X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Foptions%2Fparser.cc;h=096a31119b374a3fdf2140331c0d433208b3b506;hb=12a07e58df95bb8dbe167e4157b29c910177ade8;hp=c5a671d57aabb4a8b921f0677d3402700ea36e0d;hpb=a68b22348553017dffa5e7b35b11d1464e7ca3c7;p=awesomized%2Flibmemcached diff --git a/libmemcached/options/parser.cc b/libmemcached/options/parser.cc index c5a671d5..096a3111 100644 --- a/libmemcached/options/parser.cc +++ b/libmemcached/options/parser.cc @@ -78,34 +78,31 @@ #line 36 "libmemcached/options/parser.yy" -#include - -#include +#include +#include #include -#include -#include #include -#include -#include +#include + +#include #pragma GCC diagnostic ignored "-Wold-style-cast" -#include int conf_lex(YYSTYPE* lvalp, void* scanner); -#define parser_abort(A, B) do { parser::abort_func((A), (B)); YYABORT; } while (0) +#define parser_abort(A, B) do { (A)->abort((B)); YYABORT; } while (0) inline void config_error(Context *context, yyscan_t *scanner, const char *error) { if (not context->end()) - parser::abort_func(context, error); + context->abort(error); } /* Line 189 of yacc.c */ -#line 109 "libmemcached/options/parser.cc" +#line 106 "libmemcached/options/parser.cc" /* Enabling traces. */ #ifndef YYDEBUG @@ -141,17 +138,17 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) CONFIGURE_FILE = 264, EMPTY_LINE = 265, SERVER = 266, - SERVERS = 267, - SERVERS_OPTION = 268, - UNKNOWN_OPTION = 269, - UNKNOWN = 270, - AUTO_EJECT_HOSTS = 271, + SOCKET = 267, + SERVERS = 268, + SERVERS_OPTION = 269, + UNKNOWN_OPTION = 270, + UNKNOWN = 271, BINARY_PROTOCOL = 272, BUFFER_REQUESTS = 273, CONNECT_TIMEOUT = 274, DISTRIBUTION = 275, HASH = 276, - HASH_WITH_PREFIX_KEY = 277, + HASH_WITH_NAMESPACE = 277, IO_BYTES_WATERMARK = 278, IO_KEY_PREFETCH = 279, IO_MSG_WATERMARK = 280, @@ -162,43 +159,45 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) POLL_TIMEOUT = 285, RANDOMIZE_REPLICA_READ = 286, RCV_TIMEOUT = 287, - RETRY_TIMEOUT = 288, - SERVER_FAILURE_LIMIT = 289, + REMOVE_FAILED_SERVERS = 288, + RETRY_TIMEOUT = 289, SND_TIMEOUT = 290, SOCKET_RECV_SIZE = 291, SOCKET_SEND_SIZE = 292, SORT_HOSTS = 293, SUPPORT_CAS = 294, - _TCP_NODELAY = 295, - _TCP_KEEPALIVE = 296, - _TCP_KEEPIDLE = 297, - USER_DATA = 298, - USE_UDP = 299, - VERIFY_KEY = 300, - PREFIX_KEY = 301, - MD5 = 302, - CRC = 303, - FNV1_64 = 304, - FNV1A_64 = 305, - FNV1_32 = 306, - FNV1A_32 = 307, - HSIEH = 308, - MURMUR = 309, - JENKINS = 310, - CONSISTENT = 311, - MODULA = 312, - RANDOM = 313, - TRUE = 314, - FALSE = 315, - FLOAT = 316, - NUMBER = 317, - PORT = 318, - WEIGHT_START = 319, - IPADDRESS = 320, - HOSTNAME = 321, - STRING = 322, - QUOTED_STRING = 323, - FILE_PATH = 324 + USER_DATA = 295, + USE_UDP = 296, + VERIFY_KEY = 297, + _TCP_KEEPALIVE = 298, + _TCP_KEEPIDLE = 299, + _TCP_NODELAY = 300, + NAMESPACE = 301, + POOL_MIN = 302, + POOL_MAX = 303, + MD5 = 304, + CRC = 305, + FNV1_64 = 306, + FNV1A_64 = 307, + FNV1_32 = 308, + FNV1A_32 = 309, + HSIEH = 310, + MURMUR = 311, + JENKINS = 312, + CONSISTENT = 313, + MODULA = 314, + RANDOM = 315, + TRUE = 316, + FALSE = 317, + FLOAT = 318, + NUMBER = 319, + PORT = 320, + WEIGHT_START = 321, + IPADDRESS = 322, + HOSTNAME = 323, + STRING = 324, + QUOTED_STRING = 325, + FILE_PATH = 326 }; #endif @@ -215,7 +214,7 @@ inline void config_error(Context *context, yyscan_t *scanner, const char *error) /* Line 264 of yacc.c */ -#line 219 "libmemcached/options/parser.cc" +#line 218 "libmemcached/options/parser.cc" #ifdef short # undef short @@ -428,22 +427,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 66 +#define YYFINAL 71 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 72 +#define YYLAST 74 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 73 +#define YYNTOKENS 75 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 12 /* YYNRULES -- Number of rules. */ -#define YYNRULES 65 +#define YYNRULES 67 /* YYNRULES -- Number of states. */ -#define YYNSTATES 79 +#define YYNSTATES 85 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 324 +#define YYMAXUTOK 326 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -454,10 +453,10 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 72, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 61, 2, 2, 2, 2, 2, + 2, 2, 74, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 63, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 62, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 64, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -482,8 +481,8 @@ static const yytype_uint8 yytranslate[] = 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 63, 64, 65, 66, - 67, 68, 69, 70, 71 + 55, 56, 57, 58, 59, 60, 61, 62, 65, 66, + 67, 68, 69, 70, 71, 72, 73 }; #if YYDEBUG @@ -492,44 +491,45 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint8 yyprhs[] = { 0, 0, 3, 5, 9, 11, 13, 15, 17, 19, - 21, 23, 27, 32, 37, 40, 42, 45, 48, 53, - 56, 59, 61, 63, 65, 67, 69, 71, 73, 75, - 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, - 97, 99, 101, 103, 105, 107, 109, 111, 113, 114, - 116, 117, 119, 121, 123, 125, 127, 129, 131, 133, - 135, 137, 139, 141, 143, 145 + 21, 23, 27, 32, 37, 41, 44, 47, 50, 52, + 55, 58, 63, 66, 69, 71, 73, 75, 77, 79, + 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, + 101, 103, 105, 107, 109, 111, 113, 115, 117, 119, + 121, 122, 124, 125, 127, 129, 131, 133, 135, 137, + 139, 141, 143, 145, 147, 149, 151, 153 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 74, 0, -1, 75, -1, 74, 72, 75, -1, 76, + 76, 0, -1, 77, -1, 76, 74, 77, -1, 78, -1, 3, -1, 10, -1, 4, -1, 5, -1, 6, - -1, 7, -1, 8, 72, 83, -1, 11, 68, 80, - 81, -1, 11, 67, 80, 81, -1, 9, 83, -1, - 77, -1, 46, 83, -1, 20, 84, -1, 20, 84, - 61, 82, -1, 21, 82, -1, 78, 64, -1, 79, - -1, 43, -1, 19, -1, 25, -1, 23, -1, 24, - -1, 29, -1, 30, -1, 32, -1, 33, -1, 34, - -1, 35, -1, 36, -1, 37, -1, 16, -1, 17, - -1, 18, -1, 22, -1, 28, -1, 31, -1, 38, - -1, 39, -1, 40, -1, 41, -1, 42, -1, 44, - -1, 45, -1, -1, 65, -1, -1, 66, -1, 47, - -1, 48, -1, 49, -1, 50, -1, 51, -1, 52, - -1, 53, -1, 54, -1, 55, -1, 69, -1, 70, - -1, 56, -1, 57, -1, 58, -1 + -1, 7, -1, 8, 74, 85, -1, 11, 70, 82, + 83, -1, 11, 69, 82, 83, -1, 12, 85, 83, + -1, 9, 85, -1, 47, 66, -1, 48, 66, -1, + 79, -1, 46, 85, -1, 20, 86, -1, 20, 86, + 63, 84, -1, 21, 84, -1, 80, 66, -1, 81, + -1, 40, -1, 33, -1, 19, -1, 25, -1, 23, + -1, 24, -1, 29, -1, 30, -1, 32, -1, 34, + -1, 35, -1, 36, -1, 37, -1, 17, -1, 18, + -1, 22, -1, 28, -1, 31, -1, 38, -1, 39, + -1, 45, -1, 43, -1, 44, -1, 41, -1, 42, + -1, -1, 67, -1, -1, 68, -1, 49, -1, 50, + -1, 51, -1, 52, -1, 53, -1, 54, -1, 55, + -1, 56, -1, 57, -1, 71, -1, 72, -1, 58, + -1, 59, -1, 60, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 155, 155, 156, 160, 162, 164, 166, 171, 176, - 180, 184, 195, 203, 211, 215, 219, 226, 233, 244, - 251, 258, 265, 271, 275, 279, 283, 287, 291, 295, - 299, 303, 307, 311, 315, 322, 326, 330, 334, 338, - 342, 346, 350, 354, 358, 362, 366, 370, 377, 378, - 383, 384, 389, 393, 397, 401, 405, 409, 413, 417, - 421, 428, 432, 440, 444, 448 + 0, 158, 158, 159, 163, 165, 167, 169, 174, 179, + 183, 187, 198, 206, 214, 221, 225, 229, 233, 237, + 244, 251, 262, 269, 276, 283, 289, 293, 297, 301, + 305, 309, 313, 317, 321, 325, 329, 333, 340, 344, + 348, 352, 356, 360, 364, 368, 372, 376, 380, 384, + 391, 392, 397, 398, 403, 407, 411, 415, 419, 423, + 427, 431, 435, 442, 446, 457, 461, 465 }; #endif @@ -540,22 +540,22 @@ static const char *const yytname[] = { "$end", "error", "$undefined", "COMMENT", "END", "ERROR", "RESET", "PARSER_DEBUG", "INCLUDE", "CONFIGURE_FILE", "EMPTY_LINE", "SERVER", - "SERVERS", "SERVERS_OPTION", "UNKNOWN_OPTION", "UNKNOWN", - "AUTO_EJECT_HOSTS", "BINARY_PROTOCOL", "BUFFER_REQUESTS", - "CONNECT_TIMEOUT", "DISTRIBUTION", "HASH", "HASH_WITH_PREFIX_KEY", - "IO_BYTES_WATERMARK", "IO_KEY_PREFETCH", "IO_MSG_WATERMARK", - "KETAMA_HASH", "KETAMA_WEIGHTED", "NOREPLY", "NUMBER_OF_REPLICAS", - "POLL_TIMEOUT", "RANDOMIZE_REPLICA_READ", "RCV_TIMEOUT", "RETRY_TIMEOUT", - "SERVER_FAILURE_LIMIT", "SND_TIMEOUT", "SOCKET_RECV_SIZE", - "SOCKET_SEND_SIZE", "SORT_HOSTS", "SUPPORT_CAS", "_TCP_NODELAY", - "_TCP_KEEPALIVE", "_TCP_KEEPIDLE", "USER_DATA", "USE_UDP", "VERIFY_KEY", - "PREFIX_KEY", "MD5", "CRC", "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", - "HSIEH", "MURMUR", "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", - "FALSE", "','", "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", - "IPADDRESS", "HOSTNAME", "STRING", "QUOTED_STRING", "FILE_PATH", "' '", - "$accept", "begin", "statement", "expression", "behaviors", - "behavior_number", "behavior_boolean", "optional_port", - "optional_weight", "hash", "string", "distribution", 0 + "SOCKET", "SERVERS", "SERVERS_OPTION", "UNKNOWN_OPTION", "UNKNOWN", + "BINARY_PROTOCOL", "BUFFER_REQUESTS", "CONNECT_TIMEOUT", "DISTRIBUTION", + "HASH", "HASH_WITH_NAMESPACE", "IO_BYTES_WATERMARK", "IO_KEY_PREFETCH", + "IO_MSG_WATERMARK", "KETAMA_HASH", "KETAMA_WEIGHTED", "NOREPLY", + "NUMBER_OF_REPLICAS", "POLL_TIMEOUT", "RANDOMIZE_REPLICA_READ", + "RCV_TIMEOUT", "REMOVE_FAILED_SERVERS", "RETRY_TIMEOUT", "SND_TIMEOUT", + "SOCKET_RECV_SIZE", "SOCKET_SEND_SIZE", "SORT_HOSTS", "SUPPORT_CAS", + "USER_DATA", "USE_UDP", "VERIFY_KEY", "_TCP_KEEPALIVE", "_TCP_KEEPIDLE", + "_TCP_NODELAY", "NAMESPACE", "POOL_MIN", "POOL_MAX", "MD5", "CRC", + "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH", "MURMUR", + "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE", "','", + "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS", + "HOSTNAME", "STRING", "QUOTED_STRING", "FILE_PATH", "' '", "$accept", + "begin", "statement", "expression", "behaviors", "behavior_number", + "behavior_boolean", "optional_port", "optional_weight", "hash", "string", + "distribution", 0 }; #endif @@ -570,33 +570,33 @@ static const yytype_uint16 yytoknum[] = 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 44, 61, 316, 317, 318, 319, 320, 321, 322, - 323, 324, 32 + 315, 316, 317, 44, 61, 318, 319, 320, 321, 322, + 323, 324, 325, 326, 32 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 73, 74, 74, 75, 75, 75, 75, 75, 75, - 75, 75, 76, 76, 76, 76, 77, 77, 77, 77, - 77, 77, 77, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 78, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 80, 80, - 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 83, 83, 84, 84, 84 + 0, 75, 76, 76, 77, 77, 77, 77, 77, 77, + 77, 77, 78, 78, 78, 78, 78, 78, 78, 79, + 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 82, 82, 83, 83, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 85, 85, 86, 86, 86 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 3, 4, 4, 2, 1, 2, 2, 4, 2, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 3, 4, 4, 3, 2, 2, 2, 1, 2, + 2, 4, 2, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1 + 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -605,42 +605,44 @@ static const yytype_uint8 yyr2[] = static const yytype_uint8 yydefact[] = { 0, 5, 7, 8, 9, 10, 0, 0, 6, 0, - 35, 36, 37, 23, 0, 0, 38, 25, 26, 24, - 39, 27, 28, 40, 29, 30, 31, 32, 33, 34, - 41, 42, 43, 44, 45, 22, 46, 47, 0, 0, - 2, 4, 15, 0, 21, 0, 61, 62, 14, 48, - 48, 63, 64, 65, 17, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 19, 16, 1, 0, 20, 11, - 49, 50, 50, 0, 3, 51, 13, 12, 18 + 0, 38, 39, 27, 0, 0, 40, 29, 30, 28, + 41, 31, 32, 42, 33, 26, 34, 35, 36, 37, + 43, 44, 25, 48, 49, 46, 47, 45, 0, 0, + 0, 0, 2, 4, 18, 0, 24, 0, 63, 64, + 15, 50, 50, 52, 65, 66, 67, 20, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 22, 19, 16, + 17, 1, 0, 23, 11, 51, 52, 52, 53, 14, + 0, 3, 13, 12, 21 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 39, 40, 41, 42, 43, 44, 71, 76, 64, - 48, 54 + -1, 41, 42, 43, 44, 45, 46, 76, 79, 67, + 50, 57 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -60 +#define YYPACT_NINF -61 static const yytype_int8 yypact[] = { - -2, -60, -60, -60, -60, -60, -59, -45, -60, -11, - -60, -60, -60, -60, -46, -1, -60, -60, -60, -60, - -60, -60, -60, -60, -60, -60, -60, -60, -60, -60, - -60, -60, -60, -60, -60, -60, -60, -60, -45, 0, - -60, -60, -60, -19, -60, -45, -60, -60, -60, -7, - -7, -60, -60, -60, 2, -60, -60, -60, -60, -60, - -60, -60, -60, -60, -60, -60, -60, -2, -60, -60, - -60, -6, -6, -1, -60, -60, -60, -60, -60 + -2, -61, -61, -61, -61, -61, -60, -24, -61, -20, + -24, -61, -61, -61, -47, 13, -61, -61, -61, -61, + -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, + -61, -61, -61, -61, -61, -61, -61, -61, -24, -41, + -15, 0, -61, -61, -61, -11, -61, -24, -61, -61, + -61, -10, -10, -12, -61, -61, -61, -5, -61, -61, + -61, -61, -61, -61, -61, -61, -61, -61, -61, -61, + -61, -61, -2, -61, -61, -61, -12, -12, -61, -61, + 13, -61, -61, -61, -61 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -60, -60, -8, -60, -60, -60, -60, 11, -5, -9, - 17, -60 + -61, -61, -13, -61, -61, -61, -61, 8, -23, -9, + 14, -61 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -650,26 +652,26 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 66, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 51, 52, 53, 45, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 46, 47, 20, 21, 22, 23, + 71, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 54, 55, 56, 47, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 53, 69, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 68, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 65, 49, 50, 70, 74, - 75, 72, 69, 73, 78, 0, 0, 77, 0, 0, - 0, 0, 67 + 34, 35, 36, 37, 38, 39, 40, 48, 49, 51, + 52, 70, 68, 82, 83, 73, 78, 75, 80, 81, + 77, 74, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 84, 0, 0, 72 }; static const yytype_int8 yycheck[] = { 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 56, 57, 58, 72, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 69, 70, 28, 29, 30, 31, + 12, 58, 59, 60, 74, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 10, 66, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 64, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 38, 67, 68, 65, 67, - 66, 50, 45, 61, 73, -1, -1, 72, -1, -1, - -1, -1, 72 + 42, 43, 44, 45, 46, 47, 48, 71, 72, 69, + 70, 66, 38, 76, 77, 66, 68, 67, 63, 72, + 52, 47, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 80, -1, -1, 74 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -677,13 +679,14 @@ static const yytype_int8 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 12, 17, 18, 19, 20, 21, 22, 23, 24, 25, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 74, - 75, 76, 77, 78, 79, 72, 69, 70, 83, 67, - 68, 56, 57, 58, 84, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 82, 83, 0, 72, 64, 83, - 65, 80, 80, 61, 75, 66, 81, 81, 82 + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 76, 77, 78, 79, 80, 81, 74, 71, 72, + 85, 69, 70, 85, 58, 59, 60, 86, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 84, 85, 66, + 66, 0, 74, 66, 85, 67, 82, 82, 68, 83, + 63, 77, 83, 83, 84 }; #define yyerrok (yyerrstatus = 0) @@ -1518,28 +1521,28 @@ yyreduce: case 4: /* Line 1464 of yacc.c */ -#line 161 "libmemcached/options/parser.yy" +#line 164 "libmemcached/options/parser.yy" { ;} break; case 5: /* Line 1464 of yacc.c */ -#line 163 "libmemcached/options/parser.yy" +#line 166 "libmemcached/options/parser.yy" { ;} break; case 6: /* Line 1464 of yacc.c */ -#line 165 "libmemcached/options/parser.yy" +#line 168 "libmemcached/options/parser.yy" { ;} break; case 7: /* Line 1464 of yacc.c */ -#line 167 "libmemcached/options/parser.yy" +#line 170 "libmemcached/options/parser.yy" { context->set_end(); YYACCEPT; @@ -1549,7 +1552,7 @@ yyreduce: case 8: /* Line 1464 of yacc.c */ -#line 172 "libmemcached/options/parser.yy" +#line 175 "libmemcached/options/parser.yy" { context->rc= MEMCACHED_PARSE_USER_ERROR; parser_abort(context, NULL); @@ -1559,7 +1562,7 @@ yyreduce: case 9: /* Line 1464 of yacc.c */ -#line 177 "libmemcached/options/parser.yy" +#line 180 "libmemcached/options/parser.yy" { memcached_reset(context->memc); ;} @@ -1568,7 +1571,7 @@ yyreduce: case 10: /* Line 1464 of yacc.c */ -#line 181 "libmemcached/options/parser.yy" +#line 184 "libmemcached/options/parser.yy" { yydebug= 1; ;} @@ -1577,9 +1580,9 @@ yyreduce: case 11: /* Line 1464 of yacc.c */ -#line 185 "libmemcached/options/parser.yy" +#line 188 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_parse_configure_file(context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).length)) != MEMCACHED_SUCCESS) + 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); } @@ -1589,9 +1592,9 @@ yyreduce: case 12: /* Line 1464 of yacc.c */ -#line 196 "libmemcached/options/parser.yy" +#line 199 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(2) - (4)].server).port, (yyvsp[(2) - (4)].server).weight)) != MEMCACHED_SUCCESS) + 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); } @@ -1602,9 +1605,9 @@ yyreduce: case 13: /* Line 1464 of yacc.c */ -#line 204 "libmemcached/options/parser.yy" +#line 207 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(2) - (4)].server).port, (yyvsp[(2) - (4)].server).weight)) != MEMCACHED_SUCCESS) + 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); } @@ -1615,60 +1618,50 @@ yyreduce: case 14: /* Line 1464 of yacc.c */ -#line 212 "libmemcached/options/parser.yy" +#line 215 "libmemcached/options/parser.yy" { - memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).length); + 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); + } ;} break; - case 16: + case 15: /* Line 1464 of yacc.c */ -#line 220 "libmemcached/options/parser.yy" +#line 222 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_set_prefix_key(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).length)) != MEMCACHED_SUCCESS) - { - parser_abort(context, NULL);; - } + memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size); ;} break; - case 17: + case 16: /* Line 1464 of yacc.c */ -#line 227 "libmemcached/options/parser.yy" +#line 226 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS) - { - parser_abort(context, NULL);; - } + context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number); ;} break; - case 18: + case 17: /* Line 1464 of yacc.c */ -#line 234 "libmemcached/options/parser.yy" +#line 230 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS) - { - parser_abort(context, NULL);; - } - if ((context->rc= memcached_behavior_set_distribution_hash(context->memc, (yyvsp[(4) - (4)].hash))) != MEMCACHED_SUCCESS) - { - parser_abort(context, NULL);; - } + context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number); ;} break; case 19: /* Line 1464 of yacc.c */ -#line 245 "libmemcached/options/parser.yy" +#line 238 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, (yyvsp[(2) - (2)].hash))) != MEMCACHED_SUCCESS) + 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, NULL);; } ;} break; @@ -1676,9 +1669,9 @@ yyreduce: case 20: /* Line 1464 of yacc.c */ -#line 252 "libmemcached/options/parser.yy" +#line 245 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS) + if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS) { parser_abort(context, NULL);; } @@ -1688,9 +1681,13 @@ yyreduce: case 21: /* Line 1464 of yacc.c */ -#line 259 "libmemcached/options/parser.yy" +#line 252 "libmemcached/options/parser.yy" { - if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS) + if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS) + { + parser_abort(context, NULL);; + } + if ((context->rc= memcached_behavior_set_distribution_hash(context->memc, (yyvsp[(4) - (4)].hash))) != MEMCACHED_SUCCESS) { parser_abort(context, NULL);; } @@ -1700,386 +1697,416 @@ yyreduce: case 22: /* Line 1464 of yacc.c */ -#line 266 "libmemcached/options/parser.yy" +#line 263 "libmemcached/options/parser.yy" { + if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, (yyvsp[(2) - (2)].hash))) != MEMCACHED_SUCCESS) + { + parser_abort(context, NULL);; + } ;} break; case 23: /* Line 1464 of yacc.c */ -#line 272 "libmemcached/options/parser.yy" +#line 270 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT; + if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS) + { + parser_abort(context, NULL);; + } ;} break; case 24: /* Line 1464 of yacc.c */ -#line 276 "libmemcached/options/parser.yy" +#line 277 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK; + if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS) + { + parser_abort(context, NULL);; + } ;} break; case 25: /* Line 1464 of yacc.c */ -#line 280 "libmemcached/options/parser.yy" +#line 284 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK; ;} break; case 26: /* Line 1464 of yacc.c */ -#line 284 "libmemcached/options/parser.yy" +#line 290 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH; + (yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS; ;} break; case 27: /* Line 1464 of yacc.c */ -#line 288 "libmemcached/options/parser.yy" +#line 294 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS; + (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT; ;} break; case 28: /* Line 1464 of yacc.c */ -#line 292 "libmemcached/options/parser.yy" +#line 298 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT; + (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK; ;} break; case 29: /* Line 1464 of yacc.c */ -#line 296 "libmemcached/options/parser.yy" +#line 302 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT; + (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK; ;} break; case 30: /* Line 1464 of yacc.c */ -#line 300 "libmemcached/options/parser.yy" +#line 306 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT; + (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH; ;} break; case 31: /* Line 1464 of yacc.c */ -#line 304 "libmemcached/options/parser.yy" +#line 310 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT; + (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS; ;} break; case 32: /* Line 1464 of yacc.c */ -#line 308 "libmemcached/options/parser.yy" +#line 314 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT; + (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT; ;} break; case 33: /* Line 1464 of yacc.c */ -#line 312 "libmemcached/options/parser.yy" +#line 318 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE; + (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT; ;} break; case 34: /* Line 1464 of yacc.c */ -#line 316 "libmemcached/options/parser.yy" +#line 322 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE; + (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT; ;} break; case 35: /* Line 1464 of yacc.c */ -#line 323 "libmemcached/options/parser.yy" +#line 326 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS; + (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT; ;} break; case 36: /* Line 1464 of yacc.c */ -#line 327 "libmemcached/options/parser.yy" +#line 330 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL; + (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE; ;} break; case 37: /* Line 1464 of yacc.c */ -#line 331 "libmemcached/options/parser.yy" +#line 334 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; + (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE; ;} break; case 38: /* Line 1464 of yacc.c */ -#line 335 "libmemcached/options/parser.yy" +#line 341 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; + (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL; ;} break; case 39: /* Line 1464 of yacc.c */ -#line 339 "libmemcached/options/parser.yy" +#line 345 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY; + (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS; ;} break; case 40: /* Line 1464 of yacc.c */ -#line 343 "libmemcached/options/parser.yy" +#line 349 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ; + (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY; ;} break; case 41: /* Line 1464 of yacc.c */ -#line 347 "libmemcached/options/parser.yy" +#line 353 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS; + (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY; ;} break; case 42: /* Line 1464 of yacc.c */ -#line 351 "libmemcached/options/parser.yy" +#line 357 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS; + (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ; ;} break; case 43: /* Line 1464 of yacc.c */ -#line 355 "libmemcached/options/parser.yy" +#line 361 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY; + (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS; ;} break; case 44: /* Line 1464 of yacc.c */ -#line 359 "libmemcached/options/parser.yy" +#line 365 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE; + (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS; ;} break; case 45: /* Line 1464 of yacc.c */ -#line 363 "libmemcached/options/parser.yy" +#line 369 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE; + (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY; ;} break; case 46: /* Line 1464 of yacc.c */ -#line 367 "libmemcached/options/parser.yy" +#line 373 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP; + (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE; ;} break; case 47: /* Line 1464 of yacc.c */ -#line 371 "libmemcached/options/parser.yy" +#line 377 "libmemcached/options/parser.yy" { - (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY; + (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE; ;} break; case 48: /* Line 1464 of yacc.c */ -#line 377 "libmemcached/options/parser.yy" - { ;} +#line 381 "libmemcached/options/parser.yy" + { + (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP; + ;} break; case 49: /* Line 1464 of yacc.c */ -#line 379 "libmemcached/options/parser.yy" - { ;} +#line 385 "libmemcached/options/parser.yy" + { + (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY; + ;} break; case 50: /* Line 1464 of yacc.c */ -#line 383 "libmemcached/options/parser.yy" - { ;} +#line 391 "libmemcached/options/parser.yy" + { (yyval.number)= MEMCACHED_DEFAULT_PORT;;} break; case 51: /* Line 1464 of yacc.c */ -#line 385 "libmemcached/options/parser.yy" +#line 393 "libmemcached/options/parser.yy" { ;} break; case 52: /* Line 1464 of yacc.c */ -#line 390 "libmemcached/options/parser.yy" +#line 397 "libmemcached/options/parser.yy" + { (yyval.number)= 1; ;} + break; + + case 53: + +/* Line 1464 of yacc.c */ +#line 399 "libmemcached/options/parser.yy" + { ;} + break; + + case 54: + +/* Line 1464 of yacc.c */ +#line 404 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MD5; ;} break; - case 53: + case 55: /* Line 1464 of yacc.c */ -#line 394 "libmemcached/options/parser.yy" +#line 408 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_CRC; ;} break; - case 54: + case 56: /* Line 1464 of yacc.c */ -#line 398 "libmemcached/options/parser.yy" +#line 412 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_64; ;} break; - case 55: + case 57: /* Line 1464 of yacc.c */ -#line 402 "libmemcached/options/parser.yy" +#line 416 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_64; ;} break; - case 56: + case 58: /* Line 1464 of yacc.c */ -#line 406 "libmemcached/options/parser.yy" +#line 420 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1_32; ;} break; - case 57: + case 59: /* Line 1464 of yacc.c */ -#line 410 "libmemcached/options/parser.yy" +#line 424 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_FNV1A_32; ;} break; - case 58: + case 60: /* Line 1464 of yacc.c */ -#line 414 "libmemcached/options/parser.yy" +#line 428 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_HSIEH; ;} break; - case 59: + case 61: /* Line 1464 of yacc.c */ -#line 418 "libmemcached/options/parser.yy" +#line 432 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_MURMUR; ;} break; - case 60: + case 62: /* Line 1464 of yacc.c */ -#line 422 "libmemcached/options/parser.yy" +#line 436 "libmemcached/options/parser.yy" { (yyval.hash)= MEMCACHED_HASH_JENKINS; ;} break; - case 61: + case 63: /* Line 1464 of yacc.c */ -#line 429 "libmemcached/options/parser.yy" +#line 443 "libmemcached/options/parser.yy" { (yyval.string)= (yyvsp[(1) - (1)].string); ;} break; - case 62: + case 64: /* Line 1464 of yacc.c */ -#line 433 "libmemcached/options/parser.yy" +#line 447 "libmemcached/options/parser.yy" { + (yyval.string)= (yyvsp[(1) - (1)].string); + #if 0 (yyval.string).c_str= (yyvsp[(1) - (1)].string).c_str +1; // +1 to move use passed the initial quote - (yyval.string).length= (yyvsp[(1) - (1)].string).length -1; // -1 removes the end quote + (yyval.string).size= (yyvsp[(1) - (1)].string).size -2; // -2 removes the begin and end quote + #endif ;} break; - case 63: + case 65: /* Line 1464 of yacc.c */ -#line 441 "libmemcached/options/parser.yy" +#line 458 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT; ;} break; - case 64: + case 66: /* Line 1464 of yacc.c */ -#line 445 "libmemcached/options/parser.yy" +#line 462 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA; ;} break; - case 65: + case 67: /* Line 1464 of yacc.c */ -#line 449 "libmemcached/options/parser.yy" +#line 466 "libmemcached/options/parser.yy" { (yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM; ;} @@ -2088,7 +2115,7 @@ yyreduce: /* Line 1464 of yacc.c */ -#line 2092 "libmemcached/options/parser.cc" +#line 2119 "libmemcached/options/parser.cc" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2300,7 +2327,7 @@ yyreturn: /* Line 1684 of yacc.c */ -#line 454 "libmemcached/options/parser.yy" +#line 471 "libmemcached/options/parser.yy" void Context::start()