diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 8ee23846518e6ae3681d0ab3523975b0f88f4a5c..7a9183ac060b255c49def69fcea1c5cbd74c3226 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -128,31 +128,17 @@ typedef union { #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo #define YYFALLBACK 1 -<<<<<<< HEAD #define YYNSTATE 362 -#define YYNRULE 291 +#define YYNRULE 289 #define YYNTOKEN 195 #define YY_MAX_SHIFT 361 -#define YY_MIN_SHIFTREDUCE 569 -#define YY_MAX_SHIFTREDUCE 859 -#define YY_ERROR_ACTION 860 -#define YY_ACCEPT_ACTION 861 -#define YY_NO_ACTION 862 -#define YY_MIN_REDUCE 863 -#define YY_MAX_REDUCE 1153 -======= -#define YYNSTATE 347 -#define YYNRULE 283 -#define YYNTOKEN 190 -#define YY_MAX_SHIFT 346 -#define YY_MIN_SHIFTREDUCE 547 -#define YY_MAX_SHIFTREDUCE 829 -#define YY_ERROR_ACTION 830 -#define YY_ACCEPT_ACTION 831 -#define YY_NO_ACTION 832 -#define YY_MIN_REDUCE 833 -#define YY_MAX_REDUCE 1115 ->>>>>>> dev +#define YY_MIN_SHIFTREDUCE 567 +#define YY_MAX_SHIFTREDUCE 855 +#define YY_ERROR_ACTION 856 +#define YY_ACCEPT_ACTION 857 +#define YY_NO_ACTION 858 +#define YY_MIN_REDUCE 859 +#define YY_MAX_REDUCE 1147 /************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined @@ -218,163 +204,162 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -<<<<<<< HEAD -#define YY_ACTTAB_COUNT (757) +#define YY_ACTTAB_COUNT (753) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 206, 620, 245, 620, 620, 257, 1042, 94, 23, 621, - /* 10 */ 1129, 621, 621, 56, 57, 174, 60, 61, 228, 359, - /* 20 */ 248, 50, 620, 59, 315, 64, 62, 65, 63, 1033, - /* 30 */ 621, 234, 240, 55, 54, 1020, 1020, 53, 52, 51, - /* 40 */ 1003, 1004, 34, 1007, 152, 231, 656, 570, 571, 572, - /* 50 */ 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - /* 60 */ 583, 360, 206, 37, 229, 159, 159, 56, 57, 911, - /* 70 */ 60, 61, 1130, 1039, 248, 50, 188, 59, 315, 64, - /* 80 */ 62, 65, 63, 244, 1014, 29, 79, 55, 54, 85, - /* 90 */ 313, 53, 52, 51, 56, 57, 249, 60, 61, 861, - /* 100 */ 361, 248, 50, 92, 59, 315, 64, 62, 65, 63, - /* 110 */ 78, 1016, 277, 276, 55, 54, 97, 80, 53, 52, - /* 120 */ 51, 56, 58, 242, 60, 61, 44, 1020, 248, 50, - /* 130 */ 241, 59, 315, 64, 62, 65, 63, 798, 1079, 1078, - /* 140 */ 289, 55, 54, 206, 1005, 53, 52, 51, 57, 1033, - /* 150 */ 60, 61, 1008, 1130, 248, 50, 206, 59, 315, 64, - /* 160 */ 62, 65, 63, 921, 345, 270, 1130, 55, 54, 1019, - /* 170 */ 188, 53, 52, 51, 43, 311, 354, 353, 310, 309, - /* 180 */ 308, 352, 307, 351, 350, 349, 306, 348, 347, 980, - /* 190 */ 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, - /* 200 */ 978, 979, 981, 982, 60, 61, 24, 37, 248, 50, - /* 210 */ 262, 59, 315, 64, 62, 65, 63, 1033, 203, 266, - /* 220 */ 265, 55, 54, 159, 209, 53, 52, 51, 247, 813, - /* 230 */ 257, 215, 802, 232, 805, 82, 808, 135, 134, 214, - /* 240 */ 175, 247, 813, 320, 85, 802, 204, 805, 70, 808, - /* 250 */ 912, 230, 53, 52, 51, 1017, 43, 188, 354, 353, - /* 260 */ 226, 227, 37, 352, 316, 351, 350, 349, 159, 348, - /* 270 */ 347, 122, 273, 226, 227, 988, 1006, 986, 987, 37, - /* 280 */ 210, 44, 989, 345, 991, 992, 990, 83, 993, 994, - /* 290 */ 71, 5, 40, 178, 291, 804, 90, 807, 177, 103, - /* 300 */ 108, 99, 107, 269, 251, 77, 238, 246, 730, 66, - /* 310 */ 1017, 727, 222, 728, 256, 729, 302, 64, 62, 65, - /* 320 */ 63, 706, 66, 239, 273, 55, 54, 1017, 6, 53, - /* 330 */ 52, 51, 55, 54, 37, 746, 53, 52, 51, 253, - /* 340 */ 254, 91, 37, 1126, 814, 809, 355, 949, 37, 335, - /* 350 */ 334, 810, 120, 114, 125, 37, 37, 814, 809, 124, - /* 360 */ 313, 130, 133, 123, 810, 197, 195, 193, 37, 127, - /* 370 */ 1125, 37, 192, 139, 138, 137, 136, 37, 324, 252, - /* 380 */ 317, 250, 1017, 323, 322, 803, 325, 806, 257, 258, - /* 390 */ 1017, 255, 326, 330, 329, 1124, 1017, 14, 1018, 327, - /* 400 */ 331, 93, 73, 1017, 1017, 358, 357, 144, 150, 148, - /* 410 */ 147, 743, 332, 224, 811, 333, 1017, 1, 176, 1017, - /* 420 */ 750, 337, 33, 731, 732, 1017, 3, 189, 779, 780, - /* 430 */ 271, 96, 762, 770, 771, 716, 294, 9, 718, 296, - /* 440 */ 717, 800, 74, 834, 38, 815, 154, 67, 26, 38, - /* 450 */ 38, 619, 67, 95, 67, 297, 16, 25, 15, 25, - /* 460 */ 76, 735, 113, 736, 112, 25, 18, 733, 17, 734, - /* 470 */ 20, 119, 19, 118, 22, 1089, 21, 801, 132, 131, - /* 480 */ 1149, 225, 817, 207, 208, 211, 205, 212, 213, 1141, - /* 490 */ 217, 218, 705, 1088, 219, 216, 202, 236, 1085, 1084, - /* 500 */ 237, 336, 267, 151, 812, 149, 1041, 47, 1052, 1049, - /* 510 */ 1034, 1050, 274, 1015, 1031, 1071, 161, 1054, 153, 157, - /* 520 */ 1070, 283, 170, 171, 165, 278, 1013, 172, 160, 173, - /* 530 */ 926, 299, 300, 301, 304, 305, 45, 200, 761, 233, - /* 540 */ 41, 314, 920, 321, 280, 1148, 287, 110, 75, 72, - /* 550 */ 292, 49, 162, 1147, 163, 290, 288, 1144, 179, 286, - /* 560 */ 328, 284, 1140, 116, 164, 1139, 1136, 166, 180, 946, - /* 570 */ 42, 39, 46, 201, 908, 126, 906, 282, 128, 279, - /* 580 */ 129, 904, 903, 259, 191, 901, 900, 899, 898, 897, - /* 590 */ 896, 895, 194, 196, 892, 890, 888, 886, 198, 48, - /* 600 */ 883, 199, 303, 272, 81, 86, 281, 1072, 346, 339, - /* 610 */ 121, 338, 340, 223, 342, 243, 341, 298, 343, 344, - /* 620 */ 356, 859, 260, 220, 261, 858, 221, 263, 925, 924, - /* 630 */ 104, 105, 264, 857, 840, 268, 839, 273, 902, 293, - /* 640 */ 84, 275, 140, 10, 141, 183, 182, 947, 181, 184, - /* 650 */ 185, 187, 186, 894, 2, 738, 142, 893, 885, 984, - /* 660 */ 169, 167, 168, 948, 143, 884, 4, 30, 87, 763, - /* 670 */ 155, 156, 996, 766, 88, 235, 768, 89, 285, 31, - /* 680 */ 772, 158, 11, 12, 32, 13, 27, 28, 295, 98, - /* 690 */ 634, 96, 101, 35, 100, 669, 36, 665, 102, 663, - /* 700 */ 662, 661, 658, 624, 312, 7, 818, 106, 816, 319, - /* 710 */ 109, 318, 8, 111, 68, 69, 115, 117, 708, 38, - /* 720 */ 707, 704, 650, 648, 640, 646, 642, 644, 638, 636, - /* 730 */ 672, 671, 670, 668, 667, 666, 664, 660, 659, 190, - /* 740 */ 622, 587, 585, 863, 862, 862, 862, 862, 862, 862, - /* 750 */ 862, 862, 862, 862, 862, 145, 146, + /* 0 */ 206, 618, 245, 618, 618, 97, 244, 228, 359, 619, + /* 10 */ 1123, 619, 619, 56, 57, 152, 60, 61, 654, 1027, + /* 20 */ 248, 50, 1036, 59, 317, 64, 62, 65, 63, 984, + /* 30 */ 249, 982, 983, 55, 54, 231, 985, 53, 52, 51, + /* 40 */ 986, 1002, 987, 988, 53, 52, 51, 568, 569, 570, + /* 50 */ 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, + /* 60 */ 581, 360, 206, 257, 229, 159, 206, 56, 57, 37, + /* 70 */ 60, 61, 1124, 174, 248, 50, 1124, 59, 317, 64, + /* 80 */ 62, 65, 63, 277, 276, 29, 79, 55, 54, 1033, + /* 90 */ 206, 53, 52, 51, 56, 57, 315, 60, 61, 234, + /* 100 */ 1124, 248, 50, 1014, 59, 317, 64, 62, 65, 63, + /* 110 */ 358, 357, 144, 230, 55, 54, 85, 1011, 53, 52, + /* 120 */ 51, 56, 58, 240, 60, 61, 347, 1014, 248, 50, + /* 130 */ 94, 59, 317, 64, 62, 65, 63, 794, 1073, 242, + /* 140 */ 289, 55, 54, 1014, 618, 53, 52, 51, 57, 23, + /* 150 */ 60, 61, 619, 44, 248, 50, 1000, 59, 317, 64, + /* 160 */ 62, 65, 63, 997, 998, 34, 1001, 55, 54, 857, + /* 170 */ 361, 53, 52, 51, 43, 313, 354, 353, 312, 311, + /* 180 */ 310, 352, 309, 308, 307, 351, 306, 350, 349, 976, + /* 190 */ 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, + /* 200 */ 974, 975, 977, 978, 60, 61, 24, 1008, 248, 50, + /* 210 */ 257, 59, 317, 64, 62, 65, 63, 1027, 122, 1027, + /* 220 */ 175, 55, 54, 37, 209, 53, 52, 51, 247, 809, + /* 230 */ 347, 215, 798, 232, 801, 270, 804, 135, 134, 214, + /* 240 */ 315, 247, 809, 322, 85, 798, 14, 801, 37, 804, + /* 250 */ 93, 159, 726, 241, 203, 723, 800, 724, 803, 725, + /* 260 */ 226, 227, 257, 16, 318, 15, 37, 238, 5, 40, + /* 270 */ 178, 1011, 1012, 226, 227, 177, 103, 108, 99, 107, + /* 280 */ 96, 44, 204, 253, 254, 210, 64, 62, 65, 63, + /* 290 */ 355, 945, 159, 302, 55, 54, 1010, 251, 53, 52, + /* 300 */ 51, 1013, 78, 269, 256, 77, 120, 114, 125, 66, + /* 310 */ 239, 702, 222, 124, 1011, 130, 133, 123, 37, 197, + /* 320 */ 195, 193, 66, 127, 1072, 37, 192, 139, 138, 137, + /* 330 */ 136, 799, 159, 802, 37, 43, 999, 354, 353, 337, + /* 340 */ 336, 37, 352, 262, 810, 805, 351, 37, 350, 349, + /* 350 */ 37, 806, 266, 265, 742, 55, 54, 810, 805, 53, + /* 360 */ 52, 51, 326, 291, 806, 90, 1011, 727, 728, 327, + /* 370 */ 37, 37, 252, 1011, 250, 807, 325, 324, 328, 258, + /* 380 */ 82, 255, 1011, 332, 331, 329, 150, 148, 147, 1011, + /* 390 */ 907, 333, 83, 917, 334, 1011, 908, 188, 1011, 271, + /* 400 */ 188, 739, 92, 188, 70, 91, 1, 176, 3, 189, + /* 410 */ 775, 776, 758, 38, 335, 339, 80, 273, 1011, 1011, + /* 420 */ 766, 767, 73, 712, 294, 33, 154, 9, 714, 273, + /* 430 */ 296, 713, 796, 830, 67, 26, 246, 38, 38, 746, + /* 440 */ 811, 319, 67, 76, 95, 67, 71, 25, 1120, 617, + /* 450 */ 808, 132, 131, 113, 25, 112, 1119, 6, 297, 18, + /* 460 */ 1118, 17, 74, 25, 731, 729, 732, 730, 797, 20, + /* 470 */ 1083, 19, 119, 224, 118, 701, 22, 225, 21, 207, + /* 480 */ 208, 211, 205, 212, 213, 217, 218, 219, 216, 202, + /* 490 */ 1143, 1082, 1135, 236, 267, 1079, 1078, 237, 338, 151, + /* 500 */ 1035, 1046, 47, 1065, 1043, 149, 1064, 1025, 1028, 1044, + /* 510 */ 274, 1048, 153, 170, 157, 1009, 278, 283, 171, 1007, + /* 520 */ 172, 233, 166, 280, 161, 757, 160, 173, 162, 922, + /* 530 */ 163, 299, 300, 301, 304, 305, 287, 292, 45, 290, + /* 540 */ 75, 200, 288, 813, 272, 41, 72, 49, 316, 164, + /* 550 */ 916, 323, 1142, 110, 1141, 1138, 286, 179, 330, 1134, + /* 560 */ 284, 116, 1133, 1130, 180, 282, 942, 42, 39, 46, + /* 570 */ 201, 904, 279, 126, 48, 902, 128, 129, 900, 899, + /* 580 */ 259, 191, 897, 896, 895, 894, 893, 892, 891, 194, + /* 590 */ 196, 888, 886, 884, 882, 198, 879, 199, 303, 81, + /* 600 */ 86, 348, 281, 1066, 121, 340, 341, 342, 343, 344, + /* 610 */ 223, 345, 346, 356, 855, 243, 298, 260, 261, 854, + /* 620 */ 263, 220, 221, 264, 853, 836, 104, 921, 920, 105, + /* 630 */ 835, 268, 273, 10, 293, 734, 275, 84, 30, 87, + /* 640 */ 898, 890, 182, 943, 186, 181, 184, 140, 183, 187, + /* 650 */ 185, 141, 142, 889, 4, 143, 980, 881, 880, 944, + /* 660 */ 759, 165, 167, 168, 155, 169, 762, 156, 2, 990, + /* 670 */ 88, 235, 764, 89, 285, 31, 768, 158, 11, 12, + /* 680 */ 13, 32, 27, 295, 28, 96, 98, 101, 35, 100, + /* 690 */ 632, 36, 102, 667, 665, 664, 663, 661, 660, 659, + /* 700 */ 656, 314, 622, 106, 7, 320, 812, 814, 8, 321, + /* 710 */ 109, 111, 68, 69, 115, 704, 703, 38, 117, 700, + /* 720 */ 648, 646, 638, 644, 640, 642, 636, 634, 670, 669, + /* 730 */ 668, 666, 662, 658, 657, 190, 620, 585, 583, 859, + /* 740 */ 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, + /* 750 */ 858, 145, 146, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 265, 1, 205, 1, 1, 199, 199, 206, 265, 9, - /* 10 */ 275, 9, 9, 13, 14, 209, 16, 17, 198, 199, - /* 20 */ 20, 21, 1, 23, 24, 25, 26, 27, 28, 246, - /* 30 */ 9, 244, 244, 33, 34, 248, 248, 37, 38, 39, - /* 40 */ 239, 240, 241, 242, 199, 262, 5, 45, 46, 47, + /* 0 */ 265, 1, 205, 1, 1, 206, 205, 198, 199, 9, + /* 10 */ 275, 9, 9, 13, 14, 199, 16, 17, 5, 246, + /* 20 */ 20, 21, 199, 23, 24, 25, 26, 27, 28, 222, + /* 30 */ 205, 224, 225, 33, 34, 262, 229, 37, 38, 39, + /* 40 */ 233, 242, 235, 236, 37, 38, 39, 45, 46, 47, /* 50 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - /* 60 */ 58, 59, 265, 199, 62, 199, 199, 13, 14, 204, - /* 70 */ 16, 17, 275, 266, 20, 21, 211, 23, 24, 25, - /* 80 */ 26, 27, 28, 205, 199, 82, 86, 33, 34, 82, - /* 90 */ 84, 37, 38, 39, 13, 14, 205, 16, 17, 196, - /* 100 */ 197, 20, 21, 249, 23, 24, 25, 26, 27, 28, - /* 110 */ 206, 247, 267, 268, 33, 34, 206, 263, 37, 38, - /* 120 */ 39, 13, 14, 244, 16, 17, 119, 248, 20, 21, - /* 130 */ 245, 23, 24, 25, 26, 27, 28, 83, 272, 272, - /* 140 */ 274, 33, 34, 265, 240, 37, 38, 39, 14, 246, - /* 150 */ 16, 17, 242, 275, 20, 21, 265, 23, 24, 25, - /* 160 */ 26, 27, 28, 204, 90, 262, 275, 33, 34, 248, - /* 170 */ 211, 37, 38, 39, 98, 99, 100, 101, 102, 103, + /* 60 */ 58, 59, 265, 199, 62, 199, 265, 13, 14, 199, + /* 70 */ 16, 17, 275, 209, 20, 21, 275, 23, 24, 25, + /* 80 */ 26, 27, 28, 267, 268, 82, 86, 33, 34, 266, + /* 90 */ 265, 37, 38, 39, 13, 14, 84, 16, 17, 244, + /* 100 */ 275, 20, 21, 248, 23, 24, 25, 26, 27, 28, + /* 110 */ 66, 67, 68, 243, 33, 34, 82, 247, 37, 38, + /* 120 */ 39, 13, 14, 244, 16, 17, 90, 248, 20, 21, + /* 130 */ 206, 23, 24, 25, 26, 27, 28, 83, 272, 244, + /* 140 */ 274, 33, 34, 248, 1, 37, 38, 39, 14, 265, + /* 150 */ 16, 17, 9, 119, 20, 21, 0, 23, 24, 25, + /* 160 */ 26, 27, 28, 239, 240, 241, 242, 33, 34, 196, + /* 170 */ 197, 37, 38, 39, 98, 99, 100, 101, 102, 103, /* 180 */ 104, 105, 106, 107, 108, 109, 110, 111, 112, 222, /* 190 */ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, /* 200 */ 233, 234, 235, 236, 16, 17, 44, 199, 20, 21, - /* 210 */ 142, 23, 24, 25, 26, 27, 28, 246, 265, 151, - /* 220 */ 152, 33, 34, 199, 62, 37, 38, 39, 1, 2, - /* 230 */ 199, 69, 5, 262, 7, 83, 9, 75, 76, 77, - /* 240 */ 209, 1, 2, 81, 82, 5, 265, 7, 97, 9, - /* 250 */ 204, 243, 37, 38, 39, 247, 98, 211, 100, 101, - /* 260 */ 33, 34, 199, 105, 37, 107, 108, 109, 199, 111, - /* 270 */ 112, 78, 120, 33, 34, 222, 0, 224, 225, 199, - /* 280 */ 265, 119, 229, 90, 231, 232, 233, 83, 235, 236, - /* 290 */ 139, 63, 64, 65, 270, 5, 272, 7, 70, 71, - /* 300 */ 72, 73, 74, 141, 69, 143, 243, 61, 2, 82, - /* 310 */ 247, 5, 150, 7, 69, 9, 88, 25, 26, 27, - /* 320 */ 28, 5, 82, 243, 120, 33, 34, 247, 82, 37, - /* 330 */ 38, 39, 33, 34, 199, 37, 37, 38, 39, 33, - /* 340 */ 34, 272, 199, 265, 117, 118, 220, 221, 199, 33, - /* 350 */ 34, 124, 63, 64, 65, 199, 199, 117, 118, 70, - /* 360 */ 84, 72, 73, 74, 124, 63, 64, 65, 199, 80, - /* 370 */ 265, 199, 70, 71, 72, 73, 74, 199, 243, 144, - /* 380 */ 15, 146, 247, 148, 149, 5, 243, 7, 199, 144, - /* 390 */ 247, 146, 243, 148, 149, 265, 247, 82, 209, 243, - /* 400 */ 243, 86, 97, 247, 247, 66, 67, 68, 63, 64, - /* 410 */ 65, 97, 243, 265, 124, 243, 247, 207, 208, 247, - /* 420 */ 122, 243, 82, 117, 118, 247, 202, 203, 132, 133, - /* 430 */ 83, 116, 83, 83, 83, 83, 83, 123, 83, 83, - /* 440 */ 83, 1, 137, 83, 97, 83, 97, 97, 97, 97, - /* 450 */ 97, 83, 97, 97, 97, 115, 145, 97, 147, 97, - /* 460 */ 82, 5, 145, 7, 147, 97, 145, 5, 147, 7, - /* 470 */ 145, 145, 147, 147, 145, 238, 147, 37, 78, 79, - /* 480 */ 248, 265, 117, 265, 265, 265, 265, 265, 265, 248, - /* 490 */ 265, 265, 114, 238, 265, 265, 265, 238, 238, 238, - /* 500 */ 238, 238, 199, 199, 124, 61, 199, 264, 199, 199, - /* 510 */ 246, 199, 246, 246, 261, 273, 259, 199, 199, 199, - /* 520 */ 273, 199, 250, 199, 255, 269, 199, 199, 260, 199, - /* 530 */ 199, 199, 199, 199, 199, 199, 199, 199, 124, 269, - /* 540 */ 199, 199, 199, 199, 269, 199, 269, 199, 136, 138, - /* 550 */ 130, 135, 258, 199, 257, 134, 129, 199, 199, 128, - /* 560 */ 199, 127, 199, 199, 256, 199, 199, 254, 199, 199, - /* 570 */ 199, 199, 199, 199, 199, 199, 199, 126, 199, 125, + /* 210 */ 199, 23, 24, 25, 26, 27, 28, 246, 78, 246, + /* 220 */ 209, 33, 34, 199, 62, 37, 38, 39, 1, 2, + /* 230 */ 90, 69, 5, 262, 7, 262, 9, 75, 76, 77, + /* 240 */ 84, 1, 2, 81, 82, 5, 82, 7, 199, 9, + /* 250 */ 86, 199, 2, 245, 265, 5, 5, 7, 7, 9, + /* 260 */ 33, 34, 199, 145, 37, 147, 199, 243, 63, 64, + /* 270 */ 65, 247, 209, 33, 34, 70, 71, 72, 73, 74, + /* 280 */ 116, 119, 265, 33, 34, 265, 25, 26, 27, 28, + /* 290 */ 220, 221, 199, 88, 33, 34, 247, 69, 37, 38, + /* 300 */ 39, 248, 206, 141, 69, 143, 63, 64, 65, 82, + /* 310 */ 243, 5, 150, 70, 247, 72, 73, 74, 199, 63, + /* 320 */ 64, 65, 82, 80, 272, 199, 70, 71, 72, 73, + /* 330 */ 74, 5, 199, 7, 199, 98, 240, 100, 101, 33, + /* 340 */ 34, 199, 105, 142, 117, 118, 109, 199, 111, 112, + /* 350 */ 199, 124, 151, 152, 37, 33, 34, 117, 118, 37, + /* 360 */ 38, 39, 243, 270, 124, 272, 247, 117, 118, 243, + /* 370 */ 199, 199, 144, 247, 146, 124, 148, 149, 243, 144, + /* 380 */ 83, 146, 247, 148, 149, 243, 63, 64, 65, 247, + /* 390 */ 204, 243, 83, 204, 243, 247, 204, 211, 247, 83, + /* 400 */ 211, 97, 249, 211, 97, 272, 207, 208, 202, 203, + /* 410 */ 132, 133, 83, 97, 243, 243, 263, 120, 247, 247, + /* 420 */ 83, 83, 97, 83, 83, 82, 97, 123, 83, 120, + /* 430 */ 83, 83, 1, 83, 97, 97, 61, 97, 97, 122, + /* 440 */ 83, 15, 97, 82, 97, 97, 139, 97, 265, 83, + /* 450 */ 124, 78, 79, 145, 97, 147, 265, 82, 115, 145, + /* 460 */ 265, 147, 137, 97, 5, 5, 7, 7, 37, 145, + /* 470 */ 238, 147, 145, 265, 147, 114, 145, 265, 147, 265, + /* 480 */ 265, 265, 265, 265, 265, 265, 265, 265, 265, 265, + /* 490 */ 248, 238, 248, 238, 199, 238, 238, 238, 238, 199, + /* 500 */ 199, 199, 264, 273, 199, 61, 273, 261, 246, 199, + /* 510 */ 246, 199, 199, 250, 199, 246, 269, 199, 199, 199, + /* 520 */ 199, 269, 254, 269, 259, 124, 260, 199, 258, 199, + /* 530 */ 257, 199, 199, 199, 199, 199, 269, 130, 199, 134, + /* 540 */ 136, 199, 129, 117, 200, 199, 138, 135, 199, 256, + /* 550 */ 199, 199, 199, 199, 199, 199, 128, 199, 199, 199, + /* 560 */ 127, 199, 199, 199, 199, 126, 199, 199, 199, 199, + /* 570 */ 199, 199, 125, 199, 140, 199, 199, 199, 199, 199, /* 580 */ 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, - /* 590 */ 199, 199, 199, 199, 199, 199, 199, 199, 199, 140, - /* 600 */ 199, 199, 89, 200, 200, 200, 200, 200, 113, 51, - /* 610 */ 96, 95, 92, 200, 55, 200, 94, 200, 93, 91, - /* 620 */ 84, 5, 153, 200, 5, 5, 200, 153, 210, 210, - /* 630 */ 206, 206, 5, 5, 100, 142, 99, 120, 200, 115, - /* 640 */ 121, 97, 201, 82, 201, 213, 217, 219, 218, 216, - /* 650 */ 214, 212, 215, 200, 207, 83, 201, 200, 200, 237, - /* 660 */ 251, 253, 252, 221, 201, 200, 202, 82, 97, 83, - /* 670 */ 82, 97, 237, 83, 82, 1, 83, 82, 82, 97, - /* 680 */ 83, 82, 131, 131, 97, 82, 82, 82, 115, 78, - /* 690 */ 5, 116, 71, 87, 86, 9, 87, 5, 86, 5, - /* 700 */ 5, 5, 5, 85, 15, 82, 117, 78, 83, 59, - /* 710 */ 147, 24, 82, 147, 16, 16, 147, 147, 5, 97, - /* 720 */ 5, 83, 5, 5, 5, 5, 5, 5, 5, 5, - /* 730 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 97, - /* 740 */ 85, 61, 60, 0, 276, 276, 276, 276, 276, 276, - /* 750 */ 276, 276, 276, 276, 276, 21, 21, 276, 276, 276, + /* 590 */ 199, 199, 199, 199, 199, 199, 199, 199, 89, 200, + /* 600 */ 200, 113, 200, 200, 96, 95, 51, 92, 94, 55, + /* 610 */ 200, 93, 91, 84, 5, 200, 200, 153, 5, 5, + /* 620 */ 153, 200, 200, 5, 5, 100, 206, 210, 210, 206, + /* 630 */ 99, 142, 120, 82, 115, 83, 97, 121, 82, 97, + /* 640 */ 200, 200, 217, 219, 215, 218, 216, 201, 213, 212, + /* 650 */ 214, 201, 201, 200, 202, 201, 237, 200, 200, 221, + /* 660 */ 83, 255, 253, 252, 82, 251, 83, 97, 207, 237, + /* 670 */ 82, 1, 83, 82, 82, 97, 83, 82, 131, 131, + /* 680 */ 82, 97, 82, 115, 82, 116, 78, 71, 87, 86, + /* 690 */ 5, 87, 86, 9, 5, 5, 5, 5, 5, 5, + /* 700 */ 5, 15, 85, 78, 82, 24, 83, 117, 82, 59, + /* 710 */ 147, 147, 16, 16, 147, 5, 5, 97, 147, 83, + /* 720 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 730 */ 5, 5, 5, 5, 5, 97, 85, 61, 60, 0, + /* 740 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, + /* 750 */ 276, 21, 21, 276, 276, 276, 276, 276, 276, 276, /* 760 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, /* 770 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, /* 780 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, @@ -393,390 +378,114 @@ static const YYCODETYPE yy_lookahead[] = { /* 910 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, /* 920 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, /* 930 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - /* 940 */ 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, - /* 950 */ 276, 276, -======= -#define YY_ACTTAB_COUNT (731) -static const YYACTIONTYPE yy_action[] = { - /* 0 */ 23, 596, 1004, 596, 219, 344, 194, 831, 346, 597, - /* 10 */ 596, 597, 197, 54, 55, 225, 58, 59, 597, 982, - /* 20 */ 239, 48, 1091, 57, 302, 62, 60, 63, 61, 995, - /* 30 */ 995, 231, 233, 53, 52, 982, 982, 51, 50, 49, - /* 40 */ 54, 55, 35, 58, 59, 222, 223, 239, 48, 596, - /* 50 */ 57, 302, 62, 60, 63, 61, 995, 597, 152, 236, - /* 60 */ 53, 52, 235, 152, 51, 50, 49, 55, 1001, 58, - /* 70 */ 59, 770, 261, 239, 48, 240, 57, 302, 62, 60, - /* 80 */ 63, 61, 29, 83, 976, 221, 53, 52, 145, 979, - /* 90 */ 51, 50, 49, 548, 549, 550, 551, 552, 553, 554, - /* 100 */ 555, 556, 557, 558, 559, 560, 345, 771, 768, 220, - /* 110 */ 95, 77, 54, 55, 35, 58, 59, 42, 197, 239, - /* 120 */ 48, 197, 57, 302, 62, 60, 63, 61, 1092, 232, - /* 130 */ 1040, 1092, 53, 52, 197, 89, 51, 50, 49, 54, - /* 140 */ 56, 968, 58, 59, 1092, 970, 239, 48, 262, 57, - /* 150 */ 302, 62, 60, 63, 61, 268, 267, 229, 36, 53, - /* 160 */ 52, 979, 248, 51, 50, 49, 41, 298, 339, 338, - /* 170 */ 297, 296, 295, 337, 294, 293, 292, 336, 291, 335, - /* 180 */ 334, 944, 932, 933, 934, 935, 936, 937, 938, 939, - /* 190 */ 940, 941, 942, 943, 945, 946, 58, 59, 24, 980, - /* 200 */ 239, 48, 90, 57, 302, 62, 60, 63, 61, 51, - /* 210 */ 50, 49, 152, 53, 52, 205, 78, 51, 50, 49, - /* 220 */ 53, 52, 206, 300, 51, 50, 49, 129, 128, 204, - /* 230 */ 732, 238, 783, 307, 83, 772, 740, 775, 35, 778, - /* 240 */ 147, 238, 783, 116, 253, 772, 65, 775, 35, 778, - /* 250 */ 300, 332, 152, 257, 256, 35, 879, 62, 60, 63, - /* 260 */ 61, 179, 332, 217, 218, 53, 52, 303, 42, 51, - /* 270 */ 50, 49, 700, 217, 218, 697, 304, 698, 14, 699, - /* 280 */ 41, 230, 339, 338, 1041, 979, 280, 337, 340, 913, - /* 290 */ 260, 336, 75, 335, 334, 978, 1, 167, 311, 213, - /* 300 */ 628, 242, 979, 244, 245, 114, 108, 119, 94, 91, - /* 310 */ 64, 195, 118, 124, 127, 117, 952, 80, 950, 951, - /* 320 */ 64, 121, 282, 953, 88, 76, 247, 954, 35, 955, - /* 330 */ 956, 5, 38, 169, 92, 3, 180, 35, 168, 102, - /* 340 */ 97, 101, 784, 779, 35, 35, 35, 35, 716, 780, - /* 350 */ 676, 264, 784, 779, 188, 186, 184, 200, 967, 780, - /* 360 */ 35, 183, 132, 131, 130, 1088, 965, 966, 34, 969, - /* 370 */ 1087, 312, 243, 787, 241, 979, 310, 309, 322, 321, - /* 380 */ 313, 889, 701, 702, 979, 81, 179, 314, 318, 319, - /* 390 */ 320, 979, 979, 979, 979, 880, 774, 249, 777, 246, - /* 400 */ 179, 317, 316, 324, 773, 713, 776, 979, 343, 342, - /* 410 */ 137, 741, 143, 141, 140, 749, 750, 68, 71, 264, - /* 420 */ 686, 26, 237, 285, 16, 688, 15, 287, 720, 687, - /* 430 */ 36, 981, 9, 36, 33, 65, 804, 93, 785, 65, - /* 440 */ 595, 74, 6, 107, 1086, 106, 25, 18, 25, 17, - /* 450 */ 25, 705, 703, 706, 704, 20, 113, 19, 112, 72, - /* 460 */ 69, 215, 22, 288, 21, 126, 125, 216, 198, 675, - /* 470 */ 199, 201, 196, 202, 203, 208, 209, 210, 207, 193, - /* 480 */ 1111, 1103, 1051, 1050, 227, 1047, 1046, 228, 323, 45, - /* 490 */ 258, 144, 1003, 1014, 1011, 1012, 1016, 996, 142, 265, - /* 500 */ 146, 1033, 150, 274, 1032, 977, 163, 164, 269, 224, - /* 510 */ 781, 975, 165, 166, 892, 290, 731, 43, 782, 191, - /* 520 */ 283, 993, 39, 301, 154, 888, 308, 1110, 104, 1109, - /* 530 */ 1106, 170, 315, 73, 1102, 110, 271, 278, 70, 153, - /* 540 */ 47, 1101, 155, 1098, 281, 171, 910, 40, 279, 277, - /* 550 */ 37, 275, 44, 273, 192, 270, 156, 876, 120, 874, - /* 560 */ 122, 123, 872, 871, 250, 182, 869, 868, 867, 866, - /* 570 */ 865, 864, 185, 187, 861, 859, 857, 855, 189, 852, - /* 580 */ 190, 333, 263, 79, 46, 84, 115, 272, 1034, 325, - /* 590 */ 326, 327, 328, 329, 330, 331, 214, 341, 829, 234, - /* 600 */ 251, 252, 289, 828, 254, 255, 827, 211, 212, 809, - /* 610 */ 98, 810, 99, 259, 264, 284, 10, 82, 708, 266, - /* 620 */ 85, 30, 870, 174, 178, 863, 911, 172, 173, 175, - /* 630 */ 176, 4, 133, 177, 862, 912, 134, 135, 948, 136, - /* 640 */ 854, 733, 148, 853, 157, 158, 159, 160, 736, 161, - /* 650 */ 149, 162, 958, 2, 86, 226, 738, 87, 276, 31, - /* 660 */ 742, 151, 32, 13, 11, 27, 286, 28, 12, 641, - /* 670 */ 96, 94, 639, 638, 637, 635, 634, 633, 630, 299, - /* 680 */ 600, 100, 7, 305, 786, 788, 8, 306, 103, 105, - /* 690 */ 66, 67, 109, 111, 678, 36, 677, 674, 622, 620, - /* 700 */ 612, 618, 614, 616, 610, 608, 644, 643, 642, 640, - /* 710 */ 636, 632, 631, 181, 598, 564, 562, 833, 832, 832, - /* 720 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 138, - /* 730 */ 139, -}; -static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 259, 1, 194, 1, 193, 194, 259, 191, 192, 9, - /* 10 */ 1, 9, 259, 13, 14, 238, 16, 17, 9, 242, - /* 20 */ 20, 21, 269, 23, 24, 25, 26, 27, 28, 240, - /* 30 */ 240, 238, 238, 33, 34, 242, 242, 37, 38, 39, - /* 40 */ 13, 14, 194, 16, 17, 256, 256, 20, 21, 1, - /* 50 */ 23, 24, 25, 26, 27, 28, 240, 9, 194, 200, - /* 60 */ 33, 34, 200, 194, 37, 38, 39, 14, 260, 16, - /* 70 */ 17, 1, 256, 20, 21, 200, 23, 24, 25, 26, - /* 80 */ 27, 28, 80, 80, 194, 237, 33, 34, 194, 241, - /* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51, - /* 100 */ 52, 53, 54, 55, 56, 57, 58, 37, 81, 61, - /* 110 */ 201, 111, 13, 14, 194, 16, 17, 114, 259, 20, - /* 120 */ 21, 259, 23, 24, 25, 26, 27, 28, 269, 239, - /* 130 */ 266, 269, 33, 34, 259, 266, 37, 38, 39, 13, - /* 140 */ 14, 0, 16, 17, 269, 236, 20, 21, 81, 23, - /* 150 */ 24, 25, 26, 27, 28, 261, 262, 237, 91, 33, - /* 160 */ 34, 241, 194, 37, 38, 39, 92, 93, 94, 95, - /* 170 */ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, - /* 180 */ 106, 215, 216, 217, 218, 219, 220, 221, 222, 223, - /* 190 */ 224, 225, 226, 227, 228, 229, 16, 17, 44, 231, - /* 200 */ 20, 21, 243, 23, 24, 25, 26, 27, 28, 37, - /* 210 */ 38, 39, 194, 33, 34, 61, 257, 37, 38, 39, - /* 220 */ 33, 34, 68, 82, 37, 38, 39, 73, 74, 75, - /* 230 */ 81, 1, 2, 79, 80, 5, 81, 7, 194, 9, - /* 240 */ 91, 1, 2, 76, 137, 5, 91, 7, 194, 9, - /* 250 */ 82, 84, 194, 146, 147, 194, 199, 25, 26, 27, - /* 260 */ 28, 204, 84, 33, 34, 33, 34, 37, 114, 37, - /* 270 */ 38, 39, 2, 33, 34, 5, 15, 7, 80, 9, - /* 280 */ 92, 237, 94, 95, 266, 241, 268, 99, 213, 214, - /* 290 */ 136, 103, 138, 105, 106, 241, 202, 203, 237, 145, - /* 300 */ 5, 68, 241, 33, 34, 62, 63, 64, 110, 111, - /* 310 */ 80, 259, 69, 70, 71, 72, 215, 81, 217, 218, - /* 320 */ 80, 78, 264, 222, 266, 201, 68, 226, 194, 228, - /* 330 */ 229, 62, 63, 64, 201, 197, 198, 194, 69, 70, - /* 340 */ 71, 72, 112, 113, 194, 194, 194, 194, 37, 119, - /* 350 */ 5, 115, 112, 113, 62, 63, 64, 259, 234, 119, - /* 360 */ 194, 69, 70, 71, 72, 259, 233, 234, 235, 236, - /* 370 */ 259, 237, 139, 112, 141, 241, 143, 144, 33, 34, - /* 380 */ 237, 199, 112, 113, 241, 81, 204, 237, 237, 237, - /* 390 */ 237, 241, 241, 241, 241, 199, 5, 139, 7, 141, - /* 400 */ 204, 143, 144, 237, 5, 91, 7, 241, 65, 66, - /* 410 */ 67, 81, 62, 63, 64, 127, 128, 91, 91, 115, - /* 420 */ 81, 91, 60, 81, 140, 81, 142, 81, 117, 81, - /* 430 */ 91, 242, 118, 91, 80, 91, 81, 91, 81, 91, - /* 440 */ 81, 80, 80, 140, 259, 142, 91, 140, 91, 142, - /* 450 */ 91, 5, 5, 7, 7, 140, 140, 142, 142, 132, - /* 460 */ 134, 259, 140, 109, 142, 76, 77, 259, 259, 108, - /* 470 */ 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, - /* 480 */ 242, 242, 232, 232, 232, 232, 232, 232, 232, 258, - /* 490 */ 194, 194, 194, 194, 194, 194, 194, 240, 60, 240, - /* 500 */ 194, 267, 194, 194, 267, 240, 244, 194, 263, 263, - /* 510 */ 119, 194, 194, 194, 194, 194, 119, 194, 119, 194, - /* 520 */ 125, 255, 194, 194, 253, 194, 194, 194, 194, 194, - /* 530 */ 194, 194, 194, 131, 194, 194, 263, 263, 133, 254, - /* 540 */ 130, 194, 252, 194, 129, 194, 194, 194, 124, 123, - /* 550 */ 194, 122, 194, 121, 194, 120, 251, 194, 194, 194, - /* 560 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, - /* 570 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, - /* 580 */ 194, 107, 195, 195, 135, 195, 90, 195, 195, 89, - /* 590 */ 50, 86, 88, 54, 87, 85, 195, 82, 5, 195, - /* 600 */ 148, 5, 195, 5, 148, 5, 5, 195, 195, 93, - /* 610 */ 201, 94, 201, 137, 115, 109, 80, 116, 81, 91, - /* 620 */ 91, 80, 195, 206, 205, 195, 212, 211, 210, 209, - /* 630 */ 207, 197, 196, 208, 195, 214, 196, 196, 230, 196, - /* 640 */ 195, 81, 80, 195, 250, 249, 248, 247, 81, 246, - /* 650 */ 91, 245, 230, 202, 80, 1, 81, 80, 80, 91, - /* 660 */ 81, 80, 91, 80, 126, 80, 109, 80, 126, 9, - /* 670 */ 76, 110, 5, 5, 5, 5, 5, 5, 5, 15, - /* 680 */ 83, 76, 80, 24, 81, 112, 80, 58, 142, 142, - /* 690 */ 16, 16, 142, 142, 5, 91, 5, 81, 5, 5, - /* 700 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - /* 710 */ 5, 5, 5, 91, 83, 60, 59, 0, 270, 270, - /* 720 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 21, - /* 730 */ 21, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 740 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 750 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 760 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 770 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 780 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 790 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 800 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 810 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 820 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 830 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 840 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 850 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 860 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 870 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 880 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 890 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 900 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 910 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 920 */ 270, ->>>>>>> dev + /* 940 */ 276, 276, 276, 276, 276, 276, 276, 276, }; #define YY_SHIFT_COUNT (361) #define YY_SHIFT_MIN (0) -<<<<<<< HEAD -#define YY_SHIFT_MAX (743) +#define YY_SHIFT_MAX (739) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 162, 76, 76, 158, 158, 6, 227, 240, 240, 3, - /* 10 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 20 */ 21, 21, 21, 0, 2, 240, 306, 306, 306, 7, - /* 30 */ 7, 21, 21, 21, 276, 21, 21, 21, 21, 193, - /* 40 */ 6, 74, 74, 41, 757, 757, 757, 240, 240, 240, + /* 0 */ 162, 76, 76, 237, 237, 12, 227, 240, 240, 3, + /* 10 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + /* 20 */ 143, 143, 143, 0, 2, 240, 250, 250, 250, 34, + /* 30 */ 34, 143, 143, 143, 156, 143, 143, 143, 143, 140, + /* 40 */ 12, 36, 36, 13, 753, 753, 753, 240, 240, 240, /* 50 */ 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - /* 60 */ 240, 240, 240, 240, 240, 240, 240, 306, 306, 306, - /* 70 */ 316, 316, 316, 316, 316, 316, 316, 21, 21, 21, - /* 80 */ 298, 21, 21, 21, 7, 7, 21, 21, 21, 21, - /* 90 */ 296, 296, 314, 7, 21, 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, 444, 444, 444, 414, 414, 414, 444, 414, 444, - /* 160 */ 412, 411, 420, 416, 421, 427, 431, 434, 451, 454, - /* 170 */ 459, 444, 444, 444, 513, 513, 495, 6, 6, 444, - /* 180 */ 444, 514, 516, 558, 520, 522, 559, 525, 528, 495, - /* 190 */ 41, 444, 536, 536, 444, 536, 444, 536, 444, 444, - /* 200 */ 757, 757, 54, 81, 81, 108, 81, 134, 188, 228, - /* 210 */ 292, 292, 292, 292, 289, 302, 299, 299, 299, 299, - /* 220 */ 235, 245, 68, 315, 215, 215, 290, 380, 339, 345, - /* 230 */ 347, 152, 204, 349, 350, 351, 151, 305, 352, 353, - /* 240 */ 355, 356, 357, 340, 360, 362, 440, 246, 365, 368, - /* 250 */ 311, 317, 321, 456, 462, 325, 326, 378, 329, 400, - /* 260 */ 616, 469, 619, 620, 474, 627, 628, 534, 537, 493, - /* 270 */ 517, 524, 561, 519, 572, 585, 544, 571, 586, 588, - /* 280 */ 590, 574, 592, 593, 595, 674, 596, 597, 599, 582, - /* 290 */ 551, 587, 552, 603, 524, 604, 573, 605, 575, 611, - /* 300 */ 606, 608, 621, 685, 609, 612, 686, 692, 694, 695, - /* 310 */ 696, 697, 618, 689, 629, 623, 625, 589, 630, 687, - /* 320 */ 650, 698, 563, 566, 622, 622, 622, 622, 699, 569, - /* 330 */ 570, 622, 622, 622, 713, 715, 638, 622, 717, 718, - /* 340 */ 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, - /* 350 */ 729, 730, 731, 732, 733, 642, 655, 734, 735, 680, - /* 360 */ 682, 743, + /* 60 */ 240, 240, 240, 240, 240, 240, 240, 250, 250, 250, + /* 70 */ 306, 306, 306, 306, 306, 306, 306, 143, 143, 143, + /* 80 */ 317, 143, 143, 143, 34, 34, 143, 143, 143, 143, + /* 90 */ 278, 278, 304, 34, 143, 143, 143, 143, 143, 143, + /* 100 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + /* 110 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + /* 120 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + /* 130 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + /* 140 */ 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + /* 150 */ 143, 444, 444, 444, 401, 401, 401, 444, 401, 444, + /* 160 */ 404, 408, 407, 412, 405, 413, 428, 433, 439, 447, + /* 170 */ 434, 444, 444, 444, 509, 509, 488, 12, 12, 444, + /* 180 */ 444, 508, 510, 555, 515, 514, 554, 518, 521, 488, + /* 190 */ 13, 444, 529, 529, 444, 529, 444, 529, 444, 444, + /* 200 */ 753, 753, 54, 81, 81, 108, 81, 134, 188, 205, + /* 210 */ 261, 261, 261, 261, 243, 256, 322, 322, 322, 322, + /* 220 */ 228, 235, 201, 164, 7, 7, 251, 326, 44, 323, + /* 230 */ 316, 297, 309, 329, 337, 338, 307, 325, 340, 341, + /* 240 */ 345, 347, 348, 343, 350, 357, 431, 375, 426, 366, + /* 250 */ 118, 308, 314, 459, 460, 324, 327, 361, 331, 373, + /* 260 */ 609, 464, 613, 614, 467, 618, 619, 525, 531, 489, + /* 270 */ 512, 519, 551, 516, 552, 556, 539, 542, 577, 582, + /* 280 */ 583, 570, 588, 589, 591, 670, 592, 593, 595, 578, + /* 290 */ 547, 584, 548, 598, 519, 600, 568, 602, 569, 608, + /* 300 */ 601, 603, 616, 685, 604, 606, 684, 689, 690, 691, + /* 310 */ 692, 693, 694, 695, 617, 686, 625, 622, 623, 590, + /* 320 */ 626, 681, 650, 696, 563, 564, 620, 620, 620, 620, + /* 330 */ 697, 567, 571, 620, 620, 620, 710, 711, 636, 620, + /* 340 */ 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, + /* 350 */ 725, 726, 727, 728, 729, 638, 651, 730, 731, 676, + /* 360 */ 678, 739, }; #define YY_REDUCE_COUNT (201) #define YY_REDUCE_MIN (-265) -#define YY_REDUCE_MAX (465) -static const short yy_reduce_ofst[] = { - /* 0 */ -97, -33, -33, 53, 53, -199, -203, -122, -109, -155, - /* 10 */ 8, -134, 24, 63, 80, 135, 143, 149, 156, 157, - /* 20 */ 169, 172, 178, -193, -180, -265, -213, -212, -121, -217, - /* 30 */ -29, -133, 69, -115, -90, -194, 31, 189, -136, -135, - /* 40 */ -96, -41, 46, 126, -146, 210, 224, -257, -47, -19, - /* 50 */ 15, 78, 105, 130, 148, 216, 218, 219, 220, 221, - /* 60 */ 222, 223, 225, 226, 229, 230, 231, -79, 232, 241, - /* 70 */ 237, 255, 259, 260, 261, 262, 263, 303, 304, 307, - /* 80 */ 243, 309, 310, 312, 264, 266, 318, 319, 320, 322, - /* 90 */ 242, 247, 272, 267, 324, 327, 328, 330, 331, 332, - /* 100 */ 333, 334, 335, 336, 337, 338, 341, 342, 343, 344, - /* 110 */ 346, 348, 354, 358, 359, 361, 363, 364, 366, 367, - /* 120 */ 369, 370, 371, 372, 373, 374, 375, 376, 377, 379, - /* 130 */ 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - /* 140 */ 391, 392, 393, 394, 395, 396, 397, 398, 399, 401, - /* 150 */ 402, 403, 404, 405, 256, 270, 275, 406, 277, 407, - /* 160 */ 253, 268, 257, 294, 297, 308, 269, 313, 408, 410, - /* 170 */ 409, 413, 415, 417, 418, 419, 422, 424, 425, 423, - /* 180 */ 426, 428, 430, 429, 432, 433, 436, 437, 439, 435, - /* 190 */ 442, 438, 441, 443, 453, 455, 457, 463, 458, 465, - /* 200 */ 447, 464, -}; -static const YYACTIONTYPE yy_default[] = { - /* 0 */ 860, 983, 922, 995, 909, 919, 1132, 1132, 1132, 860, - /* 10 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 20 */ 860, 860, 860, 1043, 880, 1132, 860, 860, 860, 860, - /* 30 */ 860, 860, 860, 860, 919, 860, 860, 860, 860, 929, - /* 40 */ 919, 929, 929, 860, 1038, 967, 985, 860, 860, 860, - /* 50 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 60 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 70 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 80 */ 1045, 1051, 1048, 860, 860, 860, 1053, 860, 860, 860, - /* 90 */ 1075, 1075, 1036, 860, 860, 860, 860, 860, 860, 860, - /* 100 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 110 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 120 */ 860, 860, 860, 860, 860, 860, 907, 860, 905, 860, - /* 130 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 140 */ 860, 860, 860, 860, 891, 860, 860, 860, 860, 860, - /* 150 */ 860, 882, 882, 882, 860, 860, 860, 882, 860, 882, - /* 160 */ 1082, 1086, 1068, 1080, 1076, 1067, 1063, 1061, 1059, 1058, - /* 170 */ 1090, 882, 882, 882, 927, 927, 923, 919, 919, 882, - /* 180 */ 882, 945, 943, 941, 933, 939, 935, 937, 931, 910, - /* 190 */ 860, 882, 917, 917, 882, 917, 882, 917, 882, 882, - /* 200 */ 967, 985, 860, 1091, 1081, 860, 1131, 1121, 1120, 860, - /* 210 */ 1127, 1119, 1118, 1117, 860, 860, 1113, 1116, 1115, 1114, - /* 220 */ 860, 860, 860, 860, 1123, 1122, 860, 860, 860, 860, - /* 230 */ 860, 860, 860, 860, 860, 860, 1087, 1083, 860, 860, - /* 240 */ 860, 860, 860, 860, 860, 860, 860, 1093, 860, 860, - /* 250 */ 860, 860, 860, 860, 860, 860, 860, 997, 860, 860, - /* 260 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 270 */ 1035, 860, 860, 860, 860, 860, 1047, 1046, 860, 860, - /* 280 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 1077, - /* 290 */ 860, 1069, 860, 860, 1009, 860, 860, 860, 860, 860, - /* 300 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 310 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 320 */ 860, 860, 860, 860, 1150, 1145, 1146, 1143, 860, 860, - /* 330 */ 860, 1142, 1137, 1138, 860, 860, 860, 1135, 860, 860, - /* 340 */ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, - /* 350 */ 860, 860, 860, 860, 860, 951, 860, 889, 887, 860, - /* 360 */ 878, 860, -======= -#define YY_SHIFT_MAX (717) -static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 154, 74, 74, 188, 188, 168, 230, 240, 240, 2, - /* 10 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - /* 20 */ 9, 9, 9, 0, 48, 240, 270, 270, 270, 3, - /* 30 */ 3, 9, 9, 9, 141, 9, 9, 167, 168, 178, - /* 40 */ 178, 295, 731, 731, 731, 240, 240, 240, 240, 240, - /* 50 */ 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - /* 60 */ 240, 240, 240, 240, 240, 270, 270, 270, 345, 345, - /* 70 */ 345, 345, 345, 345, 345, 9, 9, 9, 311, 9, - /* 80 */ 9, 9, 3, 3, 9, 9, 9, 9, 288, 288, - /* 90 */ 314, 3, 9, 9, 9, 9, 9, 9, 9, 9, - /* 100 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - /* 110 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - /* 120 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - /* 130 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - /* 140 */ 9, 9, 9, 9, 438, 438, 438, 397, 397, 397, - /* 150 */ 438, 397, 438, 402, 405, 395, 410, 415, 424, 426, - /* 160 */ 429, 432, 435, 449, 438, 438, 438, 474, 168, 168, - /* 170 */ 438, 438, 496, 500, 540, 505, 504, 539, 507, 510, - /* 180 */ 474, 295, 438, 515, 515, 438, 515, 438, 515, 438, - /* 190 */ 438, 731, 731, 27, 99, 99, 126, 99, 53, 180, - /* 200 */ 232, 232, 232, 232, 243, 269, 292, 187, 187, 187, - /* 210 */ 187, 233, 258, 107, 198, 172, 172, 391, 399, 343, - /* 220 */ 350, 67, 236, 304, 149, 155, 330, 326, 327, 339, - /* 230 */ 342, 344, 346, 348, 354, 355, 357, 70, 362, 261, - /* 240 */ 359, 284, 303, 307, 446, 447, 315, 316, 361, 322, - /* 250 */ 389, 593, 452, 596, 598, 456, 600, 601, 517, 516, - /* 260 */ 476, 499, 506, 536, 501, 537, 541, 528, 529, 560, - /* 270 */ 562, 567, 559, 574, 575, 577, 654, 578, 579, 581, - /* 280 */ 568, 538, 571, 542, 583, 506, 585, 557, 587, 561, - /* 290 */ 594, 660, 667, 668, 669, 670, 671, 672, 673, 597, - /* 300 */ 664, 605, 602, 603, 573, 606, 659, 629, 674, 546, - /* 310 */ 547, 604, 604, 604, 604, 675, 550, 551, 604, 604, - /* 320 */ 604, 689, 691, 616, 604, 693, 694, 695, 696, 697, - /* 330 */ 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, - /* 340 */ 622, 631, 708, 709, 655, 657, 717, -}; -#define YY_REDUCE_COUNT (192) -#define YY_REDUCE_MIN (-259) -#define YY_REDUCE_MAX (451) +#define YY_REDUCE_MAX (461) static const short yy_reduce_ofst[] = { - /* 0 */ -184, -34, -34, 101, 101, 133, -141, -138, -125, -106, - /* 10 */ -152, 18, 58, -80, 44, 61, 134, 143, 150, 151, - /* 20 */ 152, 153, 166, -192, -189, -247, -223, -207, -206, -211, - /* 30 */ -210, -136, -131, -110, -91, -32, 54, 57, 124, 182, - /* 40 */ 196, 75, -41, 94, 138, -259, -253, 52, 98, 106, - /* 50 */ 111, 185, 202, 208, 209, 211, 212, 213, 214, 215, - /* 60 */ 216, 217, 218, 219, 220, 189, 238, 239, 250, 251, - /* 70 */ 252, 253, 254, 255, 256, 296, 297, 298, 231, 299, - /* 80 */ 300, 301, 257, 259, 302, 306, 308, 309, 234, 237, - /* 90 */ 262, 265, 313, 317, 318, 319, 320, 321, 323, 325, - /* 100 */ 328, 329, 331, 332, 333, 334, 335, 336, 337, 338, - /* 110 */ 340, 341, 347, 349, 351, 352, 353, 356, 358, 360, - /* 120 */ 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, - /* 130 */ 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - /* 140 */ 383, 384, 385, 386, 387, 388, 390, 245, 246, 273, - /* 150 */ 392, 274, 393, 266, 285, 271, 290, 305, 394, 396, - /* 160 */ 398, 400, 403, 406, 401, 404, 407, 408, 409, 411, - /* 170 */ 412, 413, 414, 416, 418, 417, 420, 423, 425, 419, - /* 180 */ 422, 421, 427, 436, 440, 430, 441, 439, 443, 445, - /* 190 */ 448, 451, 434, + /* 0 */ -27, -33, -33, -193, -193, -76, -203, -199, -175, -184, + /* 10 */ -130, -134, 93, 24, 67, 119, 126, 135, 142, 148, + /* 20 */ 151, 171, 172, -177, -191, -265, -145, -121, -105, -227, + /* 30 */ -29, 52, 133, 8, -201, -136, 11, 63, 49, 186, + /* 40 */ 96, 189, 192, 70, 153, 199, 206, -116, -11, 17, + /* 50 */ 20, 183, 191, 195, 208, 212, 214, 215, 216, 217, + /* 60 */ 218, 219, 220, 221, 222, 223, 224, 53, 242, 244, + /* 70 */ 232, 253, 255, 257, 258, 259, 260, 295, 300, 301, + /* 80 */ 238, 302, 305, 310, 262, 264, 312, 313, 315, 318, + /* 90 */ 230, 233, 263, 269, 319, 320, 321, 328, 330, 332, + /* 100 */ 333, 334, 335, 336, 339, 342, 346, 349, 351, 352, + /* 110 */ 353, 354, 355, 356, 358, 359, 360, 362, 363, 364, + /* 120 */ 365, 367, 368, 369, 370, 371, 372, 374, 376, 377, + /* 130 */ 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, + /* 140 */ 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, + /* 150 */ 398, 344, 399, 400, 247, 252, 254, 402, 267, 403, + /* 160 */ 246, 266, 265, 270, 273, 293, 406, 268, 409, 411, + /* 170 */ 414, 410, 415, 416, 417, 418, 419, 420, 423, 421, + /* 180 */ 422, 424, 427, 425, 435, 430, 436, 429, 437, 432, + /* 190 */ 438, 440, 446, 450, 441, 451, 453, 454, 457, 458, + /* 200 */ 461, 452, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 830, 947, 890, 957, 877, 887, 1094, 1094, 1094, 830, - /* 10 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 20 */ 830, 830, 830, 1005, 849, 1094, 830, 830, 830, 830, - /* 30 */ 830, 830, 830, 830, 887, 830, 830, 893, 887, 893, - /* 40 */ 893, 830, 1000, 931, 949, 830, 830, 830, 830, 830, - /* 50 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 60 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 70 */ 830, 830, 830, 830, 830, 830, 830, 830, 1007, 1013, - /* 80 */ 1010, 830, 830, 830, 1015, 830, 830, 830, 1037, 1037, - /* 90 */ 998, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 100 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 110 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 120 */ 875, 830, 873, 830, 830, 830, 830, 830, 830, 830, - /* 130 */ 830, 830, 830, 830, 830, 830, 830, 860, 830, 830, - /* 140 */ 830, 830, 830, 830, 851, 851, 851, 830, 830, 830, - /* 150 */ 851, 830, 851, 1044, 1048, 1030, 1042, 1038, 1029, 1025, - /* 160 */ 1023, 1021, 1020, 1052, 851, 851, 851, 891, 887, 887, - /* 170 */ 851, 851, 909, 907, 905, 897, 903, 899, 901, 895, - /* 180 */ 878, 830, 851, 885, 885, 851, 885, 851, 885, 851, - /* 190 */ 851, 931, 949, 830, 1053, 1043, 830, 1093, 1083, 1082, - /* 200 */ 1089, 1081, 1080, 1079, 830, 830, 830, 1075, 1078, 1077, - /* 210 */ 1076, 830, 830, 830, 830, 1085, 1084, 830, 830, 830, - /* 220 */ 830, 830, 830, 830, 830, 830, 830, 1049, 1045, 830, - /* 230 */ 830, 830, 830, 830, 830, 830, 830, 830, 1055, 830, - /* 240 */ 830, 830, 830, 830, 830, 830, 830, 830, 959, 830, - /* 250 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 260 */ 830, 997, 830, 830, 830, 830, 830, 1009, 1008, 830, - /* 270 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 280 */ 1039, 830, 1031, 830, 830, 971, 830, 830, 830, 830, - /* 290 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 300 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 310 */ 830, 1112, 1107, 1108, 1105, 830, 830, 830, 1104, 1099, - /* 320 */ 1100, 830, 830, 830, 1097, 830, 830, 830, 830, 830, - /* 330 */ 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, - /* 340 */ 915, 830, 858, 856, 830, 847, 830, ->>>>>>> dev + /* 0 */ 856, 979, 918, 989, 905, 915, 1126, 1126, 1126, 856, + /* 10 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 20 */ 856, 856, 856, 1037, 876, 1126, 856, 856, 856, 856, + /* 30 */ 856, 856, 856, 856, 915, 856, 856, 856, 856, 925, + /* 40 */ 915, 925, 925, 856, 1032, 963, 981, 856, 856, 856, + /* 50 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 60 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 70 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 80 */ 1039, 1045, 1042, 856, 856, 856, 1047, 856, 856, 856, + /* 90 */ 1069, 1069, 1030, 856, 856, 856, 856, 856, 856, 856, + /* 100 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 110 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 120 */ 856, 856, 856, 856, 856, 856, 903, 856, 901, 856, + /* 130 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 140 */ 856, 856, 856, 856, 887, 856, 856, 856, 856, 856, + /* 150 */ 856, 878, 878, 878, 856, 856, 856, 878, 856, 878, + /* 160 */ 1076, 1080, 1062, 1074, 1070, 1061, 1057, 1055, 1053, 1052, + /* 170 */ 1084, 878, 878, 878, 923, 923, 919, 915, 915, 878, + /* 180 */ 878, 941, 939, 937, 929, 935, 931, 933, 927, 906, + /* 190 */ 856, 878, 913, 913, 878, 913, 878, 913, 878, 878, + /* 200 */ 963, 981, 856, 1085, 1075, 856, 1125, 1115, 1114, 856, + /* 210 */ 1121, 1113, 1112, 1111, 856, 856, 1107, 1110, 1109, 1108, + /* 220 */ 856, 856, 856, 856, 1117, 1116, 856, 856, 856, 856, + /* 230 */ 856, 856, 856, 856, 856, 856, 1081, 1077, 856, 856, + /* 240 */ 856, 856, 856, 856, 856, 856, 856, 1087, 856, 856, + /* 250 */ 856, 856, 856, 856, 856, 856, 856, 991, 856, 856, + /* 260 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 270 */ 1029, 856, 856, 856, 856, 856, 1041, 1040, 856, 856, + /* 280 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 1071, + /* 290 */ 856, 1063, 856, 856, 1003, 856, 856, 856, 856, 856, + /* 300 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 310 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 320 */ 856, 856, 856, 856, 856, 856, 1144, 1139, 1140, 1137, + /* 330 */ 856, 856, 856, 1136, 1131, 1132, 856, 856, 856, 1129, + /* 340 */ 856, 856, 856, 856, 856, 856, 856, 856, 856, 856, + /* 350 */ 856, 856, 856, 856, 856, 947, 856, 885, 883, 856, + /* 360 */ 874, 856, }; /********** End of lemon-generated parsing tables *****************************/ @@ -1124,7 +833,6 @@ static const char *const yyTokenName[] = { /* 44 */ "SHOW", /* 45 */ "DATABASES", /* 46 */ "TOPICS", -<<<<<<< HEAD /* 47 */ "FUNCTIONS", /* 48 */ "MNODES", /* 49 */ "DNODES", @@ -1354,231 +1062,6 @@ static const char *const yyTokenName[] = { /* 273 */ "sortorder", /* 274 */ "grouplist", /* 275 */ "expritem", -======= - /* 47 */ "MNODES", - /* 48 */ "DNODES", - /* 49 */ "ACCOUNTS", - /* 50 */ "USERS", - /* 51 */ "MODULES", - /* 52 */ "QUERIES", - /* 53 */ "CONNECTIONS", - /* 54 */ "STREAMS", - /* 55 */ "VARIABLES", - /* 56 */ "SCORES", - /* 57 */ "GRANTS", - /* 58 */ "VNODES", - /* 59 */ "IPTOKEN", - /* 60 */ "DOT", - /* 61 */ "CREATE", - /* 62 */ "TABLE", - /* 63 */ "STABLE", - /* 64 */ "DATABASE", - /* 65 */ "TABLES", - /* 66 */ "STABLES", - /* 67 */ "VGROUPS", - /* 68 */ "DROP", - /* 69 */ "TOPIC", - /* 70 */ "DNODE", - /* 71 */ "USER", - /* 72 */ "ACCOUNT", - /* 73 */ "USE", - /* 74 */ "DESCRIBE", - /* 75 */ "ALTER", - /* 76 */ "PASS", - /* 77 */ "PRIVILEGE", - /* 78 */ "LOCAL", - /* 79 */ "COMPACT", - /* 80 */ "LP", - /* 81 */ "RP", - /* 82 */ "IF", - /* 83 */ "EXISTS", - /* 84 */ "PPS", - /* 85 */ "TSERIES", - /* 86 */ "DBS", - /* 87 */ "STORAGE", - /* 88 */ "QTIME", - /* 89 */ "CONNS", - /* 90 */ "STATE", - /* 91 */ "COMMA", - /* 92 */ "KEEP", - /* 93 */ "CACHE", - /* 94 */ "REPLICA", - /* 95 */ "QUORUM", - /* 96 */ "DAYS", - /* 97 */ "MINROWS", - /* 98 */ "MAXROWS", - /* 99 */ "BLOCKS", - /* 100 */ "CTIME", - /* 101 */ "WAL", - /* 102 */ "FSYNC", - /* 103 */ "COMP", - /* 104 */ "PRECISION", - /* 105 */ "UPDATE", - /* 106 */ "CACHELAST", - /* 107 */ "PARTITIONS", - /* 108 */ "UNSIGNED", - /* 109 */ "TAGS", - /* 110 */ "USING", - /* 111 */ "AS", - /* 112 */ "NULL", - /* 113 */ "NOW", - /* 114 */ "SELECT", - /* 115 */ "UNION", - /* 116 */ "ALL", - /* 117 */ "DISTINCT", - /* 118 */ "FROM", - /* 119 */ "VARIABLE", - /* 120 */ "INTERVAL", - /* 121 */ "SESSION", - /* 122 */ "STATE_WINDOW", - /* 123 */ "FILL", - /* 124 */ "SLIDING", - /* 125 */ "ORDER", - /* 126 */ "BY", - /* 127 */ "ASC", - /* 128 */ "DESC", - /* 129 */ "GROUP", - /* 130 */ "HAVING", - /* 131 */ "LIMIT", - /* 132 */ "OFFSET", - /* 133 */ "SLIMIT", - /* 134 */ "SOFFSET", - /* 135 */ "WHERE", - /* 136 */ "RESET", - /* 137 */ "QUERY", - /* 138 */ "SYNCDB", - /* 139 */ "ADD", - /* 140 */ "COLUMN", - /* 141 */ "MODIFY", - /* 142 */ "TAG", - /* 143 */ "CHANGE", - /* 144 */ "SET", - /* 145 */ "KILL", - /* 146 */ "CONNECTION", - /* 147 */ "STREAM", - /* 148 */ "COLON", - /* 149 */ "ABORT", - /* 150 */ "AFTER", - /* 151 */ "ATTACH", - /* 152 */ "BEFORE", - /* 153 */ "BEGIN", - /* 154 */ "CASCADE", - /* 155 */ "CLUSTER", - /* 156 */ "CONFLICT", - /* 157 */ "COPY", - /* 158 */ "DEFERRED", - /* 159 */ "DELIMITERS", - /* 160 */ "DETACH", - /* 161 */ "EACH", - /* 162 */ "END", - /* 163 */ "EXPLAIN", - /* 164 */ "FAIL", - /* 165 */ "FOR", - /* 166 */ "IGNORE", - /* 167 */ "IMMEDIATE", - /* 168 */ "INITIALLY", - /* 169 */ "INSTEAD", - /* 170 */ "MATCH", - /* 171 */ "KEY", - /* 172 */ "OF", - /* 173 */ "RAISE", - /* 174 */ "REPLACE", - /* 175 */ "RESTRICT", - /* 176 */ "ROW", - /* 177 */ "STATEMENT", - /* 178 */ "TRIGGER", - /* 179 */ "VIEW", - /* 180 */ "SEMI", - /* 181 */ "NONE", - /* 182 */ "PREV", - /* 183 */ "LINEAR", - /* 184 */ "IMPORT", - /* 185 */ "TBNAME", - /* 186 */ "JOIN", - /* 187 */ "INSERT", - /* 188 */ "INTO", - /* 189 */ "VALUES", - /* 190 */ "error", - /* 191 */ "program", - /* 192 */ "cmd", - /* 193 */ "dbPrefix", - /* 194 */ "ids", - /* 195 */ "cpxName", - /* 196 */ "ifexists", - /* 197 */ "alter_db_optr", - /* 198 */ "alter_topic_optr", - /* 199 */ "acct_optr", - /* 200 */ "exprlist", - /* 201 */ "ifnotexists", - /* 202 */ "db_optr", - /* 203 */ "topic_optr", - /* 204 */ "pps", - /* 205 */ "tseries", - /* 206 */ "dbs", - /* 207 */ "streams", - /* 208 */ "storage", - /* 209 */ "qtime", - /* 210 */ "users", - /* 211 */ "conns", - /* 212 */ "state", - /* 213 */ "intitemlist", - /* 214 */ "intitem", - /* 215 */ "keep", - /* 216 */ "cache", - /* 217 */ "replica", - /* 218 */ "quorum", - /* 219 */ "days", - /* 220 */ "minrows", - /* 221 */ "maxrows", - /* 222 */ "blocks", - /* 223 */ "ctime", - /* 224 */ "wal", - /* 225 */ "fsync", - /* 226 */ "comp", - /* 227 */ "prec", - /* 228 */ "update", - /* 229 */ "cachelast", - /* 230 */ "partitions", - /* 231 */ "typename", - /* 232 */ "signed", - /* 233 */ "create_table_args", - /* 234 */ "create_stable_args", - /* 235 */ "create_table_list", - /* 236 */ "create_from_stable", - /* 237 */ "columnlist", - /* 238 */ "tagitemlist", - /* 239 */ "tagNamelist", - /* 240 */ "select", - /* 241 */ "column", - /* 242 */ "tagitem", - /* 243 */ "selcollist", - /* 244 */ "from", - /* 245 */ "where_opt", - /* 246 */ "interval_opt", - /* 247 */ "session_option", - /* 248 */ "windowstate_option", - /* 249 */ "fill_opt", - /* 250 */ "sliding_opt", - /* 251 */ "groupby_opt", - /* 252 */ "having_opt", - /* 253 */ "orderby_opt", - /* 254 */ "slimit_opt", - /* 255 */ "limit_opt", - /* 256 */ "union", - /* 257 */ "sclp", - /* 258 */ "distinct", - /* 259 */ "expr", - /* 260 */ "as", - /* 261 */ "tablelist", - /* 262 */ "sub", - /* 263 */ "tmvar", - /* 264 */ "sortlist", - /* 265 */ "sortitem", - /* 266 */ "item", - /* 267 */ "sortorder", - /* 268 */ "grouplist", - /* 269 */ "expritem", ->>>>>>> dev }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1589,7 +1072,6 @@ static const char *const yyRuleName[] = { /* 0 */ "program ::= cmd", /* 1 */ "cmd ::= SHOW DATABASES", /* 2 */ "cmd ::= SHOW TOPICS", -<<<<<<< HEAD /* 3 */ "cmd ::= SHOW FUNCTIONS", /* 4 */ "cmd ::= SHOW MNODES", /* 5 */ "cmd ::= SHOW DNODES", @@ -1715,451 +1197,167 @@ static const char *const yyRuleName[] = { /* 125 */ "alter_db_optr ::= alter_db_optr keep", /* 126 */ "alter_db_optr ::= alter_db_optr blocks", /* 127 */ "alter_db_optr ::= alter_db_optr comp", - /* 128 */ "alter_db_optr ::= alter_db_optr wal", - /* 129 */ "alter_db_optr ::= alter_db_optr fsync", - /* 130 */ "alter_db_optr ::= alter_db_optr update", - /* 131 */ "alter_db_optr ::= alter_db_optr cachelast", - /* 132 */ "alter_topic_optr ::= alter_db_optr", - /* 133 */ "alter_topic_optr ::= alter_topic_optr partitions", - /* 134 */ "typename ::= ids", - /* 135 */ "typename ::= ids LP signed RP", - /* 136 */ "typename ::= ids UNSIGNED", - /* 137 */ "signed ::= INTEGER", - /* 138 */ "signed ::= PLUS INTEGER", - /* 139 */ "signed ::= MINUS INTEGER", - /* 140 */ "cmd ::= CREATE TABLE create_table_args", - /* 141 */ "cmd ::= CREATE TABLE create_stable_args", - /* 142 */ "cmd ::= CREATE STABLE create_stable_args", - /* 143 */ "cmd ::= CREATE TABLE create_table_list", - /* 144 */ "create_table_list ::= create_from_stable", - /* 145 */ "create_table_list ::= create_table_list create_from_stable", - /* 146 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", - /* 147 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", - /* 148 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", - /* 149 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", - /* 150 */ "tagNamelist ::= tagNamelist COMMA ids", - /* 151 */ "tagNamelist ::= ids", - /* 152 */ "create_table_args ::= ifnotexists ids cpxName AS select", - /* 153 */ "columnlist ::= columnlist COMMA column", - /* 154 */ "columnlist ::= column", - /* 155 */ "column ::= ids typename", - /* 156 */ "tagitemlist ::= tagitemlist COMMA tagitem", - /* 157 */ "tagitemlist ::= tagitem", - /* 158 */ "tagitem ::= INTEGER", - /* 159 */ "tagitem ::= FLOAT", - /* 160 */ "tagitem ::= STRING", - /* 161 */ "tagitem ::= BOOL", - /* 162 */ "tagitem ::= NULL", - /* 163 */ "tagitem ::= NOW", - /* 164 */ "tagitem ::= MINUS INTEGER", - /* 165 */ "tagitem ::= MINUS FLOAT", - /* 166 */ "tagitem ::= PLUS INTEGER", - /* 167 */ "tagitem ::= PLUS FLOAT", - /* 168 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_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_opt ::= INTERVAL LP tmvar RP", - /* 194 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 195 */ "interval_opt ::=", - /* 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", -======= - /* 3 */ "cmd ::= SHOW MNODES", - /* 4 */ "cmd ::= SHOW DNODES", - /* 5 */ "cmd ::= SHOW ACCOUNTS", - /* 6 */ "cmd ::= SHOW USERS", - /* 7 */ "cmd ::= SHOW MODULES", - /* 8 */ "cmd ::= SHOW QUERIES", - /* 9 */ "cmd ::= SHOW CONNECTIONS", - /* 10 */ "cmd ::= SHOW STREAMS", - /* 11 */ "cmd ::= SHOW VARIABLES", - /* 12 */ "cmd ::= SHOW SCORES", - /* 13 */ "cmd ::= SHOW GRANTS", - /* 14 */ "cmd ::= SHOW VNODES", - /* 15 */ "cmd ::= SHOW VNODES IPTOKEN", - /* 16 */ "dbPrefix ::=", - /* 17 */ "dbPrefix ::= ids DOT", - /* 18 */ "cpxName ::=", - /* 19 */ "cpxName ::= DOT ids", - /* 20 */ "cmd ::= SHOW CREATE TABLE ids cpxName", - /* 21 */ "cmd ::= SHOW CREATE STABLE ids cpxName", - /* 22 */ "cmd ::= SHOW CREATE DATABASE ids", - /* 23 */ "cmd ::= SHOW dbPrefix TABLES", - /* 24 */ "cmd ::= SHOW dbPrefix TABLES LIKE ids", - /* 25 */ "cmd ::= SHOW dbPrefix STABLES", - /* 26 */ "cmd ::= SHOW dbPrefix STABLES LIKE ids", - /* 27 */ "cmd ::= SHOW dbPrefix VGROUPS", - /* 28 */ "cmd ::= SHOW dbPrefix VGROUPS ids", - /* 29 */ "cmd ::= DROP TABLE ifexists ids cpxName", - /* 30 */ "cmd ::= DROP STABLE ifexists ids cpxName", - /* 31 */ "cmd ::= DROP DATABASE ifexists ids", - /* 32 */ "cmd ::= DROP TOPIC ifexists ids", - /* 33 */ "cmd ::= DROP DNODE ids", - /* 34 */ "cmd ::= DROP USER ids", - /* 35 */ "cmd ::= DROP ACCOUNT ids", - /* 36 */ "cmd ::= USE ids", - /* 37 */ "cmd ::= DESCRIBE ids cpxName", - /* 38 */ "cmd ::= ALTER USER ids PASS ids", - /* 39 */ "cmd ::= ALTER USER ids PRIVILEGE ids", - /* 40 */ "cmd ::= ALTER DNODE ids ids", - /* 41 */ "cmd ::= ALTER DNODE ids ids ids", - /* 42 */ "cmd ::= ALTER LOCAL ids", - /* 43 */ "cmd ::= ALTER LOCAL ids ids", - /* 44 */ "cmd ::= ALTER DATABASE ids alter_db_optr", - /* 45 */ "cmd ::= ALTER TOPIC ids alter_topic_optr", - /* 46 */ "cmd ::= ALTER ACCOUNT ids acct_optr", - /* 47 */ "cmd ::= ALTER ACCOUNT ids PASS ids acct_optr", - /* 48 */ "cmd ::= COMPACT VNODES IN LP exprlist RP", - /* 49 */ "ids ::= ID", - /* 50 */ "ids ::= STRING", - /* 51 */ "ifexists ::= IF EXISTS", - /* 52 */ "ifexists ::=", - /* 53 */ "ifnotexists ::= IF NOT EXISTS", - /* 54 */ "ifnotexists ::=", - /* 55 */ "cmd ::= CREATE DNODE ids", - /* 56 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", - /* 57 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", - /* 58 */ "cmd ::= CREATE TOPIC ifnotexists ids topic_optr", - /* 59 */ "cmd ::= CREATE USER ids PASS ids", - /* 60 */ "pps ::=", - /* 61 */ "pps ::= PPS INTEGER", - /* 62 */ "tseries ::=", - /* 63 */ "tseries ::= TSERIES INTEGER", - /* 64 */ "dbs ::=", - /* 65 */ "dbs ::= DBS INTEGER", - /* 66 */ "streams ::=", - /* 67 */ "streams ::= STREAMS INTEGER", - /* 68 */ "storage ::=", - /* 69 */ "storage ::= STORAGE INTEGER", - /* 70 */ "qtime ::=", - /* 71 */ "qtime ::= QTIME INTEGER", - /* 72 */ "users ::=", - /* 73 */ "users ::= USERS INTEGER", - /* 74 */ "conns ::=", - /* 75 */ "conns ::= CONNS INTEGER", - /* 76 */ "state ::=", - /* 77 */ "state ::= STATE ids", - /* 78 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state", - /* 79 */ "intitemlist ::= intitemlist COMMA intitem", - /* 80 */ "intitemlist ::= intitem", - /* 81 */ "intitem ::= INTEGER", - /* 82 */ "keep ::= KEEP intitemlist", - /* 83 */ "cache ::= CACHE INTEGER", - /* 84 */ "replica ::= REPLICA INTEGER", - /* 85 */ "quorum ::= QUORUM INTEGER", - /* 86 */ "days ::= DAYS INTEGER", - /* 87 */ "minrows ::= MINROWS INTEGER", - /* 88 */ "maxrows ::= MAXROWS INTEGER", - /* 89 */ "blocks ::= BLOCKS INTEGER", - /* 90 */ "ctime ::= CTIME INTEGER", - /* 91 */ "wal ::= WAL INTEGER", - /* 92 */ "fsync ::= FSYNC INTEGER", - /* 93 */ "comp ::= COMP INTEGER", - /* 94 */ "prec ::= PRECISION STRING", - /* 95 */ "update ::= UPDATE INTEGER", - /* 96 */ "cachelast ::= CACHELAST INTEGER", - /* 97 */ "partitions ::= PARTITIONS INTEGER", - /* 98 */ "db_optr ::=", - /* 99 */ "db_optr ::= db_optr cache", - /* 100 */ "db_optr ::= db_optr replica", - /* 101 */ "db_optr ::= db_optr quorum", - /* 102 */ "db_optr ::= db_optr days", - /* 103 */ "db_optr ::= db_optr minrows", - /* 104 */ "db_optr ::= db_optr maxrows", - /* 105 */ "db_optr ::= db_optr blocks", - /* 106 */ "db_optr ::= db_optr ctime", - /* 107 */ "db_optr ::= db_optr wal", - /* 108 */ "db_optr ::= db_optr fsync", - /* 109 */ "db_optr ::= db_optr comp", - /* 110 */ "db_optr ::= db_optr prec", - /* 111 */ "db_optr ::= db_optr keep", - /* 112 */ "db_optr ::= db_optr update", - /* 113 */ "db_optr ::= db_optr cachelast", - /* 114 */ "topic_optr ::= db_optr", - /* 115 */ "topic_optr ::= topic_optr partitions", - /* 116 */ "alter_db_optr ::=", - /* 117 */ "alter_db_optr ::= alter_db_optr replica", - /* 118 */ "alter_db_optr ::= alter_db_optr quorum", - /* 119 */ "alter_db_optr ::= alter_db_optr keep", - /* 120 */ "alter_db_optr ::= alter_db_optr blocks", - /* 121 */ "alter_db_optr ::= alter_db_optr comp", - /* 122 */ "alter_db_optr ::= alter_db_optr update", - /* 123 */ "alter_db_optr ::= alter_db_optr cachelast", - /* 124 */ "alter_topic_optr ::= alter_db_optr", - /* 125 */ "alter_topic_optr ::= alter_topic_optr partitions", - /* 126 */ "typename ::= ids", - /* 127 */ "typename ::= ids LP signed RP", - /* 128 */ "typename ::= ids UNSIGNED", - /* 129 */ "signed ::= INTEGER", - /* 130 */ "signed ::= PLUS INTEGER", - /* 131 */ "signed ::= MINUS INTEGER", - /* 132 */ "cmd ::= CREATE TABLE create_table_args", - /* 133 */ "cmd ::= CREATE TABLE create_stable_args", - /* 134 */ "cmd ::= CREATE STABLE create_stable_args", - /* 135 */ "cmd ::= CREATE TABLE create_table_list", - /* 136 */ "create_table_list ::= create_from_stable", - /* 137 */ "create_table_list ::= create_table_list create_from_stable", - /* 138 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", - /* 139 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", - /* 140 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", - /* 141 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", - /* 142 */ "tagNamelist ::= tagNamelist COMMA ids", - /* 143 */ "tagNamelist ::= ids", - /* 144 */ "create_table_args ::= ifnotexists ids cpxName AS select", - /* 145 */ "columnlist ::= columnlist COMMA column", - /* 146 */ "columnlist ::= column", - /* 147 */ "column ::= ids typename", - /* 148 */ "tagitemlist ::= tagitemlist COMMA tagitem", - /* 149 */ "tagitemlist ::= tagitem", - /* 150 */ "tagitem ::= INTEGER", - /* 151 */ "tagitem ::= FLOAT", - /* 152 */ "tagitem ::= STRING", - /* 153 */ "tagitem ::= BOOL", - /* 154 */ "tagitem ::= NULL", - /* 155 */ "tagitem ::= NOW", - /* 156 */ "tagitem ::= MINUS INTEGER", - /* 157 */ "tagitem ::= MINUS FLOAT", - /* 158 */ "tagitem ::= PLUS INTEGER", - /* 159 */ "tagitem ::= PLUS FLOAT", - /* 160 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", - /* 161 */ "select ::= LP select RP", - /* 162 */ "union ::= select", - /* 163 */ "union ::= union UNION ALL select", - /* 164 */ "cmd ::= union", - /* 165 */ "select ::= SELECT selcollist", - /* 166 */ "sclp ::= selcollist COMMA", - /* 167 */ "sclp ::=", - /* 168 */ "selcollist ::= sclp distinct expr as", - /* 169 */ "selcollist ::= sclp STAR", - /* 170 */ "as ::= AS ids", - /* 171 */ "as ::= ids", - /* 172 */ "as ::=", - /* 173 */ "distinct ::= DISTINCT", - /* 174 */ "distinct ::=", - /* 175 */ "from ::= FROM tablelist", - /* 176 */ "from ::= FROM sub", - /* 177 */ "sub ::= LP union RP", - /* 178 */ "sub ::= LP union RP ids", - /* 179 */ "sub ::= sub COMMA LP union RP ids", - /* 180 */ "tablelist ::= ids cpxName", - /* 181 */ "tablelist ::= ids cpxName ids", - /* 182 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 183 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 184 */ "tmvar ::= VARIABLE", - /* 185 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 186 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 187 */ "interval_opt ::=", - /* 188 */ "session_option ::=", - /* 189 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 190 */ "windowstate_option ::=", - /* 191 */ "windowstate_option ::= STATE_WINDOW LP ids RP", - /* 192 */ "fill_opt ::=", - /* 193 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 194 */ "fill_opt ::= FILL LP ID RP", - /* 195 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 196 */ "sliding_opt ::=", - /* 197 */ "orderby_opt ::=", - /* 198 */ "orderby_opt ::= ORDER BY sortlist", - /* 199 */ "sortlist ::= sortlist COMMA item sortorder", - /* 200 */ "sortlist ::= item sortorder", - /* 201 */ "item ::= ids cpxName", - /* 202 */ "sortorder ::= ASC", - /* 203 */ "sortorder ::= DESC", - /* 204 */ "sortorder ::=", - /* 205 */ "groupby_opt ::=", - /* 206 */ "groupby_opt ::= GROUP BY grouplist", - /* 207 */ "grouplist ::= grouplist COMMA item", - /* 208 */ "grouplist ::= item", - /* 209 */ "having_opt ::=", - /* 210 */ "having_opt ::= HAVING expr", - /* 211 */ "limit_opt ::=", - /* 212 */ "limit_opt ::= LIMIT signed", - /* 213 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 214 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 215 */ "slimit_opt ::=", - /* 216 */ "slimit_opt ::= SLIMIT signed", - /* 217 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 218 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 219 */ "where_opt ::=", - /* 220 */ "where_opt ::= WHERE expr", - /* 221 */ "expr ::= LP expr RP", - /* 222 */ "expr ::= ID", - /* 223 */ "expr ::= ID DOT ID", - /* 224 */ "expr ::= ID DOT STAR", - /* 225 */ "expr ::= INTEGER", - /* 226 */ "expr ::= MINUS INTEGER", - /* 227 */ "expr ::= PLUS INTEGER", - /* 228 */ "expr ::= FLOAT", - /* 229 */ "expr ::= MINUS FLOAT", - /* 230 */ "expr ::= PLUS FLOAT", - /* 231 */ "expr ::= STRING", - /* 232 */ "expr ::= NOW", - /* 233 */ "expr ::= VARIABLE", - /* 234 */ "expr ::= PLUS VARIABLE", - /* 235 */ "expr ::= MINUS VARIABLE", - /* 236 */ "expr ::= BOOL", - /* 237 */ "expr ::= NULL", - /* 238 */ "expr ::= ID LP exprlist RP", - /* 239 */ "expr ::= ID LP STAR RP", - /* 240 */ "expr ::= expr IS NULL", - /* 241 */ "expr ::= expr IS NOT NULL", - /* 242 */ "expr ::= expr LT expr", - /* 243 */ "expr ::= expr GT expr", - /* 244 */ "expr ::= expr LE expr", - /* 245 */ "expr ::= expr GE expr", - /* 246 */ "expr ::= expr NE expr", - /* 247 */ "expr ::= expr EQ expr", - /* 248 */ "expr ::= expr BETWEEN expr AND expr", - /* 249 */ "expr ::= expr AND expr", - /* 250 */ "expr ::= expr OR expr", - /* 251 */ "expr ::= expr PLUS expr", - /* 252 */ "expr ::= expr MINUS expr", - /* 253 */ "expr ::= expr STAR expr", - /* 254 */ "expr ::= expr SLASH expr", - /* 255 */ "expr ::= expr REM expr", - /* 256 */ "expr ::= expr LIKE expr", - /* 257 */ "expr ::= expr IN LP exprlist RP", - /* 258 */ "exprlist ::= exprlist COMMA expritem", - /* 259 */ "exprlist ::= expritem", - /* 260 */ "expritem ::= expr", - /* 261 */ "expritem ::=", - /* 262 */ "cmd ::= RESET QUERY CACHE", - /* 263 */ "cmd ::= SYNCDB ids REPLICA", - /* 264 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 265 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 266 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", - /* 267 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 268 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 269 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 270 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 271 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", - /* 272 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 273 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 274 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", - /* 275 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 276 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 277 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 278 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", - /* 279 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", - /* 280 */ "cmd ::= KILL CONNECTION INTEGER", - /* 281 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 282 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", ->>>>>>> dev + /* 128 */ "alter_db_optr ::= alter_db_optr update", + /* 129 */ "alter_db_optr ::= alter_db_optr cachelast", + /* 130 */ "alter_topic_optr ::= alter_db_optr", + /* 131 */ "alter_topic_optr ::= alter_topic_optr partitions", + /* 132 */ "typename ::= ids", + /* 133 */ "typename ::= ids LP signed RP", + /* 134 */ "typename ::= ids UNSIGNED", + /* 135 */ "signed ::= INTEGER", + /* 136 */ "signed ::= PLUS INTEGER", + /* 137 */ "signed ::= MINUS INTEGER", + /* 138 */ "cmd ::= CREATE TABLE create_table_args", + /* 139 */ "cmd ::= CREATE TABLE create_stable_args", + /* 140 */ "cmd ::= CREATE STABLE create_stable_args", + /* 141 */ "cmd ::= CREATE TABLE create_table_list", + /* 142 */ "create_table_list ::= create_from_stable", + /* 143 */ "create_table_list ::= create_table_list create_from_stable", + /* 144 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", + /* 145 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", + /* 146 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", + /* 147 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", + /* 148 */ "tagNamelist ::= tagNamelist COMMA ids", + /* 149 */ "tagNamelist ::= ids", + /* 150 */ "create_table_args ::= ifnotexists ids cpxName AS select", + /* 151 */ "columnlist ::= columnlist COMMA column", + /* 152 */ "columnlist ::= column", + /* 153 */ "column ::= ids typename", + /* 154 */ "tagitemlist ::= tagitemlist COMMA tagitem", + /* 155 */ "tagitemlist ::= tagitem", + /* 156 */ "tagitem ::= INTEGER", + /* 157 */ "tagitem ::= FLOAT", + /* 158 */ "tagitem ::= STRING", + /* 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_opt session_option windowstate_option fill_opt sliding_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_opt ::= INTERVAL LP tmvar RP", + /* 192 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 193 */ "interval_opt ::=", + /* 194 */ "session_option ::=", + /* 195 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 196 */ "windowstate_option ::=", + /* 197 */ "windowstate_option ::= STATE_WINDOW LP ids RP", + /* 198 */ "fill_opt ::=", + /* 199 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 200 */ "fill_opt ::= FILL LP ID RP", + /* 201 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 202 */ "sliding_opt ::=", + /* 203 */ "orderby_opt ::=", + /* 204 */ "orderby_opt ::= ORDER BY sortlist", + /* 205 */ "sortlist ::= sortlist COMMA item sortorder", + /* 206 */ "sortlist ::= item sortorder", + /* 207 */ "item ::= ids cpxName", + /* 208 */ "sortorder ::= ASC", + /* 209 */ "sortorder ::= DESC", + /* 210 */ "sortorder ::=", + /* 211 */ "groupby_opt ::=", + /* 212 */ "groupby_opt ::= GROUP BY grouplist", + /* 213 */ "grouplist ::= grouplist COMMA item", + /* 214 */ "grouplist ::= item", + /* 215 */ "having_opt ::=", + /* 216 */ "having_opt ::= HAVING expr", + /* 217 */ "limit_opt ::=", + /* 218 */ "limit_opt ::= LIMIT signed", + /* 219 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 220 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 221 */ "slimit_opt ::=", + /* 222 */ "slimit_opt ::= SLIMIT signed", + /* 223 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 224 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 225 */ "where_opt ::=", + /* 226 */ "where_opt ::= WHERE expr", + /* 227 */ "expr ::= LP expr RP", + /* 228 */ "expr ::= ID", + /* 229 */ "expr ::= ID DOT ID", + /* 230 */ "expr ::= ID DOT STAR", + /* 231 */ "expr ::= INTEGER", + /* 232 */ "expr ::= MINUS INTEGER", + /* 233 */ "expr ::= PLUS INTEGER", + /* 234 */ "expr ::= FLOAT", + /* 235 */ "expr ::= MINUS FLOAT", + /* 236 */ "expr ::= PLUS FLOAT", + /* 237 */ "expr ::= STRING", + /* 238 */ "expr ::= NOW", + /* 239 */ "expr ::= VARIABLE", + /* 240 */ "expr ::= PLUS VARIABLE", + /* 241 */ "expr ::= MINUS VARIABLE", + /* 242 */ "expr ::= BOOL", + /* 243 */ "expr ::= NULL", + /* 244 */ "expr ::= ID LP exprlist RP", + /* 245 */ "expr ::= ID LP STAR RP", + /* 246 */ "expr ::= expr IS NULL", + /* 247 */ "expr ::= expr IS NOT NULL", + /* 248 */ "expr ::= expr LT expr", + /* 249 */ "expr ::= expr GT expr", + /* 250 */ "expr ::= expr LE expr", + /* 251 */ "expr ::= expr GE expr", + /* 252 */ "expr ::= expr NE expr", + /* 253 */ "expr ::= expr EQ expr", + /* 254 */ "expr ::= expr BETWEEN expr AND expr", + /* 255 */ "expr ::= expr AND expr", + /* 256 */ "expr ::= expr OR expr", + /* 257 */ "expr ::= expr PLUS expr", + /* 258 */ "expr ::= expr MINUS expr", + /* 259 */ "expr ::= expr STAR expr", + /* 260 */ "expr ::= expr SLASH expr", + /* 261 */ "expr ::= expr REM expr", + /* 262 */ "expr ::= expr LIKE expr", + /* 263 */ "expr ::= expr IN LP exprlist RP", + /* 264 */ "exprlist ::= exprlist COMMA expritem", + /* 265 */ "exprlist ::= expritem", + /* 266 */ "expritem ::= expr", + /* 267 */ "expritem ::=", + /* 268 */ "cmd ::= RESET QUERY CACHE", + /* 269 */ "cmd ::= SYNCDB ids REPLICA", + /* 270 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 271 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 272 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", + /* 273 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 274 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 275 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 276 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 277 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", + /* 278 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 279 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 280 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", + /* 281 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 282 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 283 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 284 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", + /* 285 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", + /* 286 */ "cmd ::= KILL CONNECTION INTEGER", + /* 287 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 288 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -2287,7 +1485,6 @@ static void yy_destructor( tSqlExprListDestroy((yypminor->yy525)); } break; -<<<<<<< HEAD case 220: /* intitemlist */ case 222: /* keep */ case 243: /* columnlist */ @@ -2300,20 +1497,6 @@ tSqlExprListDestroy((yypminor->yy525)); case 274: /* grouplist */ { taosArrayDestroy((yypminor->yy525)); -======= - case 213: /* intitemlist */ - case 215: /* keep */ - case 237: /* columnlist */ - case 238: /* tagitemlist */ - case 239: /* tagNamelist */ - case 249: /* fill_opt */ - case 251: /* groupby_opt */ - case 253: /* orderby_opt */ - case 264: /* sortlist */ - case 268: /* grouplist */ -{ -taosArrayDestroy((yypminor->yy441)); ->>>>>>> dev } break; case 241: /* create_table_list */ @@ -2333,17 +1516,10 @@ destroySqlNode((yypminor->yy464)); destroyRelationInfo((yypminor->yy412)); } break; -<<<<<<< HEAD case 251: /* where_opt */ case 258: /* having_opt */ case 265: /* expr */ case 275: /* expritem */ -======= - case 245: /* where_opt */ - case 252: /* having_opt */ - case 259: /* expr */ - case 269: /* expritem */ ->>>>>>> dev { tSqlExprDestroy((yypminor->yy370)); } @@ -2649,7 +1825,6 @@ static const struct { YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ signed char nrhs; /* Negative of the number of RHS symbols in the rule */ } yyRuleInfo[] = { -<<<<<<< HEAD { 196, -1 }, /* (0) program ::= cmd */ { 197, -2 }, /* (1) cmd ::= SHOW DATABASES */ { 197, -2 }, /* (2) cmd ::= SHOW TOPICS */ @@ -2778,454 +1953,167 @@ static const struct { { 202, -2 }, /* (125) alter_db_optr ::= alter_db_optr keep */ { 202, -2 }, /* (126) alter_db_optr ::= alter_db_optr blocks */ { 202, -2 }, /* (127) alter_db_optr ::= alter_db_optr comp */ - { 202, -2 }, /* (128) alter_db_optr ::= alter_db_optr wal */ - { 202, -2 }, /* (129) alter_db_optr ::= alter_db_optr fsync */ - { 202, -2 }, /* (130) alter_db_optr ::= alter_db_optr update */ - { 202, -2 }, /* (131) alter_db_optr ::= alter_db_optr cachelast */ - { 203, -1 }, /* (132) alter_topic_optr ::= alter_db_optr */ - { 203, -2 }, /* (133) alter_topic_optr ::= alter_topic_optr partitions */ - { 209, -1 }, /* (134) typename ::= ids */ - { 209, -4 }, /* (135) typename ::= ids LP signed RP */ - { 209, -2 }, /* (136) typename ::= ids UNSIGNED */ - { 238, -1 }, /* (137) signed ::= INTEGER */ - { 238, -2 }, /* (138) signed ::= PLUS INTEGER */ - { 238, -2 }, /* (139) signed ::= MINUS INTEGER */ - { 197, -3 }, /* (140) cmd ::= CREATE TABLE create_table_args */ - { 197, -3 }, /* (141) cmd ::= CREATE TABLE create_stable_args */ - { 197, -3 }, /* (142) cmd ::= CREATE STABLE create_stable_args */ - { 197, -3 }, /* (143) cmd ::= CREATE TABLE create_table_list */ - { 241, -1 }, /* (144) create_table_list ::= create_from_stable */ - { 241, -2 }, /* (145) create_table_list ::= create_table_list create_from_stable */ - { 239, -6 }, /* (146) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 240, -10 }, /* (147) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 242, -10 }, /* (148) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 242, -13 }, /* (149) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 245, -3 }, /* (150) tagNamelist ::= tagNamelist COMMA ids */ - { 245, -1 }, /* (151) tagNamelist ::= ids */ - { 239, -5 }, /* (152) create_table_args ::= ifnotexists ids cpxName AS select */ - { 243, -3 }, /* (153) columnlist ::= columnlist COMMA column */ - { 243, -1 }, /* (154) columnlist ::= column */ - { 247, -2 }, /* (155) column ::= ids typename */ - { 244, -3 }, /* (156) tagitemlist ::= tagitemlist COMMA tagitem */ - { 244, -1 }, /* (157) tagitemlist ::= tagitem */ - { 248, -1 }, /* (158) tagitem ::= INTEGER */ - { 248, -1 }, /* (159) tagitem ::= FLOAT */ - { 248, -1 }, /* (160) tagitem ::= STRING */ - { 248, -1 }, /* (161) tagitem ::= BOOL */ - { 248, -1 }, /* (162) tagitem ::= NULL */ - { 248, -1 }, /* (163) tagitem ::= NOW */ - { 248, -2 }, /* (164) tagitem ::= MINUS INTEGER */ - { 248, -2 }, /* (165) tagitem ::= MINUS FLOAT */ - { 248, -2 }, /* (166) tagitem ::= PLUS INTEGER */ - { 248, -2 }, /* (167) tagitem ::= PLUS FLOAT */ - { 246, -14 }, /* (168) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ - { 246, -3 }, /* (169) select ::= LP select RP */ - { 262, -1 }, /* (170) union ::= select */ - { 262, -4 }, /* (171) union ::= union UNION ALL select */ - { 197, -1 }, /* (172) cmd ::= union */ - { 246, -2 }, /* (173) select ::= SELECT selcollist */ - { 263, -2 }, /* (174) sclp ::= selcollist COMMA */ - { 263, 0 }, /* (175) sclp ::= */ - { 249, -4 }, /* (176) selcollist ::= sclp distinct expr as */ - { 249, -2 }, /* (177) selcollist ::= sclp STAR */ - { 266, -2 }, /* (178) as ::= AS ids */ - { 266, -1 }, /* (179) as ::= ids */ - { 266, 0 }, /* (180) as ::= */ - { 264, -1 }, /* (181) distinct ::= DISTINCT */ - { 264, 0 }, /* (182) distinct ::= */ - { 250, -2 }, /* (183) from ::= FROM tablelist */ - { 250, -2 }, /* (184) from ::= FROM sub */ - { 268, -3 }, /* (185) sub ::= LP union RP */ - { 268, -4 }, /* (186) sub ::= LP union RP ids */ - { 268, -6 }, /* (187) sub ::= sub COMMA LP union RP ids */ - { 267, -2 }, /* (188) tablelist ::= ids cpxName */ - { 267, -3 }, /* (189) tablelist ::= ids cpxName ids */ - { 267, -4 }, /* (190) tablelist ::= tablelist COMMA ids cpxName */ - { 267, -5 }, /* (191) tablelist ::= tablelist COMMA ids cpxName ids */ - { 269, -1 }, /* (192) tmvar ::= VARIABLE */ - { 252, -4 }, /* (193) interval_opt ::= INTERVAL LP tmvar RP */ - { 252, -6 }, /* (194) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 252, 0 }, /* (195) interval_opt ::= */ - { 253, 0 }, /* (196) session_option ::= */ - { 253, -7 }, /* (197) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 254, 0 }, /* (198) windowstate_option ::= */ - { 254, -4 }, /* (199) windowstate_option ::= STATE_WINDOW LP ids RP */ - { 255, 0 }, /* (200) fill_opt ::= */ - { 255, -6 }, /* (201) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 255, -4 }, /* (202) fill_opt ::= FILL LP ID RP */ - { 256, -4 }, /* (203) sliding_opt ::= SLIDING LP tmvar RP */ - { 256, 0 }, /* (204) sliding_opt ::= */ - { 259, 0 }, /* (205) orderby_opt ::= */ - { 259, -3 }, /* (206) orderby_opt ::= ORDER BY sortlist */ - { 270, -4 }, /* (207) sortlist ::= sortlist COMMA item sortorder */ - { 270, -2 }, /* (208) sortlist ::= item sortorder */ - { 272, -2 }, /* (209) item ::= ids cpxName */ - { 273, -1 }, /* (210) sortorder ::= ASC */ - { 273, -1 }, /* (211) sortorder ::= DESC */ - { 273, 0 }, /* (212) sortorder ::= */ - { 257, 0 }, /* (213) groupby_opt ::= */ - { 257, -3 }, /* (214) groupby_opt ::= GROUP BY grouplist */ - { 274, -3 }, /* (215) grouplist ::= grouplist COMMA item */ - { 274, -1 }, /* (216) grouplist ::= item */ - { 258, 0 }, /* (217) having_opt ::= */ - { 258, -2 }, /* (218) having_opt ::= HAVING expr */ - { 261, 0 }, /* (219) limit_opt ::= */ - { 261, -2 }, /* (220) limit_opt ::= LIMIT signed */ - { 261, -4 }, /* (221) limit_opt ::= LIMIT signed OFFSET signed */ - { 261, -4 }, /* (222) limit_opt ::= LIMIT signed COMMA signed */ - { 260, 0 }, /* (223) slimit_opt ::= */ - { 260, -2 }, /* (224) slimit_opt ::= SLIMIT signed */ - { 260, -4 }, /* (225) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 260, -4 }, /* (226) slimit_opt ::= SLIMIT signed COMMA signed */ - { 251, 0 }, /* (227) where_opt ::= */ - { 251, -2 }, /* (228) where_opt ::= WHERE expr */ - { 265, -3 }, /* (229) expr ::= LP expr RP */ - { 265, -1 }, /* (230) expr ::= ID */ - { 265, -3 }, /* (231) expr ::= ID DOT ID */ - { 265, -3 }, /* (232) expr ::= ID DOT STAR */ - { 265, -1 }, /* (233) expr ::= INTEGER */ - { 265, -2 }, /* (234) expr ::= MINUS INTEGER */ - { 265, -2 }, /* (235) expr ::= PLUS INTEGER */ - { 265, -1 }, /* (236) expr ::= FLOAT */ - { 265, -2 }, /* (237) expr ::= MINUS FLOAT */ - { 265, -2 }, /* (238) expr ::= PLUS FLOAT */ - { 265, -1 }, /* (239) expr ::= STRING */ - { 265, -1 }, /* (240) expr ::= NOW */ - { 265, -1 }, /* (241) expr ::= VARIABLE */ - { 265, -2 }, /* (242) expr ::= PLUS VARIABLE */ - { 265, -2 }, /* (243) expr ::= MINUS VARIABLE */ - { 265, -1 }, /* (244) expr ::= BOOL */ - { 265, -1 }, /* (245) expr ::= NULL */ - { 265, -4 }, /* (246) expr ::= ID LP exprlist RP */ - { 265, -4 }, /* (247) expr ::= ID LP STAR RP */ - { 265, -3 }, /* (248) expr ::= expr IS NULL */ - { 265, -4 }, /* (249) expr ::= expr IS NOT NULL */ - { 265, -3 }, /* (250) expr ::= expr LT expr */ - { 265, -3 }, /* (251) expr ::= expr GT expr */ - { 265, -3 }, /* (252) expr ::= expr LE expr */ - { 265, -3 }, /* (253) expr ::= expr GE expr */ - { 265, -3 }, /* (254) expr ::= expr NE expr */ - { 265, -3 }, /* (255) expr ::= expr EQ expr */ - { 265, -5 }, /* (256) expr ::= expr BETWEEN expr AND expr */ - { 265, -3 }, /* (257) expr ::= expr AND expr */ - { 265, -3 }, /* (258) expr ::= expr OR expr */ - { 265, -3 }, /* (259) expr ::= expr PLUS expr */ - { 265, -3 }, /* (260) expr ::= expr MINUS expr */ - { 265, -3 }, /* (261) expr ::= expr STAR expr */ - { 265, -3 }, /* (262) expr ::= expr SLASH expr */ - { 265, -3 }, /* (263) expr ::= expr REM expr */ - { 265, -3 }, /* (264) expr ::= expr LIKE expr */ - { 265, -5 }, /* (265) expr ::= expr IN LP exprlist RP */ - { 205, -3 }, /* (266) exprlist ::= exprlist COMMA expritem */ - { 205, -1 }, /* (267) exprlist ::= expritem */ - { 275, -1 }, /* (268) expritem ::= expr */ - { 275, 0 }, /* (269) expritem ::= */ - { 197, -3 }, /* (270) cmd ::= RESET QUERY CACHE */ - { 197, -3 }, /* (271) cmd ::= SYNCDB ids REPLICA */ - { 197, -7 }, /* (272) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 197, -7 }, /* (273) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 197, -7 }, /* (274) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - { 197, -7 }, /* (275) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 197, -7 }, /* (276) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 197, -8 }, /* (277) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 197, -9 }, /* (278) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 197, -7 }, /* (279) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - { 197, -7 }, /* (280) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 197, -7 }, /* (281) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 197, -7 }, /* (282) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - { 197, -7 }, /* (283) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 197, -7 }, /* (284) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 197, -8 }, /* (285) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 197, -9 }, /* (286) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - { 197, -7 }, /* (287) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - { 197, -3 }, /* (288) cmd ::= KILL CONNECTION INTEGER */ - { 197, -5 }, /* (289) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 197, -5 }, /* (290) cmd ::= KILL QUERY INTEGER COLON INTEGER */ -======= - { 191, -1 }, /* (0) program ::= cmd */ - { 192, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 192, -2 }, /* (2) cmd ::= SHOW TOPICS */ - { 192, -2 }, /* (3) cmd ::= SHOW MNODES */ - { 192, -2 }, /* (4) cmd ::= SHOW DNODES */ - { 192, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ - { 192, -2 }, /* (6) cmd ::= SHOW USERS */ - { 192, -2 }, /* (7) cmd ::= SHOW MODULES */ - { 192, -2 }, /* (8) cmd ::= SHOW QUERIES */ - { 192, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ - { 192, -2 }, /* (10) cmd ::= SHOW STREAMS */ - { 192, -2 }, /* (11) cmd ::= SHOW VARIABLES */ - { 192, -2 }, /* (12) cmd ::= SHOW SCORES */ - { 192, -2 }, /* (13) cmd ::= SHOW GRANTS */ - { 192, -2 }, /* (14) cmd ::= SHOW VNODES */ - { 192, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ - { 193, 0 }, /* (16) dbPrefix ::= */ - { 193, -2 }, /* (17) dbPrefix ::= ids DOT */ - { 195, 0 }, /* (18) cpxName ::= */ - { 195, -2 }, /* (19) cpxName ::= DOT ids */ - { 192, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 192, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */ - { 192, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */ - { 192, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */ - { 192, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 192, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */ - { 192, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 192, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ - { 192, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 192, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ - { 192, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ - { 192, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */ - { 192, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */ - { 192, -3 }, /* (33) cmd ::= DROP DNODE ids */ - { 192, -3 }, /* (34) cmd ::= DROP USER ids */ - { 192, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */ - { 192, -2 }, /* (36) cmd ::= USE ids */ - { 192, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */ - { 192, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */ - { 192, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 192, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */ - { 192, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */ - { 192, -3 }, /* (42) cmd ::= ALTER LOCAL ids */ - { 192, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */ - { 192, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 192, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */ - { 192, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 192, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 192, -6 }, /* (48) cmd ::= COMPACT VNODES IN LP exprlist RP */ - { 194, -1 }, /* (49) ids ::= ID */ - { 194, -1 }, /* (50) ids ::= STRING */ - { 196, -2 }, /* (51) ifexists ::= IF EXISTS */ - { 196, 0 }, /* (52) ifexists ::= */ - { 201, -3 }, /* (53) ifnotexists ::= IF NOT EXISTS */ - { 201, 0 }, /* (54) ifnotexists ::= */ - { 192, -3 }, /* (55) cmd ::= CREATE DNODE ids */ - { 192, -6 }, /* (56) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 192, -5 }, /* (57) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 192, -5 }, /* (58) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - { 192, -5 }, /* (59) cmd ::= CREATE USER ids PASS ids */ - { 204, 0 }, /* (60) pps ::= */ - { 204, -2 }, /* (61) pps ::= PPS INTEGER */ - { 205, 0 }, /* (62) tseries ::= */ - { 205, -2 }, /* (63) tseries ::= TSERIES INTEGER */ - { 206, 0 }, /* (64) dbs ::= */ - { 206, -2 }, /* (65) dbs ::= DBS INTEGER */ - { 207, 0 }, /* (66) streams ::= */ - { 207, -2 }, /* (67) streams ::= STREAMS INTEGER */ - { 208, 0 }, /* (68) storage ::= */ - { 208, -2 }, /* (69) storage ::= STORAGE INTEGER */ - { 209, 0 }, /* (70) qtime ::= */ - { 209, -2 }, /* (71) qtime ::= QTIME INTEGER */ - { 210, 0 }, /* (72) users ::= */ - { 210, -2 }, /* (73) users ::= USERS INTEGER */ - { 211, 0 }, /* (74) conns ::= */ - { 211, -2 }, /* (75) conns ::= CONNS INTEGER */ - { 212, 0 }, /* (76) state ::= */ - { 212, -2 }, /* (77) state ::= STATE ids */ - { 199, -9 }, /* (78) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 213, -3 }, /* (79) intitemlist ::= intitemlist COMMA intitem */ - { 213, -1 }, /* (80) intitemlist ::= intitem */ - { 214, -1 }, /* (81) intitem ::= INTEGER */ - { 215, -2 }, /* (82) keep ::= KEEP intitemlist */ - { 216, -2 }, /* (83) cache ::= CACHE INTEGER */ - { 217, -2 }, /* (84) replica ::= REPLICA INTEGER */ - { 218, -2 }, /* (85) quorum ::= QUORUM INTEGER */ - { 219, -2 }, /* (86) days ::= DAYS INTEGER */ - { 220, -2 }, /* (87) minrows ::= MINROWS INTEGER */ - { 221, -2 }, /* (88) maxrows ::= MAXROWS INTEGER */ - { 222, -2 }, /* (89) blocks ::= BLOCKS INTEGER */ - { 223, -2 }, /* (90) ctime ::= CTIME INTEGER */ - { 224, -2 }, /* (91) wal ::= WAL INTEGER */ - { 225, -2 }, /* (92) fsync ::= FSYNC INTEGER */ - { 226, -2 }, /* (93) comp ::= COMP INTEGER */ - { 227, -2 }, /* (94) prec ::= PRECISION STRING */ - { 228, -2 }, /* (95) update ::= UPDATE INTEGER */ - { 229, -2 }, /* (96) cachelast ::= CACHELAST INTEGER */ - { 230, -2 }, /* (97) partitions ::= PARTITIONS INTEGER */ - { 202, 0 }, /* (98) db_optr ::= */ - { 202, -2 }, /* (99) db_optr ::= db_optr cache */ - { 202, -2 }, /* (100) db_optr ::= db_optr replica */ - { 202, -2 }, /* (101) db_optr ::= db_optr quorum */ - { 202, -2 }, /* (102) db_optr ::= db_optr days */ - { 202, -2 }, /* (103) db_optr ::= db_optr minrows */ - { 202, -2 }, /* (104) db_optr ::= db_optr maxrows */ - { 202, -2 }, /* (105) db_optr ::= db_optr blocks */ - { 202, -2 }, /* (106) db_optr ::= db_optr ctime */ - { 202, -2 }, /* (107) db_optr ::= db_optr wal */ - { 202, -2 }, /* (108) db_optr ::= db_optr fsync */ - { 202, -2 }, /* (109) db_optr ::= db_optr comp */ - { 202, -2 }, /* (110) db_optr ::= db_optr prec */ - { 202, -2 }, /* (111) db_optr ::= db_optr keep */ - { 202, -2 }, /* (112) db_optr ::= db_optr update */ - { 202, -2 }, /* (113) db_optr ::= db_optr cachelast */ - { 203, -1 }, /* (114) topic_optr ::= db_optr */ - { 203, -2 }, /* (115) topic_optr ::= topic_optr partitions */ - { 197, 0 }, /* (116) alter_db_optr ::= */ - { 197, -2 }, /* (117) alter_db_optr ::= alter_db_optr replica */ - { 197, -2 }, /* (118) alter_db_optr ::= alter_db_optr quorum */ - { 197, -2 }, /* (119) alter_db_optr ::= alter_db_optr keep */ - { 197, -2 }, /* (120) alter_db_optr ::= alter_db_optr blocks */ - { 197, -2 }, /* (121) alter_db_optr ::= alter_db_optr comp */ - { 197, -2 }, /* (122) alter_db_optr ::= alter_db_optr update */ - { 197, -2 }, /* (123) alter_db_optr ::= alter_db_optr cachelast */ - { 198, -1 }, /* (124) alter_topic_optr ::= alter_db_optr */ - { 198, -2 }, /* (125) alter_topic_optr ::= alter_topic_optr partitions */ - { 231, -1 }, /* (126) typename ::= ids */ - { 231, -4 }, /* (127) typename ::= ids LP signed RP */ - { 231, -2 }, /* (128) typename ::= ids UNSIGNED */ - { 232, -1 }, /* (129) signed ::= INTEGER */ - { 232, -2 }, /* (130) signed ::= PLUS INTEGER */ - { 232, -2 }, /* (131) signed ::= MINUS INTEGER */ - { 192, -3 }, /* (132) cmd ::= CREATE TABLE create_table_args */ - { 192, -3 }, /* (133) cmd ::= CREATE TABLE create_stable_args */ - { 192, -3 }, /* (134) cmd ::= CREATE STABLE create_stable_args */ - { 192, -3 }, /* (135) cmd ::= CREATE TABLE create_table_list */ - { 235, -1 }, /* (136) create_table_list ::= create_from_stable */ - { 235, -2 }, /* (137) create_table_list ::= create_table_list create_from_stable */ - { 233, -6 }, /* (138) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 234, -10 }, /* (139) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 236, -10 }, /* (140) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 236, -13 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 239, -3 }, /* (142) tagNamelist ::= tagNamelist COMMA ids */ - { 239, -1 }, /* (143) tagNamelist ::= ids */ - { 233, -5 }, /* (144) create_table_args ::= ifnotexists ids cpxName AS select */ - { 237, -3 }, /* (145) columnlist ::= columnlist COMMA column */ - { 237, -1 }, /* (146) columnlist ::= column */ - { 241, -2 }, /* (147) column ::= ids typename */ - { 238, -3 }, /* (148) tagitemlist ::= tagitemlist COMMA tagitem */ - { 238, -1 }, /* (149) tagitemlist ::= tagitem */ - { 242, -1 }, /* (150) tagitem ::= INTEGER */ - { 242, -1 }, /* (151) tagitem ::= FLOAT */ - { 242, -1 }, /* (152) tagitem ::= STRING */ - { 242, -1 }, /* (153) tagitem ::= BOOL */ - { 242, -1 }, /* (154) tagitem ::= NULL */ - { 242, -1 }, /* (155) tagitem ::= NOW */ - { 242, -2 }, /* (156) tagitem ::= MINUS INTEGER */ - { 242, -2 }, /* (157) tagitem ::= MINUS FLOAT */ - { 242, -2 }, /* (158) tagitem ::= PLUS INTEGER */ - { 242, -2 }, /* (159) tagitem ::= PLUS FLOAT */ - { 240, -14 }, /* (160) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ - { 240, -3 }, /* (161) select ::= LP select RP */ - { 256, -1 }, /* (162) union ::= select */ - { 256, -4 }, /* (163) union ::= union UNION ALL select */ - { 192, -1 }, /* (164) cmd ::= union */ - { 240, -2 }, /* (165) select ::= SELECT selcollist */ - { 257, -2 }, /* (166) sclp ::= selcollist COMMA */ - { 257, 0 }, /* (167) sclp ::= */ - { 243, -4 }, /* (168) selcollist ::= sclp distinct expr as */ - { 243, -2 }, /* (169) selcollist ::= sclp STAR */ - { 260, -2 }, /* (170) as ::= AS ids */ - { 260, -1 }, /* (171) as ::= ids */ - { 260, 0 }, /* (172) as ::= */ - { 258, -1 }, /* (173) distinct ::= DISTINCT */ - { 258, 0 }, /* (174) distinct ::= */ - { 244, -2 }, /* (175) from ::= FROM tablelist */ - { 244, -2 }, /* (176) from ::= FROM sub */ - { 262, -3 }, /* (177) sub ::= LP union RP */ - { 262, -4 }, /* (178) sub ::= LP union RP ids */ - { 262, -6 }, /* (179) sub ::= sub COMMA LP union RP ids */ - { 261, -2 }, /* (180) tablelist ::= ids cpxName */ - { 261, -3 }, /* (181) tablelist ::= ids cpxName ids */ - { 261, -4 }, /* (182) tablelist ::= tablelist COMMA ids cpxName */ - { 261, -5 }, /* (183) tablelist ::= tablelist COMMA ids cpxName ids */ - { 263, -1 }, /* (184) tmvar ::= VARIABLE */ - { 246, -4 }, /* (185) interval_opt ::= INTERVAL LP tmvar RP */ - { 246, -6 }, /* (186) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 246, 0 }, /* (187) interval_opt ::= */ - { 247, 0 }, /* (188) session_option ::= */ - { 247, -7 }, /* (189) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 248, 0 }, /* (190) windowstate_option ::= */ - { 248, -4 }, /* (191) windowstate_option ::= STATE_WINDOW LP ids RP */ - { 249, 0 }, /* (192) fill_opt ::= */ - { 249, -6 }, /* (193) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 249, -4 }, /* (194) fill_opt ::= FILL LP ID RP */ - { 250, -4 }, /* (195) sliding_opt ::= SLIDING LP tmvar RP */ - { 250, 0 }, /* (196) sliding_opt ::= */ - { 253, 0 }, /* (197) orderby_opt ::= */ - { 253, -3 }, /* (198) orderby_opt ::= ORDER BY sortlist */ - { 264, -4 }, /* (199) sortlist ::= sortlist COMMA item sortorder */ - { 264, -2 }, /* (200) sortlist ::= item sortorder */ - { 266, -2 }, /* (201) item ::= ids cpxName */ - { 267, -1 }, /* (202) sortorder ::= ASC */ - { 267, -1 }, /* (203) sortorder ::= DESC */ - { 267, 0 }, /* (204) sortorder ::= */ - { 251, 0 }, /* (205) groupby_opt ::= */ - { 251, -3 }, /* (206) groupby_opt ::= GROUP BY grouplist */ - { 268, -3 }, /* (207) grouplist ::= grouplist COMMA item */ - { 268, -1 }, /* (208) grouplist ::= item */ - { 252, 0 }, /* (209) having_opt ::= */ - { 252, -2 }, /* (210) having_opt ::= HAVING expr */ - { 255, 0 }, /* (211) limit_opt ::= */ - { 255, -2 }, /* (212) limit_opt ::= LIMIT signed */ - { 255, -4 }, /* (213) limit_opt ::= LIMIT signed OFFSET signed */ - { 255, -4 }, /* (214) limit_opt ::= LIMIT signed COMMA signed */ - { 254, 0 }, /* (215) slimit_opt ::= */ - { 254, -2 }, /* (216) slimit_opt ::= SLIMIT signed */ - { 254, -4 }, /* (217) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 254, -4 }, /* (218) slimit_opt ::= SLIMIT signed COMMA signed */ - { 245, 0 }, /* (219) where_opt ::= */ - { 245, -2 }, /* (220) where_opt ::= WHERE expr */ - { 259, -3 }, /* (221) expr ::= LP expr RP */ - { 259, -1 }, /* (222) expr ::= ID */ - { 259, -3 }, /* (223) expr ::= ID DOT ID */ - { 259, -3 }, /* (224) expr ::= ID DOT STAR */ - { 259, -1 }, /* (225) expr ::= INTEGER */ - { 259, -2 }, /* (226) expr ::= MINUS INTEGER */ - { 259, -2 }, /* (227) expr ::= PLUS INTEGER */ - { 259, -1 }, /* (228) expr ::= FLOAT */ - { 259, -2 }, /* (229) expr ::= MINUS FLOAT */ - { 259, -2 }, /* (230) expr ::= PLUS FLOAT */ - { 259, -1 }, /* (231) expr ::= STRING */ - { 259, -1 }, /* (232) expr ::= NOW */ - { 259, -1 }, /* (233) expr ::= VARIABLE */ - { 259, -2 }, /* (234) expr ::= PLUS VARIABLE */ - { 259, -2 }, /* (235) expr ::= MINUS VARIABLE */ - { 259, -1 }, /* (236) expr ::= BOOL */ - { 259, -1 }, /* (237) expr ::= NULL */ - { 259, -4 }, /* (238) expr ::= ID LP exprlist RP */ - { 259, -4 }, /* (239) expr ::= ID LP STAR RP */ - { 259, -3 }, /* (240) expr ::= expr IS NULL */ - { 259, -4 }, /* (241) expr ::= expr IS NOT NULL */ - { 259, -3 }, /* (242) expr ::= expr LT expr */ - { 259, -3 }, /* (243) expr ::= expr GT expr */ - { 259, -3 }, /* (244) expr ::= expr LE expr */ - { 259, -3 }, /* (245) expr ::= expr GE expr */ - { 259, -3 }, /* (246) expr ::= expr NE expr */ - { 259, -3 }, /* (247) expr ::= expr EQ expr */ - { 259, -5 }, /* (248) expr ::= expr BETWEEN expr AND expr */ - { 259, -3 }, /* (249) expr ::= expr AND expr */ - { 259, -3 }, /* (250) expr ::= expr OR expr */ - { 259, -3 }, /* (251) expr ::= expr PLUS expr */ - { 259, -3 }, /* (252) expr ::= expr MINUS expr */ - { 259, -3 }, /* (253) expr ::= expr STAR expr */ - { 259, -3 }, /* (254) expr ::= expr SLASH expr */ - { 259, -3 }, /* (255) expr ::= expr REM expr */ - { 259, -3 }, /* (256) expr ::= expr LIKE expr */ - { 259, -5 }, /* (257) expr ::= expr IN LP exprlist RP */ - { 200, -3 }, /* (258) exprlist ::= exprlist COMMA expritem */ - { 200, -1 }, /* (259) exprlist ::= expritem */ - { 269, -1 }, /* (260) expritem ::= expr */ - { 269, 0 }, /* (261) expritem ::= */ - { 192, -3 }, /* (262) cmd ::= RESET QUERY CACHE */ - { 192, -3 }, /* (263) cmd ::= SYNCDB ids REPLICA */ - { 192, -7 }, /* (264) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 192, -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 192, -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - { 192, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 192, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 192, -8 }, /* (269) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 192, -9 }, /* (270) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 192, -7 }, /* (271) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - { 192, -7 }, /* (272) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 192, -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 192, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - { 192, -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 192, -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 192, -8 }, /* (277) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 192, -9 }, /* (278) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - { 192, -7 }, /* (279) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - { 192, -3 }, /* (280) cmd ::= KILL CONNECTION INTEGER */ - { 192, -5 }, /* (281) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 192, -5 }, /* (282) cmd ::= KILL QUERY INTEGER COLON INTEGER */ ->>>>>>> dev + { 202, -2 }, /* (128) alter_db_optr ::= alter_db_optr update */ + { 202, -2 }, /* (129) alter_db_optr ::= alter_db_optr cachelast */ + { 203, -1 }, /* (130) alter_topic_optr ::= alter_db_optr */ + { 203, -2 }, /* (131) alter_topic_optr ::= alter_topic_optr partitions */ + { 209, -1 }, /* (132) typename ::= ids */ + { 209, -4 }, /* (133) typename ::= ids LP signed RP */ + { 209, -2 }, /* (134) typename ::= ids UNSIGNED */ + { 238, -1 }, /* (135) signed ::= INTEGER */ + { 238, -2 }, /* (136) signed ::= PLUS INTEGER */ + { 238, -2 }, /* (137) signed ::= MINUS INTEGER */ + { 197, -3 }, /* (138) cmd ::= CREATE TABLE create_table_args */ + { 197, -3 }, /* (139) cmd ::= CREATE TABLE create_stable_args */ + { 197, -3 }, /* (140) cmd ::= CREATE STABLE create_stable_args */ + { 197, -3 }, /* (141) cmd ::= CREATE TABLE create_table_list */ + { 241, -1 }, /* (142) create_table_list ::= create_from_stable */ + { 241, -2 }, /* (143) create_table_list ::= create_table_list create_from_stable */ + { 239, -6 }, /* (144) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 240, -10 }, /* (145) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 242, -10 }, /* (146) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + { 242, -13 }, /* (147) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + { 245, -3 }, /* (148) tagNamelist ::= tagNamelist COMMA ids */ + { 245, -1 }, /* (149) tagNamelist ::= ids */ + { 239, -5 }, /* (150) create_table_args ::= ifnotexists ids cpxName AS select */ + { 243, -3 }, /* (151) columnlist ::= columnlist COMMA column */ + { 243, -1 }, /* (152) columnlist ::= column */ + { 247, -2 }, /* (153) column ::= ids typename */ + { 244, -3 }, /* (154) tagitemlist ::= tagitemlist COMMA tagitem */ + { 244, -1 }, /* (155) tagitemlist ::= tagitem */ + { 248, -1 }, /* (156) tagitem ::= INTEGER */ + { 248, -1 }, /* (157) tagitem ::= FLOAT */ + { 248, -1 }, /* (158) tagitem ::= STRING */ + { 248, -1 }, /* (159) tagitem ::= BOOL */ + { 248, -1 }, /* (160) tagitem ::= NULL */ + { 248, -1 }, /* (161) tagitem ::= NOW */ + { 248, -2 }, /* (162) tagitem ::= MINUS INTEGER */ + { 248, -2 }, /* (163) tagitem ::= MINUS FLOAT */ + { 248, -2 }, /* (164) tagitem ::= PLUS INTEGER */ + { 248, -2 }, /* (165) tagitem ::= PLUS FLOAT */ + { 246, -14 }, /* (166) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + { 246, -3 }, /* (167) select ::= LP select RP */ + { 262, -1 }, /* (168) union ::= select */ + { 262, -4 }, /* (169) union ::= union UNION ALL select */ + { 197, -1 }, /* (170) cmd ::= union */ + { 246, -2 }, /* (171) select ::= SELECT selcollist */ + { 263, -2 }, /* (172) sclp ::= selcollist COMMA */ + { 263, 0 }, /* (173) sclp ::= */ + { 249, -4 }, /* (174) selcollist ::= sclp distinct expr as */ + { 249, -2 }, /* (175) selcollist ::= sclp STAR */ + { 266, -2 }, /* (176) as ::= AS ids */ + { 266, -1 }, /* (177) as ::= ids */ + { 266, 0 }, /* (178) as ::= */ + { 264, -1 }, /* (179) distinct ::= DISTINCT */ + { 264, 0 }, /* (180) distinct ::= */ + { 250, -2 }, /* (181) from ::= FROM tablelist */ + { 250, -2 }, /* (182) from ::= FROM sub */ + { 268, -3 }, /* (183) sub ::= LP union RP */ + { 268, -4 }, /* (184) sub ::= LP union RP ids */ + { 268, -6 }, /* (185) sub ::= sub COMMA LP union RP ids */ + { 267, -2 }, /* (186) tablelist ::= ids cpxName */ + { 267, -3 }, /* (187) tablelist ::= ids cpxName ids */ + { 267, -4 }, /* (188) tablelist ::= tablelist COMMA ids cpxName */ + { 267, -5 }, /* (189) tablelist ::= tablelist COMMA ids cpxName ids */ + { 269, -1 }, /* (190) tmvar ::= VARIABLE */ + { 252, -4 }, /* (191) interval_opt ::= INTERVAL LP tmvar RP */ + { 252, -6 }, /* (192) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 252, 0 }, /* (193) interval_opt ::= */ + { 253, 0 }, /* (194) session_option ::= */ + { 253, -7 }, /* (195) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + { 254, 0 }, /* (196) windowstate_option ::= */ + { 254, -4 }, /* (197) windowstate_option ::= STATE_WINDOW LP ids RP */ + { 255, 0 }, /* (198) fill_opt ::= */ + { 255, -6 }, /* (199) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 255, -4 }, /* (200) fill_opt ::= FILL LP ID RP */ + { 256, -4 }, /* (201) sliding_opt ::= SLIDING LP tmvar RP */ + { 256, 0 }, /* (202) sliding_opt ::= */ + { 259, 0 }, /* (203) orderby_opt ::= */ + { 259, -3 }, /* (204) orderby_opt ::= ORDER BY sortlist */ + { 270, -4 }, /* (205) sortlist ::= sortlist COMMA item sortorder */ + { 270, -2 }, /* (206) sortlist ::= item sortorder */ + { 272, -2 }, /* (207) item ::= ids cpxName */ + { 273, -1 }, /* (208) sortorder ::= ASC */ + { 273, -1 }, /* (209) sortorder ::= DESC */ + { 273, 0 }, /* (210) sortorder ::= */ + { 257, 0 }, /* (211) groupby_opt ::= */ + { 257, -3 }, /* (212) groupby_opt ::= GROUP BY grouplist */ + { 274, -3 }, /* (213) grouplist ::= grouplist COMMA item */ + { 274, -1 }, /* (214) grouplist ::= item */ + { 258, 0 }, /* (215) having_opt ::= */ + { 258, -2 }, /* (216) having_opt ::= HAVING expr */ + { 261, 0 }, /* (217) limit_opt ::= */ + { 261, -2 }, /* (218) limit_opt ::= LIMIT signed */ + { 261, -4 }, /* (219) limit_opt ::= LIMIT signed OFFSET signed */ + { 261, -4 }, /* (220) limit_opt ::= LIMIT signed COMMA signed */ + { 260, 0 }, /* (221) slimit_opt ::= */ + { 260, -2 }, /* (222) slimit_opt ::= SLIMIT signed */ + { 260, -4 }, /* (223) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 260, -4 }, /* (224) slimit_opt ::= SLIMIT signed COMMA signed */ + { 251, 0 }, /* (225) where_opt ::= */ + { 251, -2 }, /* (226) where_opt ::= WHERE expr */ + { 265, -3 }, /* (227) expr ::= LP expr RP */ + { 265, -1 }, /* (228) expr ::= ID */ + { 265, -3 }, /* (229) expr ::= ID DOT ID */ + { 265, -3 }, /* (230) expr ::= ID DOT STAR */ + { 265, -1 }, /* (231) expr ::= INTEGER */ + { 265, -2 }, /* (232) expr ::= MINUS INTEGER */ + { 265, -2 }, /* (233) expr ::= PLUS INTEGER */ + { 265, -1 }, /* (234) expr ::= FLOAT */ + { 265, -2 }, /* (235) expr ::= MINUS FLOAT */ + { 265, -2 }, /* (236) expr ::= PLUS FLOAT */ + { 265, -1 }, /* (237) expr ::= STRING */ + { 265, -1 }, /* (238) expr ::= NOW */ + { 265, -1 }, /* (239) expr ::= VARIABLE */ + { 265, -2 }, /* (240) expr ::= PLUS VARIABLE */ + { 265, -2 }, /* (241) expr ::= MINUS VARIABLE */ + { 265, -1 }, /* (242) expr ::= BOOL */ + { 265, -1 }, /* (243) expr ::= NULL */ + { 265, -4 }, /* (244) expr ::= ID LP exprlist RP */ + { 265, -4 }, /* (245) expr ::= ID LP STAR RP */ + { 265, -3 }, /* (246) expr ::= expr IS NULL */ + { 265, -4 }, /* (247) expr ::= expr IS NOT NULL */ + { 265, -3 }, /* (248) expr ::= expr LT expr */ + { 265, -3 }, /* (249) expr ::= expr GT expr */ + { 265, -3 }, /* (250) expr ::= expr LE expr */ + { 265, -3 }, /* (251) expr ::= expr GE expr */ + { 265, -3 }, /* (252) expr ::= expr NE expr */ + { 265, -3 }, /* (253) expr ::= expr EQ expr */ + { 265, -5 }, /* (254) expr ::= expr BETWEEN expr AND expr */ + { 265, -3 }, /* (255) expr ::= expr AND expr */ + { 265, -3 }, /* (256) expr ::= expr OR expr */ + { 265, -3 }, /* (257) expr ::= expr PLUS expr */ + { 265, -3 }, /* (258) expr ::= expr MINUS expr */ + { 265, -3 }, /* (259) expr ::= expr STAR expr */ + { 265, -3 }, /* (260) expr ::= expr SLASH expr */ + { 265, -3 }, /* (261) expr ::= expr REM expr */ + { 265, -3 }, /* (262) expr ::= expr LIKE expr */ + { 265, -5 }, /* (263) expr ::= expr IN LP exprlist RP */ + { 205, -3 }, /* (264) exprlist ::= exprlist COMMA expritem */ + { 205, -1 }, /* (265) exprlist ::= expritem */ + { 275, -1 }, /* (266) expritem ::= expr */ + { 275, 0 }, /* (267) expritem ::= */ + { 197, -3 }, /* (268) cmd ::= RESET QUERY CACHE */ + { 197, -3 }, /* (269) cmd ::= SYNCDB ids REPLICA */ + { 197, -7 }, /* (270) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 197, -7 }, /* (271) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 197, -7 }, /* (272) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + { 197, -7 }, /* (273) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 197, -7 }, /* (274) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 197, -8 }, /* (275) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 197, -9 }, /* (276) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 197, -7 }, /* (277) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + { 197, -7 }, /* (278) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 197, -7 }, /* (279) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 197, -7 }, /* (280) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + { 197, -7 }, /* (281) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 197, -7 }, /* (282) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 197, -8 }, /* (283) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 197, -9 }, /* (284) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + { 197, -7 }, /* (285) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + { 197, -3 }, /* (286) cmd ::= KILL CONNECTION INTEGER */ + { 197, -5 }, /* (287) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 197, -5 }, /* (288) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -3306,15 +2194,9 @@ static void yy_reduce( /********** Begin reduce actions **********************************************/ YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ -<<<<<<< HEAD - case 140: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==140); - case 141: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==141); - case 142: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==142); -======= - case 132: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==132); - case 133: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==133); - case 134: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==134); ->>>>>>> dev + case 138: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==138); + case 139: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==139); + case 140: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==140); {} break; case 1: /* cmd ::= SHOW DATABASES */ @@ -3509,15 +2391,9 @@ static void yy_reduce( case 53: /* ifexists ::= IF EXISTS */ { yymsp[-1].minor.yy0.n = 1;} break; -<<<<<<< HEAD case 54: /* ifexists ::= */ case 56: /* ifnotexists ::= */ yytestcase(yyruleno==56); - case 182: /* distinct ::= */ yytestcase(yyruleno==182); -======= - case 52: /* ifexists ::= */ - case 54: /* ifnotexists ::= */ yytestcase(yyruleno==54); - case 174: /* distinct ::= */ yytestcase(yyruleno==174); ->>>>>>> dev + case 180: /* distinct ::= */ yytestcase(yyruleno==180); { yymsp[1].minor.yy0.n = 0;} break; case 55: /* ifnotexists ::= IF NOT EXISTS */ @@ -3566,7 +2442,6 @@ static void yy_reduce( case 83: /* state ::= STATE ids */ yytestcase(yyruleno==83); { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; -<<<<<<< HEAD case 84: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { yylhsminor.yy547.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; @@ -3582,51 +2457,20 @@ static void yy_reduce( yymsp[-8].minor.yy547 = yylhsminor.yy547; break; case 85: /* intitemlist ::= intitemlist COMMA intitem */ - case 156: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==156); + case 154: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==154); { yylhsminor.yy525 = tVariantListAppend(yymsp[-2].minor.yy525, &yymsp[0].minor.yy506, -1); } yymsp[-2].minor.yy525 = yylhsminor.yy525; break; case 86: /* intitemlist ::= intitem */ - case 157: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==157); + case 155: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==155); { yylhsminor.yy525 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } yymsp[0].minor.yy525 = yylhsminor.yy525; break; case 87: /* intitem ::= INTEGER */ - case 158: /* tagitem ::= INTEGER */ yytestcase(yyruleno==158); - case 159: /* tagitem ::= FLOAT */ yytestcase(yyruleno==159); - case 160: /* tagitem ::= STRING */ yytestcase(yyruleno==160); - case 161: /* tagitem ::= BOOL */ yytestcase(yyruleno==161); -======= - case 78: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ -{ - yylhsminor.yy151.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy151.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy151.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy151.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy151.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy151.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy151.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy151.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy151.stat = yymsp[0].minor.yy0; -} - yymsp[-8].minor.yy151 = yylhsminor.yy151; - break; - case 79: /* intitemlist ::= intitemlist COMMA intitem */ - case 148: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==148); -{ yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); } - yymsp[-2].minor.yy441 = yylhsminor.yy441; - break; - case 80: /* intitemlist ::= intitem */ - case 149: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==149); -{ yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } - yymsp[0].minor.yy441 = yylhsminor.yy441; - break; - case 81: /* intitem ::= INTEGER */ - case 150: /* tagitem ::= INTEGER */ yytestcase(yyruleno==150); - case 151: /* tagitem ::= FLOAT */ yytestcase(yyruleno==151); - case 152: /* tagitem ::= STRING */ yytestcase(yyruleno==152); - case 153: /* tagitem ::= BOOL */ yytestcase(yyruleno==153); ->>>>>>> dev + case 156: /* tagitem ::= INTEGER */ yytestcase(yyruleno==156); + case 157: /* tagitem ::= FLOAT */ yytestcase(yyruleno==157); + case 158: /* tagitem ::= STRING */ yytestcase(yyruleno==158); + case 159: /* tagitem ::= BOOL */ yytestcase(yyruleno==159); { toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } yymsp[0].minor.yy506 = yylhsminor.yy506; break; @@ -3650,7 +2494,6 @@ static void yy_reduce( case 103: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==103); { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; -<<<<<<< HEAD case 104: /* db_optr ::= */ {setDefaultCreateDbOption(&yymsp[1].minor.yy214); yymsp[1].minor.yy214.dbType = TSDB_DB_TYPE_DEFAULT;} break; @@ -3690,12 +2533,10 @@ static void yy_reduce( yymsp[-1].minor.yy214 = yylhsminor.yy214; break; case 113: /* db_optr ::= db_optr wal */ - case 128: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==128); { yylhsminor.yy214 = yymsp[-1].minor.yy214; yylhsminor.yy214.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } yymsp[-1].minor.yy214 = yylhsminor.yy214; break; case 114: /* db_optr ::= db_optr fsync */ - case 129: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==129); { yylhsminor.yy214 = yymsp[-1].minor.yy214; yylhsminor.yy214.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } yymsp[-1].minor.yy214 = yylhsminor.yy214; break; @@ -3714,126 +2555,36 @@ static void yy_reduce( yymsp[-1].minor.yy214 = yylhsminor.yy214; break; case 118: /* db_optr ::= db_optr update */ - case 130: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==130); + case 128: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==128); { yylhsminor.yy214 = yymsp[-1].minor.yy214; yylhsminor.yy214.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } yymsp[-1].minor.yy214 = yylhsminor.yy214; break; case 119: /* db_optr ::= db_optr cachelast */ - case 131: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==131); + case 129: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==129); { yylhsminor.yy214 = yymsp[-1].minor.yy214; yylhsminor.yy214.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } yymsp[-1].minor.yy214 = yylhsminor.yy214; break; case 120: /* topic_optr ::= db_optr */ - case 132: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==132); + case 130: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==130); { yylhsminor.yy214 = yymsp[0].minor.yy214; yylhsminor.yy214.dbType = TSDB_DB_TYPE_TOPIC; } yymsp[0].minor.yy214 = yylhsminor.yy214; break; case 121: /* topic_optr ::= topic_optr partitions */ - case 133: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==133); + case 131: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==131); { yylhsminor.yy214 = yymsp[-1].minor.yy214; yylhsminor.yy214.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } yymsp[-1].minor.yy214 = yylhsminor.yy214; break; case 122: /* alter_db_optr ::= */ { setDefaultCreateDbOption(&yymsp[1].minor.yy214); yymsp[1].minor.yy214.dbType = TSDB_DB_TYPE_DEFAULT;} break; - case 134: /* typename ::= ids */ -======= - case 98: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} - break; - case 99: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 100: /* db_optr ::= db_optr replica */ - case 117: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==117); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 101: /* db_optr ::= db_optr quorum */ - case 118: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==118); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 102: /* db_optr ::= db_optr days */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 103: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 104: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 105: /* db_optr ::= db_optr blocks */ - case 120: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==120); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 106: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 107: /* db_optr ::= db_optr wal */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 108: /* db_optr ::= db_optr fsync */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 109: /* db_optr ::= db_optr comp */ - case 121: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==121); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 110: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 111: /* db_optr ::= db_optr keep */ - case 119: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==119); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.keep = yymsp[0].minor.yy441; } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 112: /* db_optr ::= db_optr update */ - case 122: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==122); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 113: /* db_optr ::= db_optr cachelast */ - case 123: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==123); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 114: /* topic_optr ::= db_optr */ - case 124: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==124); -{ yylhsminor.yy382 = yymsp[0].minor.yy382; yylhsminor.yy382.dbType = TSDB_DB_TYPE_TOPIC; } - yymsp[0].minor.yy382 = yylhsminor.yy382; - break; - case 115: /* topic_optr ::= topic_optr partitions */ - case 125: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==125); -{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy382 = yylhsminor.yy382; - break; - case 116: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} - break; - case 126: /* typename ::= ids */ ->>>>>>> dev + case 132: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; tSetColumnType (&yylhsminor.yy31, &yymsp[0].minor.yy0); } yymsp[0].minor.yy31 = yylhsminor.yy31; break; -<<<<<<< HEAD - case 135: /* typename ::= ids LP signed RP */ -======= - case 127: /* typename ::= ids LP signed RP */ ->>>>>>> dev + case 133: /* typename ::= ids LP signed RP */ { if (yymsp[-1].minor.yy501 <= 0) { yymsp[-3].minor.yy0.type = 0; @@ -3845,11 +2596,7 @@ static void yy_reduce( } yymsp[-3].minor.yy31 = yylhsminor.yy31; break; -<<<<<<< HEAD - case 136: /* typename ::= ids UNSIGNED */ -======= - case 128: /* typename ::= ids UNSIGNED */ ->>>>>>> dev + case 134: /* typename ::= ids UNSIGNED */ { yymsp[-1].minor.yy0.type = 0; yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z); @@ -3857,37 +2604,20 @@ static void yy_reduce( } yymsp[-1].minor.yy31 = yylhsminor.yy31; break; -<<<<<<< HEAD - case 137: /* signed ::= INTEGER */ + case 135: /* signed ::= INTEGER */ { yylhsminor.yy501 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } yymsp[0].minor.yy501 = yylhsminor.yy501; break; - case 138: /* signed ::= PLUS INTEGER */ + case 136: /* signed ::= PLUS INTEGER */ { yymsp[-1].minor.yy501 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; - case 139: /* signed ::= MINUS INTEGER */ + case 137: /* signed ::= MINUS INTEGER */ { yymsp[-1].minor.yy501 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; - case 143: /* cmd ::= CREATE TABLE create_table_list */ + case 141: /* cmd ::= CREATE TABLE create_table_list */ { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy158;} break; - case 144: /* create_table_list ::= create_from_stable */ -======= - case 129: /* signed ::= INTEGER */ -{ yylhsminor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy369 = yylhsminor.yy369; - break; - case 130: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - break; - case 131: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} - break; - case 135: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy182;} - break; - case 136: /* create_table_list ::= create_from_stable */ ->>>>>>> dev + case 142: /* create_table_list ::= create_from_stable */ { SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); @@ -3898,22 +2628,14 @@ static void yy_reduce( } yymsp[0].minor.yy158 = yylhsminor.yy158; break; -<<<<<<< HEAD - case 145: /* create_table_list ::= create_table_list create_from_stable */ -======= - case 137: /* create_table_list ::= create_table_list create_from_stable */ ->>>>>>> dev + case 143: /* create_table_list ::= create_table_list create_from_stable */ { taosArrayPush(yymsp[-1].minor.yy158->childTableInfo, &yymsp[0].minor.yy432); yylhsminor.yy158 = yymsp[-1].minor.yy158; } yymsp[-1].minor.yy158 = yylhsminor.yy158; break; -<<<<<<< HEAD - case 146: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ -======= - case 138: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ ->>>>>>> dev + case 144: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { yylhsminor.yy158 = tSetCreateTableInfo(yymsp[-1].minor.yy525, NULL, NULL, TSQL_CREATE_TABLE); setSqlInfo(pInfo, yylhsminor.yy158, NULL, TSDB_SQL_CREATE_TABLE); @@ -3923,11 +2645,7 @@ static void yy_reduce( } yymsp[-5].minor.yy158 = yylhsminor.yy158; break; -<<<<<<< HEAD - case 147: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ -======= - case 139: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ ->>>>>>> dev + case 145: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { yylhsminor.yy158 = tSetCreateTableInfo(yymsp[-5].minor.yy525, yymsp[-1].minor.yy525, NULL, TSQL_CREATE_STABLE); setSqlInfo(pInfo, yylhsminor.yy158, NULL, TSDB_SQL_CREATE_TABLE); @@ -3937,11 +2655,7 @@ static void yy_reduce( } yymsp[-9].minor.yy158 = yylhsminor.yy158; break; -<<<<<<< HEAD - case 148: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ -======= - case 140: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ ->>>>>>> dev + case 146: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; @@ -3949,11 +2663,7 @@ static void yy_reduce( } yymsp[-9].minor.yy432 = yylhsminor.yy432; break; -<<<<<<< HEAD - case 149: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ -======= - case 141: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ ->>>>>>> dev + case 147: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ { yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n; @@ -3961,27 +2671,15 @@ static void yy_reduce( } yymsp[-12].minor.yy432 = yylhsminor.yy432; break; -<<<<<<< HEAD - case 150: /* tagNamelist ::= tagNamelist COMMA ids */ + case 148: /* tagNamelist ::= tagNamelist COMMA ids */ {taosArrayPush(yymsp[-2].minor.yy525, &yymsp[0].minor.yy0); yylhsminor.yy525 = yymsp[-2].minor.yy525; } yymsp[-2].minor.yy525 = yylhsminor.yy525; break; - case 151: /* tagNamelist ::= ids */ + case 149: /* tagNamelist ::= ids */ {yylhsminor.yy525 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy525, &yymsp[0].minor.yy0);} yymsp[0].minor.yy525 = yylhsminor.yy525; break; - case 152: /* create_table_args ::= ifnotexists ids cpxName AS select */ -======= - case 142: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy0); yylhsminor.yy441 = yymsp[-2].minor.yy441; } - yymsp[-2].minor.yy441 = yylhsminor.yy441; - break; - case 143: /* tagNamelist ::= ids */ -{yylhsminor.yy441 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy441 = yylhsminor.yy441; - break; - case 144: /* create_table_args ::= ifnotexists ids cpxName AS select */ ->>>>>>> dev + case 150: /* create_table_args ::= ifnotexists ids cpxName AS select */ { yylhsminor.yy158 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy464, TSQL_CREATE_STREAM); setSqlInfo(pInfo, yylhsminor.yy158, NULL, TSDB_SQL_CREATE_TABLE); @@ -3991,59 +2689,32 @@ static void yy_reduce( } yymsp[-4].minor.yy158 = yylhsminor.yy158; break; -<<<<<<< HEAD - case 153: /* columnlist ::= columnlist COMMA column */ + case 151: /* columnlist ::= columnlist COMMA column */ {taosArrayPush(yymsp[-2].minor.yy525, &yymsp[0].minor.yy31); yylhsminor.yy525 = yymsp[-2].minor.yy525; } yymsp[-2].minor.yy525 = yylhsminor.yy525; break; - case 154: /* columnlist ::= column */ + case 152: /* columnlist ::= column */ {yylhsminor.yy525 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy525, &yymsp[0].minor.yy31);} yymsp[0].minor.yy525 = yylhsminor.yy525; break; - case 155: /* column ::= ids typename */ -======= - case 145: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy343); yylhsminor.yy441 = yymsp[-2].minor.yy441; } - yymsp[-2].minor.yy441 = yylhsminor.yy441; - break; - case 146: /* columnlist ::= column */ -{yylhsminor.yy441 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy343);} - yymsp[0].minor.yy441 = yylhsminor.yy441; - break; - case 147: /* column ::= ids typename */ ->>>>>>> dev + case 153: /* column ::= ids typename */ { tSetColumnInfo(&yylhsminor.yy31, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy31); } yymsp[-1].minor.yy31 = yylhsminor.yy31; break; -<<<<<<< HEAD - case 162: /* tagitem ::= NULL */ + case 160: /* tagitem ::= NULL */ { yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } yymsp[0].minor.yy506 = yylhsminor.yy506; break; - case 163: /* tagitem ::= NOW */ + case 161: /* tagitem ::= NOW */ { yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0);} yymsp[0].minor.yy506 = yylhsminor.yy506; 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); -======= - case 154: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy506 = yylhsminor.yy506; - break; - case 155: /* tagitem ::= NOW */ -{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy506 = yylhsminor.yy506; - break; - case 156: /* tagitem ::= MINUS INTEGER */ - case 157: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==157); - case 158: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==158); - case 159: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==159); ->>>>>>> dev + 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); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; @@ -4052,259 +2723,142 @@ static void yy_reduce( } yymsp[-1].minor.yy506 = yylhsminor.yy506; break; -<<<<<<< HEAD - case 168: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + case 166: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ { yylhsminor.yy464 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy525, yymsp[-11].minor.yy412, yymsp[-10].minor.yy370, yymsp[-4].minor.yy525, yymsp[-2].minor.yy525, &yymsp[-9].minor.yy520, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy144, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy525, &yymsp[0].minor.yy126, &yymsp[-1].minor.yy126, yymsp[-3].minor.yy370); -======= - case 160: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ -{ - yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy441, yymsp[-11].minor.yy244, yymsp[-10].minor.yy166, yymsp[-4].minor.yy441, yymsp[-2].minor.yy441, &yymsp[-9].minor.yy340, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy348, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-3].minor.yy166); ->>>>>>> dev } yymsp[-13].minor.yy464 = yylhsminor.yy464; break; -<<<<<<< HEAD - case 169: /* select ::= LP select RP */ + case 167: /* select ::= LP select RP */ {yymsp[-2].minor.yy464 = yymsp[-1].minor.yy464;} break; - case 170: /* union ::= select */ + case 168: /* union ::= select */ { yylhsminor.yy525 = setSubclause(NULL, yymsp[0].minor.yy464); } yymsp[0].minor.yy525 = yylhsminor.yy525; break; - case 171: /* union ::= union UNION ALL select */ + case 169: /* union ::= union UNION ALL select */ { yylhsminor.yy525 = appendSelectClause(yymsp[-3].minor.yy525, yymsp[0].minor.yy464); } yymsp[-3].minor.yy525 = yylhsminor.yy525; break; - case 172: /* cmd ::= union */ + case 170: /* cmd ::= union */ { setSqlInfo(pInfo, yymsp[0].minor.yy525, NULL, TSDB_SQL_SELECT); } break; - case 173: /* select ::= SELECT selcollist */ -======= - case 161: /* select ::= LP select RP */ -{yymsp[-2].minor.yy236 = yymsp[-1].minor.yy236;} - break; - case 162: /* union ::= select */ -{ yylhsminor.yy441 = setSubclause(NULL, yymsp[0].minor.yy236); } - yymsp[0].minor.yy441 = yylhsminor.yy441; - break; - case 163: /* union ::= union UNION ALL select */ -{ yylhsminor.yy441 = appendSelectClause(yymsp[-3].minor.yy441, yymsp[0].minor.yy236); } - yymsp[-3].minor.yy441 = yylhsminor.yy441; - break; - case 164: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy441, NULL, TSDB_SQL_SELECT); } - break; - case 165: /* select ::= SELECT selcollist */ ->>>>>>> dev + case 171: /* select ::= SELECT selcollist */ { yylhsminor.yy464 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy525, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } yymsp[-1].minor.yy464 = yylhsminor.yy464; break; -<<<<<<< HEAD - case 174: /* sclp ::= selcollist COMMA */ + case 172: /* sclp ::= selcollist COMMA */ {yylhsminor.yy525 = yymsp[-1].minor.yy525;} yymsp[-1].minor.yy525 = yylhsminor.yy525; break; - case 175: /* sclp ::= */ - case 205: /* orderby_opt ::= */ yytestcase(yyruleno==205); + case 173: /* sclp ::= */ + case 203: /* orderby_opt ::= */ yytestcase(yyruleno==203); {yymsp[1].minor.yy525 = 0;} break; - case 176: /* selcollist ::= sclp distinct expr as */ -======= - case 166: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy441 = yymsp[-1].minor.yy441;} - yymsp[-1].minor.yy441 = yylhsminor.yy441; - break; - case 167: /* sclp ::= */ - case 197: /* orderby_opt ::= */ yytestcase(yyruleno==197); -{yymsp[1].minor.yy441 = 0;} - break; - case 168: /* selcollist ::= sclp distinct expr as */ ->>>>>>> dev + case 174: /* selcollist ::= sclp distinct expr as */ { yylhsminor.yy525 = tSqlExprListAppend(yymsp[-3].minor.yy525, yymsp[-1].minor.yy370, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } yymsp[-3].minor.yy525 = yylhsminor.yy525; break; -<<<<<<< HEAD - case 177: /* selcollist ::= sclp STAR */ -======= - case 169: /* selcollist ::= sclp STAR */ ->>>>>>> dev + case 175: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); yylhsminor.yy525 = tSqlExprListAppend(yymsp[-1].minor.yy525, pNode, 0, 0); } yymsp[-1].minor.yy525 = yylhsminor.yy525; break; -<<<<<<< HEAD - case 178: /* as ::= AS ids */ + case 176: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 179: /* as ::= ids */ + case 177: /* as ::= ids */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 180: /* as ::= */ + case 178: /* as ::= */ { yymsp[1].minor.yy0.n = 0; } break; - case 181: /* distinct ::= DISTINCT */ + case 179: /* distinct ::= DISTINCT */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 183: /* from ::= FROM tablelist */ - case 184: /* from ::= FROM sub */ yytestcase(yyruleno==184); + case 181: /* from ::= FROM tablelist */ + case 182: /* from ::= FROM sub */ yytestcase(yyruleno==182); {yymsp[-1].minor.yy412 = yymsp[0].minor.yy412;} break; - case 185: /* sub ::= LP union RP */ + case 183: /* sub ::= LP union RP */ {yymsp[-2].minor.yy412 = addSubqueryElem(NULL, yymsp[-1].minor.yy525, NULL);} break; - case 186: /* sub ::= LP union RP ids */ + case 184: /* sub ::= LP union RP ids */ {yymsp[-3].minor.yy412 = addSubqueryElem(NULL, yymsp[-2].minor.yy525, &yymsp[0].minor.yy0);} break; - case 187: /* sub ::= sub COMMA LP union RP ids */ + case 185: /* sub ::= sub COMMA LP union RP ids */ {yylhsminor.yy412 = addSubqueryElem(yymsp[-5].minor.yy412, yymsp[-2].minor.yy525, &yymsp[0].minor.yy0);} yymsp[-5].minor.yy412 = yylhsminor.yy412; break; - case 188: /* tablelist ::= ids cpxName */ -======= - case 170: /* as ::= AS ids */ -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } - break; - case 171: /* as ::= ids */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; - break; - case 172: /* as ::= */ -{ yymsp[1].minor.yy0.n = 0; } - break; - case 173: /* distinct ::= DISTINCT */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; - break; - case 175: /* from ::= FROM tablelist */ - case 176: /* from ::= FROM sub */ yytestcase(yyruleno==176); -{yymsp[-1].minor.yy244 = yymsp[0].minor.yy244;} - break; - case 177: /* sub ::= LP union RP */ -{yymsp[-2].minor.yy244 = addSubqueryElem(NULL, yymsp[-1].minor.yy441, NULL);} - break; - case 178: /* sub ::= LP union RP ids */ -{yymsp[-3].minor.yy244 = addSubqueryElem(NULL, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} - break; - case 179: /* sub ::= sub COMMA LP union RP ids */ -{yylhsminor.yy244 = addSubqueryElem(yymsp[-5].minor.yy244, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} - yymsp[-5].minor.yy244 = yylhsminor.yy244; - break; - case 180: /* tablelist ::= ids cpxName */ ->>>>>>> dev + case 186: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy412 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } yymsp[-1].minor.yy412 = yylhsminor.yy412; break; -<<<<<<< HEAD - case 189: /* tablelist ::= ids cpxName ids */ -======= - case 181: /* tablelist ::= ids cpxName ids */ ->>>>>>> dev + case 187: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; yylhsminor.yy412 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } yymsp[-2].minor.yy412 = yylhsminor.yy412; break; -<<<<<<< HEAD - case 190: /* tablelist ::= tablelist COMMA ids cpxName */ -======= - case 182: /* tablelist ::= tablelist COMMA ids cpxName */ ->>>>>>> dev + case 188: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yylhsminor.yy412 = setTableNameList(yymsp[-3].minor.yy412, &yymsp[-1].minor.yy0, NULL); } yymsp[-3].minor.yy412 = yylhsminor.yy412; break; -<<<<<<< HEAD - case 191: /* tablelist ::= tablelist COMMA ids cpxName ids */ -======= - case 183: /* tablelist ::= tablelist COMMA ids cpxName ids */ ->>>>>>> dev + case 189: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; yylhsminor.yy412 = setTableNameList(yymsp[-4].minor.yy412, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } yymsp[-4].minor.yy412 = yylhsminor.yy412; break; -<<<<<<< HEAD - case 192: /* tmvar ::= VARIABLE */ + case 190: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 193: /* interval_opt ::= INTERVAL LP tmvar RP */ + case 191: /* interval_opt ::= INTERVAL LP tmvar RP */ {yymsp[-3].minor.yy520.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy520.offset.n = 0;} break; - case 194: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + case 192: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ {yymsp[-5].minor.yy520.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy520.offset = yymsp[-1].minor.yy0;} break; - case 195: /* interval_opt ::= */ + case 193: /* interval_opt ::= */ {memset(&yymsp[1].minor.yy520, 0, sizeof(yymsp[1].minor.yy520));} break; - case 196: /* session_option ::= */ + case 194: /* session_option ::= */ {yymsp[1].minor.yy259.col.n = 0; yymsp[1].minor.yy259.gap.n = 0;} break; - case 197: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ -======= - case 184: /* tmvar ::= VARIABLE */ -{yylhsminor.yy0 = yymsp[0].minor.yy0;} - yymsp[0].minor.yy0 = yylhsminor.yy0; - break; - case 185: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy340.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy340.offset.n = 0;} - break; - case 186: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy340.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy340.offset = yymsp[-1].minor.yy0;} - break; - case 187: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy340, 0, sizeof(yymsp[1].minor.yy340));} - break; - case 188: /* session_option ::= */ -{yymsp[1].minor.yy259.col.n = 0; yymsp[1].minor.yy259.gap.n = 0;} - break; - case 189: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ ->>>>>>> dev + case 195: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; yymsp[-6].minor.yy259.col = yymsp[-4].minor.yy0; yymsp[-6].minor.yy259.gap = yymsp[-1].minor.yy0; } break; -<<<<<<< HEAD - case 198: /* windowstate_option ::= */ + case 196: /* windowstate_option ::= */ { yymsp[1].minor.yy144.col.n = 0; yymsp[1].minor.yy144.col.z = NULL;} break; - case 199: /* windowstate_option ::= STATE_WINDOW LP ids RP */ + case 197: /* windowstate_option ::= STATE_WINDOW LP ids RP */ { yymsp[-3].minor.yy144.col = yymsp[-1].minor.yy0; } break; - case 200: /* fill_opt ::= */ + case 198: /* fill_opt ::= */ { yymsp[1].minor.yy525 = 0; } break; - case 201: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ -======= - case 190: /* windowstate_option ::= */ -{ yymsp[1].minor.yy348.col.n = 0; yymsp[1].minor.yy348.col.z = NULL;} - break; - case 191: /* windowstate_option ::= STATE_WINDOW LP ids RP */ -{ yymsp[-3].minor.yy348.col = yymsp[-1].minor.yy0; } - break; - case 192: /* fill_opt ::= */ -{ yymsp[1].minor.yy441 = 0; } - break; - case 193: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ ->>>>>>> dev + case 199: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); @@ -4314,59 +2868,34 @@ static void yy_reduce( yymsp[-5].minor.yy525 = yymsp[-1].minor.yy525; } break; -<<<<<<< HEAD - case 202: /* fill_opt ::= FILL LP ID RP */ -======= - case 194: /* fill_opt ::= FILL LP ID RP */ ->>>>>>> dev + case 200: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-3].minor.yy525 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; -<<<<<<< HEAD - case 203: /* sliding_opt ::= SLIDING LP tmvar RP */ + case 201: /* sliding_opt ::= SLIDING LP tmvar RP */ {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; - case 204: /* sliding_opt ::= */ + case 202: /* 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 204: /* orderby_opt ::= ORDER BY sortlist */ {yymsp[-2].minor.yy525 = yymsp[0].minor.yy525;} break; - case 207: /* sortlist ::= sortlist COMMA item sortorder */ -======= - case 195: /* sliding_opt ::= SLIDING LP tmvar RP */ -{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } - break; - case 196: /* sliding_opt ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } - break; - case 198: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;} - break; - case 199: /* sortlist ::= sortlist COMMA item sortorder */ ->>>>>>> dev + case 205: /* sortlist ::= sortlist COMMA item sortorder */ { yylhsminor.yy525 = tVariantListAppend(yymsp[-3].minor.yy525, &yymsp[-1].minor.yy506, yymsp[0].minor.yy52); } yymsp[-3].minor.yy525 = yylhsminor.yy525; break; -<<<<<<< HEAD - case 208: /* sortlist ::= item sortorder */ -======= - case 200: /* sortlist ::= item sortorder */ ->>>>>>> dev + case 206: /* sortlist ::= item sortorder */ { yylhsminor.yy525 = tVariantListAppend(NULL, &yymsp[-1].minor.yy506, yymsp[0].minor.yy52); } yymsp[-1].minor.yy525 = yylhsminor.yy525; break; -<<<<<<< HEAD - case 209: /* item ::= ids cpxName */ -======= - case 201: /* item ::= ids cpxName */ ->>>>>>> dev + case 207: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; @@ -4375,444 +2904,227 @@ static void yy_reduce( } yymsp[-1].minor.yy506 = yylhsminor.yy506; break; -<<<<<<< HEAD - case 210: /* sortorder ::= ASC */ + case 208: /* sortorder ::= ASC */ { yymsp[0].minor.yy52 = TSDB_ORDER_ASC; } break; - case 211: /* sortorder ::= DESC */ + case 209: /* sortorder ::= DESC */ { yymsp[0].minor.yy52 = TSDB_ORDER_DESC;} break; - case 212: /* sortorder ::= */ + case 210: /* sortorder ::= */ { yymsp[1].minor.yy52 = TSDB_ORDER_ASC; } break; - case 213: /* groupby_opt ::= */ + case 211: /* groupby_opt ::= */ { yymsp[1].minor.yy525 = 0;} break; - case 214: /* groupby_opt ::= GROUP BY grouplist */ + case 212: /* groupby_opt ::= GROUP BY grouplist */ { yymsp[-2].minor.yy525 = yymsp[0].minor.yy525;} break; - case 215: /* grouplist ::= grouplist COMMA item */ -======= - case 202: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy112 = TSDB_ORDER_ASC; } - break; - case 203: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy112 = TSDB_ORDER_DESC;} - break; - case 204: /* sortorder ::= */ -{ yymsp[1].minor.yy112 = TSDB_ORDER_ASC; } - break; - case 205: /* groupby_opt ::= */ -{ yymsp[1].minor.yy441 = 0;} - break; - case 206: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;} - break; - case 207: /* grouplist ::= grouplist COMMA item */ ->>>>>>> dev + case 213: /* grouplist ::= grouplist COMMA item */ { yylhsminor.yy525 = tVariantListAppend(yymsp[-2].minor.yy525, &yymsp[0].minor.yy506, -1); } yymsp[-2].minor.yy525 = yylhsminor.yy525; break; -<<<<<<< HEAD - case 216: /* grouplist ::= item */ -======= - case 208: /* grouplist ::= item */ ->>>>>>> dev + case 214: /* grouplist ::= item */ { yylhsminor.yy525 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } yymsp[0].minor.yy525 = yylhsminor.yy525; break; -<<<<<<< HEAD - case 217: /* having_opt ::= */ - case 227: /* where_opt ::= */ yytestcase(yyruleno==227); - case 269: /* expritem ::= */ yytestcase(yyruleno==269); + case 215: /* having_opt ::= */ + case 225: /* where_opt ::= */ yytestcase(yyruleno==225); + case 267: /* expritem ::= */ yytestcase(yyruleno==267); {yymsp[1].minor.yy370 = 0;} break; - case 218: /* having_opt ::= HAVING expr */ - case 228: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==228); + case 216: /* having_opt ::= HAVING expr */ + case 226: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==226); {yymsp[-1].minor.yy370 = yymsp[0].minor.yy370;} break; - case 219: /* limit_opt ::= */ - case 223: /* slimit_opt ::= */ yytestcase(yyruleno==223); + case 217: /* limit_opt ::= */ + case 221: /* slimit_opt ::= */ yytestcase(yyruleno==221); {yymsp[1].minor.yy126.limit = -1; yymsp[1].minor.yy126.offset = 0;} break; - case 220: /* limit_opt ::= LIMIT signed */ - case 224: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==224); + case 218: /* limit_opt ::= LIMIT signed */ + case 222: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==222); {yymsp[-1].minor.yy126.limit = yymsp[0].minor.yy501; yymsp[-1].minor.yy126.offset = 0;} break; - case 221: /* limit_opt ::= LIMIT signed OFFSET signed */ + case 219: /* limit_opt ::= LIMIT signed OFFSET signed */ { yymsp[-3].minor.yy126.limit = yymsp[-2].minor.yy501; yymsp[-3].minor.yy126.offset = yymsp[0].minor.yy501;} break; - case 222: /* limit_opt ::= LIMIT signed COMMA signed */ + case 220: /* limit_opt ::= LIMIT signed COMMA signed */ { yymsp[-3].minor.yy126.limit = yymsp[0].minor.yy501; yymsp[-3].minor.yy126.offset = yymsp[-2].minor.yy501;} break; - case 225: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ + case 223: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ {yymsp[-3].minor.yy126.limit = yymsp[-2].minor.yy501; yymsp[-3].minor.yy126.offset = yymsp[0].minor.yy501;} break; - case 226: /* slimit_opt ::= SLIMIT signed COMMA signed */ + case 224: /* slimit_opt ::= SLIMIT signed COMMA signed */ {yymsp[-3].minor.yy126.limit = yymsp[0].minor.yy501; yymsp[-3].minor.yy126.offset = yymsp[-2].minor.yy501;} break; - case 229: /* expr ::= LP expr RP */ + case 227: /* expr ::= LP expr RP */ {yylhsminor.yy370 = yymsp[-1].minor.yy370; yylhsminor.yy370->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy370->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 230: /* expr ::= ID */ + case 228: /* expr ::= ID */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 231: /* expr ::= ID DOT ID */ + case 229: /* expr ::= ID DOT ID */ { yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 232: /* expr ::= ID DOT STAR */ + case 230: /* expr ::= ID DOT STAR */ { yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 233: /* expr ::= INTEGER */ + case 231: /* expr ::= INTEGER */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 234: /* expr ::= MINUS INTEGER */ - case 235: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==235); + case 232: /* expr ::= MINUS INTEGER */ + case 233: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==233); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} yymsp[-1].minor.yy370 = yylhsminor.yy370; break; - case 236: /* expr ::= FLOAT */ + case 234: /* expr ::= FLOAT */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 237: /* expr ::= MINUS FLOAT */ - case 238: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==238); + case 235: /* expr ::= MINUS FLOAT */ + case 236: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==236); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} yymsp[-1].minor.yy370 = yylhsminor.yy370; break; - case 239: /* expr ::= STRING */ + case 237: /* expr ::= STRING */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 240: /* expr ::= NOW */ + case 238: /* expr ::= NOW */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 241: /* expr ::= VARIABLE */ + case 239: /* expr ::= VARIABLE */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 242: /* expr ::= PLUS VARIABLE */ - case 243: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==243); + case 240: /* expr ::= PLUS VARIABLE */ + case 241: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==241); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} yymsp[-1].minor.yy370 = yylhsminor.yy370; break; - case 244: /* expr ::= BOOL */ + case 242: /* expr ::= BOOL */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 245: /* expr ::= NULL */ + case 243: /* expr ::= NULL */ { yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 246: /* expr ::= ID LP exprlist RP */ + case 244: /* expr ::= ID LP exprlist RP */ { tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy370 = tSqlExprCreateFunction(yymsp[-1].minor.yy525, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } yymsp[-3].minor.yy370 = yylhsminor.yy370; break; - case 247: /* expr ::= ID LP STAR RP */ + case 245: /* expr ::= ID LP STAR RP */ { tStrTokenAppend(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy370 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } yymsp[-3].minor.yy370 = yylhsminor.yy370; break; - case 248: /* expr ::= expr IS NULL */ + case 246: /* expr ::= expr IS NULL */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, NULL, TK_ISNULL);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 249: /* expr ::= expr IS NOT NULL */ + case 247: /* expr ::= expr IS NOT NULL */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-3].minor.yy370, NULL, TK_NOTNULL);} yymsp[-3].minor.yy370 = yylhsminor.yy370; break; - case 250: /* expr ::= expr LT expr */ + case 248: /* expr ::= expr LT expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LT);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 251: /* expr ::= expr GT expr */ + case 249: /* expr ::= expr GT expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_GT);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 252: /* expr ::= expr LE expr */ + case 250: /* expr ::= expr LE expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LE);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 253: /* expr ::= expr GE expr */ + case 251: /* expr ::= expr GE expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_GE);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 254: /* expr ::= expr NE expr */ + case 252: /* expr ::= expr NE expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_NE);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 255: /* expr ::= expr EQ expr */ + case 253: /* expr ::= expr EQ expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_EQ);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 256: /* expr ::= expr BETWEEN expr AND expr */ + case 254: /* expr ::= expr BETWEEN expr AND expr */ { tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy370); yylhsminor.yy370 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy370, yymsp[-2].minor.yy370, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy370, TK_LE), TK_AND);} yymsp[-4].minor.yy370 = yylhsminor.yy370; break; - case 257: /* expr ::= expr AND expr */ + case 255: /* expr ::= expr AND expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_AND);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 258: /* expr ::= expr OR expr */ + case 256: /* expr ::= expr OR expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_OR); } yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 259: /* expr ::= expr PLUS expr */ + case 257: /* expr ::= expr PLUS expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_PLUS); } yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 260: /* expr ::= expr MINUS expr */ + case 258: /* expr ::= expr MINUS expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_MINUS); } yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 261: /* expr ::= expr STAR expr */ + case 259: /* expr ::= expr STAR expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_STAR); } yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 262: /* expr ::= expr SLASH expr */ + case 260: /* expr ::= expr SLASH expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_DIVIDE);} yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 263: /* expr ::= expr REM expr */ + case 261: /* expr ::= expr REM expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_REM); } yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 264: /* expr ::= expr LIKE expr */ + case 262: /* expr ::= expr LIKE expr */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LIKE); } yymsp[-2].minor.yy370 = yylhsminor.yy370; break; - case 265: /* expr ::= expr IN LP exprlist RP */ + case 263: /* expr ::= expr IN LP exprlist RP */ {yylhsminor.yy370 = tSqlExprCreate(yymsp[-4].minor.yy370, (tSqlExpr*)yymsp[-1].minor.yy525, TK_IN); } yymsp[-4].minor.yy370 = yylhsminor.yy370; break; - case 266: /* exprlist ::= exprlist COMMA expritem */ + case 264: /* exprlist ::= exprlist COMMA expritem */ {yylhsminor.yy525 = tSqlExprListAppend(yymsp[-2].minor.yy525,yymsp[0].minor.yy370,0, 0);} yymsp[-2].minor.yy525 = yylhsminor.yy525; break; - case 267: /* exprlist ::= expritem */ + case 265: /* exprlist ::= expritem */ {yylhsminor.yy525 = tSqlExprListAppend(0,yymsp[0].minor.yy370,0, 0);} yymsp[0].minor.yy525 = yylhsminor.yy525; break; - case 268: /* expritem ::= expr */ + case 266: /* expritem ::= expr */ {yylhsminor.yy370 = yymsp[0].minor.yy370;} yymsp[0].minor.yy370 = yylhsminor.yy370; break; - case 270: /* cmd ::= RESET QUERY CACHE */ -{ setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} - break; - case 271: /* 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 209: /* having_opt ::= */ - case 219: /* where_opt ::= */ yytestcase(yyruleno==219); - case 261: /* expritem ::= */ yytestcase(yyruleno==261); -{yymsp[1].minor.yy166 = 0;} - break; - case 210: /* having_opt ::= HAVING expr */ - case 220: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==220); -{yymsp[-1].minor.yy166 = yymsp[0].minor.yy166;} - break; - case 211: /* limit_opt ::= */ - case 215: /* slimit_opt ::= */ yytestcase(yyruleno==215); -{yymsp[1].minor.yy414.limit = -1; yymsp[1].minor.yy414.offset = 0;} - break; - case 212: /* limit_opt ::= LIMIT signed */ - case 216: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==216); -{yymsp[-1].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-1].minor.yy414.offset = 0;} - break; - case 213: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;} - break; - case 214: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;} - break; - case 217: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;} - break; - case 218: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;} - break; - case 221: /* expr ::= LP expr RP */ -{yylhsminor.yy166 = yymsp[-1].minor.yy166; yylhsminor.yy166->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy166->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 222: /* expr ::= ID */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 223: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 224: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 225: /* expr ::= INTEGER */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 226: /* expr ::= MINUS INTEGER */ - case 227: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==227); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy166 = yylhsminor.yy166; - break; - case 228: /* expr ::= FLOAT */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 229: /* expr ::= MINUS FLOAT */ - case 230: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==230); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy166 = yylhsminor.yy166; - break; - case 231: /* expr ::= STRING */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 232: /* expr ::= NOW */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 233: /* expr ::= VARIABLE */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 234: /* expr ::= PLUS VARIABLE */ - case 235: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==235); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} - yymsp[-1].minor.yy166 = yylhsminor.yy166; - break; - case 236: /* expr ::= BOOL */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 237: /* expr ::= NULL */ -{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 238: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy166 = tSqlExprCreateFunction(yymsp[-1].minor.yy441, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy166 = yylhsminor.yy166; - break; - case 239: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy166 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy166 = yylhsminor.yy166; - break; - case 240: /* expr ::= expr IS NULL */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, NULL, TK_ISNULL);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 241: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-3].minor.yy166, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy166 = yylhsminor.yy166; - break; - case 242: /* expr ::= expr LT expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LT);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 243: /* expr ::= expr GT expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GT);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 244: /* expr ::= expr LE expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LE);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 245: /* expr ::= expr GE expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GE);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 246: /* expr ::= expr NE expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_NE);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 247: /* expr ::= expr EQ expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_EQ);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 248: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy166); yylhsminor.yy166 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy166, yymsp[-2].minor.yy166, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy166, TK_LE), TK_AND);} - yymsp[-4].minor.yy166 = yylhsminor.yy166; - break; - case 249: /* expr ::= expr AND expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_AND);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 250: /* expr ::= expr OR expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_OR); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 251: /* expr ::= expr PLUS expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_PLUS); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 252: /* expr ::= expr MINUS expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_MINUS); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 253: /* expr ::= expr STAR expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_STAR); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 254: /* expr ::= expr SLASH expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_DIVIDE);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 255: /* expr ::= expr REM expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_REM); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 256: /* expr ::= expr LIKE expr */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LIKE); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; - break; - case 257: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy166 = tSqlExprCreate(yymsp[-4].minor.yy166, (tSqlExpr*)yymsp[-1].minor.yy441, TK_IN); } - yymsp[-4].minor.yy166 = yylhsminor.yy166; - break; - case 258: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy441 = tSqlExprListAppend(yymsp[-2].minor.yy441,yymsp[0].minor.yy166,0, 0);} - yymsp[-2].minor.yy441 = yylhsminor.yy441; - break; - case 259: /* exprlist ::= expritem */ -{yylhsminor.yy441 = tSqlExprListAppend(0,yymsp[0].minor.yy166,0, 0);} - yymsp[0].minor.yy441 = yylhsminor.yy441; - break; - case 260: /* expritem ::= expr */ -{yylhsminor.yy166 = yymsp[0].minor.yy166;} - yymsp[0].minor.yy166 = yylhsminor.yy166; - break; - case 262: /* cmd ::= RESET QUERY CACHE */ + case 268: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 263: /* cmd ::= SYNCDB ids REPLICA */ + case 269: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 264: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ ->>>>>>> dev + case 270: /* 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.yy525, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 273: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ -======= - case 265: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ ->>>>>>> dev + case 271: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -4823,33 +3135,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 274: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ -======= - case 266: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ ->>>>>>> dev + case 272: /* 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.yy525, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 275: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ -======= - case 267: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ ->>>>>>> dev + case 273: /* 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.yy525, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 276: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ -======= - case 268: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ ->>>>>>> dev + case 274: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -4860,11 +3160,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 277: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ -======= - case 269: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ ->>>>>>> dev + case 275: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -4878,11 +3174,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 278: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ -======= - case 270: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ ->>>>>>> dev + case 276: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -4894,33 +3186,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 279: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ -======= - case 271: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ ->>>>>>> dev + case 277: /* 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.yy525, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 280: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ -======= - case 272: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ ->>>>>>> dev + case 278: /* 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.yy525, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 281: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ -======= - case 273: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ ->>>>>>> dev + case 279: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -4931,33 +3211,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 282: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ -======= - case 274: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ ->>>>>>> dev + case 280: /* 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.yy525, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 283: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ -======= - case 275: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ ->>>>>>> dev + case 281: /* 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.yy525, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 284: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ -======= - case 276: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ ->>>>>>> dev + case 282: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -4968,11 +3236,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 285: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ -======= - case 277: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ ->>>>>>> dev + case 283: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -4986,11 +3250,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 286: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ -======= - case 278: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ ->>>>>>> dev + case 284: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -5002,34 +3262,20 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 287: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ -======= - case 279: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ ->>>>>>> dev + case 285: /* 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.yy525, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -<<<<<<< HEAD - case 288: /* cmd ::= KILL CONNECTION INTEGER */ -{setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} - break; - case 289: /* 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 280: /* cmd ::= KILL CONNECTION INTEGER */ + case 286: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 281: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 287: /* 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 282: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ ->>>>>>> dev + case 288: /* 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: