diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 46c0eadaa1ef7bd4266bd21514141f9bddf2b4d9..0b3f561152845e95f3596243113693b7b7812c9f 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -159,12 +159,12 @@ #define TK_USING 117 #define TK_NULL 118 #define TK_NOW 119 -#define TK_SELECT 120 -#define TK_UNION 121 -#define TK_ALL 122 -#define TK_DISTINCT 123 -#define TK_FROM 124 -#define TK_VARIABLE 125 +#define TK_VARIABLE 120 +#define TK_SELECT 121 +#define TK_UNION 122 +#define TK_ALL 123 +#define TK_DISTINCT 124 +#define TK_FROM 125 #define TK_INTERVAL 126 #define TK_EVERY 127 #define TK_SESSION 128 @@ -333,18 +333,18 @@ typedef union { #define ParseCTX_FETCH #define ParseCTX_STORE #define YYFALLBACK 1 -#define YYNSTATE 363 -#define YYNRULE 291 -#define YYNRULE_WITH_ACTION 291 +#define YYNSTATE 366 +#define YYNRULE 293 +#define YYNRULE_WITH_ACTION 293 #define YYNTOKEN 197 -#define YY_MAX_SHIFT 362 -#define YY_MIN_SHIFTREDUCE 571 -#define YY_MAX_SHIFTREDUCE 861 -#define YY_ERROR_ACTION 862 -#define YY_ACCEPT_ACTION 863 -#define YY_NO_ACTION 864 -#define YY_MIN_REDUCE 865 -#define YY_MAX_REDUCE 1155 +#define YY_MAX_SHIFT 365 +#define YY_MIN_SHIFTREDUCE 575 +#define YY_MAX_SHIFTREDUCE 867 +#define YY_ERROR_ACTION 868 +#define YY_ACCEPT_ACTION 869 +#define YY_NO_ACTION 870 +#define YY_MIN_REDUCE 871 +#define YY_MAX_REDUCE 1163 /************* End control #defines *******************************************/ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) @@ -411,84 +411,85 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (757) +#define YY_ACTTAB_COUNT (761) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 169, 622, 235, 622, 229, 360, 1020, 1042, 241, 623, - /* 10 */ 246, 623, 1020, 57, 58, 153, 61, 62, 280, 38, - /* 20 */ 249, 51, 622, 60, 318, 65, 63, 66, 64, 990, - /* 30 */ 623, 988, 989, 56, 55, 160, 991, 54, 53, 52, - /* 40 */ 992, 160, 993, 994, 863, 362, 1033, 572, 573, 574, - /* 50 */ 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, - /* 60 */ 585, 361, 232, 231, 230, 57, 58, 1017, 61, 62, - /* 70 */ 207, 658, 249, 51, 1039, 60, 318, 65, 63, 66, - /* 80 */ 64, 1132, 1006, 278, 277, 56, 55, 80, 98, 54, - /* 90 */ 53, 52, 57, 58, 1033, 61, 62, 207, 86, 249, - /* 100 */ 51, 1014, 60, 318, 65, 63, 66, 64, 1131, 1081, - /* 110 */ 271, 290, 56, 55, 316, 1080, 54, 53, 52, 57, - /* 120 */ 59, 243, 61, 62, 1008, 1020, 249, 51, 95, 60, - /* 130 */ 318, 65, 63, 66, 64, 45, 800, 348, 1033, 56, - /* 140 */ 55, 160, 1019, 54, 53, 52, 58, 242, 61, 62, - /* 150 */ 765, 766, 249, 51, 233, 60, 318, 65, 63, 66, - /* 160 */ 64, 1003, 1004, 35, 1007, 56, 55, 316, 245, 54, - /* 170 */ 53, 52, 44, 314, 355, 354, 313, 312, 311, 353, - /* 180 */ 310, 309, 308, 352, 307, 351, 350, 982, 970, 971, - /* 190 */ 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, - /* 200 */ 983, 984, 61, 62, 24, 23, 249, 51, 263, 60, - /* 210 */ 318, 65, 63, 66, 64, 92, 79, 267, 266, 56, - /* 220 */ 55, 123, 210, 54, 53, 52, 248, 815, 207, 216, - /* 230 */ 804, 93, 807, 348, 810, 137, 136, 135, 215, 1132, - /* 240 */ 248, 815, 323, 86, 804, 81, 807, 258, 810, 250, - /* 250 */ 1005, 204, 65, 63, 66, 64, 160, 174, 227, 228, - /* 260 */ 56, 55, 319, 913, 54, 53, 52, 5, 41, 178, - /* 270 */ 188, 622, 227, 228, 177, 104, 109, 100, 108, 623, - /* 280 */ 45, 730, 356, 951, 727, 38, 728, 38, 729, 121, - /* 290 */ 115, 126, 252, 303, 38, 16, 125, 15, 131, 134, - /* 300 */ 124, 205, 270, 38, 78, 257, 782, 128, 67, 207, - /* 310 */ 746, 223, 254, 255, 3, 189, 198, 196, 194, 806, - /* 320 */ 1132, 809, 67, 193, 141, 140, 139, 138, 292, 239, - /* 330 */ 91, 240, 923, 1017, 44, 1017, 355, 354, 327, 188, - /* 340 */ 38, 353, 1017, 816, 811, 352, 38, 351, 350, 706, - /* 350 */ 812, 1016, 805, 29, 808, 211, 38, 816, 811, 38, - /* 360 */ 1091, 56, 55, 781, 812, 54, 53, 52, 253, 38, - /* 370 */ 251, 38, 326, 325, 38, 14, 1128, 338, 337, 94, - /* 380 */ 914, 259, 743, 256, 328, 333, 332, 188, 1017, 258, - /* 390 */ 329, 54, 53, 52, 1017, 258, 750, 731, 732, 175, - /* 400 */ 330, 1, 176, 334, 1017, 1018, 272, 1017, 9, 97, - /* 410 */ 83, 84, 34, 335, 71, 336, 762, 1017, 340, 1017, - /* 420 */ 39, 772, 1017, 359, 358, 599, 151, 149, 148, 773, - /* 430 */ 155, 74, 716, 802, 320, 68, 295, 718, 77, 813, - /* 440 */ 247, 133, 132, 26, 297, 298, 39, 274, 274, 717, - /* 450 */ 39, 68, 836, 817, 621, 114, 72, 113, 96, 18, - /* 460 */ 1127, 17, 6, 68, 1126, 225, 25, 25, 25, 803, - /* 470 */ 705, 75, 814, 735, 733, 736, 734, 20, 226, 19, - /* 480 */ 120, 22, 119, 21, 208, 209, 212, 206, 213, 1151, - /* 490 */ 214, 1143, 1034, 1090, 218, 237, 219, 220, 217, 203, - /* 500 */ 1087, 1086, 238, 339, 268, 152, 1041, 1052, 48, 1073, - /* 510 */ 1049, 1050, 275, 1072, 1015, 1054, 150, 154, 159, 286, - /* 520 */ 170, 171, 279, 1013, 172, 173, 162, 234, 281, 283, - /* 530 */ 928, 163, 165, 1031, 761, 161, 300, 819, 301, 302, - /* 540 */ 305, 306, 46, 201, 293, 164, 42, 289, 291, 317, - /* 550 */ 922, 324, 76, 73, 50, 287, 1150, 166, 111, 1149, - /* 560 */ 282, 1146, 285, 167, 179, 49, 331, 1142, 304, 122, - /* 570 */ 349, 117, 1141, 1138, 180, 948, 43, 40, 47, 341, - /* 580 */ 202, 910, 127, 908, 129, 130, 906, 905, 260, 191, - /* 590 */ 192, 902, 901, 900, 899, 898, 897, 896, 195, 197, - /* 600 */ 892, 890, 888, 199, 885, 200, 342, 273, 82, 87, - /* 610 */ 343, 284, 1074, 344, 345, 346, 347, 357, 861, 261, - /* 620 */ 262, 860, 224, 244, 299, 264, 265, 859, 842, 841, - /* 630 */ 269, 274, 221, 10, 85, 294, 927, 105, 926, 222, - /* 640 */ 106, 738, 276, 30, 88, 763, 904, 156, 903, 774, - /* 650 */ 142, 143, 895, 183, 182, 949, 181, 184, 185, 187, - /* 660 */ 186, 144, 894, 887, 950, 145, 986, 886, 2, 157, - /* 670 */ 168, 768, 33, 4, 158, 89, 236, 770, 90, 996, - /* 680 */ 288, 31, 11, 32, 12, 13, 27, 296, 28, 97, - /* 690 */ 99, 102, 36, 101, 636, 37, 103, 671, 669, 668, - /* 700 */ 667, 665, 664, 663, 660, 626, 315, 107, 7, 820, - /* 710 */ 818, 321, 8, 322, 110, 112, 69, 70, 116, 708, - /* 720 */ 707, 39, 118, 704, 652, 650, 642, 648, 644, 646, - /* 730 */ 640, 638, 674, 673, 672, 670, 666, 662, 661, 190, - /* 740 */ 589, 624, 587, 865, 864, 864, 864, 864, 864, 864, - /* 750 */ 864, 864, 864, 864, 864, 146, 147, + /* 0 */ 169, 626, 235, 626, 229, 363, 1026, 1050, 241, 627, + /* 10 */ 246, 627, 1026, 57, 58, 153, 61, 62, 281, 38, + /* 20 */ 249, 51, 626, 60, 319, 65, 63, 66, 64, 996, + /* 30 */ 627, 994, 995, 56, 55, 160, 997, 54, 53, 52, + /* 40 */ 998, 160, 999, 1000, 869, 365, 1041, 576, 577, 578, + /* 50 */ 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, + /* 60 */ 589, 364, 232, 231, 230, 57, 58, 1023, 61, 62, + /* 70 */ 207, 662, 249, 51, 1047, 60, 319, 65, 63, 66, + /* 80 */ 64, 1140, 23, 279, 278, 56, 55, 80, 98, 54, + /* 90 */ 53, 52, 57, 58, 1041, 61, 62, 207, 1041, 249, + /* 100 */ 51, 1020, 60, 319, 65, 63, 66, 64, 1139, 1089, + /* 110 */ 272, 291, 56, 55, 233, 1088, 54, 53, 52, 57, + /* 120 */ 59, 243, 61, 62, 1014, 1026, 249, 51, 95, 60, + /* 130 */ 319, 65, 63, 66, 64, 812, 806, 815, 317, 56, + /* 140 */ 55, 160, 123, 54, 53, 52, 58, 242, 61, 62, + /* 150 */ 771, 772, 249, 51, 351, 60, 319, 65, 63, 66, + /* 160 */ 64, 1009, 1010, 35, 1013, 56, 55, 86, 245, 54, + /* 170 */ 53, 52, 44, 315, 358, 357, 314, 313, 312, 356, + /* 180 */ 311, 310, 309, 355, 308, 354, 353, 988, 976, 977, + /* 190 */ 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, + /* 200 */ 989, 990, 61, 62, 24, 45, 249, 51, 264, 60, + /* 210 */ 319, 65, 63, 66, 64, 92, 1012, 268, 267, 56, + /* 220 */ 55, 204, 210, 54, 53, 52, 248, 821, 207, 216, + /* 230 */ 810, 741, 813, 742, 816, 137, 136, 135, 215, 1140, + /* 240 */ 248, 821, 324, 86, 810, 811, 813, 814, 816, 250, + /* 250 */ 819, 205, 65, 63, 66, 64, 919, 160, 227, 228, + /* 260 */ 56, 55, 320, 188, 54, 53, 52, 5, 41, 178, + /* 270 */ 259, 626, 227, 228, 177, 104, 109, 100, 108, 627, + /* 280 */ 174, 45, 259, 749, 734, 259, 38, 731, 38, 732, + /* 290 */ 252, 733, 175, 304, 351, 1024, 121, 115, 126, 258, + /* 300 */ 211, 317, 271, 125, 78, 131, 134, 124, 67, 207, + /* 310 */ 9, 223, 359, 957, 128, 254, 255, 198, 196, 194, + /* 320 */ 1140, 38, 67, 1025, 193, 141, 140, 139, 138, 293, + /* 330 */ 239, 91, 240, 38, 1023, 44, 1023, 358, 357, 34, + /* 340 */ 38, 38, 356, 822, 817, 818, 355, 38, 354, 353, + /* 350 */ 56, 55, 752, 29, 54, 53, 52, 822, 817, 818, + /* 360 */ 820, 38, 38, 38, 38, 328, 253, 788, 251, 1023, + /* 370 */ 327, 326, 299, 93, 710, 260, 273, 257, 321, 336, + /* 380 */ 335, 1022, 14, 79, 329, 330, 94, 81, 1023, 1023, + /* 390 */ 39, 331, 54, 53, 52, 1023, 362, 361, 603, 1159, + /* 400 */ 735, 256, 341, 340, 83, 337, 338, 339, 343, 1023, + /* 410 */ 1023, 1023, 1023, 151, 149, 148, 97, 1011, 929, 920, + /* 420 */ 1, 176, 3, 189, 787, 188, 188, 84, 808, 768, + /* 430 */ 778, 779, 71, 74, 247, 720, 296, 722, 298, 756, + /* 440 */ 721, 842, 275, 155, 68, 26, 823, 1136, 625, 39, + /* 450 */ 39, 68, 96, 77, 68, 25, 6, 16, 1135, 15, + /* 460 */ 25, 739, 25, 740, 809, 275, 1134, 114, 18, 113, + /* 470 */ 17, 333, 332, 75, 72, 20, 225, 19, 120, 269, + /* 480 */ 119, 825, 22, 226, 21, 709, 133, 132, 208, 209, + /* 490 */ 212, 1151, 1099, 152, 206, 213, 1098, 214, 218, 237, + /* 500 */ 219, 220, 1095, 217, 203, 1094, 238, 342, 1049, 48, + /* 510 */ 1060, 1042, 1057, 1058, 1062, 150, 276, 274, 154, 159, + /* 520 */ 1081, 1080, 170, 287, 1021, 171, 1019, 172, 173, 767, + /* 530 */ 166, 934, 280, 301, 1039, 234, 162, 302, 303, 306, + /* 540 */ 307, 46, 201, 282, 42, 284, 161, 294, 318, 928, + /* 550 */ 76, 73, 50, 163, 292, 164, 290, 165, 325, 1158, + /* 560 */ 111, 1157, 288, 286, 167, 1154, 179, 334, 1150, 49, + /* 570 */ 283, 117, 1149, 305, 1146, 180, 954, 43, 40, 47, + /* 580 */ 202, 916, 127, 914, 129, 130, 912, 911, 261, 191, + /* 590 */ 192, 908, 907, 906, 905, 904, 903, 902, 195, 197, + /* 600 */ 898, 896, 894, 199, 891, 200, 352, 82, 122, 87, + /* 610 */ 344, 285, 1082, 345, 346, 347, 348, 349, 350, 224, + /* 620 */ 360, 244, 300, 867, 262, 263, 866, 265, 266, 865, + /* 630 */ 848, 221, 105, 933, 932, 222, 106, 847, 270, 275, + /* 640 */ 295, 10, 85, 744, 277, 88, 30, 910, 909, 901, + /* 650 */ 182, 955, 185, 142, 183, 181, 900, 187, 184, 186, + /* 660 */ 143, 144, 992, 145, 893, 892, 769, 956, 168, 33, + /* 670 */ 2, 4, 156, 158, 780, 157, 236, 774, 89, 90, + /* 680 */ 1002, 776, 289, 31, 11, 32, 12, 13, 27, 297, + /* 690 */ 28, 97, 99, 102, 36, 101, 640, 37, 103, 675, + /* 700 */ 673, 672, 671, 669, 668, 667, 664, 316, 107, 7, + /* 710 */ 8, 630, 824, 322, 323, 110, 826, 112, 69, 70, + /* 720 */ 738, 737, 712, 711, 116, 118, 708, 656, 39, 654, + /* 730 */ 646, 652, 648, 650, 644, 642, 678, 677, 676, 674, + /* 740 */ 670, 666, 665, 190, 628, 593, 591, 871, 870, 870, + /* 750 */ 870, 870, 870, 870, 870, 870, 870, 870, 870, 146, + /* 760 */ 147, }; static const YYCODETYPE yy_lookahead[] = { /* 0 */ 253, 1, 245, 1, 199, 200, 249, 200, 245, 9, @@ -499,75 +500,75 @@ static const YYCODETYPE yy_lookahead[] = { /* 50 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, /* 60 */ 58, 59, 263, 244, 62, 13, 14, 248, 16, 17, /* 70 */ 266, 5, 20, 21, 267, 23, 24, 25, 26, 27, - /* 80 */ 28, 277, 0, 268, 269, 33, 34, 87, 207, 37, - /* 90 */ 38, 39, 13, 14, 247, 16, 17, 266, 83, 20, + /* 80 */ 28, 277, 266, 268, 269, 33, 34, 87, 207, 37, + /* 90 */ 38, 39, 13, 14, 247, 16, 17, 266, 247, 20, /* 100 */ 21, 200, 23, 24, 25, 26, 27, 28, 277, 274, - /* 110 */ 263, 276, 33, 34, 85, 274, 37, 38, 39, 13, + /* 110 */ 263, 276, 33, 34, 263, 274, 37, 38, 39, 13, /* 120 */ 14, 245, 16, 17, 243, 249, 20, 21, 207, 23, - /* 130 */ 24, 25, 26, 27, 28, 120, 84, 91, 247, 33, - /* 140 */ 34, 200, 249, 37, 38, 39, 14, 246, 16, 17, - /* 150 */ 126, 127, 20, 21, 263, 23, 24, 25, 26, 27, - /* 160 */ 28, 240, 241, 242, 243, 33, 34, 85, 206, 37, + /* 130 */ 24, 25, 26, 27, 28, 5, 84, 7, 85, 33, + /* 140 */ 34, 200, 79, 37, 38, 39, 14, 246, 16, 17, + /* 150 */ 126, 127, 20, 21, 91, 23, 24, 25, 26, 27, + /* 160 */ 28, 240, 241, 242, 243, 33, 34, 83, 206, 37, /* 170 */ 38, 39, 99, 100, 101, 102, 103, 104, 105, 106, /* 180 */ 107, 108, 109, 110, 111, 112, 113, 223, 224, 225, /* 190 */ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, - /* 200 */ 236, 237, 16, 17, 44, 266, 20, 21, 143, 23, - /* 210 */ 24, 25, 26, 27, 28, 274, 207, 152, 153, 33, - /* 220 */ 34, 79, 62, 37, 38, 39, 1, 2, 266, 69, - /* 230 */ 5, 250, 7, 91, 9, 75, 76, 77, 78, 277, - /* 240 */ 1, 2, 82, 83, 5, 264, 7, 200, 9, 206, - /* 250 */ 241, 266, 25, 26, 27, 28, 200, 210, 33, 34, - /* 260 */ 33, 34, 37, 205, 37, 38, 39, 63, 64, 65, - /* 270 */ 212, 1, 33, 34, 70, 71, 72, 73, 74, 9, - /* 280 */ 120, 2, 221, 222, 5, 200, 7, 200, 9, 63, - /* 290 */ 64, 65, 69, 89, 200, 146, 70, 148, 72, 73, - /* 300 */ 74, 266, 142, 200, 144, 69, 77, 81, 83, 266, - /* 310 */ 37, 151, 33, 34, 203, 204, 63, 64, 65, 5, - /* 320 */ 277, 7, 83, 70, 71, 72, 73, 74, 272, 244, - /* 330 */ 274, 244, 205, 248, 99, 248, 101, 102, 244, 212, - /* 340 */ 200, 106, 248, 118, 119, 110, 200, 112, 113, 5, - /* 350 */ 125, 248, 5, 83, 7, 266, 200, 118, 119, 200, - /* 360 */ 239, 33, 34, 134, 125, 37, 38, 39, 145, 200, - /* 370 */ 147, 200, 149, 150, 200, 83, 266, 33, 34, 87, - /* 380 */ 205, 145, 98, 147, 244, 149, 150, 212, 248, 200, - /* 390 */ 244, 37, 38, 39, 248, 200, 123, 118, 119, 210, - /* 400 */ 244, 208, 209, 244, 248, 210, 84, 248, 124, 117, - /* 410 */ 84, 84, 83, 244, 98, 244, 84, 248, 244, 248, - /* 420 */ 98, 84, 248, 66, 67, 68, 63, 64, 65, 84, - /* 430 */ 98, 98, 84, 1, 15, 98, 84, 84, 83, 125, - /* 440 */ 61, 79, 80, 98, 84, 116, 98, 121, 121, 84, - /* 450 */ 98, 98, 84, 84, 84, 146, 140, 148, 98, 146, - /* 460 */ 266, 148, 83, 98, 266, 266, 98, 98, 98, 37, - /* 470 */ 115, 138, 125, 5, 5, 7, 7, 146, 266, 148, - /* 480 */ 146, 146, 148, 148, 266, 266, 266, 266, 266, 249, - /* 490 */ 266, 249, 247, 239, 266, 239, 266, 266, 266, 266, - /* 500 */ 239, 239, 239, 239, 200, 200, 200, 200, 265, 275, - /* 510 */ 200, 200, 247, 275, 247, 200, 61, 200, 200, 200, - /* 520 */ 251, 200, 270, 200, 200, 200, 260, 270, 270, 270, - /* 530 */ 200, 259, 257, 262, 125, 261, 200, 118, 200, 200, - /* 540 */ 200, 200, 200, 200, 132, 258, 200, 130, 135, 200, - /* 550 */ 200, 200, 137, 139, 136, 129, 200, 256, 200, 200, - /* 560 */ 131, 200, 128, 255, 200, 141, 200, 200, 90, 97, - /* 570 */ 114, 200, 200, 200, 200, 200, 200, 200, 200, 96, + /* 200 */ 236, 237, 16, 17, 44, 121, 20, 21, 143, 23, + /* 210 */ 24, 25, 26, 27, 28, 274, 0, 152, 153, 33, + /* 220 */ 34, 266, 62, 37, 38, 39, 1, 2, 266, 69, + /* 230 */ 5, 5, 7, 7, 9, 75, 76, 77, 78, 277, + /* 240 */ 1, 2, 82, 83, 5, 5, 7, 7, 9, 206, + /* 250 */ 120, 266, 25, 26, 27, 28, 205, 200, 33, 34, + /* 260 */ 33, 34, 37, 212, 37, 38, 39, 63, 64, 65, + /* 270 */ 200, 1, 33, 34, 70, 71, 72, 73, 74, 9, + /* 280 */ 210, 121, 200, 98, 2, 200, 200, 5, 200, 7, + /* 290 */ 69, 9, 210, 89, 91, 210, 63, 64, 65, 69, + /* 300 */ 266, 85, 142, 70, 144, 72, 73, 74, 83, 266, + /* 310 */ 125, 151, 221, 222, 81, 33, 34, 63, 64, 65, + /* 320 */ 277, 200, 83, 249, 70, 71, 72, 73, 74, 272, + /* 330 */ 244, 274, 244, 200, 248, 99, 248, 101, 102, 83, + /* 340 */ 200, 200, 106, 118, 119, 120, 110, 200, 112, 113, + /* 350 */ 33, 34, 37, 83, 37, 38, 39, 118, 119, 120, + /* 360 */ 120, 200, 200, 200, 200, 244, 145, 77, 147, 248, + /* 370 */ 149, 150, 116, 250, 5, 145, 84, 147, 15, 149, + /* 380 */ 150, 248, 83, 207, 244, 244, 87, 264, 248, 248, + /* 390 */ 98, 244, 37, 38, 39, 248, 66, 67, 68, 249, + /* 400 */ 118, 119, 33, 34, 84, 244, 244, 244, 244, 248, + /* 410 */ 248, 248, 248, 63, 64, 65, 117, 241, 205, 205, + /* 420 */ 208, 209, 203, 204, 134, 212, 212, 84, 1, 84, + /* 430 */ 84, 84, 98, 98, 61, 84, 84, 84, 84, 124, + /* 440 */ 84, 84, 122, 98, 98, 98, 84, 266, 84, 98, + /* 450 */ 98, 98, 98, 83, 98, 98, 83, 146, 266, 148, + /* 460 */ 98, 5, 98, 7, 37, 122, 266, 146, 146, 148, + /* 470 */ 148, 33, 34, 138, 140, 146, 266, 148, 146, 200, + /* 480 */ 148, 118, 146, 266, 148, 115, 79, 80, 266, 266, + /* 490 */ 266, 249, 239, 200, 266, 266, 239, 266, 266, 239, + /* 500 */ 266, 266, 239, 266, 266, 239, 239, 239, 200, 265, + /* 510 */ 200, 247, 200, 200, 200, 61, 247, 201, 200, 200, + /* 520 */ 275, 275, 251, 200, 247, 200, 200, 200, 200, 120, + /* 530 */ 256, 200, 270, 200, 262, 270, 260, 200, 200, 200, + /* 540 */ 200, 200, 200, 270, 200, 270, 261, 132, 200, 200, + /* 550 */ 137, 139, 136, 259, 135, 258, 130, 257, 200, 200, + /* 560 */ 200, 200, 129, 128, 255, 200, 200, 200, 200, 141, + /* 570 */ 131, 200, 200, 90, 200, 200, 200, 200, 200, 200, /* 580 */ 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, /* 590 */ 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - /* 600 */ 200, 200, 200, 200, 200, 200, 51, 201, 201, 201, - /* 610 */ 93, 201, 201, 95, 55, 94, 92, 85, 5, 154, - /* 620 */ 5, 5, 201, 201, 201, 154, 5, 5, 101, 100, - /* 630 */ 143, 121, 201, 83, 122, 116, 211, 207, 211, 201, - /* 640 */ 207, 84, 98, 83, 98, 84, 201, 83, 201, 84, - /* 650 */ 202, 202, 201, 214, 218, 220, 219, 217, 215, 213, - /* 660 */ 216, 202, 201, 201, 222, 202, 238, 201, 208, 83, - /* 670 */ 254, 84, 252, 203, 98, 83, 1, 84, 83, 238, - /* 680 */ 83, 98, 133, 98, 133, 83, 83, 116, 83, 117, - /* 690 */ 79, 71, 88, 87, 5, 88, 87, 9, 5, 5, - /* 700 */ 5, 5, 5, 5, 5, 86, 15, 79, 83, 118, - /* 710 */ 84, 24, 83, 59, 148, 148, 16, 16, 148, 5, - /* 720 */ 5, 98, 148, 84, 5, 5, 5, 5, 5, 5, - /* 730 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 98, - /* 740 */ 61, 86, 60, 0, 278, 278, 278, 278, 278, 278, - /* 750 */ 278, 278, 278, 278, 278, 21, 21, 278, 278, 278, - /* 760 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 600 */ 200, 200, 200, 200, 200, 200, 114, 201, 97, 201, + /* 610 */ 96, 201, 201, 51, 93, 95, 55, 94, 92, 201, + /* 620 */ 85, 201, 201, 5, 154, 5, 5, 154, 5, 5, + /* 630 */ 101, 201, 207, 211, 211, 201, 207, 100, 143, 122, + /* 640 */ 116, 83, 123, 84, 98, 98, 83, 201, 201, 201, + /* 650 */ 218, 220, 215, 202, 214, 219, 201, 213, 217, 216, + /* 660 */ 202, 202, 238, 202, 201, 201, 84, 222, 254, 252, + /* 670 */ 208, 203, 83, 98, 84, 83, 1, 84, 83, 83, + /* 680 */ 238, 84, 83, 98, 133, 98, 133, 83, 83, 116, + /* 690 */ 83, 117, 79, 71, 88, 87, 5, 88, 87, 9, + /* 700 */ 5, 5, 5, 5, 5, 5, 5, 15, 79, 83, + /* 710 */ 83, 86, 84, 24, 59, 148, 118, 148, 16, 16, + /* 720 */ 120, 120, 5, 5, 148, 148, 84, 5, 98, 5, + /* 730 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 740 */ 5, 5, 5, 98, 86, 61, 60, 0, 278, 278, + /* 750 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 21, + /* 760 */ 21, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 770 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 780 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 790 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, @@ -586,114 +587,114 @@ static const YYCODETYPE yy_lookahead[] = { /* 920 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 930 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, /* 940 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 950 */ 278, 278, 278, 278, + /* 950 */ 278, 278, 278, 278, 278, 278, 278, 278, }; -#define YY_SHIFT_COUNT (362) +#define YY_SHIFT_COUNT (365) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (743) +#define YY_SHIFT_MAX (747) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 160, 73, 73, 235, 235, 29, 225, 239, 239, 270, + /* 0 */ 160, 73, 73, 236, 236, 53, 225, 239, 239, 270, /* 10 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 20 */ 21, 21, 21, 0, 2, 239, 279, 279, 279, 15, - /* 30 */ 15, 21, 21, 24, 21, 82, 21, 21, 21, 21, - /* 40 */ 142, 29, 46, 46, 66, 757, 757, 757, 239, 239, + /* 20 */ 21, 21, 21, 0, 2, 239, 282, 282, 282, 84, + /* 30 */ 84, 21, 21, 24, 21, 216, 21, 21, 21, 21, + /* 40 */ 63, 53, 203, 203, 66, 761, 761, 761, 239, 239, /* 50 */ 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - /* 60 */ 239, 239, 239, 239, 239, 239, 239, 239, 279, 279, - /* 70 */ 279, 344, 344, 344, 344, 344, 344, 344, 21, 21, - /* 80 */ 21, 273, 21, 21, 21, 15, 15, 21, 21, 21, - /* 90 */ 21, 229, 229, 284, 15, 21, 21, 21, 21, 21, + /* 60 */ 239, 239, 239, 239, 239, 239, 239, 239, 282, 282, + /* 70 */ 282, 369, 369, 369, 369, 369, 369, 369, 21, 21, + /* 80 */ 21, 315, 21, 21, 21, 84, 84, 21, 21, 21, + /* 90 */ 21, 290, 290, 185, 84, 21, 21, 21, 21, 21, /* 100 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 110 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 120 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 130 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 140 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 150 */ 21, 21, 455, 455, 455, 409, 409, 409, 409, 455, - /* 160 */ 455, 415, 414, 412, 418, 413, 417, 426, 434, 429, - /* 170 */ 424, 455, 455, 455, 478, 478, 456, 29, 29, 455, - /* 180 */ 455, 472, 483, 555, 517, 518, 559, 521, 524, 456, - /* 190 */ 66, 455, 455, 532, 532, 455, 532, 455, 532, 455, - /* 200 */ 455, 757, 757, 52, 79, 79, 106, 79, 132, 186, - /* 210 */ 204, 227, 227, 227, 227, 226, 253, 328, 328, 328, - /* 220 */ 328, 223, 236, 65, 292, 354, 354, 314, 347, 357, - /* 230 */ 363, 322, 326, 327, 332, 337, 345, 316, 333, 348, - /* 240 */ 352, 353, 360, 365, 329, 368, 369, 432, 379, 419, - /* 250 */ 370, 149, 309, 313, 468, 469, 331, 334, 355, 335, - /* 260 */ 362, 613, 465, 615, 616, 471, 621, 622, 527, 529, - /* 270 */ 487, 510, 519, 550, 512, 557, 560, 544, 546, 561, - /* 280 */ 564, 565, 586, 587, 576, 592, 593, 595, 675, 597, - /* 290 */ 583, 549, 585, 551, 602, 519, 603, 571, 605, 572, - /* 300 */ 611, 604, 606, 620, 689, 607, 609, 688, 693, 694, - /* 310 */ 695, 696, 697, 698, 699, 619, 691, 628, 625, 626, - /* 320 */ 591, 629, 687, 654, 700, 566, 567, 623, 623, 623, - /* 330 */ 623, 701, 570, 574, 623, 623, 623, 714, 715, 639, - /* 340 */ 623, 719, 720, 721, 722, 723, 724, 725, 726, 727, - /* 350 */ 728, 729, 730, 731, 732, 733, 641, 655, 734, 735, - /* 360 */ 679, 682, 743, + /* 150 */ 21, 21, 454, 454, 454, 409, 409, 409, 409, 454, + /* 160 */ 454, 413, 412, 415, 416, 419, 426, 433, 435, 439, + /* 170 */ 428, 454, 454, 454, 483, 483, 492, 53, 53, 454, + /* 180 */ 454, 511, 514, 562, 521, 520, 561, 523, 526, 492, + /* 190 */ 66, 454, 454, 535, 535, 454, 535, 454, 535, 454, + /* 200 */ 454, 761, 761, 52, 79, 79, 106, 79, 132, 186, + /* 210 */ 204, 227, 227, 227, 227, 233, 254, 317, 317, 317, + /* 220 */ 317, 221, 230, 65, 299, 355, 355, 130, 240, 330, + /* 230 */ 350, 292, 320, 343, 345, 346, 347, 334, 335, 351, + /* 240 */ 352, 353, 354, 356, 256, 357, 362, 427, 373, 363, + /* 250 */ 364, 311, 321, 322, 226, 456, 438, 329, 332, 370, + /* 260 */ 336, 407, 618, 470, 620, 621, 473, 623, 624, 529, + /* 270 */ 537, 495, 517, 524, 558, 519, 559, 563, 546, 547, + /* 280 */ 582, 589, 590, 592, 593, 575, 595, 597, 596, 675, + /* 290 */ 599, 585, 551, 587, 553, 604, 524, 605, 573, 607, + /* 300 */ 574, 613, 606, 608, 622, 691, 609, 611, 690, 695, + /* 310 */ 696, 697, 698, 699, 700, 701, 625, 692, 629, 626, + /* 320 */ 628, 598, 627, 689, 655, 702, 567, 569, 630, 630, + /* 330 */ 630, 630, 600, 601, 703, 576, 577, 630, 630, 630, + /* 340 */ 717, 718, 642, 630, 722, 724, 725, 726, 727, 728, + /* 350 */ 729, 730, 731, 732, 733, 734, 735, 736, 737, 645, + /* 360 */ 658, 738, 739, 684, 686, 747, }; #define YY_REDUCE_COUNT (202) #define YY_REDUCE_MIN (-253) -#define YY_REDUCE_MAX (470) +#define YY_REDUCE_MAX (468) static const short yy_reduce_ofst[] = { /* 0 */ -153, -36, -36, -194, -194, -79, -196, -38, 43, -185, - /* 10 */ -181, -165, 56, 85, 87, 94, 140, 146, 156, 159, - /* 20 */ 169, 171, 174, -193, -195, -169, -243, -237, -124, -201, - /* 30 */ -109, -159, -59, -253, -99, -119, 47, 189, 195, 103, - /* 40 */ 58, 9, 127, 175, 61, -19, 193, 111, -61, -15, - /* 50 */ 35, 89, 110, 194, 198, 199, 212, 218, 219, 220, - /* 60 */ 221, 222, 224, 228, 230, 231, 232, 233, -107, 240, - /* 70 */ 242, 121, 254, 256, 261, 262, 263, 264, 304, 305, - /* 80 */ 306, 243, 307, 310, 311, 245, 265, 315, 317, 318, - /* 90 */ 319, 234, 238, 269, 267, 321, 323, 324, 325, 330, - /* 100 */ 336, 338, 339, 340, 341, 342, 343, 346, 349, 350, - /* 110 */ 351, 356, 358, 359, 361, 364, 366, 367, 371, 372, - /* 120 */ 373, 374, 375, 376, 377, 378, 380, 381, 382, 383, + /* 10 */ -181, -165, 57, 86, 88, 121, 140, 141, 147, 161, + /* 20 */ 162, 163, 164, -193, -195, -169, -243, -237, -124, -201, + /* 30 */ -149, -159, -59, -253, -99, -119, 70, 82, 85, 133, + /* 40 */ 51, 176, 213, 214, 91, 123, 212, 219, -184, -45, + /* 50 */ -15, 34, 181, 192, 200, 210, 217, 222, 223, 224, + /* 60 */ 228, 229, 231, 232, 234, 235, 237, 238, 74, 150, + /* 70 */ 242, 253, 257, 260, 263, 266, 267, 268, 279, 293, + /* 80 */ 308, 244, 310, 312, 313, 264, 269, 314, 318, 319, + /* 90 */ 323, 245, 246, 271, 277, 325, 326, 327, 328, 331, + /* 100 */ 333, 337, 338, 339, 340, 341, 342, 344, 348, 349, + /* 110 */ 358, 359, 360, 361, 365, 366, 367, 368, 371, 372, + /* 120 */ 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, /* 130 */ 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, /* 140 */ 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, - /* 150 */ 404, 405, 406, 407, 408, 252, 257, 258, 259, 410, - /* 160 */ 411, 271, 274, 266, 272, 287, 275, 301, 308, 416, - /* 170 */ 420, 421, 422, 423, 425, 427, 428, 430, 433, 431, - /* 180 */ 438, 435, 437, 436, 439, 440, 443, 444, 446, 441, - /* 190 */ 442, 445, 447, 448, 449, 451, 459, 461, 463, 462, - /* 200 */ 466, 460, 470, + /* 150 */ 404, 405, 316, 406, 408, 262, 265, 273, 275, 410, + /* 160 */ 411, 272, 285, 276, 294, 297, 300, 274, 309, 414, + /* 170 */ 417, 418, 420, 421, 422, 423, 424, 425, 429, 430, + /* 180 */ 434, 431, 436, 432, 440, 441, 437, 443, 444, 442, + /* 190 */ 445, 446, 447, 451, 458, 448, 459, 455, 461, 463, + /* 200 */ 464, 462, 468, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 862, 985, 924, 995, 911, 921, 1134, 1134, 1134, 862, - /* 10 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 20 */ 862, 862, 862, 1043, 882, 1134, 862, 862, 862, 862, - /* 30 */ 862, 862, 862, 1058, 862, 921, 862, 862, 862, 862, - /* 40 */ 931, 921, 931, 931, 862, 1038, 969, 987, 862, 862, - /* 50 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 60 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 70 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 80 */ 862, 1045, 1051, 1048, 862, 862, 862, 1053, 862, 862, - /* 90 */ 862, 1077, 1077, 1036, 862, 862, 862, 862, 862, 862, - /* 100 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 110 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 120 */ 862, 862, 862, 862, 862, 862, 862, 909, 862, 907, - /* 130 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 140 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 150 */ 862, 862, 884, 884, 884, 862, 862, 862, 862, 884, - /* 160 */ 884, 1084, 1088, 1070, 1082, 1078, 1065, 1063, 1061, 1069, - /* 170 */ 1092, 884, 884, 884, 929, 929, 925, 921, 921, 884, - /* 180 */ 884, 947, 945, 943, 935, 941, 937, 939, 933, 912, - /* 190 */ 862, 884, 884, 919, 919, 884, 919, 884, 919, 884, - /* 200 */ 884, 969, 987, 862, 1093, 1083, 862, 1133, 1123, 1122, - /* 210 */ 862, 1129, 1121, 1120, 1119, 862, 862, 1115, 1118, 1117, - /* 220 */ 1116, 862, 862, 862, 862, 1125, 1124, 862, 862, 862, - /* 230 */ 862, 862, 862, 862, 862, 862, 862, 1089, 1085, 862, - /* 240 */ 862, 862, 862, 862, 862, 862, 862, 862, 1095, 862, - /* 250 */ 862, 862, 862, 862, 862, 862, 862, 862, 997, 862, - /* 260 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 270 */ 862, 1035, 862, 862, 862, 862, 862, 1047, 1046, 862, - /* 280 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 290 */ 1079, 862, 1071, 862, 862, 1009, 862, 862, 862, 862, - /* 300 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 310 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 320 */ 862, 862, 862, 862, 862, 862, 862, 1152, 1147, 1148, - /* 330 */ 1145, 862, 862, 862, 1144, 1139, 1140, 862, 862, 862, - /* 340 */ 1137, 862, 862, 862, 862, 862, 862, 862, 862, 862, - /* 350 */ 862, 862, 862, 862, 862, 862, 953, 862, 891, 889, - /* 360 */ 862, 880, 862, + /* 0 */ 868, 991, 930, 1001, 917, 927, 1142, 1142, 1142, 868, + /* 10 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 20 */ 868, 868, 868, 1051, 888, 1142, 868, 868, 868, 868, + /* 30 */ 868, 868, 868, 1066, 868, 927, 868, 868, 868, 868, + /* 40 */ 937, 927, 937, 937, 868, 1046, 975, 993, 868, 868, + /* 50 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 60 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 70 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 80 */ 868, 1053, 1059, 1056, 868, 868, 868, 1061, 868, 868, + /* 90 */ 868, 1085, 1085, 1044, 868, 868, 868, 868, 868, 868, + /* 100 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 110 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 120 */ 868, 868, 868, 868, 868, 868, 868, 915, 868, 913, + /* 130 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 140 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 150 */ 868, 868, 890, 890, 890, 868, 868, 868, 868, 890, + /* 160 */ 890, 1092, 1096, 1078, 1090, 1086, 1073, 1071, 1069, 1077, + /* 170 */ 1100, 890, 890, 890, 935, 935, 931, 927, 927, 890, + /* 180 */ 890, 953, 951, 949, 941, 947, 943, 945, 939, 918, + /* 190 */ 868, 890, 890, 925, 925, 890, 925, 890, 925, 890, + /* 200 */ 890, 975, 993, 868, 1101, 1091, 868, 1141, 1131, 1130, + /* 210 */ 868, 1137, 1129, 1128, 1127, 868, 868, 1123, 1126, 1125, + /* 220 */ 1124, 868, 868, 868, 868, 1133, 1132, 868, 868, 868, + /* 230 */ 868, 868, 868, 868, 868, 868, 868, 1097, 1093, 868, + /* 240 */ 868, 868, 868, 868, 868, 868, 868, 868, 1103, 868, + /* 250 */ 868, 868, 868, 868, 868, 868, 1032, 868, 868, 1003, + /* 260 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 270 */ 868, 868, 1043, 868, 868, 868, 868, 868, 1055, 1054, + /* 280 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 290 */ 868, 1087, 868, 1079, 868, 868, 1015, 868, 868, 868, + /* 300 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 310 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 868, + /* 320 */ 868, 868, 868, 868, 868, 868, 868, 868, 1160, 1155, + /* 330 */ 1156, 1153, 868, 868, 868, 868, 868, 1152, 1147, 1148, + /* 340 */ 868, 868, 868, 1145, 868, 868, 868, 868, 868, 868, + /* 350 */ 868, 868, 868, 868, 868, 868, 868, 868, 868, 959, + /* 360 */ 868, 897, 895, 868, 886, 868, }; /********** End of lemon-generated parsing tables *****************************/ @@ -833,12 +834,12 @@ static const YYCODETYPE yyFallback[] = { 0, /* USING => nothing */ 1, /* NULL => ID */ 1, /* NOW => ID */ + 0, /* VARIABLE => nothing */ 0, /* SELECT => nothing */ 0, /* UNION => nothing */ 1, /* ALL => ID */ 0, /* DISTINCT => nothing */ 0, /* FROM => nothing */ - 0, /* VARIABLE => nothing */ 0, /* INTERVAL => nothing */ 0, /* EVERY => nothing */ 0, /* SESSION => nothing */ @@ -1118,12 +1119,12 @@ static const char *const yyTokenName[] = { /* 117 */ "USING", /* 118 */ "NULL", /* 119 */ "NOW", - /* 120 */ "SELECT", - /* 121 */ "UNION", - /* 122 */ "ALL", - /* 123 */ "DISTINCT", - /* 124 */ "FROM", - /* 125 */ "VARIABLE", + /* 120 */ "VARIABLE", + /* 121 */ "SELECT", + /* 122 */ "UNION", + /* 123 */ "ALL", + /* 124 */ "DISTINCT", + /* 125 */ "FROM", /* 126 */ "INTERVAL", /* 127 */ "EVERY", /* 128 */ "SESSION", @@ -1445,135 +1446,137 @@ static const char *const yyRuleName[] = { /* 159 */ "tagitem ::= BOOL", /* 160 */ "tagitem ::= NULL", /* 161 */ "tagitem ::= NOW", - /* 162 */ "tagitem ::= MINUS INTEGER", - /* 163 */ "tagitem ::= MINUS FLOAT", - /* 164 */ "tagitem ::= PLUS INTEGER", - /* 165 */ "tagitem ::= PLUS FLOAT", - /* 166 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", - /* 167 */ "select ::= LP select RP", - /* 168 */ "union ::= select", - /* 169 */ "union ::= union UNION ALL select", - /* 170 */ "cmd ::= union", - /* 171 */ "select ::= SELECT selcollist", - /* 172 */ "sclp ::= selcollist COMMA", - /* 173 */ "sclp ::=", - /* 174 */ "selcollist ::= sclp distinct expr as", - /* 175 */ "selcollist ::= sclp STAR", - /* 176 */ "as ::= AS ids", - /* 177 */ "as ::= ids", - /* 178 */ "as ::=", - /* 179 */ "distinct ::= DISTINCT", - /* 180 */ "distinct ::=", - /* 181 */ "from ::= FROM tablelist", - /* 182 */ "from ::= FROM sub", - /* 183 */ "sub ::= LP union RP", - /* 184 */ "sub ::= LP union RP ids", - /* 185 */ "sub ::= sub COMMA LP union RP ids", - /* 186 */ "tablelist ::= ids cpxName", - /* 187 */ "tablelist ::= ids cpxName ids", - /* 188 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 189 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 190 */ "tmvar ::= VARIABLE", - /* 191 */ "interval_option ::= intervalKey LP tmvar RP", - /* 192 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP", - /* 193 */ "interval_option ::=", - /* 194 */ "intervalKey ::= INTERVAL", - /* 195 */ "intervalKey ::= EVERY", - /* 196 */ "session_option ::=", - /* 197 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 198 */ "windowstate_option ::=", - /* 199 */ "windowstate_option ::= STATE_WINDOW LP ids RP", - /* 200 */ "fill_opt ::=", - /* 201 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 202 */ "fill_opt ::= FILL LP ID RP", - /* 203 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 204 */ "sliding_opt ::=", - /* 205 */ "orderby_opt ::=", - /* 206 */ "orderby_opt ::= ORDER BY sortlist", - /* 207 */ "sortlist ::= sortlist COMMA item sortorder", - /* 208 */ "sortlist ::= item sortorder", - /* 209 */ "item ::= ids cpxName", - /* 210 */ "sortorder ::= ASC", - /* 211 */ "sortorder ::= DESC", - /* 212 */ "sortorder ::=", - /* 213 */ "groupby_opt ::=", - /* 214 */ "groupby_opt ::= GROUP BY grouplist", - /* 215 */ "grouplist ::= grouplist COMMA item", - /* 216 */ "grouplist ::= item", - /* 217 */ "having_opt ::=", - /* 218 */ "having_opt ::= HAVING expr", - /* 219 */ "limit_opt ::=", - /* 220 */ "limit_opt ::= LIMIT signed", - /* 221 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 222 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 223 */ "slimit_opt ::=", - /* 224 */ "slimit_opt ::= SLIMIT signed", - /* 225 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 226 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 227 */ "where_opt ::=", - /* 228 */ "where_opt ::= WHERE expr", - /* 229 */ "expr ::= LP expr RP", - /* 230 */ "expr ::= ID", - /* 231 */ "expr ::= ID DOT ID", - /* 232 */ "expr ::= ID DOT STAR", - /* 233 */ "expr ::= INTEGER", - /* 234 */ "expr ::= MINUS INTEGER", - /* 235 */ "expr ::= PLUS INTEGER", - /* 236 */ "expr ::= FLOAT", - /* 237 */ "expr ::= MINUS FLOAT", - /* 238 */ "expr ::= PLUS FLOAT", - /* 239 */ "expr ::= STRING", - /* 240 */ "expr ::= NOW", - /* 241 */ "expr ::= VARIABLE", - /* 242 */ "expr ::= PLUS VARIABLE", - /* 243 */ "expr ::= MINUS VARIABLE", - /* 244 */ "expr ::= BOOL", - /* 245 */ "expr ::= NULL", - /* 246 */ "expr ::= ID LP exprlist RP", - /* 247 */ "expr ::= ID LP STAR RP", - /* 248 */ "expr ::= expr IS NULL", - /* 249 */ "expr ::= expr IS NOT NULL", - /* 250 */ "expr ::= expr LT expr", - /* 251 */ "expr ::= expr GT expr", - /* 252 */ "expr ::= expr LE expr", - /* 253 */ "expr ::= expr GE expr", - /* 254 */ "expr ::= expr NE expr", - /* 255 */ "expr ::= expr EQ expr", - /* 256 */ "expr ::= expr BETWEEN expr AND expr", - /* 257 */ "expr ::= expr AND expr", - /* 258 */ "expr ::= expr OR expr", - /* 259 */ "expr ::= expr PLUS expr", - /* 260 */ "expr ::= expr MINUS expr", - /* 261 */ "expr ::= expr STAR expr", - /* 262 */ "expr ::= expr SLASH expr", - /* 263 */ "expr ::= expr REM expr", - /* 264 */ "expr ::= expr LIKE expr", - /* 265 */ "expr ::= expr IN LP exprlist RP", - /* 266 */ "exprlist ::= exprlist COMMA expritem", - /* 267 */ "exprlist ::= expritem", - /* 268 */ "expritem ::= expr", - /* 269 */ "expritem ::=", - /* 270 */ "cmd ::= RESET QUERY CACHE", - /* 271 */ "cmd ::= SYNCDB ids REPLICA", - /* 272 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 273 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 274 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", - /* 275 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 276 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 277 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 278 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 279 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", - /* 280 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 281 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 282 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", - /* 283 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 284 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 285 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 286 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", - /* 287 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", - /* 288 */ "cmd ::= KILL CONNECTION INTEGER", - /* 289 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 290 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 162 */ "tagitem ::= NOW PLUS VARIABLE", + /* 163 */ "tagitem ::= NOW MINUS VARIABLE", + /* 164 */ "tagitem ::= MINUS INTEGER", + /* 165 */ "tagitem ::= MINUS FLOAT", + /* 166 */ "tagitem ::= PLUS INTEGER", + /* 167 */ "tagitem ::= PLUS FLOAT", + /* 168 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", + /* 169 */ "select ::= LP select RP", + /* 170 */ "union ::= select", + /* 171 */ "union ::= union UNION ALL select", + /* 172 */ "cmd ::= union", + /* 173 */ "select ::= SELECT selcollist", + /* 174 */ "sclp ::= selcollist COMMA", + /* 175 */ "sclp ::=", + /* 176 */ "selcollist ::= sclp distinct expr as", + /* 177 */ "selcollist ::= sclp STAR", + /* 178 */ "as ::= AS ids", + /* 179 */ "as ::= ids", + /* 180 */ "as ::=", + /* 181 */ "distinct ::= DISTINCT", + /* 182 */ "distinct ::=", + /* 183 */ "from ::= FROM tablelist", + /* 184 */ "from ::= FROM sub", + /* 185 */ "sub ::= LP union RP", + /* 186 */ "sub ::= LP union RP ids", + /* 187 */ "sub ::= sub COMMA LP union RP ids", + /* 188 */ "tablelist ::= ids cpxName", + /* 189 */ "tablelist ::= ids cpxName ids", + /* 190 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 191 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 192 */ "tmvar ::= VARIABLE", + /* 193 */ "interval_option ::= intervalKey LP tmvar RP", + /* 194 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP", + /* 195 */ "interval_option ::=", + /* 196 */ "intervalKey ::= INTERVAL", + /* 197 */ "intervalKey ::= EVERY", + /* 198 */ "session_option ::=", + /* 199 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 200 */ "windowstate_option ::=", + /* 201 */ "windowstate_option ::= STATE_WINDOW LP ids RP", + /* 202 */ "fill_opt ::=", + /* 203 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 204 */ "fill_opt ::= FILL LP ID RP", + /* 205 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 206 */ "sliding_opt ::=", + /* 207 */ "orderby_opt ::=", + /* 208 */ "orderby_opt ::= ORDER BY sortlist", + /* 209 */ "sortlist ::= sortlist COMMA item sortorder", + /* 210 */ "sortlist ::= item sortorder", + /* 211 */ "item ::= ids cpxName", + /* 212 */ "sortorder ::= ASC", + /* 213 */ "sortorder ::= DESC", + /* 214 */ "sortorder ::=", + /* 215 */ "groupby_opt ::=", + /* 216 */ "groupby_opt ::= GROUP BY grouplist", + /* 217 */ "grouplist ::= grouplist COMMA item", + /* 218 */ "grouplist ::= item", + /* 219 */ "having_opt ::=", + /* 220 */ "having_opt ::= HAVING expr", + /* 221 */ "limit_opt ::=", + /* 222 */ "limit_opt ::= LIMIT signed", + /* 223 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 224 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 225 */ "slimit_opt ::=", + /* 226 */ "slimit_opt ::= SLIMIT signed", + /* 227 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 228 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 229 */ "where_opt ::=", + /* 230 */ "where_opt ::= WHERE expr", + /* 231 */ "expr ::= LP expr RP", + /* 232 */ "expr ::= ID", + /* 233 */ "expr ::= ID DOT ID", + /* 234 */ "expr ::= ID DOT STAR", + /* 235 */ "expr ::= INTEGER", + /* 236 */ "expr ::= MINUS INTEGER", + /* 237 */ "expr ::= PLUS INTEGER", + /* 238 */ "expr ::= FLOAT", + /* 239 */ "expr ::= MINUS FLOAT", + /* 240 */ "expr ::= PLUS FLOAT", + /* 241 */ "expr ::= STRING", + /* 242 */ "expr ::= NOW", + /* 243 */ "expr ::= VARIABLE", + /* 244 */ "expr ::= PLUS VARIABLE", + /* 245 */ "expr ::= MINUS VARIABLE", + /* 246 */ "expr ::= BOOL", + /* 247 */ "expr ::= NULL", + /* 248 */ "expr ::= ID LP exprlist RP", + /* 249 */ "expr ::= ID LP STAR RP", + /* 250 */ "expr ::= expr IS NULL", + /* 251 */ "expr ::= expr IS NOT NULL", + /* 252 */ "expr ::= expr LT expr", + /* 253 */ "expr ::= expr GT expr", + /* 254 */ "expr ::= expr LE expr", + /* 255 */ "expr ::= expr GE expr", + /* 256 */ "expr ::= expr NE expr", + /* 257 */ "expr ::= expr EQ expr", + /* 258 */ "expr ::= expr BETWEEN expr AND expr", + /* 259 */ "expr ::= expr AND expr", + /* 260 */ "expr ::= expr OR expr", + /* 261 */ "expr ::= expr PLUS expr", + /* 262 */ "expr ::= expr MINUS expr", + /* 263 */ "expr ::= expr STAR expr", + /* 264 */ "expr ::= expr SLASH expr", + /* 265 */ "expr ::= expr REM expr", + /* 266 */ "expr ::= expr LIKE expr", + /* 267 */ "expr ::= expr IN LP exprlist RP", + /* 268 */ "exprlist ::= exprlist COMMA expritem", + /* 269 */ "exprlist ::= expritem", + /* 270 */ "expritem ::= expr", + /* 271 */ "expritem ::=", + /* 272 */ "cmd ::= RESET QUERY CACHE", + /* 273 */ "cmd ::= SYNCDB ids REPLICA", + /* 274 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 275 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 276 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", + /* 277 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 278 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 279 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 280 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 281 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", + /* 282 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 283 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 284 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", + /* 285 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 286 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 287 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 288 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", + /* 289 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", + /* 290 */ "cmd ::= KILL CONNECTION INTEGER", + /* 291 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 292 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -2203,135 +2206,137 @@ static const YYCODETYPE yyRuleInfoLhs[] = { 249, /* (159) tagitem ::= BOOL */ 249, /* (160) tagitem ::= NULL */ 249, /* (161) tagitem ::= NOW */ - 249, /* (162) tagitem ::= MINUS INTEGER */ - 249, /* (163) tagitem ::= MINUS FLOAT */ - 249, /* (164) tagitem ::= PLUS INTEGER */ - 249, /* (165) tagitem ::= PLUS FLOAT */ - 247, /* (166) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ - 247, /* (167) select ::= LP select RP */ - 263, /* (168) union ::= select */ - 263, /* (169) union ::= union UNION ALL select */ - 198, /* (170) cmd ::= union */ - 247, /* (171) select ::= SELECT selcollist */ - 264, /* (172) sclp ::= selcollist COMMA */ - 264, /* (173) sclp ::= */ - 250, /* (174) selcollist ::= sclp distinct expr as */ - 250, /* (175) selcollist ::= sclp STAR */ - 267, /* (176) as ::= AS ids */ - 267, /* (177) as ::= ids */ - 267, /* (178) as ::= */ - 265, /* (179) distinct ::= DISTINCT */ - 265, /* (180) distinct ::= */ - 251, /* (181) from ::= FROM tablelist */ - 251, /* (182) from ::= FROM sub */ - 269, /* (183) sub ::= LP union RP */ - 269, /* (184) sub ::= LP union RP ids */ - 269, /* (185) sub ::= sub COMMA LP union RP ids */ - 268, /* (186) tablelist ::= ids cpxName */ - 268, /* (187) tablelist ::= ids cpxName ids */ - 268, /* (188) tablelist ::= tablelist COMMA ids cpxName */ - 268, /* (189) tablelist ::= tablelist COMMA ids cpxName ids */ - 270, /* (190) tmvar ::= VARIABLE */ - 253, /* (191) interval_option ::= intervalKey LP tmvar RP */ - 253, /* (192) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ - 253, /* (193) interval_option ::= */ - 271, /* (194) intervalKey ::= INTERVAL */ - 271, /* (195) intervalKey ::= EVERY */ - 255, /* (196) session_option ::= */ - 255, /* (197) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - 256, /* (198) windowstate_option ::= */ - 256, /* (199) windowstate_option ::= STATE_WINDOW LP ids RP */ - 257, /* (200) fill_opt ::= */ - 257, /* (201) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - 257, /* (202) fill_opt ::= FILL LP ID RP */ - 254, /* (203) sliding_opt ::= SLIDING LP tmvar RP */ - 254, /* (204) sliding_opt ::= */ - 260, /* (205) orderby_opt ::= */ - 260, /* (206) orderby_opt ::= ORDER BY sortlist */ - 272, /* (207) sortlist ::= sortlist COMMA item sortorder */ - 272, /* (208) sortlist ::= item sortorder */ - 274, /* (209) item ::= ids cpxName */ - 275, /* (210) sortorder ::= ASC */ - 275, /* (211) sortorder ::= DESC */ - 275, /* (212) sortorder ::= */ - 258, /* (213) groupby_opt ::= */ - 258, /* (214) groupby_opt ::= GROUP BY grouplist */ - 276, /* (215) grouplist ::= grouplist COMMA item */ - 276, /* (216) grouplist ::= item */ - 259, /* (217) having_opt ::= */ - 259, /* (218) having_opt ::= HAVING expr */ - 262, /* (219) limit_opt ::= */ - 262, /* (220) limit_opt ::= LIMIT signed */ - 262, /* (221) limit_opt ::= LIMIT signed OFFSET signed */ - 262, /* (222) limit_opt ::= LIMIT signed COMMA signed */ - 261, /* (223) slimit_opt ::= */ - 261, /* (224) slimit_opt ::= SLIMIT signed */ - 261, /* (225) slimit_opt ::= SLIMIT signed SOFFSET signed */ - 261, /* (226) slimit_opt ::= SLIMIT signed COMMA signed */ - 252, /* (227) where_opt ::= */ - 252, /* (228) where_opt ::= WHERE expr */ - 266, /* (229) expr ::= LP expr RP */ - 266, /* (230) expr ::= ID */ - 266, /* (231) expr ::= ID DOT ID */ - 266, /* (232) expr ::= ID DOT STAR */ - 266, /* (233) expr ::= INTEGER */ - 266, /* (234) expr ::= MINUS INTEGER */ - 266, /* (235) expr ::= PLUS INTEGER */ - 266, /* (236) expr ::= FLOAT */ - 266, /* (237) expr ::= MINUS FLOAT */ - 266, /* (238) expr ::= PLUS FLOAT */ - 266, /* (239) expr ::= STRING */ - 266, /* (240) expr ::= NOW */ - 266, /* (241) expr ::= VARIABLE */ - 266, /* (242) expr ::= PLUS VARIABLE */ - 266, /* (243) expr ::= MINUS VARIABLE */ - 266, /* (244) expr ::= BOOL */ - 266, /* (245) expr ::= NULL */ - 266, /* (246) expr ::= ID LP exprlist RP */ - 266, /* (247) expr ::= ID LP STAR RP */ - 266, /* (248) expr ::= expr IS NULL */ - 266, /* (249) expr ::= expr IS NOT NULL */ - 266, /* (250) expr ::= expr LT expr */ - 266, /* (251) expr ::= expr GT expr */ - 266, /* (252) expr ::= expr LE expr */ - 266, /* (253) expr ::= expr GE expr */ - 266, /* (254) expr ::= expr NE expr */ - 266, /* (255) expr ::= expr EQ expr */ - 266, /* (256) expr ::= expr BETWEEN expr AND expr */ - 266, /* (257) expr ::= expr AND expr */ - 266, /* (258) expr ::= expr OR expr */ - 266, /* (259) expr ::= expr PLUS expr */ - 266, /* (260) expr ::= expr MINUS expr */ - 266, /* (261) expr ::= expr STAR expr */ - 266, /* (262) expr ::= expr SLASH expr */ - 266, /* (263) expr ::= expr REM expr */ - 266, /* (264) expr ::= expr LIKE expr */ - 266, /* (265) expr ::= expr IN LP exprlist RP */ - 206, /* (266) exprlist ::= exprlist COMMA expritem */ - 206, /* (267) exprlist ::= expritem */ - 277, /* (268) expritem ::= expr */ - 277, /* (269) expritem ::= */ - 198, /* (270) cmd ::= RESET QUERY CACHE */ - 198, /* (271) cmd ::= SYNCDB ids REPLICA */ - 198, /* (272) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - 198, /* (273) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - 198, /* (274) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - 198, /* (275) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - 198, /* (276) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - 198, /* (277) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - 198, /* (278) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - 198, /* (279) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - 198, /* (280) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - 198, /* (281) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - 198, /* (282) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - 198, /* (283) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - 198, /* (284) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - 198, /* (285) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - 198, /* (286) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - 198, /* (287) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - 198, /* (288) cmd ::= KILL CONNECTION INTEGER */ - 198, /* (289) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - 198, /* (290) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + 249, /* (162) tagitem ::= NOW PLUS VARIABLE */ + 249, /* (163) tagitem ::= NOW MINUS VARIABLE */ + 249, /* (164) tagitem ::= MINUS INTEGER */ + 249, /* (165) tagitem ::= MINUS FLOAT */ + 249, /* (166) tagitem ::= PLUS INTEGER */ + 249, /* (167) tagitem ::= PLUS FLOAT */ + 247, /* (168) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + 247, /* (169) select ::= LP select RP */ + 263, /* (170) union ::= select */ + 263, /* (171) union ::= union UNION ALL select */ + 198, /* (172) cmd ::= union */ + 247, /* (173) select ::= SELECT selcollist */ + 264, /* (174) sclp ::= selcollist COMMA */ + 264, /* (175) sclp ::= */ + 250, /* (176) selcollist ::= sclp distinct expr as */ + 250, /* (177) selcollist ::= sclp STAR */ + 267, /* (178) as ::= AS ids */ + 267, /* (179) as ::= ids */ + 267, /* (180) as ::= */ + 265, /* (181) distinct ::= DISTINCT */ + 265, /* (182) distinct ::= */ + 251, /* (183) from ::= FROM tablelist */ + 251, /* (184) from ::= FROM sub */ + 269, /* (185) sub ::= LP union RP */ + 269, /* (186) sub ::= LP union RP ids */ + 269, /* (187) sub ::= sub COMMA LP union RP ids */ + 268, /* (188) tablelist ::= ids cpxName */ + 268, /* (189) tablelist ::= ids cpxName ids */ + 268, /* (190) tablelist ::= tablelist COMMA ids cpxName */ + 268, /* (191) tablelist ::= tablelist COMMA ids cpxName ids */ + 270, /* (192) tmvar ::= VARIABLE */ + 253, /* (193) interval_option ::= intervalKey LP tmvar RP */ + 253, /* (194) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ + 253, /* (195) interval_option ::= */ + 271, /* (196) intervalKey ::= INTERVAL */ + 271, /* (197) intervalKey ::= EVERY */ + 255, /* (198) session_option ::= */ + 255, /* (199) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + 256, /* (200) windowstate_option ::= */ + 256, /* (201) windowstate_option ::= STATE_WINDOW LP ids RP */ + 257, /* (202) fill_opt ::= */ + 257, /* (203) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + 257, /* (204) fill_opt ::= FILL LP ID RP */ + 254, /* (205) sliding_opt ::= SLIDING LP tmvar RP */ + 254, /* (206) sliding_opt ::= */ + 260, /* (207) orderby_opt ::= */ + 260, /* (208) orderby_opt ::= ORDER BY sortlist */ + 272, /* (209) sortlist ::= sortlist COMMA item sortorder */ + 272, /* (210) sortlist ::= item sortorder */ + 274, /* (211) item ::= ids cpxName */ + 275, /* (212) sortorder ::= ASC */ + 275, /* (213) sortorder ::= DESC */ + 275, /* (214) sortorder ::= */ + 258, /* (215) groupby_opt ::= */ + 258, /* (216) groupby_opt ::= GROUP BY grouplist */ + 276, /* (217) grouplist ::= grouplist COMMA item */ + 276, /* (218) grouplist ::= item */ + 259, /* (219) having_opt ::= */ + 259, /* (220) having_opt ::= HAVING expr */ + 262, /* (221) limit_opt ::= */ + 262, /* (222) limit_opt ::= LIMIT signed */ + 262, /* (223) limit_opt ::= LIMIT signed OFFSET signed */ + 262, /* (224) limit_opt ::= LIMIT signed COMMA signed */ + 261, /* (225) slimit_opt ::= */ + 261, /* (226) slimit_opt ::= SLIMIT signed */ + 261, /* (227) slimit_opt ::= SLIMIT signed SOFFSET signed */ + 261, /* (228) slimit_opt ::= SLIMIT signed COMMA signed */ + 252, /* (229) where_opt ::= */ + 252, /* (230) where_opt ::= WHERE expr */ + 266, /* (231) expr ::= LP expr RP */ + 266, /* (232) expr ::= ID */ + 266, /* (233) expr ::= ID DOT ID */ + 266, /* (234) expr ::= ID DOT STAR */ + 266, /* (235) expr ::= INTEGER */ + 266, /* (236) expr ::= MINUS INTEGER */ + 266, /* (237) expr ::= PLUS INTEGER */ + 266, /* (238) expr ::= FLOAT */ + 266, /* (239) expr ::= MINUS FLOAT */ + 266, /* (240) expr ::= PLUS FLOAT */ + 266, /* (241) expr ::= STRING */ + 266, /* (242) expr ::= NOW */ + 266, /* (243) expr ::= VARIABLE */ + 266, /* (244) expr ::= PLUS VARIABLE */ + 266, /* (245) expr ::= MINUS VARIABLE */ + 266, /* (246) expr ::= BOOL */ + 266, /* (247) expr ::= NULL */ + 266, /* (248) expr ::= ID LP exprlist RP */ + 266, /* (249) expr ::= ID LP STAR RP */ + 266, /* (250) expr ::= expr IS NULL */ + 266, /* (251) expr ::= expr IS NOT NULL */ + 266, /* (252) expr ::= expr LT expr */ + 266, /* (253) expr ::= expr GT expr */ + 266, /* (254) expr ::= expr LE expr */ + 266, /* (255) expr ::= expr GE expr */ + 266, /* (256) expr ::= expr NE expr */ + 266, /* (257) expr ::= expr EQ expr */ + 266, /* (258) expr ::= expr BETWEEN expr AND expr */ + 266, /* (259) expr ::= expr AND expr */ + 266, /* (260) expr ::= expr OR expr */ + 266, /* (261) expr ::= expr PLUS expr */ + 266, /* (262) expr ::= expr MINUS expr */ + 266, /* (263) expr ::= expr STAR expr */ + 266, /* (264) expr ::= expr SLASH expr */ + 266, /* (265) expr ::= expr REM expr */ + 266, /* (266) expr ::= expr LIKE expr */ + 266, /* (267) expr ::= expr IN LP exprlist RP */ + 206, /* (268) exprlist ::= exprlist COMMA expritem */ + 206, /* (269) exprlist ::= expritem */ + 277, /* (270) expritem ::= expr */ + 277, /* (271) expritem ::= */ + 198, /* (272) cmd ::= RESET QUERY CACHE */ + 198, /* (273) cmd ::= SYNCDB ids REPLICA */ + 198, /* (274) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + 198, /* (275) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + 198, /* (276) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + 198, /* (277) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + 198, /* (278) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + 198, /* (279) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + 198, /* (280) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + 198, /* (281) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + 198, /* (282) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + 198, /* (283) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + 198, /* (284) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + 198, /* (285) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + 198, /* (286) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + 198, /* (287) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + 198, /* (288) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + 198, /* (289) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + 198, /* (290) cmd ::= KILL CONNECTION INTEGER */ + 198, /* (291) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + 198, /* (292) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; /* For rule J, yyRuleInfoNRhs[J] contains the negative of the number @@ -2499,135 +2504,137 @@ static const signed char yyRuleInfoNRhs[] = { -1, /* (159) tagitem ::= BOOL */ -1, /* (160) tagitem ::= NULL */ -1, /* (161) tagitem ::= NOW */ - -2, /* (162) tagitem ::= MINUS INTEGER */ - -2, /* (163) tagitem ::= MINUS FLOAT */ - -2, /* (164) tagitem ::= PLUS INTEGER */ - -2, /* (165) tagitem ::= PLUS FLOAT */ - -14, /* (166) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ - -3, /* (167) select ::= LP select RP */ - -1, /* (168) union ::= select */ - -4, /* (169) union ::= union UNION ALL select */ - -1, /* (170) cmd ::= union */ - -2, /* (171) select ::= SELECT selcollist */ - -2, /* (172) sclp ::= selcollist COMMA */ - 0, /* (173) sclp ::= */ - -4, /* (174) selcollist ::= sclp distinct expr as */ - -2, /* (175) selcollist ::= sclp STAR */ - -2, /* (176) as ::= AS ids */ - -1, /* (177) as ::= ids */ - 0, /* (178) as ::= */ - -1, /* (179) distinct ::= DISTINCT */ - 0, /* (180) distinct ::= */ - -2, /* (181) from ::= FROM tablelist */ - -2, /* (182) from ::= FROM sub */ - -3, /* (183) sub ::= LP union RP */ - -4, /* (184) sub ::= LP union RP ids */ - -6, /* (185) sub ::= sub COMMA LP union RP ids */ - -2, /* (186) tablelist ::= ids cpxName */ - -3, /* (187) tablelist ::= ids cpxName ids */ - -4, /* (188) tablelist ::= tablelist COMMA ids cpxName */ - -5, /* (189) tablelist ::= tablelist COMMA ids cpxName ids */ - -1, /* (190) tmvar ::= VARIABLE */ - -4, /* (191) interval_option ::= intervalKey LP tmvar RP */ - -6, /* (192) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ - 0, /* (193) interval_option ::= */ - -1, /* (194) intervalKey ::= INTERVAL */ - -1, /* (195) intervalKey ::= EVERY */ - 0, /* (196) session_option ::= */ - -7, /* (197) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - 0, /* (198) windowstate_option ::= */ - -4, /* (199) windowstate_option ::= STATE_WINDOW LP ids RP */ - 0, /* (200) fill_opt ::= */ - -6, /* (201) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - -4, /* (202) fill_opt ::= FILL LP ID RP */ - -4, /* (203) sliding_opt ::= SLIDING LP tmvar RP */ - 0, /* (204) sliding_opt ::= */ - 0, /* (205) orderby_opt ::= */ - -3, /* (206) orderby_opt ::= ORDER BY sortlist */ - -4, /* (207) sortlist ::= sortlist COMMA item sortorder */ - -2, /* (208) sortlist ::= item sortorder */ - -2, /* (209) item ::= ids cpxName */ - -1, /* (210) sortorder ::= ASC */ - -1, /* (211) sortorder ::= DESC */ - 0, /* (212) sortorder ::= */ - 0, /* (213) groupby_opt ::= */ - -3, /* (214) groupby_opt ::= GROUP BY grouplist */ - -3, /* (215) grouplist ::= grouplist COMMA item */ - -1, /* (216) grouplist ::= item */ - 0, /* (217) having_opt ::= */ - -2, /* (218) having_opt ::= HAVING expr */ - 0, /* (219) limit_opt ::= */ - -2, /* (220) limit_opt ::= LIMIT signed */ - -4, /* (221) limit_opt ::= LIMIT signed OFFSET signed */ - -4, /* (222) limit_opt ::= LIMIT signed COMMA signed */ - 0, /* (223) slimit_opt ::= */ - -2, /* (224) slimit_opt ::= SLIMIT signed */ - -4, /* (225) slimit_opt ::= SLIMIT signed SOFFSET signed */ - -4, /* (226) slimit_opt ::= SLIMIT signed COMMA signed */ - 0, /* (227) where_opt ::= */ - -2, /* (228) where_opt ::= WHERE expr */ - -3, /* (229) expr ::= LP expr RP */ - -1, /* (230) expr ::= ID */ - -3, /* (231) expr ::= ID DOT ID */ - -3, /* (232) expr ::= ID DOT STAR */ - -1, /* (233) expr ::= INTEGER */ - -2, /* (234) expr ::= MINUS INTEGER */ - -2, /* (235) expr ::= PLUS INTEGER */ - -1, /* (236) expr ::= FLOAT */ - -2, /* (237) expr ::= MINUS FLOAT */ - -2, /* (238) expr ::= PLUS FLOAT */ - -1, /* (239) expr ::= STRING */ - -1, /* (240) expr ::= NOW */ - -1, /* (241) expr ::= VARIABLE */ - -2, /* (242) expr ::= PLUS VARIABLE */ - -2, /* (243) expr ::= MINUS VARIABLE */ - -1, /* (244) expr ::= BOOL */ - -1, /* (245) expr ::= NULL */ - -4, /* (246) expr ::= ID LP exprlist RP */ - -4, /* (247) expr ::= ID LP STAR RP */ - -3, /* (248) expr ::= expr IS NULL */ - -4, /* (249) expr ::= expr IS NOT NULL */ - -3, /* (250) expr ::= expr LT expr */ - -3, /* (251) expr ::= expr GT expr */ - -3, /* (252) expr ::= expr LE expr */ - -3, /* (253) expr ::= expr GE expr */ - -3, /* (254) expr ::= expr NE expr */ - -3, /* (255) expr ::= expr EQ expr */ - -5, /* (256) expr ::= expr BETWEEN expr AND expr */ - -3, /* (257) expr ::= expr AND expr */ - -3, /* (258) expr ::= expr OR expr */ - -3, /* (259) expr ::= expr PLUS expr */ - -3, /* (260) expr ::= expr MINUS expr */ - -3, /* (261) expr ::= expr STAR expr */ - -3, /* (262) expr ::= expr SLASH expr */ - -3, /* (263) expr ::= expr REM expr */ - -3, /* (264) expr ::= expr LIKE expr */ - -5, /* (265) expr ::= expr IN LP exprlist RP */ - -3, /* (266) exprlist ::= exprlist COMMA expritem */ - -1, /* (267) exprlist ::= expritem */ - -1, /* (268) expritem ::= expr */ - 0, /* (269) expritem ::= */ - -3, /* (270) cmd ::= RESET QUERY CACHE */ - -3, /* (271) cmd ::= SYNCDB ids REPLICA */ - -7, /* (272) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - -7, /* (273) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - -7, /* (274) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - -7, /* (275) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - -7, /* (276) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - -8, /* (277) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - -9, /* (278) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - -7, /* (279) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - -7, /* (280) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - -7, /* (281) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - -7, /* (282) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - -7, /* (283) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - -7, /* (284) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - -8, /* (285) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - -9, /* (286) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - -7, /* (287) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - -3, /* (288) cmd ::= KILL CONNECTION INTEGER */ - -5, /* (289) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - -5, /* (290) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + -3, /* (162) tagitem ::= NOW PLUS VARIABLE */ + -3, /* (163) tagitem ::= NOW MINUS VARIABLE */ + -2, /* (164) tagitem ::= MINUS INTEGER */ + -2, /* (165) tagitem ::= MINUS FLOAT */ + -2, /* (166) tagitem ::= PLUS INTEGER */ + -2, /* (167) tagitem ::= PLUS FLOAT */ + -14, /* (168) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + -3, /* (169) select ::= LP select RP */ + -1, /* (170) union ::= select */ + -4, /* (171) union ::= union UNION ALL select */ + -1, /* (172) cmd ::= union */ + -2, /* (173) select ::= SELECT selcollist */ + -2, /* (174) sclp ::= selcollist COMMA */ + 0, /* (175) sclp ::= */ + -4, /* (176) selcollist ::= sclp distinct expr as */ + -2, /* (177) selcollist ::= sclp STAR */ + -2, /* (178) as ::= AS ids */ + -1, /* (179) as ::= ids */ + 0, /* (180) as ::= */ + -1, /* (181) distinct ::= DISTINCT */ + 0, /* (182) distinct ::= */ + -2, /* (183) from ::= FROM tablelist */ + -2, /* (184) from ::= FROM sub */ + -3, /* (185) sub ::= LP union RP */ + -4, /* (186) sub ::= LP union RP ids */ + -6, /* (187) sub ::= sub COMMA LP union RP ids */ + -2, /* (188) tablelist ::= ids cpxName */ + -3, /* (189) tablelist ::= ids cpxName ids */ + -4, /* (190) tablelist ::= tablelist COMMA ids cpxName */ + -5, /* (191) tablelist ::= tablelist COMMA ids cpxName ids */ + -1, /* (192) tmvar ::= VARIABLE */ + -4, /* (193) interval_option ::= intervalKey LP tmvar RP */ + -6, /* (194) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ + 0, /* (195) interval_option ::= */ + -1, /* (196) intervalKey ::= INTERVAL */ + -1, /* (197) intervalKey ::= EVERY */ + 0, /* (198) session_option ::= */ + -7, /* (199) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + 0, /* (200) windowstate_option ::= */ + -4, /* (201) windowstate_option ::= STATE_WINDOW LP ids RP */ + 0, /* (202) fill_opt ::= */ + -6, /* (203) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + -4, /* (204) fill_opt ::= FILL LP ID RP */ + -4, /* (205) sliding_opt ::= SLIDING LP tmvar RP */ + 0, /* (206) sliding_opt ::= */ + 0, /* (207) orderby_opt ::= */ + -3, /* (208) orderby_opt ::= ORDER BY sortlist */ + -4, /* (209) sortlist ::= sortlist COMMA item sortorder */ + -2, /* (210) sortlist ::= item sortorder */ + -2, /* (211) item ::= ids cpxName */ + -1, /* (212) sortorder ::= ASC */ + -1, /* (213) sortorder ::= DESC */ + 0, /* (214) sortorder ::= */ + 0, /* (215) groupby_opt ::= */ + -3, /* (216) groupby_opt ::= GROUP BY grouplist */ + -3, /* (217) grouplist ::= grouplist COMMA item */ + -1, /* (218) grouplist ::= item */ + 0, /* (219) having_opt ::= */ + -2, /* (220) having_opt ::= HAVING expr */ + 0, /* (221) limit_opt ::= */ + -2, /* (222) limit_opt ::= LIMIT signed */ + -4, /* (223) limit_opt ::= LIMIT signed OFFSET signed */ + -4, /* (224) limit_opt ::= LIMIT signed COMMA signed */ + 0, /* (225) slimit_opt ::= */ + -2, /* (226) slimit_opt ::= SLIMIT signed */ + -4, /* (227) slimit_opt ::= SLIMIT signed SOFFSET signed */ + -4, /* (228) slimit_opt ::= SLIMIT signed COMMA signed */ + 0, /* (229) where_opt ::= */ + -2, /* (230) where_opt ::= WHERE expr */ + -3, /* (231) expr ::= LP expr RP */ + -1, /* (232) expr ::= ID */ + -3, /* (233) expr ::= ID DOT ID */ + -3, /* (234) expr ::= ID DOT STAR */ + -1, /* (235) expr ::= INTEGER */ + -2, /* (236) expr ::= MINUS INTEGER */ + -2, /* (237) expr ::= PLUS INTEGER */ + -1, /* (238) expr ::= FLOAT */ + -2, /* (239) expr ::= MINUS FLOAT */ + -2, /* (240) expr ::= PLUS FLOAT */ + -1, /* (241) expr ::= STRING */ + -1, /* (242) expr ::= NOW */ + -1, /* (243) expr ::= VARIABLE */ + -2, /* (244) expr ::= PLUS VARIABLE */ + -2, /* (245) expr ::= MINUS VARIABLE */ + -1, /* (246) expr ::= BOOL */ + -1, /* (247) expr ::= NULL */ + -4, /* (248) expr ::= ID LP exprlist RP */ + -4, /* (249) expr ::= ID LP STAR RP */ + -3, /* (250) expr ::= expr IS NULL */ + -4, /* (251) expr ::= expr IS NOT NULL */ + -3, /* (252) expr ::= expr LT expr */ + -3, /* (253) expr ::= expr GT expr */ + -3, /* (254) expr ::= expr LE expr */ + -3, /* (255) expr ::= expr GE expr */ + -3, /* (256) expr ::= expr NE expr */ + -3, /* (257) expr ::= expr EQ expr */ + -5, /* (258) expr ::= expr BETWEEN expr AND expr */ + -3, /* (259) expr ::= expr AND expr */ + -3, /* (260) expr ::= expr OR expr */ + -3, /* (261) expr ::= expr PLUS expr */ + -3, /* (262) expr ::= expr MINUS expr */ + -3, /* (263) expr ::= expr STAR expr */ + -3, /* (264) expr ::= expr SLASH expr */ + -3, /* (265) expr ::= expr REM expr */ + -3, /* (266) expr ::= expr LIKE expr */ + -5, /* (267) expr ::= expr IN LP exprlist RP */ + -3, /* (268) exprlist ::= exprlist COMMA expritem */ + -1, /* (269) exprlist ::= expritem */ + -1, /* (270) expritem ::= expr */ + 0, /* (271) expritem ::= */ + -3, /* (272) cmd ::= RESET QUERY CACHE */ + -3, /* (273) cmd ::= SYNCDB ids REPLICA */ + -7, /* (274) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + -7, /* (275) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + -7, /* (276) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + -7, /* (277) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + -7, /* (278) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + -8, /* (279) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + -9, /* (280) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + -7, /* (281) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + -7, /* (282) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + -7, /* (283) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + -7, /* (284) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + -7, /* (285) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + -7, /* (286) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + -8, /* (287) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + -9, /* (288) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + -7, /* (289) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + -3, /* (290) cmd ::= KILL CONNECTION INTEGER */ + -5, /* (291) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + -5, /* (292) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2863,7 +2870,7 @@ static YYACTIONTYPE yy_reduce( break; case 54: /* ifexists ::= */ case 56: /* ifnotexists ::= */ yytestcase(yyruleno==56); - case 180: /* distinct ::= */ yytestcase(yyruleno==180); + case 182: /* distinct ::= */ yytestcase(yyruleno==182); { yymsp[1].minor.yy0.n = 0;} break; case 55: /* ifnotexists ::= IF NOT EXISTS */ @@ -3178,13 +3185,25 @@ static YYACTIONTYPE yy_reduce( yymsp[0].minor.yy430 = yylhsminor.yy430; break; case 161: /* tagitem ::= NOW */ -{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0);} +{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreateExt(&yylhsminor.yy430, &yymsp[0].minor.yy0, TK_NOW);} yymsp[0].minor.yy430 = yylhsminor.yy430; break; - case 162: /* tagitem ::= MINUS INTEGER */ - case 163: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==163); - case 164: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==164); - case 165: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==165); + case 162: /* tagitem ::= NOW PLUS VARIABLE */ +{ + yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; + tVariantCreateExt(&yymsp[-2].minor.yy430, &yymsp[0].minor.yy0, TK_PLUS); +} + break; + case 163: /* tagitem ::= NOW MINUS VARIABLE */ +{ + yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; + tVariantCreateExt(&yymsp[-2].minor.yy430, &yymsp[0].minor.yy0, TK_MINUS); +} + break; + case 164: /* tagitem ::= MINUS INTEGER */ + case 165: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==165); + case 166: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==166); + case 167: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==167); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; @@ -3193,150 +3212,150 @@ static YYACTIONTYPE yy_reduce( } yymsp[-1].minor.yy430 = yylhsminor.yy430; break; - case 166: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + case 168: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ { yylhsminor.yy56 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy421, yymsp[-11].minor.yy8, yymsp[-10].minor.yy439, yymsp[-4].minor.yy421, yymsp[-2].minor.yy421, &yymsp[-9].minor.yy400, &yymsp[-7].minor.yy147, &yymsp[-6].minor.yy40, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy421, &yymsp[0].minor.yy166, &yymsp[-1].minor.yy166, yymsp[-3].minor.yy439); } yymsp[-13].minor.yy56 = yylhsminor.yy56; break; - case 167: /* select ::= LP select RP */ + case 169: /* select ::= LP select RP */ {yymsp[-2].minor.yy56 = yymsp[-1].minor.yy56;} break; - case 168: /* union ::= select */ + case 170: /* union ::= select */ { yylhsminor.yy421 = setSubclause(NULL, yymsp[0].minor.yy56); } yymsp[0].minor.yy421 = yylhsminor.yy421; break; - case 169: /* union ::= union UNION ALL select */ + case 171: /* union ::= union UNION ALL select */ { yylhsminor.yy421 = appendSelectClause(yymsp[-3].minor.yy421, yymsp[0].minor.yy56); } yymsp[-3].minor.yy421 = yylhsminor.yy421; break; - case 170: /* cmd ::= union */ + case 172: /* cmd ::= union */ { setSqlInfo(pInfo, yymsp[0].minor.yy421, NULL, TSDB_SQL_SELECT); } break; - case 171: /* select ::= SELECT selcollist */ + case 173: /* select ::= SELECT selcollist */ { yylhsminor.yy56 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy421, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } yymsp[-1].minor.yy56 = yylhsminor.yy56; break; - case 172: /* sclp ::= selcollist COMMA */ + case 174: /* sclp ::= selcollist COMMA */ {yylhsminor.yy421 = yymsp[-1].minor.yy421;} yymsp[-1].minor.yy421 = yylhsminor.yy421; break; - case 173: /* sclp ::= */ - case 205: /* orderby_opt ::= */ yytestcase(yyruleno==205); + case 175: /* sclp ::= */ + case 207: /* orderby_opt ::= */ yytestcase(yyruleno==207); {yymsp[1].minor.yy421 = 0;} break; - case 174: /* selcollist ::= sclp distinct expr as */ + case 176: /* selcollist ::= sclp distinct expr as */ { yylhsminor.yy421 = tSqlExprListAppend(yymsp[-3].minor.yy421, yymsp[-1].minor.yy439, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } yymsp[-3].minor.yy421 = yylhsminor.yy421; break; - case 175: /* selcollist ::= sclp STAR */ + case 177: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(pInfo, NULL, TK_ALL); yylhsminor.yy421 = tSqlExprListAppend(yymsp[-1].minor.yy421, pNode, 0, 0); } yymsp[-1].minor.yy421 = yylhsminor.yy421; break; - case 176: /* as ::= AS ids */ + case 178: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 177: /* as ::= ids */ + case 179: /* as ::= ids */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 178: /* as ::= */ + case 180: /* as ::= */ { yymsp[1].minor.yy0.n = 0; } break; - case 179: /* distinct ::= DISTINCT */ + case 181: /* distinct ::= DISTINCT */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 181: /* from ::= FROM tablelist */ - case 182: /* from ::= FROM sub */ yytestcase(yyruleno==182); + case 183: /* from ::= FROM tablelist */ + case 184: /* from ::= FROM sub */ yytestcase(yyruleno==184); {yymsp[-1].minor.yy8 = yymsp[0].minor.yy8;} break; - case 183: /* sub ::= LP union RP */ + case 185: /* sub ::= LP union RP */ {yymsp[-2].minor.yy8 = addSubqueryElem(NULL, yymsp[-1].minor.yy421, NULL);} break; - case 184: /* sub ::= LP union RP ids */ + case 186: /* sub ::= LP union RP ids */ {yymsp[-3].minor.yy8 = addSubqueryElem(NULL, yymsp[-2].minor.yy421, &yymsp[0].minor.yy0);} break; - case 185: /* sub ::= sub COMMA LP union RP ids */ + case 187: /* sub ::= sub COMMA LP union RP ids */ {yylhsminor.yy8 = addSubqueryElem(yymsp[-5].minor.yy8, yymsp[-2].minor.yy421, &yymsp[0].minor.yy0);} yymsp[-5].minor.yy8 = yylhsminor.yy8; break; - case 186: /* tablelist ::= ids cpxName */ + case 188: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy8 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } yymsp[-1].minor.yy8 = yylhsminor.yy8; break; - case 187: /* tablelist ::= ids cpxName ids */ + case 189: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; yylhsminor.yy8 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } yymsp[-2].minor.yy8 = yylhsminor.yy8; break; - case 188: /* tablelist ::= tablelist COMMA ids cpxName */ + case 190: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy8 = setTableNameList(yymsp[-3].minor.yy8, &yymsp[-1].minor.yy0, NULL); } yymsp[-3].minor.yy8 = yylhsminor.yy8; break; - case 189: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 191: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; yylhsminor.yy8 = setTableNameList(yymsp[-4].minor.yy8, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } yymsp[-4].minor.yy8 = yylhsminor.yy8; break; - case 190: /* tmvar ::= VARIABLE */ + case 192: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 191: /* interval_option ::= intervalKey LP tmvar RP */ + case 193: /* interval_option ::= intervalKey LP tmvar RP */ {yylhsminor.yy400.interval = yymsp[-1].minor.yy0; yylhsminor.yy400.offset.n = 0; yylhsminor.yy400.token = yymsp[-3].minor.yy104;} yymsp[-3].minor.yy400 = yylhsminor.yy400; break; - case 192: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ + case 194: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ {yylhsminor.yy400.interval = yymsp[-3].minor.yy0; yylhsminor.yy400.offset = yymsp[-1].minor.yy0; yylhsminor.yy400.token = yymsp[-5].minor.yy104;} yymsp[-5].minor.yy400 = yylhsminor.yy400; break; - case 193: /* interval_option ::= */ + case 195: /* interval_option ::= */ {memset(&yymsp[1].minor.yy400, 0, sizeof(yymsp[1].minor.yy400));} break; - case 194: /* intervalKey ::= INTERVAL */ + case 196: /* intervalKey ::= INTERVAL */ {yymsp[0].minor.yy104 = TK_INTERVAL;} break; - case 195: /* intervalKey ::= EVERY */ + case 197: /* intervalKey ::= EVERY */ {yymsp[0].minor.yy104 = TK_EVERY; } break; - case 196: /* session_option ::= */ + case 198: /* session_option ::= */ {yymsp[1].minor.yy147.col.n = 0; yymsp[1].minor.yy147.gap.n = 0;} break; - case 197: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + case 199: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-6].minor.yy147.col = yymsp[-4].minor.yy0; yymsp[-6].minor.yy147.gap = yymsp[-1].minor.yy0; } break; - case 198: /* windowstate_option ::= */ + case 200: /* windowstate_option ::= */ { yymsp[1].minor.yy40.col.n = 0; yymsp[1].minor.yy40.col.z = NULL;} break; - case 199: /* windowstate_option ::= STATE_WINDOW LP ids RP */ + case 201: /* windowstate_option ::= STATE_WINDOW LP ids RP */ { yymsp[-3].minor.yy40.col = yymsp[-1].minor.yy0; } break; - case 200: /* fill_opt ::= */ + case 202: /* fill_opt ::= */ { yymsp[1].minor.yy421 = 0; } break; - case 201: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 203: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); @@ -3346,34 +3365,34 @@ static YYACTIONTYPE yy_reduce( yymsp[-5].minor.yy421 = yymsp[-1].minor.yy421; } break; - case 202: /* fill_opt ::= FILL LP ID RP */ + case 204: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-3].minor.yy421 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 203: /* sliding_opt ::= SLIDING LP tmvar RP */ + case 205: /* sliding_opt ::= SLIDING LP tmvar RP */ {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; - case 204: /* sliding_opt ::= */ + case 206: /* sliding_opt ::= */ {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; - case 206: /* orderby_opt ::= ORDER BY sortlist */ + case 208: /* orderby_opt ::= ORDER BY sortlist */ {yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} break; - case 207: /* sortlist ::= sortlist COMMA item sortorder */ + case 209: /* sortlist ::= sortlist COMMA item sortorder */ { yylhsminor.yy421 = tVariantListAppend(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96); } yymsp[-3].minor.yy421 = yylhsminor.yy421; break; - case 208: /* sortlist ::= item sortorder */ + case 210: /* sortlist ::= item sortorder */ { yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96); } yymsp[-1].minor.yy421 = yylhsminor.yy421; break; - case 209: /* item ::= ids cpxName */ + case 211: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; @@ -3382,227 +3401,227 @@ static YYACTIONTYPE yy_reduce( } yymsp[-1].minor.yy430 = yylhsminor.yy430; break; - case 210: /* sortorder ::= ASC */ + case 212: /* sortorder ::= ASC */ { yymsp[0].minor.yy96 = TSDB_ORDER_ASC; } break; - case 211: /* sortorder ::= DESC */ + case 213: /* sortorder ::= DESC */ { yymsp[0].minor.yy96 = TSDB_ORDER_DESC;} break; - case 212: /* sortorder ::= */ + case 214: /* sortorder ::= */ { yymsp[1].minor.yy96 = TSDB_ORDER_ASC; } break; - case 213: /* groupby_opt ::= */ + case 215: /* groupby_opt ::= */ { yymsp[1].minor.yy421 = 0;} break; - case 214: /* groupby_opt ::= GROUP BY grouplist */ + case 216: /* groupby_opt ::= GROUP BY grouplist */ { yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} break; - case 215: /* grouplist ::= grouplist COMMA item */ + case 217: /* grouplist ::= grouplist COMMA item */ { yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); } yymsp[-2].minor.yy421 = yylhsminor.yy421; break; - case 216: /* grouplist ::= item */ + case 218: /* grouplist ::= item */ { yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); } yymsp[0].minor.yy421 = yylhsminor.yy421; break; - case 217: /* having_opt ::= */ - case 227: /* where_opt ::= */ yytestcase(yyruleno==227); - case 269: /* expritem ::= */ yytestcase(yyruleno==269); + case 219: /* having_opt ::= */ + case 229: /* where_opt ::= */ yytestcase(yyruleno==229); + case 271: /* expritem ::= */ yytestcase(yyruleno==271); {yymsp[1].minor.yy439 = 0;} break; - case 218: /* having_opt ::= HAVING expr */ - case 228: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==228); + case 220: /* having_opt ::= HAVING expr */ + case 230: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==230); {yymsp[-1].minor.yy439 = yymsp[0].minor.yy439;} break; - case 219: /* limit_opt ::= */ - case 223: /* slimit_opt ::= */ yytestcase(yyruleno==223); + case 221: /* limit_opt ::= */ + case 225: /* slimit_opt ::= */ yytestcase(yyruleno==225); {yymsp[1].minor.yy166.limit = -1; yymsp[1].minor.yy166.offset = 0;} break; - case 220: /* limit_opt ::= LIMIT signed */ - case 224: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==224); + case 222: /* limit_opt ::= LIMIT signed */ + case 226: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==226); {yymsp[-1].minor.yy166.limit = yymsp[0].minor.yy325; yymsp[-1].minor.yy166.offset = 0;} break; - case 221: /* limit_opt ::= LIMIT signed OFFSET signed */ + case 223: /* limit_opt ::= LIMIT signed OFFSET signed */ { yymsp[-3].minor.yy166.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[0].minor.yy325;} break; - case 222: /* limit_opt ::= LIMIT signed COMMA signed */ + case 224: /* limit_opt ::= LIMIT signed COMMA signed */ { yymsp[-3].minor.yy166.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[-2].minor.yy325;} break; - case 225: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ + case 227: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ {yymsp[-3].minor.yy166.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[0].minor.yy325;} break; - case 226: /* slimit_opt ::= SLIMIT signed COMMA signed */ + case 228: /* slimit_opt ::= SLIMIT signed COMMA signed */ {yymsp[-3].minor.yy166.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy166.offset = yymsp[-2].minor.yy325;} break; - case 229: /* expr ::= LP expr RP */ + case 231: /* expr ::= LP expr RP */ {yylhsminor.yy439 = yymsp[-1].minor.yy439; yylhsminor.yy439->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy439->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 230: /* expr ::= ID */ + case 232: /* expr ::= ID */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_ID);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 231: /* expr ::= ID DOT ID */ + case 233: /* expr ::= ID DOT ID */ { yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[-2].minor.yy0, TK_ID);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 232: /* expr ::= ID DOT STAR */ + case 234: /* expr ::= ID DOT STAR */ { yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[-2].minor.yy0, TK_ALL);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 233: /* expr ::= INTEGER */ + case 235: /* expr ::= INTEGER */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_INTEGER);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 234: /* expr ::= MINUS INTEGER */ - case 235: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==235); + case 236: /* expr ::= MINUS INTEGER */ + case 237: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==237); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[-1].minor.yy0, TK_INTEGER);} yymsp[-1].minor.yy439 = yylhsminor.yy439; break; - case 236: /* expr ::= FLOAT */ + case 238: /* expr ::= FLOAT */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_FLOAT);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 237: /* expr ::= MINUS FLOAT */ - case 238: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==238); + case 239: /* expr ::= MINUS FLOAT */ + case 240: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==240); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[-1].minor.yy0, TK_FLOAT);} yymsp[-1].minor.yy439 = yylhsminor.yy439; break; - case 239: /* expr ::= STRING */ + case 241: /* expr ::= STRING */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_STRING);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 240: /* expr ::= NOW */ + case 242: /* expr ::= NOW */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_NOW); } yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 241: /* expr ::= VARIABLE */ + case 243: /* expr ::= VARIABLE */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_VARIABLE);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 242: /* expr ::= PLUS VARIABLE */ - case 243: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==243); + case 244: /* expr ::= PLUS VARIABLE */ + case 245: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==245); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[-1].minor.yy0, TK_VARIABLE);} yymsp[-1].minor.yy439 = yylhsminor.yy439; break; - case 244: /* expr ::= BOOL */ + case 246: /* expr ::= BOOL */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_BOOL);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 245: /* expr ::= NULL */ + case 247: /* expr ::= NULL */ { yylhsminor.yy439 = tSqlExprCreateIdValue(pInfo, &yymsp[0].minor.yy0, TK_NULL);} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 246: /* expr ::= ID LP exprlist RP */ + case 248: /* expr ::= ID LP exprlist RP */ { tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy439 = tSqlExprCreateFunction(yymsp[-1].minor.yy421, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } yymsp[-3].minor.yy439 = yylhsminor.yy439; break; - case 247: /* expr ::= ID LP STAR RP */ + case 249: /* expr ::= ID LP STAR RP */ { tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy439 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } yymsp[-3].minor.yy439 = yylhsminor.yy439; break; - case 248: /* expr ::= expr IS NULL */ + case 250: /* expr ::= expr IS NULL */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, NULL, TK_ISNULL);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 249: /* expr ::= expr IS NOT NULL */ + case 251: /* expr ::= expr IS NOT NULL */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-3].minor.yy439, NULL, TK_NOTNULL);} yymsp[-3].minor.yy439 = yylhsminor.yy439; break; - case 250: /* expr ::= expr LT expr */ + case 252: /* expr ::= expr LT expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LT);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 251: /* expr ::= expr GT expr */ + case 253: /* expr ::= expr GT expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_GT);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 252: /* expr ::= expr LE expr */ + case 254: /* expr ::= expr LE expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LE);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 253: /* expr ::= expr GE expr */ + case 255: /* expr ::= expr GE expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_GE);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 254: /* expr ::= expr NE expr */ + case 256: /* expr ::= expr NE expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_NE);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 255: /* expr ::= expr EQ expr */ + case 257: /* expr ::= expr EQ expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_EQ);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 256: /* expr ::= expr BETWEEN expr AND expr */ + case 258: /* expr ::= expr BETWEEN expr AND expr */ { tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy439); yylhsminor.yy439 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy439, yymsp[-2].minor.yy439, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy439, TK_LE), TK_AND);} yymsp[-4].minor.yy439 = yylhsminor.yy439; break; - case 257: /* expr ::= expr AND expr */ + case 259: /* expr ::= expr AND expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_AND);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 258: /* expr ::= expr OR expr */ + case 260: /* expr ::= expr OR expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_OR); } yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 259: /* expr ::= expr PLUS expr */ + case 261: /* expr ::= expr PLUS expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_PLUS); } yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 260: /* expr ::= expr MINUS expr */ + case 262: /* expr ::= expr MINUS expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_MINUS); } yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 261: /* expr ::= expr STAR expr */ + case 263: /* expr ::= expr STAR expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_STAR); } yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 262: /* expr ::= expr SLASH expr */ + case 264: /* expr ::= expr SLASH expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_DIVIDE);} yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 263: /* expr ::= expr REM expr */ + case 265: /* expr ::= expr REM expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_REM); } yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 264: /* expr ::= expr LIKE expr */ + case 266: /* expr ::= expr LIKE expr */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LIKE); } yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 265: /* expr ::= expr IN LP exprlist RP */ + case 267: /* expr ::= expr IN LP exprlist RP */ {yylhsminor.yy439 = tSqlExprCreate(yymsp[-4].minor.yy439, (tSqlExpr*)yymsp[-1].minor.yy421, TK_IN); } yymsp[-4].minor.yy439 = yylhsminor.yy439; break; - case 266: /* exprlist ::= exprlist COMMA expritem */ + case 268: /* exprlist ::= exprlist COMMA expritem */ {yylhsminor.yy421 = tSqlExprListAppend(yymsp[-2].minor.yy421,yymsp[0].minor.yy439,0, 0);} yymsp[-2].minor.yy421 = yylhsminor.yy421; break; - case 267: /* exprlist ::= expritem */ + case 269: /* exprlist ::= expritem */ {yylhsminor.yy421 = tSqlExprListAppend(0,yymsp[0].minor.yy439,0, 0);} yymsp[0].minor.yy421 = yylhsminor.yy421; break; - case 268: /* expritem ::= expr */ + case 270: /* expritem ::= expr */ {yylhsminor.yy439 = yymsp[0].minor.yy439;} yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 270: /* cmd ::= RESET QUERY CACHE */ + case 272: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 271: /* cmd ::= SYNCDB ids REPLICA */ + case 273: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 272: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 274: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 273: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 275: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3613,21 +3632,21 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 274: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + case 276: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 275: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 277: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 276: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 278: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3638,7 +3657,7 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 277: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 279: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3652,7 +3671,7 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 278: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 280: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -3664,21 +3683,21 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 279: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + case 281: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 280: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 282: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 281: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 283: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3689,21 +3708,21 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 282: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + case 284: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 283: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 285: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 284: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 286: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3714,7 +3733,7 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 285: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 287: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3728,7 +3747,7 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 286: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + case 288: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -3740,20 +3759,20 @@ static YYACTIONTYPE yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 287: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + case 289: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 288: /* cmd ::= KILL CONNECTION INTEGER */ + case 290: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 289: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 291: /* 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 290: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 292: /* 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: @@ -4029,13 +4048,14 @@ void Parse( yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion); yymajor = YYNOCODE; }else{ - while( yypParser->yytos > yypParser->yystack ){ - yyact = yy_find_reduce_action(yypParser->yytos->stateno, - YYERRORSYMBOL); - if( yyact<=YY_MAX_SHIFTREDUCE ) break; + while( yypParser->yytos >= yypParser->yystack + && (yyact = yy_find_reduce_action( + yypParser->yytos->stateno, + YYERRORSYMBOL)) > YY_MAX_SHIFTREDUCE + ){ yy_pop_parser_stack(yypParser); } - if( yypParser->yytos <= yypParser->yystack || yymajor==0 ){ + if( yypParser->yytos < yypParser->yystack || yymajor==0 ){ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yy_parse_failed(yypParser); #ifndef YYNOERRORRECOVERY