From c47646d2b077baa7e5ac86037ed471a5bdb7ba70 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Mon, 15 Mar 2021 13:53:16 +0800 Subject: [PATCH] support outputtype --- src/inc/ttokendef.h | 264 ++--- src/query/inc/qSqlparser.h | 1 + src/query/inc/sql.y | 2 +- src/query/src/qParserImpl.c | 3 +- src/query/src/qTokenizer.c | 3 +- src/query/src/sql.c | 2031 ++++++++++++++++++----------------- 6 files changed, 1156 insertions(+), 1148 deletions(-) diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index 1aa386b69d..3130894b30 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -100,137 +100,139 @@ #define TK_IF 81 #define TK_EXISTS 82 #define TK_AS 83 -#define TK_PPS 84 -#define TK_TSERIES 85 -#define TK_DBS 86 -#define TK_STORAGE 87 -#define TK_QTIME 88 -#define TK_CONNS 89 -#define TK_STATE 90 -#define TK_KEEP 91 -#define TK_CACHE 92 -#define TK_REPLICA 93 -#define TK_QUORUM 94 -#define TK_DAYS 95 -#define TK_MINROWS 96 -#define TK_MAXROWS 97 -#define TK_BLOCKS 98 -#define TK_CTIME 99 -#define TK_WAL 100 -#define TK_FSYNC 101 -#define TK_COMP 102 -#define TK_PRECISION 103 -#define TK_UPDATE 104 -#define TK_CACHELAST 105 -#define TK_PARTITIONS 106 -#define TK_LP 107 -#define TK_RP 108 -#define TK_UNSIGNED 109 -#define TK_TAGS 110 -#define TK_USING 111 -#define TK_COMMA 112 -#define TK_NULL 113 -#define TK_SELECT 114 -#define TK_UNION 115 -#define TK_ALL 116 -#define TK_DISTINCT 117 -#define TK_FROM 118 -#define TK_VARIABLE 119 -#define TK_INTERVAL 120 -#define TK_FILL 121 -#define TK_SLIDING 122 -#define TK_ORDER 123 -#define TK_BY 124 -#define TK_ASC 125 -#define TK_DESC 126 -#define TK_GROUP 127 -#define TK_HAVING 128 -#define TK_LIMIT 129 -#define TK_OFFSET 130 -#define TK_SLIMIT 131 -#define TK_SOFFSET 132 -#define TK_WHERE 133 -#define TK_NOW 134 -#define TK_RESET 135 -#define TK_QUERY 136 -#define TK_ADD 137 -#define TK_COLUMN 138 -#define TK_TAG 139 -#define TK_CHANGE 140 -#define TK_SET 141 -#define TK_KILL 142 -#define TK_CONNECTION 143 -#define TK_STREAM 144 -#define TK_COLON 145 -#define TK_ABORT 146 -#define TK_AFTER 147 -#define TK_ATTACH 148 -#define TK_BEFORE 149 -#define TK_BEGIN 150 -#define TK_CASCADE 151 -#define TK_CLUSTER 152 -#define TK_CONFLICT 153 -#define TK_COPY 154 -#define TK_DEFERRED 155 -#define TK_DELIMITERS 156 -#define TK_DETACH 157 -#define TK_EACH 158 -#define TK_END 159 -#define TK_EXPLAIN 160 -#define TK_FAIL 161 -#define TK_FOR 162 -#define TK_IGNORE 163 -#define TK_IMMEDIATE 164 -#define TK_INITIALLY 165 -#define TK_INSTEAD 166 -#define TK_MATCH 167 -#define TK_KEY 168 -#define TK_OF 169 -#define TK_RAISE 170 -#define TK_REPLACE 171 -#define TK_RESTRICT 172 -#define TK_ROW 173 -#define TK_STATEMENT 174 -#define TK_TRIGGER 175 -#define TK_VIEW 176 -#define TK_COUNT 177 -#define TK_SUM 178 -#define TK_AVG 179 -#define TK_MIN 180 -#define TK_MAX 181 -#define TK_FIRST 182 -#define TK_LAST 183 -#define TK_TOP 184 -#define TK_BOTTOM 185 -#define TK_STDDEV 186 -#define TK_PERCENTILE 187 -#define TK_APERCENTILE 188 -#define TK_LEASTSQUARES 189 -#define TK_HISTOGRAM 190 -#define TK_DIFF 191 -#define TK_SPREAD 192 -#define TK_TWA 193 -#define TK_INTERP 194 -#define TK_LAST_ROW 195 -#define TK_RATE 196 -#define TK_IRATE 197 -#define TK_SUM_RATE 198 -#define TK_SUM_IRATE 199 -#define TK_AVG_RATE 200 -#define TK_AVG_IRATE 201 -#define TK_TBID 202 -#define TK_SEMI 203 -#define TK_NONE 204 -#define TK_PREV 205 -#define TK_LINEAR 206 -#define TK_IMPORT 207 -#define TK_METRIC 208 -#define TK_TBNAME 209 -#define TK_JOIN 210 -#define TK_METRICS 211 -#define TK_INSERT 212 -#define TK_INTO 213 -#define TK_VALUES 214 +#define TK_OUTPUTTYPE 84 +#define TK_PPS 85 +#define TK_TSERIES 86 +#define TK_DBS 87 +#define TK_STORAGE 88 +#define TK_QTIME 89 +#define TK_CONNS 90 +#define TK_STATE 91 +#define TK_KEEP 92 +#define TK_CACHE 93 +#define TK_REPLICA 94 +#define TK_QUORUM 95 +#define TK_DAYS 96 +#define TK_MINROWS 97 +#define TK_MAXROWS 98 +#define TK_BLOCKS 99 +#define TK_CTIME 100 +#define TK_WAL 101 +#define TK_FSYNC 102 +#define TK_COMP 103 +#define TK_PRECISION 104 +#define TK_UPDATE 105 +#define TK_CACHELAST 106 +#define TK_PARTITIONS 107 +#define TK_LP 108 +#define TK_RP 109 +#define TK_UNSIGNED 110 +#define TK_TAGS 111 +#define TK_USING 112 +#define TK_COMMA 113 +#define TK_NULL 114 +#define TK_SELECT 115 +#define TK_UNION 116 +#define TK_ALL 117 +#define TK_DISTINCT 118 +#define TK_FROM 119 +#define TK_VARIABLE 120 +#define TK_INTERVAL 121 +#define TK_FILL 122 +#define TK_SLIDING 123 +#define TK_ORDER 124 +#define TK_BY 125 +#define TK_ASC 126 +#define TK_DESC 127 +#define TK_GROUP 128 +#define TK_HAVING 129 +#define TK_LIMIT 130 +#define TK_OFFSET 131 +#define TK_SLIMIT 132 +#define TK_SOFFSET 133 +#define TK_WHERE 134 +#define TK_NOW 135 +#define TK_RESET 136 +#define TK_QUERY 137 +#define TK_ADD 138 +#define TK_COLUMN 139 +#define TK_TAG 140 +#define TK_CHANGE 141 +#define TK_SET 142 +#define TK_KILL 143 +#define TK_CONNECTION 144 +#define TK_STREAM 145 +#define TK_COLON 146 +#define TK_ABORT 147 +#define TK_AFTER 148 +#define TK_ATTACH 149 +#define TK_BEFORE 150 +#define TK_BEGIN 151 +#define TK_CASCADE 152 +#define TK_CLUSTER 153 +#define TK_CONFLICT 154 +#define TK_COPY 155 +#define TK_DEFERRED 156 +#define TK_DELIMITERS 157 +#define TK_DETACH 158 +#define TK_EACH 159 +#define TK_END 160 +#define TK_EXPLAIN 161 +#define TK_FAIL 162 +#define TK_FOR 163 +#define TK_IGNORE 164 +#define TK_IMMEDIATE 165 +#define TK_INITIALLY 166 +#define TK_INSTEAD 167 +#define TK_MATCH 168 +#define TK_KEY 169 +#define TK_OF 170 +#define TK_RAISE 171 +#define TK_REPLACE 172 +#define TK_RESTRICT 173 +#define TK_ROW 174 +#define TK_STATEMENT 175 +#define TK_TRIGGER 176 +#define TK_VIEW 177 +#define TK_COUNT 178 +#define TK_SUM 179 +#define TK_AVG 180 +#define TK_MIN 181 +#define TK_MAX 182 +#define TK_FIRST 183 +#define TK_LAST 184 +#define TK_TOP 185 +#define TK_BOTTOM 186 +#define TK_STDDEV 187 +#define TK_PERCENTILE 188 +#define TK_APERCENTILE 189 +#define TK_LEASTSQUARES 190 +#define TK_HISTOGRAM 191 +#define TK_DIFF 192 +#define TK_SPREAD 193 +#define TK_TWA 194 +#define TK_INTERP 195 +#define TK_LAST_ROW 196 +#define TK_RATE 197 +#define TK_IRATE 198 +#define TK_SUM_RATE 199 +#define TK_SUM_IRATE 200 +#define TK_AVG_RATE 201 +#define TK_AVG_IRATE 202 +#define TK_TBID 203 +#define TK_SEMI 204 +#define TK_NONE 205 +#define TK_PREV 206 +#define TK_LINEAR 207 +#define TK_IMPORT 208 +#define TK_METRIC 209 +#define TK_TBNAME 210 +#define TK_JOIN 211 +#define TK_METRICS 212 +#define TK_INSERT 213 +#define TK_INTO 214 +#define TK_VALUES 215 + diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h index 54b8730257..30c6a36177 100644 --- a/src/query/inc/qSqlparser.h +++ b/src/query/inc/qSqlparser.h @@ -132,6 +132,7 @@ typedef struct SCreateDbInfo { typedef struct SCreateFuncInfo { SStrToken name; SStrToken path; + TAOS_FIELD output; } SCreateFuncInfo; diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index 2cd904d625..cb0c94708e 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -194,7 +194,7 @@ cmd ::= CREATE ACCOUNT ids(X) PASS ids(Y) acct_optr(Z). { setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &X, &Y, &Z);} cmd ::= CREATE DATABASE ifnotexists(Z) ids(X) db_optr(Y). { setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);} cmd ::= CREATE TOPIC ifnotexists(Z) ids(X) topic_optr(Y). { setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);} -cmd ::= CREATE FUNCTION ids(X) AS ids(Y). { setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &X, &Y);} +cmd ::= CREATE FUNCTION ids(X) AS ids(Y) OUTPUTTYPE typename(Z). { setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &X, &Y, &Z);} cmd ::= CREATE USER ids(X) PASS ids(Y). { setCreateUserSql(pInfo, &X, &Y);} pps(Y) ::= . { Y.n = 0; } diff --git a/src/query/src/qParserImpl.c b/src/query/src/qParserImpl.c index 00d47a5732..bd6af3a2eb 100644 --- a/src/query/src/qParserImpl.c +++ b/src/query/src/qParserImpl.c @@ -866,7 +866,7 @@ void setCreateDbInfo(SSqlInfo *pInfo, int32_t type, SStrToken *pToken, SCreateDb pInfo->pMiscInfo->dbOpt.ignoreExists = pIgExists->n; // sql.y has: ifnotexists(X) ::= IF NOT EXISTS. {X.n = 1;} } -void setCreateFuncInfo(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPath) { +void setCreateFuncInfo(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken *pPath, TAOS_FIELD *output) { pInfo->type = type; if (pInfo->pMiscInfo == NULL) { pInfo->pMiscInfo = calloc(1, sizeof(SMiscInfo)); @@ -874,6 +874,7 @@ void setCreateFuncInfo(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToke pInfo->pMiscInfo->funcOpt.name = *pName; pInfo->pMiscInfo->funcOpt.path = *pPath; + pInfo->pMiscInfo->funcOpt.output = *output; } diff --git a/src/query/src/qTokenizer.c b/src/query/src/qTokenizer.c index 3cca9c208d..62f5606609 100644 --- a/src/query/src/qTokenizer.c +++ b/src/query/src/qTokenizer.c @@ -245,7 +245,8 @@ static SKeyword keywordTable[] = { {"TOPIC", TK_TOPIC}, {"TOPICS", TK_TOPICS}, {"FUNCTION", TK_FUNCTION}, - {"FUNCTIONS", TK_FUNCTIONS} + {"FUNCTIONS", TK_FUNCTIONS}, + {"OUTPUTTYPE", TK_OUTPUTTYPE} }; static const char isIdChar[] = { diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 1999156899..019ddcc401 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -100,27 +100,27 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 289 +#define YYNOCODE 290 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SStrToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SCreatedTableInfo yy34; - tVariant yy54; - int64_t yy55; - SIntervalVal yy102; - SCreateTableSQL* yy144; - SCreateAcctInfo yy205; - SArray* yy209; - tSQLExprList* yy246; - tSQLExpr* yy254; - int yy332; - TAOS_FIELD yy369; - SSubclauseInfo* yy437; - SLimitVal yy534; - SQuerySQL* yy540; - SCreateDbInfo yy560; + tSQLExpr* yy70; + SArray* yy161; + TAOS_FIELD yy223; + SCreateAcctInfo yy231; + SSubclauseInfo* yy233; + SIntervalVal yy300; + SCreateDbInfo yy302; + SCreatedTableInfo yy356; + int64_t yy369; + SLimitVal yy394; + int yy452; + tSQLExprList* yy458; + SCreateTableSQL* yy518; + tVariant yy526; + SQuerySQL* yy544; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -136,18 +136,18 @@ typedef union { #define ParseCTX_FETCH #define ParseCTX_STORE #define YYFALLBACK 1 -#define YYNSTATE 310 +#define YYNSTATE 312 #define YYNRULE 266 #define YYNRULE_WITH_ACTION 266 -#define YYNTOKEN 215 -#define YY_MAX_SHIFT 309 -#define YY_MIN_SHIFTREDUCE 501 -#define YY_MAX_SHIFTREDUCE 766 -#define YY_ERROR_ACTION 767 -#define YY_ACCEPT_ACTION 768 -#define YY_NO_ACTION 769 -#define YY_MIN_REDUCE 770 -#define YY_MAX_REDUCE 1035 +#define YYNTOKEN 216 +#define YY_MAX_SHIFT 311 +#define YY_MIN_SHIFTREDUCE 503 +#define YY_MAX_SHIFTREDUCE 768 +#define YY_ERROR_ACTION 769 +#define YY_ACCEPT_ACTION 770 +#define YY_NO_ACTION 771 +#define YY_MIN_REDUCE 772 +#define YY_MAX_REDUCE 1037 /************* End control #defines *******************************************/ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) @@ -214,259 +214,260 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (674) +#define YY_ACTTAB_COUNT (667) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 224, 550, 941, 550, 200, 307, 905, 17, 817, 551, - /* 10 */ 78, 551, 164, 47, 48, 177, 51, 52, 138, 179, - /* 20 */ 212, 41, 179, 50, 256, 55, 53, 57, 54, 1017, - /* 30 */ 30, 207, 1018, 46, 45, 917, 179, 44, 43, 42, - /* 40 */ 183, 902, 903, 29, 906, 206, 1018, 502, 503, 504, - /* 50 */ 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, - /* 60 */ 515, 308, 550, 938, 229, 47, 48, 930, 51, 52, - /* 70 */ 551, 202, 212, 41, 916, 50, 256, 55, 53, 57, - /* 80 */ 54, 201, 253, 70, 75, 46, 45, 273, 204, 44, - /* 90 */ 43, 42, 47, 48, 273, 51, 52, 148, 217, 212, - /* 100 */ 41, 133, 50, 256, 55, 53, 57, 54, 630, 219, - /* 110 */ 768, 309, 46, 45, 919, 293, 44, 43, 42, 47, - /* 120 */ 49, 12, 51, 52, 919, 80, 212, 41, 303, 50, - /* 130 */ 256, 55, 53, 57, 54, 919, 283, 282, 887, 46, - /* 140 */ 45, 885, 886, 44, 43, 42, 888, 826, 890, 891, - /* 150 */ 889, 164, 892, 893, 919, 48, 930, 51, 52, 138, - /* 160 */ 714, 212, 41, 244, 50, 256, 55, 53, 57, 54, - /* 170 */ 239, 44, 43, 42, 46, 45, 913, 138, 44, 43, - /* 180 */ 42, 23, 271, 302, 301, 270, 269, 268, 300, 267, - /* 190 */ 299, 298, 297, 266, 296, 295, 879, 81, 867, 868, - /* 200 */ 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, - /* 210 */ 880, 881, 51, 52, 18, 210, 212, 41, 218, 50, - /* 220 */ 256, 55, 53, 57, 54, 970, 67, 251, 629, 46, - /* 230 */ 45, 907, 187, 44, 43, 42, 211, 727, 189, 77, - /* 240 */ 718, 1014, 721, 969, 724, 116, 115, 188, 138, 211, - /* 250 */ 727, 71, 64, 718, 221, 721, 69, 724, 46, 45, - /* 260 */ 30, 6, 44, 43, 42, 103, 232, 30, 208, 209, - /* 270 */ 65, 293, 255, 236, 235, 1013, 23, 24, 302, 301, - /* 280 */ 1027, 208, 209, 300, 36, 299, 298, 297, 904, 296, - /* 290 */ 295, 670, 223, 30, 55, 53, 57, 54, 306, 305, - /* 300 */ 125, 215, 46, 45, 916, 238, 44, 43, 42, 5, - /* 310 */ 154, 915, 195, 257, 76, 33, 153, 85, 90, 83, - /* 320 */ 89, 101, 106, 222, 1, 152, 275, 95, 105, 30, - /* 330 */ 111, 114, 104, 667, 216, 30, 30, 916, 108, 25, - /* 340 */ 172, 168, 56, 3, 165, 30, 170, 167, 120, 119, - /* 350 */ 118, 117, 24, 654, 726, 56, 651, 918, 652, 36, - /* 360 */ 653, 225, 818, 1012, 280, 279, 164, 726, 131, 725, - /* 370 */ 276, 674, 716, 916, 662, 36, 277, 281, 196, 916, - /* 380 */ 916, 241, 725, 242, 226, 227, 285, 31, 682, 916, - /* 390 */ 695, 696, 135, 686, 687, 747, 728, 60, 20, 19, - /* 400 */ 19, 720, 719, 723, 722, 61, 94, 93, 717, 640, - /* 410 */ 259, 730, 642, 31, 31, 261, 60, 641, 962, 79, - /* 420 */ 28, 60, 658, 262, 659, 62, 197, 14, 13, 100, - /* 430 */ 99, 181, 16, 15, 656, 182, 657, 113, 112, 130, - /* 440 */ 128, 184, 178, 185, 186, 192, 193, 191, 980, 176, - /* 450 */ 190, 180, 979, 213, 976, 975, 214, 284, 932, 132, - /* 460 */ 940, 39, 947, 961, 655, 949, 36, 134, 149, 147, - /* 470 */ 912, 150, 240, 151, 830, 264, 129, 829, 265, 681, - /* 480 */ 37, 174, 34, 66, 929, 274, 245, 203, 825, 1032, - /* 490 */ 91, 1031, 1029, 249, 155, 63, 278, 1026, 58, 97, - /* 500 */ 1025, 1023, 156, 139, 140, 254, 252, 141, 848, 142, - /* 510 */ 35, 250, 143, 32, 38, 175, 248, 814, 107, 144, - /* 520 */ 246, 812, 294, 109, 110, 40, 810, 102, 809, 228, - /* 530 */ 166, 286, 807, 806, 805, 804, 803, 802, 801, 169, - /* 540 */ 171, 798, 796, 794, 792, 790, 173, 287, 243, 72, - /* 550 */ 73, 963, 288, 289, 290, 198, 220, 263, 291, 292, - /* 560 */ 304, 199, 194, 766, 86, 87, 230, 808, 231, 765, - /* 570 */ 233, 234, 764, 752, 237, 241, 159, 121, 158, 849, - /* 580 */ 157, 160, 122, 161, 163, 800, 162, 123, 799, 4, - /* 590 */ 2, 883, 124, 791, 664, 914, 68, 258, 8, 205, - /* 600 */ 145, 146, 895, 683, 74, 136, 26, 247, 9, 688, - /* 610 */ 137, 7, 10, 729, 27, 11, 21, 260, 22, 731, - /* 620 */ 82, 80, 84, 593, 589, 587, 586, 585, 582, 554, - /* 630 */ 272, 88, 92, 31, 59, 632, 96, 631, 628, 577, - /* 640 */ 575, 567, 573, 569, 571, 565, 563, 596, 595, 594, - /* 650 */ 592, 98, 591, 590, 588, 584, 583, 60, 552, 770, - /* 660 */ 519, 517, 769, 769, 769, 769, 769, 126, 769, 769, - /* 670 */ 769, 769, 769, 127, + /* 0 */ 78, 552, 943, 552, 201, 309, 1, 153, 17, 553, + /* 10 */ 79, 553, 72, 48, 49, 205, 52, 53, 139, 180, + /* 20 */ 213, 42, 180, 51, 257, 56, 54, 58, 55, 1019, + /* 30 */ 31, 208, 1020, 47, 46, 134, 180, 45, 44, 43, + /* 40 */ 921, 904, 905, 29, 908, 207, 1020, 504, 505, 506, + /* 50 */ 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, + /* 60 */ 517, 310, 218, 940, 230, 48, 49, 932, 52, 53, + /* 70 */ 139, 203, 213, 42, 918, 51, 257, 56, 54, 58, + /* 80 */ 55, 202, 254, 71, 76, 47, 46, 921, 275, 45, + /* 90 */ 44, 43, 48, 49, 82, 52, 53, 245, 295, 213, + /* 100 */ 42, 139, 51, 257, 56, 54, 58, 55, 770, 311, + /* 110 */ 3, 166, 47, 46, 24, 225, 45, 44, 43, 48, + /* 120 */ 50, 37, 52, 53, 831, 672, 213, 42, 909, 51, + /* 130 */ 257, 56, 54, 58, 55, 632, 972, 220, 252, 47, + /* 140 */ 46, 669, 552, 45, 44, 43, 49, 25, 52, 53, + /* 150 */ 553, 178, 213, 42, 932, 51, 257, 56, 54, 58, + /* 160 */ 55, 716, 921, 285, 284, 47, 46, 971, 240, 45, + /* 170 */ 44, 43, 23, 273, 304, 303, 272, 271, 270, 302, + /* 180 */ 269, 301, 300, 299, 268, 298, 297, 881, 915, 869, + /* 190 */ 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, + /* 200 */ 880, 882, 883, 52, 53, 18, 676, 213, 42, 233, + /* 210 */ 51, 257, 56, 54, 58, 55, 237, 236, 697, 698, + /* 220 */ 47, 46, 718, 188, 45, 44, 43, 212, 729, 190, + /* 230 */ 219, 720, 305, 723, 819, 726, 117, 116, 189, 165, + /* 240 */ 212, 729, 31, 31, 720, 104, 723, 224, 726, 45, + /* 250 */ 44, 43, 295, 56, 54, 58, 55, 921, 719, 209, + /* 260 */ 210, 47, 46, 256, 31, 45, 44, 43, 23, 24, + /* 270 */ 304, 303, 209, 210, 184, 302, 37, 301, 300, 299, + /* 280 */ 828, 298, 297, 216, 217, 165, 918, 918, 889, 47, + /* 290 */ 46, 887, 888, 45, 44, 43, 890, 239, 892, 893, + /* 300 */ 891, 907, 894, 895, 196, 5, 155, 258, 917, 31, + /* 310 */ 1016, 34, 154, 86, 91, 84, 90, 226, 102, 107, + /* 320 */ 282, 281, 31, 31, 96, 106, 149, 112, 115, 105, + /* 330 */ 173, 169, 31, 139, 57, 109, 171, 168, 121, 120, + /* 340 */ 119, 118, 222, 308, 307, 126, 728, 57, 225, 656, + /* 350 */ 278, 12, 653, 918, 654, 81, 655, 919, 70, 728, + /* 360 */ 820, 727, 132, 279, 283, 165, 918, 918, 642, 37, + /* 370 */ 664, 243, 32, 287, 727, 32, 918, 242, 211, 684, + /* 380 */ 227, 228, 275, 136, 62, 688, 95, 94, 689, 61, + /* 390 */ 906, 749, 20, 730, 722, 19, 725, 19, 721, 77, + /* 400 */ 724, 65, 1015, 260, 63, 644, 732, 32, 28, 61, + /* 410 */ 1014, 263, 223, 262, 643, 277, 197, 80, 61, 66, + /* 420 */ 14, 13, 101, 100, 68, 6, 631, 198, 16, 15, + /* 430 */ 660, 658, 661, 659, 114, 113, 131, 129, 182, 183, + /* 440 */ 982, 185, 179, 186, 187, 193, 1029, 194, 192, 177, + /* 450 */ 191, 181, 920, 981, 214, 978, 977, 215, 286, 934, + /* 460 */ 133, 657, 40, 942, 949, 951, 964, 135, 150, 963, + /* 470 */ 148, 914, 151, 37, 130, 241, 152, 832, 246, 265, + /* 480 */ 683, 67, 266, 267, 38, 175, 931, 35, 276, 204, + /* 490 */ 250, 827, 1034, 64, 92, 59, 1033, 140, 141, 1031, + /* 500 */ 255, 142, 253, 143, 156, 280, 1028, 251, 144, 98, + /* 510 */ 1027, 247, 1025, 249, 157, 41, 850, 36, 33, 145, + /* 520 */ 103, 39, 176, 296, 288, 816, 108, 814, 110, 111, + /* 530 */ 812, 811, 229, 167, 809, 289, 290, 808, 807, 806, + /* 540 */ 805, 804, 803, 170, 172, 800, 798, 796, 794, 792, + /* 550 */ 174, 291, 244, 73, 74, 965, 292, 293, 294, 199, + /* 560 */ 221, 264, 306, 768, 231, 200, 195, 232, 87, 88, + /* 570 */ 767, 235, 766, 234, 238, 754, 242, 666, 69, 810, + /* 580 */ 75, 259, 8, 160, 159, 851, 158, 161, 163, 162, + /* 590 */ 122, 123, 164, 124, 2, 802, 885, 801, 793, 916, + /* 600 */ 125, 685, 4, 137, 146, 147, 206, 248, 897, 690, + /* 610 */ 138, 26, 9, 10, 731, 7, 27, 11, 733, 21, + /* 620 */ 22, 261, 83, 30, 85, 81, 595, 591, 589, 588, + /* 630 */ 587, 584, 556, 274, 89, 32, 93, 60, 634, 633, + /* 640 */ 630, 579, 577, 569, 575, 571, 97, 573, 99, 567, + /* 650 */ 565, 598, 597, 596, 594, 593, 592, 590, 586, 585, + /* 660 */ 61, 554, 127, 521, 128, 772, 519, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 218, 1, 218, 1, 217, 218, 0, 278, 223, 9, - /* 10 */ 224, 9, 227, 13, 14, 278, 16, 17, 218, 278, - /* 20 */ 20, 21, 278, 23, 24, 25, 26, 27, 28, 288, - /* 30 */ 218, 287, 288, 33, 34, 253, 278, 37, 38, 39, - /* 40 */ 278, 255, 256, 257, 258, 287, 288, 45, 46, 47, + /* 0 */ 265, 1, 219, 1, 218, 219, 226, 227, 279, 9, + /* 10 */ 225, 9, 277, 13, 14, 239, 16, 17, 219, 279, + /* 20 */ 20, 21, 279, 23, 24, 25, 26, 27, 28, 289, + /* 30 */ 219, 288, 289, 33, 34, 219, 279, 37, 38, 39, + /* 40 */ 264, 256, 257, 258, 259, 288, 289, 45, 46, 47, /* 50 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - /* 60 */ 58, 59, 1, 279, 62, 13, 14, 261, 16, 17, - /* 70 */ 9, 259, 20, 21, 262, 23, 24, 25, 26, 27, - /* 80 */ 28, 275, 282, 83, 284, 33, 34, 81, 237, 37, - /* 90 */ 38, 39, 13, 14, 81, 16, 17, 83, 237, 20, - /* 100 */ 21, 218, 23, 24, 25, 26, 27, 28, 5, 237, - /* 110 */ 215, 216, 33, 34, 263, 84, 37, 38, 39, 13, - /* 120 */ 14, 107, 16, 17, 263, 111, 20, 21, 237, 23, - /* 130 */ 24, 25, 26, 27, 28, 263, 33, 34, 236, 33, - /* 140 */ 34, 239, 240, 37, 38, 39, 244, 223, 246, 247, - /* 150 */ 248, 227, 250, 251, 263, 14, 261, 16, 17, 218, - /* 160 */ 108, 20, 21, 280, 23, 24, 25, 26, 27, 28, - /* 170 */ 275, 37, 38, 39, 33, 34, 218, 218, 37, 38, - /* 180 */ 39, 91, 92, 93, 94, 95, 96, 97, 98, 99, - /* 190 */ 100, 101, 102, 103, 104, 105, 236, 224, 238, 239, - /* 200 */ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, - /* 210 */ 250, 251, 16, 17, 44, 61, 20, 21, 260, 23, - /* 220 */ 24, 25, 26, 27, 28, 284, 107, 286, 109, 33, - /* 230 */ 34, 258, 62, 37, 38, 39, 1, 2, 68, 264, - /* 240 */ 5, 278, 7, 284, 9, 75, 76, 77, 218, 1, - /* 250 */ 2, 276, 112, 5, 68, 7, 224, 9, 33, 34, - /* 260 */ 218, 107, 37, 38, 39, 78, 136, 218, 33, 34, - /* 270 */ 130, 84, 37, 143, 144, 278, 91, 107, 93, 94, - /* 280 */ 263, 33, 34, 98, 114, 100, 101, 102, 256, 104, - /* 290 */ 105, 37, 68, 218, 25, 26, 27, 28, 65, 66, - /* 300 */ 67, 259, 33, 34, 262, 135, 37, 38, 39, 63, - /* 310 */ 64, 262, 142, 15, 284, 69, 70, 71, 72, 73, - /* 320 */ 74, 63, 64, 137, 225, 226, 140, 69, 70, 218, - /* 330 */ 72, 73, 74, 112, 259, 218, 218, 262, 80, 118, - /* 340 */ 63, 64, 107, 221, 222, 218, 69, 70, 71, 72, - /* 350 */ 73, 74, 107, 2, 119, 107, 5, 263, 7, 114, - /* 360 */ 9, 137, 223, 278, 140, 141, 227, 119, 107, 134, - /* 370 */ 259, 117, 1, 262, 108, 114, 259, 259, 278, 262, - /* 380 */ 262, 115, 134, 108, 33, 34, 259, 112, 108, 262, - /* 390 */ 125, 126, 112, 108, 108, 108, 108, 112, 112, 112, - /* 400 */ 112, 5, 5, 7, 7, 112, 138, 139, 37, 108, - /* 410 */ 108, 113, 108, 112, 112, 108, 112, 108, 285, 112, - /* 420 */ 107, 112, 5, 110, 7, 132, 278, 138, 139, 138, - /* 430 */ 139, 278, 138, 139, 5, 278, 7, 78, 79, 63, - /* 440 */ 64, 278, 278, 278, 278, 278, 278, 278, 254, 278, - /* 450 */ 278, 278, 254, 254, 254, 254, 254, 254, 261, 218, - /* 460 */ 218, 277, 218, 285, 113, 218, 114, 218, 218, 265, - /* 470 */ 218, 218, 261, 218, 218, 218, 61, 218, 218, 119, - /* 480 */ 218, 218, 218, 129, 274, 218, 281, 281, 218, 218, - /* 490 */ 218, 218, 218, 281, 218, 131, 218, 218, 128, 218, - /* 500 */ 218, 218, 218, 273, 272, 123, 127, 271, 218, 270, - /* 510 */ 218, 122, 269, 218, 218, 218, 121, 218, 218, 268, - /* 520 */ 120, 218, 106, 218, 218, 133, 218, 90, 218, 218, - /* 530 */ 218, 89, 218, 218, 218, 218, 218, 218, 218, 218, - /* 540 */ 218, 218, 218, 218, 218, 218, 218, 51, 219, 219, - /* 550 */ 219, 219, 86, 88, 55, 219, 219, 219, 87, 85, - /* 560 */ 81, 219, 219, 5, 224, 224, 145, 219, 5, 5, - /* 570 */ 145, 5, 5, 92, 136, 115, 229, 220, 233, 235, - /* 580 */ 234, 232, 220, 230, 228, 219, 231, 220, 219, 221, - /* 590 */ 225, 252, 220, 219, 108, 261, 116, 110, 107, 1, - /* 600 */ 267, 266, 252, 108, 112, 107, 112, 107, 124, 108, - /* 610 */ 107, 107, 124, 108, 112, 107, 107, 110, 107, 113, - /* 620 */ 78, 111, 83, 9, 5, 5, 5, 5, 5, 82, - /* 630 */ 15, 78, 139, 112, 16, 5, 139, 5, 108, 5, - /* 640 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - /* 650 */ 5, 139, 5, 5, 5, 5, 5, 112, 82, 0, - /* 660 */ 61, 60, 289, 289, 289, 289, 289, 21, 289, 289, - /* 670 */ 289, 289, 289, 21, 289, 289, 289, 289, 289, 289, - /* 680 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 690 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 700 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 710 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 720 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 730 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 740 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 750 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 760 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 770 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 780 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 790 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 800 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 810 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 820 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 830 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 840 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 850 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 860 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 870 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - /* 880 */ 289, 289, 289, 289, 289, 289, 289, 289, 289, + /* 60 */ 58, 59, 239, 280, 62, 13, 14, 262, 16, 17, + /* 70 */ 219, 260, 20, 21, 263, 23, 24, 25, 26, 27, + /* 80 */ 28, 276, 283, 83, 285, 33, 34, 264, 81, 37, + /* 90 */ 38, 39, 13, 14, 225, 16, 17, 281, 85, 20, + /* 100 */ 21, 219, 23, 24, 25, 26, 27, 28, 216, 217, + /* 110 */ 222, 223, 33, 34, 108, 219, 37, 38, 39, 13, + /* 120 */ 14, 115, 16, 17, 228, 37, 20, 21, 259, 23, + /* 130 */ 24, 25, 26, 27, 28, 5, 285, 239, 287, 33, + /* 140 */ 34, 113, 1, 37, 38, 39, 14, 119, 16, 17, + /* 150 */ 9, 279, 20, 21, 262, 23, 24, 25, 26, 27, + /* 160 */ 28, 109, 264, 33, 34, 33, 34, 285, 276, 37, + /* 170 */ 38, 39, 92, 93, 94, 95, 96, 97, 98, 99, + /* 180 */ 100, 101, 102, 103, 104, 105, 106, 238, 219, 240, + /* 190 */ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, + /* 200 */ 251, 252, 253, 16, 17, 44, 118, 20, 21, 137, + /* 210 */ 23, 24, 25, 26, 27, 28, 144, 145, 126, 127, + /* 220 */ 33, 34, 1, 62, 37, 38, 39, 1, 2, 68, + /* 230 */ 261, 5, 239, 7, 224, 9, 75, 76, 77, 229, + /* 240 */ 1, 2, 219, 219, 5, 78, 7, 68, 9, 37, + /* 250 */ 38, 39, 85, 25, 26, 27, 28, 264, 37, 33, + /* 260 */ 34, 33, 34, 37, 219, 37, 38, 39, 92, 108, + /* 270 */ 94, 95, 33, 34, 279, 99, 115, 101, 102, 103, + /* 280 */ 224, 105, 106, 260, 260, 229, 263, 263, 238, 33, + /* 290 */ 34, 241, 242, 37, 38, 39, 246, 136, 248, 249, + /* 300 */ 250, 0, 252, 253, 143, 63, 64, 15, 263, 219, + /* 310 */ 279, 69, 70, 71, 72, 73, 74, 138, 63, 64, + /* 320 */ 141, 142, 219, 219, 69, 70, 83, 72, 73, 74, + /* 330 */ 63, 64, 219, 219, 108, 80, 69, 70, 71, 72, + /* 340 */ 73, 74, 68, 65, 66, 67, 120, 108, 219, 2, + /* 350 */ 260, 108, 5, 263, 7, 112, 9, 228, 225, 120, + /* 360 */ 224, 135, 108, 260, 260, 229, 263, 263, 109, 115, + /* 370 */ 109, 109, 113, 260, 135, 113, 263, 116, 61, 109, + /* 380 */ 33, 34, 81, 113, 113, 109, 139, 140, 109, 113, + /* 390 */ 257, 109, 113, 109, 5, 113, 7, 113, 5, 285, + /* 400 */ 7, 113, 279, 109, 133, 109, 114, 113, 108, 113, + /* 410 */ 279, 111, 138, 109, 109, 141, 279, 113, 113, 131, + /* 420 */ 139, 140, 139, 140, 108, 108, 110, 279, 139, 140, + /* 430 */ 5, 5, 7, 7, 78, 79, 63, 64, 279, 279, + /* 440 */ 255, 279, 279, 279, 279, 279, 264, 279, 279, 279, + /* 450 */ 279, 279, 264, 255, 255, 255, 255, 255, 255, 262, + /* 460 */ 219, 114, 278, 219, 219, 219, 286, 219, 219, 286, + /* 470 */ 266, 219, 219, 115, 61, 262, 219, 219, 282, 219, + /* 480 */ 120, 130, 219, 219, 219, 219, 275, 219, 219, 282, + /* 490 */ 282, 219, 219, 132, 219, 129, 219, 274, 273, 219, + /* 500 */ 124, 272, 128, 271, 219, 219, 219, 123, 270, 219, + /* 510 */ 219, 121, 219, 122, 219, 134, 219, 219, 219, 269, + /* 520 */ 91, 219, 219, 107, 90, 219, 219, 219, 219, 219, + /* 530 */ 219, 219, 219, 219, 219, 51, 87, 219, 219, 219, + /* 540 */ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + /* 550 */ 219, 89, 220, 220, 220, 220, 55, 88, 86, 220, + /* 560 */ 220, 220, 81, 5, 146, 220, 220, 5, 225, 225, + /* 570 */ 5, 5, 5, 146, 137, 93, 116, 109, 117, 220, + /* 580 */ 113, 111, 108, 231, 235, 237, 236, 234, 233, 232, + /* 590 */ 221, 221, 230, 221, 226, 220, 254, 220, 220, 262, + /* 600 */ 221, 109, 222, 108, 268, 267, 1, 108, 254, 109, + /* 610 */ 108, 113, 125, 125, 109, 108, 113, 108, 114, 108, + /* 620 */ 108, 111, 78, 84, 83, 112, 9, 5, 5, 5, + /* 630 */ 5, 5, 82, 15, 78, 113, 140, 16, 5, 5, + /* 640 */ 109, 5, 5, 5, 5, 5, 140, 5, 140, 5, + /* 650 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 660 */ 113, 82, 21, 61, 21, 0, 60, 290, 290, 290, + /* 670 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 680 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 690 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 700 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 710 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 720 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 730 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 740 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 750 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 760 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 770 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 780 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 790 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 800 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 810 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 820 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 830 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 840 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 850 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 860 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 870 */ 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, + /* 880 */ 290, 290, 290, }; -#define YY_SHIFT_COUNT (309) +#define YY_SHIFT_COUNT (311) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (659) +#define YY_SHIFT_MAX (665) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 170, 90, 90, 185, 185, 13, 235, 248, 61, 61, - /* 10 */ 61, 61, 61, 61, 61, 61, 61, 0, 2, 248, - /* 20 */ 351, 351, 351, 351, 245, 61, 61, 61, 61, 6, - /* 30 */ 61, 61, 187, 13, 31, 31, 674, 674, 674, 248, - /* 40 */ 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - /* 50 */ 248, 248, 248, 248, 248, 248, 248, 248, 248, 351, - /* 60 */ 351, 103, 103, 103, 103, 103, 103, 103, 261, 61, - /* 70 */ 61, 254, 61, 61, 61, 265, 265, 221, 61, 61, - /* 80 */ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - /* 90 */ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - /* 100 */ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - /* 110 */ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - /* 120 */ 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - /* 130 */ 61, 352, 415, 415, 415, 360, 360, 360, 415, 354, - /* 140 */ 364, 370, 382, 379, 389, 395, 400, 392, 352, 415, - /* 150 */ 415, 415, 416, 13, 13, 415, 415, 437, 442, 496, - /* 160 */ 466, 465, 499, 471, 474, 416, 415, 479, 479, 415, - /* 170 */ 479, 415, 479, 415, 674, 674, 52, 79, 106, 79, - /* 180 */ 79, 141, 196, 269, 269, 269, 269, 246, 258, 277, - /* 190 */ 225, 225, 225, 225, 224, 130, 134, 134, 14, 186, - /* 200 */ 233, 266, 275, 280, 285, 286, 287, 288, 396, 397, - /* 210 */ 371, 154, 298, 293, 140, 301, 302, 304, 307, 309, - /* 220 */ 313, 268, 289, 291, 119, 294, 417, 429, 359, 376, - /* 230 */ 558, 421, 563, 564, 425, 566, 567, 481, 438, 460, - /* 240 */ 486, 480, 487, 491, 492, 495, 498, 598, 500, 501, - /* 250 */ 503, 494, 484, 502, 488, 505, 504, 506, 508, 487, - /* 260 */ 509, 507, 511, 510, 542, 539, 614, 619, 620, 621, - /* 270 */ 622, 623, 547, 615, 553, 493, 521, 521, 618, 497, - /* 280 */ 512, 521, 630, 632, 530, 521, 634, 635, 636, 637, - /* 290 */ 638, 639, 640, 641, 642, 643, 644, 645, 647, 648, - /* 300 */ 649, 650, 651, 545, 576, 646, 652, 599, 601, 659, + /* 0 */ 161, 80, 80, 176, 176, 7, 226, 239, 141, 141, + /* 10 */ 141, 141, 141, 141, 141, 141, 141, 0, 2, 239, + /* 20 */ 347, 347, 347, 347, 6, 141, 141, 141, 141, 301, + /* 30 */ 141, 141, 141, 167, 7, 13, 13, 667, 667, 667, + /* 40 */ 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + /* 50 */ 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + /* 60 */ 347, 347, 130, 130, 130, 130, 130, 130, 130, 254, + /* 70 */ 141, 141, 88, 141, 141, 141, 92, 92, 28, 141, + /* 80 */ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + /* 90 */ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + /* 100 */ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + /* 110 */ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + /* 120 */ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + /* 130 */ 141, 141, 358, 413, 413, 413, 360, 360, 360, 413, + /* 140 */ 351, 361, 366, 376, 374, 384, 391, 390, 381, 358, + /* 150 */ 413, 413, 413, 416, 7, 7, 413, 413, 429, 434, + /* 160 */ 484, 449, 462, 501, 469, 472, 416, 413, 481, 481, + /* 170 */ 413, 481, 413, 481, 413, 667, 667, 52, 79, 106, + /* 180 */ 79, 79, 132, 187, 228, 228, 228, 228, 242, 255, + /* 190 */ 267, 256, 256, 256, 256, 179, 72, 212, 212, 243, + /* 200 */ 274, 278, 261, 262, 270, 276, 279, 282, 284, 389, + /* 210 */ 393, 221, 317, 292, 271, 288, 259, 294, 296, 304, + /* 220 */ 305, 300, 247, 281, 283, 316, 289, 425, 426, 356, + /* 230 */ 373, 558, 418, 562, 565, 427, 566, 567, 482, 437, + /* 240 */ 460, 468, 461, 470, 474, 467, 492, 495, 605, 499, + /* 250 */ 500, 502, 498, 487, 503, 488, 505, 507, 504, 509, + /* 260 */ 470, 511, 510, 512, 513, 544, 539, 541, 617, 622, + /* 270 */ 623, 624, 625, 626, 550, 618, 556, 496, 522, 522, + /* 280 */ 621, 506, 508, 522, 633, 634, 531, 522, 636, 637, + /* 290 */ 638, 639, 640, 642, 644, 645, 646, 647, 648, 649, + /* 300 */ 650, 651, 652, 653, 654, 547, 579, 641, 643, 602, + /* 310 */ 606, 665, }; -#define YY_REDUCE_COUNT (175) +#define YY_REDUCE_COUNT (176) #define YY_REDUCE_MIN (-271) -#define YY_REDUCE_MAX (374) +#define YY_REDUCE_MAX (380) static const short yy_reduce_ofst[] = { - /* 0 */ -105, -40, -40, -98, -98, -214, -256, -242, -188, -59, - /* 10 */ -200, 42, 75, 111, 117, 118, 127, -216, -213, -259, - /* 20 */ -149, -139, -128, -109, -194, -117, -41, 30, -42, -27, - /* 30 */ -218, 49, -215, 32, -76, 139, -25, 99, 122, -271, - /* 40 */ -263, -238, -37, -3, 85, 100, 148, 153, 157, 163, - /* 50 */ 164, 165, 166, 167, 168, 169, 171, 172, 173, 17, - /* 60 */ 94, 194, 198, 199, 200, 201, 202, 203, 197, 241, - /* 70 */ 242, 184, 244, 247, 249, 133, 178, 204, 250, 252, - /* 80 */ 253, 255, 256, 257, 259, 260, 262, 263, 264, 267, - /* 90 */ 270, 271, 272, 273, 274, 276, 278, 279, 281, 282, - /* 100 */ 283, 284, 290, 292, 295, 296, 297, 299, 300, 303, - /* 110 */ 305, 306, 308, 310, 311, 312, 314, 315, 316, 317, - /* 120 */ 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, - /* 130 */ 328, 211, 329, 330, 331, 205, 206, 212, 332, 210, - /* 140 */ 230, 232, 236, 239, 243, 251, 333, 335, 334, 336, - /* 150 */ 337, 338, 339, 340, 341, 342, 343, 344, 346, 345, - /* 160 */ 347, 349, 353, 355, 356, 350, 348, 357, 362, 366, - /* 170 */ 367, 369, 372, 374, 365, 368, + /* 0 */ -108, -51, -51, 50, 50, -215, -257, -243, -189, -149, + /* 10 */ -201, 23, 24, 90, 103, 104, 113, -217, -214, -260, + /* 20 */ -224, -177, -102, -7, -195, -184, -118, 114, -31, -131, + /* 30 */ -104, 129, 45, 10, 133, 56, 136, -265, -220, -112, + /* 40 */ -271, -128, -5, 31, 123, 131, 137, 148, 159, 160, + /* 50 */ 162, 163, 164, 165, 166, 168, 169, 170, 171, 172, + /* 60 */ 182, 188, 185, 198, 199, 200, 201, 202, 203, 197, + /* 70 */ 241, 244, 184, 245, 246, 248, 180, 183, 204, 249, + /* 80 */ 252, 253, 257, 258, 260, 263, 264, 265, 266, 268, + /* 90 */ 269, 272, 273, 275, 277, 280, 285, 286, 287, 290, + /* 100 */ 291, 293, 295, 297, 298, 299, 302, 303, 306, 307, + /* 110 */ 308, 309, 310, 311, 312, 313, 314, 315, 318, 319, + /* 120 */ 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + /* 130 */ 330, 331, 213, 332, 333, 334, 196, 207, 208, 335, + /* 140 */ 211, 223, 225, 229, 232, 238, 250, 336, 338, 337, + /* 150 */ 339, 340, 341, 342, 343, 344, 345, 346, 348, 350, + /* 160 */ 349, 352, 353, 357, 355, 362, 354, 359, 369, 370, + /* 170 */ 375, 372, 377, 379, 378, 368, 380, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 767, 882, 827, 894, 815, 824, 1020, 1020, 767, 767, - /* 10 */ 767, 767, 767, 767, 767, 767, 767, 942, 787, 1020, - /* 20 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 824, - /* 30 */ 767, 767, 831, 824, 831, 831, 937, 866, 884, 767, - /* 40 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 50 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 60 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 70 */ 767, 944, 946, 948, 767, 966, 966, 935, 767, 767, - /* 80 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 90 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 100 */ 767, 767, 767, 767, 767, 767, 767, 813, 767, 811, - /* 110 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 120 */ 767, 767, 767, 767, 767, 797, 767, 767, 767, 767, - /* 130 */ 767, 767, 789, 789, 789, 767, 767, 767, 789, 973, - /* 140 */ 977, 971, 959, 967, 958, 954, 953, 981, 767, 789, - /* 150 */ 789, 789, 828, 824, 824, 789, 789, 847, 845, 843, - /* 160 */ 835, 841, 837, 839, 833, 816, 789, 822, 822, 789, - /* 170 */ 822, 789, 822, 789, 866, 884, 767, 982, 767, 1019, - /* 180 */ 972, 1009, 1008, 1015, 1007, 1006, 1005, 767, 767, 767, - /* 190 */ 1001, 1002, 1004, 1003, 767, 767, 1011, 1010, 767, 767, - /* 200 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 210 */ 767, 984, 767, 978, 974, 767, 767, 767, 767, 767, - /* 220 */ 767, 767, 767, 767, 896, 767, 767, 767, 767, 767, - /* 230 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 934, - /* 240 */ 767, 767, 767, 767, 945, 767, 767, 767, 767, 767, - /* 250 */ 767, 968, 767, 960, 767, 767, 767, 767, 767, 908, - /* 260 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 270 */ 767, 767, 767, 767, 767, 767, 1030, 1028, 767, 767, - /* 280 */ 767, 1024, 767, 767, 767, 1022, 767, 767, 767, 767, - /* 290 */ 767, 767, 767, 767, 767, 767, 767, 767, 767, 767, - /* 300 */ 767, 767, 767, 850, 767, 795, 793, 767, 785, 767, + /* 0 */ 769, 884, 829, 896, 817, 826, 1022, 1022, 769, 769, + /* 10 */ 769, 769, 769, 769, 769, 769, 769, 944, 789, 1022, + /* 20 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 826, + /* 30 */ 769, 769, 769, 833, 826, 833, 833, 939, 868, 886, + /* 40 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 50 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 60 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 70 */ 769, 769, 946, 948, 950, 769, 968, 968, 937, 769, + /* 80 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 90 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 100 */ 769, 769, 769, 769, 769, 769, 769, 769, 815, 769, + /* 110 */ 813, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 120 */ 769, 769, 769, 769, 769, 769, 799, 769, 769, 769, + /* 130 */ 769, 769, 769, 791, 791, 791, 769, 769, 769, 791, + /* 140 */ 975, 979, 973, 961, 969, 960, 956, 955, 983, 769, + /* 150 */ 791, 791, 791, 830, 826, 826, 791, 791, 849, 847, + /* 160 */ 845, 837, 843, 839, 841, 835, 818, 791, 824, 824, + /* 170 */ 791, 824, 791, 824, 791, 868, 886, 769, 984, 769, + /* 180 */ 1021, 974, 1011, 1010, 1017, 1009, 1008, 1007, 769, 769, + /* 190 */ 769, 1003, 1004, 1006, 1005, 769, 769, 1013, 1012, 769, + /* 200 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 210 */ 769, 769, 986, 769, 980, 976, 769, 769, 769, 769, + /* 220 */ 769, 769, 769, 769, 769, 898, 769, 769, 769, 769, + /* 230 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 240 */ 936, 769, 769, 769, 769, 947, 769, 769, 769, 769, + /* 250 */ 769, 769, 970, 769, 962, 769, 769, 769, 769, 769, + /* 260 */ 910, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 270 */ 769, 769, 769, 769, 769, 769, 769, 769, 1032, 1030, + /* 280 */ 769, 769, 769, 1026, 769, 769, 769, 1024, 769, 769, + /* 290 */ 769, 769, 769, 769, 769, 769, 769, 769, 769, 769, + /* 300 */ 769, 769, 769, 769, 769, 852, 769, 797, 795, 769, + /* 310 */ 787, 769, }; /********** End of lemon-generated parsing tables *****************************/ @@ -570,6 +571,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* IF => nothing */ 0, /* EXISTS => nothing */ 0, /* AS => nothing */ + 0, /* OUTPUTTYPE => nothing */ 0, /* PPS => nothing */ 0, /* TSERIES => nothing */ 0, /* DBS => nothing */ @@ -872,211 +874,212 @@ static const char *const yyTokenName[] = { /* 81 */ "IF", /* 82 */ "EXISTS", /* 83 */ "AS", - /* 84 */ "PPS", - /* 85 */ "TSERIES", - /* 86 */ "DBS", - /* 87 */ "STORAGE", - /* 88 */ "QTIME", - /* 89 */ "CONNS", - /* 90 */ "STATE", - /* 91 */ "KEEP", - /* 92 */ "CACHE", - /* 93 */ "REPLICA", - /* 94 */ "QUORUM", - /* 95 */ "DAYS", - /* 96 */ "MINROWS", - /* 97 */ "MAXROWS", - /* 98 */ "BLOCKS", - /* 99 */ "CTIME", - /* 100 */ "WAL", - /* 101 */ "FSYNC", - /* 102 */ "COMP", - /* 103 */ "PRECISION", - /* 104 */ "UPDATE", - /* 105 */ "CACHELAST", - /* 106 */ "PARTITIONS", - /* 107 */ "LP", - /* 108 */ "RP", - /* 109 */ "UNSIGNED", - /* 110 */ "TAGS", - /* 111 */ "USING", - /* 112 */ "COMMA", - /* 113 */ "NULL", - /* 114 */ "SELECT", - /* 115 */ "UNION", - /* 116 */ "ALL", - /* 117 */ "DISTINCT", - /* 118 */ "FROM", - /* 119 */ "VARIABLE", - /* 120 */ "INTERVAL", - /* 121 */ "FILL", - /* 122 */ "SLIDING", - /* 123 */ "ORDER", - /* 124 */ "BY", - /* 125 */ "ASC", - /* 126 */ "DESC", - /* 127 */ "GROUP", - /* 128 */ "HAVING", - /* 129 */ "LIMIT", - /* 130 */ "OFFSET", - /* 131 */ "SLIMIT", - /* 132 */ "SOFFSET", - /* 133 */ "WHERE", - /* 134 */ "NOW", - /* 135 */ "RESET", - /* 136 */ "QUERY", - /* 137 */ "ADD", - /* 138 */ "COLUMN", - /* 139 */ "TAG", - /* 140 */ "CHANGE", - /* 141 */ "SET", - /* 142 */ "KILL", - /* 143 */ "CONNECTION", - /* 144 */ "STREAM", - /* 145 */ "COLON", - /* 146 */ "ABORT", - /* 147 */ "AFTER", - /* 148 */ "ATTACH", - /* 149 */ "BEFORE", - /* 150 */ "BEGIN", - /* 151 */ "CASCADE", - /* 152 */ "CLUSTER", - /* 153 */ "CONFLICT", - /* 154 */ "COPY", - /* 155 */ "DEFERRED", - /* 156 */ "DELIMITERS", - /* 157 */ "DETACH", - /* 158 */ "EACH", - /* 159 */ "END", - /* 160 */ "EXPLAIN", - /* 161 */ "FAIL", - /* 162 */ "FOR", - /* 163 */ "IGNORE", - /* 164 */ "IMMEDIATE", - /* 165 */ "INITIALLY", - /* 166 */ "INSTEAD", - /* 167 */ "MATCH", - /* 168 */ "KEY", - /* 169 */ "OF", - /* 170 */ "RAISE", - /* 171 */ "REPLACE", - /* 172 */ "RESTRICT", - /* 173 */ "ROW", - /* 174 */ "STATEMENT", - /* 175 */ "TRIGGER", - /* 176 */ "VIEW", - /* 177 */ "COUNT", - /* 178 */ "SUM", - /* 179 */ "AVG", - /* 180 */ "MIN", - /* 181 */ "MAX", - /* 182 */ "FIRST", - /* 183 */ "LAST", - /* 184 */ "TOP", - /* 185 */ "BOTTOM", - /* 186 */ "STDDEV", - /* 187 */ "PERCENTILE", - /* 188 */ "APERCENTILE", - /* 189 */ "LEASTSQUARES", - /* 190 */ "HISTOGRAM", - /* 191 */ "DIFF", - /* 192 */ "SPREAD", - /* 193 */ "TWA", - /* 194 */ "INTERP", - /* 195 */ "LAST_ROW", - /* 196 */ "RATE", - /* 197 */ "IRATE", - /* 198 */ "SUM_RATE", - /* 199 */ "SUM_IRATE", - /* 200 */ "AVG_RATE", - /* 201 */ "AVG_IRATE", - /* 202 */ "TBID", - /* 203 */ "SEMI", - /* 204 */ "NONE", - /* 205 */ "PREV", - /* 206 */ "LINEAR", - /* 207 */ "IMPORT", - /* 208 */ "METRIC", - /* 209 */ "TBNAME", - /* 210 */ "JOIN", - /* 211 */ "METRICS", - /* 212 */ "INSERT", - /* 213 */ "INTO", - /* 214 */ "VALUES", - /* 215 */ "program", - /* 216 */ "cmd", - /* 217 */ "dbPrefix", - /* 218 */ "ids", - /* 219 */ "cpxName", - /* 220 */ "ifexists", - /* 221 */ "alter_db_optr", - /* 222 */ "alter_topic_optr", - /* 223 */ "acct_optr", - /* 224 */ "ifnotexists", - /* 225 */ "db_optr", - /* 226 */ "topic_optr", - /* 227 */ "pps", - /* 228 */ "tseries", - /* 229 */ "dbs", - /* 230 */ "streams", - /* 231 */ "storage", - /* 232 */ "qtime", - /* 233 */ "users", - /* 234 */ "conns", - /* 235 */ "state", - /* 236 */ "keep", - /* 237 */ "tagitemlist", - /* 238 */ "cache", - /* 239 */ "replica", - /* 240 */ "quorum", - /* 241 */ "days", - /* 242 */ "minrows", - /* 243 */ "maxrows", - /* 244 */ "blocks", - /* 245 */ "ctime", - /* 246 */ "wal", - /* 247 */ "fsync", - /* 248 */ "comp", - /* 249 */ "prec", - /* 250 */ "update", - /* 251 */ "cachelast", - /* 252 */ "partitions", - /* 253 */ "typename", - /* 254 */ "signed", - /* 255 */ "create_table_args", - /* 256 */ "create_stable_args", - /* 257 */ "create_table_list", - /* 258 */ "create_from_stable", - /* 259 */ "columnlist", - /* 260 */ "tagNamelist", - /* 261 */ "select", - /* 262 */ "column", - /* 263 */ "tagitem", - /* 264 */ "selcollist", - /* 265 */ "from", - /* 266 */ "where_opt", - /* 267 */ "interval_opt", - /* 268 */ "fill_opt", - /* 269 */ "sliding_opt", - /* 270 */ "groupby_opt", - /* 271 */ "orderby_opt", - /* 272 */ "having_opt", - /* 273 */ "slimit_opt", - /* 274 */ "limit_opt", - /* 275 */ "union", - /* 276 */ "sclp", - /* 277 */ "distinct", - /* 278 */ "expr", - /* 279 */ "as", - /* 280 */ "tablelist", - /* 281 */ "tmvar", - /* 282 */ "sortlist", - /* 283 */ "sortitem", - /* 284 */ "item", - /* 285 */ "sortorder", - /* 286 */ "grouplist", - /* 287 */ "exprlist", - /* 288 */ "expritem", + /* 84 */ "OUTPUTTYPE", + /* 85 */ "PPS", + /* 86 */ "TSERIES", + /* 87 */ "DBS", + /* 88 */ "STORAGE", + /* 89 */ "QTIME", + /* 90 */ "CONNS", + /* 91 */ "STATE", + /* 92 */ "KEEP", + /* 93 */ "CACHE", + /* 94 */ "REPLICA", + /* 95 */ "QUORUM", + /* 96 */ "DAYS", + /* 97 */ "MINROWS", + /* 98 */ "MAXROWS", + /* 99 */ "BLOCKS", + /* 100 */ "CTIME", + /* 101 */ "WAL", + /* 102 */ "FSYNC", + /* 103 */ "COMP", + /* 104 */ "PRECISION", + /* 105 */ "UPDATE", + /* 106 */ "CACHELAST", + /* 107 */ "PARTITIONS", + /* 108 */ "LP", + /* 109 */ "RP", + /* 110 */ "UNSIGNED", + /* 111 */ "TAGS", + /* 112 */ "USING", + /* 113 */ "COMMA", + /* 114 */ "NULL", + /* 115 */ "SELECT", + /* 116 */ "UNION", + /* 117 */ "ALL", + /* 118 */ "DISTINCT", + /* 119 */ "FROM", + /* 120 */ "VARIABLE", + /* 121 */ "INTERVAL", + /* 122 */ "FILL", + /* 123 */ "SLIDING", + /* 124 */ "ORDER", + /* 125 */ "BY", + /* 126 */ "ASC", + /* 127 */ "DESC", + /* 128 */ "GROUP", + /* 129 */ "HAVING", + /* 130 */ "LIMIT", + /* 131 */ "OFFSET", + /* 132 */ "SLIMIT", + /* 133 */ "SOFFSET", + /* 134 */ "WHERE", + /* 135 */ "NOW", + /* 136 */ "RESET", + /* 137 */ "QUERY", + /* 138 */ "ADD", + /* 139 */ "COLUMN", + /* 140 */ "TAG", + /* 141 */ "CHANGE", + /* 142 */ "SET", + /* 143 */ "KILL", + /* 144 */ "CONNECTION", + /* 145 */ "STREAM", + /* 146 */ "COLON", + /* 147 */ "ABORT", + /* 148 */ "AFTER", + /* 149 */ "ATTACH", + /* 150 */ "BEFORE", + /* 151 */ "BEGIN", + /* 152 */ "CASCADE", + /* 153 */ "CLUSTER", + /* 154 */ "CONFLICT", + /* 155 */ "COPY", + /* 156 */ "DEFERRED", + /* 157 */ "DELIMITERS", + /* 158 */ "DETACH", + /* 159 */ "EACH", + /* 160 */ "END", + /* 161 */ "EXPLAIN", + /* 162 */ "FAIL", + /* 163 */ "FOR", + /* 164 */ "IGNORE", + /* 165 */ "IMMEDIATE", + /* 166 */ "INITIALLY", + /* 167 */ "INSTEAD", + /* 168 */ "MATCH", + /* 169 */ "KEY", + /* 170 */ "OF", + /* 171 */ "RAISE", + /* 172 */ "REPLACE", + /* 173 */ "RESTRICT", + /* 174 */ "ROW", + /* 175 */ "STATEMENT", + /* 176 */ "TRIGGER", + /* 177 */ "VIEW", + /* 178 */ "COUNT", + /* 179 */ "SUM", + /* 180 */ "AVG", + /* 181 */ "MIN", + /* 182 */ "MAX", + /* 183 */ "FIRST", + /* 184 */ "LAST", + /* 185 */ "TOP", + /* 186 */ "BOTTOM", + /* 187 */ "STDDEV", + /* 188 */ "PERCENTILE", + /* 189 */ "APERCENTILE", + /* 190 */ "LEASTSQUARES", + /* 191 */ "HISTOGRAM", + /* 192 */ "DIFF", + /* 193 */ "SPREAD", + /* 194 */ "TWA", + /* 195 */ "INTERP", + /* 196 */ "LAST_ROW", + /* 197 */ "RATE", + /* 198 */ "IRATE", + /* 199 */ "SUM_RATE", + /* 200 */ "SUM_IRATE", + /* 201 */ "AVG_RATE", + /* 202 */ "AVG_IRATE", + /* 203 */ "TBID", + /* 204 */ "SEMI", + /* 205 */ "NONE", + /* 206 */ "PREV", + /* 207 */ "LINEAR", + /* 208 */ "IMPORT", + /* 209 */ "METRIC", + /* 210 */ "TBNAME", + /* 211 */ "JOIN", + /* 212 */ "METRICS", + /* 213 */ "INSERT", + /* 214 */ "INTO", + /* 215 */ "VALUES", + /* 216 */ "program", + /* 217 */ "cmd", + /* 218 */ "dbPrefix", + /* 219 */ "ids", + /* 220 */ "cpxName", + /* 221 */ "ifexists", + /* 222 */ "alter_db_optr", + /* 223 */ "alter_topic_optr", + /* 224 */ "acct_optr", + /* 225 */ "ifnotexists", + /* 226 */ "db_optr", + /* 227 */ "topic_optr", + /* 228 */ "typename", + /* 229 */ "pps", + /* 230 */ "tseries", + /* 231 */ "dbs", + /* 232 */ "streams", + /* 233 */ "storage", + /* 234 */ "qtime", + /* 235 */ "users", + /* 236 */ "conns", + /* 237 */ "state", + /* 238 */ "keep", + /* 239 */ "tagitemlist", + /* 240 */ "cache", + /* 241 */ "replica", + /* 242 */ "quorum", + /* 243 */ "days", + /* 244 */ "minrows", + /* 245 */ "maxrows", + /* 246 */ "blocks", + /* 247 */ "ctime", + /* 248 */ "wal", + /* 249 */ "fsync", + /* 250 */ "comp", + /* 251 */ "prec", + /* 252 */ "update", + /* 253 */ "cachelast", + /* 254 */ "partitions", + /* 255 */ "signed", + /* 256 */ "create_table_args", + /* 257 */ "create_stable_args", + /* 258 */ "create_table_list", + /* 259 */ "create_from_stable", + /* 260 */ "columnlist", + /* 261 */ "tagNamelist", + /* 262 */ "select", + /* 263 */ "column", + /* 264 */ "tagitem", + /* 265 */ "selcollist", + /* 266 */ "from", + /* 267 */ "where_opt", + /* 268 */ "interval_opt", + /* 269 */ "fill_opt", + /* 270 */ "sliding_opt", + /* 271 */ "groupby_opt", + /* 272 */ "orderby_opt", + /* 273 */ "having_opt", + /* 274 */ "slimit_opt", + /* 275 */ "limit_opt", + /* 276 */ "union", + /* 277 */ "sclp", + /* 278 */ "distinct", + /* 279 */ "expr", + /* 280 */ "as", + /* 281 */ "tablelist", + /* 282 */ "tmvar", + /* 283 */ "sortlist", + /* 284 */ "sortitem", + /* 285 */ "item", + /* 286 */ "sortorder", + /* 287 */ "grouplist", + /* 288 */ "exprlist", + /* 289 */ "expritem", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1143,7 +1146,7 @@ static const char *const yyRuleName[] = { /* 56 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", /* 57 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", /* 58 */ "cmd ::= CREATE TOPIC ifnotexists ids topic_optr", - /* 59 */ "cmd ::= CREATE FUNCTION ids AS ids", + /* 59 */ "cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename", /* 60 */ "cmd ::= CREATE USER ids PASS ids", /* 61 */ "pps ::=", /* 62 */ "pps ::= PPS INTEGER", @@ -1475,52 +1478,52 @@ static void yy_destructor( ** inside the C code. */ /********* Begin destructor definitions ***************************************/ - case 236: /* keep */ - case 237: /* tagitemlist */ - case 259: /* columnlist */ - case 260: /* tagNamelist */ - case 268: /* fill_opt */ - case 270: /* groupby_opt */ - case 271: /* orderby_opt */ - case 282: /* sortlist */ - case 286: /* grouplist */ + case 238: /* keep */ + case 239: /* tagitemlist */ + case 260: /* columnlist */ + case 261: /* tagNamelist */ + case 269: /* fill_opt */ + case 271: /* groupby_opt */ + case 272: /* orderby_opt */ + case 283: /* sortlist */ + case 287: /* grouplist */ { -taosArrayDestroy((yypminor->yy209)); +taosArrayDestroy((yypminor->yy161)); } break; - case 257: /* create_table_list */ + case 258: /* create_table_list */ { -destroyCreateTableSql((yypminor->yy144)); +destroyCreateTableSql((yypminor->yy518)); } break; - case 261: /* select */ + case 262: /* select */ { -doDestroyQuerySql((yypminor->yy540)); +doDestroyQuerySql((yypminor->yy544)); } break; - case 264: /* selcollist */ - case 276: /* sclp */ - case 287: /* exprlist */ + case 265: /* selcollist */ + case 277: /* sclp */ + case 288: /* exprlist */ { -tSqlExprListDestroy((yypminor->yy246)); +tSqlExprListDestroy((yypminor->yy458)); } break; - case 266: /* where_opt */ - case 272: /* having_opt */ - case 278: /* expr */ - case 288: /* expritem */ + case 267: /* where_opt */ + case 273: /* having_opt */ + case 279: /* expr */ + case 289: /* expritem */ { -tSqlExprDestroy((yypminor->yy254)); +tSqlExprDestroy((yypminor->yy70)); } break; - case 275: /* union */ + case 276: /* union */ { -destroyAllSelectClause((yypminor->yy437)); +destroyAllSelectClause((yypminor->yy233)); } break; - case 283: /* sortitem */ + case 284: /* sortitem */ { -tVariantDestroy(&(yypminor->yy54)); +tVariantDestroy(&(yypminor->yy526)); } break; /********* End destructor definitions *****************************************/ @@ -1809,272 +1812,272 @@ static void yy_shift( /* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side ** of that rule */ static const YYCODETYPE yyRuleInfoLhs[] = { - 215, /* (0) program ::= cmd */ - 216, /* (1) cmd ::= SHOW DATABASES */ - 216, /* (2) cmd ::= SHOW TOPICS */ - 216, /* (3) cmd ::= SHOW FUNCTIONS */ - 216, /* (4) cmd ::= SHOW MNODES */ - 216, /* (5) cmd ::= SHOW DNODES */ - 216, /* (6) cmd ::= SHOW ACCOUNTS */ - 216, /* (7) cmd ::= SHOW USERS */ - 216, /* (8) cmd ::= SHOW MODULES */ - 216, /* (9) cmd ::= SHOW QUERIES */ - 216, /* (10) cmd ::= SHOW CONNECTIONS */ - 216, /* (11) cmd ::= SHOW STREAMS */ - 216, /* (12) cmd ::= SHOW VARIABLES */ - 216, /* (13) cmd ::= SHOW SCORES */ - 216, /* (14) cmd ::= SHOW GRANTS */ - 216, /* (15) cmd ::= SHOW VNODES */ - 216, /* (16) cmd ::= SHOW VNODES IPTOKEN */ - 217, /* (17) dbPrefix ::= */ - 217, /* (18) dbPrefix ::= ids DOT */ - 219, /* (19) cpxName ::= */ - 219, /* (20) cpxName ::= DOT ids */ - 216, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */ - 216, /* (22) cmd ::= SHOW CREATE DATABASE ids */ - 216, /* (23) cmd ::= SHOW dbPrefix TABLES */ - 216, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - 216, /* (25) cmd ::= SHOW dbPrefix STABLES */ - 216, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - 216, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ - 216, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ - 216, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ - 216, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ - 216, /* (31) cmd ::= DROP DATABASE ifexists ids */ - 216, /* (32) cmd ::= DROP TOPIC ifexists ids */ - 216, /* (33) cmd ::= DROP FUNCTION ids */ - 216, /* (34) cmd ::= DROP DNODE ids */ - 216, /* (35) cmd ::= DROP USER ids */ - 216, /* (36) cmd ::= DROP ACCOUNT ids */ - 216, /* (37) cmd ::= USE ids */ - 216, /* (38) cmd ::= DESCRIBE ids cpxName */ - 216, /* (39) cmd ::= ALTER USER ids PASS ids */ - 216, /* (40) cmd ::= ALTER USER ids PRIVILEGE ids */ - 216, /* (41) cmd ::= ALTER DNODE ids ids */ - 216, /* (42) cmd ::= ALTER DNODE ids ids ids */ - 216, /* (43) cmd ::= ALTER LOCAL ids */ - 216, /* (44) cmd ::= ALTER LOCAL ids ids */ - 216, /* (45) cmd ::= ALTER DATABASE ids alter_db_optr */ - 216, /* (46) cmd ::= ALTER TOPIC ids alter_topic_optr */ - 216, /* (47) cmd ::= ALTER ACCOUNT ids acct_optr */ - 216, /* (48) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - 218, /* (49) ids ::= ID */ - 218, /* (50) ids ::= STRING */ - 220, /* (51) ifexists ::= IF EXISTS */ - 220, /* (52) ifexists ::= */ - 224, /* (53) ifnotexists ::= IF NOT EXISTS */ - 224, /* (54) ifnotexists ::= */ - 216, /* (55) cmd ::= CREATE DNODE ids */ - 216, /* (56) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - 216, /* (57) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - 216, /* (58) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - 216, /* (59) cmd ::= CREATE FUNCTION ids AS ids */ - 216, /* (60) cmd ::= CREATE USER ids PASS ids */ - 227, /* (61) pps ::= */ - 227, /* (62) pps ::= PPS INTEGER */ - 228, /* (63) tseries ::= */ - 228, /* (64) tseries ::= TSERIES INTEGER */ - 229, /* (65) dbs ::= */ - 229, /* (66) dbs ::= DBS INTEGER */ - 230, /* (67) streams ::= */ - 230, /* (68) streams ::= STREAMS INTEGER */ - 231, /* (69) storage ::= */ - 231, /* (70) storage ::= STORAGE INTEGER */ - 232, /* (71) qtime ::= */ - 232, /* (72) qtime ::= QTIME INTEGER */ - 233, /* (73) users ::= */ - 233, /* (74) users ::= USERS INTEGER */ - 234, /* (75) conns ::= */ - 234, /* (76) conns ::= CONNS INTEGER */ - 235, /* (77) state ::= */ - 235, /* (78) state ::= STATE ids */ - 223, /* (79) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - 236, /* (80) keep ::= KEEP tagitemlist */ - 238, /* (81) cache ::= CACHE INTEGER */ - 239, /* (82) replica ::= REPLICA INTEGER */ - 240, /* (83) quorum ::= QUORUM INTEGER */ - 241, /* (84) days ::= DAYS INTEGER */ - 242, /* (85) minrows ::= MINROWS INTEGER */ - 243, /* (86) maxrows ::= MAXROWS INTEGER */ - 244, /* (87) blocks ::= BLOCKS INTEGER */ - 245, /* (88) ctime ::= CTIME INTEGER */ - 246, /* (89) wal ::= WAL INTEGER */ - 247, /* (90) fsync ::= FSYNC INTEGER */ - 248, /* (91) comp ::= COMP INTEGER */ - 249, /* (92) prec ::= PRECISION STRING */ - 250, /* (93) update ::= UPDATE INTEGER */ - 251, /* (94) cachelast ::= CACHELAST INTEGER */ - 252, /* (95) partitions ::= PARTITIONS INTEGER */ - 225, /* (96) db_optr ::= */ - 225, /* (97) db_optr ::= db_optr cache */ - 225, /* (98) db_optr ::= db_optr replica */ - 225, /* (99) db_optr ::= db_optr quorum */ - 225, /* (100) db_optr ::= db_optr days */ - 225, /* (101) db_optr ::= db_optr minrows */ - 225, /* (102) db_optr ::= db_optr maxrows */ - 225, /* (103) db_optr ::= db_optr blocks */ - 225, /* (104) db_optr ::= db_optr ctime */ - 225, /* (105) db_optr ::= db_optr wal */ - 225, /* (106) db_optr ::= db_optr fsync */ - 225, /* (107) db_optr ::= db_optr comp */ - 225, /* (108) db_optr ::= db_optr prec */ - 225, /* (109) db_optr ::= db_optr keep */ - 225, /* (110) db_optr ::= db_optr update */ - 225, /* (111) db_optr ::= db_optr cachelast */ - 226, /* (112) topic_optr ::= db_optr */ - 226, /* (113) topic_optr ::= topic_optr partitions */ - 221, /* (114) alter_db_optr ::= */ - 221, /* (115) alter_db_optr ::= alter_db_optr replica */ - 221, /* (116) alter_db_optr ::= alter_db_optr quorum */ - 221, /* (117) alter_db_optr ::= alter_db_optr keep */ - 221, /* (118) alter_db_optr ::= alter_db_optr blocks */ - 221, /* (119) alter_db_optr ::= alter_db_optr comp */ - 221, /* (120) alter_db_optr ::= alter_db_optr wal */ - 221, /* (121) alter_db_optr ::= alter_db_optr fsync */ - 221, /* (122) alter_db_optr ::= alter_db_optr update */ - 221, /* (123) alter_db_optr ::= alter_db_optr cachelast */ - 222, /* (124) alter_topic_optr ::= alter_db_optr */ - 222, /* (125) alter_topic_optr ::= alter_topic_optr partitions */ - 253, /* (126) typename ::= ids */ - 253, /* (127) typename ::= ids LP signed RP */ - 253, /* (128) typename ::= ids UNSIGNED */ - 254, /* (129) signed ::= INTEGER */ - 254, /* (130) signed ::= PLUS INTEGER */ - 254, /* (131) signed ::= MINUS INTEGER */ - 216, /* (132) cmd ::= CREATE TABLE create_table_args */ - 216, /* (133) cmd ::= CREATE TABLE create_stable_args */ - 216, /* (134) cmd ::= CREATE STABLE create_stable_args */ - 216, /* (135) cmd ::= CREATE TABLE create_table_list */ - 257, /* (136) create_table_list ::= create_from_stable */ - 257, /* (137) create_table_list ::= create_table_list create_from_stable */ - 255, /* (138) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - 256, /* (139) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - 258, /* (140) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - 258, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - 260, /* (142) tagNamelist ::= tagNamelist COMMA ids */ - 260, /* (143) tagNamelist ::= ids */ - 255, /* (144) create_table_args ::= ifnotexists ids cpxName AS select */ - 259, /* (145) columnlist ::= columnlist COMMA column */ - 259, /* (146) columnlist ::= column */ - 262, /* (147) column ::= ids typename */ - 237, /* (148) tagitemlist ::= tagitemlist COMMA tagitem */ - 237, /* (149) tagitemlist ::= tagitem */ - 263, /* (150) tagitem ::= INTEGER */ - 263, /* (151) tagitem ::= FLOAT */ - 263, /* (152) tagitem ::= STRING */ - 263, /* (153) tagitem ::= BOOL */ - 263, /* (154) tagitem ::= NULL */ - 263, /* (155) tagitem ::= MINUS INTEGER */ - 263, /* (156) tagitem ::= MINUS FLOAT */ - 263, /* (157) tagitem ::= PLUS INTEGER */ - 263, /* (158) tagitem ::= PLUS FLOAT */ - 261, /* (159) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - 275, /* (160) union ::= select */ - 275, /* (161) union ::= LP union RP */ - 275, /* (162) union ::= union UNION ALL select */ - 275, /* (163) union ::= union UNION ALL LP select RP */ - 216, /* (164) cmd ::= union */ - 261, /* (165) select ::= SELECT selcollist */ - 276, /* (166) sclp ::= selcollist COMMA */ - 276, /* (167) sclp ::= */ - 264, /* (168) selcollist ::= sclp distinct expr as */ - 264, /* (169) selcollist ::= sclp STAR */ - 279, /* (170) as ::= AS ids */ - 279, /* (171) as ::= ids */ - 279, /* (172) as ::= */ - 277, /* (173) distinct ::= DISTINCT */ - 277, /* (174) distinct ::= */ - 265, /* (175) from ::= FROM tablelist */ - 280, /* (176) tablelist ::= ids cpxName */ - 280, /* (177) tablelist ::= ids cpxName ids */ - 280, /* (178) tablelist ::= tablelist COMMA ids cpxName */ - 280, /* (179) tablelist ::= tablelist COMMA ids cpxName ids */ - 281, /* (180) tmvar ::= VARIABLE */ - 267, /* (181) interval_opt ::= INTERVAL LP tmvar RP */ - 267, /* (182) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - 267, /* (183) interval_opt ::= */ - 268, /* (184) fill_opt ::= */ - 268, /* (185) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - 268, /* (186) fill_opt ::= FILL LP ID RP */ - 269, /* (187) sliding_opt ::= SLIDING LP tmvar RP */ - 269, /* (188) sliding_opt ::= */ - 271, /* (189) orderby_opt ::= */ - 271, /* (190) orderby_opt ::= ORDER BY sortlist */ - 282, /* (191) sortlist ::= sortlist COMMA item sortorder */ - 282, /* (192) sortlist ::= item sortorder */ - 284, /* (193) item ::= ids cpxName */ - 285, /* (194) sortorder ::= ASC */ - 285, /* (195) sortorder ::= DESC */ - 285, /* (196) sortorder ::= */ - 270, /* (197) groupby_opt ::= */ - 270, /* (198) groupby_opt ::= GROUP BY grouplist */ - 286, /* (199) grouplist ::= grouplist COMMA item */ - 286, /* (200) grouplist ::= item */ - 272, /* (201) having_opt ::= */ - 272, /* (202) having_opt ::= HAVING expr */ - 274, /* (203) limit_opt ::= */ - 274, /* (204) limit_opt ::= LIMIT signed */ - 274, /* (205) limit_opt ::= LIMIT signed OFFSET signed */ - 274, /* (206) limit_opt ::= LIMIT signed COMMA signed */ - 273, /* (207) slimit_opt ::= */ - 273, /* (208) slimit_opt ::= SLIMIT signed */ - 273, /* (209) slimit_opt ::= SLIMIT signed SOFFSET signed */ - 273, /* (210) slimit_opt ::= SLIMIT signed COMMA signed */ - 266, /* (211) where_opt ::= */ - 266, /* (212) where_opt ::= WHERE expr */ - 278, /* (213) expr ::= LP expr RP */ - 278, /* (214) expr ::= ID */ - 278, /* (215) expr ::= ID DOT ID */ - 278, /* (216) expr ::= ID DOT STAR */ - 278, /* (217) expr ::= INTEGER */ - 278, /* (218) expr ::= MINUS INTEGER */ - 278, /* (219) expr ::= PLUS INTEGER */ - 278, /* (220) expr ::= FLOAT */ - 278, /* (221) expr ::= MINUS FLOAT */ - 278, /* (222) expr ::= PLUS FLOAT */ - 278, /* (223) expr ::= STRING */ - 278, /* (224) expr ::= NOW */ - 278, /* (225) expr ::= VARIABLE */ - 278, /* (226) expr ::= BOOL */ - 278, /* (227) expr ::= ID LP exprlist RP */ - 278, /* (228) expr ::= ID LP STAR RP */ - 278, /* (229) expr ::= expr IS NULL */ - 278, /* (230) expr ::= expr IS NOT NULL */ - 278, /* (231) expr ::= expr LT expr */ - 278, /* (232) expr ::= expr GT expr */ - 278, /* (233) expr ::= expr LE expr */ - 278, /* (234) expr ::= expr GE expr */ - 278, /* (235) expr ::= expr NE expr */ - 278, /* (236) expr ::= expr EQ expr */ - 278, /* (237) expr ::= expr BETWEEN expr AND expr */ - 278, /* (238) expr ::= expr AND expr */ - 278, /* (239) expr ::= expr OR expr */ - 278, /* (240) expr ::= expr PLUS expr */ - 278, /* (241) expr ::= expr MINUS expr */ - 278, /* (242) expr ::= expr STAR expr */ - 278, /* (243) expr ::= expr SLASH expr */ - 278, /* (244) expr ::= expr REM expr */ - 278, /* (245) expr ::= expr LIKE expr */ - 278, /* (246) expr ::= expr IN LP exprlist RP */ - 287, /* (247) exprlist ::= exprlist COMMA expritem */ - 287, /* (248) exprlist ::= expritem */ - 288, /* (249) expritem ::= expr */ - 288, /* (250) expritem ::= */ - 216, /* (251) cmd ::= RESET QUERY CACHE */ - 216, /* (252) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - 216, /* (253) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - 216, /* (254) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - 216, /* (255) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - 216, /* (256) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - 216, /* (257) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - 216, /* (258) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - 216, /* (259) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - 216, /* (260) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - 216, /* (261) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - 216, /* (262) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - 216, /* (263) cmd ::= KILL CONNECTION INTEGER */ - 216, /* (264) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - 216, /* (265) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + 216, /* (0) program ::= cmd */ + 217, /* (1) cmd ::= SHOW DATABASES */ + 217, /* (2) cmd ::= SHOW TOPICS */ + 217, /* (3) cmd ::= SHOW FUNCTIONS */ + 217, /* (4) cmd ::= SHOW MNODES */ + 217, /* (5) cmd ::= SHOW DNODES */ + 217, /* (6) cmd ::= SHOW ACCOUNTS */ + 217, /* (7) cmd ::= SHOW USERS */ + 217, /* (8) cmd ::= SHOW MODULES */ + 217, /* (9) cmd ::= SHOW QUERIES */ + 217, /* (10) cmd ::= SHOW CONNECTIONS */ + 217, /* (11) cmd ::= SHOW STREAMS */ + 217, /* (12) cmd ::= SHOW VARIABLES */ + 217, /* (13) cmd ::= SHOW SCORES */ + 217, /* (14) cmd ::= SHOW GRANTS */ + 217, /* (15) cmd ::= SHOW VNODES */ + 217, /* (16) cmd ::= SHOW VNODES IPTOKEN */ + 218, /* (17) dbPrefix ::= */ + 218, /* (18) dbPrefix ::= ids DOT */ + 220, /* (19) cpxName ::= */ + 220, /* (20) cpxName ::= DOT ids */ + 217, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */ + 217, /* (22) cmd ::= SHOW CREATE DATABASE ids */ + 217, /* (23) cmd ::= SHOW dbPrefix TABLES */ + 217, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + 217, /* (25) cmd ::= SHOW dbPrefix STABLES */ + 217, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + 217, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ + 217, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ + 217, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ + 217, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ + 217, /* (31) cmd ::= DROP DATABASE ifexists ids */ + 217, /* (32) cmd ::= DROP TOPIC ifexists ids */ + 217, /* (33) cmd ::= DROP FUNCTION ids */ + 217, /* (34) cmd ::= DROP DNODE ids */ + 217, /* (35) cmd ::= DROP USER ids */ + 217, /* (36) cmd ::= DROP ACCOUNT ids */ + 217, /* (37) cmd ::= USE ids */ + 217, /* (38) cmd ::= DESCRIBE ids cpxName */ + 217, /* (39) cmd ::= ALTER USER ids PASS ids */ + 217, /* (40) cmd ::= ALTER USER ids PRIVILEGE ids */ + 217, /* (41) cmd ::= ALTER DNODE ids ids */ + 217, /* (42) cmd ::= ALTER DNODE ids ids ids */ + 217, /* (43) cmd ::= ALTER LOCAL ids */ + 217, /* (44) cmd ::= ALTER LOCAL ids ids */ + 217, /* (45) cmd ::= ALTER DATABASE ids alter_db_optr */ + 217, /* (46) cmd ::= ALTER TOPIC ids alter_topic_optr */ + 217, /* (47) cmd ::= ALTER ACCOUNT ids acct_optr */ + 217, /* (48) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + 219, /* (49) ids ::= ID */ + 219, /* (50) ids ::= STRING */ + 221, /* (51) ifexists ::= IF EXISTS */ + 221, /* (52) ifexists ::= */ + 225, /* (53) ifnotexists ::= IF NOT EXISTS */ + 225, /* (54) ifnotexists ::= */ + 217, /* (55) cmd ::= CREATE DNODE ids */ + 217, /* (56) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + 217, /* (57) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + 217, /* (58) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ + 217, /* (59) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename */ + 217, /* (60) cmd ::= CREATE USER ids PASS ids */ + 229, /* (61) pps ::= */ + 229, /* (62) pps ::= PPS INTEGER */ + 230, /* (63) tseries ::= */ + 230, /* (64) tseries ::= TSERIES INTEGER */ + 231, /* (65) dbs ::= */ + 231, /* (66) dbs ::= DBS INTEGER */ + 232, /* (67) streams ::= */ + 232, /* (68) streams ::= STREAMS INTEGER */ + 233, /* (69) storage ::= */ + 233, /* (70) storage ::= STORAGE INTEGER */ + 234, /* (71) qtime ::= */ + 234, /* (72) qtime ::= QTIME INTEGER */ + 235, /* (73) users ::= */ + 235, /* (74) users ::= USERS INTEGER */ + 236, /* (75) conns ::= */ + 236, /* (76) conns ::= CONNS INTEGER */ + 237, /* (77) state ::= */ + 237, /* (78) state ::= STATE ids */ + 224, /* (79) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + 238, /* (80) keep ::= KEEP tagitemlist */ + 240, /* (81) cache ::= CACHE INTEGER */ + 241, /* (82) replica ::= REPLICA INTEGER */ + 242, /* (83) quorum ::= QUORUM INTEGER */ + 243, /* (84) days ::= DAYS INTEGER */ + 244, /* (85) minrows ::= MINROWS INTEGER */ + 245, /* (86) maxrows ::= MAXROWS INTEGER */ + 246, /* (87) blocks ::= BLOCKS INTEGER */ + 247, /* (88) ctime ::= CTIME INTEGER */ + 248, /* (89) wal ::= WAL INTEGER */ + 249, /* (90) fsync ::= FSYNC INTEGER */ + 250, /* (91) comp ::= COMP INTEGER */ + 251, /* (92) prec ::= PRECISION STRING */ + 252, /* (93) update ::= UPDATE INTEGER */ + 253, /* (94) cachelast ::= CACHELAST INTEGER */ + 254, /* (95) partitions ::= PARTITIONS INTEGER */ + 226, /* (96) db_optr ::= */ + 226, /* (97) db_optr ::= db_optr cache */ + 226, /* (98) db_optr ::= db_optr replica */ + 226, /* (99) db_optr ::= db_optr quorum */ + 226, /* (100) db_optr ::= db_optr days */ + 226, /* (101) db_optr ::= db_optr minrows */ + 226, /* (102) db_optr ::= db_optr maxrows */ + 226, /* (103) db_optr ::= db_optr blocks */ + 226, /* (104) db_optr ::= db_optr ctime */ + 226, /* (105) db_optr ::= db_optr wal */ + 226, /* (106) db_optr ::= db_optr fsync */ + 226, /* (107) db_optr ::= db_optr comp */ + 226, /* (108) db_optr ::= db_optr prec */ + 226, /* (109) db_optr ::= db_optr keep */ + 226, /* (110) db_optr ::= db_optr update */ + 226, /* (111) db_optr ::= db_optr cachelast */ + 227, /* (112) topic_optr ::= db_optr */ + 227, /* (113) topic_optr ::= topic_optr partitions */ + 222, /* (114) alter_db_optr ::= */ + 222, /* (115) alter_db_optr ::= alter_db_optr replica */ + 222, /* (116) alter_db_optr ::= alter_db_optr quorum */ + 222, /* (117) alter_db_optr ::= alter_db_optr keep */ + 222, /* (118) alter_db_optr ::= alter_db_optr blocks */ + 222, /* (119) alter_db_optr ::= alter_db_optr comp */ + 222, /* (120) alter_db_optr ::= alter_db_optr wal */ + 222, /* (121) alter_db_optr ::= alter_db_optr fsync */ + 222, /* (122) alter_db_optr ::= alter_db_optr update */ + 222, /* (123) alter_db_optr ::= alter_db_optr cachelast */ + 223, /* (124) alter_topic_optr ::= alter_db_optr */ + 223, /* (125) alter_topic_optr ::= alter_topic_optr partitions */ + 228, /* (126) typename ::= ids */ + 228, /* (127) typename ::= ids LP signed RP */ + 228, /* (128) typename ::= ids UNSIGNED */ + 255, /* (129) signed ::= INTEGER */ + 255, /* (130) signed ::= PLUS INTEGER */ + 255, /* (131) signed ::= MINUS INTEGER */ + 217, /* (132) cmd ::= CREATE TABLE create_table_args */ + 217, /* (133) cmd ::= CREATE TABLE create_stable_args */ + 217, /* (134) cmd ::= CREATE STABLE create_stable_args */ + 217, /* (135) cmd ::= CREATE TABLE create_table_list */ + 258, /* (136) create_table_list ::= create_from_stable */ + 258, /* (137) create_table_list ::= create_table_list create_from_stable */ + 256, /* (138) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + 257, /* (139) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + 259, /* (140) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + 259, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + 261, /* (142) tagNamelist ::= tagNamelist COMMA ids */ + 261, /* (143) tagNamelist ::= ids */ + 256, /* (144) create_table_args ::= ifnotexists ids cpxName AS select */ + 260, /* (145) columnlist ::= columnlist COMMA column */ + 260, /* (146) columnlist ::= column */ + 263, /* (147) column ::= ids typename */ + 239, /* (148) tagitemlist ::= tagitemlist COMMA tagitem */ + 239, /* (149) tagitemlist ::= tagitem */ + 264, /* (150) tagitem ::= INTEGER */ + 264, /* (151) tagitem ::= FLOAT */ + 264, /* (152) tagitem ::= STRING */ + 264, /* (153) tagitem ::= BOOL */ + 264, /* (154) tagitem ::= NULL */ + 264, /* (155) tagitem ::= MINUS INTEGER */ + 264, /* (156) tagitem ::= MINUS FLOAT */ + 264, /* (157) tagitem ::= PLUS INTEGER */ + 264, /* (158) tagitem ::= PLUS FLOAT */ + 262, /* (159) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + 276, /* (160) union ::= select */ + 276, /* (161) union ::= LP union RP */ + 276, /* (162) union ::= union UNION ALL select */ + 276, /* (163) union ::= union UNION ALL LP select RP */ + 217, /* (164) cmd ::= union */ + 262, /* (165) select ::= SELECT selcollist */ + 277, /* (166) sclp ::= selcollist COMMA */ + 277, /* (167) sclp ::= */ + 265, /* (168) selcollist ::= sclp distinct expr as */ + 265, /* (169) selcollist ::= sclp STAR */ + 280, /* (170) as ::= AS ids */ + 280, /* (171) as ::= ids */ + 280, /* (172) as ::= */ + 278, /* (173) distinct ::= DISTINCT */ + 278, /* (174) distinct ::= */ + 266, /* (175) from ::= FROM tablelist */ + 281, /* (176) tablelist ::= ids cpxName */ + 281, /* (177) tablelist ::= ids cpxName ids */ + 281, /* (178) tablelist ::= tablelist COMMA ids cpxName */ + 281, /* (179) tablelist ::= tablelist COMMA ids cpxName ids */ + 282, /* (180) tmvar ::= VARIABLE */ + 268, /* (181) interval_opt ::= INTERVAL LP tmvar RP */ + 268, /* (182) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + 268, /* (183) interval_opt ::= */ + 269, /* (184) fill_opt ::= */ + 269, /* (185) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + 269, /* (186) fill_opt ::= FILL LP ID RP */ + 270, /* (187) sliding_opt ::= SLIDING LP tmvar RP */ + 270, /* (188) sliding_opt ::= */ + 272, /* (189) orderby_opt ::= */ + 272, /* (190) orderby_opt ::= ORDER BY sortlist */ + 283, /* (191) sortlist ::= sortlist COMMA item sortorder */ + 283, /* (192) sortlist ::= item sortorder */ + 285, /* (193) item ::= ids cpxName */ + 286, /* (194) sortorder ::= ASC */ + 286, /* (195) sortorder ::= DESC */ + 286, /* (196) sortorder ::= */ + 271, /* (197) groupby_opt ::= */ + 271, /* (198) groupby_opt ::= GROUP BY grouplist */ + 287, /* (199) grouplist ::= grouplist COMMA item */ + 287, /* (200) grouplist ::= item */ + 273, /* (201) having_opt ::= */ + 273, /* (202) having_opt ::= HAVING expr */ + 275, /* (203) limit_opt ::= */ + 275, /* (204) limit_opt ::= LIMIT signed */ + 275, /* (205) limit_opt ::= LIMIT signed OFFSET signed */ + 275, /* (206) limit_opt ::= LIMIT signed COMMA signed */ + 274, /* (207) slimit_opt ::= */ + 274, /* (208) slimit_opt ::= SLIMIT signed */ + 274, /* (209) slimit_opt ::= SLIMIT signed SOFFSET signed */ + 274, /* (210) slimit_opt ::= SLIMIT signed COMMA signed */ + 267, /* (211) where_opt ::= */ + 267, /* (212) where_opt ::= WHERE expr */ + 279, /* (213) expr ::= LP expr RP */ + 279, /* (214) expr ::= ID */ + 279, /* (215) expr ::= ID DOT ID */ + 279, /* (216) expr ::= ID DOT STAR */ + 279, /* (217) expr ::= INTEGER */ + 279, /* (218) expr ::= MINUS INTEGER */ + 279, /* (219) expr ::= PLUS INTEGER */ + 279, /* (220) expr ::= FLOAT */ + 279, /* (221) expr ::= MINUS FLOAT */ + 279, /* (222) expr ::= PLUS FLOAT */ + 279, /* (223) expr ::= STRING */ + 279, /* (224) expr ::= NOW */ + 279, /* (225) expr ::= VARIABLE */ + 279, /* (226) expr ::= BOOL */ + 279, /* (227) expr ::= ID LP exprlist RP */ + 279, /* (228) expr ::= ID LP STAR RP */ + 279, /* (229) expr ::= expr IS NULL */ + 279, /* (230) expr ::= expr IS NOT NULL */ + 279, /* (231) expr ::= expr LT expr */ + 279, /* (232) expr ::= expr GT expr */ + 279, /* (233) expr ::= expr LE expr */ + 279, /* (234) expr ::= expr GE expr */ + 279, /* (235) expr ::= expr NE expr */ + 279, /* (236) expr ::= expr EQ expr */ + 279, /* (237) expr ::= expr BETWEEN expr AND expr */ + 279, /* (238) expr ::= expr AND expr */ + 279, /* (239) expr ::= expr OR expr */ + 279, /* (240) expr ::= expr PLUS expr */ + 279, /* (241) expr ::= expr MINUS expr */ + 279, /* (242) expr ::= expr STAR expr */ + 279, /* (243) expr ::= expr SLASH expr */ + 279, /* (244) expr ::= expr REM expr */ + 279, /* (245) expr ::= expr LIKE expr */ + 279, /* (246) expr ::= expr IN LP exprlist RP */ + 288, /* (247) exprlist ::= exprlist COMMA expritem */ + 288, /* (248) exprlist ::= expritem */ + 289, /* (249) expritem ::= expr */ + 289, /* (250) expritem ::= */ + 217, /* (251) cmd ::= RESET QUERY CACHE */ + 217, /* (252) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + 217, /* (253) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + 217, /* (254) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + 217, /* (255) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + 217, /* (256) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + 217, /* (257) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + 217, /* (258) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + 217, /* (259) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + 217, /* (260) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + 217, /* (261) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + 217, /* (262) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + 217, /* (263) cmd ::= KILL CONNECTION INTEGER */ + 217, /* (264) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + 217, /* (265) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; /* For rule J, yyRuleInfoNRhs[J] contains the negative of the number @@ -2139,7 +2142,7 @@ static const signed char yyRuleInfoNRhs[] = { -6, /* (56) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ -5, /* (57) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -5, /* (58) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - -5, /* (59) cmd ::= CREATE FUNCTION ids AS ids */ + -7, /* (59) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename */ -5, /* (60) cmd ::= CREATE USER ids PASS ids */ 0, /* (61) pps ::= */ -2, /* (62) pps ::= PPS INTEGER */ @@ -2608,13 +2611,13 @@ static YYACTIONTYPE yy_reduce( break; case 45: /* cmd ::= ALTER DATABASE ids alter_db_optr */ case 46: /* cmd ::= ALTER TOPIC ids alter_topic_optr */ yytestcase(yyruleno==46); -{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy560, &t);} +{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy302, &t);} break; case 47: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy205);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy231);} break; case 48: /* 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.yy205);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy231);} break; case 49: /* ids ::= ID */ case 50: /* ids ::= STRING */ yytestcase(yyruleno==50); @@ -2636,14 +2639,14 @@ static YYACTIONTYPE yy_reduce( { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} break; case 56: /* 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.yy205);} +{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy231);} break; case 57: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ case 58: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==58); -{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy560, &yymsp[-2].minor.yy0);} +{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy302, &yymsp[-2].minor.yy0);} break; - case 59: /* cmd ::= CREATE FUNCTION ids AS ids */ -{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} + case 59: /* cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename */ +{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-4].minor.yy0, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy223);} break; case 60: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} @@ -2672,20 +2675,20 @@ static YYACTIONTYPE yy_reduce( break; case 79: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy205.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy205.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy205.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy205.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy205.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy205.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy205.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy205.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy205.stat = yymsp[0].minor.yy0; -} - yymsp[-8].minor.yy205 = yylhsminor.yy205; + yylhsminor.yy231.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy231.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy231.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy231.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy231.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy231.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy231.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy231.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy231.stat = yymsp[0].minor.yy0; +} + yymsp[-8].minor.yy231 = yylhsminor.yy231; break; case 80: /* keep ::= KEEP tagitemlist */ -{ yymsp[-1].minor.yy209 = yymsp[0].minor.yy209; } +{ yymsp[-1].minor.yy161 = yymsp[0].minor.yy161; } break; case 81: /* cache ::= CACHE INTEGER */ case 82: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==82); @@ -2705,234 +2708,234 @@ static YYACTIONTYPE yy_reduce( { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 96: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy560); yymsp[1].minor.yy560.dbType = TSDB_DB_TYPE_DEFAULT;} +{setDefaultCreateDbOption(&yymsp[1].minor.yy302); yymsp[1].minor.yy302.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 97: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 98: /* db_optr ::= db_optr replica */ case 115: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==115); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 99: /* db_optr ::= db_optr quorum */ case 116: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==116); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 100: /* db_optr ::= db_optr days */ -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 101: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 102: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 103: /* db_optr ::= db_optr blocks */ case 118: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==118); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 104: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 105: /* db_optr ::= db_optr wal */ case 120: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==120); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 106: /* db_optr ::= db_optr fsync */ case 121: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==121); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 107: /* db_optr ::= db_optr comp */ case 119: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==119); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 108: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 109: /* db_optr ::= db_optr keep */ case 117: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==117); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.keep = yymsp[0].minor.yy209; } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.keep = yymsp[0].minor.yy161; } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 110: /* db_optr ::= db_optr update */ case 122: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==122); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 111: /* db_optr ::= db_optr cachelast */ case 123: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==123); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 112: /* topic_optr ::= db_optr */ case 124: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==124); -{ yylhsminor.yy560 = yymsp[0].minor.yy560; yylhsminor.yy560.dbType = TSDB_DB_TYPE_TOPIC; } - yymsp[0].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[0].minor.yy302; yylhsminor.yy302.dbType = TSDB_DB_TYPE_TOPIC; } + yymsp[0].minor.yy302 = yylhsminor.yy302; break; case 113: /* topic_optr ::= topic_optr partitions */ case 125: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==125); -{ yylhsminor.yy560 = yymsp[-1].minor.yy560; yylhsminor.yy560.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy560 = yylhsminor.yy560; +{ yylhsminor.yy302 = yymsp[-1].minor.yy302; yylhsminor.yy302.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy302 = yylhsminor.yy302; break; case 114: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy560); yymsp[1].minor.yy560.dbType = TSDB_DB_TYPE_DEFAULT;} +{ setDefaultCreateDbOption(&yymsp[1].minor.yy302); yymsp[1].minor.yy302.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 126: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSqlSetColumnType (&yylhsminor.yy369, &yymsp[0].minor.yy0); + tSqlSetColumnType (&yylhsminor.yy223, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy369 = yylhsminor.yy369; + yymsp[0].minor.yy223 = yylhsminor.yy223; break; case 127: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy55 <= 0) { + if (yymsp[-1].minor.yy369 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSqlSetColumnType(&yylhsminor.yy369, &yymsp[-3].minor.yy0); + tSqlSetColumnType(&yylhsminor.yy223, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy55; // negative value of name length - tSqlSetColumnType(&yylhsminor.yy369, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy369; // negative value of name length + tSqlSetColumnType(&yylhsminor.yy223, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy369 = yylhsminor.yy369; + yymsp[-3].minor.yy223 = yylhsminor.yy223; break; case 128: /* 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); - tSqlSetColumnType (&yylhsminor.yy369, &yymsp[-1].minor.yy0); + tSqlSetColumnType (&yylhsminor.yy223, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy369 = yylhsminor.yy369; + yymsp[-1].minor.yy223 = yylhsminor.yy223; break; case 129: /* signed ::= INTEGER */ -{ yylhsminor.yy55 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy55 = yylhsminor.yy55; +{ yylhsminor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy369 = yylhsminor.yy369; break; case 130: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy55 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yymsp[-1].minor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 131: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy55 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} +{ yymsp[-1].minor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 135: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy144;} +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy518;} break; case 136: /* create_table_list ::= create_from_stable */ { SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy34); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy356); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy144 = pCreateTable; + yylhsminor.yy518 = pCreateTable; } - yymsp[0].minor.yy144 = yylhsminor.yy144; + yymsp[0].minor.yy518 = yylhsminor.yy518; break; case 137: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy144->childTableInfo, &yymsp[0].minor.yy34); - yylhsminor.yy144 = yymsp[-1].minor.yy144; + taosArrayPush(yymsp[-1].minor.yy518->childTableInfo, &yymsp[0].minor.yy356); + yylhsminor.yy518 = yymsp[-1].minor.yy518; } - yymsp[-1].minor.yy144 = yylhsminor.yy144; + yymsp[-1].minor.yy518 = yylhsminor.yy518; break; case 138: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy144 = tSetCreateSqlElems(yymsp[-1].minor.yy209, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy144, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy518 = tSetCreateSqlElems(yymsp[-1].minor.yy161, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy518, 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.yy144 = yylhsminor.yy144; + yymsp[-5].minor.yy518 = yylhsminor.yy518; break; case 139: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy144 = tSetCreateSqlElems(yymsp[-5].minor.yy209, yymsp[-1].minor.yy209, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy144, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy518 = tSetCreateSqlElems(yymsp[-5].minor.yy161, yymsp[-1].minor.yy161, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy518, 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.yy144 = yylhsminor.yy144; + yymsp[-9].minor.yy518 = yylhsminor.yy518; break; case 140: /* 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.yy34 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy209, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy356 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy161, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy34 = yylhsminor.yy34; + yymsp[-9].minor.yy356 = yylhsminor.yy356; break; case 141: /* 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.yy34 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy209, yymsp[-1].minor.yy209, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yylhsminor.yy356 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy161, yymsp[-1].minor.yy161, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy34 = yylhsminor.yy34; + yymsp[-12].minor.yy356 = yylhsminor.yy356; break; case 142: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy209, &yymsp[0].minor.yy0); yylhsminor.yy209 = yymsp[-2].minor.yy209; } - yymsp[-2].minor.yy209 = yylhsminor.yy209; +{taosArrayPush(yymsp[-2].minor.yy161, &yymsp[0].minor.yy0); yylhsminor.yy161 = yymsp[-2].minor.yy161; } + yymsp[-2].minor.yy161 = yylhsminor.yy161; break; case 143: /* tagNamelist ::= ids */ -{yylhsminor.yy209 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy209, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy209 = yylhsminor.yy209; +{yylhsminor.yy161 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy161, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy161 = yylhsminor.yy161; break; case 144: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy144 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy540, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy144, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy518 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy544, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy518, 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.yy144 = yylhsminor.yy144; + yymsp[-4].minor.yy518 = yylhsminor.yy518; break; case 145: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy209, &yymsp[0].minor.yy369); yylhsminor.yy209 = yymsp[-2].minor.yy209; } - yymsp[-2].minor.yy209 = yylhsminor.yy209; +{taosArrayPush(yymsp[-2].minor.yy161, &yymsp[0].minor.yy223); yylhsminor.yy161 = yymsp[-2].minor.yy161; } + yymsp[-2].minor.yy161 = yylhsminor.yy161; break; case 146: /* columnlist ::= column */ -{yylhsminor.yy209 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy209, &yymsp[0].minor.yy369);} - yymsp[0].minor.yy209 = yylhsminor.yy209; +{yylhsminor.yy161 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy161, &yymsp[0].minor.yy223);} + yymsp[0].minor.yy161 = yylhsminor.yy161; break; case 147: /* column ::= ids typename */ { - tSqlSetColumnInfo(&yylhsminor.yy369, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy369); + tSqlSetColumnInfo(&yylhsminor.yy223, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy223); } - yymsp[-1].minor.yy369 = yylhsminor.yy369; + yymsp[-1].minor.yy223 = yylhsminor.yy223; break; case 148: /* tagitemlist ::= tagitemlist COMMA tagitem */ -{ yylhsminor.yy209 = tVariantListAppend(yymsp[-2].minor.yy209, &yymsp[0].minor.yy54, -1); } - yymsp[-2].minor.yy209 = yylhsminor.yy209; +{ yylhsminor.yy161 = tVariantListAppend(yymsp[-2].minor.yy161, &yymsp[0].minor.yy526, -1); } + yymsp[-2].minor.yy161 = yylhsminor.yy161; break; case 149: /* tagitemlist ::= tagitem */ -{ yylhsminor.yy209 = tVariantListAppend(NULL, &yymsp[0].minor.yy54, -1); } - yymsp[0].minor.yy209 = yylhsminor.yy209; +{ yylhsminor.yy161 = tVariantListAppend(NULL, &yymsp[0].minor.yy526, -1); } + yymsp[0].minor.yy161 = yylhsminor.yy161; break; case 150: /* tagitem ::= INTEGER */ case 151: /* tagitem ::= FLOAT */ yytestcase(yyruleno==151); case 152: /* tagitem ::= STRING */ yytestcase(yyruleno==152); case 153: /* tagitem ::= BOOL */ yytestcase(yyruleno==153); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy54, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy54 = yylhsminor.yy54; +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy526, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy526 = yylhsminor.yy526; break; case 154: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy54, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy54 = yylhsminor.yy54; +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy526, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy526 = yylhsminor.yy526; break; case 155: /* tagitem ::= MINUS INTEGER */ case 156: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==156); @@ -2942,59 +2945,59 @@ static YYACTIONTYPE 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.yy54, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy526, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy54 = yylhsminor.yy54; + yymsp[-1].minor.yy526 = yylhsminor.yy526; break; case 159: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy540 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy246, yymsp[-9].minor.yy209, yymsp[-8].minor.yy254, yymsp[-4].minor.yy209, yymsp[-3].minor.yy209, &yymsp[-7].minor.yy102, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy209, &yymsp[0].minor.yy534, &yymsp[-1].minor.yy534); + yylhsminor.yy544 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy458, yymsp[-9].minor.yy161, yymsp[-8].minor.yy70, yymsp[-4].minor.yy161, yymsp[-3].minor.yy161, &yymsp[-7].minor.yy300, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy161, &yymsp[0].minor.yy394, &yymsp[-1].minor.yy394); } - yymsp[-11].minor.yy540 = yylhsminor.yy540; + yymsp[-11].minor.yy544 = yylhsminor.yy544; break; case 160: /* union ::= select */ -{ yylhsminor.yy437 = setSubclause(NULL, yymsp[0].minor.yy540); } - yymsp[0].minor.yy437 = yylhsminor.yy437; +{ yylhsminor.yy233 = setSubclause(NULL, yymsp[0].minor.yy544); } + yymsp[0].minor.yy233 = yylhsminor.yy233; break; case 161: /* union ::= LP union RP */ -{ yymsp[-2].minor.yy437 = yymsp[-1].minor.yy437; } +{ yymsp[-2].minor.yy233 = yymsp[-1].minor.yy233; } break; case 162: /* union ::= union UNION ALL select */ -{ yylhsminor.yy437 = appendSelectClause(yymsp[-3].minor.yy437, yymsp[0].minor.yy540); } - yymsp[-3].minor.yy437 = yylhsminor.yy437; +{ yylhsminor.yy233 = appendSelectClause(yymsp[-3].minor.yy233, yymsp[0].minor.yy544); } + yymsp[-3].minor.yy233 = yylhsminor.yy233; break; case 163: /* union ::= union UNION ALL LP select RP */ -{ yylhsminor.yy437 = appendSelectClause(yymsp[-5].minor.yy437, yymsp[-1].minor.yy540); } - yymsp[-5].minor.yy437 = yylhsminor.yy437; +{ yylhsminor.yy233 = appendSelectClause(yymsp[-5].minor.yy233, yymsp[-1].minor.yy544); } + yymsp[-5].minor.yy233 = yylhsminor.yy233; break; case 164: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy437, NULL, TSDB_SQL_SELECT); } +{ setSqlInfo(pInfo, yymsp[0].minor.yy233, NULL, TSDB_SQL_SELECT); } break; case 165: /* select ::= SELECT selcollist */ { - yylhsminor.yy540 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy246, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy544 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy458, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy540 = yylhsminor.yy540; + yymsp[-1].minor.yy544 = yylhsminor.yy544; break; case 166: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy246 = yymsp[-1].minor.yy246;} - yymsp[-1].minor.yy246 = yylhsminor.yy246; +{yylhsminor.yy458 = yymsp[-1].minor.yy458;} + yymsp[-1].minor.yy458 = yylhsminor.yy458; break; case 167: /* sclp ::= */ -{yymsp[1].minor.yy246 = 0;} +{yymsp[1].minor.yy458 = 0;} break; case 168: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy246 = tSqlExprListAppend(yymsp[-3].minor.yy246, yymsp[-1].minor.yy254, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy458 = tSqlExprListAppend(yymsp[-3].minor.yy458, yymsp[-1].minor.yy70, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy246 = yylhsminor.yy246; + yymsp[-3].minor.yy458 = yylhsminor.yy458; break; case 169: /* selcollist ::= sclp STAR */ { tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL); - yylhsminor.yy246 = tSqlExprListAppend(yymsp[-1].minor.yy246, pNode, 0, 0); + yylhsminor.yy458 = tSqlExprListAppend(yymsp[-1].minor.yy458, pNode, 0, 0); } - yymsp[-1].minor.yy246 = yylhsminor.yy246; + yymsp[-1].minor.yy458 = yylhsminor.yy458; break; case 170: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } @@ -3011,61 +3014,61 @@ static YYACTIONTYPE yy_reduce( yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 175: /* from ::= FROM tablelist */ -{yymsp[-1].minor.yy209 = yymsp[0].minor.yy209;} +{yymsp[-1].minor.yy161 = yymsp[0].minor.yy161;} break; case 176: /* tablelist ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy209 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); - yylhsminor.yy209 = tVariantListAppendToken(yylhsminor.yy209, &yymsp[-1].minor.yy0, -1); // table alias name + yylhsminor.yy161 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(yylhsminor.yy161, &yymsp[-1].minor.yy0, -1); // table alias name } - yymsp[-1].minor.yy209 = yylhsminor.yy209; + yymsp[-1].minor.yy161 = yylhsminor.yy161; break; case 177: /* 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.yy209 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - yylhsminor.yy209 = tVariantListAppendToken(yylhsminor.yy209, &yymsp[0].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(yylhsminor.yy161, &yymsp[0].minor.yy0, -1); } - yymsp[-2].minor.yy209 = yylhsminor.yy209; + yymsp[-2].minor.yy161 = yylhsminor.yy161; break; case 178: /* tablelist ::= tablelist COMMA ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy209 = tVariantListAppendToken(yymsp[-3].minor.yy209, &yymsp[-1].minor.yy0, -1); - yylhsminor.yy209 = tVariantListAppendToken(yylhsminor.yy209, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(yymsp[-3].minor.yy161, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(yylhsminor.yy161, &yymsp[-1].minor.yy0, -1); } - yymsp[-3].minor.yy209 = yylhsminor.yy209; + yymsp[-3].minor.yy161 = yylhsminor.yy161; break; case 179: /* tablelist ::= tablelist COMMA 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.yy209 = tVariantListAppendToken(yymsp[-4].minor.yy209, &yymsp[-2].minor.yy0, -1); - yylhsminor.yy209 = tVariantListAppendToken(yylhsminor.yy209, &yymsp[0].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(yymsp[-4].minor.yy161, &yymsp[-2].minor.yy0, -1); + yylhsminor.yy161 = tVariantListAppendToken(yylhsminor.yy161, &yymsp[0].minor.yy0, -1); } - yymsp[-4].minor.yy209 = yylhsminor.yy209; + yymsp[-4].minor.yy161 = yylhsminor.yy161; break; case 180: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 181: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy102.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy102.offset.n = 0; yymsp[-3].minor.yy102.offset.z = NULL; yymsp[-3].minor.yy102.offset.type = 0;} +{yymsp[-3].minor.yy300.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy300.offset.n = 0; yymsp[-3].minor.yy300.offset.z = NULL; yymsp[-3].minor.yy300.offset.type = 0;} break; case 182: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy102.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy102.offset = yymsp[-1].minor.yy0;} +{yymsp[-5].minor.yy300.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy300.offset = yymsp[-1].minor.yy0;} break; case 183: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy102, 0, sizeof(yymsp[1].minor.yy102));} +{memset(&yymsp[1].minor.yy300, 0, sizeof(yymsp[1].minor.yy300));} break; case 184: /* fill_opt ::= */ -{yymsp[1].minor.yy209 = 0; } +{yymsp[1].minor.yy161 = 0; } break; case 185: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { @@ -3073,14 +3076,14 @@ static YYACTIONTYPE yy_reduce( toTSDBType(yymsp[-3].minor.yy0.type); tVariantCreate(&A, &yymsp[-3].minor.yy0); - tVariantListInsert(yymsp[-1].minor.yy209, &A, -1, 0); - yymsp[-5].minor.yy209 = yymsp[-1].minor.yy209; + tVariantListInsert(yymsp[-1].minor.yy161, &A, -1, 0); + yymsp[-5].minor.yy161 = yymsp[-1].minor.yy161; } break; case 186: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy209 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy161 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; case 187: /* sliding_opt ::= SLIDING LP tmvar RP */ @@ -3090,229 +3093,229 @@ static YYACTIONTYPE 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 ::= */ -{yymsp[1].minor.yy209 = 0;} +{yymsp[1].minor.yy161 = 0;} break; case 190: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy209 = yymsp[0].minor.yy209;} +{yymsp[-2].minor.yy161 = yymsp[0].minor.yy161;} break; case 191: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy209 = tVariantListAppend(yymsp[-3].minor.yy209, &yymsp[-1].minor.yy54, yymsp[0].minor.yy332); + yylhsminor.yy161 = tVariantListAppend(yymsp[-3].minor.yy161, &yymsp[-1].minor.yy526, yymsp[0].minor.yy452); } - yymsp[-3].minor.yy209 = yylhsminor.yy209; + yymsp[-3].minor.yy161 = yylhsminor.yy161; break; case 192: /* sortlist ::= item sortorder */ { - yylhsminor.yy209 = tVariantListAppend(NULL, &yymsp[-1].minor.yy54, yymsp[0].minor.yy332); + yylhsminor.yy161 = tVariantListAppend(NULL, &yymsp[-1].minor.yy526, yymsp[0].minor.yy452); } - yymsp[-1].minor.yy209 = yylhsminor.yy209; + yymsp[-1].minor.yy161 = yylhsminor.yy161; break; case 193: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy54, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy526, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy54 = yylhsminor.yy54; + yymsp[-1].minor.yy526 = yylhsminor.yy526; break; case 194: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy332 = TSDB_ORDER_ASC; } +{ yymsp[0].minor.yy452 = TSDB_ORDER_ASC; } break; case 195: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy332 = TSDB_ORDER_DESC;} +{ yymsp[0].minor.yy452 = TSDB_ORDER_DESC;} break; case 196: /* sortorder ::= */ -{ yymsp[1].minor.yy332 = TSDB_ORDER_ASC; } +{ yymsp[1].minor.yy452 = TSDB_ORDER_ASC; } break; case 197: /* groupby_opt ::= */ -{ yymsp[1].minor.yy209 = 0;} +{ yymsp[1].minor.yy161 = 0;} break; case 198: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy209 = yymsp[0].minor.yy209;} +{ yymsp[-2].minor.yy161 = yymsp[0].minor.yy161;} break; case 199: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy209 = tVariantListAppend(yymsp[-2].minor.yy209, &yymsp[0].minor.yy54, -1); + yylhsminor.yy161 = tVariantListAppend(yymsp[-2].minor.yy161, &yymsp[0].minor.yy526, -1); } - yymsp[-2].minor.yy209 = yylhsminor.yy209; + yymsp[-2].minor.yy161 = yylhsminor.yy161; break; case 200: /* grouplist ::= item */ { - yylhsminor.yy209 = tVariantListAppend(NULL, &yymsp[0].minor.yy54, -1); + yylhsminor.yy161 = tVariantListAppend(NULL, &yymsp[0].minor.yy526, -1); } - yymsp[0].minor.yy209 = yylhsminor.yy209; + yymsp[0].minor.yy161 = yylhsminor.yy161; break; case 201: /* having_opt ::= */ case 211: /* where_opt ::= */ yytestcase(yyruleno==211); case 250: /* expritem ::= */ yytestcase(yyruleno==250); -{yymsp[1].minor.yy254 = 0;} +{yymsp[1].minor.yy70 = 0;} break; case 202: /* having_opt ::= HAVING expr */ case 212: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==212); -{yymsp[-1].minor.yy254 = yymsp[0].minor.yy254;} +{yymsp[-1].minor.yy70 = yymsp[0].minor.yy70;} break; case 203: /* limit_opt ::= */ case 207: /* slimit_opt ::= */ yytestcase(yyruleno==207); -{yymsp[1].minor.yy534.limit = -1; yymsp[1].minor.yy534.offset = 0;} +{yymsp[1].minor.yy394.limit = -1; yymsp[1].minor.yy394.offset = 0;} break; case 204: /* limit_opt ::= LIMIT signed */ case 208: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==208); -{yymsp[-1].minor.yy534.limit = yymsp[0].minor.yy55; yymsp[-1].minor.yy534.offset = 0;} +{yymsp[-1].minor.yy394.limit = yymsp[0].minor.yy369; yymsp[-1].minor.yy394.offset = 0;} break; case 205: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy534.limit = yymsp[-2].minor.yy55; yymsp[-3].minor.yy534.offset = yymsp[0].minor.yy55;} +{ yymsp[-3].minor.yy394.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy394.offset = yymsp[0].minor.yy369;} break; case 206: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy534.limit = yymsp[0].minor.yy55; yymsp[-3].minor.yy534.offset = yymsp[-2].minor.yy55;} +{ yymsp[-3].minor.yy394.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy394.offset = yymsp[-2].minor.yy369;} break; case 209: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy534.limit = yymsp[-2].minor.yy55; yymsp[-3].minor.yy534.offset = yymsp[0].minor.yy55;} +{yymsp[-3].minor.yy394.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy394.offset = yymsp[0].minor.yy369;} break; case 210: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy534.limit = yymsp[0].minor.yy55; yymsp[-3].minor.yy534.offset = yymsp[-2].minor.yy55;} +{yymsp[-3].minor.yy394.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy394.offset = yymsp[-2].minor.yy369;} break; case 213: /* expr ::= LP expr RP */ -{yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy254->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = yymsp[-1].minor.yy70; yylhsminor.yy70->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy70->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 214: /* expr ::= ID */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 215: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 216: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 217: /* expr ::= INTEGER */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 218: /* expr ::= MINUS INTEGER */ case 219: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==219); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy254 = yylhsminor.yy254; +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy70 = yylhsminor.yy70; break; case 220: /* expr ::= FLOAT */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 221: /* expr ::= MINUS FLOAT */ case 222: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==222); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy254 = yylhsminor.yy254; +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy70 = yylhsminor.yy70; break; case 223: /* expr ::= STRING */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 224: /* expr ::= NOW */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 225: /* expr ::= VARIABLE */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 226: /* expr ::= BOOL */ -{ yylhsminor.yy254 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 227: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy254 = tSqlExprCreateFunction(yymsp[-1].minor.yy246, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprCreateFunction(yymsp[-1].minor.yy458, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy70 = yylhsminor.yy70; break; case 228: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy254 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy254 = yylhsminor.yy254; +{ yylhsminor.yy70 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy70 = yylhsminor.yy70; break; case 229: /* expr ::= expr IS NULL */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, NULL, TK_ISNULL);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, NULL, TK_ISNULL);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 230: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-3].minor.yy254, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-3].minor.yy70, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy70 = yylhsminor.yy70; break; case 231: /* expr ::= expr LT expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_LT);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_LT);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 232: /* expr ::= expr GT expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_GT);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_GT);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 233: /* expr ::= expr LE expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_LE);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_LE);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 234: /* expr ::= expr GE expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_GE);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_GE);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 235: /* expr ::= expr NE expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_NE);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_NE);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 236: /* expr ::= expr EQ expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_EQ);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_EQ);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 237: /* expr ::= expr BETWEEN expr AND expr */ -{ tSQLExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy254); yylhsminor.yy254 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy254, yymsp[-2].minor.yy254, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy254, TK_LE), TK_AND);} - yymsp[-4].minor.yy254 = yylhsminor.yy254; +{ tSQLExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy70); yylhsminor.yy70 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy70, yymsp[-2].minor.yy70, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy70, TK_LE), TK_AND);} + yymsp[-4].minor.yy70 = yylhsminor.yy70; break; case 238: /* expr ::= expr AND expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_AND);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_AND);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 239: /* expr ::= expr OR expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_OR); } - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_OR); } + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 240: /* expr ::= expr PLUS expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_PLUS); } - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_PLUS); } + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 241: /* expr ::= expr MINUS expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_MINUS); } - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_MINUS); } + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 242: /* expr ::= expr STAR expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_STAR); } - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_STAR); } + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 243: /* expr ::= expr SLASH expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_DIVIDE);} - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_DIVIDE);} + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 244: /* expr ::= expr REM expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_REM); } - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_REM); } + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 245: /* expr ::= expr LIKE expr */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-2].minor.yy254, yymsp[0].minor.yy254, TK_LIKE); } - yymsp[-2].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-2].minor.yy70, yymsp[0].minor.yy70, TK_LIKE); } + yymsp[-2].minor.yy70 = yylhsminor.yy70; break; case 246: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy254 = tSqlExprCreate(yymsp[-4].minor.yy254, (tSQLExpr*)yymsp[-1].minor.yy246, TK_IN); } - yymsp[-4].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = tSqlExprCreate(yymsp[-4].minor.yy70, (tSQLExpr*)yymsp[-1].minor.yy458, TK_IN); } + yymsp[-4].minor.yy70 = yylhsminor.yy70; break; case 247: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy246 = tSqlExprListAppend(yymsp[-2].minor.yy246,yymsp[0].minor.yy254,0, 0);} - yymsp[-2].minor.yy246 = yylhsminor.yy246; +{yylhsminor.yy458 = tSqlExprListAppend(yymsp[-2].minor.yy458,yymsp[0].minor.yy70,0, 0);} + yymsp[-2].minor.yy458 = yylhsminor.yy458; break; case 248: /* exprlist ::= expritem */ -{yylhsminor.yy246 = tSqlExprListAppend(0,yymsp[0].minor.yy254,0, 0);} - yymsp[0].minor.yy246 = yylhsminor.yy246; +{yylhsminor.yy458 = tSqlExprListAppend(0,yymsp[0].minor.yy70,0, 0);} + yymsp[0].minor.yy458 = yylhsminor.yy458; break; case 249: /* expritem ::= expr */ -{yylhsminor.yy254 = yymsp[0].minor.yy254;} - yymsp[0].minor.yy254 = yylhsminor.yy254; +{yylhsminor.yy70 = yymsp[0].minor.yy70;} + yymsp[0].minor.yy70 = yylhsminor.yy70; break; case 251: /* cmd ::= RESET QUERY CACHE */ { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} @@ -3320,7 +3323,7 @@ static YYACTIONTYPE yy_reduce( case 252: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy209, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy161, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; @@ -3338,7 +3341,7 @@ static YYACTIONTYPE yy_reduce( case 254: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy209, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy161, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; @@ -3373,7 +3376,7 @@ static YYACTIONTYPE yy_reduce( toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tVariantListAppend(A, &yymsp[0].minor.yy54, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy526, -1); SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); @@ -3382,7 +3385,7 @@ static YYACTIONTYPE yy_reduce( case 258: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy209, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy161, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; @@ -3400,7 +3403,7 @@ static YYACTIONTYPE yy_reduce( case 260: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy209, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy161, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; -- GitLab