From 8286820a1cd75b7fb627767d1aa759740271adab Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 17 Mar 2021 13:15:09 +0800 Subject: [PATCH] [td-225]remove unused keywords. --- src/inc/ttokendef.h | 12 +- src/query/inc/sql.y | 4 +- src/query/src/qTokenizer.c | 2 - src/query/src/sql.c | 1606 ++++++++++----------- tests/script/general/parser/create_mt.sim | 6 +- tests/script/general/parser/create_tb.sim | 8 +- 6 files changed, 812 insertions(+), 826 deletions(-) diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index 31e38c1b50..91c08fa26a 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -197,13 +197,11 @@ #define TK_PREV 178 #define TK_LINEAR 179 #define TK_IMPORT 180 -#define TK_METRIC 181 -#define TK_TBNAME 182 -#define TK_JOIN 183 -#define TK_METRICS 184 -#define TK_INSERT 185 -#define TK_INTO 186 -#define TK_VALUES 187 +#define TK_TBNAME 181 +#define TK_JOIN 182 +#define TK_INSERT 183 +#define TK_INTO 184 +#define TK_VALUES 185 #define TK_SPACE 300 diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index 7d704e03b4..7f6aa1ca5f 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -838,6 +838,4 @@ cmd ::= KILL QUERY INTEGER(X) COLON(Z) INTEGER(Y). {X.n += (Z.n + Y.n); s %fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL - NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT - METRIC TBNAME JOIN METRICS STABLE NULL INSERT INTO VALUES. - \ No newline at end of file + NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT TBNAME JOIN STABLE NULL INSERT INTO VALUES. \ No newline at end of file diff --git a/src/query/src/qTokenizer.c b/src/query/src/qTokenizer.c index 63ec2bd342..013eaaf2a9 100644 --- a/src/query/src/qTokenizer.c +++ b/src/query/src/qTokenizer.c @@ -206,10 +206,8 @@ static SKeyword keywordTable[] = { {"PREV", TK_PREV}, {"LINEAR", TK_LINEAR}, {"IMPORT", TK_IMPORT}, - {"METRIC", TK_METRIC}, {"TBNAME", TK_TBNAME}, {"JOIN", TK_JOIN}, - {"METRICS", TK_METRICS}, {"STABLE", TK_STABLE}, {"FILE", TK_FILE}, {"VNODES", TK_VNODES}, diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 1aafe75c32..98304d636f 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -97,28 +97,28 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 265 +#define YYNOCODE 263 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SStrToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SCreatedTableInfo yy96; - SFromInfo* yy162; - tSqlExpr* yy178; - SCreateAcctInfo yy187; - SArray* yy285; - TAOS_FIELD yy295; - SQuerySqlNode* yy342; - tVariant yy362; - SIntervalVal yy376; - SLimitVal yy438; - int yy460; - SCreateTableSql* yy470; - SSubclauseInfo* yy513; - SSessionWindowVal yy523; - int64_t yy525; - SCreateDbInfo yy526; + SLimitVal yy18; + SFromInfo* yy70; + SSessionWindowVal yy87; + SCreateDbInfo yy94; + int yy116; + SSubclauseInfo* yy141; + tSqlExpr* yy170; + SCreateTableSql* yy194; + tVariant yy218; + SIntervalVal yy220; + SCreatedTableInfo yy252; + SQuerySqlNode* yy254; + SCreateAcctInfo yy419; + SArray* yy429; + TAOS_FIELD yy451; + int64_t yy481; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -130,7 +130,7 @@ typedef union { #define YYFALLBACK 1 #define YYNSTATE 313 #define YYNRULE 265 -#define YYNTOKEN 188 +#define YYNTOKEN 186 #define YY_MAX_SHIFT 312 #define YY_MIN_SHIFTREDUCE 502 #define YY_MAX_SHIFTREDUCE 766 @@ -217,152 +217,152 @@ static const YYACTIONTYPE yy_action[] = { /* 80 */ 57, 54, 969, 550, 255, 220, 46, 45, 276, 916, /* 90 */ 44, 43, 42, 503, 504, 505, 506, 507, 508, 509, /* 100 */ 510, 511, 512, 513, 514, 515, 311, 628, 84, 230, - /* 110 */ 69, 916, 296, 47, 48, 30, 51, 52, 1013, 30, - /* 120 */ 213, 41, 549, 50, 260, 55, 53, 57, 54, 1012, + /* 110 */ 69, 916, 1013, 47, 48, 30, 51, 52, 296, 30, + /* 120 */ 213, 41, 549, 50, 260, 55, 53, 57, 54, 64, /* 130 */ 550, 306, 714, 46, 45, 286, 285, 44, 43, 42, - /* 140 */ 47, 49, 904, 51, 52, 224, 1011, 213, 41, 667, + /* 140 */ 47, 49, 904, 51, 52, 224, 1012, 213, 41, 65, /* 150 */ 50, 260, 55, 53, 57, 54, 216, 916, 902, 913, /* 160 */ 46, 45, 222, 912, 44, 43, 42, 23, 274, 305, /* 170 */ 304, 273, 272, 271, 303, 270, 302, 301, 300, 269, /* 180 */ 299, 298, 876, 139, 864, 865, 866, 867, 868, 869, /* 190 */ 870, 871, 872, 873, 874, 875, 877, 878, 51, 52, - /* 200 */ 815, 197, 213, 41, 165, 50, 260, 55, 53, 57, - /* 210 */ 54, 198, 18, 81, 226, 46, 45, 283, 282, 44, - /* 220 */ 43, 42, 212, 727, 928, 25, 718, 671, 721, 189, + /* 200 */ 815, 139, 213, 41, 165, 50, 260, 55, 53, 57, + /* 210 */ 54, 1011, 18, 81, 226, 46, 45, 283, 282, 44, + /* 220 */ 43, 42, 212, 727, 928, 25, 718, 68, 721, 189, /* 230 */ 724, 223, 212, 727, 278, 190, 718, 276, 721, 203, /* 240 */ 724, 117, 116, 188, 899, 900, 29, 903, 257, 233, - /* 250 */ 77, 44, 43, 42, 209, 210, 237, 236, 259, 139, - /* 260 */ 23, 104, 305, 304, 209, 210, 296, 303, 79, 302, - /* 270 */ 301, 300, 73, 299, 298, 884, 132, 30, 882, 883, - /* 280 */ 36, 70, 225, 885, 824, 887, 888, 886, 165, 889, - /* 290 */ 890, 55, 53, 57, 54, 182, 309, 308, 125, 46, - /* 300 */ 45, 1026, 239, 44, 43, 42, 102, 107, 30, 196, - /* 310 */ 261, 73, 96, 106, 112, 115, 105, 914, 217, 36, - /* 320 */ 674, 913, 109, 5, 155, 56, 78, 30, 243, 33, - /* 330 */ 154, 91, 86, 90, 30, 56, 173, 169, 726, 245, - /* 340 */ 30, 68, 171, 168, 120, 119, 118, 12, 726, 279, - /* 350 */ 183, 83, 913, 80, 725, 28, 46, 45, 266, 816, - /* 360 */ 44, 43, 42, 165, 725, 1, 153, 652, 280, 716, - /* 370 */ 649, 913, 650, 901, 651, 284, 695, 696, 913, 664, - /* 380 */ 720, 288, 723, 241, 913, 680, 24, 31, 686, 134, - /* 390 */ 687, 747, 60, 728, 20, 19, 211, 19, 227, 228, - /* 400 */ 719, 61, 722, 185, 638, 717, 730, 64, 31, 263, - /* 410 */ 640, 265, 639, 31, 60, 82, 60, 179, 95, 94, - /* 420 */ 186, 14, 13, 62, 101, 100, 67, 65, 627, 187, - /* 430 */ 16, 15, 656, 654, 657, 655, 114, 113, 130, 128, - /* 440 */ 6, 193, 194, 192, 177, 191, 181, 915, 979, 131, - /* 450 */ 978, 214, 975, 974, 215, 287, 936, 39, 961, 944, - /* 460 */ 946, 133, 960, 929, 244, 137, 129, 150, 911, 149, - /* 470 */ 242, 909, 679, 246, 151, 204, 653, 247, 258, 256, - /* 480 */ 66, 152, 827, 268, 63, 926, 37, 140, 175, 34, - /* 490 */ 248, 253, 277, 823, 1031, 92, 58, 141, 254, 142, - /* 500 */ 1030, 1028, 156, 281, 1025, 98, 1024, 1022, 157, 845, - /* 510 */ 35, 32, 38, 176, 252, 144, 812, 108, 810, 110, - /* 520 */ 111, 808, 807, 229, 167, 805, 804, 803, 250, 802, - /* 530 */ 801, 800, 170, 172, 797, 795, 793, 791, 789, 174, - /* 540 */ 40, 71, 74, 249, 962, 297, 103, 289, 290, 291, - /* 550 */ 292, 293, 294, 295, 307, 199, 766, 221, 231, 232, - /* 560 */ 267, 765, 234, 235, 764, 752, 200, 195, 238, 87, - /* 570 */ 88, 243, 75, 8, 262, 659, 72, 806, 681, 121, - /* 580 */ 206, 135, 122, 799, 160, 123, 159, 846, 158, 161, - /* 590 */ 162, 164, 163, 798, 684, 124, 880, 790, 2, 136, - /* 600 */ 4, 145, 143, 146, 147, 76, 148, 251, 892, 688, - /* 610 */ 138, 26, 264, 729, 9, 10, 27, 7, 11, 21, - /* 620 */ 731, 22, 85, 591, 83, 587, 585, 584, 583, 580, - /* 630 */ 553, 275, 93, 89, 31, 59, 630, 97, 99, 629, + /* 250 */ 77, 44, 43, 42, 209, 210, 237, 236, 259, 901, + /* 260 */ 23, 197, 305, 304, 209, 210, 225, 303, 78, 302, + /* 270 */ 301, 300, 73, 299, 298, 884, 104, 30, 882, 883, + /* 280 */ 36, 296, 720, 885, 723, 887, 888, 886, 667, 889, + /* 290 */ 890, 55, 53, 57, 54, 132, 309, 308, 125, 46, + /* 300 */ 45, 914, 239, 44, 43, 42, 102, 107, 30, 196, + /* 310 */ 664, 73, 96, 106, 112, 115, 105, 24, 217, 36, + /* 320 */ 674, 913, 109, 5, 155, 56, 261, 79, 243, 33, + /* 330 */ 154, 91, 86, 90, 30, 56, 173, 169, 726, 30, + /* 340 */ 70, 30, 171, 168, 120, 119, 118, 12, 726, 279, + /* 350 */ 211, 83, 913, 80, 725, 824, 46, 45, 245, 165, + /* 360 */ 44, 43, 42, 198, 725, 816, 671, 652, 182, 165, + /* 370 */ 649, 719, 650, 722, 651, 280, 1, 153, 913, 716, + /* 380 */ 284, 61, 288, 913, 183, 913, 241, 695, 696, 680, + /* 390 */ 31, 686, 687, 134, 6, 60, 20, 747, 227, 228, + /* 400 */ 728, 19, 638, 62, 19, 263, 31, 640, 265, 31, + /* 410 */ 639, 60, 82, 28, 60, 717, 266, 95, 94, 14, + /* 420 */ 13, 67, 730, 627, 185, 101, 100, 179, 16, 15, + /* 430 */ 979, 656, 654, 657, 655, 114, 113, 130, 128, 186, + /* 440 */ 187, 193, 194, 192, 177, 191, 181, 1026, 915, 978, + /* 450 */ 214, 975, 974, 215, 287, 131, 39, 936, 944, 946, + /* 460 */ 133, 137, 929, 244, 129, 150, 961, 960, 911, 909, + /* 470 */ 149, 679, 246, 151, 204, 152, 653, 250, 258, 827, + /* 480 */ 140, 66, 141, 268, 37, 63, 175, 926, 34, 277, + /* 490 */ 248, 823, 253, 142, 1031, 58, 92, 1030, 1028, 256, + /* 500 */ 156, 143, 281, 1025, 98, 1024, 1022, 254, 157, 845, + /* 510 */ 35, 32, 38, 252, 176, 812, 108, 810, 110, 111, + /* 520 */ 808, 807, 229, 167, 805, 804, 803, 802, 801, 800, + /* 530 */ 170, 172, 797, 795, 793, 791, 789, 174, 247, 242, + /* 540 */ 71, 74, 249, 962, 40, 297, 103, 289, 290, 291, + /* 550 */ 292, 293, 294, 295, 199, 221, 307, 766, 231, 232, + /* 560 */ 267, 765, 234, 235, 764, 200, 238, 87, 88, 752, + /* 570 */ 195, 243, 75, 8, 262, 806, 72, 659, 681, 135, + /* 580 */ 76, 121, 159, 846, 160, 161, 158, 162, 164, 122, + /* 590 */ 163, 799, 2, 123, 880, 124, 798, 790, 684, 144, + /* 600 */ 147, 145, 146, 4, 136, 148, 892, 206, 251, 26, + /* 610 */ 688, 138, 9, 10, 729, 27, 7, 11, 21, 731, + /* 620 */ 22, 85, 264, 591, 587, 83, 585, 584, 583, 580, + /* 630 */ 553, 275, 93, 89, 31, 630, 59, 97, 629, 99, /* 640 */ 626, 575, 573, 565, 571, 567, 569, 563, 561, 594, - /* 650 */ 593, 592, 590, 589, 588, 586, 582, 581, 60, 519, - /* 660 */ 551, 517, 770, 769, 769, 769, 769, 769, 769, 769, + /* 650 */ 593, 592, 590, 589, 588, 586, 582, 581, 60, 551, + /* 660 */ 519, 517, 770, 769, 769, 769, 769, 769, 769, 769, /* 670 */ 769, 769, 769, 769, 126, 127, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 192, 1, 191, 192, 211, 192, 192, 195, 196, 9, - /* 10 */ 189, 190, 253, 13, 14, 192, 16, 17, 192, 253, - /* 20 */ 20, 21, 253, 23, 24, 25, 26, 27, 28, 263, - /* 30 */ 237, 262, 263, 33, 34, 253, 253, 37, 38, 39, - /* 40 */ 13, 14, 234, 16, 17, 262, 263, 20, 21, 1, - /* 50 */ 23, 24, 25, 26, 27, 28, 235, 9, 253, 233, - /* 60 */ 33, 34, 236, 211, 37, 38, 39, 14, 254, 16, - /* 70 */ 17, 250, 259, 20, 21, 1, 23, 24, 25, 26, - /* 80 */ 27, 28, 259, 9, 261, 211, 33, 34, 79, 237, + /* 0 */ 190, 1, 189, 190, 209, 190, 190, 193, 194, 9, + /* 10 */ 187, 188, 251, 13, 14, 190, 16, 17, 190, 251, + /* 20 */ 20, 21, 251, 23, 24, 25, 26, 27, 28, 261, + /* 30 */ 235, 260, 261, 33, 34, 251, 251, 37, 38, 39, + /* 40 */ 13, 14, 232, 16, 17, 260, 261, 20, 21, 1, + /* 50 */ 23, 24, 25, 26, 27, 28, 233, 9, 251, 231, + /* 60 */ 33, 34, 234, 209, 37, 38, 39, 14, 252, 16, + /* 70 */ 17, 248, 257, 20, 21, 1, 23, 24, 25, 26, + /* 80 */ 27, 28, 257, 9, 259, 209, 33, 34, 79, 235, /* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51, - /* 100 */ 52, 53, 54, 55, 56, 57, 58, 5, 198, 61, - /* 110 */ 110, 237, 81, 13, 14, 192, 16, 17, 253, 192, - /* 120 */ 20, 21, 1, 23, 24, 25, 26, 27, 28, 253, - /* 130 */ 9, 211, 105, 33, 34, 33, 34, 37, 38, 39, - /* 140 */ 13, 14, 232, 16, 17, 67, 253, 20, 21, 37, - /* 150 */ 23, 24, 25, 26, 27, 28, 233, 237, 0, 236, - /* 160 */ 33, 34, 67, 236, 37, 38, 39, 88, 89, 90, + /* 100 */ 52, 53, 54, 55, 56, 57, 58, 5, 196, 61, + /* 110 */ 110, 235, 251, 13, 14, 190, 16, 17, 81, 190, + /* 120 */ 20, 21, 1, 23, 24, 25, 26, 27, 28, 109, + /* 130 */ 9, 209, 105, 33, 34, 33, 34, 37, 38, 39, + /* 140 */ 13, 14, 230, 16, 17, 67, 251, 20, 21, 129, + /* 150 */ 23, 24, 25, 26, 27, 28, 231, 235, 0, 234, + /* 160 */ 33, 34, 67, 234, 37, 38, 39, 88, 89, 90, /* 170 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - /* 180 */ 101, 102, 210, 192, 212, 213, 214, 215, 216, 217, - /* 190 */ 218, 219, 220, 221, 222, 223, 224, 225, 16, 17, - /* 200 */ 197, 253, 20, 21, 201, 23, 24, 25, 26, 27, - /* 210 */ 28, 253, 44, 198, 136, 33, 34, 139, 140, 37, - /* 220 */ 38, 39, 1, 2, 235, 104, 5, 115, 7, 61, - /* 230 */ 9, 136, 1, 2, 139, 67, 5, 79, 7, 250, - /* 240 */ 9, 73, 74, 75, 229, 230, 231, 232, 257, 135, - /* 250 */ 259, 37, 38, 39, 33, 34, 142, 143, 37, 192, - /* 260 */ 88, 76, 90, 91, 33, 34, 81, 95, 238, 97, - /* 270 */ 98, 99, 104, 101, 102, 210, 192, 192, 213, 214, - /* 280 */ 112, 251, 192, 218, 197, 220, 221, 222, 201, 224, - /* 290 */ 225, 25, 26, 27, 28, 253, 64, 65, 66, 33, - /* 300 */ 34, 237, 134, 37, 38, 39, 62, 63, 192, 141, - /* 310 */ 15, 104, 68, 69, 70, 71, 72, 227, 233, 112, - /* 320 */ 105, 236, 78, 62, 63, 104, 259, 192, 113, 68, - /* 330 */ 69, 70, 71, 72, 192, 104, 62, 63, 117, 255, - /* 340 */ 192, 198, 68, 69, 70, 71, 72, 104, 117, 233, - /* 350 */ 253, 108, 236, 110, 133, 104, 33, 34, 107, 197, - /* 360 */ 37, 38, 39, 201, 133, 199, 200, 2, 233, 1, - /* 370 */ 5, 236, 7, 230, 9, 233, 124, 125, 236, 109, - /* 380 */ 5, 233, 7, 105, 236, 105, 116, 109, 105, 109, - /* 390 */ 105, 105, 109, 105, 109, 109, 60, 109, 33, 34, - /* 400 */ 5, 109, 7, 253, 105, 37, 111, 109, 109, 105, - /* 410 */ 105, 105, 105, 109, 109, 109, 109, 253, 137, 138, - /* 420 */ 253, 137, 138, 131, 137, 138, 104, 129, 106, 253, - /* 430 */ 137, 138, 5, 5, 7, 7, 76, 77, 62, 63, - /* 440 */ 104, 253, 253, 253, 253, 253, 253, 237, 228, 192, - /* 450 */ 228, 228, 228, 228, 228, 228, 192, 252, 260, 192, - /* 460 */ 192, 192, 260, 235, 235, 192, 60, 192, 235, 239, - /* 470 */ 193, 192, 117, 256, 192, 256, 111, 118, 122, 126, - /* 480 */ 128, 192, 192, 192, 130, 249, 192, 248, 192, 192, - /* 490 */ 256, 256, 192, 192, 192, 192, 127, 247, 121, 246, - /* 500 */ 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - /* 510 */ 192, 192, 192, 192, 120, 244, 192, 192, 192, 192, - /* 520 */ 192, 192, 192, 192, 192, 192, 192, 192, 119, 192, - /* 530 */ 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - /* 540 */ 132, 193, 193, 193, 193, 103, 87, 86, 50, 83, - /* 550 */ 85, 54, 84, 82, 79, 193, 5, 193, 144, 5, - /* 560 */ 193, 5, 144, 5, 5, 89, 193, 193, 135, 198, - /* 570 */ 198, 113, 109, 104, 107, 105, 114, 193, 105, 194, - /* 580 */ 1, 104, 194, 193, 203, 194, 207, 209, 208, 206, - /* 590 */ 204, 202, 205, 193, 105, 194, 226, 193, 199, 109, - /* 600 */ 195, 243, 245, 242, 241, 104, 240, 104, 226, 105, - /* 610 */ 104, 109, 107, 105, 123, 123, 109, 104, 104, 104, - /* 620 */ 111, 104, 76, 9, 108, 5, 5, 5, 5, 5, - /* 630 */ 80, 15, 138, 76, 109, 16, 5, 138, 138, 5, + /* 180 */ 101, 102, 208, 190, 210, 211, 212, 213, 214, 215, + /* 190 */ 216, 217, 218, 219, 220, 221, 222, 223, 16, 17, + /* 200 */ 195, 190, 20, 21, 199, 23, 24, 25, 26, 27, + /* 210 */ 28, 251, 44, 196, 136, 33, 34, 139, 140, 37, + /* 220 */ 38, 39, 1, 2, 233, 104, 5, 196, 7, 61, + /* 230 */ 9, 136, 1, 2, 139, 67, 5, 79, 7, 248, + /* 240 */ 9, 73, 74, 75, 227, 228, 229, 230, 255, 135, + /* 250 */ 257, 37, 38, 39, 33, 34, 142, 143, 37, 228, + /* 260 */ 88, 251, 90, 91, 33, 34, 190, 95, 257, 97, + /* 270 */ 98, 99, 104, 101, 102, 208, 76, 190, 211, 212, + /* 280 */ 112, 81, 5, 216, 7, 218, 219, 220, 37, 222, + /* 290 */ 223, 25, 26, 27, 28, 190, 64, 65, 66, 33, + /* 300 */ 34, 225, 134, 37, 38, 39, 62, 63, 190, 141, + /* 310 */ 109, 104, 68, 69, 70, 71, 72, 116, 231, 112, + /* 320 */ 105, 234, 78, 62, 63, 104, 15, 236, 113, 68, + /* 330 */ 69, 70, 71, 72, 190, 104, 62, 63, 117, 190, + /* 340 */ 249, 190, 68, 69, 70, 71, 72, 104, 117, 231, + /* 350 */ 60, 108, 234, 110, 133, 195, 33, 34, 253, 199, + /* 360 */ 37, 38, 39, 251, 133, 195, 115, 2, 251, 199, + /* 370 */ 5, 5, 7, 7, 9, 231, 197, 198, 234, 1, + /* 380 */ 231, 109, 231, 234, 251, 234, 105, 124, 125, 105, + /* 390 */ 109, 105, 105, 109, 104, 109, 109, 105, 33, 34, + /* 400 */ 105, 109, 105, 131, 109, 105, 109, 105, 105, 109, + /* 410 */ 105, 109, 109, 104, 109, 37, 107, 137, 138, 137, + /* 420 */ 138, 104, 111, 106, 251, 137, 138, 251, 137, 138, + /* 430 */ 226, 5, 5, 7, 7, 76, 77, 62, 63, 251, + /* 440 */ 251, 251, 251, 251, 251, 251, 251, 235, 235, 226, + /* 450 */ 226, 226, 226, 226, 226, 190, 250, 190, 190, 190, + /* 460 */ 190, 190, 233, 233, 60, 190, 258, 258, 233, 190, + /* 470 */ 237, 117, 254, 190, 254, 190, 111, 119, 122, 190, + /* 480 */ 246, 128, 245, 190, 190, 130, 190, 247, 190, 190, + /* 490 */ 254, 190, 254, 244, 190, 127, 190, 190, 190, 126, + /* 500 */ 190, 243, 190, 190, 190, 190, 190, 121, 190, 190, + /* 510 */ 190, 190, 190, 120, 190, 190, 190, 190, 190, 190, + /* 520 */ 190, 190, 190, 190, 190, 190, 190, 190, 190, 190, + /* 530 */ 190, 190, 190, 190, 190, 190, 190, 190, 118, 191, + /* 540 */ 191, 191, 191, 191, 132, 103, 87, 86, 50, 83, + /* 550 */ 85, 54, 84, 82, 191, 191, 79, 5, 144, 5, + /* 560 */ 191, 5, 144, 5, 5, 191, 135, 196, 196, 89, + /* 570 */ 191, 113, 109, 104, 107, 191, 114, 105, 105, 104, + /* 580 */ 104, 192, 205, 207, 201, 204, 206, 202, 200, 192, + /* 590 */ 203, 191, 197, 192, 224, 192, 191, 191, 105, 242, + /* 600 */ 239, 241, 240, 193, 109, 238, 224, 1, 104, 109, + /* 610 */ 105, 104, 123, 123, 105, 109, 104, 104, 104, 111, + /* 620 */ 104, 76, 107, 9, 5, 108, 5, 5, 5, 5, + /* 630 */ 80, 15, 138, 76, 109, 5, 16, 138, 5, 138, /* 640 */ 105, 5, 5, 5, 5, 5, 5, 5, 5, 5, - /* 650 */ 5, 5, 5, 5, 5, 5, 5, 5, 109, 60, - /* 660 */ 80, 59, 0, 264, 264, 264, 264, 264, 264, 264, - /* 670 */ 264, 264, 264, 264, 21, 21, 264, 264, 264, 264, - /* 680 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 690 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 700 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 710 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 720 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 730 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 740 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 750 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 760 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 770 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 780 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 790 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 800 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 810 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 820 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 830 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 840 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 850 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, - /* 860 */ 264, 264, 264, 264, + /* 650 */ 5, 5, 5, 5, 5, 5, 5, 5, 109, 80, + /* 660 */ 60, 59, 0, 262, 262, 262, 262, 262, 262, 262, + /* 670 */ 262, 262, 262, 262, 21, 21, 262, 262, 262, 262, + /* 680 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 690 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 700 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 710 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 720 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 730 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 740 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 750 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 760 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 770 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 780 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 790 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 800 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 810 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 820 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 830 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 840 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 850 */ 262, 262, 262, 262, 262, 262, 262, 262, 262, 262, + /* 860 */ 262, 262, }; #define YY_SHIFT_COUNT (312) #define YY_SHIFT_MIN (0) @@ -371,58 +371,58 @@ static const unsigned short int yy_shift_ofst[] = { /* 0 */ 168, 79, 79, 172, 172, 9, 221, 231, 74, 74, /* 10 */ 74, 74, 74, 74, 74, 74, 74, 0, 48, 231, /* 20 */ 365, 365, 365, 365, 121, 207, 74, 74, 74, 158, - /* 30 */ 74, 74, 185, 9, 31, 31, 676, 676, 676, 231, + /* 30 */ 74, 74, 200, 9, 37, 37, 676, 676, 676, 231, /* 40 */ 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, /* 50 */ 231, 231, 231, 231, 231, 231, 231, 231, 231, 365, /* 60 */ 365, 102, 102, 102, 102, 102, 102, 102, 74, 74, - /* 70 */ 112, 74, 207, 207, 74, 74, 74, 252, 252, 270, + /* 70 */ 251, 74, 207, 207, 74, 74, 74, 263, 263, 201, /* 80 */ 207, 74, 74, 74, 74, 74, 74, 74, 74, 74, /* 90 */ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, /* 100 */ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, /* 110 */ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, /* 120 */ 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, - /* 130 */ 74, 406, 406, 406, 355, 355, 355, 406, 355, 406, - /* 140 */ 352, 354, 369, 356, 353, 377, 394, 409, 359, 408, - /* 150 */ 406, 406, 406, 442, 9, 9, 406, 406, 459, 461, - /* 160 */ 498, 466, 465, 497, 468, 471, 442, 406, 475, 475, - /* 170 */ 406, 475, 406, 475, 406, 676, 676, 27, 100, 127, + /* 130 */ 74, 404, 404, 404, 354, 354, 354, 404, 354, 404, + /* 140 */ 353, 355, 368, 356, 373, 386, 393, 358, 420, 412, + /* 150 */ 404, 404, 404, 442, 9, 9, 404, 404, 459, 461, + /* 160 */ 498, 466, 465, 497, 468, 471, 442, 404, 477, 477, + /* 170 */ 404, 477, 404, 477, 404, 676, 676, 27, 100, 127, /* 180 */ 100, 100, 53, 182, 266, 266, 266, 266, 244, 261, /* 190 */ 274, 323, 323, 323, 323, 78, 114, 214, 214, 243, - /* 200 */ 95, 232, 278, 215, 280, 283, 285, 286, 288, 375, - /* 210 */ 395, 368, 336, 295, 292, 298, 299, 304, 305, 306, - /* 220 */ 307, 251, 281, 284, 287, 322, 293, 427, 428, 360, - /* 230 */ 376, 551, 414, 554, 556, 418, 558, 559, 476, 433, - /* 240 */ 458, 467, 469, 462, 470, 463, 473, 477, 489, 490, - /* 250 */ 501, 579, 503, 504, 506, 502, 491, 507, 492, 508, - /* 260 */ 513, 509, 514, 467, 515, 505, 517, 516, 546, 614, - /* 270 */ 620, 621, 622, 623, 624, 550, 616, 557, 494, 525, - /* 280 */ 525, 619, 499, 500, 525, 631, 634, 535, 525, 636, + /* 200 */ 95, 232, 281, 215, 284, 286, 287, 292, 295, 277, + /* 210 */ 366, 378, 290, 311, 272, 20, 297, 300, 302, 303, + /* 220 */ 305, 309, 280, 282, 288, 317, 291, 426, 427, 359, + /* 230 */ 375, 552, 414, 554, 556, 418, 558, 559, 480, 431, + /* 240 */ 458, 467, 469, 462, 472, 463, 473, 475, 493, 495, + /* 250 */ 476, 606, 504, 505, 507, 500, 489, 506, 490, 509, + /* 260 */ 512, 508, 513, 467, 514, 515, 516, 517, 545, 614, + /* 270 */ 619, 621, 622, 623, 624, 550, 616, 557, 494, 525, + /* 280 */ 525, 620, 499, 501, 525, 630, 633, 535, 525, 636, /* 290 */ 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, - /* 300 */ 647, 648, 649, 650, 651, 652, 549, 580, 653, 654, - /* 310 */ 599, 602, 662, + /* 300 */ 647, 648, 649, 650, 651, 652, 549, 579, 653, 654, + /* 310 */ 600, 602, 662, }; #define YY_REDUCE_COUNT (176) -#define YY_REDUCE_MIN (-241) -#define YY_REDUCE_MAX (405) +#define YY_REDUCE_MIN (-239) +#define YY_REDUCE_MAX (410) static const short yy_reduce_ofst[] = { - /* 0 */ -179, -28, -28, 65, 65, 15, -231, -217, -174, -177, - /* 10 */ -9, -77, 85, 116, 135, 142, 148, -186, -189, -234, - /* 20 */ -207, -148, -126, -80, 84, -11, -187, 67, -192, -90, - /* 30 */ 90, -73, 3, 143, 87, 162, 30, 166, -188, -241, - /* 40 */ -218, -195, -135, -124, -107, -52, -42, 42, 97, 150, - /* 50 */ 164, 167, 176, 188, 189, 190, 191, 192, 193, 64, - /* 60 */ 210, 220, 222, 223, 224, 225, 226, 227, 257, 264, - /* 70 */ 205, 267, 228, 229, 268, 269, 273, 198, 202, 230, - /* 80 */ 233, 275, 279, 282, 289, 290, 291, 294, 296, 297, - /* 90 */ 300, 301, 302, 303, 308, 309, 310, 311, 312, 313, - /* 100 */ 314, 315, 316, 317, 318, 319, 320, 321, 324, 325, - /* 110 */ 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, + /* 0 */ -177, -26, -26, 67, 67, 17, -229, -215, -172, -175, + /* 10 */ -7, -75, 87, 118, 144, 149, 151, -184, -187, -232, + /* 20 */ -205, -146, -124, -78, 105, -9, -185, 11, -190, -88, + /* 30 */ 76, -71, 5, 31, 160, 170, 91, 179, -186, -239, + /* 40 */ -216, -193, -139, -105, -40, 10, 112, 117, 133, 173, + /* 50 */ 176, 188, 189, 190, 191, 192, 193, 194, 195, 212, + /* 60 */ 213, 204, 223, 224, 225, 226, 227, 228, 265, 267, + /* 70 */ 206, 268, 229, 230, 269, 270, 271, 208, 209, 233, + /* 80 */ 235, 275, 279, 283, 285, 289, 293, 294, 296, 298, + /* 90 */ 299, 301, 304, 306, 307, 308, 310, 312, 313, 314, + /* 100 */ 315, 316, 318, 319, 320, 321, 322, 324, 325, 326, + /* 110 */ 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, /* 120 */ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, - /* 130 */ 347, 277, 348, 349, 217, 219, 234, 350, 235, 351, - /* 140 */ 236, 239, 250, 253, 357, 271, 358, 361, 363, 366, - /* 150 */ 362, 364, 367, 370, 371, 372, 373, 374, 378, 380, - /* 160 */ 379, 381, 383, 386, 387, 389, 382, 384, 385, 388, - /* 170 */ 390, 391, 400, 401, 404, 399, 405, + /* 130 */ 347, 348, 349, 350, 218, 220, 236, 351, 238, 352, + /* 140 */ 240, 234, 237, 249, 258, 357, 360, 362, 361, 367, + /* 150 */ 363, 364, 369, 370, 371, 372, 374, 379, 376, 380, + /* 160 */ 377, 383, 381, 385, 387, 388, 382, 384, 389, 397, + /* 170 */ 400, 401, 405, 403, 406, 395, 410, }; static const YYACTIONTYPE yy_default[] = { /* 0 */ 767, 879, 825, 891, 813, 822, 1019, 1019, 767, 767, @@ -657,10 +657,8 @@ static const YYCODETYPE yyFallback[] = { 1, /* PREV => ID */ 1, /* LINEAR => ID */ 1, /* IMPORT => ID */ - 1, /* METRIC => ID */ 1, /* TBNAME => ID */ 1, /* JOIN => ID */ - 1, /* METRICS => ID */ 1, /* INSERT => ID */ 1, /* INTO => ID */ 1, /* VALUES => ID */ @@ -931,89 +929,87 @@ static const char *const yyTokenName[] = { /* 178 */ "PREV", /* 179 */ "LINEAR", /* 180 */ "IMPORT", - /* 181 */ "METRIC", - /* 182 */ "TBNAME", - /* 183 */ "JOIN", - /* 184 */ "METRICS", - /* 185 */ "INSERT", - /* 186 */ "INTO", - /* 187 */ "VALUES", - /* 188 */ "error", - /* 189 */ "program", - /* 190 */ "cmd", - /* 191 */ "dbPrefix", - /* 192 */ "ids", - /* 193 */ "cpxName", - /* 194 */ "ifexists", - /* 195 */ "alter_db_optr", - /* 196 */ "alter_topic_optr", - /* 197 */ "acct_optr", - /* 198 */ "ifnotexists", - /* 199 */ "db_optr", - /* 200 */ "topic_optr", - /* 201 */ "pps", - /* 202 */ "tseries", - /* 203 */ "dbs", - /* 204 */ "streams", - /* 205 */ "storage", - /* 206 */ "qtime", - /* 207 */ "users", - /* 208 */ "conns", - /* 209 */ "state", - /* 210 */ "keep", - /* 211 */ "tagitemlist", - /* 212 */ "cache", - /* 213 */ "replica", - /* 214 */ "quorum", - /* 215 */ "days", - /* 216 */ "minrows", - /* 217 */ "maxrows", - /* 218 */ "blocks", - /* 219 */ "ctime", - /* 220 */ "wal", - /* 221 */ "fsync", - /* 222 */ "comp", - /* 223 */ "prec", - /* 224 */ "update", - /* 225 */ "cachelast", - /* 226 */ "partitions", - /* 227 */ "typename", - /* 228 */ "signed", - /* 229 */ "create_table_args", - /* 230 */ "create_stable_args", - /* 231 */ "create_table_list", - /* 232 */ "create_from_stable", - /* 233 */ "columnlist", - /* 234 */ "tagNamelist", - /* 235 */ "select", - /* 236 */ "column", - /* 237 */ "tagitem", - /* 238 */ "selcollist", - /* 239 */ "from", - /* 240 */ "where_opt", - /* 241 */ "interval_opt", - /* 242 */ "session_option", - /* 243 */ "fill_opt", - /* 244 */ "sliding_opt", - /* 245 */ "groupby_opt", - /* 246 */ "orderby_opt", - /* 247 */ "having_opt", - /* 248 */ "slimit_opt", - /* 249 */ "limit_opt", - /* 250 */ "union", - /* 251 */ "sclp", - /* 252 */ "distinct", - /* 253 */ "expr", - /* 254 */ "as", - /* 255 */ "tablelist", - /* 256 */ "tmvar", - /* 257 */ "sortlist", - /* 258 */ "sortitem", - /* 259 */ "item", - /* 260 */ "sortorder", - /* 261 */ "grouplist", - /* 262 */ "exprlist", - /* 263 */ "expritem", + /* 181 */ "TBNAME", + /* 182 */ "JOIN", + /* 183 */ "INSERT", + /* 184 */ "INTO", + /* 185 */ "VALUES", + /* 186 */ "error", + /* 187 */ "program", + /* 188 */ "cmd", + /* 189 */ "dbPrefix", + /* 190 */ "ids", + /* 191 */ "cpxName", + /* 192 */ "ifexists", + /* 193 */ "alter_db_optr", + /* 194 */ "alter_topic_optr", + /* 195 */ "acct_optr", + /* 196 */ "ifnotexists", + /* 197 */ "db_optr", + /* 198 */ "topic_optr", + /* 199 */ "pps", + /* 200 */ "tseries", + /* 201 */ "dbs", + /* 202 */ "streams", + /* 203 */ "storage", + /* 204 */ "qtime", + /* 205 */ "users", + /* 206 */ "conns", + /* 207 */ "state", + /* 208 */ "keep", + /* 209 */ "tagitemlist", + /* 210 */ "cache", + /* 211 */ "replica", + /* 212 */ "quorum", + /* 213 */ "days", + /* 214 */ "minrows", + /* 215 */ "maxrows", + /* 216 */ "blocks", + /* 217 */ "ctime", + /* 218 */ "wal", + /* 219 */ "fsync", + /* 220 */ "comp", + /* 221 */ "prec", + /* 222 */ "update", + /* 223 */ "cachelast", + /* 224 */ "partitions", + /* 225 */ "typename", + /* 226 */ "signed", + /* 227 */ "create_table_args", + /* 228 */ "create_stable_args", + /* 229 */ "create_table_list", + /* 230 */ "create_from_stable", + /* 231 */ "columnlist", + /* 232 */ "tagNamelist", + /* 233 */ "select", + /* 234 */ "column", + /* 235 */ "tagitem", + /* 236 */ "selcollist", + /* 237 */ "from", + /* 238 */ "where_opt", + /* 239 */ "interval_opt", + /* 240 */ "session_option", + /* 241 */ "fill_opt", + /* 242 */ "sliding_opt", + /* 243 */ "groupby_opt", + /* 244 */ "orderby_opt", + /* 245 */ "having_opt", + /* 246 */ "slimit_opt", + /* 247 */ "limit_opt", + /* 248 */ "union", + /* 249 */ "sclp", + /* 250 */ "distinct", + /* 251 */ "expr", + /* 252 */ "as", + /* 253 */ "tablelist", + /* 254 */ "tmvar", + /* 255 */ "sortlist", + /* 256 */ "sortitem", + /* 257 */ "item", + /* 258 */ "sortorder", + /* 259 */ "grouplist", + /* 260 */ "exprlist", + /* 261 */ "expritem", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1406,52 +1402,52 @@ static void yy_destructor( ** inside the C code. */ /********* Begin destructor definitions ***************************************/ - case 210: /* keep */ - case 211: /* tagitemlist */ - case 233: /* columnlist */ - case 234: /* tagNamelist */ - case 243: /* fill_opt */ - case 245: /* groupby_opt */ - case 246: /* orderby_opt */ - case 257: /* sortlist */ - case 261: /* grouplist */ + case 208: /* keep */ + case 209: /* tagitemlist */ + case 231: /* columnlist */ + case 232: /* tagNamelist */ + case 241: /* fill_opt */ + case 243: /* groupby_opt */ + case 244: /* orderby_opt */ + case 255: /* sortlist */ + case 259: /* grouplist */ { -taosArrayDestroy((yypminor->yy285)); +taosArrayDestroy((yypminor->yy429)); } break; - case 231: /* create_table_list */ + case 229: /* create_table_list */ { -destroyCreateTableSql((yypminor->yy470)); +destroyCreateTableSql((yypminor->yy194)); } break; - case 235: /* select */ + case 233: /* select */ { -destroyQuerySqlNode((yypminor->yy342)); +destroyQuerySqlNode((yypminor->yy254)); } break; - case 238: /* selcollist */ - case 251: /* sclp */ - case 262: /* exprlist */ + case 236: /* selcollist */ + case 249: /* sclp */ + case 260: /* exprlist */ { -tSqlExprListDestroy((yypminor->yy285)); +tSqlExprListDestroy((yypminor->yy429)); } break; - case 240: /* where_opt */ - case 247: /* having_opt */ - case 253: /* expr */ - case 263: /* expritem */ + case 238: /* where_opt */ + case 245: /* having_opt */ + case 251: /* expr */ + case 261: /* expritem */ { -tSqlExprDestroy((yypminor->yy178)); +tSqlExprDestroy((yypminor->yy170)); } break; - case 250: /* union */ + case 248: /* union */ { -destroyAllSelectClause((yypminor->yy513)); +destroyAllSelectClause((yypminor->yy141)); } break; - case 258: /* sortitem */ + case 256: /* sortitem */ { -tVariantDestroy(&(yypminor->yy362)); +tVariantDestroy(&(yypminor->yy218)); } break; /********* End destructor definitions *****************************************/ @@ -1745,271 +1741,271 @@ 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[] = { - { 189, -1 }, /* (0) program ::= cmd */ - { 190, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 190, -2 }, /* (2) cmd ::= SHOW TOPICS */ - { 190, -2 }, /* (3) cmd ::= SHOW MNODES */ - { 190, -2 }, /* (4) cmd ::= SHOW DNODES */ - { 190, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ - { 190, -2 }, /* (6) cmd ::= SHOW USERS */ - { 190, -2 }, /* (7) cmd ::= SHOW MODULES */ - { 190, -2 }, /* (8) cmd ::= SHOW QUERIES */ - { 190, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ - { 190, -2 }, /* (10) cmd ::= SHOW STREAMS */ - { 190, -2 }, /* (11) cmd ::= SHOW VARIABLES */ - { 190, -2 }, /* (12) cmd ::= SHOW SCORES */ - { 190, -2 }, /* (13) cmd ::= SHOW GRANTS */ - { 190, -2 }, /* (14) cmd ::= SHOW VNODES */ - { 190, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ - { 191, 0 }, /* (16) dbPrefix ::= */ - { 191, -2 }, /* (17) dbPrefix ::= ids DOT */ - { 193, 0 }, /* (18) cpxName ::= */ - { 193, -2 }, /* (19) cpxName ::= DOT ids */ - { 190, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 190, -4 }, /* (21) cmd ::= SHOW CREATE DATABASE ids */ - { 190, -3 }, /* (22) cmd ::= SHOW dbPrefix TABLES */ - { 190, -5 }, /* (23) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 190, -3 }, /* (24) cmd ::= SHOW dbPrefix STABLES */ - { 190, -5 }, /* (25) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 190, -3 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS */ - { 190, -4 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 190, -5 }, /* (28) cmd ::= DROP TABLE ifexists ids cpxName */ - { 190, -5 }, /* (29) cmd ::= DROP STABLE ifexists ids cpxName */ - { 190, -4 }, /* (30) cmd ::= DROP DATABASE ifexists ids */ - { 190, -4 }, /* (31) cmd ::= DROP TOPIC ifexists ids */ - { 190, -3 }, /* (32) cmd ::= DROP DNODE ids */ - { 190, -3 }, /* (33) cmd ::= DROP USER ids */ - { 190, -3 }, /* (34) cmd ::= DROP ACCOUNT ids */ - { 190, -2 }, /* (35) cmd ::= USE ids */ - { 190, -3 }, /* (36) cmd ::= DESCRIBE ids cpxName */ - { 190, -5 }, /* (37) cmd ::= ALTER USER ids PASS ids */ - { 190, -5 }, /* (38) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 190, -4 }, /* (39) cmd ::= ALTER DNODE ids ids */ - { 190, -5 }, /* (40) cmd ::= ALTER DNODE ids ids ids */ - { 190, -3 }, /* (41) cmd ::= ALTER LOCAL ids */ - { 190, -4 }, /* (42) cmd ::= ALTER LOCAL ids ids */ - { 190, -4 }, /* (43) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 190, -4 }, /* (44) cmd ::= ALTER TOPIC ids alter_topic_optr */ - { 190, -4 }, /* (45) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 190, -6 }, /* (46) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 192, -1 }, /* (47) ids ::= ID */ - { 192, -1 }, /* (48) ids ::= STRING */ - { 194, -2 }, /* (49) ifexists ::= IF EXISTS */ - { 194, 0 }, /* (50) ifexists ::= */ - { 198, -3 }, /* (51) ifnotexists ::= IF NOT EXISTS */ - { 198, 0 }, /* (52) ifnotexists ::= */ - { 190, -3 }, /* (53) cmd ::= CREATE DNODE ids */ - { 190, -6 }, /* (54) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 190, -5 }, /* (55) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 190, -5 }, /* (56) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - { 190, -5 }, /* (57) cmd ::= CREATE USER ids PASS ids */ - { 201, 0 }, /* (58) pps ::= */ - { 201, -2 }, /* (59) pps ::= PPS INTEGER */ - { 202, 0 }, /* (60) tseries ::= */ - { 202, -2 }, /* (61) tseries ::= TSERIES INTEGER */ - { 203, 0 }, /* (62) dbs ::= */ - { 203, -2 }, /* (63) dbs ::= DBS INTEGER */ - { 204, 0 }, /* (64) streams ::= */ - { 204, -2 }, /* (65) streams ::= STREAMS INTEGER */ - { 205, 0 }, /* (66) storage ::= */ - { 205, -2 }, /* (67) storage ::= STORAGE INTEGER */ - { 206, 0 }, /* (68) qtime ::= */ - { 206, -2 }, /* (69) qtime ::= QTIME INTEGER */ - { 207, 0 }, /* (70) users ::= */ - { 207, -2 }, /* (71) users ::= USERS INTEGER */ - { 208, 0 }, /* (72) conns ::= */ - { 208, -2 }, /* (73) conns ::= CONNS INTEGER */ - { 209, 0 }, /* (74) state ::= */ - { 209, -2 }, /* (75) state ::= STATE ids */ - { 197, -9 }, /* (76) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 210, -2 }, /* (77) keep ::= KEEP tagitemlist */ - { 212, -2 }, /* (78) cache ::= CACHE INTEGER */ - { 213, -2 }, /* (79) replica ::= REPLICA INTEGER */ - { 214, -2 }, /* (80) quorum ::= QUORUM INTEGER */ - { 215, -2 }, /* (81) days ::= DAYS INTEGER */ - { 216, -2 }, /* (82) minrows ::= MINROWS INTEGER */ - { 217, -2 }, /* (83) maxrows ::= MAXROWS INTEGER */ - { 218, -2 }, /* (84) blocks ::= BLOCKS INTEGER */ - { 219, -2 }, /* (85) ctime ::= CTIME INTEGER */ - { 220, -2 }, /* (86) wal ::= WAL INTEGER */ - { 221, -2 }, /* (87) fsync ::= FSYNC INTEGER */ - { 222, -2 }, /* (88) comp ::= COMP INTEGER */ - { 223, -2 }, /* (89) prec ::= PRECISION STRING */ - { 224, -2 }, /* (90) update ::= UPDATE INTEGER */ - { 225, -2 }, /* (91) cachelast ::= CACHELAST INTEGER */ - { 226, -2 }, /* (92) partitions ::= PARTITIONS INTEGER */ - { 199, 0 }, /* (93) db_optr ::= */ - { 199, -2 }, /* (94) db_optr ::= db_optr cache */ - { 199, -2 }, /* (95) db_optr ::= db_optr replica */ - { 199, -2 }, /* (96) db_optr ::= db_optr quorum */ - { 199, -2 }, /* (97) db_optr ::= db_optr days */ - { 199, -2 }, /* (98) db_optr ::= db_optr minrows */ - { 199, -2 }, /* (99) db_optr ::= db_optr maxrows */ - { 199, -2 }, /* (100) db_optr ::= db_optr blocks */ - { 199, -2 }, /* (101) db_optr ::= db_optr ctime */ - { 199, -2 }, /* (102) db_optr ::= db_optr wal */ - { 199, -2 }, /* (103) db_optr ::= db_optr fsync */ - { 199, -2 }, /* (104) db_optr ::= db_optr comp */ - { 199, -2 }, /* (105) db_optr ::= db_optr prec */ - { 199, -2 }, /* (106) db_optr ::= db_optr keep */ - { 199, -2 }, /* (107) db_optr ::= db_optr update */ - { 199, -2 }, /* (108) db_optr ::= db_optr cachelast */ - { 200, -1 }, /* (109) topic_optr ::= db_optr */ - { 200, -2 }, /* (110) topic_optr ::= topic_optr partitions */ - { 195, 0 }, /* (111) alter_db_optr ::= */ - { 195, -2 }, /* (112) alter_db_optr ::= alter_db_optr replica */ - { 195, -2 }, /* (113) alter_db_optr ::= alter_db_optr quorum */ - { 195, -2 }, /* (114) alter_db_optr ::= alter_db_optr keep */ - { 195, -2 }, /* (115) alter_db_optr ::= alter_db_optr blocks */ - { 195, -2 }, /* (116) alter_db_optr ::= alter_db_optr comp */ - { 195, -2 }, /* (117) alter_db_optr ::= alter_db_optr wal */ - { 195, -2 }, /* (118) alter_db_optr ::= alter_db_optr fsync */ - { 195, -2 }, /* (119) alter_db_optr ::= alter_db_optr update */ - { 195, -2 }, /* (120) alter_db_optr ::= alter_db_optr cachelast */ - { 196, -1 }, /* (121) alter_topic_optr ::= alter_db_optr */ - { 196, -2 }, /* (122) alter_topic_optr ::= alter_topic_optr partitions */ - { 227, -1 }, /* (123) typename ::= ids */ - { 227, -4 }, /* (124) typename ::= ids LP signed RP */ - { 227, -2 }, /* (125) typename ::= ids UNSIGNED */ - { 228, -1 }, /* (126) signed ::= INTEGER */ - { 228, -2 }, /* (127) signed ::= PLUS INTEGER */ - { 228, -2 }, /* (128) signed ::= MINUS INTEGER */ - { 190, -3 }, /* (129) cmd ::= CREATE TABLE create_table_args */ - { 190, -3 }, /* (130) cmd ::= CREATE TABLE create_stable_args */ - { 190, -3 }, /* (131) cmd ::= CREATE STABLE create_stable_args */ - { 190, -3 }, /* (132) cmd ::= CREATE TABLE create_table_list */ - { 231, -1 }, /* (133) create_table_list ::= create_from_stable */ - { 231, -2 }, /* (134) create_table_list ::= create_table_list create_from_stable */ - { 229, -6 }, /* (135) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 230, -10 }, /* (136) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 232, -10 }, /* (137) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 232, -13 }, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 234, -3 }, /* (139) tagNamelist ::= tagNamelist COMMA ids */ - { 234, -1 }, /* (140) tagNamelist ::= ids */ - { 229, -5 }, /* (141) create_table_args ::= ifnotexists ids cpxName AS select */ - { 233, -3 }, /* (142) columnlist ::= columnlist COMMA column */ - { 233, -1 }, /* (143) columnlist ::= column */ - { 236, -2 }, /* (144) column ::= ids typename */ - { 211, -3 }, /* (145) tagitemlist ::= tagitemlist COMMA tagitem */ - { 211, -1 }, /* (146) tagitemlist ::= tagitem */ - { 237, -1 }, /* (147) tagitem ::= INTEGER */ - { 237, -1 }, /* (148) tagitem ::= FLOAT */ - { 237, -1 }, /* (149) tagitem ::= STRING */ - { 237, -1 }, /* (150) tagitem ::= BOOL */ - { 237, -1 }, /* (151) tagitem ::= NULL */ - { 237, -2 }, /* (152) tagitem ::= MINUS INTEGER */ - { 237, -2 }, /* (153) tagitem ::= MINUS FLOAT */ - { 237, -2 }, /* (154) tagitem ::= PLUS INTEGER */ - { 237, -2 }, /* (155) tagitem ::= PLUS FLOAT */ - { 235, -13 }, /* (156) select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - { 235, -3 }, /* (157) select ::= LP select RP */ - { 250, -1 }, /* (158) union ::= select */ - { 250, -4 }, /* (159) union ::= union UNION ALL select */ - { 190, -1 }, /* (160) cmd ::= union */ - { 235, -2 }, /* (161) select ::= SELECT selcollist */ - { 251, -2 }, /* (162) sclp ::= selcollist COMMA */ - { 251, 0 }, /* (163) sclp ::= */ - { 238, -4 }, /* (164) selcollist ::= sclp distinct expr as */ - { 238, -2 }, /* (165) selcollist ::= sclp STAR */ - { 254, -2 }, /* (166) as ::= AS ids */ - { 254, -1 }, /* (167) as ::= ids */ - { 254, 0 }, /* (168) as ::= */ - { 252, -1 }, /* (169) distinct ::= DISTINCT */ - { 252, 0 }, /* (170) distinct ::= */ - { 239, -2 }, /* (171) from ::= FROM tablelist */ - { 239, -4 }, /* (172) from ::= FROM LP union RP */ - { 255, -2 }, /* (173) tablelist ::= ids cpxName */ - { 255, -3 }, /* (174) tablelist ::= ids cpxName ids */ - { 255, -4 }, /* (175) tablelist ::= tablelist COMMA ids cpxName */ - { 255, -5 }, /* (176) tablelist ::= tablelist COMMA ids cpxName ids */ - { 256, -1 }, /* (177) tmvar ::= VARIABLE */ - { 241, -4 }, /* (178) interval_opt ::= INTERVAL LP tmvar RP */ - { 241, -6 }, /* (179) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 241, 0 }, /* (180) interval_opt ::= */ - { 242, 0 }, /* (181) session_option ::= */ - { 242, -7 }, /* (182) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 243, 0 }, /* (183) fill_opt ::= */ - { 243, -6 }, /* (184) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 243, -4 }, /* (185) fill_opt ::= FILL LP ID RP */ - { 244, -4 }, /* (186) sliding_opt ::= SLIDING LP tmvar RP */ - { 244, 0 }, /* (187) sliding_opt ::= */ - { 246, 0 }, /* (188) orderby_opt ::= */ - { 246, -3 }, /* (189) orderby_opt ::= ORDER BY sortlist */ - { 257, -4 }, /* (190) sortlist ::= sortlist COMMA item sortorder */ - { 257, -2 }, /* (191) sortlist ::= item sortorder */ - { 259, -2 }, /* (192) item ::= ids cpxName */ - { 260, -1 }, /* (193) sortorder ::= ASC */ - { 260, -1 }, /* (194) sortorder ::= DESC */ - { 260, 0 }, /* (195) sortorder ::= */ - { 245, 0 }, /* (196) groupby_opt ::= */ - { 245, -3 }, /* (197) groupby_opt ::= GROUP BY grouplist */ - { 261, -3 }, /* (198) grouplist ::= grouplist COMMA item */ - { 261, -1 }, /* (199) grouplist ::= item */ - { 247, 0 }, /* (200) having_opt ::= */ - { 247, -2 }, /* (201) having_opt ::= HAVING expr */ - { 249, 0 }, /* (202) limit_opt ::= */ - { 249, -2 }, /* (203) limit_opt ::= LIMIT signed */ - { 249, -4 }, /* (204) limit_opt ::= LIMIT signed OFFSET signed */ - { 249, -4 }, /* (205) limit_opt ::= LIMIT signed COMMA signed */ - { 248, 0 }, /* (206) slimit_opt ::= */ - { 248, -2 }, /* (207) slimit_opt ::= SLIMIT signed */ - { 248, -4 }, /* (208) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 248, -4 }, /* (209) slimit_opt ::= SLIMIT signed COMMA signed */ - { 240, 0 }, /* (210) where_opt ::= */ - { 240, -2 }, /* (211) where_opt ::= WHERE expr */ - { 253, -3 }, /* (212) expr ::= LP expr RP */ - { 253, -1 }, /* (213) expr ::= ID */ - { 253, -3 }, /* (214) expr ::= ID DOT ID */ - { 253, -3 }, /* (215) expr ::= ID DOT STAR */ - { 253, -1 }, /* (216) expr ::= INTEGER */ - { 253, -2 }, /* (217) expr ::= MINUS INTEGER */ - { 253, -2 }, /* (218) expr ::= PLUS INTEGER */ - { 253, -1 }, /* (219) expr ::= FLOAT */ - { 253, -2 }, /* (220) expr ::= MINUS FLOAT */ - { 253, -2 }, /* (221) expr ::= PLUS FLOAT */ - { 253, -1 }, /* (222) expr ::= STRING */ - { 253, -1 }, /* (223) expr ::= NOW */ - { 253, -1 }, /* (224) expr ::= VARIABLE */ - { 253, -1 }, /* (225) expr ::= BOOL */ - { 253, -4 }, /* (226) expr ::= ID LP exprlist RP */ - { 253, -4 }, /* (227) expr ::= ID LP STAR RP */ - { 253, -3 }, /* (228) expr ::= expr IS NULL */ - { 253, -4 }, /* (229) expr ::= expr IS NOT NULL */ - { 253, -3 }, /* (230) expr ::= expr LT expr */ - { 253, -3 }, /* (231) expr ::= expr GT expr */ - { 253, -3 }, /* (232) expr ::= expr LE expr */ - { 253, -3 }, /* (233) expr ::= expr GE expr */ - { 253, -3 }, /* (234) expr ::= expr NE expr */ - { 253, -3 }, /* (235) expr ::= expr EQ expr */ - { 253, -5 }, /* (236) expr ::= expr BETWEEN expr AND expr */ - { 253, -3 }, /* (237) expr ::= expr AND expr */ - { 253, -3 }, /* (238) expr ::= expr OR expr */ - { 253, -3 }, /* (239) expr ::= expr PLUS expr */ - { 253, -3 }, /* (240) expr ::= expr MINUS expr */ - { 253, -3 }, /* (241) expr ::= expr STAR expr */ - { 253, -3 }, /* (242) expr ::= expr SLASH expr */ - { 253, -3 }, /* (243) expr ::= expr REM expr */ - { 253, -3 }, /* (244) expr ::= expr LIKE expr */ - { 253, -5 }, /* (245) expr ::= expr IN LP exprlist RP */ - { 262, -3 }, /* (246) exprlist ::= exprlist COMMA expritem */ - { 262, -1 }, /* (247) exprlist ::= expritem */ - { 263, -1 }, /* (248) expritem ::= expr */ - { 263, 0 }, /* (249) expritem ::= */ - { 190, -3 }, /* (250) cmd ::= RESET QUERY CACHE */ - { 190, -7 }, /* (251) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 190, -7 }, /* (252) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 190, -7 }, /* (253) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 190, -7 }, /* (254) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 190, -8 }, /* (255) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 190, -9 }, /* (256) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 190, -7 }, /* (257) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 190, -7 }, /* (258) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 190, -7 }, /* (259) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 190, -7 }, /* (260) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 190, -8 }, /* (261) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 190, -3 }, /* (262) cmd ::= KILL CONNECTION INTEGER */ - { 190, -5 }, /* (263) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 190, -5 }, /* (264) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 187, -1 }, /* (0) program ::= cmd */ + { 188, -2 }, /* (1) cmd ::= SHOW DATABASES */ + { 188, -2 }, /* (2) cmd ::= SHOW TOPICS */ + { 188, -2 }, /* (3) cmd ::= SHOW MNODES */ + { 188, -2 }, /* (4) cmd ::= SHOW DNODES */ + { 188, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ + { 188, -2 }, /* (6) cmd ::= SHOW USERS */ + { 188, -2 }, /* (7) cmd ::= SHOW MODULES */ + { 188, -2 }, /* (8) cmd ::= SHOW QUERIES */ + { 188, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ + { 188, -2 }, /* (10) cmd ::= SHOW STREAMS */ + { 188, -2 }, /* (11) cmd ::= SHOW VARIABLES */ + { 188, -2 }, /* (12) cmd ::= SHOW SCORES */ + { 188, -2 }, /* (13) cmd ::= SHOW GRANTS */ + { 188, -2 }, /* (14) cmd ::= SHOW VNODES */ + { 188, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ + { 189, 0 }, /* (16) dbPrefix ::= */ + { 189, -2 }, /* (17) dbPrefix ::= ids DOT */ + { 191, 0 }, /* (18) cpxName ::= */ + { 191, -2 }, /* (19) cpxName ::= DOT ids */ + { 188, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ + { 188, -4 }, /* (21) cmd ::= SHOW CREATE DATABASE ids */ + { 188, -3 }, /* (22) cmd ::= SHOW dbPrefix TABLES */ + { 188, -5 }, /* (23) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + { 188, -3 }, /* (24) cmd ::= SHOW dbPrefix STABLES */ + { 188, -5 }, /* (25) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + { 188, -3 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS */ + { 188, -4 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS ids */ + { 188, -5 }, /* (28) cmd ::= DROP TABLE ifexists ids cpxName */ + { 188, -5 }, /* (29) cmd ::= DROP STABLE ifexists ids cpxName */ + { 188, -4 }, /* (30) cmd ::= DROP DATABASE ifexists ids */ + { 188, -4 }, /* (31) cmd ::= DROP TOPIC ifexists ids */ + { 188, -3 }, /* (32) cmd ::= DROP DNODE ids */ + { 188, -3 }, /* (33) cmd ::= DROP USER ids */ + { 188, -3 }, /* (34) cmd ::= DROP ACCOUNT ids */ + { 188, -2 }, /* (35) cmd ::= USE ids */ + { 188, -3 }, /* (36) cmd ::= DESCRIBE ids cpxName */ + { 188, -5 }, /* (37) cmd ::= ALTER USER ids PASS ids */ + { 188, -5 }, /* (38) cmd ::= ALTER USER ids PRIVILEGE ids */ + { 188, -4 }, /* (39) cmd ::= ALTER DNODE ids ids */ + { 188, -5 }, /* (40) cmd ::= ALTER DNODE ids ids ids */ + { 188, -3 }, /* (41) cmd ::= ALTER LOCAL ids */ + { 188, -4 }, /* (42) cmd ::= ALTER LOCAL ids ids */ + { 188, -4 }, /* (43) cmd ::= ALTER DATABASE ids alter_db_optr */ + { 188, -4 }, /* (44) cmd ::= ALTER TOPIC ids alter_topic_optr */ + { 188, -4 }, /* (45) cmd ::= ALTER ACCOUNT ids acct_optr */ + { 188, -6 }, /* (46) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + { 190, -1 }, /* (47) ids ::= ID */ + { 190, -1 }, /* (48) ids ::= STRING */ + { 192, -2 }, /* (49) ifexists ::= IF EXISTS */ + { 192, 0 }, /* (50) ifexists ::= */ + { 196, -3 }, /* (51) ifnotexists ::= IF NOT EXISTS */ + { 196, 0 }, /* (52) ifnotexists ::= */ + { 188, -3 }, /* (53) cmd ::= CREATE DNODE ids */ + { 188, -6 }, /* (54) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + { 188, -5 }, /* (55) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + { 188, -5 }, /* (56) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ + { 188, -5 }, /* (57) cmd ::= CREATE USER ids PASS ids */ + { 199, 0 }, /* (58) pps ::= */ + { 199, -2 }, /* (59) pps ::= PPS INTEGER */ + { 200, 0 }, /* (60) tseries ::= */ + { 200, -2 }, /* (61) tseries ::= TSERIES INTEGER */ + { 201, 0 }, /* (62) dbs ::= */ + { 201, -2 }, /* (63) dbs ::= DBS INTEGER */ + { 202, 0 }, /* (64) streams ::= */ + { 202, -2 }, /* (65) streams ::= STREAMS INTEGER */ + { 203, 0 }, /* (66) storage ::= */ + { 203, -2 }, /* (67) storage ::= STORAGE INTEGER */ + { 204, 0 }, /* (68) qtime ::= */ + { 204, -2 }, /* (69) qtime ::= QTIME INTEGER */ + { 205, 0 }, /* (70) users ::= */ + { 205, -2 }, /* (71) users ::= USERS INTEGER */ + { 206, 0 }, /* (72) conns ::= */ + { 206, -2 }, /* (73) conns ::= CONNS INTEGER */ + { 207, 0 }, /* (74) state ::= */ + { 207, -2 }, /* (75) state ::= STATE ids */ + { 195, -9 }, /* (76) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + { 208, -2 }, /* (77) keep ::= KEEP tagitemlist */ + { 210, -2 }, /* (78) cache ::= CACHE INTEGER */ + { 211, -2 }, /* (79) replica ::= REPLICA INTEGER */ + { 212, -2 }, /* (80) quorum ::= QUORUM INTEGER */ + { 213, -2 }, /* (81) days ::= DAYS INTEGER */ + { 214, -2 }, /* (82) minrows ::= MINROWS INTEGER */ + { 215, -2 }, /* (83) maxrows ::= MAXROWS INTEGER */ + { 216, -2 }, /* (84) blocks ::= BLOCKS INTEGER */ + { 217, -2 }, /* (85) ctime ::= CTIME INTEGER */ + { 218, -2 }, /* (86) wal ::= WAL INTEGER */ + { 219, -2 }, /* (87) fsync ::= FSYNC INTEGER */ + { 220, -2 }, /* (88) comp ::= COMP INTEGER */ + { 221, -2 }, /* (89) prec ::= PRECISION STRING */ + { 222, -2 }, /* (90) update ::= UPDATE INTEGER */ + { 223, -2 }, /* (91) cachelast ::= CACHELAST INTEGER */ + { 224, -2 }, /* (92) partitions ::= PARTITIONS INTEGER */ + { 197, 0 }, /* (93) db_optr ::= */ + { 197, -2 }, /* (94) db_optr ::= db_optr cache */ + { 197, -2 }, /* (95) db_optr ::= db_optr replica */ + { 197, -2 }, /* (96) db_optr ::= db_optr quorum */ + { 197, -2 }, /* (97) db_optr ::= db_optr days */ + { 197, -2 }, /* (98) db_optr ::= db_optr minrows */ + { 197, -2 }, /* (99) db_optr ::= db_optr maxrows */ + { 197, -2 }, /* (100) db_optr ::= db_optr blocks */ + { 197, -2 }, /* (101) db_optr ::= db_optr ctime */ + { 197, -2 }, /* (102) db_optr ::= db_optr wal */ + { 197, -2 }, /* (103) db_optr ::= db_optr fsync */ + { 197, -2 }, /* (104) db_optr ::= db_optr comp */ + { 197, -2 }, /* (105) db_optr ::= db_optr prec */ + { 197, -2 }, /* (106) db_optr ::= db_optr keep */ + { 197, -2 }, /* (107) db_optr ::= db_optr update */ + { 197, -2 }, /* (108) db_optr ::= db_optr cachelast */ + { 198, -1 }, /* (109) topic_optr ::= db_optr */ + { 198, -2 }, /* (110) topic_optr ::= topic_optr partitions */ + { 193, 0 }, /* (111) alter_db_optr ::= */ + { 193, -2 }, /* (112) alter_db_optr ::= alter_db_optr replica */ + { 193, -2 }, /* (113) alter_db_optr ::= alter_db_optr quorum */ + { 193, -2 }, /* (114) alter_db_optr ::= alter_db_optr keep */ + { 193, -2 }, /* (115) alter_db_optr ::= alter_db_optr blocks */ + { 193, -2 }, /* (116) alter_db_optr ::= alter_db_optr comp */ + { 193, -2 }, /* (117) alter_db_optr ::= alter_db_optr wal */ + { 193, -2 }, /* (118) alter_db_optr ::= alter_db_optr fsync */ + { 193, -2 }, /* (119) alter_db_optr ::= alter_db_optr update */ + { 193, -2 }, /* (120) alter_db_optr ::= alter_db_optr cachelast */ + { 194, -1 }, /* (121) alter_topic_optr ::= alter_db_optr */ + { 194, -2 }, /* (122) alter_topic_optr ::= alter_topic_optr partitions */ + { 225, -1 }, /* (123) typename ::= ids */ + { 225, -4 }, /* (124) typename ::= ids LP signed RP */ + { 225, -2 }, /* (125) typename ::= ids UNSIGNED */ + { 226, -1 }, /* (126) signed ::= INTEGER */ + { 226, -2 }, /* (127) signed ::= PLUS INTEGER */ + { 226, -2 }, /* (128) signed ::= MINUS INTEGER */ + { 188, -3 }, /* (129) cmd ::= CREATE TABLE create_table_args */ + { 188, -3 }, /* (130) cmd ::= CREATE TABLE create_stable_args */ + { 188, -3 }, /* (131) cmd ::= CREATE STABLE create_stable_args */ + { 188, -3 }, /* (132) cmd ::= CREATE TABLE create_table_list */ + { 229, -1 }, /* (133) create_table_list ::= create_from_stable */ + { 229, -2 }, /* (134) create_table_list ::= create_table_list create_from_stable */ + { 227, -6 }, /* (135) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 228, -10 }, /* (136) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 230, -10 }, /* (137) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + { 230, -13 }, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + { 232, -3 }, /* (139) tagNamelist ::= tagNamelist COMMA ids */ + { 232, -1 }, /* (140) tagNamelist ::= ids */ + { 227, -5 }, /* (141) create_table_args ::= ifnotexists ids cpxName AS select */ + { 231, -3 }, /* (142) columnlist ::= columnlist COMMA column */ + { 231, -1 }, /* (143) columnlist ::= column */ + { 234, -2 }, /* (144) column ::= ids typename */ + { 209, -3 }, /* (145) tagitemlist ::= tagitemlist COMMA tagitem */ + { 209, -1 }, /* (146) tagitemlist ::= tagitem */ + { 235, -1 }, /* (147) tagitem ::= INTEGER */ + { 235, -1 }, /* (148) tagitem ::= FLOAT */ + { 235, -1 }, /* (149) tagitem ::= STRING */ + { 235, -1 }, /* (150) tagitem ::= BOOL */ + { 235, -1 }, /* (151) tagitem ::= NULL */ + { 235, -2 }, /* (152) tagitem ::= MINUS INTEGER */ + { 235, -2 }, /* (153) tagitem ::= MINUS FLOAT */ + { 235, -2 }, /* (154) tagitem ::= PLUS INTEGER */ + { 235, -2 }, /* (155) tagitem ::= PLUS FLOAT */ + { 233, -13 }, /* (156) select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + { 233, -3 }, /* (157) select ::= LP select RP */ + { 248, -1 }, /* (158) union ::= select */ + { 248, -4 }, /* (159) union ::= union UNION ALL select */ + { 188, -1 }, /* (160) cmd ::= union */ + { 233, -2 }, /* (161) select ::= SELECT selcollist */ + { 249, -2 }, /* (162) sclp ::= selcollist COMMA */ + { 249, 0 }, /* (163) sclp ::= */ + { 236, -4 }, /* (164) selcollist ::= sclp distinct expr as */ + { 236, -2 }, /* (165) selcollist ::= sclp STAR */ + { 252, -2 }, /* (166) as ::= AS ids */ + { 252, -1 }, /* (167) as ::= ids */ + { 252, 0 }, /* (168) as ::= */ + { 250, -1 }, /* (169) distinct ::= DISTINCT */ + { 250, 0 }, /* (170) distinct ::= */ + { 237, -2 }, /* (171) from ::= FROM tablelist */ + { 237, -4 }, /* (172) from ::= FROM LP union RP */ + { 253, -2 }, /* (173) tablelist ::= ids cpxName */ + { 253, -3 }, /* (174) tablelist ::= ids cpxName ids */ + { 253, -4 }, /* (175) tablelist ::= tablelist COMMA ids cpxName */ + { 253, -5 }, /* (176) tablelist ::= tablelist COMMA ids cpxName ids */ + { 254, -1 }, /* (177) tmvar ::= VARIABLE */ + { 239, -4 }, /* (178) interval_opt ::= INTERVAL LP tmvar RP */ + { 239, -6 }, /* (179) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 239, 0 }, /* (180) interval_opt ::= */ + { 240, 0 }, /* (181) session_option ::= */ + { 240, -7 }, /* (182) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + { 241, 0 }, /* (183) fill_opt ::= */ + { 241, -6 }, /* (184) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 241, -4 }, /* (185) fill_opt ::= FILL LP ID RP */ + { 242, -4 }, /* (186) sliding_opt ::= SLIDING LP tmvar RP */ + { 242, 0 }, /* (187) sliding_opt ::= */ + { 244, 0 }, /* (188) orderby_opt ::= */ + { 244, -3 }, /* (189) orderby_opt ::= ORDER BY sortlist */ + { 255, -4 }, /* (190) sortlist ::= sortlist COMMA item sortorder */ + { 255, -2 }, /* (191) sortlist ::= item sortorder */ + { 257, -2 }, /* (192) item ::= ids cpxName */ + { 258, -1 }, /* (193) sortorder ::= ASC */ + { 258, -1 }, /* (194) sortorder ::= DESC */ + { 258, 0 }, /* (195) sortorder ::= */ + { 243, 0 }, /* (196) groupby_opt ::= */ + { 243, -3 }, /* (197) groupby_opt ::= GROUP BY grouplist */ + { 259, -3 }, /* (198) grouplist ::= grouplist COMMA item */ + { 259, -1 }, /* (199) grouplist ::= item */ + { 245, 0 }, /* (200) having_opt ::= */ + { 245, -2 }, /* (201) having_opt ::= HAVING expr */ + { 247, 0 }, /* (202) limit_opt ::= */ + { 247, -2 }, /* (203) limit_opt ::= LIMIT signed */ + { 247, -4 }, /* (204) limit_opt ::= LIMIT signed OFFSET signed */ + { 247, -4 }, /* (205) limit_opt ::= LIMIT signed COMMA signed */ + { 246, 0 }, /* (206) slimit_opt ::= */ + { 246, -2 }, /* (207) slimit_opt ::= SLIMIT signed */ + { 246, -4 }, /* (208) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 246, -4 }, /* (209) slimit_opt ::= SLIMIT signed COMMA signed */ + { 238, 0 }, /* (210) where_opt ::= */ + { 238, -2 }, /* (211) where_opt ::= WHERE expr */ + { 251, -3 }, /* (212) expr ::= LP expr RP */ + { 251, -1 }, /* (213) expr ::= ID */ + { 251, -3 }, /* (214) expr ::= ID DOT ID */ + { 251, -3 }, /* (215) expr ::= ID DOT STAR */ + { 251, -1 }, /* (216) expr ::= INTEGER */ + { 251, -2 }, /* (217) expr ::= MINUS INTEGER */ + { 251, -2 }, /* (218) expr ::= PLUS INTEGER */ + { 251, -1 }, /* (219) expr ::= FLOAT */ + { 251, -2 }, /* (220) expr ::= MINUS FLOAT */ + { 251, -2 }, /* (221) expr ::= PLUS FLOAT */ + { 251, -1 }, /* (222) expr ::= STRING */ + { 251, -1 }, /* (223) expr ::= NOW */ + { 251, -1 }, /* (224) expr ::= VARIABLE */ + { 251, -1 }, /* (225) expr ::= BOOL */ + { 251, -4 }, /* (226) expr ::= ID LP exprlist RP */ + { 251, -4 }, /* (227) expr ::= ID LP STAR RP */ + { 251, -3 }, /* (228) expr ::= expr IS NULL */ + { 251, -4 }, /* (229) expr ::= expr IS NOT NULL */ + { 251, -3 }, /* (230) expr ::= expr LT expr */ + { 251, -3 }, /* (231) expr ::= expr GT expr */ + { 251, -3 }, /* (232) expr ::= expr LE expr */ + { 251, -3 }, /* (233) expr ::= expr GE expr */ + { 251, -3 }, /* (234) expr ::= expr NE expr */ + { 251, -3 }, /* (235) expr ::= expr EQ expr */ + { 251, -5 }, /* (236) expr ::= expr BETWEEN expr AND expr */ + { 251, -3 }, /* (237) expr ::= expr AND expr */ + { 251, -3 }, /* (238) expr ::= expr OR expr */ + { 251, -3 }, /* (239) expr ::= expr PLUS expr */ + { 251, -3 }, /* (240) expr ::= expr MINUS expr */ + { 251, -3 }, /* (241) expr ::= expr STAR expr */ + { 251, -3 }, /* (242) expr ::= expr SLASH expr */ + { 251, -3 }, /* (243) expr ::= expr REM expr */ + { 251, -3 }, /* (244) expr ::= expr LIKE expr */ + { 251, -5 }, /* (245) expr ::= expr IN LP exprlist RP */ + { 260, -3 }, /* (246) exprlist ::= exprlist COMMA expritem */ + { 260, -1 }, /* (247) exprlist ::= expritem */ + { 261, -1 }, /* (248) expritem ::= expr */ + { 261, 0 }, /* (249) expritem ::= */ + { 188, -3 }, /* (250) cmd ::= RESET QUERY CACHE */ + { 188, -7 }, /* (251) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 188, -7 }, /* (252) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 188, -7 }, /* (253) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 188, -7 }, /* (254) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 188, -8 }, /* (255) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 188, -9 }, /* (256) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 188, -7 }, /* (257) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 188, -7 }, /* (258) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 188, -7 }, /* (259) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 188, -7 }, /* (260) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 188, -8 }, /* (261) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 188, -3 }, /* (262) cmd ::= KILL CONNECTION INTEGER */ + { 188, -5 }, /* (263) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 188, -5 }, /* (264) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2256,13 +2252,13 @@ static void yy_reduce( break; case 43: /* cmd ::= ALTER DATABASE ids alter_db_optr */ case 44: /* cmd ::= ALTER TOPIC ids alter_topic_optr */ yytestcase(yyruleno==44); -{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy526, &t);} +{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy94, &t);} break; case 45: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy187);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy419);} break; case 46: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy187);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy419);} break; case 47: /* ids ::= ID */ case 48: /* ids ::= STRING */ yytestcase(yyruleno==48); @@ -2284,11 +2280,11 @@ static void yy_reduce( { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} break; case 54: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy187);} +{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy419);} break; case 55: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ case 56: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==56); -{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy526, &yymsp[-2].minor.yy0);} +{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy94, &yymsp[-2].minor.yy0);} break; case 57: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} @@ -2317,20 +2313,20 @@ static void yy_reduce( break; case 76: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy187.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy187.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy187.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy187.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy187.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy187.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy187.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy187.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy187.stat = yymsp[0].minor.yy0; -} - yymsp[-8].minor.yy187 = yylhsminor.yy187; + yylhsminor.yy419.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy419.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy419.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy419.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy419.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy419.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy419.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy419.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy419.stat = yymsp[0].minor.yy0; +} + yymsp[-8].minor.yy419 = yylhsminor.yy419; break; case 77: /* keep ::= KEEP tagitemlist */ -{ yymsp[-1].minor.yy285 = yymsp[0].minor.yy285; } +{ yymsp[-1].minor.yy429 = yymsp[0].minor.yy429; } break; case 78: /* cache ::= CACHE INTEGER */ case 79: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==79); @@ -2350,234 +2346,234 @@ static void yy_reduce( { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 93: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy526); yymsp[1].minor.yy526.dbType = TSDB_DB_TYPE_DEFAULT;} +{setDefaultCreateDbOption(&yymsp[1].minor.yy94); yymsp[1].minor.yy94.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 94: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 95: /* db_optr ::= db_optr replica */ case 112: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==112); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 96: /* db_optr ::= db_optr quorum */ case 113: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==113); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 97: /* db_optr ::= db_optr days */ -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 98: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 99: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 100: /* db_optr ::= db_optr blocks */ case 115: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==115); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 101: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 102: /* db_optr ::= db_optr wal */ case 117: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==117); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 103: /* db_optr ::= db_optr fsync */ case 118: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==118); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 104: /* db_optr ::= db_optr comp */ case 116: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==116); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 105: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 106: /* db_optr ::= db_optr keep */ case 114: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==114); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.keep = yymsp[0].minor.yy285; } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.keep = yymsp[0].minor.yy429; } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 107: /* db_optr ::= db_optr update */ case 119: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==119); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 108: /* db_optr ::= db_optr cachelast */ case 120: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==120); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 109: /* topic_optr ::= db_optr */ case 121: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==121); -{ yylhsminor.yy526 = yymsp[0].minor.yy526; yylhsminor.yy526.dbType = TSDB_DB_TYPE_TOPIC; } - yymsp[0].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[0].minor.yy94; yylhsminor.yy94.dbType = TSDB_DB_TYPE_TOPIC; } + yymsp[0].minor.yy94 = yylhsminor.yy94; break; case 110: /* topic_optr ::= topic_optr partitions */ case 122: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==122); -{ yylhsminor.yy526 = yymsp[-1].minor.yy526; yylhsminor.yy526.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy526 = yylhsminor.yy526; +{ yylhsminor.yy94 = yymsp[-1].minor.yy94; yylhsminor.yy94.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy94 = yylhsminor.yy94; break; case 111: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy526); yymsp[1].minor.yy526.dbType = TSDB_DB_TYPE_DEFAULT;} +{ setDefaultCreateDbOption(&yymsp[1].minor.yy94); yymsp[1].minor.yy94.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 123: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yylhsminor.yy295, &yymsp[0].minor.yy0); + tSetColumnType (&yylhsminor.yy451, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy295 = yylhsminor.yy295; + yymsp[0].minor.yy451 = yylhsminor.yy451; break; case 124: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy525 <= 0) { + if (yymsp[-1].minor.yy481 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yylhsminor.yy295, &yymsp[-3].minor.yy0); + tSetColumnType(&yylhsminor.yy451, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy525; // negative value of name length - tSetColumnType(&yylhsminor.yy295, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy481; // negative value of name length + tSetColumnType(&yylhsminor.yy451, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy295 = yylhsminor.yy295; + yymsp[-3].minor.yy451 = yylhsminor.yy451; break; case 125: /* 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); - tSetColumnType (&yylhsminor.yy295, &yymsp[-1].minor.yy0); + tSetColumnType (&yylhsminor.yy451, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy295 = yylhsminor.yy295; + yymsp[-1].minor.yy451 = yylhsminor.yy451; break; case 126: /* signed ::= INTEGER */ -{ yylhsminor.yy525 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy525 = yylhsminor.yy525; +{ yylhsminor.yy481 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy481 = yylhsminor.yy481; break; case 127: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy525 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yymsp[-1].minor.yy481 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 128: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy525 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} +{ yymsp[-1].minor.yy481 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 132: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy470;} +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy194;} break; case 133: /* create_table_list ::= create_from_stable */ { SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy96); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy252); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy470 = pCreateTable; + yylhsminor.yy194 = pCreateTable; } - yymsp[0].minor.yy470 = yylhsminor.yy470; + yymsp[0].minor.yy194 = yylhsminor.yy194; break; case 134: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy470->childTableInfo, &yymsp[0].minor.yy96); - yylhsminor.yy470 = yymsp[-1].minor.yy470; + taosArrayPush(yymsp[-1].minor.yy194->childTableInfo, &yymsp[0].minor.yy252); + yylhsminor.yy194 = yymsp[-1].minor.yy194; } - yymsp[-1].minor.yy470 = yylhsminor.yy470; + yymsp[-1].minor.yy194 = yylhsminor.yy194; break; case 135: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy470 = tSetCreateTableInfo(yymsp[-1].minor.yy285, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy470, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy194 = tSetCreateTableInfo(yymsp[-1].minor.yy429, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy194, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0); } - yymsp[-5].minor.yy470 = yylhsminor.yy470; + yymsp[-5].minor.yy194 = yylhsminor.yy194; break; case 136: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy470 = tSetCreateTableInfo(yymsp[-5].minor.yy285, yymsp[-1].minor.yy285, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy470, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy194 = tSetCreateTableInfo(yymsp[-5].minor.yy429, yymsp[-1].minor.yy429, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy194, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy470 = yylhsminor.yy470; + yymsp[-9].minor.yy194 = yylhsminor.yy194; break; case 137: /* 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; - yylhsminor.yy96 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy285, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy252 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy429, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy96 = yylhsminor.yy96; + yymsp[-9].minor.yy252 = yylhsminor.yy252; break; case 138: /* 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; - yylhsminor.yy96 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy285, yymsp[-1].minor.yy285, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yylhsminor.yy252 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy429, yymsp[-1].minor.yy429, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy96 = yylhsminor.yy96; + yymsp[-12].minor.yy252 = yylhsminor.yy252; break; case 139: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy285, &yymsp[0].minor.yy0); yylhsminor.yy285 = yymsp[-2].minor.yy285; } - yymsp[-2].minor.yy285 = yylhsminor.yy285; +{taosArrayPush(yymsp[-2].minor.yy429, &yymsp[0].minor.yy0); yylhsminor.yy429 = yymsp[-2].minor.yy429; } + yymsp[-2].minor.yy429 = yylhsminor.yy429; break; case 140: /* tagNamelist ::= ids */ -{yylhsminor.yy285 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy285, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy285 = yylhsminor.yy285; +{yylhsminor.yy429 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy429, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy429 = yylhsminor.yy429; break; case 141: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy470 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy342, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy470, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy194 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy254, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy194, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0); } - yymsp[-4].minor.yy470 = yylhsminor.yy470; + yymsp[-4].minor.yy194 = yylhsminor.yy194; break; case 142: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy285, &yymsp[0].minor.yy295); yylhsminor.yy285 = yymsp[-2].minor.yy285; } - yymsp[-2].minor.yy285 = yylhsminor.yy285; +{taosArrayPush(yymsp[-2].minor.yy429, &yymsp[0].minor.yy451); yylhsminor.yy429 = yymsp[-2].minor.yy429; } + yymsp[-2].minor.yy429 = yylhsminor.yy429; break; case 143: /* columnlist ::= column */ -{yylhsminor.yy285 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy285, &yymsp[0].minor.yy295);} - yymsp[0].minor.yy285 = yylhsminor.yy285; +{yylhsminor.yy429 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy429, &yymsp[0].minor.yy451);} + yymsp[0].minor.yy429 = yylhsminor.yy429; break; case 144: /* column ::= ids typename */ { - tSetColumnInfo(&yylhsminor.yy295, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy295); + tSetColumnInfo(&yylhsminor.yy451, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy451); } - yymsp[-1].minor.yy295 = yylhsminor.yy295; + yymsp[-1].minor.yy451 = yylhsminor.yy451; break; case 145: /* tagitemlist ::= tagitemlist COMMA tagitem */ -{ yylhsminor.yy285 = tVariantListAppend(yymsp[-2].minor.yy285, &yymsp[0].minor.yy362, -1); } - yymsp[-2].minor.yy285 = yylhsminor.yy285; +{ yylhsminor.yy429 = tVariantListAppend(yymsp[-2].minor.yy429, &yymsp[0].minor.yy218, -1); } + yymsp[-2].minor.yy429 = yylhsminor.yy429; break; case 146: /* tagitemlist ::= tagitem */ -{ yylhsminor.yy285 = tVariantListAppend(NULL, &yymsp[0].minor.yy362, -1); } - yymsp[0].minor.yy285 = yylhsminor.yy285; +{ yylhsminor.yy429 = tVariantListAppend(NULL, &yymsp[0].minor.yy218, -1); } + yymsp[0].minor.yy429 = yylhsminor.yy429; break; case 147: /* tagitem ::= INTEGER */ case 148: /* tagitem ::= FLOAT */ yytestcase(yyruleno==148); case 149: /* tagitem ::= STRING */ yytestcase(yyruleno==149); case 150: /* tagitem ::= BOOL */ yytestcase(yyruleno==150); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy362, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy362 = yylhsminor.yy362; +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy218, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy218 = yylhsminor.yy218; break; case 151: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy362, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy362 = yylhsminor.yy362; +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy218, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy218 = yylhsminor.yy218; break; case 152: /* tagitem ::= MINUS INTEGER */ case 153: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==153); @@ -2587,56 +2583,56 @@ static void yy_reduce( yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; toTSDBType(yymsp[-1].minor.yy0.type); - tVariantCreate(&yylhsminor.yy362, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy218, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy362 = yylhsminor.yy362; + yymsp[-1].minor.yy218 = yylhsminor.yy218; break; case 156: /* select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy342 = tSetQuerySqlNode(&yymsp[-12].minor.yy0, yymsp[-11].minor.yy285, yymsp[-10].minor.yy162, yymsp[-9].minor.yy178, yymsp[-4].minor.yy285, yymsp[-3].minor.yy285, &yymsp[-8].minor.yy376, &yymsp[-7].minor.yy523, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy285, &yymsp[0].minor.yy438, &yymsp[-1].minor.yy438); + yylhsminor.yy254 = tSetQuerySqlNode(&yymsp[-12].minor.yy0, yymsp[-11].minor.yy429, yymsp[-10].minor.yy70, yymsp[-9].minor.yy170, yymsp[-4].minor.yy429, yymsp[-3].minor.yy429, &yymsp[-8].minor.yy220, &yymsp[-7].minor.yy87, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy429, &yymsp[0].minor.yy18, &yymsp[-1].minor.yy18); } - yymsp[-12].minor.yy342 = yylhsminor.yy342; + yymsp[-12].minor.yy254 = yylhsminor.yy254; break; case 157: /* select ::= LP select RP */ -{yymsp[-2].minor.yy342 = yymsp[-1].minor.yy342;} +{yymsp[-2].minor.yy254 = yymsp[-1].minor.yy254;} break; case 158: /* union ::= select */ -{ yylhsminor.yy513 = setSubclause(NULL, yymsp[0].minor.yy342); } - yymsp[0].minor.yy513 = yylhsminor.yy513; +{ yylhsminor.yy141 = setSubclause(NULL, yymsp[0].minor.yy254); } + yymsp[0].minor.yy141 = yylhsminor.yy141; break; case 159: /* union ::= union UNION ALL select */ -{ yylhsminor.yy513 = appendSelectClause(yymsp[-3].minor.yy513, yymsp[0].minor.yy342); } - yymsp[-3].minor.yy513 = yylhsminor.yy513; +{ yylhsminor.yy141 = appendSelectClause(yymsp[-3].minor.yy141, yymsp[0].minor.yy254); } + yymsp[-3].minor.yy141 = yylhsminor.yy141; break; case 160: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy513, NULL, TSDB_SQL_SELECT); } +{ setSqlInfo(pInfo, yymsp[0].minor.yy141, NULL, TSDB_SQL_SELECT); } break; case 161: /* select ::= SELECT selcollist */ { - yylhsminor.yy342 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy285, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy254 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy429, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy342 = yylhsminor.yy342; + yymsp[-1].minor.yy254 = yylhsminor.yy254; break; case 162: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy285 = yymsp[-1].minor.yy285;} - yymsp[-1].minor.yy285 = yylhsminor.yy285; +{yylhsminor.yy429 = yymsp[-1].minor.yy429;} + yymsp[-1].minor.yy429 = yylhsminor.yy429; break; case 163: /* sclp ::= */ case 188: /* orderby_opt ::= */ yytestcase(yyruleno==188); -{yymsp[1].minor.yy285 = 0;} +{yymsp[1].minor.yy429 = 0;} break; case 164: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy285 = tSqlExprListAppend(yymsp[-3].minor.yy285, yymsp[-1].minor.yy178, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy429 = tSqlExprListAppend(yymsp[-3].minor.yy429, yymsp[-1].minor.yy170, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy285 = yylhsminor.yy285; + yymsp[-3].minor.yy429 = yylhsminor.yy429; break; case 165: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yylhsminor.yy285 = tSqlExprListAppend(yymsp[-1].minor.yy285, pNode, 0, 0); + yylhsminor.yy429 = tSqlExprListAppend(yymsp[-1].minor.yy429, pNode, 0, 0); } - yymsp[-1].minor.yy285 = yylhsminor.yy285; + yymsp[-1].minor.yy429 = yylhsminor.yy429; break; case 166: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } @@ -2653,35 +2649,35 @@ static void yy_reduce( yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 171: /* from ::= FROM tablelist */ -{yymsp[-1].minor.yy162 = yymsp[0].minor.yy285;} +{yymsp[-1].minor.yy70 = yymsp[0].minor.yy429;} break; case 172: /* from ::= FROM LP union RP */ -{yymsp[-3].minor.yy162 = yymsp[-1].minor.yy513;} +{yymsp[-3].minor.yy70 = yymsp[-1].minor.yy141;} break; case 173: /* tablelist ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy285 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy429 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } - yymsp[-1].minor.yy285 = yylhsminor.yy285; + yymsp[-1].minor.yy429 = yylhsminor.yy429; break; case 174: /* tablelist ::= ids cpxName ids */ { toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type); yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy285 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy429 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy285 = yylhsminor.yy285; + yymsp[-2].minor.yy429 = yylhsminor.yy429; break; case 175: /* tablelist ::= tablelist COMMA ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy285 = setTableNameList(yymsp[-3].minor.yy285, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy429 = setTableNameList(yymsp[-3].minor.yy429, &yymsp[-1].minor.yy0, NULL); } - yymsp[-3].minor.yy285 = yylhsminor.yy285; + yymsp[-3].minor.yy429 = yylhsminor.yy429; break; case 176: /* tablelist ::= tablelist COMMA ids cpxName ids */ { @@ -2689,35 +2685,35 @@ static void yy_reduce( toTSDBType(yymsp[0].minor.yy0.type); yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy285 = setTableNameList(yymsp[-4].minor.yy285, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy429 = setTableNameList(yymsp[-4].minor.yy429, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-4].minor.yy285 = yylhsminor.yy285; + yymsp[-4].minor.yy429 = yylhsminor.yy429; break; case 177: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 178: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy376.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy376.offset.n = 0;} +{yymsp[-3].minor.yy220.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy220.offset.n = 0;} break; case 179: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy376.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy376.offset = yymsp[-1].minor.yy0;} +{yymsp[-5].minor.yy220.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy220.offset = yymsp[-1].minor.yy0;} break; case 180: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy376, 0, sizeof(yymsp[1].minor.yy376));} +{memset(&yymsp[1].minor.yy220, 0, sizeof(yymsp[1].minor.yy220));} break; case 181: /* session_option ::= */ -{yymsp[1].minor.yy523.col.n = 0; yymsp[1].minor.yy523.gap.n = 0;} +{yymsp[1].minor.yy87.col.n = 0; yymsp[1].minor.yy87.gap.n = 0;} break; case 182: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yymsp[-6].minor.yy523.col = yymsp[-4].minor.yy0; - yymsp[-6].minor.yy523.gap = yymsp[-1].minor.yy0; + yymsp[-6].minor.yy87.col = yymsp[-4].minor.yy0; + yymsp[-6].minor.yy87.gap = yymsp[-1].minor.yy0; } break; case 183: /* fill_opt ::= */ -{ yymsp[1].minor.yy285 = 0; } +{ yymsp[1].minor.yy429 = 0; } break; case 184: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { @@ -2725,14 +2721,14 @@ static void yy_reduce( toTSDBType(yymsp[-3].minor.yy0.type); tVariantCreate(&A, &yymsp[-3].minor.yy0); - tVariantListInsert(yymsp[-1].minor.yy285, &A, -1, 0); - yymsp[-5].minor.yy285 = yymsp[-1].minor.yy285; + tVariantListInsert(yymsp[-1].minor.yy429, &A, -1, 0); + yymsp[-5].minor.yy429 = yymsp[-1].minor.yy429; } break; case 185: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy285 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy429 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; case 186: /* sliding_opt ::= SLIDING LP tmvar RP */ @@ -2742,226 +2738,226 @@ static void yy_reduce( {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; case 189: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy285 = yymsp[0].minor.yy285;} +{yymsp[-2].minor.yy429 = yymsp[0].minor.yy429;} break; case 190: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy285 = tVariantListAppend(yymsp[-3].minor.yy285, &yymsp[-1].minor.yy362, yymsp[0].minor.yy460); + yylhsminor.yy429 = tVariantListAppend(yymsp[-3].minor.yy429, &yymsp[-1].minor.yy218, yymsp[0].minor.yy116); } - yymsp[-3].minor.yy285 = yylhsminor.yy285; + yymsp[-3].minor.yy429 = yylhsminor.yy429; break; case 191: /* sortlist ::= item sortorder */ { - yylhsminor.yy285 = tVariantListAppend(NULL, &yymsp[-1].minor.yy362, yymsp[0].minor.yy460); + yylhsminor.yy429 = tVariantListAppend(NULL, &yymsp[-1].minor.yy218, yymsp[0].minor.yy116); } - yymsp[-1].minor.yy285 = yylhsminor.yy285; + yymsp[-1].minor.yy429 = yylhsminor.yy429; break; case 192: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy362, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy218, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy362 = yylhsminor.yy362; + yymsp[-1].minor.yy218 = yylhsminor.yy218; break; case 193: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy460 = TSDB_ORDER_ASC; } +{ yymsp[0].minor.yy116 = TSDB_ORDER_ASC; } break; case 194: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy460 = TSDB_ORDER_DESC;} +{ yymsp[0].minor.yy116 = TSDB_ORDER_DESC;} break; case 195: /* sortorder ::= */ -{ yymsp[1].minor.yy460 = TSDB_ORDER_ASC; } +{ yymsp[1].minor.yy116 = TSDB_ORDER_ASC; } break; case 196: /* groupby_opt ::= */ -{ yymsp[1].minor.yy285 = 0;} +{ yymsp[1].minor.yy429 = 0;} break; case 197: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy285 = yymsp[0].minor.yy285;} +{ yymsp[-2].minor.yy429 = yymsp[0].minor.yy429;} break; case 198: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy285 = tVariantListAppend(yymsp[-2].minor.yy285, &yymsp[0].minor.yy362, -1); + yylhsminor.yy429 = tVariantListAppend(yymsp[-2].minor.yy429, &yymsp[0].minor.yy218, -1); } - yymsp[-2].minor.yy285 = yylhsminor.yy285; + yymsp[-2].minor.yy429 = yylhsminor.yy429; break; case 199: /* grouplist ::= item */ { - yylhsminor.yy285 = tVariantListAppend(NULL, &yymsp[0].minor.yy362, -1); + yylhsminor.yy429 = tVariantListAppend(NULL, &yymsp[0].minor.yy218, -1); } - yymsp[0].minor.yy285 = yylhsminor.yy285; + yymsp[0].minor.yy429 = yylhsminor.yy429; break; case 200: /* having_opt ::= */ case 210: /* where_opt ::= */ yytestcase(yyruleno==210); case 249: /* expritem ::= */ yytestcase(yyruleno==249); -{yymsp[1].minor.yy178 = 0;} +{yymsp[1].minor.yy170 = 0;} break; case 201: /* having_opt ::= HAVING expr */ case 211: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==211); -{yymsp[-1].minor.yy178 = yymsp[0].minor.yy178;} +{yymsp[-1].minor.yy170 = yymsp[0].minor.yy170;} break; case 202: /* limit_opt ::= */ case 206: /* slimit_opt ::= */ yytestcase(yyruleno==206); -{yymsp[1].minor.yy438.limit = -1; yymsp[1].minor.yy438.offset = 0;} +{yymsp[1].minor.yy18.limit = -1; yymsp[1].minor.yy18.offset = 0;} break; case 203: /* limit_opt ::= LIMIT signed */ case 207: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==207); -{yymsp[-1].minor.yy438.limit = yymsp[0].minor.yy525; yymsp[-1].minor.yy438.offset = 0;} +{yymsp[-1].minor.yy18.limit = yymsp[0].minor.yy481; yymsp[-1].minor.yy18.offset = 0;} break; case 204: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy438.limit = yymsp[-2].minor.yy525; yymsp[-3].minor.yy438.offset = yymsp[0].minor.yy525;} +{ yymsp[-3].minor.yy18.limit = yymsp[-2].minor.yy481; yymsp[-3].minor.yy18.offset = yymsp[0].minor.yy481;} break; case 205: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy438.limit = yymsp[0].minor.yy525; yymsp[-3].minor.yy438.offset = yymsp[-2].minor.yy525;} +{ yymsp[-3].minor.yy18.limit = yymsp[0].minor.yy481; yymsp[-3].minor.yy18.offset = yymsp[-2].minor.yy481;} break; case 208: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy438.limit = yymsp[-2].minor.yy525; yymsp[-3].minor.yy438.offset = yymsp[0].minor.yy525;} +{yymsp[-3].minor.yy18.limit = yymsp[-2].minor.yy481; yymsp[-3].minor.yy18.offset = yymsp[0].minor.yy481;} break; case 209: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy438.limit = yymsp[0].minor.yy525; yymsp[-3].minor.yy438.offset = yymsp[-2].minor.yy525;} +{yymsp[-3].minor.yy18.limit = yymsp[0].minor.yy481; yymsp[-3].minor.yy18.offset = yymsp[-2].minor.yy481;} break; case 212: /* expr ::= LP expr RP */ -{yylhsminor.yy178 = yymsp[-1].minor.yy178; yylhsminor.yy178->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy178->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = yymsp[-1].minor.yy170; yylhsminor.yy170->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy170->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 213: /* expr ::= ID */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 214: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 215: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 216: /* expr ::= INTEGER */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 217: /* expr ::= MINUS INTEGER */ case 218: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==218); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy178 = yylhsminor.yy178; +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy170 = yylhsminor.yy170; break; case 219: /* expr ::= FLOAT */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 220: /* expr ::= MINUS FLOAT */ case 221: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==221); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy178 = yylhsminor.yy178; +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy170 = yylhsminor.yy170; break; case 222: /* expr ::= STRING */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 223: /* expr ::= NOW */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 224: /* expr ::= VARIABLE */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 225: /* expr ::= BOOL */ -{ yylhsminor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 226: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy178 = tSqlExprCreateFunction(yymsp[-1].minor.yy285, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateFunction(yymsp[-1].minor.yy429, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy170 = yylhsminor.yy170; break; case 227: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy178 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy178 = yylhsminor.yy178; +{ yylhsminor.yy170 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy170 = yylhsminor.yy170; break; case 228: /* expr ::= expr IS NULL */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, NULL, TK_ISNULL);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, NULL, TK_ISNULL);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 229: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-3].minor.yy178, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-3].minor.yy170, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy170 = yylhsminor.yy170; break; case 230: /* expr ::= expr LT expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_LT);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_LT);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 231: /* expr ::= expr GT expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_GT);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_GT);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 232: /* expr ::= expr LE expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_LE);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_LE);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 233: /* expr ::= expr GE expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_GE);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_GE);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 234: /* expr ::= expr NE expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_NE);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_NE);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 235: /* expr ::= expr EQ expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_EQ);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_EQ);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 236: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy178); yylhsminor.yy178 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy178, yymsp[-2].minor.yy178, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy178, TK_LE), TK_AND);} - yymsp[-4].minor.yy178 = yylhsminor.yy178; +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy170); yylhsminor.yy170 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy170, yymsp[-2].minor.yy170, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy170, TK_LE), TK_AND);} + yymsp[-4].minor.yy170 = yylhsminor.yy170; break; case 237: /* expr ::= expr AND expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_AND);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_AND);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 238: /* expr ::= expr OR expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_OR); } - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_OR); } + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 239: /* expr ::= expr PLUS expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_PLUS); } - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_PLUS); } + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 240: /* expr ::= expr MINUS expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_MINUS); } - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_MINUS); } + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 241: /* expr ::= expr STAR expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_STAR); } - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_STAR); } + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 242: /* expr ::= expr SLASH expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_DIVIDE);} - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_DIVIDE);} + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 243: /* expr ::= expr REM expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_REM); } - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_REM); } + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 244: /* expr ::= expr LIKE expr */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_LIKE); } - yymsp[-2].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-2].minor.yy170, yymsp[0].minor.yy170, TK_LIKE); } + yymsp[-2].minor.yy170 = yylhsminor.yy170; break; case 245: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy178 = tSqlExprCreate(yymsp[-4].minor.yy178, (tSqlExpr*)yymsp[-1].minor.yy285, TK_IN); } - yymsp[-4].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = tSqlExprCreate(yymsp[-4].minor.yy170, (tSqlExpr*)yymsp[-1].minor.yy429, TK_IN); } + yymsp[-4].minor.yy170 = yylhsminor.yy170; break; case 246: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy285 = tSqlExprListAppend(yymsp[-2].minor.yy285,yymsp[0].minor.yy178,0, 0);} - yymsp[-2].minor.yy285 = yylhsminor.yy285; +{yylhsminor.yy429 = tSqlExprListAppend(yymsp[-2].minor.yy429,yymsp[0].minor.yy170,0, 0);} + yymsp[-2].minor.yy429 = yylhsminor.yy429; break; case 247: /* exprlist ::= expritem */ -{yylhsminor.yy285 = tSqlExprListAppend(0,yymsp[0].minor.yy178,0, 0);} - yymsp[0].minor.yy285 = yylhsminor.yy285; +{yylhsminor.yy429 = tSqlExprListAppend(0,yymsp[0].minor.yy170,0, 0);} + yymsp[0].minor.yy429 = yylhsminor.yy429; break; case 248: /* expritem ::= expr */ -{yylhsminor.yy178 = yymsp[0].minor.yy178;} - yymsp[0].minor.yy178 = yylhsminor.yy178; +{yylhsminor.yy170 = yymsp[0].minor.yy170;} + yymsp[0].minor.yy170 = yylhsminor.yy170; break; case 250: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} @@ -2969,7 +2965,7 @@ static void yy_reduce( case 251: /* 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.yy285, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy429, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; @@ -2987,7 +2983,7 @@ static void yy_reduce( case 253: /* 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.yy285, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy429, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; @@ -3022,7 +3018,7 @@ static void yy_reduce( toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tVariantListAppend(A, &yymsp[0].minor.yy362, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy218, -1); SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); @@ -3031,7 +3027,7 @@ static void yy_reduce( case 257: /* 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.yy285, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy429, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; @@ -3049,7 +3045,7 @@ static void yy_reduce( case 259: /* 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.yy285, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy429, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index 830b72f93f..ae1629dce9 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -126,8 +126,7 @@ $tb_ = table $tbs = tables $db_ = database $dbs = databases -$mt_ = metric -$mts = metrics +$ses = session $int = int $bint = bigint $binary = binary @@ -145,8 +144,7 @@ sql_error create table $mt (ts timestamp, col1 int) tags ( $tb_ int) sql_error create table $mt (ts timestamp, col1 int) tags ( $tbs int) sql_error create table $mt (ts timestamp, col1 int) tags ( $db_ int) sql_error create table $mt (ts timestamp, col1 int) tags ( $dbs int) -sql_error create table $mt (ts timestamp, col1 int) tags ( $mt_ int) -sql_error create table $mt (ts timestamp, col1 int) tags ( $mts int) +sql_error create table $mt (ts timestamp, col1 int) tags ( $ses int) sql_error create table $mt (ts timestamp, col1 int) tags ( $int int) sql_error create table $mt (ts timestamp, col1 int) tags ( $bint int) sql_error create table $mt (ts timestamp, col1 int) tags ( $binary int) diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim index d30a1392ef..eb6e4f71c3 100644 --- a/tests/script/general/parser/create_tb.sim +++ b/tests/script/general/parser/create_tb.sim @@ -90,8 +90,7 @@ $tb_ = table $tbs = tables $db_ = database $dbs = databases -$mt_ = metric -$mts = metrics +$ses = session $int = int $bint = bigint $binary = binary @@ -105,9 +104,8 @@ $nchar = nchar sql_error create table $tb (ts timestamp, $tb_ int) sql_error create table $tb (ts timestamp, $tbs int) sql_error create table $tb (ts timestamp, $db_ int) -sql_error create table $tb (ts timestamp, $dbs int) -sql_error create table $tb (ts timestamp, $mt_ int) -sql_error create table $tb (ts timestamp, $mts int) +sql_error create table $tb (ts timestamp, $dbs int) +sql_error create table $tb (ts timestamp, $ses int) sql_error create table $tb (ts timestamp, $int int) sql_error create table $tb (ts timestamp, $bint int) sql_error create table $tb (ts timestamp, $binary int) -- GitLab