diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 3c160aab3b00faa05853e4594511608c89850616..a18efdeb744ba039c685d5fc1067c95e3ca15d86 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -114,6 +114,7 @@ typedef union { tSQLExprList* yy224; int64_t yy271; tVariant yy312; + SIntervalVal yy314; SCreateTableSQL* yy374; tFieldList* yy449; tVariantList* yy494; @@ -126,17 +127,17 @@ typedef union { #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo #define YYFALLBACK 1 -#define YYNSTATE 248 -#define YYNRULE 227 +#define YYNSTATE 252 +#define YYNRULE 230 #define YYNTOKEN 206 -#define YY_MAX_SHIFT 247 -#define YY_MIN_SHIFTREDUCE 409 -#define YY_MAX_SHIFTREDUCE 635 -#define YY_ERROR_ACTION 636 -#define YY_ACCEPT_ACTION 637 -#define YY_NO_ACTION 638 -#define YY_MIN_REDUCE 639 -#define YY_MAX_REDUCE 865 +#define YY_MAX_SHIFT 251 +#define YY_MIN_SHIFTREDUCE 416 +#define YY_MAX_SHIFTREDUCE 645 +#define YY_ERROR_ACTION 646 +#define YY_ACCEPT_ACTION 647 +#define YY_NO_ACTION 648 +#define YY_MIN_REDUCE 649 +#define YY_MAX_REDUCE 878 /************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined @@ -202,123 +203,124 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (555) +#define YY_ACTTAB_COUNT (566) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 11, 452, 140, 452, 158, 245, 21, 139, 144, 453, - /* 10 */ 140, 453, 852, 41, 43, 771, 35, 36, 849, 163, - /* 20 */ 853, 29, 452, 848, 203, 39, 37, 40, 38, 159, - /* 30 */ 453, 782, 741, 34, 33, 739, 740, 32, 31, 30, - /* 40 */ 742, 756, 744, 745, 743, 107, 160, 410, 411, 412, - /* 50 */ 413, 414, 415, 416, 417, 418, 419, 420, 421, 246, - /* 60 */ 637, 247, 178, 41, 43, 760, 35, 36, 225, 107, - /* 70 */ 140, 29, 170, 847, 203, 39, 37, 40, 38, 162, - /* 80 */ 853, 518, 779, 34, 33, 103, 156, 32, 31, 30, - /* 90 */ 234, 760, 41, 43, 157, 35, 36, 771, 758, 200, - /* 100 */ 29, 60, 56, 203, 39, 37, 40, 38, 17, 223, - /* 110 */ 222, 188, 34, 33, 145, 26, 32, 31, 30, 43, - /* 120 */ 8, 35, 36, 63, 117, 808, 29, 198, 146, 203, - /* 130 */ 39, 37, 40, 38, 32, 31, 30, 191, 34, 33, - /* 140 */ 181, 107, 32, 31, 30, 241, 21, 185, 184, 591, - /* 150 */ 16, 214, 240, 239, 213, 212, 211, 238, 210, 237, - /* 160 */ 236, 235, 209, 737, 760, 725, 726, 727, 728, 729, - /* 170 */ 730, 731, 732, 733, 734, 735, 736, 35, 36, 171, - /* 180 */ 680, 757, 29, 130, 148, 203, 39, 37, 40, 38, - /* 190 */ 244, 243, 96, 149, 34, 33, 107, 807, 32, 31, - /* 200 */ 30, 167, 604, 78, 12, 595, 62, 598, 234, 601, - /* 210 */ 689, 167, 604, 130, 150, 595, 173, 598, 27, 601, - /* 220 */ 152, 167, 604, 572, 573, 595, 153, 598, 151, 601, - /* 230 */ 90, 89, 147, 164, 165, 34, 33, 202, 142, 32, - /* 240 */ 31, 30, 681, 164, 165, 130, 818, 550, 39, 37, - /* 250 */ 40, 38, 61, 164, 165, 563, 34, 33, 17, 46, - /* 260 */ 32, 31, 30, 102, 16, 26, 240, 239, 564, 21, - /* 270 */ 26, 238, 14, 237, 236, 235, 597, 174, 600, 547, - /* 280 */ 220, 219, 76, 80, 18, 187, 166, 21, 85, 88, - /* 290 */ 79, 138, 155, 120, 121, 21, 82, 593, 42, 70, - /* 300 */ 66, 69, 172, 542, 757, 134, 132, 143, 42, 603, - /* 310 */ 190, 93, 92, 91, 596, 141, 599, 621, 42, 603, - /* 320 */ 221, 13, 757, 605, 602, 3, 862, 13, 226, 603, - /* 330 */ 757, 47, 534, 594, 602, 531, 50, 532, 538, 533, - /* 340 */ 539, 524, 523, 817, 602, 46, 22, 207, 87, 86, - /* 350 */ 48, 22, 759, 51, 75, 74, 101, 99, 10, 9, - /* 360 */ 536, 168, 537, 175, 176, 814, 813, 169, 781, 786, - /* 370 */ 751, 800, 224, 773, 788, 26, 104, 799, 118, 189, - /* 380 */ 116, 119, 691, 208, 136, 24, 100, 217, 688, 559, - /* 390 */ 218, 861, 72, 860, 858, 122, 709, 25, 23, 137, - /* 400 */ 678, 81, 676, 83, 84, 674, 673, 177, 131, 671, - /* 410 */ 192, 670, 196, 669, 770, 668, 667, 133, 665, 663, - /* 420 */ 52, 661, 659, 657, 135, 49, 57, 58, 801, 44, - /* 430 */ 201, 199, 197, 195, 535, 193, 28, 216, 77, 227, - /* 440 */ 228, 230, 229, 231, 232, 233, 242, 635, 180, 205, - /* 450 */ 53, 179, 634, 182, 183, 64, 67, 154, 633, 626, - /* 460 */ 186, 161, 105, 672, 190, 94, 544, 666, 658, 125, - /* 470 */ 710, 123, 124, 126, 127, 108, 128, 109, 129, 110, - /* 480 */ 95, 755, 111, 112, 115, 113, 114, 2, 1, 55, - /* 490 */ 59, 560, 194, 5, 565, 106, 19, 6, 606, 20, - /* 500 */ 4, 15, 65, 7, 204, 493, 206, 489, 487, 486, - /* 510 */ 485, 482, 456, 215, 68, 45, 22, 71, 73, 520, - /* 520 */ 519, 517, 54, 477, 475, 467, 473, 469, 471, 465, - /* 530 */ 463, 492, 491, 490, 488, 484, 483, 46, 454, 425, - /* 540 */ 423, 639, 638, 638, 638, 638, 638, 638, 638, 638, - /* 550 */ 638, 638, 638, 97, 98, + /* 0 */ 751, 459, 11, 749, 750, 647, 251, 459, 752, 460, + /* 10 */ 754, 755, 753, 35, 36, 460, 37, 38, 159, 249, + /* 20 */ 170, 29, 141, 459, 206, 41, 39, 43, 40, 140, + /* 30 */ 145, 460, 865, 34, 33, 862, 141, 32, 31, 30, + /* 40 */ 35, 36, 781, 37, 38, 165, 866, 170, 29, 141, + /* 50 */ 62, 206, 41, 39, 43, 40, 191, 525, 164, 866, + /* 60 */ 34, 33, 27, 21, 32, 31, 30, 417, 418, 419, + /* 70 */ 420, 421, 422, 423, 424, 425, 426, 427, 428, 250, + /* 80 */ 35, 36, 181, 37, 38, 227, 226, 170, 29, 781, + /* 90 */ 176, 206, 41, 39, 43, 40, 174, 162, 767, 792, + /* 100 */ 34, 33, 56, 160, 32, 31, 30, 21, 36, 8, + /* 110 */ 37, 38, 63, 118, 170, 29, 770, 108, 206, 41, + /* 120 */ 39, 43, 40, 32, 31, 30, 599, 34, 33, 78, + /* 130 */ 875, 32, 31, 30, 238, 37, 38, 108, 238, 170, + /* 140 */ 29, 184, 766, 206, 41, 39, 43, 40, 188, 187, + /* 150 */ 789, 177, 34, 33, 224, 223, 32, 31, 30, 16, + /* 160 */ 218, 244, 243, 217, 216, 215, 242, 214, 241, 240, + /* 170 */ 239, 213, 747, 818, 735, 736, 737, 738, 739, 740, + /* 180 */ 741, 742, 743, 744, 745, 746, 169, 612, 103, 12, + /* 190 */ 603, 17, 606, 819, 609, 201, 169, 612, 26, 108, + /* 200 */ 603, 108, 606, 861, 609, 153, 169, 612, 173, 567, + /* 210 */ 603, 154, 606, 105, 609, 90, 89, 148, 166, 167, + /* 220 */ 34, 33, 205, 102, 32, 31, 30, 770, 166, 167, + /* 230 */ 26, 21, 557, 41, 39, 43, 40, 549, 166, 167, + /* 240 */ 194, 34, 33, 17, 193, 32, 31, 30, 860, 16, + /* 250 */ 26, 244, 243, 203, 21, 60, 242, 61, 241, 240, + /* 260 */ 239, 248, 247, 96, 175, 229, 767, 76, 80, 245, + /* 270 */ 190, 554, 21, 85, 88, 79, 18, 156, 121, 122, + /* 280 */ 605, 82, 608, 42, 70, 66, 69, 225, 770, 767, + /* 290 */ 135, 133, 601, 42, 611, 768, 93, 92, 91, 690, + /* 300 */ 168, 207, 131, 42, 611, 230, 545, 767, 546, 610, + /* 310 */ 699, 157, 691, 131, 611, 131, 604, 541, 607, 610, + /* 320 */ 538, 571, 539, 47, 540, 46, 580, 581, 602, 610, + /* 330 */ 572, 631, 613, 50, 14, 13, 13, 531, 543, 3, + /* 340 */ 544, 46, 48, 530, 75, 74, 811, 22, 178, 179, + /* 350 */ 51, 211, 10, 9, 829, 22, 87, 86, 101, 99, + /* 360 */ 158, 143, 144, 146, 147, 151, 152, 150, 139, 149, + /* 370 */ 769, 142, 828, 171, 825, 824, 172, 791, 761, 796, + /* 380 */ 228, 783, 798, 104, 810, 119, 120, 701, 117, 212, + /* 390 */ 615, 137, 24, 221, 698, 26, 222, 192, 874, 72, + /* 400 */ 873, 871, 123, 719, 25, 100, 23, 138, 566, 688, + /* 410 */ 81, 686, 83, 84, 684, 195, 780, 683, 161, 542, + /* 420 */ 180, 199, 132, 681, 680, 679, 52, 49, 678, 677, + /* 430 */ 109, 134, 44, 675, 204, 673, 671, 669, 667, 202, + /* 440 */ 200, 198, 196, 28, 136, 220, 57, 58, 812, 77, + /* 450 */ 231, 232, 233, 234, 235, 236, 237, 246, 209, 645, + /* 460 */ 53, 182, 183, 644, 110, 64, 67, 155, 186, 185, + /* 470 */ 682, 643, 94, 636, 676, 189, 126, 125, 720, 124, + /* 480 */ 127, 128, 130, 129, 95, 668, 1, 551, 193, 765, + /* 490 */ 2, 55, 113, 111, 114, 112, 115, 116, 59, 568, + /* 500 */ 163, 106, 197, 5, 573, 107, 6, 65, 614, 19, + /* 510 */ 4, 20, 15, 208, 616, 7, 210, 500, 496, 494, + /* 520 */ 493, 492, 489, 463, 219, 68, 45, 71, 73, 22, + /* 530 */ 527, 526, 524, 54, 484, 482, 474, 480, 476, 478, + /* 540 */ 472, 470, 499, 498, 497, 495, 491, 490, 46, 461, + /* 550 */ 432, 430, 649, 648, 648, 648, 648, 648, 648, 648, + /* 560 */ 648, 648, 648, 648, 97, 98, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 260, 1, 260, 1, 209, 210, 210, 260, 260, 9, - /* 10 */ 260, 9, 270, 13, 14, 244, 16, 17, 260, 269, - /* 20 */ 270, 21, 1, 260, 24, 25, 26, 27, 28, 258, - /* 30 */ 9, 210, 226, 33, 34, 229, 230, 37, 38, 39, - /* 40 */ 234, 245, 236, 237, 238, 210, 227, 45, 46, 47, - /* 50 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - /* 60 */ 207, 208, 60, 13, 14, 246, 16, 17, 210, 210, - /* 70 */ 260, 21, 227, 260, 24, 25, 26, 27, 28, 269, - /* 80 */ 270, 5, 261, 33, 34, 210, 260, 37, 38, 39, - /* 90 */ 78, 246, 13, 14, 260, 16, 17, 244, 240, 264, - /* 100 */ 21, 266, 102, 24, 25, 26, 27, 28, 98, 33, - /* 110 */ 34, 258, 33, 34, 260, 105, 37, 38, 39, 14, - /* 120 */ 98, 16, 17, 101, 102, 266, 21, 268, 260, 24, - /* 130 */ 25, 26, 27, 28, 37, 38, 39, 262, 33, 34, - /* 140 */ 126, 210, 37, 38, 39, 227, 210, 133, 134, 99, - /* 150 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - /* 160 */ 95, 96, 97, 226, 246, 228, 229, 230, 231, 232, - /* 170 */ 233, 234, 235, 236, 237, 238, 239, 16, 17, 243, - /* 180 */ 214, 245, 21, 217, 260, 24, 25, 26, 27, 28, - /* 190 */ 63, 64, 65, 260, 33, 34, 210, 266, 37, 38, - /* 200 */ 39, 1, 2, 73, 44, 5, 247, 7, 78, 9, - /* 210 */ 214, 1, 2, 217, 260, 5, 66, 7, 259, 9, - /* 220 */ 60, 1, 2, 115, 116, 5, 66, 7, 260, 9, - /* 230 */ 70, 71, 72, 33, 34, 33, 34, 37, 260, 37, - /* 240 */ 38, 39, 214, 33, 34, 217, 241, 37, 25, 26, - /* 250 */ 27, 28, 266, 33, 34, 99, 33, 34, 98, 103, - /* 260 */ 37, 38, 39, 98, 85, 105, 87, 88, 99, 210, - /* 270 */ 105, 92, 103, 94, 95, 96, 5, 127, 7, 103, - /* 280 */ 130, 131, 61, 62, 108, 125, 59, 210, 67, 68, - /* 290 */ 69, 260, 132, 61, 62, 210, 75, 1, 98, 67, - /* 300 */ 68, 69, 243, 99, 245, 61, 62, 260, 98, 109, - /* 310 */ 106, 67, 68, 69, 5, 260, 7, 99, 98, 109, - /* 320 */ 243, 103, 245, 99, 124, 98, 246, 103, 243, 109, - /* 330 */ 245, 103, 2, 37, 124, 5, 103, 7, 5, 9, - /* 340 */ 7, 99, 99, 241, 124, 103, 103, 99, 73, 74, - /* 350 */ 122, 103, 246, 120, 128, 129, 61, 62, 128, 129, - /* 360 */ 5, 241, 7, 33, 34, 241, 241, 241, 210, 210, - /* 370 */ 242, 267, 241, 244, 210, 105, 210, 267, 210, 244, - /* 380 */ 248, 210, 210, 210, 210, 210, 59, 210, 210, 109, - /* 390 */ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - /* 400 */ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - /* 410 */ 263, 210, 263, 210, 257, 210, 210, 210, 210, 210, - /* 420 */ 119, 210, 210, 210, 210, 121, 211, 211, 211, 118, - /* 430 */ 113, 117, 112, 111, 104, 110, 123, 76, 84, 83, - /* 440 */ 49, 82, 80, 53, 81, 79, 76, 5, 5, 211, - /* 450 */ 211, 135, 5, 135, 5, 215, 215, 211, 5, 86, - /* 460 */ 126, 1, 98, 211, 106, 212, 99, 211, 211, 219, - /* 470 */ 225, 224, 223, 222, 220, 256, 221, 255, 218, 254, - /* 480 */ 212, 244, 253, 252, 249, 251, 250, 213, 216, 107, - /* 490 */ 103, 99, 98, 114, 99, 98, 103, 114, 99, 103, - /* 500 */ 98, 98, 73, 98, 100, 9, 100, 5, 5, 5, - /* 510 */ 5, 5, 77, 15, 73, 16, 103, 129, 129, 5, - /* 520 */ 5, 99, 98, 5, 5, 5, 5, 5, 5, 5, - /* 530 */ 5, 5, 5, 5, 5, 5, 5, 103, 77, 59, - /* 540 */ 58, 0, 271, 271, 271, 271, 271, 271, 271, 271, - /* 550 */ 271, 271, 271, 21, 21, 271, 271, 271, 271, 271, - /* 560 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + /* 0 */ 226, 1, 260, 229, 230, 207, 208, 1, 234, 9, + /* 10 */ 236, 237, 238, 13, 14, 9, 16, 17, 209, 210, + /* 20 */ 20, 21, 260, 1, 24, 25, 26, 27, 28, 260, + /* 30 */ 260, 9, 270, 33, 34, 260, 260, 37, 38, 39, + /* 40 */ 13, 14, 244, 16, 17, 269, 270, 20, 21, 260, + /* 50 */ 247, 24, 25, 26, 27, 28, 258, 5, 269, 270, + /* 60 */ 33, 34, 259, 210, 37, 38, 39, 45, 46, 47, + /* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + /* 80 */ 13, 14, 60, 16, 17, 33, 34, 20, 21, 244, + /* 90 */ 66, 24, 25, 26, 27, 28, 243, 227, 245, 210, + /* 100 */ 33, 34, 102, 258, 37, 38, 39, 210, 14, 98, + /* 110 */ 16, 17, 101, 102, 20, 21, 246, 210, 24, 25, + /* 120 */ 26, 27, 28, 37, 38, 39, 99, 33, 34, 73, + /* 130 */ 246, 37, 38, 39, 78, 16, 17, 210, 78, 20, + /* 140 */ 21, 126, 245, 24, 25, 26, 27, 28, 133, 134, + /* 150 */ 261, 127, 33, 34, 130, 131, 37, 38, 39, 85, + /* 160 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + /* 170 */ 96, 97, 226, 266, 228, 229, 230, 231, 232, 233, + /* 180 */ 234, 235, 236, 237, 238, 239, 1, 2, 210, 44, + /* 190 */ 5, 98, 7, 266, 9, 268, 1, 2, 105, 210, + /* 200 */ 5, 210, 7, 260, 9, 60, 1, 2, 227, 99, + /* 210 */ 5, 66, 7, 103, 9, 70, 71, 72, 33, 34, + /* 220 */ 33, 34, 37, 98, 37, 38, 39, 246, 33, 34, + /* 230 */ 105, 210, 37, 25, 26, 27, 28, 99, 33, 34, + /* 240 */ 262, 33, 34, 98, 106, 37, 38, 39, 260, 85, + /* 250 */ 105, 87, 88, 264, 210, 266, 92, 266, 94, 95, + /* 260 */ 96, 63, 64, 65, 243, 210, 245, 61, 62, 227, + /* 270 */ 125, 103, 210, 67, 68, 69, 108, 132, 61, 62, + /* 280 */ 5, 75, 7, 98, 67, 68, 69, 243, 246, 245, + /* 290 */ 61, 62, 1, 98, 109, 240, 67, 68, 69, 214, + /* 300 */ 59, 15, 217, 98, 109, 243, 5, 245, 7, 124, + /* 310 */ 214, 260, 214, 217, 109, 217, 5, 2, 7, 124, + /* 320 */ 5, 99, 7, 103, 9, 103, 115, 116, 37, 124, + /* 330 */ 99, 99, 99, 103, 103, 103, 103, 99, 5, 98, + /* 340 */ 7, 103, 122, 99, 128, 129, 267, 103, 33, 34, + /* 350 */ 120, 99, 128, 129, 241, 103, 73, 74, 61, 62, + /* 360 */ 260, 260, 260, 260, 260, 260, 260, 260, 260, 260, + /* 370 */ 246, 260, 241, 241, 241, 241, 241, 210, 242, 210, + /* 380 */ 241, 244, 210, 210, 267, 210, 210, 210, 248, 210, + /* 390 */ 104, 210, 210, 210, 210, 105, 210, 244, 210, 210, + /* 400 */ 210, 210, 210, 210, 210, 59, 210, 210, 109, 210, + /* 410 */ 210, 210, 210, 210, 210, 263, 257, 210, 263, 104, + /* 420 */ 210, 263, 210, 210, 210, 210, 119, 121, 210, 210, + /* 430 */ 256, 210, 118, 210, 113, 210, 210, 210, 210, 117, + /* 440 */ 112, 111, 110, 123, 210, 76, 211, 211, 211, 84, + /* 450 */ 83, 49, 80, 82, 53, 81, 79, 76, 211, 5, + /* 460 */ 211, 135, 5, 5, 255, 215, 215, 211, 5, 135, + /* 470 */ 211, 5, 212, 86, 211, 126, 219, 223, 225, 224, + /* 480 */ 222, 220, 218, 221, 212, 211, 216, 99, 106, 244, + /* 490 */ 213, 107, 252, 254, 251, 253, 250, 249, 103, 99, + /* 500 */ 1, 98, 98, 114, 99, 98, 114, 73, 99, 103, + /* 510 */ 98, 103, 98, 100, 104, 98, 100, 9, 5, 5, + /* 520 */ 5, 5, 5, 77, 15, 73, 16, 129, 129, 103, + /* 530 */ 5, 5, 99, 98, 5, 5, 5, 5, 5, 5, + /* 540 */ 5, 5, 5, 5, 5, 5, 5, 5, 103, 77, + /* 550 */ 59, 58, 0, 271, 271, 271, 271, 271, 271, 271, + /* 560 */ 271, 271, 271, 271, 21, 21, 271, 271, 271, 271, /* 570 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, /* 580 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, /* 590 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, @@ -338,83 +340,86 @@ static const YYCODETYPE yy_lookahead[] = { /* 730 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, /* 740 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, /* 750 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, - /* 760 */ 271, + /* 760 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + /* 770 */ 271, 271, }; -#define YY_SHIFT_COUNT (247) +#define YY_SHIFT_COUNT (251) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (541) +#define YY_SHIFT_MAX (552) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 160, 65, 179, 200, 220, 21, 21, 21, 21, 21, - /* 10 */ 21, 0, 2, 220, 330, 330, 330, 10, 21, 21, - /* 20 */ 21, 21, 21, 130, 12, 12, 555, 210, 220, 220, - /* 30 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - /* 40 */ 220, 220, 220, 220, 220, 330, 330, 76, 76, 76, - /* 50 */ 76, 76, 76, 22, 76, 165, 21, 21, 21, 21, - /* 60 */ 108, 108, 176, 21, 21, 21, 21, 21, 21, 21, - /* 70 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 80 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 90 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 100 */ 21, 21, 270, 327, 327, 280, 280, 327, 301, 304, - /* 110 */ 311, 317, 314, 320, 322, 325, 313, 270, 327, 327, - /* 120 */ 361, 361, 327, 354, 356, 391, 362, 359, 390, 363, - /* 130 */ 366, 327, 370, 327, 370, 327, 555, 555, 50, 79, - /* 140 */ 79, 79, 105, 161, 223, 223, 223, 221, 202, 202, - /* 150 */ 202, 202, 232, 244, 150, 14, 97, 97, 127, 204, - /* 160 */ 156, 169, 218, 224, 271, 309, 296, 227, 228, 233, - /* 170 */ 242, 243, 248, 226, 230, 333, 355, 275, 295, 442, - /* 180 */ 316, 443, 447, 318, 449, 453, 373, 334, 358, 367, - /* 190 */ 382, 387, 392, 364, 460, 394, 395, 397, 393, 379, - /* 200 */ 396, 383, 399, 402, 403, 404, 405, 406, 429, 496, - /* 210 */ 502, 503, 504, 505, 506, 435, 498, 441, 499, 388, - /* 220 */ 389, 413, 514, 515, 422, 424, 413, 518, 519, 520, - /* 230 */ 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, - /* 240 */ 531, 434, 461, 532, 533, 480, 482, 541, + /* 0 */ 145, 74, 164, 185, 205, 6, 6, 6, 6, 6, + /* 10 */ 6, 0, 22, 205, 315, 315, 315, 93, 6, 6, + /* 20 */ 6, 6, 6, 56, 60, 60, 566, 195, 205, 205, + /* 30 */ 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + /* 40 */ 205, 205, 205, 205, 205, 315, 315, 52, 52, 52, + /* 50 */ 52, 52, 52, 11, 52, 125, 6, 6, 6, 6, + /* 60 */ 211, 211, 168, 6, 6, 6, 6, 6, 6, 6, + /* 70 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + /* 80 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + /* 90 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + /* 100 */ 6, 6, 290, 346, 346, 299, 299, 299, 346, 307, + /* 110 */ 306, 314, 321, 322, 328, 330, 332, 320, 290, 346, + /* 120 */ 346, 369, 369, 346, 365, 367, 402, 372, 371, 401, + /* 130 */ 374, 377, 346, 381, 346, 381, 346, 566, 566, 27, + /* 140 */ 67, 67, 67, 94, 119, 208, 208, 208, 206, 187, + /* 150 */ 187, 187, 187, 217, 229, 24, 15, 86, 86, 198, + /* 160 */ 138, 110, 222, 231, 232, 233, 275, 311, 291, 241, + /* 170 */ 286, 220, 230, 238, 244, 252, 216, 224, 301, 333, + /* 180 */ 283, 297, 454, 326, 457, 458, 334, 463, 466, 387, + /* 190 */ 349, 382, 388, 384, 395, 400, 403, 499, 404, 405, + /* 200 */ 407, 406, 389, 408, 392, 409, 412, 410, 414, 413, + /* 210 */ 417, 416, 434, 508, 513, 514, 515, 516, 517, 446, + /* 220 */ 509, 452, 510, 398, 399, 426, 525, 526, 433, 435, + /* 230 */ 426, 529, 530, 531, 532, 533, 534, 535, 536, 537, + /* 240 */ 538, 539, 540, 541, 542, 445, 472, 543, 544, 491, + /* 250 */ 493, 552, }; -#define YY_REDUCE_COUNT (137) -#define YY_REDUCE_MIN (-260) -#define YY_REDUCE_MAX (274) +#define YY_REDUCE_COUNT (138) +#define YY_REDUCE_MIN (-258) +#define YY_REDUCE_MAX (277) static const short yy_reduce_ofst[] = { - /* 0 */ -147, -63, -194, -250, -190, -141, -165, -64, 59, 77, - /* 10 */ 85, -179, -205, -258, -181, -155, -82, -229, -125, -69, - /* 20 */ -14, -142, -204, -34, -4, 28, -41, -260, -253, -252, - /* 30 */ -242, -237, -187, -174, -166, -146, -132, -76, -67, -46, - /* 40 */ -32, -22, 31, 47, 55, 80, 106, 5, 102, 120, - /* 50 */ 124, 125, 126, 128, 131, 129, 158, 159, 164, 166, - /* 60 */ 104, 110, 132, 168, 171, 172, 173, 174, 175, 177, - /* 70 */ 178, 180, 181, 182, 183, 184, 185, 186, 187, 188, - /* 80 */ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, - /* 90 */ 199, 201, 203, 205, 206, 207, 208, 209, 211, 212, - /* 100 */ 213, 214, 135, 215, 216, 147, 149, 217, 157, 219, - /* 110 */ 222, 225, 229, 231, 234, 236, 235, 237, 238, 239, - /* 120 */ 240, 241, 246, 245, 247, 249, 250, 251, 254, 255, - /* 130 */ 260, 252, 253, 256, 268, 257, 272, 274, + /* 0 */ -202, -54, -226, -224, -211, -73, -11, -147, 21, 44, + /* 10 */ 62, -111, -191, -238, -130, -19, 42, -155, -22, -93, + /* 20 */ -9, 55, -103, 85, 96, 98, -197, -258, -231, -230, + /* 30 */ -225, -57, -12, 51, 100, 101, 102, 103, 104, 105, + /* 40 */ 106, 107, 108, 109, 111, -116, 124, 113, 131, 132, + /* 50 */ 133, 134, 135, 136, 139, 137, 167, 169, 172, 173, + /* 60 */ 79, 117, 140, 175, 176, 177, 179, 181, 182, 183, + /* 70 */ 184, 186, 188, 189, 190, 191, 192, 193, 194, 196, + /* 80 */ 197, 199, 200, 201, 202, 203, 204, 207, 210, 212, + /* 90 */ 213, 214, 215, 218, 219, 221, 223, 225, 226, 227, + /* 100 */ 228, 234, 153, 235, 236, 152, 155, 158, 237, 159, + /* 110 */ 174, 209, 239, 242, 240, 243, 246, 248, 245, 247, + /* 120 */ 249, 250, 251, 256, 253, 255, 254, 257, 258, 261, + /* 130 */ 262, 264, 259, 260, 263, 272, 274, 270, 277, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 636, 690, 679, 855, 855, 636, 636, 636, 636, 636, - /* 10 */ 636, 783, 654, 855, 636, 636, 636, 636, 636, 636, - /* 20 */ 636, 636, 636, 692, 692, 692, 778, 636, 636, 636, - /* 30 */ 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - /* 40 */ 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - /* 50 */ 636, 636, 636, 636, 636, 636, 636, 785, 787, 636, - /* 60 */ 804, 804, 776, 636, 636, 636, 636, 636, 636, 636, - /* 70 */ 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - /* 80 */ 636, 677, 636, 675, 636, 636, 636, 636, 636, 636, - /* 90 */ 636, 636, 636, 636, 636, 636, 664, 636, 636, 636, - /* 100 */ 636, 636, 636, 656, 656, 636, 636, 656, 811, 815, - /* 110 */ 809, 797, 805, 796, 792, 791, 819, 636, 656, 656, - /* 120 */ 687, 687, 656, 708, 706, 704, 696, 702, 698, 700, - /* 130 */ 694, 656, 685, 656, 685, 656, 724, 738, 636, 820, - /* 140 */ 854, 810, 838, 837, 850, 844, 843, 636, 842, 841, - /* 150 */ 840, 839, 636, 636, 636, 636, 846, 845, 636, 636, - /* 160 */ 636, 636, 636, 636, 636, 636, 636, 822, 816, 812, - /* 170 */ 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - /* 180 */ 636, 636, 636, 636, 636, 636, 636, 636, 775, 636, - /* 190 */ 636, 784, 636, 636, 636, 636, 636, 636, 806, 636, - /* 200 */ 798, 636, 636, 636, 636, 636, 636, 752, 636, 636, - /* 210 */ 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - /* 220 */ 636, 859, 636, 636, 636, 746, 857, 636, 636, 636, - /* 230 */ 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - /* 240 */ 636, 711, 636, 662, 660, 636, 652, 636, + /* 0 */ 646, 700, 689, 868, 868, 646, 646, 646, 646, 646, + /* 10 */ 646, 793, 664, 868, 646, 646, 646, 646, 646, 646, + /* 20 */ 646, 646, 646, 702, 702, 702, 788, 646, 646, 646, + /* 30 */ 646, 646, 646, 646, 646, 646, 646, 646, 646, 646, + /* 40 */ 646, 646, 646, 646, 646, 646, 646, 646, 646, 646, + /* 50 */ 646, 646, 646, 646, 646, 646, 646, 795, 797, 646, + /* 60 */ 815, 815, 786, 646, 646, 646, 646, 646, 646, 646, + /* 70 */ 646, 646, 646, 646, 646, 646, 646, 646, 646, 646, + /* 80 */ 646, 687, 646, 685, 646, 646, 646, 646, 646, 646, + /* 90 */ 646, 646, 646, 646, 646, 646, 674, 646, 646, 646, + /* 100 */ 646, 646, 646, 666, 666, 646, 646, 646, 666, 822, + /* 110 */ 826, 820, 808, 816, 807, 803, 802, 830, 646, 666, + /* 120 */ 666, 697, 697, 666, 718, 716, 714, 706, 712, 708, + /* 130 */ 710, 704, 666, 695, 666, 695, 666, 734, 748, 646, + /* 140 */ 831, 867, 821, 857, 856, 863, 855, 854, 646, 850, + /* 150 */ 851, 853, 852, 646, 646, 646, 646, 859, 858, 646, + /* 160 */ 646, 646, 646, 646, 646, 646, 646, 646, 646, 833, + /* 170 */ 646, 827, 823, 646, 646, 646, 646, 646, 646, 646, + /* 180 */ 646, 646, 646, 646, 646, 646, 646, 646, 646, 646, + /* 190 */ 646, 785, 646, 646, 794, 646, 646, 646, 646, 646, + /* 200 */ 646, 817, 646, 809, 646, 646, 646, 646, 646, 646, + /* 210 */ 646, 762, 646, 646, 646, 646, 646, 646, 646, 646, + /* 220 */ 646, 646, 646, 646, 646, 872, 646, 646, 646, 756, + /* 230 */ 870, 646, 646, 646, 646, 646, 646, 646, 646, 646, + /* 240 */ 646, 646, 646, 646, 646, 721, 646, 672, 670, 646, + /* 250 */ 662, 646, }; /********** End of lemon-generated parsing tables *****************************/ @@ -1156,81 +1161,84 @@ static const char *const yyRuleName[] = { /* 149 */ "tablelist ::= tablelist COMMA ids cpxName ids", /* 150 */ "tmvar ::= VARIABLE", /* 151 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 152 */ "interval_opt ::=", - /* 153 */ "fill_opt ::=", - /* 154 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 155 */ "fill_opt ::= FILL LP ID RP", - /* 156 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 157 */ "sliding_opt ::=", - /* 158 */ "orderby_opt ::=", - /* 159 */ "orderby_opt ::= ORDER BY sortlist", - /* 160 */ "sortlist ::= sortlist COMMA item sortorder", - /* 161 */ "sortlist ::= item sortorder", - /* 162 */ "item ::= ids cpxName", - /* 163 */ "sortorder ::= ASC", - /* 164 */ "sortorder ::= DESC", - /* 165 */ "sortorder ::=", - /* 166 */ "groupby_opt ::=", - /* 167 */ "groupby_opt ::= GROUP BY grouplist", - /* 168 */ "grouplist ::= grouplist COMMA item", - /* 169 */ "grouplist ::= item", - /* 170 */ "having_opt ::=", - /* 171 */ "having_opt ::= HAVING expr", - /* 172 */ "limit_opt ::=", - /* 173 */ "limit_opt ::= LIMIT signed", - /* 174 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 175 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 176 */ "slimit_opt ::=", - /* 177 */ "slimit_opt ::= SLIMIT signed", - /* 178 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 179 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 180 */ "where_opt ::=", - /* 181 */ "where_opt ::= WHERE expr", - /* 182 */ "expr ::= LP expr RP", - /* 183 */ "expr ::= ID", - /* 184 */ "expr ::= ID DOT ID", - /* 185 */ "expr ::= ID DOT STAR", - /* 186 */ "expr ::= INTEGER", - /* 187 */ "expr ::= MINUS INTEGER", - /* 188 */ "expr ::= PLUS INTEGER", - /* 189 */ "expr ::= FLOAT", - /* 190 */ "expr ::= MINUS FLOAT", - /* 191 */ "expr ::= PLUS FLOAT", - /* 192 */ "expr ::= STRING", - /* 193 */ "expr ::= NOW", - /* 194 */ "expr ::= VARIABLE", - /* 195 */ "expr ::= BOOL", - /* 196 */ "expr ::= ID LP exprlist RP", - /* 197 */ "expr ::= ID LP STAR RP", - /* 198 */ "expr ::= expr AND expr", - /* 199 */ "expr ::= expr OR expr", - /* 200 */ "expr ::= expr LT expr", - /* 201 */ "expr ::= expr GT expr", - /* 202 */ "expr ::= expr LE expr", - /* 203 */ "expr ::= expr GE expr", - /* 204 */ "expr ::= expr NE expr", - /* 205 */ "expr ::= expr EQ expr", - /* 206 */ "expr ::= expr PLUS expr", - /* 207 */ "expr ::= expr MINUS expr", - /* 208 */ "expr ::= expr STAR expr", - /* 209 */ "expr ::= expr SLASH expr", - /* 210 */ "expr ::= expr REM expr", - /* 211 */ "expr ::= expr LIKE expr", - /* 212 */ "expr ::= expr IN LP exprlist RP", - /* 213 */ "exprlist ::= exprlist COMMA expritem", - /* 214 */ "exprlist ::= expritem", - /* 215 */ "expritem ::= expr", - /* 216 */ "expritem ::=", - /* 217 */ "cmd ::= RESET QUERY CACHE", - /* 218 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 219 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 220 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 221 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 222 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 223 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 224 */ "cmd ::= KILL CONNECTION INTEGER", - /* 225 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 226 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 152 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 153 */ "interval_opt ::=", + /* 154 */ "fill_opt ::=", + /* 155 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 156 */ "fill_opt ::= FILL LP ID RP", + /* 157 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 158 */ "sliding_opt ::=", + /* 159 */ "orderby_opt ::=", + /* 160 */ "orderby_opt ::= ORDER BY sortlist", + /* 161 */ "sortlist ::= sortlist COMMA item sortorder", + /* 162 */ "sortlist ::= item sortorder", + /* 163 */ "item ::= ids cpxName", + /* 164 */ "sortorder ::= ASC", + /* 165 */ "sortorder ::= DESC", + /* 166 */ "sortorder ::=", + /* 167 */ "groupby_opt ::=", + /* 168 */ "groupby_opt ::= GROUP BY grouplist", + /* 169 */ "grouplist ::= grouplist COMMA item", + /* 170 */ "grouplist ::= item", + /* 171 */ "having_opt ::=", + /* 172 */ "having_opt ::= HAVING expr", + /* 173 */ "limit_opt ::=", + /* 174 */ "limit_opt ::= LIMIT signed", + /* 175 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 176 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 177 */ "slimit_opt ::=", + /* 178 */ "slimit_opt ::= SLIMIT signed", + /* 179 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 180 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 181 */ "where_opt ::=", + /* 182 */ "where_opt ::= WHERE expr", + /* 183 */ "expr ::= LP expr RP", + /* 184 */ "expr ::= ID", + /* 185 */ "expr ::= ID DOT ID", + /* 186 */ "expr ::= ID DOT STAR", + /* 187 */ "expr ::= INTEGER", + /* 188 */ "expr ::= MINUS INTEGER", + /* 189 */ "expr ::= PLUS INTEGER", + /* 190 */ "expr ::= FLOAT", + /* 191 */ "expr ::= MINUS FLOAT", + /* 192 */ "expr ::= PLUS FLOAT", + /* 193 */ "expr ::= STRING", + /* 194 */ "expr ::= NOW", + /* 195 */ "expr ::= VARIABLE", + /* 196 */ "expr ::= BOOL", + /* 197 */ "expr ::= ID LP exprlist RP", + /* 198 */ "expr ::= ID LP STAR RP", + /* 199 */ "expr ::= expr IS NULL", + /* 200 */ "expr ::= expr IS NOT NULL", + /* 201 */ "expr ::= expr LT expr", + /* 202 */ "expr ::= expr GT expr", + /* 203 */ "expr ::= expr LE expr", + /* 204 */ "expr ::= expr GE expr", + /* 205 */ "expr ::= expr NE expr", + /* 206 */ "expr ::= expr EQ expr", + /* 207 */ "expr ::= expr AND expr", + /* 208 */ "expr ::= expr OR expr", + /* 209 */ "expr ::= expr PLUS expr", + /* 210 */ "expr ::= expr MINUS expr", + /* 211 */ "expr ::= expr STAR expr", + /* 212 */ "expr ::= expr SLASH expr", + /* 213 */ "expr ::= expr REM expr", + /* 214 */ "expr ::= expr LIKE expr", + /* 215 */ "expr ::= expr IN LP exprlist RP", + /* 216 */ "exprlist ::= exprlist COMMA expritem", + /* 217 */ "exprlist ::= expritem", + /* 218 */ "expritem ::= expr", + /* 219 */ "expritem ::=", + /* 220 */ "cmd ::= RESET QUERY CACHE", + /* 221 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 222 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 223 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 224 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 225 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 226 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 227 */ "cmd ::= KILL CONNECTION INTEGER", + /* 228 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 229 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -1840,81 +1848,84 @@ static const struct { { 262, -5 }, /* (149) tablelist ::= tablelist COMMA ids cpxName ids */ { 263, -1 }, /* (150) tmvar ::= VARIABLE */ { 250, -4 }, /* (151) interval_opt ::= INTERVAL LP tmvar RP */ - { 250, 0 }, /* (152) interval_opt ::= */ - { 251, 0 }, /* (153) fill_opt ::= */ - { 251, -6 }, /* (154) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 251, -4 }, /* (155) fill_opt ::= FILL LP ID RP */ - { 252, -4 }, /* (156) sliding_opt ::= SLIDING LP tmvar RP */ - { 252, 0 }, /* (157) sliding_opt ::= */ - { 254, 0 }, /* (158) orderby_opt ::= */ - { 254, -3 }, /* (159) orderby_opt ::= ORDER BY sortlist */ - { 264, -4 }, /* (160) sortlist ::= sortlist COMMA item sortorder */ - { 264, -2 }, /* (161) sortlist ::= item sortorder */ - { 266, -2 }, /* (162) item ::= ids cpxName */ - { 267, -1 }, /* (163) sortorder ::= ASC */ - { 267, -1 }, /* (164) sortorder ::= DESC */ - { 267, 0 }, /* (165) sortorder ::= */ - { 253, 0 }, /* (166) groupby_opt ::= */ - { 253, -3 }, /* (167) groupby_opt ::= GROUP BY grouplist */ - { 268, -3 }, /* (168) grouplist ::= grouplist COMMA item */ - { 268, -1 }, /* (169) grouplist ::= item */ - { 255, 0 }, /* (170) having_opt ::= */ - { 255, -2 }, /* (171) having_opt ::= HAVING expr */ - { 257, 0 }, /* (172) limit_opt ::= */ - { 257, -2 }, /* (173) limit_opt ::= LIMIT signed */ - { 257, -4 }, /* (174) limit_opt ::= LIMIT signed OFFSET signed */ - { 257, -4 }, /* (175) limit_opt ::= LIMIT signed COMMA signed */ - { 256, 0 }, /* (176) slimit_opt ::= */ - { 256, -2 }, /* (177) slimit_opt ::= SLIMIT signed */ - { 256, -4 }, /* (178) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 256, -4 }, /* (179) slimit_opt ::= SLIMIT signed COMMA signed */ - { 249, 0 }, /* (180) where_opt ::= */ - { 249, -2 }, /* (181) where_opt ::= WHERE expr */ - { 260, -3 }, /* (182) expr ::= LP expr RP */ - { 260, -1 }, /* (183) expr ::= ID */ - { 260, -3 }, /* (184) expr ::= ID DOT ID */ - { 260, -3 }, /* (185) expr ::= ID DOT STAR */ - { 260, -1 }, /* (186) expr ::= INTEGER */ - { 260, -2 }, /* (187) expr ::= MINUS INTEGER */ - { 260, -2 }, /* (188) expr ::= PLUS INTEGER */ - { 260, -1 }, /* (189) expr ::= FLOAT */ - { 260, -2 }, /* (190) expr ::= MINUS FLOAT */ - { 260, -2 }, /* (191) expr ::= PLUS FLOAT */ - { 260, -1 }, /* (192) expr ::= STRING */ - { 260, -1 }, /* (193) expr ::= NOW */ - { 260, -1 }, /* (194) expr ::= VARIABLE */ - { 260, -1 }, /* (195) expr ::= BOOL */ - { 260, -4 }, /* (196) expr ::= ID LP exprlist RP */ - { 260, -4 }, /* (197) expr ::= ID LP STAR RP */ - { 260, -3 }, /* (198) expr ::= expr AND expr */ - { 260, -3 }, /* (199) expr ::= expr OR expr */ - { 260, -3 }, /* (200) expr ::= expr LT expr */ - { 260, -3 }, /* (201) expr ::= expr GT expr */ - { 260, -3 }, /* (202) expr ::= expr LE expr */ - { 260, -3 }, /* (203) expr ::= expr GE expr */ - { 260, -3 }, /* (204) expr ::= expr NE expr */ - { 260, -3 }, /* (205) expr ::= expr EQ expr */ - { 260, -3 }, /* (206) expr ::= expr PLUS expr */ - { 260, -3 }, /* (207) expr ::= expr MINUS expr */ - { 260, -3 }, /* (208) expr ::= expr STAR expr */ - { 260, -3 }, /* (209) expr ::= expr SLASH expr */ - { 260, -3 }, /* (210) expr ::= expr REM expr */ - { 260, -3 }, /* (211) expr ::= expr LIKE expr */ - { 260, -5 }, /* (212) expr ::= expr IN LP exprlist RP */ - { 269, -3 }, /* (213) exprlist ::= exprlist COMMA expritem */ - { 269, -1 }, /* (214) exprlist ::= expritem */ - { 270, -1 }, /* (215) expritem ::= expr */ - { 270, 0 }, /* (216) expritem ::= */ - { 208, -3 }, /* (217) cmd ::= RESET QUERY CACHE */ - { 208, -7 }, /* (218) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 208, -7 }, /* (219) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 208, -7 }, /* (220) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 208, -7 }, /* (221) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 208, -8 }, /* (222) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 208, -9 }, /* (223) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 208, -3 }, /* (224) cmd ::= KILL CONNECTION INTEGER */ - { 208, -5 }, /* (225) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 208, -5 }, /* (226) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 250, -6 }, /* (152) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 250, 0 }, /* (153) interval_opt ::= */ + { 251, 0 }, /* (154) fill_opt ::= */ + { 251, -6 }, /* (155) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 251, -4 }, /* (156) fill_opt ::= FILL LP ID RP */ + { 252, -4 }, /* (157) sliding_opt ::= SLIDING LP tmvar RP */ + { 252, 0 }, /* (158) sliding_opt ::= */ + { 254, 0 }, /* (159) orderby_opt ::= */ + { 254, -3 }, /* (160) orderby_opt ::= ORDER BY sortlist */ + { 264, -4 }, /* (161) sortlist ::= sortlist COMMA item sortorder */ + { 264, -2 }, /* (162) sortlist ::= item sortorder */ + { 266, -2 }, /* (163) item ::= ids cpxName */ + { 267, -1 }, /* (164) sortorder ::= ASC */ + { 267, -1 }, /* (165) sortorder ::= DESC */ + { 267, 0 }, /* (166) sortorder ::= */ + { 253, 0 }, /* (167) groupby_opt ::= */ + { 253, -3 }, /* (168) groupby_opt ::= GROUP BY grouplist */ + { 268, -3 }, /* (169) grouplist ::= grouplist COMMA item */ + { 268, -1 }, /* (170) grouplist ::= item */ + { 255, 0 }, /* (171) having_opt ::= */ + { 255, -2 }, /* (172) having_opt ::= HAVING expr */ + { 257, 0 }, /* (173) limit_opt ::= */ + { 257, -2 }, /* (174) limit_opt ::= LIMIT signed */ + { 257, -4 }, /* (175) limit_opt ::= LIMIT signed OFFSET signed */ + { 257, -4 }, /* (176) limit_opt ::= LIMIT signed COMMA signed */ + { 256, 0 }, /* (177) slimit_opt ::= */ + { 256, -2 }, /* (178) slimit_opt ::= SLIMIT signed */ + { 256, -4 }, /* (179) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 256, -4 }, /* (180) slimit_opt ::= SLIMIT signed COMMA signed */ + { 249, 0 }, /* (181) where_opt ::= */ + { 249, -2 }, /* (182) where_opt ::= WHERE expr */ + { 260, -3 }, /* (183) expr ::= LP expr RP */ + { 260, -1 }, /* (184) expr ::= ID */ + { 260, -3 }, /* (185) expr ::= ID DOT ID */ + { 260, -3 }, /* (186) expr ::= ID DOT STAR */ + { 260, -1 }, /* (187) expr ::= INTEGER */ + { 260, -2 }, /* (188) expr ::= MINUS INTEGER */ + { 260, -2 }, /* (189) expr ::= PLUS INTEGER */ + { 260, -1 }, /* (190) expr ::= FLOAT */ + { 260, -2 }, /* (191) expr ::= MINUS FLOAT */ + { 260, -2 }, /* (192) expr ::= PLUS FLOAT */ + { 260, -1 }, /* (193) expr ::= STRING */ + { 260, -1 }, /* (194) expr ::= NOW */ + { 260, -1 }, /* (195) expr ::= VARIABLE */ + { 260, -1 }, /* (196) expr ::= BOOL */ + { 260, -4 }, /* (197) expr ::= ID LP exprlist RP */ + { 260, -4 }, /* (198) expr ::= ID LP STAR RP */ + { 260, -3 }, /* (199) expr ::= expr IS NULL */ + { 260, -4 }, /* (200) expr ::= expr IS NOT NULL */ + { 260, -3 }, /* (201) expr ::= expr LT expr */ + { 260, -3 }, /* (202) expr ::= expr GT expr */ + { 260, -3 }, /* (203) expr ::= expr LE expr */ + { 260, -3 }, /* (204) expr ::= expr GE expr */ + { 260, -3 }, /* (205) expr ::= expr NE expr */ + { 260, -3 }, /* (206) expr ::= expr EQ expr */ + { 260, -3 }, /* (207) expr ::= expr AND expr */ + { 260, -3 }, /* (208) expr ::= expr OR expr */ + { 260, -3 }, /* (209) expr ::= expr PLUS expr */ + { 260, -3 }, /* (210) expr ::= expr MINUS expr */ + { 260, -3 }, /* (211) expr ::= expr STAR expr */ + { 260, -3 }, /* (212) expr ::= expr SLASH expr */ + { 260, -3 }, /* (213) expr ::= expr REM expr */ + { 260, -3 }, /* (214) expr ::= expr LIKE expr */ + { 260, -5 }, /* (215) expr ::= expr IN LP exprlist RP */ + { 269, -3 }, /* (216) exprlist ::= exprlist COMMA expritem */ + { 269, -1 }, /* (217) exprlist ::= expritem */ + { 270, -1 }, /* (218) expritem ::= expr */ + { 270, 0 }, /* (219) expritem ::= */ + { 208, -3 }, /* (220) cmd ::= RESET QUERY CACHE */ + { 208, -7 }, /* (221) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 208, -7 }, /* (222) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 208, -7 }, /* (223) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 208, -7 }, /* (224) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 208, -8 }, /* (225) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 208, -9 }, /* (226) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 208, -3 }, /* (227) cmd ::= KILL CONNECTION INTEGER */ + { 208, -5 }, /* (228) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 208, -5 }, /* (229) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2405,7 +2416,7 @@ static void yy_reduce( break; case 131: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy150 = tSetQuerySQLElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy224, yymsp[-9].minor.yy494, yymsp[-8].minor.yy66, yymsp[-4].minor.yy494, yymsp[-3].minor.yy494, &yymsp[-7].minor.yy0, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy494, &yymsp[0].minor.yy188, &yymsp[-1].minor.yy188); + yylhsminor.yy150 = tSetQuerySQLElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy224, yymsp[-9].minor.yy494, yymsp[-8].minor.yy66, yymsp[-4].minor.yy494, yymsp[-3].minor.yy494, &yymsp[-7].minor.yy314, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy494, &yymsp[0].minor.yy188, &yymsp[-1].minor.yy188); } yymsp[-11].minor.yy150 = yylhsminor.yy150; break; @@ -2509,17 +2520,18 @@ static void yy_reduce( yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 151: /* interval_opt ::= INTERVAL LP tmvar RP */ - case 156: /* sliding_opt ::= SLIDING LP tmvar RP */ yytestcase(yyruleno==156); -{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } +{yymsp[-3].minor.yy314.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy314.offset.n = 0; yymsp[-3].minor.yy314.offset.z = NULL; yymsp[-3].minor.yy314.offset.type = 0;} break; - case 152: /* interval_opt ::= */ - case 157: /* sliding_opt ::= */ yytestcase(yyruleno==157); -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } + case 152: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ +{yymsp[-5].minor.yy314.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy314.offset = yymsp[-1].minor.yy0;} + break; + case 153: /* interval_opt ::= */ +{memset(&yymsp[1].minor.yy314, 0, sizeof(yymsp[1].minor.yy314));} break; - case 153: /* fill_opt ::= */ + case 154: /* fill_opt ::= */ {yymsp[1].minor.yy494 = 0; } break; - case 154: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 155: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); @@ -2529,33 +2541,39 @@ static void yy_reduce( yymsp[-5].minor.yy494 = yymsp[-1].minor.yy494; } break; - case 155: /* fill_opt ::= FILL LP ID RP */ + case 156: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-3].minor.yy494 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 158: /* orderby_opt ::= */ - case 166: /* groupby_opt ::= */ yytestcase(yyruleno==166); + case 157: /* sliding_opt ::= SLIDING LP tmvar RP */ +{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } + break; + case 158: /* sliding_opt ::= */ +{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } + break; + case 159: /* orderby_opt ::= */ + case 167: /* groupby_opt ::= */ yytestcase(yyruleno==167); {yymsp[1].minor.yy494 = 0;} break; - case 159: /* orderby_opt ::= ORDER BY sortlist */ - case 167: /* groupby_opt ::= GROUP BY grouplist */ yytestcase(yyruleno==167); + case 160: /* orderby_opt ::= ORDER BY sortlist */ + case 168: /* groupby_opt ::= GROUP BY grouplist */ yytestcase(yyruleno==168); {yymsp[-2].minor.yy494 = yymsp[0].minor.yy494;} break; - case 160: /* sortlist ::= sortlist COMMA item sortorder */ + case 161: /* sortlist ::= sortlist COMMA item sortorder */ { yylhsminor.yy494 = tVariantListAppend(yymsp[-3].minor.yy494, &yymsp[-1].minor.yy312, yymsp[0].minor.yy82); } yymsp[-3].minor.yy494 = yylhsminor.yy494; break; - case 161: /* sortlist ::= item sortorder */ + case 162: /* sortlist ::= item sortorder */ { yylhsminor.yy494 = tVariantListAppend(NULL, &yymsp[-1].minor.yy312, yymsp[0].minor.yy82); } yymsp[-1].minor.yy494 = yylhsminor.yy494; break; - case 162: /* item ::= ids cpxName */ + case 163: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; @@ -2564,196 +2582,200 @@ static void yy_reduce( } yymsp[-1].minor.yy312 = yylhsminor.yy312; break; - case 163: /* sortorder ::= ASC */ + case 164: /* sortorder ::= ASC */ {yymsp[0].minor.yy82 = TSDB_ORDER_ASC; } break; - case 164: /* sortorder ::= DESC */ + case 165: /* sortorder ::= DESC */ {yymsp[0].minor.yy82 = TSDB_ORDER_DESC;} break; - case 165: /* sortorder ::= */ + case 166: /* sortorder ::= */ {yymsp[1].minor.yy82 = TSDB_ORDER_ASC;} break; - case 168: /* grouplist ::= grouplist COMMA item */ + case 169: /* grouplist ::= grouplist COMMA item */ { yylhsminor.yy494 = tVariantListAppend(yymsp[-2].minor.yy494, &yymsp[0].minor.yy312, -1); } yymsp[-2].minor.yy494 = yylhsminor.yy494; break; - case 169: /* grouplist ::= item */ + case 170: /* grouplist ::= item */ { yylhsminor.yy494 = tVariantListAppend(NULL, &yymsp[0].minor.yy312, -1); } yymsp[0].minor.yy494 = yylhsminor.yy494; break; - case 170: /* having_opt ::= */ - case 180: /* where_opt ::= */ yytestcase(yyruleno==180); - case 216: /* expritem ::= */ yytestcase(yyruleno==216); + case 171: /* having_opt ::= */ + case 181: /* where_opt ::= */ yytestcase(yyruleno==181); + case 219: /* expritem ::= */ yytestcase(yyruleno==219); {yymsp[1].minor.yy66 = 0;} break; - case 171: /* having_opt ::= HAVING expr */ - case 181: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==181); + case 172: /* having_opt ::= HAVING expr */ + case 182: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==182); {yymsp[-1].minor.yy66 = yymsp[0].minor.yy66;} break; - case 172: /* limit_opt ::= */ - case 176: /* slimit_opt ::= */ yytestcase(yyruleno==176); + case 173: /* limit_opt ::= */ + case 177: /* slimit_opt ::= */ yytestcase(yyruleno==177); {yymsp[1].minor.yy188.limit = -1; yymsp[1].minor.yy188.offset = 0;} break; - case 173: /* limit_opt ::= LIMIT signed */ - case 177: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==177); + case 174: /* limit_opt ::= LIMIT signed */ + case 178: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==178); {yymsp[-1].minor.yy188.limit = yymsp[0].minor.yy271; yymsp[-1].minor.yy188.offset = 0;} break; - case 174: /* limit_opt ::= LIMIT signed OFFSET signed */ - case 178: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ yytestcase(yyruleno==178); + case 175: /* limit_opt ::= LIMIT signed OFFSET signed */ + case 179: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ yytestcase(yyruleno==179); {yymsp[-3].minor.yy188.limit = yymsp[-2].minor.yy271; yymsp[-3].minor.yy188.offset = yymsp[0].minor.yy271;} break; - case 175: /* limit_opt ::= LIMIT signed COMMA signed */ - case 179: /* slimit_opt ::= SLIMIT signed COMMA signed */ yytestcase(yyruleno==179); + case 176: /* limit_opt ::= LIMIT signed COMMA signed */ + case 180: /* slimit_opt ::= SLIMIT signed COMMA signed */ yytestcase(yyruleno==180); {yymsp[-3].minor.yy188.limit = yymsp[0].minor.yy271; yymsp[-3].minor.yy188.offset = yymsp[-2].minor.yy271;} break; - case 182: /* expr ::= LP expr RP */ + case 183: /* expr ::= LP expr RP */ {yymsp[-2].minor.yy66 = yymsp[-1].minor.yy66; } break; - case 183: /* expr ::= ID */ + case 184: /* expr ::= ID */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 184: /* expr ::= ID DOT ID */ + case 185: /* expr ::= ID DOT ID */ {yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 185: /* expr ::= ID DOT STAR */ + case 186: /* expr ::= ID DOT STAR */ {yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 186: /* expr ::= INTEGER */ + case 187: /* expr ::= INTEGER */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 187: /* expr ::= MINUS INTEGER */ - case 188: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==188); + case 188: /* expr ::= MINUS INTEGER */ + case 189: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==189); {yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} yymsp[-1].minor.yy66 = yylhsminor.yy66; break; - case 189: /* expr ::= FLOAT */ + case 190: /* expr ::= FLOAT */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 190: /* expr ::= MINUS FLOAT */ - case 191: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==191); + case 191: /* expr ::= MINUS FLOAT */ + case 192: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==192); {yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} yymsp[-1].minor.yy66 = yylhsminor.yy66; break; - case 192: /* expr ::= STRING */ + case 193: /* expr ::= STRING */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 193: /* expr ::= NOW */ + case 194: /* expr ::= NOW */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 194: /* expr ::= VARIABLE */ + case 195: /* expr ::= VARIABLE */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 195: /* expr ::= BOOL */ + case 196: /* expr ::= BOOL */ {yylhsminor.yy66 = tSQLExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 196: /* expr ::= ID LP exprlist RP */ -{ - yylhsminor.yy66 = tSQLExprCreateFunction(yymsp[-1].minor.yy224, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); -} + case 197: /* expr ::= ID LP exprlist RP */ +{ yylhsminor.yy66 = tSQLExprCreateFunction(yymsp[-1].minor.yy224, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } yymsp[-3].minor.yy66 = yylhsminor.yy66; break; - case 197: /* expr ::= ID LP STAR RP */ -{ - yylhsminor.yy66 = tSQLExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); -} + case 198: /* expr ::= ID LP STAR RP */ +{ yylhsminor.yy66 = tSQLExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } yymsp[-3].minor.yy66 = yylhsminor.yy66; break; - case 198: /* expr ::= expr AND expr */ -{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_AND);} + case 199: /* expr ::= expr IS NULL */ +{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, NULL, TK_ISNULL);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 199: /* expr ::= expr OR expr */ -{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_OR); } - yymsp[-2].minor.yy66 = yylhsminor.yy66; + case 200: /* expr ::= expr IS NOT NULL */ +{yylhsminor.yy66 = tSQLExprCreate(yymsp[-3].minor.yy66, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy66 = yylhsminor.yy66; break; - case 200: /* expr ::= expr LT expr */ + case 201: /* expr ::= expr LT expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_LT);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 201: /* expr ::= expr GT expr */ + case 202: /* expr ::= expr GT expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_GT);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 202: /* expr ::= expr LE expr */ + case 203: /* expr ::= expr LE expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_LE);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 203: /* expr ::= expr GE expr */ + case 204: /* expr ::= expr GE expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_GE);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 204: /* expr ::= expr NE expr */ + case 205: /* expr ::= expr NE expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_NE);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 205: /* expr ::= expr EQ expr */ + case 206: /* expr ::= expr EQ expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_EQ);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 206: /* expr ::= expr PLUS expr */ + case 207: /* expr ::= expr AND expr */ +{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_AND);} + yymsp[-2].minor.yy66 = yylhsminor.yy66; + break; + case 208: /* expr ::= expr OR expr */ +{yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_OR); } + yymsp[-2].minor.yy66 = yylhsminor.yy66; + break; + case 209: /* expr ::= expr PLUS expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_PLUS); } yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 207: /* expr ::= expr MINUS expr */ + case 210: /* expr ::= expr MINUS expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_MINUS); } yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 208: /* expr ::= expr STAR expr */ + case 211: /* expr ::= expr STAR expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_STAR); } yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 209: /* expr ::= expr SLASH expr */ + case 212: /* expr ::= expr SLASH expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_DIVIDE);} yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 210: /* expr ::= expr REM expr */ + case 213: /* expr ::= expr REM expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_REM); } yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 211: /* expr ::= expr LIKE expr */ + case 214: /* expr ::= expr LIKE expr */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-2].minor.yy66, yymsp[0].minor.yy66, TK_LIKE); } yymsp[-2].minor.yy66 = yylhsminor.yy66; break; - case 212: /* expr ::= expr IN LP exprlist RP */ + case 215: /* expr ::= expr IN LP exprlist RP */ {yylhsminor.yy66 = tSQLExprCreate(yymsp[-4].minor.yy66, (tSQLExpr*)yymsp[-1].minor.yy224, TK_IN); } yymsp[-4].minor.yy66 = yylhsminor.yy66; break; - case 213: /* exprlist ::= exprlist COMMA expritem */ + case 216: /* exprlist ::= exprlist COMMA expritem */ {yylhsminor.yy224 = tSQLExprListAppend(yymsp[-2].minor.yy224,yymsp[0].minor.yy66,0);} yymsp[-2].minor.yy224 = yylhsminor.yy224; break; - case 214: /* exprlist ::= expritem */ + case 217: /* exprlist ::= expritem */ {yylhsminor.yy224 = tSQLExprListAppend(0,yymsp[0].minor.yy66,0);} yymsp[0].minor.yy224 = yylhsminor.yy224; break; - case 215: /* expritem ::= expr */ + case 218: /* expritem ::= expr */ {yylhsminor.yy66 = yymsp[0].minor.yy66;} yymsp[0].minor.yy66 = yylhsminor.yy66; break; - case 217: /* cmd ::= RESET QUERY CACHE */ + case 220: /* cmd ::= RESET QUERY CACHE */ { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 218: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 221: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy449, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 219: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 222: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2764,14 +2786,14 @@ static void yy_reduce( setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 220: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 223: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableSQL* pAlterTable = tAlterTableSQLElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy449, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 221: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 224: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2782,7 +2804,7 @@ static void yy_reduce( setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 222: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 225: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -2796,7 +2818,7 @@ static void yy_reduce( setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 223: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 226: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -2808,13 +2830,13 @@ static void yy_reduce( setSQLInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 224: /* cmd ::= KILL CONNECTION INTEGER */ + case 227: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSQL(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 225: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 228: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} break; - case 226: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 229: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSQL(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} break; default: