From 5342e859f7b931464aa7e606acf4183647c31852 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 14 Jan 2021 11:10:27 +0000 Subject: [PATCH 01/34] TD-2571 --- src/inc/ttokendef.h | 397 ++--- src/query/inc/qSqlparser.h | 3 +- src/query/inc/sql.y | 14 +- src/query/src/qParserImpl.c | 3 +- src/query/src/qTokenizer.c | 1 + src/query/src/sql.c | 3238 +++++++++++++++++------------------ 6 files changed, 1786 insertions(+), 1870 deletions(-) diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index 09500fc8c5..bc11f84e62 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -16,105 +16,106 @@ #ifndef TDENGINE_TTOKENDEF_H #define TDENGINE_TTOKENDEF_H -#define TK_ID 1 -#define TK_BOOL 2 -#define TK_TINYINT 3 -#define TK_SMALLINT 4 -#define TK_INTEGER 5 -#define TK_BIGINT 6 -#define TK_FLOAT 7 -#define TK_DOUBLE 8 -#define TK_STRING 9 -#define TK_TIMESTAMP 10 -#define TK_BINARY 11 -#define TK_NCHAR 12 -#define TK_OR 13 -#define TK_AND 14 -#define TK_NOT 15 -#define TK_EQ 16 -#define TK_NE 17 -#define TK_ISNULL 18 -#define TK_NOTNULL 19 -#define TK_IS 20 -#define TK_LIKE 21 -#define TK_GLOB 22 -#define TK_BETWEEN 23 -#define TK_IN 24 -#define TK_GT 25 -#define TK_GE 26 -#define TK_LT 27 -#define TK_LE 28 -#define TK_BITAND 29 -#define TK_BITOR 30 -#define TK_LSHIFT 31 -#define TK_RSHIFT 32 -#define TK_PLUS 33 -#define TK_MINUS 34 -#define TK_DIVIDE 35 -#define TK_TIMES 36 -#define TK_STAR 37 -#define TK_SLASH 38 -#define TK_REM 39 -#define TK_CONCAT 40 -#define TK_UMINUS 41 -#define TK_UPLUS 42 -#define TK_BITNOT 43 -#define TK_SHOW 44 -#define TK_DATABASES 45 -#define TK_MNODES 46 -#define TK_DNODES 47 -#define TK_ACCOUNTS 48 -#define TK_USERS 49 -#define TK_MODULES 50 -#define TK_QUERIES 51 -#define TK_CONNECTIONS 52 -#define TK_STREAMS 53 -#define TK_VARIABLES 54 -#define TK_SCORES 55 -#define TK_GRANTS 56 -#define TK_VNODES 57 -#define TK_IPTOKEN 58 -#define TK_DOT 59 -#define TK_CREATE 60 -#define TK_TABLE 61 -#define TK_DATABASE 62 -#define TK_TABLES 63 -#define TK_STABLES 64 -#define TK_VGROUPS 65 -#define TK_DROP 66 -#define TK_DNODE 67 -#define TK_USER 68 -#define TK_ACCOUNT 69 -#define TK_USE 70 -#define TK_DESCRIBE 71 -#define TK_ALTER 72 -#define TK_PASS 73 -#define TK_PRIVILEGE 74 -#define TK_LOCAL 75 -#define TK_IF 76 -#define TK_EXISTS 77 -#define TK_PPS 78 -#define TK_TSERIES 79 -#define TK_DBS 80 -#define TK_STORAGE 81 -#define TK_QTIME 82 -#define TK_CONNS 83 -#define TK_STATE 84 -#define TK_KEEP 85 -#define TK_CACHE 86 -#define TK_REPLICA 87 -#define TK_QUORUM 88 -#define TK_DAYS 89 -#define TK_MINROWS 90 -#define TK_MAXROWS 91 -#define TK_BLOCKS 92 -#define TK_CTIME 93 -#define TK_WAL 94 -#define TK_FSYNC 95 -#define TK_COMP 96 -#define TK_PRECISION 97 -#define TK_UPDATE 98 -#define TK_CACHELAST 99 + +#define TK_ID 1 +#define TK_BOOL 2 +#define TK_TINYINT 3 +#define TK_SMALLINT 4 +#define TK_INTEGER 5 +#define TK_BIGINT 6 +#define TK_FLOAT 7 +#define TK_DOUBLE 8 +#define TK_STRING 9 +#define TK_TIMESTAMP 10 +#define TK_BINARY 11 +#define TK_NCHAR 12 +#define TK_OR 13 +#define TK_AND 14 +#define TK_NOT 15 +#define TK_EQ 16 +#define TK_NE 17 +#define TK_ISNULL 18 +#define TK_NOTNULL 19 +#define TK_IS 20 +#define TK_LIKE 21 +#define TK_GLOB 22 +#define TK_BETWEEN 23 +#define TK_IN 24 +#define TK_GT 25 +#define TK_GE 26 +#define TK_LT 27 +#define TK_LE 28 +#define TK_BITAND 29 +#define TK_BITOR 30 +#define TK_LSHIFT 31 +#define TK_RSHIFT 32 +#define TK_PLUS 33 +#define TK_MINUS 34 +#define TK_DIVIDE 35 +#define TK_TIMES 36 +#define TK_STAR 37 +#define TK_SLASH 38 +#define TK_REM 39 +#define TK_CONCAT 40 +#define TK_UMINUS 41 +#define TK_UPLUS 42 +#define TK_BITNOT 43 +#define TK_SHOW 44 +#define TK_DATABASES 45 +#define TK_MNODES 46 +#define TK_DNODES 47 +#define TK_ACCOUNTS 48 +#define TK_USERS 49 +#define TK_MODULES 50 +#define TK_QUERIES 51 +#define TK_CONNECTIONS 52 +#define TK_STREAMS 53 +#define TK_VARIABLES 54 +#define TK_SCORES 55 +#define TK_GRANTS 56 +#define TK_VNODES 57 +#define TK_IPTOKEN 58 +#define TK_DOT 59 +#define TK_CREATE 60 +#define TK_TABLE 61 +#define TK_DATABASE 62 +#define TK_TABLES 63 +#define TK_STABLES 64 +#define TK_VGROUPS 65 +#define TK_DROP 66 +#define TK_DNODE 67 +#define TK_USER 68 +#define TK_ACCOUNT 69 +#define TK_USE 70 +#define TK_DESCRIBE 71 +#define TK_ALTER 72 +#define TK_PASS 73 +#define TK_PRIVILEGE 74 +#define TK_LOCAL 75 +#define TK_IF 76 +#define TK_EXISTS 77 +#define TK_PPS 78 +#define TK_TSERIES 79 +#define TK_DBS 80 +#define TK_STORAGE 81 +#define TK_QTIME 82 +#define TK_CONNS 83 +#define TK_STATE 84 +#define TK_KEEP 85 +#define TK_CACHE 86 +#define TK_REPLICA 87 +#define TK_QUORUM 88 +#define TK_DAYS 89 +#define TK_MINROWS 90 +#define TK_MAXROWS 91 +#define TK_BLOCKS 92 +#define TK_CTIME 93 +#define TK_WAL 94 +#define TK_FSYNC 95 +#define TK_COMP 96 +#define TK_PRECISION 97 +#define TK_UPDATE 98 +#define TK_CACHELAST 99 #define TK_LP 100 #define TK_RP 101 #define TK_UNSIGNED 102 @@ -126,105 +127,105 @@ #define TK_SELECT 108 #define TK_UNION 109 #define TK_ALL 110 -#define TK_FROM 111 -#define TK_VARIABLE 112 -#define TK_INTERVAL 113 -#define TK_FILL 114 -#define TK_SLIDING 115 -#define TK_ORDER 116 -#define TK_BY 117 -#define TK_ASC 118 -#define TK_DESC 119 -#define TK_GROUP 120 -#define TK_HAVING 121 -#define TK_LIMIT 122 -#define TK_OFFSET 123 -#define TK_SLIMIT 124 -#define TK_SOFFSET 125 -#define TK_WHERE 126 -#define TK_NOW 127 -#define TK_RESET 128 -#define TK_QUERY 129 -#define TK_ADD 130 -#define TK_COLUMN 131 -#define TK_TAG 132 -#define TK_CHANGE 133 -#define TK_SET 134 -#define TK_KILL 135 -#define TK_CONNECTION 136 -#define TK_STREAM 137 -#define TK_COLON 138 -#define TK_ABORT 139 -#define TK_AFTER 140 -#define TK_ATTACH 141 -#define TK_BEFORE 142 -#define TK_BEGIN 143 -#define TK_CASCADE 144 -#define TK_CLUSTER 145 -#define TK_CONFLICT 146 -#define TK_COPY 147 -#define TK_DEFERRED 148 -#define TK_DELIMITERS 149 -#define TK_DETACH 150 -#define TK_EACH 151 -#define TK_END 152 -#define TK_EXPLAIN 153 -#define TK_FAIL 154 -#define TK_FOR 155 -#define TK_IGNORE 156 -#define TK_IMMEDIATE 157 -#define TK_INITIALLY 158 -#define TK_INSTEAD 159 -#define TK_MATCH 160 -#define TK_KEY 161 -#define TK_OF 162 -#define TK_RAISE 163 -#define TK_REPLACE 164 -#define TK_RESTRICT 165 -#define TK_ROW 166 -#define TK_STATEMENT 167 -#define TK_TRIGGER 168 -#define TK_VIEW 169 -#define TK_COUNT 170 -#define TK_SUM 171 -#define TK_AVG 172 -#define TK_MIN 173 -#define TK_MAX 174 -#define TK_FIRST 175 -#define TK_LAST 176 -#define TK_TOP 177 -#define TK_BOTTOM 178 -#define TK_STDDEV 179 -#define TK_PERCENTILE 180 -#define TK_APERCENTILE 181 -#define TK_LEASTSQUARES 182 -#define TK_HISTOGRAM 183 -#define TK_DIFF 184 -#define TK_SPREAD 185 -#define TK_TWA 186 -#define TK_INTERP 187 -#define TK_LAST_ROW 188 -#define TK_RATE 189 -#define TK_IRATE 190 -#define TK_SUM_RATE 191 -#define TK_SUM_IRATE 192 -#define TK_AVG_RATE 193 -#define TK_AVG_IRATE 194 -#define TK_TBID 195 -#define TK_SEMI 196 -#define TK_NONE 197 -#define TK_PREV 198 -#define TK_LINEAR 199 -#define TK_IMPORT 200 -#define TK_METRIC 201 -#define TK_TBNAME 202 -#define TK_JOIN 203 -#define TK_METRICS 204 -#define TK_STABLE 205 -#define TK_INSERT 206 -#define TK_INTO 207 -#define TK_VALUES 208 - +#define TK_DISTINCT 111 +#define TK_FROM 112 +#define TK_VARIABLE 113 +#define TK_INTERVAL 114 +#define TK_FILL 115 +#define TK_SLIDING 116 +#define TK_ORDER 117 +#define TK_BY 118 +#define TK_ASC 119 +#define TK_DESC 120 +#define TK_GROUP 121 +#define TK_HAVING 122 +#define TK_LIMIT 123 +#define TK_OFFSET 124 +#define TK_SLIMIT 125 +#define TK_SOFFSET 126 +#define TK_WHERE 127 +#define TK_NOW 128 +#define TK_RESET 129 +#define TK_QUERY 130 +#define TK_ADD 131 +#define TK_COLUMN 132 +#define TK_TAG 133 +#define TK_CHANGE 134 +#define TK_SET 135 +#define TK_KILL 136 +#define TK_CONNECTION 137 +#define TK_STREAM 138 +#define TK_COLON 139 +#define TK_ABORT 140 +#define TK_AFTER 141 +#define TK_ATTACH 142 +#define TK_BEFORE 143 +#define TK_BEGIN 144 +#define TK_CASCADE 145 +#define TK_CLUSTER 146 +#define TK_CONFLICT 147 +#define TK_COPY 148 +#define TK_DEFERRED 149 +#define TK_DELIMITERS 150 +#define TK_DETACH 151 +#define TK_EACH 152 +#define TK_END 153 +#define TK_EXPLAIN 154 +#define TK_FAIL 155 +#define TK_FOR 156 +#define TK_IGNORE 157 +#define TK_IMMEDIATE 158 +#define TK_INITIALLY 159 +#define TK_INSTEAD 160 +#define TK_MATCH 161 +#define TK_KEY 162 +#define TK_OF 163 +#define TK_RAISE 164 +#define TK_REPLACE 165 +#define TK_RESTRICT 166 +#define TK_ROW 167 +#define TK_STATEMENT 168 +#define TK_TRIGGER 169 +#define TK_VIEW 170 +#define TK_COUNT 171 +#define TK_SUM 172 +#define TK_AVG 173 +#define TK_MIN 174 +#define TK_MAX 175 +#define TK_FIRST 176 +#define TK_LAST 177 +#define TK_TOP 178 +#define TK_BOTTOM 179 +#define TK_STDDEV 180 +#define TK_PERCENTILE 181 +#define TK_APERCENTILE 182 +#define TK_LEASTSQUARES 183 +#define TK_HISTOGRAM 184 +#define TK_DIFF 185 +#define TK_SPREAD 186 +#define TK_TWA 187 +#define TK_INTERP 188 +#define TK_LAST_ROW 189 +#define TK_RATE 190 +#define TK_IRATE 191 +#define TK_SUM_RATE 192 +#define TK_SUM_IRATE 193 +#define TK_AVG_RATE 194 +#define TK_AVG_IRATE 195 +#define TK_TBID 196 +#define TK_SEMI 197 +#define TK_NONE 198 +#define TK_PREV 199 +#define TK_LINEAR 200 +#define TK_IMPORT 201 +#define TK_METRIC 202 +#define TK_TBNAME 203 +#define TK_JOIN 204 +#define TK_METRICS 205 +#define TK_STABLE 206 +#define TK_INSERT 207 +#define TK_INTO 208 +#define TK_VALUES 209 #define TK_SPACE 300 diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h index 56e676ef16..640576e090 100644 --- a/src/query/inc/qSqlparser.h +++ b/src/query/inc/qSqlparser.h @@ -206,6 +206,7 @@ typedef struct tSQLExpr { typedef struct tSqlExprItem { tSQLExpr *pNode; // The list of expressions char * aliasName; // alias name, null-terminated string + bool distinct; } tSqlExprItem; // todo refactor by using SArray @@ -238,7 +239,7 @@ tSQLExpr *tSqlExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType); void tSqlExprDestroy(tSQLExpr *pExpr); -tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pToken); +tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pDistinct, SStrToken *pToken); void tSqlExprListDestroy(tSQLExprList *pList); diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index 1fa1369bb5..660a1f0663 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -448,13 +448,13 @@ select(A) ::= SELECT(T) selcollist(W). { %destructor sclp {tSqlExprListDestroy($$);} sclp(A) ::= selcollist(X) COMMA. {A = X;} sclp(A) ::= . {A = 0;} -selcollist(A) ::= sclp(P) expr(X) as(Y). { - A = tSqlExprListAppend(P, X, Y.n?&Y:0); +selcollist(A) ::= sclp(P) distinct(Z) expr(X) as(Y). { + A = tSqlExprListAppend(P, X, Z.n? &Z:0, Y.n?&Y:0); } selcollist(A) ::= sclp(P) STAR. { tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL); - A = tSqlExprListAppend(P, pNode, 0); + A = tSqlExprListAppend(P, pNode, 0, 0); } // An option "AS " phrase that can follow one of the expressions that @@ -465,6 +465,10 @@ as(X) ::= AS ids(Y). { X = Y; } as(X) ::= ids(Y). { X = Y; } as(X) ::= . { X.n = 0; } +%type distinct {SStrToken} +distinct(X) ::= DISTINCT(Y). { X = Y; } +distinct(X) ::= . { X.n = 0;} + // A complete FROM clause. %type from {SArray*} // current not support query from no-table @@ -672,8 +676,8 @@ expr(A) ::= expr(X) IN LP exprlist(Y) RP. {A = tSqlExprCreate(X, (tSQLExpr*)Y, %type expritem {tSQLExpr*} %destructor expritem {tSqlExprDestroy($$);} -exprlist(A) ::= exprlist(X) COMMA expritem(Y). {A = tSqlExprListAppend(X,Y,0);} -exprlist(A) ::= expritem(X). {A = tSqlExprListAppend(0,X,0);} +exprlist(A) ::= exprlist(X) COMMA expritem(Y). {A = tSqlExprListAppend(X,Y,0, 0);} +exprlist(A) ::= expritem(X). {A = tSqlExprListAppend(0,X,0, 0);} expritem(A) ::= expr(X). {A = X;} expritem(A) ::= . {A = 0;} diff --git a/src/query/src/qParserImpl.c b/src/query/src/qParserImpl.c index d311cb3557..b3827ca45c 100644 --- a/src/query/src/qParserImpl.c +++ b/src/query/src/qParserImpl.c @@ -71,7 +71,7 @@ abort_parse: return sqlInfo; } -tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pToken) { +tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken *pDistinct, SStrToken *pToken) { if (pList == NULL) { pList = calloc(1, sizeof(tSQLExprList)); } @@ -97,6 +97,7 @@ tSQLExprList *tSqlExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SStrToken strdequote(pItem->aliasName); } + pItem->distinct = (pDistinct != NULL); } return pList; } diff --git a/src/query/src/qTokenizer.c b/src/query/src/qTokenizer.c index 48d2f5d505..b55f813b5b 100644 --- a/src/query/src/qTokenizer.c +++ b/src/query/src/qTokenizer.c @@ -240,6 +240,7 @@ static SKeyword keywordTable[] = { {"AVG_RATE", TK_AVG_RATE}, {"AVG_IRATE", TK_AVG_IRATE}, {"CACHELAST", TK_CACHELAST}, + {"DISTINCT", TK_DISTINCT}, }; static const char isIdChar[] = { diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 6c59a51074..f559c55922 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -1,29 +1,10 @@ -/* -** 2000-05-29 -** -** The author disclaims copyright to this source code. In place of -** a legal notice, here is a blessing: -** -** May you do good and not evil. -** May you find forgiveness for yourself and forgive others. -** May you share freely, never taking more than you give. -** -************************************************************************* -** Driver template for the LEMON parser generator. -** -** The "lemon" program processes an LALR(1) input grammar file, then uses -** this template to construct a parser. The "lemon" program inserts text -** at each "%%" line. Also, any "P-a-r-s-e" identifer prefix (without the -** interstitial "-" characters) contained in this template is changed into -** the value of the %name directive from the grammar. Otherwise, the content -** of this template is copied straight through into the generate parser -** source file. -** -** The following is the concatenation of all %include directives from the -** input grammar file: +/* Driver template for the LEMON parser generator. +** The author disclaims copyright to this source code. */ +/* First off, code is included that follows the "include" declaration +** in the input grammar file. */ #include -/************ Begin %include sections from the grammar ************************/ +#line 23 "sql.y" #include #include @@ -36,88 +17,78 @@ #include "ttokendef.h" #include "tutil.h" #include "tvariant.h" -/**************** End of %include directives **********************************/ -/* These constants specify the various numeric values for terminal symbols -** in a format understandable to "makeheaders". This section is blank unless -** "lemon" is run with the "-m" command-line option. -***************** Begin makeheaders token definitions *************************/ -/**************** End makeheaders token definitions ***************************/ - -/* The next sections is a series of control #defines. +#line 21 "sql.c" +/* Next is all token values, in a form suitable for use by makeheaders. +** This section will be null unless lemon is run with the -m switch. +*/ +/* +** These constants (all generated automatically by the parser generator) +** specify the various kinds of tokens (terminals) that the parser +** understands. +** +** Each symbol here is a terminal symbol in the grammar. +*/ +/* Make sure the INTERFACE macro is defined. +*/ +#ifndef INTERFACE +# define INTERFACE 1 +#endif +/* The next thing included is series of defines which control ** various aspects of the generated parser. -** YYCODETYPE is the data type used to store the integer codes -** that represent terminal and non-terminal symbols. -** "unsigned char" is used if there are fewer than -** 256 symbols. Larger types otherwise. -** YYNOCODE is a number of type YYCODETYPE that is not used for -** any terminal or nonterminal symbol. +** YYCODETYPE is the data type used for storing terminal +** and nonterminal numbers. "unsigned char" is +** used if there are fewer than 250 terminals +** and nonterminals. "int" is used otherwise. +** YYNOCODE is a number of type YYCODETYPE which corresponds +** to no legal terminal or nonterminal number. This +** number is used to fill in empty slots of the hash +** table. ** YYFALLBACK If defined, this indicates that one or more tokens -** (also known as: "terminal symbols") have fall-back -** values which should be used if the original symbol -** would not parse. This permits keywords to sometimes -** be used as identifiers, for example. -** YYACTIONTYPE is the data type used for "action codes" - numbers -** that indicate what to do in response to the next -** token. -** ParseTOKENTYPE is the data type used for minor type for terminal -** symbols. Background: A "minor type" is a semantic -** value associated with a terminal or non-terminal -** symbols. For example, for an "ID" terminal symbol, -** the minor type might be the name of the identifier. -** Each non-terminal can have a different minor type. -** Terminal symbols all have the same minor type, though. -** This macros defines the minor type for terminal -** symbols. -** YYMINORTYPE is the data type used for all minor types. +** have fall-back values which should be used if the +** original value of the token will not parse. +** YYACTIONTYPE is the data type used for storing terminal +** and nonterminal numbers. "unsigned char" is +** used if there are fewer than 250 rules and +** states combined. "int" is used otherwise. +** ParseTOKENTYPE is the data type used for minor tokens given +** directly to the parser from the tokenizer. +** YYMINORTYPE is the data type used for all minor tokens. ** This is typically a union of many types, one of ** which is ParseTOKENTYPE. The entry in the union -** for terminal symbols is called "yy0". +** for base tokens is called "yy0". ** YYSTACKDEPTH is the maximum depth of the parser's stack. If ** zero the stack is dynamically sized using realloc() ** ParseARG_SDECL A static variable declaration for the %extra_argument ** ParseARG_PDECL A parameter declaration for the %extra_argument ** ParseARG_STORE Code to store %extra_argument into yypParser ** ParseARG_FETCH Code to extract %extra_argument from yypParser -** YYERRORSYMBOL is the code number of the error symbol. If not -** defined, then do no error processing. ** YYNSTATE the combined number of states. ** YYNRULE the number of rules in the grammar -** YYNTOKEN Number of terminal symbols -** YY_MAX_SHIFT Maximum value for shift actions -** YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions -** YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions -** YY_ERROR_ACTION The yy_action[] code for syntax error -** YY_ACCEPT_ACTION The yy_action[] code for accept -** YY_NO_ACTION The yy_action[] code for no-op -** YY_MIN_REDUCE Minimum value for reduce actions -** YY_MAX_REDUCE Maximum value for reduce actions +** YYERRORSYMBOL is the code number of the error symbol. If not +** defined, then do no error processing. */ -#ifndef INTERFACE -# define INTERFACE 1 -#endif -/************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 279 +#define YYNOCODE 281 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SStrToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SCreateTableSQL* yy38; - SCreateAcctSQL yy71; - tSQLExpr* yy78; - int yy96; - SQuerySQL* yy148; - SCreatedTableInfo yy152; - SSubclauseInfo* yy153; - tSQLExprList* yy166; - SLimitVal yy167; - TAOS_FIELD yy183; - SCreateDBInfo yy234; - int64_t yy325; - SIntervalVal yy400; - SArray* yy421; - tVariant yy430; + tSQLExpr* yy50; + SCreateAcctSQL yy79; + tVariant yy106; + int64_t yy109; + int yy172; + tSQLExprList* yy178; + SArray* yy221; + SSubclauseInfo* yy273; + SIntervalVal yy280; + SQuerySQL* yy344; + SCreateTableSQL* yy358; + SCreatedTableInfo yy416; + SLimitVal yy454; + SCreateDBInfo yy478; + TAOS_FIELD yy503; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -126,19 +97,16 @@ typedef union { #define ParseARG_PDECL ,SSqlInfo* pInfo #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo +#define YYNSTATE 433 +#define YYNRULE 242 #define YYFALLBACK 1 -#define YYNSTATE 258 -#define YYNRULE 240 -#define YYNTOKEN 209 -#define YY_MAX_SHIFT 257 -#define YY_MIN_SHIFTREDUCE 431 -#define YY_MAX_SHIFTREDUCE 670 -#define YY_ERROR_ACTION 671 -#define YY_ACCEPT_ACTION 672 -#define YY_NO_ACTION 673 -#define YY_MIN_REDUCE 674 -#define YY_MAX_REDUCE 913 -/************* End control #defines *******************************************/ +#define YY_NO_ACTION (YYNSTATE+YYNRULE+2) +#define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) +#define YY_ERROR_ACTION (YYNSTATE+YYNRULE) + +/* The yyzerominor constant is used to initialize instances of +** YYMINORTYPE objects to zero. */ +static const YYMINORTYPE yyzerominor = { 0 }; /* Define the yytestcase() macro to be a no-op if is not already defined ** otherwise. @@ -161,35 +129,33 @@ typedef union { ** Suppose the action integer is N. Then the action is determined as ** follows ** -** 0 <= N <= YY_MAX_SHIFT Shift N. That is, push the lookahead +** 0 <= N < YYNSTATE Shift N. That is, push the lookahead ** token onto the stack and goto state N. ** -** N between YY_MIN_SHIFTREDUCE Shift to an arbitrary state then -** and YY_MAX_SHIFTREDUCE reduce by rule N-YY_MIN_SHIFTREDUCE. +** YYNSTATE <= N < YYNSTATE+YYNRULE Reduce by rule N-YYNSTATE. ** -** N == YY_ERROR_ACTION A syntax error has occurred. +** N == YYNSTATE+YYNRULE A syntax error has occurred. ** -** N == YY_ACCEPT_ACTION The parser accepts its input. +** N == YYNSTATE+YYNRULE+1 The parser accepts its input. ** -** N == YY_NO_ACTION No such action. Denotes unused +** N == YYNSTATE+YYNRULE+2 No such action. Denotes unused ** slots in the yy_action[] table. ** -** N between YY_MIN_REDUCE Reduce by rule N-YY_MIN_REDUCE -** and YY_MAX_REDUCE -** ** The action table is constructed as a single large table named yy_action[]. -** Given state S and lookahead X, the action is computed as either: +** Given state S and lookahead X, the action is computed as ** -** (A) N = yy_action[ yy_shift_ofst[S] + X ] -** (B) N = yy_default[S] +** yy_action[ yy_shift_ofst[S] + X ] ** -** The (A) formula is preferred. The B formula is used instead if -** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X. +** If the index value yy_shift_ofst[S]+X is out of range or if the value +** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S] +** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table +** and that yy_default[S] should be used instead. ** -** The formulas above are for computing the action when the lookahead is +** The formula above is for computing the action when the lookahead is ** a terminal symbol. If the lookahead is a non-terminal (as occurs after ** a reduce action) then the yy_reduce_ofst[] array is used in place of -** the yy_shift_ofst[] array. +** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of +** YY_SHIFT_USE_DFLT. ** ** The following are the tables generated in this section: ** @@ -201,235 +167,252 @@ typedef union { ** yy_reduce_ofst[] For each state, the offset into yy_action for ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. -** -*********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (586) +*/ +#define YY_ACTTAB_COUNT (690) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 143, 474, 143, 23, 672, 257, 165, 547, 827, 475, - /* 10 */ 900, 168, 901, 37, 38, 12, 39, 40, 816, 23, - /* 20 */ 173, 31, 474, 474, 210, 43, 41, 45, 42, 805, - /* 30 */ 475, 475, 163, 36, 35, 232, 231, 34, 33, 32, - /* 40 */ 37, 38, 801, 39, 40, 816, 110, 173, 31, 162, - /* 50 */ 255, 210, 43, 41, 45, 42, 176, 66, 802, 195, - /* 60 */ 36, 35, 178, 824, 34, 33, 32, 432, 433, 434, - /* 70 */ 435, 436, 437, 438, 439, 440, 441, 442, 443, 256, - /* 80 */ 179, 225, 185, 37, 38, 805, 39, 40, 796, 242, - /* 90 */ 173, 31, 143, 180, 210, 43, 41, 45, 42, 110, - /* 100 */ 110, 167, 901, 36, 35, 57, 853, 34, 33, 32, - /* 110 */ 17, 223, 250, 249, 222, 221, 220, 248, 219, 247, - /* 120 */ 246, 245, 218, 244, 243, 803, 142, 774, 624, 762, - /* 130 */ 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, - /* 140 */ 773, 775, 776, 38, 181, 39, 40, 229, 228, 173, - /* 150 */ 31, 605, 606, 210, 43, 41, 45, 42, 207, 854, - /* 160 */ 61, 205, 36, 35, 23, 110, 34, 33, 32, 188, - /* 170 */ 39, 40, 23, 251, 173, 31, 192, 191, 210, 43, - /* 180 */ 41, 45, 42, 34, 33, 32, 105, 36, 35, 104, - /* 190 */ 147, 34, 33, 32, 172, 637, 805, 28, 628, 897, - /* 200 */ 631, 177, 634, 802, 172, 637, 896, 13, 628, 230, - /* 210 */ 631, 802, 634, 18, 172, 637, 794, 895, 628, 63, - /* 220 */ 631, 28, 634, 155, 574, 62, 169, 170, 23, 156, - /* 230 */ 209, 29, 197, 92, 91, 150, 169, 170, 77, 76, - /* 240 */ 582, 17, 198, 250, 249, 159, 169, 170, 248, 626, - /* 250 */ 247, 246, 245, 715, 244, 243, 133, 211, 780, 80, - /* 260 */ 160, 778, 779, 18, 242, 234, 781, 802, 783, 784, - /* 270 */ 782, 28, 785, 786, 43, 41, 45, 42, 724, 579, - /* 280 */ 64, 133, 36, 35, 19, 627, 34, 33, 32, 3, - /* 290 */ 124, 194, 225, 44, 910, 72, 68, 71, 158, 11, - /* 300 */ 10, 566, 592, 44, 563, 636, 564, 107, 565, 793, - /* 310 */ 22, 795, 630, 44, 633, 636, 716, 36, 35, 133, - /* 320 */ 635, 34, 33, 32, 171, 636, 596, 49, 78, 82, - /* 330 */ 635, 48, 182, 183, 87, 90, 81, 137, 135, 629, - /* 340 */ 635, 632, 84, 95, 94, 93, 50, 9, 145, 640, - /* 350 */ 52, 65, 120, 254, 253, 98, 597, 656, 638, 555, - /* 360 */ 146, 15, 14, 14, 24, 4, 55, 53, 546, 213, - /* 370 */ 556, 570, 148, 571, 24, 48, 568, 149, 569, 89, - /* 380 */ 88, 103, 101, 153, 154, 152, 141, 151, 144, 804, - /* 390 */ 864, 863, 818, 174, 860, 859, 175, 233, 826, 846, - /* 400 */ 831, 833, 106, 121, 845, 122, 567, 119, 123, 726, - /* 410 */ 217, 139, 26, 226, 102, 723, 28, 227, 909, 74, - /* 420 */ 908, 906, 125, 744, 27, 25, 196, 140, 713, 591, - /* 430 */ 83, 711, 85, 86, 199, 709, 708, 184, 54, 134, - /* 440 */ 706, 164, 705, 704, 703, 702, 136, 700, 698, 696, - /* 450 */ 694, 692, 138, 203, 58, 59, 51, 847, 815, 46, - /* 460 */ 208, 206, 204, 202, 200, 30, 79, 235, 236, 237, - /* 470 */ 238, 239, 240, 241, 161, 215, 216, 252, 670, 187, - /* 480 */ 186, 669, 69, 189, 157, 190, 668, 193, 661, 707, - /* 490 */ 197, 576, 60, 56, 593, 96, 128, 97, 127, 745, - /* 500 */ 126, 130, 129, 131, 132, 701, 693, 113, 111, 118, - /* 510 */ 116, 114, 112, 115, 800, 1, 117, 2, 166, 20, - /* 520 */ 108, 201, 6, 598, 109, 7, 639, 5, 8, 21, - /* 530 */ 16, 67, 212, 641, 214, 515, 65, 511, 509, 508, - /* 540 */ 507, 504, 478, 224, 70, 47, 73, 75, 24, 549, - /* 550 */ 548, 545, 499, 497, 489, 495, 491, 493, 487, 485, - /* 560 */ 517, 516, 514, 513, 512, 510, 506, 505, 48, 476, - /* 570 */ 447, 445, 674, 673, 673, 673, 673, 673, 673, 673, - /* 580 */ 673, 673, 673, 673, 99, 100, + /* 0 */ 417, 36, 35, 79, 83, 34, 33, 32, 416, 88, + /* 10 */ 91, 82, 37, 38, 67, 39, 40, 85, 212, 174, + /* 20 */ 31, 676, 258, 211, 43, 41, 45, 42, 255, 254, + /* 30 */ 99, 172, 36, 35, 104, 102, 34, 33, 32, 37, + /* 40 */ 38, 433, 39, 40, 9, 320, 174, 31, 66, 121, + /* 50 */ 211, 43, 41, 45, 42, 34, 33, 32, 144, 36, + /* 60 */ 35, 180, 266, 34, 33, 32, 37, 38, 289, 39, + /* 70 */ 40, 356, 4, 174, 31, 144, 196, 211, 43, 41, + /* 80 */ 45, 42, 65, 419, 168, 290, 36, 35, 417, 307, + /* 90 */ 34, 33, 32, 90, 89, 38, 416, 39, 40, 233, + /* 100 */ 232, 174, 31, 52, 57, 211, 43, 41, 45, 42, + /* 110 */ 310, 321, 22, 318, 36, 35, 138, 136, 34, 33, + /* 120 */ 32, 53, 96, 95, 94, 306, 182, 308, 369, 230, + /* 130 */ 229, 134, 432, 431, 430, 429, 428, 427, 426, 425, + /* 140 */ 424, 423, 422, 421, 257, 101, 325, 186, 337, 336, + /* 150 */ 335, 334, 333, 332, 331, 330, 329, 328, 327, 326, + /* 160 */ 324, 323, 420, 17, 224, 251, 250, 223, 222, 221, + /* 170 */ 249, 220, 248, 247, 246, 219, 245, 244, 39, 40, + /* 180 */ 23, 553, 174, 31, 189, 23, 211, 43, 41, 45, + /* 190 */ 42, 193, 192, 11, 10, 36, 35, 111, 274, 34, + /* 200 */ 33, 32, 173, 296, 19, 13, 305, 111, 300, 392, + /* 210 */ 299, 391, 173, 296, 78, 77, 305, 235, 300, 351, + /* 220 */ 299, 156, 231, 394, 351, 23, 397, 157, 396, 49, + /* 230 */ 395, 93, 92, 151, 170, 171, 286, 285, 210, 43, + /* 240 */ 41, 45, 42, 345, 170, 171, 134, 36, 35, 50, + /* 250 */ 144, 34, 33, 32, 183, 184, 208, 226, 62, 169, + /* 260 */ 290, 18, 178, 377, 351, 23, 379, 378, 281, 28, + /* 270 */ 206, 376, 268, 374, 373, 375, 370, 372, 371, 134, + /* 280 */ 3, 125, 17, 252, 251, 250, 73, 69, 72, 249, + /* 290 */ 195, 248, 247, 246, 319, 245, 244, 159, 390, 48, + /* 300 */ 389, 44, 177, 55, 351, 353, 388, 214, 317, 23, + /* 310 */ 295, 44, 24, 24, 297, 14, 291, 304, 302, 303, + /* 320 */ 301, 14, 181, 64, 297, 277, 278, 276, 393, 298, + /* 330 */ 15, 48, 108, 265, 417, 58, 105, 266, 81, 298, + /* 340 */ 111, 198, 416, 243, 28, 111, 267, 106, 358, 18, + /* 350 */ 179, 164, 166, 269, 352, 163, 256, 28, 100, 409, + /* 360 */ 48, 387, 386, 385, 384, 383, 382, 381, 380, 368, + /* 370 */ 367, 366, 365, 388, 364, 388, 363, 362, 361, 24, + /* 380 */ 357, 355, 354, 76, 74, 344, 47, 71, 343, 225, + /* 390 */ 342, 341, 340, 339, 68, 66, 16, 215, 338, 8, + /* 400 */ 213, 63, 309, 5, 199, 288, 282, 7, 21, 271, + /* 410 */ 6, 20, 279, 167, 194, 110, 202, 109, 198, 275, + /* 420 */ 56, 263, 262, 261, 191, 61, 190, 260, 188, 187, + /* 430 */ 259, 253, 1, 2, 103, 415, 130, 131, 98, 97, + /* 440 */ 133, 237, 410, 403, 240, 127, 316, 242, 28, 158, + /* 450 */ 30, 117, 119, 129, 132, 217, 70, 216, 128, 241, + /* 460 */ 238, 239, 359, 162, 236, 201, 80, 203, 116, 226, + /* 470 */ 205, 207, 51, 284, 204, 46, 60, 165, 59, 677, + /* 480 */ 139, 418, 414, 413, 412, 411, 137, 677, 408, 407, + /* 490 */ 406, 405, 404, 677, 135, 185, 118, 402, 677, 197, + /* 500 */ 115, 209, 401, 114, 234, 243, 113, 280, 112, 120, + /* 510 */ 315, 264, 87, 54, 86, 400, 398, 677, 200, 677, + /* 520 */ 84, 399, 677, 677, 29, 677, 677, 677, 287, 145, + /* 530 */ 677, 283, 176, 314, 677, 677, 141, 677, 25, 27, + /* 540 */ 360, 126, 350, 349, 75, 348, 228, 677, 346, 227, + /* 550 */ 677, 677, 26, 140, 677, 218, 322, 124, 123, 122, + /* 560 */ 107, 677, 273, 272, 677, 677, 677, 677, 677, 677, + /* 570 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 580 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 590 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 600 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 270, + /* 610 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 620 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 630 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 640 */ 677, 677, 677, 313, 175, 312, 311, 677, 677, 677, + /* 650 */ 677, 677, 677, 677, 347, 677, 677, 677, 677, 677, + /* 660 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, + /* 670 */ 152, 142, 153, 155, 154, 150, 149, 147, 146, 161, + /* 680 */ 160, 677, 294, 293, 292, 148, 143, 677, 677, 12, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 267, 1, 267, 213, 210, 211, 230, 5, 213, 9, - /* 10 */ 277, 276, 277, 13, 14, 267, 16, 17, 251, 213, - /* 20 */ 20, 21, 1, 1, 24, 25, 26, 27, 28, 253, - /* 30 */ 9, 9, 265, 33, 34, 33, 34, 37, 38, 39, - /* 40 */ 13, 14, 252, 16, 17, 251, 213, 20, 21, 212, - /* 50 */ 213, 24, 25, 26, 27, 28, 250, 218, 252, 265, - /* 60 */ 33, 34, 230, 268, 37, 38, 39, 45, 46, 47, - /* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - /* 80 */ 66, 76, 60, 13, 14, 253, 16, 17, 249, 78, - /* 90 */ 20, 21, 267, 213, 24, 25, 26, 27, 28, 213, - /* 100 */ 213, 276, 277, 33, 34, 105, 273, 37, 38, 39, - /* 110 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - /* 120 */ 95, 96, 97, 98, 99, 245, 267, 229, 101, 231, - /* 130 */ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, - /* 140 */ 242, 243, 244, 14, 130, 16, 17, 133, 134, 20, - /* 150 */ 21, 118, 119, 24, 25, 26, 27, 28, 271, 273, - /* 160 */ 273, 275, 33, 34, 213, 213, 37, 38, 39, 129, - /* 170 */ 16, 17, 213, 230, 20, 21, 136, 137, 24, 25, - /* 180 */ 26, 27, 28, 37, 38, 39, 213, 33, 34, 100, - /* 190 */ 267, 37, 38, 39, 1, 2, 253, 108, 5, 267, - /* 200 */ 7, 250, 9, 252, 1, 2, 267, 44, 5, 250, - /* 210 */ 7, 252, 9, 100, 1, 2, 0, 267, 5, 254, - /* 220 */ 7, 108, 9, 60, 101, 273, 33, 34, 213, 66, - /* 230 */ 37, 266, 109, 70, 71, 72, 33, 34, 131, 132, - /* 240 */ 37, 85, 269, 87, 88, 267, 33, 34, 92, 1, - /* 250 */ 94, 95, 96, 217, 98, 99, 220, 15, 229, 73, - /* 260 */ 267, 232, 233, 100, 78, 250, 237, 252, 239, 240, - /* 270 */ 241, 108, 243, 244, 25, 26, 27, 28, 217, 106, - /* 280 */ 218, 220, 33, 34, 111, 37, 37, 38, 39, 61, - /* 290 */ 62, 128, 76, 100, 253, 67, 68, 69, 135, 131, - /* 300 */ 132, 2, 101, 100, 5, 112, 7, 106, 9, 247, - /* 310 */ 248, 249, 5, 100, 7, 112, 217, 33, 34, 220, - /* 320 */ 127, 37, 38, 39, 59, 112, 101, 106, 61, 62, - /* 330 */ 127, 106, 33, 34, 67, 68, 69, 61, 62, 5, - /* 340 */ 127, 7, 75, 67, 68, 69, 125, 100, 267, 107, - /* 350 */ 106, 104, 105, 63, 64, 65, 101, 101, 101, 101, - /* 360 */ 267, 106, 106, 106, 106, 100, 100, 123, 102, 101, - /* 370 */ 101, 5, 267, 7, 106, 106, 5, 267, 7, 73, - /* 380 */ 74, 61, 62, 267, 267, 267, 267, 267, 267, 253, - /* 390 */ 246, 246, 251, 246, 246, 246, 246, 246, 213, 274, - /* 400 */ 213, 213, 213, 213, 274, 213, 107, 255, 213, 213, - /* 410 */ 213, 213, 213, 213, 59, 213, 108, 213, 213, 213, - /* 420 */ 213, 213, 213, 213, 213, 213, 251, 213, 213, 112, - /* 430 */ 213, 213, 213, 213, 270, 213, 213, 213, 122, 213, - /* 440 */ 213, 270, 213, 213, 213, 213, 213, 213, 213, 213, - /* 450 */ 213, 213, 213, 270, 214, 214, 124, 214, 264, 121, - /* 460 */ 116, 120, 115, 114, 113, 126, 84, 83, 49, 80, - /* 470 */ 82, 53, 81, 79, 214, 214, 214, 76, 5, 5, - /* 480 */ 138, 5, 218, 138, 214, 5, 5, 129, 86, 214, - /* 490 */ 109, 101, 106, 110, 101, 215, 222, 215, 226, 228, - /* 500 */ 227, 223, 225, 224, 221, 214, 214, 261, 263, 256, - /* 510 */ 258, 260, 262, 259, 251, 219, 257, 216, 1, 106, - /* 520 */ 100, 100, 117, 101, 100, 117, 101, 100, 100, 106, - /* 530 */ 100, 73, 103, 107, 103, 9, 104, 5, 5, 5, - /* 540 */ 5, 5, 77, 15, 73, 16, 132, 132, 106, 5, - /* 550 */ 5, 101, 5, 5, 5, 5, 5, 5, 5, 5, - /* 560 */ 5, 5, 5, 5, 5, 5, 5, 5, 106, 77, - /* 570 */ 59, 58, 0, 278, 278, 278, 278, 278, 278, 278, - /* 580 */ 278, 278, 278, 278, 21, 21, 278, 278, 278, 278, - /* 590 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 600 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 610 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 620 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 630 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 640 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 650 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 660 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 670 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 680 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 690 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 700 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 710 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 720 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 730 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 740 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 750 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 760 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 770 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 780 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, - /* 790 */ 278, 278, 278, 278, 278, + /* 0 */ 1, 33, 34, 61, 62, 37, 38, 39, 9, 67, + /* 10 */ 68, 69, 13, 14, 219, 16, 17, 75, 15, 20, + /* 20 */ 21, 211, 212, 24, 25, 26, 27, 28, 63, 64, + /* 30 */ 65, 59, 33, 34, 61, 62, 37, 38, 39, 13, + /* 40 */ 14, 0, 16, 17, 100, 250, 20, 21, 104, 105, + /* 50 */ 24, 25, 26, 27, 28, 37, 38, 39, 269, 33, + /* 60 */ 34, 66, 252, 37, 38, 39, 13, 14, 279, 16, + /* 70 */ 17, 5, 100, 20, 21, 269, 266, 24, 25, 26, + /* 80 */ 27, 28, 219, 59, 278, 279, 33, 34, 1, 1, + /* 90 */ 37, 38, 39, 73, 74, 14, 9, 16, 17, 33, + /* 100 */ 34, 20, 21, 106, 105, 24, 25, 26, 27, 28, + /* 110 */ 107, 248, 249, 250, 33, 34, 61, 62, 37, 38, + /* 120 */ 39, 124, 67, 68, 69, 37, 131, 101, 218, 134, + /* 130 */ 135, 221, 45, 46, 47, 48, 49, 50, 51, 52, + /* 140 */ 53, 54, 55, 56, 57, 21, 230, 60, 232, 233, + /* 150 */ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + /* 160 */ 244, 245, 58, 85, 86, 87, 88, 89, 90, 91, + /* 170 */ 92, 93, 94, 95, 96, 97, 98, 99, 16, 17, + /* 180 */ 214, 0, 20, 21, 130, 214, 24, 25, 26, 27, + /* 190 */ 28, 137, 138, 132, 133, 33, 34, 214, 106, 37, + /* 200 */ 38, 39, 1, 2, 112, 44, 5, 214, 7, 5, + /* 210 */ 9, 7, 1, 2, 132, 133, 5, 251, 7, 253, + /* 220 */ 9, 60, 251, 2, 253, 214, 5, 66, 7, 106, + /* 230 */ 9, 70, 71, 72, 33, 34, 119, 120, 37, 25, + /* 240 */ 26, 27, 28, 218, 33, 34, 221, 33, 34, 126, + /* 250 */ 269, 37, 38, 39, 33, 34, 273, 76, 275, 278, + /* 260 */ 279, 100, 251, 230, 253, 214, 233, 234, 275, 108, + /* 270 */ 277, 238, 37, 240, 241, 242, 218, 244, 245, 221, + /* 280 */ 61, 62, 85, 231, 87, 88, 67, 68, 69, 92, + /* 290 */ 129, 94, 95, 96, 101, 98, 99, 136, 5, 106, + /* 300 */ 7, 100, 251, 100, 253, 102, 254, 101, 101, 214, + /* 310 */ 101, 100, 106, 106, 113, 106, 101, 5, 5, 7, + /* 320 */ 7, 106, 214, 255, 113, 101, 101, 101, 107, 128, + /* 330 */ 106, 106, 106, 101, 1, 267, 100, 252, 73, 128, + /* 340 */ 214, 109, 9, 78, 108, 214, 111, 214, 253, 100, + /* 350 */ 231, 266, 231, 214, 246, 213, 214, 108, 21, 77, + /* 360 */ 106, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 370 */ 5, 5, 5, 254, 5, 254, 5, 5, 5, 106, + /* 380 */ 101, 5, 5, 133, 133, 77, 16, 73, 5, 15, + /* 390 */ 5, 5, 5, 5, 73, 104, 100, 103, 9, 100, + /* 400 */ 103, 275, 107, 100, 271, 101, 275, 118, 106, 270, + /* 410 */ 118, 106, 101, 1, 130, 100, 100, 100, 109, 101, + /* 420 */ 110, 101, 86, 5, 5, 106, 139, 5, 5, 139, + /* 430 */ 5, 76, 220, 217, 59, 215, 226, 224, 216, 216, + /* 440 */ 222, 49, 215, 215, 53, 228, 252, 79, 108, 215, + /* 450 */ 127, 259, 257, 223, 225, 215, 219, 215, 227, 81, + /* 460 */ 80, 82, 229, 215, 83, 114, 84, 115, 260, 76, + /* 470 */ 116, 121, 125, 215, 272, 122, 215, 272, 215, 280, + /* 480 */ 214, 214, 214, 214, 214, 214, 214, 280, 214, 214, + /* 490 */ 214, 214, 214, 280, 214, 214, 258, 214, 280, 252, + /* 500 */ 261, 117, 214, 262, 247, 78, 263, 113, 264, 256, + /* 510 */ 265, 252, 214, 123, 214, 214, 254, 280, 272, 280, + /* 520 */ 214, 214, 280, 280, 268, 280, 280, 280, 276, 269, + /* 530 */ 280, 276, 247, 247, 280, 280, 214, 280, 214, 214, + /* 540 */ 214, 214, 214, 214, 214, 214, 214, 280, 214, 214, + /* 550 */ 280, 280, 214, 214, 280, 214, 214, 214, 214, 214, + /* 560 */ 214, 280, 214, 214, 280, 280, 280, 280, 280, 280, + /* 570 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 580 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 590 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 600 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 214, + /* 610 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 620 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 630 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 640 */ 280, 280, 280, 247, 247, 247, 247, 280, 280, 280, + /* 650 */ 280, 280, 280, 280, 254, 280, 280, 280, 280, 280, + /* 660 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 670 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + /* 680 */ 269, 280, 269, 269, 269, 269, 269, 280, 280, 269, }; -#define YY_SHIFT_COUNT (257) -#define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (572) -static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 163, 25, 156, 5, 193, 213, 21, 21, 21, 21, - /* 10 */ 21, 21, 0, 22, 213, 299, 299, 299, 113, 21, - /* 20 */ 21, 21, 216, 21, 21, 186, 11, 11, 586, 203, - /* 30 */ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - /* 40 */ 213, 213, 213, 213, 213, 213, 213, 299, 299, 2, - /* 50 */ 2, 2, 2, 2, 2, 2, 89, 21, 21, 21, - /* 60 */ 21, 33, 33, 173, 21, 21, 21, 21, 21, 21, - /* 70 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 80 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 90 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 100 */ 21, 21, 21, 21, 308, 355, 355, 317, 317, 317, - /* 110 */ 355, 316, 332, 338, 344, 341, 347, 349, 351, 339, - /* 120 */ 308, 355, 355, 355, 5, 355, 382, 384, 419, 389, - /* 130 */ 388, 418, 391, 394, 355, 401, 355, 401, 355, 586, - /* 140 */ 586, 27, 70, 70, 70, 129, 154, 249, 249, 249, - /* 150 */ 267, 284, 284, 284, 284, 228, 276, 14, 40, 146, - /* 160 */ 146, 247, 290, 123, 201, 225, 255, 256, 257, 307, - /* 170 */ 334, 248, 265, 242, 221, 244, 258, 268, 269, 107, - /* 180 */ 266, 168, 366, 371, 306, 320, 473, 342, 474, 476, - /* 190 */ 345, 480, 481, 402, 358, 381, 390, 383, 386, 393, - /* 200 */ 420, 517, 421, 422, 424, 413, 405, 423, 408, 425, - /* 210 */ 427, 426, 428, 429, 430, 431, 432, 458, 526, 532, - /* 220 */ 533, 534, 535, 536, 465, 528, 471, 529, 414, 415, - /* 230 */ 442, 544, 545, 450, 442, 547, 548, 549, 550, 551, - /* 240 */ 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, - /* 250 */ 562, 462, 492, 563, 564, 511, 513, 572, +#define YY_SHIFT_USE_DFLT (-59) +#define YY_SHIFT_COUNT (258) +#define YY_SHIFT_MIN (-58) +#define YY_SHIFT_MAX (427) +static const short yy_shift_ofst[] = { + /* 0 */ 161, 78, 197, 393, 201, 211, 333, 333, 333, 333, + /* 10 */ 333, 333, -1, 87, 211, 221, 221, 221, 249, 333, + /* 20 */ 333, 333, 181, 333, 333, 265, 427, 427, -59, 211, + /* 30 */ 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + /* 40 */ 211, 211, 211, 211, 211, 211, 211, 221, 221, 66, + /* 50 */ 66, 66, 66, 66, 66, 66, 236, 333, 235, 333, + /* 60 */ 333, 333, 117, 117, 92, 333, 333, 333, 333, 333, + /* 70 */ 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, + /* 80 */ 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, + /* 90 */ 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, + /* 100 */ 333, 333, 333, 333, 333, 340, 375, 375, 394, 394, + /* 110 */ 394, 375, 390, 347, 353, 384, 350, 354, 352, 351, + /* 120 */ 323, 340, 375, 375, 375, 393, 375, 382, 381, 392, + /* 130 */ 380, 379, 391, 378, 368, 375, 355, 375, 355, 375, + /* 140 */ -59, -59, 26, 53, 53, 53, 81, 162, 214, 214, + /* 150 */ 214, -58, -32, -32, -32, -32, 219, 55, -5, 54, + /* 160 */ 18, 18, -56, -35, 232, 226, 225, 224, 215, 209, + /* 170 */ 313, 312, 88, -28, 3, 123, -3, 207, 206, 193, + /* 180 */ 82, 203, 61, 293, 204, 20, -27, 425, 290, 423, + /* 190 */ 422, 287, 419, 418, 336, 284, 309, 320, 310, 319, + /* 200 */ 318, 317, 412, 316, 311, 315, 305, 292, 302, 289, + /* 210 */ 304, 303, 295, 299, 297, 296, 294, 291, 321, 389, + /* 220 */ 388, 387, 386, 385, 383, 308, 374, 314, 370, 251, + /* 230 */ 250, 273, 377, 376, 279, 273, 373, 372, 371, 369, + /* 240 */ 367, 366, 365, 364, 363, 362, 361, 360, 359, 358, + /* 250 */ 357, 356, 254, 282, 337, 124, 24, 104, 41, }; -#define YY_REDUCE_COUNT (140) -#define YY_REDUCE_MIN (-267) -#define YY_REDUCE_MAX (301) +#define YY_REDUCE_USE_DFLT (-212) +#define YY_REDUCE_COUNT (141) +#define YY_REDUCE_MIN (-211) +#define YY_REDUCE_MAX (420) static const short yy_reduce_ofst[] = { - /* 0 */ -206, -102, 29, 62, -265, -175, -114, -113, -194, -49, - /* 10 */ -41, 15, -205, -163, -267, -224, -168, -57, -233, -27, - /* 20 */ -167, -48, -161, -120, -210, 36, 61, 99, -35, -252, - /* 30 */ -141, -77, -68, -61, -50, -22, -7, 81, 93, 105, - /* 40 */ 110, 116, 117, 118, 119, 120, 121, 41, 136, 144, - /* 50 */ 145, 147, 148, 149, 150, 151, 141, 185, 187, 188, - /* 60 */ 189, 125, 130, 152, 190, 192, 195, 196, 197, 198, - /* 70 */ 199, 200, 202, 204, 205, 206, 207, 208, 209, 210, - /* 80 */ 211, 212, 214, 215, 217, 218, 219, 220, 222, 223, - /* 90 */ 224, 226, 227, 229, 230, 231, 232, 233, 234, 235, - /* 100 */ 236, 237, 238, 239, 175, 240, 241, 164, 171, 183, - /* 110 */ 243, 194, 245, 250, 246, 251, 254, 252, 259, 253, - /* 120 */ 263, 260, 261, 262, 264, 270, 271, 273, 272, 274, - /* 130 */ 277, 278, 279, 283, 275, 280, 291, 282, 292, 296, - /* 140 */ 301, + /* 0 */ -190, -84, 33, -137, -19, -194, -7, -17, 51, 11, + /* 10 */ -29, -34, 139, 142, -211, 121, 119, 52, 85, 133, + /* 20 */ 131, 126, -205, 108, 95, 58, 25, -90, 68, 420, + /* 30 */ 417, 416, 415, 414, 413, 411, 410, 409, 408, 407, + /* 40 */ 406, 405, 404, 403, 402, 401, 260, 400, 262, 399, + /* 50 */ 398, 397, 396, 286, 285, 257, 259, 395, 256, 349, + /* 60 */ 348, 346, 255, 252, 253, 345, 344, 343, 342, 341, + /* 70 */ 339, 338, 335, 334, 332, 331, 330, 329, 328, 327, + /* 80 */ 326, 325, 324, 322, 307, 306, 301, 300, 298, 288, + /* 90 */ 283, 281, 280, 278, 277, 276, 275, 274, 272, 271, + /* 100 */ 270, 269, 268, 267, 266, 247, 263, 261, 246, 205, + /* 110 */ 202, 258, 245, 244, 243, 241, 239, 208, 192, 238, + /* 120 */ 195, 194, 248, 242, 240, 237, 234, 233, 217, 231, + /* 130 */ 230, 210, 213, 229, 218, 228, 223, 227, 222, 220, + /* 140 */ 212, 216, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 671, 725, 714, 722, 903, 903, 671, 671, 671, 671, - /* 10 */ 671, 671, 828, 689, 903, 671, 671, 671, 671, 671, - /* 20 */ 671, 671, 722, 671, 671, 727, 727, 727, 823, 671, - /* 30 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 40 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 50 */ 671, 671, 671, 671, 671, 671, 671, 671, 830, 832, - /* 60 */ 671, 850, 850, 821, 671, 671, 671, 671, 671, 671, - /* 70 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 80 */ 671, 671, 671, 712, 671, 710, 671, 671, 671, 671, - /* 90 */ 671, 671, 671, 671, 671, 671, 671, 671, 699, 671, - /* 100 */ 671, 671, 671, 671, 671, 691, 691, 671, 671, 671, - /* 110 */ 691, 857, 861, 855, 843, 851, 842, 838, 837, 865, - /* 120 */ 671, 691, 691, 691, 722, 691, 743, 741, 739, 731, - /* 130 */ 737, 733, 735, 729, 691, 720, 691, 720, 691, 761, - /* 140 */ 777, 671, 866, 902, 856, 892, 891, 898, 890, 889, - /* 150 */ 671, 885, 886, 888, 887, 671, 671, 671, 671, 894, - /* 160 */ 893, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 170 */ 671, 671, 868, 671, 862, 858, 671, 671, 671, 671, - /* 180 */ 787, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 190 */ 671, 671, 671, 671, 671, 820, 671, 671, 829, 671, - /* 200 */ 671, 671, 671, 671, 671, 852, 671, 844, 671, 671, - /* 210 */ 671, 671, 671, 797, 671, 671, 671, 671, 671, 671, - /* 220 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 230 */ 907, 671, 671, 671, 905, 671, 671, 671, 671, 671, - /* 240 */ 671, 671, 671, 671, 671, 671, 671, 671, 671, 671, - /* 250 */ 671, 746, 671, 697, 695, 671, 687, 671, + /* 0 */ 675, 484, 473, 481, 664, 664, 675, 675, 675, 675, + /* 10 */ 675, 675, 587, 448, 664, 675, 675, 675, 675, 675, + /* 20 */ 675, 675, 481, 675, 675, 486, 486, 486, 582, 675, + /* 30 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, + /* 40 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, + /* 50 */ 675, 675, 675, 675, 675, 675, 675, 675, 589, 591, + /* 60 */ 593, 675, 611, 611, 580, 675, 675, 675, 675, 675, + /* 70 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, + /* 80 */ 675, 675, 675, 675, 471, 675, 469, 675, 675, 675, + /* 90 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 458, + /* 100 */ 675, 675, 675, 675, 675, 675, 450, 450, 675, 675, + /* 110 */ 675, 450, 618, 622, 616, 604, 612, 603, 599, 598, + /* 120 */ 626, 675, 450, 450, 450, 481, 450, 502, 500, 498, + /* 130 */ 490, 496, 492, 494, 488, 450, 479, 450, 479, 450, + /* 140 */ 520, 536, 675, 627, 663, 617, 653, 652, 659, 651, + /* 150 */ 650, 675, 646, 647, 649, 648, 675, 675, 675, 675, + /* 160 */ 655, 654, 675, 675, 675, 675, 675, 675, 675, 675, + /* 170 */ 675, 675, 675, 629, 675, 623, 619, 675, 675, 675, + /* 180 */ 675, 546, 675, 675, 675, 675, 675, 675, 675, 675, + /* 190 */ 675, 675, 675, 675, 675, 675, 579, 675, 675, 590, + /* 200 */ 675, 675, 675, 675, 675, 675, 613, 675, 605, 675, + /* 210 */ 675, 675, 675, 675, 556, 675, 675, 675, 675, 675, + /* 220 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, + /* 230 */ 675, 668, 675, 675, 675, 666, 675, 675, 675, 675, + /* 240 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, + /* 250 */ 675, 675, 505, 675, 456, 454, 675, 446, 675, 674, + /* 260 */ 673, 672, 665, 578, 577, 576, 575, 588, 584, 586, + /* 270 */ 585, 583, 592, 594, 581, 597, 596, 601, 600, 602, + /* 280 */ 595, 615, 614, 607, 608, 610, 609, 606, 643, 661, + /* 290 */ 662, 660, 658, 657, 656, 642, 641, 640, 639, 638, + /* 300 */ 635, 637, 634, 636, 633, 632, 631, 630, 628, 645, + /* 310 */ 644, 625, 624, 621, 620, 574, 559, 557, 554, 558, + /* 320 */ 555, 552, 485, 535, 534, 533, 532, 531, 530, 529, + /* 330 */ 528, 527, 526, 525, 524, 523, 522, 521, 517, 513, + /* 340 */ 511, 510, 509, 506, 480, 483, 482, 671, 670, 669, + /* 350 */ 667, 561, 562, 548, 551, 550, 549, 547, 560, 504, + /* 360 */ 503, 501, 499, 491, 497, 493, 495, 489, 487, 475, + /* 370 */ 474, 545, 544, 543, 542, 541, 540, 539, 538, 537, + /* 380 */ 519, 518, 516, 515, 514, 512, 508, 507, 564, 573, + /* 390 */ 572, 571, 570, 569, 568, 567, 566, 565, 563, 472, + /* 400 */ 470, 468, 467, 466, 465, 464, 463, 462, 461, 478, + /* 410 */ 460, 459, 457, 455, 453, 452, 477, 476, 451, 449, + /* 420 */ 447, 445, 444, 443, 442, 441, 440, 439, 438, 437, + /* 430 */ 436, 435, 434, }; -/********** End of lemon-generated parsing tables *****************************/ -/* The next table maps tokens (terminal symbols) into fallback tokens. -** If a construct like the following: +/* The next table maps tokens into fallback tokens. If a construct +** like the following: ** ** %fallback ID X Y Z. ** @@ -437,10 +420,6 @@ static const YYACTIONTYPE yy_default[] = { ** and Z. Whenever one of the tokens X, Y, or Z is input to the parser ** but it does not parse, the type of the token is changed to ID and ** the parse is retried before an error is thrown. -** -** This feature can be used, for example, to cause some keywords in a language -** to revert to identifiers if they keyword does not apply in the context where -** it appears. */ #ifdef YYFALLBACK static const YYCODETYPE yyFallback[] = { @@ -555,6 +534,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* SELECT => nothing */ 0, /* UNION => nothing */ 1, /* ALL => ID */ + 0, /* DISTINCT => nothing */ 0, /* FROM => nothing */ 0, /* VARIABLE => nothing */ 0, /* INTERVAL => nothing */ @@ -667,13 +647,9 @@ static const YYCODETYPE yyFallback[] = { ** + The semantic value stored at this level of the stack. This is ** the information used by the action routines in the grammar. ** It is sometimes called the "minor" token. -** -** After the "shift" half of a SHIFTREDUCE action, the stateno field -** actually contains the reduce action for the second half of the -** SHIFTREDUCE. */ struct yyStackEntry { - YYACTIONTYPE stateno; /* The state-number, or reduce action in SHIFTREDUCE */ + YYACTIONTYPE stateno; /* The state-number */ YYCODETYPE major; /* The major token value. This is the code ** number for the token at this stack level */ YYMINORTYPE minor; /* The user-supplied minor token value. This @@ -684,21 +660,17 @@ typedef struct yyStackEntry yyStackEntry; /* The state of the parser is completely contained in an instance of ** the following structure */ struct yyParser { - yyStackEntry *yytos; /* Pointer to top element of the stack */ + int yyidx; /* Index of top element in stack */ #ifdef YYTRACKMAXSTACKDEPTH - int yyhwm; /* High-water mark of the stack */ + int yyidxMax; /* Maximum value of yyidx */ #endif -#ifndef YYNOERRORRECOVERY int yyerrcnt; /* Shifts left before out of the error */ -#endif ParseARG_SDECL /* A place to hold %extra_argument */ #if YYSTACKDEPTH<=0 int yystksz; /* Current side of the stack */ yyStackEntry *yystack; /* The parser's stack */ - yyStackEntry yystk0; /* First stack entry */ #else yyStackEntry yystack[YYSTACKDEPTH]; /* The parser's stack */ - yyStackEntry *yystackEnd; /* Last entry in the stack */ #endif }; typedef struct yyParser yyParser; @@ -735,290 +707,82 @@ void ParseTrace(FILE *TraceFILE, char *zTracePrompt){ } #endif /* NDEBUG */ -#if defined(YYCOVERAGE) || !defined(NDEBUG) +#ifndef NDEBUG /* For tracing shifts, the names of all terminals and nonterminals ** are required. The following table supplies these names */ static const char *const yyTokenName[] = { - /* 0 */ "$", - /* 1 */ "ID", - /* 2 */ "BOOL", - /* 3 */ "TINYINT", - /* 4 */ "SMALLINT", - /* 5 */ "INTEGER", - /* 6 */ "BIGINT", - /* 7 */ "FLOAT", - /* 8 */ "DOUBLE", - /* 9 */ "STRING", - /* 10 */ "TIMESTAMP", - /* 11 */ "BINARY", - /* 12 */ "NCHAR", - /* 13 */ "OR", - /* 14 */ "AND", - /* 15 */ "NOT", - /* 16 */ "EQ", - /* 17 */ "NE", - /* 18 */ "ISNULL", - /* 19 */ "NOTNULL", - /* 20 */ "IS", - /* 21 */ "LIKE", - /* 22 */ "GLOB", - /* 23 */ "BETWEEN", - /* 24 */ "IN", - /* 25 */ "GT", - /* 26 */ "GE", - /* 27 */ "LT", - /* 28 */ "LE", - /* 29 */ "BITAND", - /* 30 */ "BITOR", - /* 31 */ "LSHIFT", - /* 32 */ "RSHIFT", - /* 33 */ "PLUS", - /* 34 */ "MINUS", - /* 35 */ "DIVIDE", - /* 36 */ "TIMES", - /* 37 */ "STAR", - /* 38 */ "SLASH", - /* 39 */ "REM", - /* 40 */ "CONCAT", - /* 41 */ "UMINUS", - /* 42 */ "UPLUS", - /* 43 */ "BITNOT", - /* 44 */ "SHOW", - /* 45 */ "DATABASES", - /* 46 */ "MNODES", - /* 47 */ "DNODES", - /* 48 */ "ACCOUNTS", - /* 49 */ "USERS", - /* 50 */ "MODULES", - /* 51 */ "QUERIES", - /* 52 */ "CONNECTIONS", - /* 53 */ "STREAMS", - /* 54 */ "VARIABLES", - /* 55 */ "SCORES", - /* 56 */ "GRANTS", - /* 57 */ "VNODES", - /* 58 */ "IPTOKEN", - /* 59 */ "DOT", - /* 60 */ "CREATE", - /* 61 */ "TABLE", - /* 62 */ "DATABASE", - /* 63 */ "TABLES", - /* 64 */ "STABLES", - /* 65 */ "VGROUPS", - /* 66 */ "DROP", - /* 67 */ "DNODE", - /* 68 */ "USER", - /* 69 */ "ACCOUNT", - /* 70 */ "USE", - /* 71 */ "DESCRIBE", - /* 72 */ "ALTER", - /* 73 */ "PASS", - /* 74 */ "PRIVILEGE", - /* 75 */ "LOCAL", - /* 76 */ "IF", - /* 77 */ "EXISTS", - /* 78 */ "PPS", - /* 79 */ "TSERIES", - /* 80 */ "DBS", - /* 81 */ "STORAGE", - /* 82 */ "QTIME", - /* 83 */ "CONNS", - /* 84 */ "STATE", - /* 85 */ "KEEP", - /* 86 */ "CACHE", - /* 87 */ "REPLICA", - /* 88 */ "QUORUM", - /* 89 */ "DAYS", - /* 90 */ "MINROWS", - /* 91 */ "MAXROWS", - /* 92 */ "BLOCKS", - /* 93 */ "CTIME", - /* 94 */ "WAL", - /* 95 */ "FSYNC", - /* 96 */ "COMP", - /* 97 */ "PRECISION", - /* 98 */ "UPDATE", - /* 99 */ "CACHELAST", - /* 100 */ "LP", - /* 101 */ "RP", - /* 102 */ "UNSIGNED", - /* 103 */ "TAGS", - /* 104 */ "USING", - /* 105 */ "AS", - /* 106 */ "COMMA", - /* 107 */ "NULL", - /* 108 */ "SELECT", - /* 109 */ "UNION", - /* 110 */ "ALL", - /* 111 */ "FROM", - /* 112 */ "VARIABLE", - /* 113 */ "INTERVAL", - /* 114 */ "FILL", - /* 115 */ "SLIDING", - /* 116 */ "ORDER", - /* 117 */ "BY", - /* 118 */ "ASC", - /* 119 */ "DESC", - /* 120 */ "GROUP", - /* 121 */ "HAVING", - /* 122 */ "LIMIT", - /* 123 */ "OFFSET", - /* 124 */ "SLIMIT", - /* 125 */ "SOFFSET", - /* 126 */ "WHERE", - /* 127 */ "NOW", - /* 128 */ "RESET", - /* 129 */ "QUERY", - /* 130 */ "ADD", - /* 131 */ "COLUMN", - /* 132 */ "TAG", - /* 133 */ "CHANGE", - /* 134 */ "SET", - /* 135 */ "KILL", - /* 136 */ "CONNECTION", - /* 137 */ "STREAM", - /* 138 */ "COLON", - /* 139 */ "ABORT", - /* 140 */ "AFTER", - /* 141 */ "ATTACH", - /* 142 */ "BEFORE", - /* 143 */ "BEGIN", - /* 144 */ "CASCADE", - /* 145 */ "CLUSTER", - /* 146 */ "CONFLICT", - /* 147 */ "COPY", - /* 148 */ "DEFERRED", - /* 149 */ "DELIMITERS", - /* 150 */ "DETACH", - /* 151 */ "EACH", - /* 152 */ "END", - /* 153 */ "EXPLAIN", - /* 154 */ "FAIL", - /* 155 */ "FOR", - /* 156 */ "IGNORE", - /* 157 */ "IMMEDIATE", - /* 158 */ "INITIALLY", - /* 159 */ "INSTEAD", - /* 160 */ "MATCH", - /* 161 */ "KEY", - /* 162 */ "OF", - /* 163 */ "RAISE", - /* 164 */ "REPLACE", - /* 165 */ "RESTRICT", - /* 166 */ "ROW", - /* 167 */ "STATEMENT", - /* 168 */ "TRIGGER", - /* 169 */ "VIEW", - /* 170 */ "COUNT", - /* 171 */ "SUM", - /* 172 */ "AVG", - /* 173 */ "MIN", - /* 174 */ "MAX", - /* 175 */ "FIRST", - /* 176 */ "LAST", - /* 177 */ "TOP", - /* 178 */ "BOTTOM", - /* 179 */ "STDDEV", - /* 180 */ "PERCENTILE", - /* 181 */ "APERCENTILE", - /* 182 */ "LEASTSQUARES", - /* 183 */ "HISTOGRAM", - /* 184 */ "DIFF", - /* 185 */ "SPREAD", - /* 186 */ "TWA", - /* 187 */ "INTERP", - /* 188 */ "LAST_ROW", - /* 189 */ "RATE", - /* 190 */ "IRATE", - /* 191 */ "SUM_RATE", - /* 192 */ "SUM_IRATE", - /* 193 */ "AVG_RATE", - /* 194 */ "AVG_IRATE", - /* 195 */ "TBID", - /* 196 */ "SEMI", - /* 197 */ "NONE", - /* 198 */ "PREV", - /* 199 */ "LINEAR", - /* 200 */ "IMPORT", - /* 201 */ "METRIC", - /* 202 */ "TBNAME", - /* 203 */ "JOIN", - /* 204 */ "METRICS", - /* 205 */ "STABLE", - /* 206 */ "INSERT", - /* 207 */ "INTO", - /* 208 */ "VALUES", - /* 209 */ "error", - /* 210 */ "program", - /* 211 */ "cmd", - /* 212 */ "dbPrefix", - /* 213 */ "ids", - /* 214 */ "cpxName", - /* 215 */ "ifexists", - /* 216 */ "alter_db_optr", - /* 217 */ "acct_optr", - /* 218 */ "ifnotexists", - /* 219 */ "db_optr", - /* 220 */ "pps", - /* 221 */ "tseries", - /* 222 */ "dbs", - /* 223 */ "streams", - /* 224 */ "storage", - /* 225 */ "qtime", - /* 226 */ "users", - /* 227 */ "conns", - /* 228 */ "state", - /* 229 */ "keep", - /* 230 */ "tagitemlist", - /* 231 */ "cache", - /* 232 */ "replica", - /* 233 */ "quorum", - /* 234 */ "days", - /* 235 */ "minrows", - /* 236 */ "maxrows", - /* 237 */ "blocks", - /* 238 */ "ctime", - /* 239 */ "wal", - /* 240 */ "fsync", - /* 241 */ "comp", - /* 242 */ "prec", - /* 243 */ "update", - /* 244 */ "cachelast", - /* 245 */ "typename", - /* 246 */ "signed", - /* 247 */ "create_table_args", - /* 248 */ "create_table_list", - /* 249 */ "create_from_stable", - /* 250 */ "columnlist", - /* 251 */ "select", - /* 252 */ "column", - /* 253 */ "tagitem", - /* 254 */ "selcollist", - /* 255 */ "from", - /* 256 */ "where_opt", - /* 257 */ "interval_opt", - /* 258 */ "fill_opt", - /* 259 */ "sliding_opt", - /* 260 */ "groupby_opt", - /* 261 */ "orderby_opt", - /* 262 */ "having_opt", - /* 263 */ "slimit_opt", - /* 264 */ "limit_opt", - /* 265 */ "union", - /* 266 */ "sclp", - /* 267 */ "expr", - /* 268 */ "as", - /* 269 */ "tablelist", - /* 270 */ "tmvar", - /* 271 */ "sortlist", - /* 272 */ "sortitem", - /* 273 */ "item", - /* 274 */ "sortorder", - /* 275 */ "grouplist", - /* 276 */ "exprlist", - /* 277 */ "expritem", + "$", "ID", "BOOL", "TINYINT", + "SMALLINT", "INTEGER", "BIGINT", "FLOAT", + "DOUBLE", "STRING", "TIMESTAMP", "BINARY", + "NCHAR", "OR", "AND", "NOT", + "EQ", "NE", "ISNULL", "NOTNULL", + "IS", "LIKE", "GLOB", "BETWEEN", + "IN", "GT", "GE", "LT", + "LE", "BITAND", "BITOR", "LSHIFT", + "RSHIFT", "PLUS", "MINUS", "DIVIDE", + "TIMES", "STAR", "SLASH", "REM", + "CONCAT", "UMINUS", "UPLUS", "BITNOT", + "SHOW", "DATABASES", "MNODES", "DNODES", + "ACCOUNTS", "USERS", "MODULES", "QUERIES", + "CONNECTIONS", "STREAMS", "VARIABLES", "SCORES", + "GRANTS", "VNODES", "IPTOKEN", "DOT", + "CREATE", "TABLE", "DATABASE", "TABLES", + "STABLES", "VGROUPS", "DROP", "DNODE", + "USER", "ACCOUNT", "USE", "DESCRIBE", + "ALTER", "PASS", "PRIVILEGE", "LOCAL", + "IF", "EXISTS", "PPS", "TSERIES", + "DBS", "STORAGE", "QTIME", "CONNS", + "STATE", "KEEP", "CACHE", "REPLICA", + "QUORUM", "DAYS", "MINROWS", "MAXROWS", + "BLOCKS", "CTIME", "WAL", "FSYNC", + "COMP", "PRECISION", "UPDATE", "CACHELAST", + "LP", "RP", "UNSIGNED", "TAGS", + "USING", "AS", "COMMA", "NULL", + "SELECT", "UNION", "ALL", "DISTINCT", + "FROM", "VARIABLE", "INTERVAL", "FILL", + "SLIDING", "ORDER", "BY", "ASC", + "DESC", "GROUP", "HAVING", "LIMIT", + "OFFSET", "SLIMIT", "SOFFSET", "WHERE", + "NOW", "RESET", "QUERY", "ADD", + "COLUMN", "TAG", "CHANGE", "SET", + "KILL", "CONNECTION", "STREAM", "COLON", + "ABORT", "AFTER", "ATTACH", "BEFORE", + "BEGIN", "CASCADE", "CLUSTER", "CONFLICT", + "COPY", "DEFERRED", "DELIMITERS", "DETACH", + "EACH", "END", "EXPLAIN", "FAIL", + "FOR", "IGNORE", "IMMEDIATE", "INITIALLY", + "INSTEAD", "MATCH", "KEY", "OF", + "RAISE", "REPLACE", "RESTRICT", "ROW", + "STATEMENT", "TRIGGER", "VIEW", "COUNT", + "SUM", "AVG", "MIN", "MAX", + "FIRST", "LAST", "TOP", "BOTTOM", + "STDDEV", "PERCENTILE", "APERCENTILE", "LEASTSQUARES", + "HISTOGRAM", "DIFF", "SPREAD", "TWA", + "INTERP", "LAST_ROW", "RATE", "IRATE", + "SUM_RATE", "SUM_IRATE", "AVG_RATE", "AVG_IRATE", + "TBID", "SEMI", "NONE", "PREV", + "LINEAR", "IMPORT", "METRIC", "TBNAME", + "JOIN", "METRICS", "STABLE", "INSERT", + "INTO", "VALUES", "error", "program", + "cmd", "dbPrefix", "ids", "cpxName", + "ifexists", "alter_db_optr", "acct_optr", "ifnotexists", + "db_optr", "pps", "tseries", "dbs", + "streams", "storage", "qtime", "users", + "conns", "state", "keep", "tagitemlist", + "cache", "replica", "quorum", "days", + "minrows", "maxrows", "blocks", "ctime", + "wal", "fsync", "comp", "prec", + "update", "cachelast", "typename", "signed", + "create_table_args", "create_table_list", "create_from_stable", "columnlist", + "select", "column", "tagitem", "selcollist", + "from", "where_opt", "interval_opt", "fill_opt", + "sliding_opt", "groupby_opt", "orderby_opt", "having_opt", + "slimit_opt", "limit_opt", "union", "sclp", + "distinct", "expr", "as", "tablelist", + "tmvar", "sortlist", "sortitem", "item", + "sortorder", "grouplist", "exprlist", "expritem", }; -#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ +#endif /* NDEBUG */ #ifndef NDEBUG /* For tracing reduce actions, the names of all rules are required. @@ -1174,170 +938,125 @@ static const char *const yyRuleName[] = { /* 147 */ "select ::= SELECT selcollist", /* 148 */ "sclp ::= selcollist COMMA", /* 149 */ "sclp ::=", - /* 150 */ "selcollist ::= sclp expr as", + /* 150 */ "selcollist ::= sclp distinct expr as", /* 151 */ "selcollist ::= sclp STAR", /* 152 */ "as ::= AS ids", /* 153 */ "as ::= ids", /* 154 */ "as ::=", - /* 155 */ "from ::= FROM tablelist", - /* 156 */ "tablelist ::= ids cpxName", - /* 157 */ "tablelist ::= ids cpxName ids", - /* 158 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 159 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 160 */ "tmvar ::= VARIABLE", - /* 161 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 162 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 163 */ "interval_opt ::=", - /* 164 */ "fill_opt ::=", - /* 165 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 166 */ "fill_opt ::= FILL LP ID RP", - /* 167 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 168 */ "sliding_opt ::=", - /* 169 */ "orderby_opt ::=", - /* 170 */ "orderby_opt ::= ORDER BY sortlist", - /* 171 */ "sortlist ::= sortlist COMMA item sortorder", - /* 172 */ "sortlist ::= item sortorder", - /* 173 */ "item ::= ids cpxName", - /* 174 */ "sortorder ::= ASC", - /* 175 */ "sortorder ::= DESC", - /* 176 */ "sortorder ::=", - /* 177 */ "groupby_opt ::=", - /* 178 */ "groupby_opt ::= GROUP BY grouplist", - /* 179 */ "grouplist ::= grouplist COMMA item", - /* 180 */ "grouplist ::= item", - /* 181 */ "having_opt ::=", - /* 182 */ "having_opt ::= HAVING expr", - /* 183 */ "limit_opt ::=", - /* 184 */ "limit_opt ::= LIMIT signed", - /* 185 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 186 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 187 */ "slimit_opt ::=", - /* 188 */ "slimit_opt ::= SLIMIT signed", - /* 189 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 190 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 191 */ "where_opt ::=", - /* 192 */ "where_opt ::= WHERE expr", - /* 193 */ "expr ::= LP expr RP", - /* 194 */ "expr ::= ID", - /* 195 */ "expr ::= ID DOT ID", - /* 196 */ "expr ::= ID DOT STAR", - /* 197 */ "expr ::= INTEGER", - /* 198 */ "expr ::= MINUS INTEGER", - /* 199 */ "expr ::= PLUS INTEGER", - /* 200 */ "expr ::= FLOAT", - /* 201 */ "expr ::= MINUS FLOAT", - /* 202 */ "expr ::= PLUS FLOAT", - /* 203 */ "expr ::= STRING", - /* 204 */ "expr ::= NOW", - /* 205 */ "expr ::= VARIABLE", - /* 206 */ "expr ::= BOOL", - /* 207 */ "expr ::= ID LP exprlist RP", - /* 208 */ "expr ::= ID LP STAR RP", - /* 209 */ "expr ::= expr IS NULL", - /* 210 */ "expr ::= expr IS NOT NULL", - /* 211 */ "expr ::= expr LT expr", - /* 212 */ "expr ::= expr GT expr", - /* 213 */ "expr ::= expr LE expr", - /* 214 */ "expr ::= expr GE expr", - /* 215 */ "expr ::= expr NE expr", - /* 216 */ "expr ::= expr EQ expr", - /* 217 */ "expr ::= expr AND expr", - /* 218 */ "expr ::= expr OR expr", - /* 219 */ "expr ::= expr PLUS expr", - /* 220 */ "expr ::= expr MINUS expr", - /* 221 */ "expr ::= expr STAR expr", - /* 222 */ "expr ::= expr SLASH expr", - /* 223 */ "expr ::= expr REM expr", - /* 224 */ "expr ::= expr LIKE expr", - /* 225 */ "expr ::= expr IN LP exprlist RP", - /* 226 */ "exprlist ::= exprlist COMMA expritem", - /* 227 */ "exprlist ::= expritem", - /* 228 */ "expritem ::= expr", - /* 229 */ "expritem ::=", - /* 230 */ "cmd ::= RESET QUERY CACHE", - /* 231 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 232 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 233 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 234 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 235 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 236 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 237 */ "cmd ::= KILL CONNECTION INTEGER", - /* 238 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 239 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 155 */ "distinct ::= DISTINCT", + /* 156 */ "distinct ::=", + /* 157 */ "from ::= FROM tablelist", + /* 158 */ "tablelist ::= ids cpxName", + /* 159 */ "tablelist ::= ids cpxName ids", + /* 160 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 161 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 162 */ "tmvar ::= VARIABLE", + /* 163 */ "interval_opt ::= INTERVAL LP tmvar RP", + /* 164 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 165 */ "interval_opt ::=", + /* 166 */ "fill_opt ::=", + /* 167 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 168 */ "fill_opt ::= FILL LP ID RP", + /* 169 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 170 */ "sliding_opt ::=", + /* 171 */ "orderby_opt ::=", + /* 172 */ "orderby_opt ::= ORDER BY sortlist", + /* 173 */ "sortlist ::= sortlist COMMA item sortorder", + /* 174 */ "sortlist ::= item sortorder", + /* 175 */ "item ::= ids cpxName", + /* 176 */ "sortorder ::= ASC", + /* 177 */ "sortorder ::= DESC", + /* 178 */ "sortorder ::=", + /* 179 */ "groupby_opt ::=", + /* 180 */ "groupby_opt ::= GROUP BY grouplist", + /* 181 */ "grouplist ::= grouplist COMMA item", + /* 182 */ "grouplist ::= item", + /* 183 */ "having_opt ::=", + /* 184 */ "having_opt ::= HAVING expr", + /* 185 */ "limit_opt ::=", + /* 186 */ "limit_opt ::= LIMIT signed", + /* 187 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 188 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 189 */ "slimit_opt ::=", + /* 190 */ "slimit_opt ::= SLIMIT signed", + /* 191 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 192 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 193 */ "where_opt ::=", + /* 194 */ "where_opt ::= WHERE expr", + /* 195 */ "expr ::= LP expr RP", + /* 196 */ "expr ::= ID", + /* 197 */ "expr ::= ID DOT ID", + /* 198 */ "expr ::= ID DOT STAR", + /* 199 */ "expr ::= INTEGER", + /* 200 */ "expr ::= MINUS INTEGER", + /* 201 */ "expr ::= PLUS INTEGER", + /* 202 */ "expr ::= FLOAT", + /* 203 */ "expr ::= MINUS FLOAT", + /* 204 */ "expr ::= PLUS FLOAT", + /* 205 */ "expr ::= STRING", + /* 206 */ "expr ::= NOW", + /* 207 */ "expr ::= VARIABLE", + /* 208 */ "expr ::= BOOL", + /* 209 */ "expr ::= ID LP exprlist RP", + /* 210 */ "expr ::= ID LP STAR RP", + /* 211 */ "expr ::= expr IS NULL", + /* 212 */ "expr ::= expr IS NOT NULL", + /* 213 */ "expr ::= expr LT expr", + /* 214 */ "expr ::= expr GT expr", + /* 215 */ "expr ::= expr LE expr", + /* 216 */ "expr ::= expr GE expr", + /* 217 */ "expr ::= expr NE expr", + /* 218 */ "expr ::= expr EQ expr", + /* 219 */ "expr ::= expr AND expr", + /* 220 */ "expr ::= expr OR expr", + /* 221 */ "expr ::= expr PLUS expr", + /* 222 */ "expr ::= expr MINUS expr", + /* 223 */ "expr ::= expr STAR expr", + /* 224 */ "expr ::= expr SLASH expr", + /* 225 */ "expr ::= expr REM expr", + /* 226 */ "expr ::= expr LIKE expr", + /* 227 */ "expr ::= expr IN LP exprlist RP", + /* 228 */ "exprlist ::= exprlist COMMA expritem", + /* 229 */ "exprlist ::= expritem", + /* 230 */ "expritem ::= expr", + /* 231 */ "expritem ::=", + /* 232 */ "cmd ::= RESET QUERY CACHE", + /* 233 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 234 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 235 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 236 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 237 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 238 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 239 */ "cmd ::= KILL CONNECTION INTEGER", + /* 240 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 241 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ #if YYSTACKDEPTH<=0 /* -** Try to increase the size of the parser stack. Return the number -** of errors. Return 0 on success. +** Try to increase the size of the parser stack. */ -static int yyGrowStack(yyParser *p){ +static void yyGrowStack(yyParser *p){ int newSize; - int idx; yyStackEntry *pNew; newSize = p->yystksz*2 + 100; - idx = p->yytos ? (int)(p->yytos - p->yystack) : 0; - if( p->yystack==&p->yystk0 ){ - pNew = malloc(newSize*sizeof(pNew[0])); - if( pNew ) pNew[0] = p->yystk0; - }else{ - pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); - } + pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); if( pNew ){ p->yystack = pNew; - p->yytos = &p->yystack[idx]; + p->yystksz = newSize; #ifndef NDEBUG if( yyTraceFILE ){ - fprintf(yyTraceFILE,"%sStack grows from %d to %d entries.\n", - yyTracePrompt, p->yystksz, newSize); + fprintf(yyTraceFILE,"%sStack grows to %d entries!\n", + yyTracePrompt, p->yystksz); } #endif - p->yystksz = newSize; } - return pNew==0; } #endif -/* Datatype of the argument to the memory allocated passed as the -** second argument to ParseAlloc() below. This can be changed by -** putting an appropriate #define in the %include section of the input -** grammar. -*/ -#ifndef YYMALLOCARGTYPE -# define YYMALLOCARGTYPE size_t -#endif - -/* Initialize a new parser that has already been allocated. -*/ -void ParseInit(void *yypParser){ - yyParser *pParser = (yyParser*)yypParser; -#ifdef YYTRACKMAXSTACKDEPTH - pParser->yyhwm = 0; -#endif -#if YYSTACKDEPTH<=0 - pParser->yytos = NULL; - pParser->yystack = NULL; - pParser->yystksz = 0; - if( yyGrowStack(pParser) ){ - pParser->yystack = &pParser->yystk0; - pParser->yystksz = 1; - } -#endif -#ifndef YYNOERRORRECOVERY - pParser->yyerrcnt = -1; -#endif - pParser->yytos = pParser->yystack; - pParser->yystack[0].stateno = 0; - pParser->yystack[0].major = 0; -#if YYSTACKDEPTH>0 - pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1]; -#endif -} - -#ifndef Parse_ENGINEALWAYSONSTACK /* ** This function allocates a new parser. ** The only argument is a pointer to a function which works like @@ -1350,21 +1069,27 @@ void ParseInit(void *yypParser){ ** A pointer to a parser. This pointer is used in subsequent calls ** to Parse and ParseFree. */ -void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){ +void *ParseAlloc(void *(*mallocProc)(size_t)){ yyParser *pParser; - pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) ); - if( pParser ) ParseInit(pParser); + pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); + if( pParser ){ + pParser->yyidx = -1; +#ifdef YYTRACKMAXSTACKDEPTH + pParser->yyidxMax = 0; +#endif +#if YYSTACKDEPTH<=0 + pParser->yystack = NULL; + pParser->yystksz = 0; + yyGrowStack(pParser); +#endif + } return pParser; } -#endif /* Parse_ENGINEALWAYSONSTACK */ - -/* The following function deletes the "minor type" or semantic value -** associated with a symbol. The symbol can be either a terminal -** or nonterminal. "yymajor" is the symbol code, and "yypminor" is -** a pointer to the value to be deleted. The code used to do the -** deletions is derived from the %destructor and/or %token_destructor -** directives of the input grammar. +/* The following function deletes the value associated with a +** symbol. The symbol can be either a terminal or nonterminal. +** "yymajor" is the symbol code, and "yypminor" is a pointer to +** the value. */ static void yy_destructor( yyParser *yypParser, /* The parser */ @@ -1380,58 +1105,70 @@ static void yy_destructor( ** being destroyed before it is finished parsing. ** ** Note: during a reduce, the only symbols destroyed are those - ** which appear on the RHS of the rule, but which are *not* used + ** which appear on the RHS of the rule, but which are not used ** inside the C code. */ -/********* Begin destructor definitions ***************************************/ - case 229: /* keep */ - case 230: /* tagitemlist */ - case 250: /* columnlist */ - case 258: /* fill_opt */ - case 260: /* groupby_opt */ - case 261: /* orderby_opt */ - case 271: /* sortlist */ - case 275: /* grouplist */ + case 230: /* keep */ + case 231: /* tagitemlist */ + case 251: /* columnlist */ + case 259: /* fill_opt */ + case 261: /* groupby_opt */ + case 262: /* orderby_opt */ + case 273: /* sortlist */ + case 277: /* grouplist */ { -taosArrayDestroy((yypminor->yy421)); +#line 227 "sql.y" +taosArrayDestroy((yypminor->yy221)); +#line 1123 "sql.c" } break; - case 248: /* create_table_list */ + case 249: /* create_table_list */ { -destroyCreateTableSql((yypminor->yy38)); +#line 311 "sql.y" +destroyCreateTableSql((yypminor->yy358)); +#line 1130 "sql.c" } break; - case 251: /* select */ + case 252: /* select */ { -doDestroyQuerySql((yypminor->yy148)); +#line 418 "sql.y" +doDestroyQuerySql((yypminor->yy344)); +#line 1137 "sql.c" } break; - case 254: /* selcollist */ - case 266: /* sclp */ - case 276: /* exprlist */ + case 255: /* selcollist */ + case 267: /* sclp */ + case 278: /* exprlist */ { -tSqlExprListDestroy((yypminor->yy166)); +#line 445 "sql.y" +tSqlExprListDestroy((yypminor->yy178)); +#line 1146 "sql.c" } break; - case 256: /* where_opt */ - case 262: /* having_opt */ - case 267: /* expr */ - case 277: /* expritem */ + case 257: /* where_opt */ + case 263: /* having_opt */ + case 269: /* expr */ + case 279: /* expritem */ { -tSqlExprDestroy((yypminor->yy78)); +#line 612 "sql.y" +tSqlExprDestroy((yypminor->yy50)); +#line 1156 "sql.c" } break; - case 265: /* union */ + case 266: /* union */ { -destroyAllSelectClause((yypminor->yy153)); +#line 424 "sql.y" +destroyAllSelectClause((yypminor->yy273)); +#line 1163 "sql.c" } break; - case 272: /* sortitem */ + case 274: /* sortitem */ { -tVariantDestroy(&(yypminor->yy430)); +#line 545 "sql.y" +tVariantDestroy(&(yypminor->yy106)); +#line 1170 "sql.c" } break; -/********* End destructor definitions *****************************************/ default: break; /* If no destructor action specified: do nothing */ } } @@ -1441,53 +1178,51 @@ tVariantDestroy(&(yypminor->yy430)); ** ** If there is a destructor routine associated with the token which ** is popped from the stack, then call it. +** +** Return the major token number for the symbol popped. */ -static void yy_pop_parser_stack(yyParser *pParser){ - yyStackEntry *yytos; - assert( pParser->yytos!=0 ); - assert( pParser->yytos > pParser->yystack ); - yytos = pParser->yytos--; +static int yy_pop_parser_stack(yyParser *pParser){ + YYCODETYPE yymajor; + yyStackEntry *yytos = &pParser->yystack[pParser->yyidx]; + + if( pParser->yyidx<0 ) return 0; #ifndef NDEBUG - if( yyTraceFILE ){ + if( yyTraceFILE && pParser->yyidx>=0 ){ fprintf(yyTraceFILE,"%sPopping %s\n", yyTracePrompt, yyTokenName[yytos->major]); } #endif - yy_destructor(pParser, yytos->major, &yytos->minor); + yymajor = yytos->major; + yy_destructor(pParser, yymajor, &yytos->minor); + pParser->yyidx--; + return yymajor; } -/* -** Clear all secondary memory allocations from the parser -*/ -void ParseFinalize(void *p){ - yyParser *pParser = (yyParser*)p; - while( pParser->yytos>pParser->yystack ) yy_pop_parser_stack(pParser); -#if YYSTACKDEPTH<=0 - if( pParser->yystack!=&pParser->yystk0 ) free(pParser->yystack); -#endif -} - -#ifndef Parse_ENGINEALWAYSONSTACK /* -** Deallocate and destroy a parser. Destructors are called for +** Deallocate and destroy a parser. Destructors are all called for ** all stack elements before shutting the parser down. ** -** If the YYPARSEFREENEVERNULL macro exists (for example because it -** is defined in a %include section of the input grammar) then it is -** assumed that the input pointer is never NULL. +** Inputs: +**
    +**
  • A pointer to the parser. This should be a pointer +** obtained from ParseAlloc. +**
  • A pointer to a function used to reclaim memory obtained +** from malloc. +**
*/ void ParseFree( void *p, /* The parser to be deleted */ void (*freeProc)(void*) /* Function used to reclaim memory */ ){ -#ifndef YYPARSEFREENEVERNULL - if( p==0 ) return; + yyParser *pParser = (yyParser*)p; + if( pParser==0 ) return; + while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser); +#if YYSTACKDEPTH<=0 + free(pParser->yystack); #endif - ParseFinalize(p); - (*freeProc)(p); + (*freeProc)((void*)pParser); } -#endif /* Parse_ENGINEALWAYSONSTACK */ /* ** Return the peak depth of the stack for a parser. @@ -1495,70 +1230,33 @@ void ParseFree( #ifdef YYTRACKMAXSTACKDEPTH int ParseStackPeak(void *p){ yyParser *pParser = (yyParser*)p; - return pParser->yyhwm; -} -#endif - -/* This array of booleans keeps track of the parser statement -** coverage. The element yycoverage[X][Y] is set when the parser -** is in state X and has a lookahead token Y. In a well-tested -** systems, every element of this matrix should end up being set. -*/ -#if defined(YYCOVERAGE) -static unsigned char yycoverage[YYNSTATE][YYNTOKEN]; -#endif - -/* -** Write into out a description of every state/lookahead combination that -** -** (1) has not been used by the parser, and -** (2) is not a syntax error. -** -** Return the number of missed state/lookahead combinations. -*/ -#if defined(YYCOVERAGE) -int ParseCoverage(FILE *out){ - int stateno, iLookAhead, i; - int nMissed = 0; - for(stateno=0; statenoyyidxMax; } #endif /* ** Find the appropriate action for a parser given the terminal ** look-ahead token iLookAhead. +** +** If the look-ahead token is YYNOCODE, then check to see if the action is +** independent of the look-ahead. If it is, return the action, otherwise +** return YY_NO_ACTION. */ -static unsigned int yy_find_shift_action( +static int yy_find_shift_action( yyParser *pParser, /* The parser */ YYCODETYPE iLookAhead /* The look-ahead token */ ){ int i; - int stateno = pParser->yytos->stateno; + int stateno = pParser->yystack[pParser->yyidx].stateno; - if( stateno>YY_MAX_SHIFT ) return stateno; - assert( stateno <= YY_SHIFT_COUNT ); -#if defined(YYCOVERAGE) - yycoverage[stateno][iLookAhead] = 1; -#endif - do{ - i = yy_shift_ofst[stateno]; - assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) ); - assert( iLookAhead!=YYNOCODE ); - assert( iLookAhead < YYNTOKEN ); - i += iLookAhead; - if( yy_lookahead[i]!=iLookAhead ){ + if( stateno>YY_SHIFT_COUNT + || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){ + return yy_default[stateno]; + } + assert( iLookAhead!=YYNOCODE ); + i += iLookAhead; + if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ + if( iLookAhead>0 ){ #ifdef YYFALLBACK YYCODETYPE iFallback; /* Fallback token */ if( iLookAhead=YY_ACTTAB_COUNT j0 + yy_lookahead[j]==YYWILDCARD ){ #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n", - yyTracePrompt, yyTokenName[iLookAhead], - yyTokenName[YYWILDCARD]); + yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]); } #endif /* NDEBUG */ return yy_action[j]; } } #endif /* YYWILDCARD */ - return yy_default[stateno]; - }else{ - return yy_action[i]; } - }while(1); + return yy_default[stateno]; + }else{ + return yy_action[i]; + } } /* ** Find the appropriate action for a parser given the non-terminal ** look-ahead token iLookAhead. +** +** If the look-ahead token is YYNOCODE, then check to see if the action is +** independent of the look-ahead. If it is, return the action, otherwise +** return YY_NO_ACTION. */ static int yy_find_reduce_action( int stateno, /* Current state number */ @@ -1621,6 +1320,7 @@ static int yy_find_reduce_action( assert( stateno<=YY_REDUCE_COUNT ); #endif i = yy_reduce_ofst[stateno]; + assert( i!=YY_REDUCE_USE_DFLT ); assert( iLookAhead!=YYNOCODE ); i += iLookAhead; #ifdef YYERRORSYMBOL @@ -1637,42 +1337,20 @@ static int yy_find_reduce_action( /* ** The following routine is called if the stack overflows. */ -static void yyStackOverflow(yyParser *yypParser){ +static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){ ParseARG_FETCH; + yypParser->yyidx--; #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); } #endif - while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser); + while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will execute if the parser ** stack every overflows */ -/******** Begin %stack_overflow code ******************************************/ -/******** End %stack_overflow code ********************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument var */ } -/* -** Print tracing information for a SHIFT action -*/ -#ifndef NDEBUG -static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){ - if( yyTraceFILE ){ - if( yyNewStateyytos->major], - yyNewState); - }else{ - fprintf(yyTraceFILE,"%s%s '%s', pending reduce %d\n", - yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major], - yyNewState - YY_MIN_REDUCE); - } - } -} -#else -# define yyTraceShift(X,Y,Z) -#endif - /* ** Perform a shift action. */ @@ -1680,288 +1358,294 @@ static void yy_shift( yyParser *yypParser, /* The parser to be shifted */ int yyNewState, /* The new state to shift in */ int yyMajor, /* The major token to shift in */ - ParseTOKENTYPE yyMinor /* The minor token to shift in */ + YYMINORTYPE *yypMinor /* Pointer to the minor token to shift in */ ){ yyStackEntry *yytos; - yypParser->yytos++; + yypParser->yyidx++; #ifdef YYTRACKMAXSTACKDEPTH - if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ - yypParser->yyhwm++; - assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack) ); + if( yypParser->yyidx>yypParser->yyidxMax ){ + yypParser->yyidxMax = yypParser->yyidx; } #endif #if YYSTACKDEPTH>0 - if( yypParser->yytos>yypParser->yystackEnd ){ - yypParser->yytos--; - yyStackOverflow(yypParser); + if( yypParser->yyidx>=YYSTACKDEPTH ){ + yyStackOverflow(yypParser, yypMinor); return; } #else - if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){ - if( yyGrowStack(yypParser) ){ - yypParser->yytos--; - yyStackOverflow(yypParser); + if( yypParser->yyidx>=yypParser->yystksz ){ + yyGrowStack(yypParser); + if( yypParser->yyidx>=yypParser->yystksz ){ + yyStackOverflow(yypParser, yypMinor); return; } } #endif - if( yyNewState > YY_MAX_SHIFT ){ - yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE; - } - yytos = yypParser->yytos; + yytos = &yypParser->yystack[yypParser->yyidx]; yytos->stateno = (YYACTIONTYPE)yyNewState; yytos->major = (YYCODETYPE)yyMajor; - yytos->minor.yy0 = yyMinor; - yyTraceShift(yypParser, yyNewState, "Shift"); + yytos->minor = *yypMinor; +#ifndef NDEBUG + if( yyTraceFILE && yypParser->yyidx>0 ){ + int i; + fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState); + fprintf(yyTraceFILE,"%sStack:",yyTracePrompt); + for(i=1; i<=yypParser->yyidx; i++) + fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]); + fprintf(yyTraceFILE,"\n"); + } +#endif } /* The following table contains information about every rule that ** is used during the reduce. */ static const struct { - YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ - signed char nrhs; /* Negative of the number of RHS symbols in the rule */ + YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ + unsigned char nrhs; /* Number of right-hand side symbols in the rule */ } yyRuleInfo[] = { - { 210, -1 }, /* (0) program ::= cmd */ - { 211, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 211, -2 }, /* (2) cmd ::= SHOW MNODES */ - { 211, -2 }, /* (3) cmd ::= SHOW DNODES */ - { 211, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */ - { 211, -2 }, /* (5) cmd ::= SHOW USERS */ - { 211, -2 }, /* (6) cmd ::= SHOW MODULES */ - { 211, -2 }, /* (7) cmd ::= SHOW QUERIES */ - { 211, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */ - { 211, -2 }, /* (9) cmd ::= SHOW STREAMS */ - { 211, -2 }, /* (10) cmd ::= SHOW VARIABLES */ - { 211, -2 }, /* (11) cmd ::= SHOW SCORES */ - { 211, -2 }, /* (12) cmd ::= SHOW GRANTS */ - { 211, -2 }, /* (13) cmd ::= SHOW VNODES */ - { 211, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */ - { 212, 0 }, /* (15) dbPrefix ::= */ - { 212, -2 }, /* (16) dbPrefix ::= ids DOT */ - { 214, 0 }, /* (17) cpxName ::= */ - { 214, -2 }, /* (18) cpxName ::= DOT ids */ - { 211, -5 }, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 211, -4 }, /* (20) cmd ::= SHOW CREATE DATABASE ids */ - { 211, -3 }, /* (21) cmd ::= SHOW dbPrefix TABLES */ - { 211, -5 }, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 211, -3 }, /* (23) cmd ::= SHOW dbPrefix STABLES */ - { 211, -5 }, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 211, -3 }, /* (25) cmd ::= SHOW dbPrefix VGROUPS */ - { 211, -4 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 211, -5 }, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */ - { 211, -4 }, /* (28) cmd ::= DROP DATABASE ifexists ids */ - { 211, -3 }, /* (29) cmd ::= DROP DNODE ids */ - { 211, -3 }, /* (30) cmd ::= DROP USER ids */ - { 211, -3 }, /* (31) cmd ::= DROP ACCOUNT ids */ - { 211, -2 }, /* (32) cmd ::= USE ids */ - { 211, -3 }, /* (33) cmd ::= DESCRIBE ids cpxName */ - { 211, -5 }, /* (34) cmd ::= ALTER USER ids PASS ids */ - { 211, -5 }, /* (35) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 211, -4 }, /* (36) cmd ::= ALTER DNODE ids ids */ - { 211, -5 }, /* (37) cmd ::= ALTER DNODE ids ids ids */ - { 211, -3 }, /* (38) cmd ::= ALTER LOCAL ids */ - { 211, -4 }, /* (39) cmd ::= ALTER LOCAL ids ids */ - { 211, -4 }, /* (40) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 211, -4 }, /* (41) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 211, -6 }, /* (42) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 213, -1 }, /* (43) ids ::= ID */ - { 213, -1 }, /* (44) ids ::= STRING */ - { 215, -2 }, /* (45) ifexists ::= IF EXISTS */ - { 215, 0 }, /* (46) ifexists ::= */ - { 218, -3 }, /* (47) ifnotexists ::= IF NOT EXISTS */ - { 218, 0 }, /* (48) ifnotexists ::= */ - { 211, -3 }, /* (49) cmd ::= CREATE DNODE ids */ - { 211, -6 }, /* (50) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 211, -5 }, /* (51) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 211, -5 }, /* (52) cmd ::= CREATE USER ids PASS ids */ - { 220, 0 }, /* (53) pps ::= */ - { 220, -2 }, /* (54) pps ::= PPS INTEGER */ - { 221, 0 }, /* (55) tseries ::= */ - { 221, -2 }, /* (56) tseries ::= TSERIES INTEGER */ - { 222, 0 }, /* (57) dbs ::= */ - { 222, -2 }, /* (58) dbs ::= DBS INTEGER */ - { 223, 0 }, /* (59) streams ::= */ - { 223, -2 }, /* (60) streams ::= STREAMS INTEGER */ - { 224, 0 }, /* (61) storage ::= */ - { 224, -2 }, /* (62) storage ::= STORAGE INTEGER */ - { 225, 0 }, /* (63) qtime ::= */ - { 225, -2 }, /* (64) qtime ::= QTIME INTEGER */ - { 226, 0 }, /* (65) users ::= */ - { 226, -2 }, /* (66) users ::= USERS INTEGER */ - { 227, 0 }, /* (67) conns ::= */ - { 227, -2 }, /* (68) conns ::= CONNS INTEGER */ - { 228, 0 }, /* (69) state ::= */ - { 228, -2 }, /* (70) state ::= STATE ids */ - { 217, -9 }, /* (71) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 229, -2 }, /* (72) keep ::= KEEP tagitemlist */ - { 231, -2 }, /* (73) cache ::= CACHE INTEGER */ - { 232, -2 }, /* (74) replica ::= REPLICA INTEGER */ - { 233, -2 }, /* (75) quorum ::= QUORUM INTEGER */ - { 234, -2 }, /* (76) days ::= DAYS INTEGER */ - { 235, -2 }, /* (77) minrows ::= MINROWS INTEGER */ - { 236, -2 }, /* (78) maxrows ::= MAXROWS INTEGER */ - { 237, -2 }, /* (79) blocks ::= BLOCKS INTEGER */ - { 238, -2 }, /* (80) ctime ::= CTIME INTEGER */ - { 239, -2 }, /* (81) wal ::= WAL INTEGER */ - { 240, -2 }, /* (82) fsync ::= FSYNC INTEGER */ - { 241, -2 }, /* (83) comp ::= COMP INTEGER */ - { 242, -2 }, /* (84) prec ::= PRECISION STRING */ - { 243, -2 }, /* (85) update ::= UPDATE INTEGER */ - { 244, -2 }, /* (86) cachelast ::= CACHELAST INTEGER */ - { 219, 0 }, /* (87) db_optr ::= */ - { 219, -2 }, /* (88) db_optr ::= db_optr cache */ - { 219, -2 }, /* (89) db_optr ::= db_optr replica */ - { 219, -2 }, /* (90) db_optr ::= db_optr quorum */ - { 219, -2 }, /* (91) db_optr ::= db_optr days */ - { 219, -2 }, /* (92) db_optr ::= db_optr minrows */ - { 219, -2 }, /* (93) db_optr ::= db_optr maxrows */ - { 219, -2 }, /* (94) db_optr ::= db_optr blocks */ - { 219, -2 }, /* (95) db_optr ::= db_optr ctime */ - { 219, -2 }, /* (96) db_optr ::= db_optr wal */ - { 219, -2 }, /* (97) db_optr ::= db_optr fsync */ - { 219, -2 }, /* (98) db_optr ::= db_optr comp */ - { 219, -2 }, /* (99) db_optr ::= db_optr prec */ - { 219, -2 }, /* (100) db_optr ::= db_optr keep */ - { 219, -2 }, /* (101) db_optr ::= db_optr update */ - { 219, -2 }, /* (102) db_optr ::= db_optr cachelast */ - { 216, 0 }, /* (103) alter_db_optr ::= */ - { 216, -2 }, /* (104) alter_db_optr ::= alter_db_optr replica */ - { 216, -2 }, /* (105) alter_db_optr ::= alter_db_optr quorum */ - { 216, -2 }, /* (106) alter_db_optr ::= alter_db_optr keep */ - { 216, -2 }, /* (107) alter_db_optr ::= alter_db_optr blocks */ - { 216, -2 }, /* (108) alter_db_optr ::= alter_db_optr comp */ - { 216, -2 }, /* (109) alter_db_optr ::= alter_db_optr wal */ - { 216, -2 }, /* (110) alter_db_optr ::= alter_db_optr fsync */ - { 216, -2 }, /* (111) alter_db_optr ::= alter_db_optr update */ - { 216, -2 }, /* (112) alter_db_optr ::= alter_db_optr cachelast */ - { 245, -1 }, /* (113) typename ::= ids */ - { 245, -4 }, /* (114) typename ::= ids LP signed RP */ - { 245, -2 }, /* (115) typename ::= ids UNSIGNED */ - { 246, -1 }, /* (116) signed ::= INTEGER */ - { 246, -2 }, /* (117) signed ::= PLUS INTEGER */ - { 246, -2 }, /* (118) signed ::= MINUS INTEGER */ - { 211, -3 }, /* (119) cmd ::= CREATE TABLE create_table_args */ - { 211, -3 }, /* (120) cmd ::= CREATE TABLE create_table_list */ - { 248, -1 }, /* (121) create_table_list ::= create_from_stable */ - { 248, -2 }, /* (122) create_table_list ::= create_table_list create_from_stable */ - { 247, -6 }, /* (123) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 247, -10 }, /* (124) create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 249, -10 }, /* (125) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 247, -5 }, /* (126) create_table_args ::= ifnotexists ids cpxName AS select */ - { 250, -3 }, /* (127) columnlist ::= columnlist COMMA column */ - { 250, -1 }, /* (128) columnlist ::= column */ - { 252, -2 }, /* (129) column ::= ids typename */ - { 230, -3 }, /* (130) tagitemlist ::= tagitemlist COMMA tagitem */ - { 230, -1 }, /* (131) tagitemlist ::= tagitem */ - { 253, -1 }, /* (132) tagitem ::= INTEGER */ - { 253, -1 }, /* (133) tagitem ::= FLOAT */ - { 253, -1 }, /* (134) tagitem ::= STRING */ - { 253, -1 }, /* (135) tagitem ::= BOOL */ - { 253, -1 }, /* (136) tagitem ::= NULL */ - { 253, -2 }, /* (137) tagitem ::= MINUS INTEGER */ - { 253, -2 }, /* (138) tagitem ::= MINUS FLOAT */ - { 253, -2 }, /* (139) tagitem ::= PLUS INTEGER */ - { 253, -2 }, /* (140) tagitem ::= PLUS FLOAT */ - { 251, -12 }, /* (141) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - { 265, -1 }, /* (142) union ::= select */ - { 265, -3 }, /* (143) union ::= LP union RP */ - { 265, -4 }, /* (144) union ::= union UNION ALL select */ - { 265, -6 }, /* (145) union ::= union UNION ALL LP select RP */ - { 211, -1 }, /* (146) cmd ::= union */ - { 251, -2 }, /* (147) select ::= SELECT selcollist */ - { 266, -2 }, /* (148) sclp ::= selcollist COMMA */ - { 266, 0 }, /* (149) sclp ::= */ - { 254, -3 }, /* (150) selcollist ::= sclp expr as */ - { 254, -2 }, /* (151) selcollist ::= sclp STAR */ - { 268, -2 }, /* (152) as ::= AS ids */ - { 268, -1 }, /* (153) as ::= ids */ - { 268, 0 }, /* (154) as ::= */ - { 255, -2 }, /* (155) from ::= FROM tablelist */ - { 269, -2 }, /* (156) tablelist ::= ids cpxName */ - { 269, -3 }, /* (157) tablelist ::= ids cpxName ids */ - { 269, -4 }, /* (158) tablelist ::= tablelist COMMA ids cpxName */ - { 269, -5 }, /* (159) tablelist ::= tablelist COMMA ids cpxName ids */ - { 270, -1 }, /* (160) tmvar ::= VARIABLE */ - { 257, -4 }, /* (161) interval_opt ::= INTERVAL LP tmvar RP */ - { 257, -6 }, /* (162) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 257, 0 }, /* (163) interval_opt ::= */ - { 258, 0 }, /* (164) fill_opt ::= */ - { 258, -6 }, /* (165) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 258, -4 }, /* (166) fill_opt ::= FILL LP ID RP */ - { 259, -4 }, /* (167) sliding_opt ::= SLIDING LP tmvar RP */ - { 259, 0 }, /* (168) sliding_opt ::= */ - { 261, 0 }, /* (169) orderby_opt ::= */ - { 261, -3 }, /* (170) orderby_opt ::= ORDER BY sortlist */ - { 271, -4 }, /* (171) sortlist ::= sortlist COMMA item sortorder */ - { 271, -2 }, /* (172) sortlist ::= item sortorder */ - { 273, -2 }, /* (173) item ::= ids cpxName */ - { 274, -1 }, /* (174) sortorder ::= ASC */ - { 274, -1 }, /* (175) sortorder ::= DESC */ - { 274, 0 }, /* (176) sortorder ::= */ - { 260, 0 }, /* (177) groupby_opt ::= */ - { 260, -3 }, /* (178) groupby_opt ::= GROUP BY grouplist */ - { 275, -3 }, /* (179) grouplist ::= grouplist COMMA item */ - { 275, -1 }, /* (180) grouplist ::= item */ - { 262, 0 }, /* (181) having_opt ::= */ - { 262, -2 }, /* (182) having_opt ::= HAVING expr */ - { 264, 0 }, /* (183) limit_opt ::= */ - { 264, -2 }, /* (184) limit_opt ::= LIMIT signed */ - { 264, -4 }, /* (185) limit_opt ::= LIMIT signed OFFSET signed */ - { 264, -4 }, /* (186) limit_opt ::= LIMIT signed COMMA signed */ - { 263, 0 }, /* (187) slimit_opt ::= */ - { 263, -2 }, /* (188) slimit_opt ::= SLIMIT signed */ - { 263, -4 }, /* (189) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 263, -4 }, /* (190) slimit_opt ::= SLIMIT signed COMMA signed */ - { 256, 0 }, /* (191) where_opt ::= */ - { 256, -2 }, /* (192) where_opt ::= WHERE expr */ - { 267, -3 }, /* (193) expr ::= LP expr RP */ - { 267, -1 }, /* (194) expr ::= ID */ - { 267, -3 }, /* (195) expr ::= ID DOT ID */ - { 267, -3 }, /* (196) expr ::= ID DOT STAR */ - { 267, -1 }, /* (197) expr ::= INTEGER */ - { 267, -2 }, /* (198) expr ::= MINUS INTEGER */ - { 267, -2 }, /* (199) expr ::= PLUS INTEGER */ - { 267, -1 }, /* (200) expr ::= FLOAT */ - { 267, -2 }, /* (201) expr ::= MINUS FLOAT */ - { 267, -2 }, /* (202) expr ::= PLUS FLOAT */ - { 267, -1 }, /* (203) expr ::= STRING */ - { 267, -1 }, /* (204) expr ::= NOW */ - { 267, -1 }, /* (205) expr ::= VARIABLE */ - { 267, -1 }, /* (206) expr ::= BOOL */ - { 267, -4 }, /* (207) expr ::= ID LP exprlist RP */ - { 267, -4 }, /* (208) expr ::= ID LP STAR RP */ - { 267, -3 }, /* (209) expr ::= expr IS NULL */ - { 267, -4 }, /* (210) expr ::= expr IS NOT NULL */ - { 267, -3 }, /* (211) expr ::= expr LT expr */ - { 267, -3 }, /* (212) expr ::= expr GT expr */ - { 267, -3 }, /* (213) expr ::= expr LE expr */ - { 267, -3 }, /* (214) expr ::= expr GE expr */ - { 267, -3 }, /* (215) expr ::= expr NE expr */ - { 267, -3 }, /* (216) expr ::= expr EQ expr */ - { 267, -3 }, /* (217) expr ::= expr AND expr */ - { 267, -3 }, /* (218) expr ::= expr OR expr */ - { 267, -3 }, /* (219) expr ::= expr PLUS expr */ - { 267, -3 }, /* (220) expr ::= expr MINUS expr */ - { 267, -3 }, /* (221) expr ::= expr STAR expr */ - { 267, -3 }, /* (222) expr ::= expr SLASH expr */ - { 267, -3 }, /* (223) expr ::= expr REM expr */ - { 267, -3 }, /* (224) expr ::= expr LIKE expr */ - { 267, -5 }, /* (225) expr ::= expr IN LP exprlist RP */ - { 276, -3 }, /* (226) exprlist ::= exprlist COMMA expritem */ - { 276, -1 }, /* (227) exprlist ::= expritem */ - { 277, -1 }, /* (228) expritem ::= expr */ - { 277, 0 }, /* (229) expritem ::= */ - { 211, -3 }, /* (230) cmd ::= RESET QUERY CACHE */ - { 211, -7 }, /* (231) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 211, -7 }, /* (232) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 211, -7 }, /* (233) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 211, -7 }, /* (234) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 211, -8 }, /* (235) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 211, -9 }, /* (236) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 211, -3 }, /* (237) cmd ::= KILL CONNECTION INTEGER */ - { 211, -5 }, /* (238) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 211, -5 }, /* (239) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 211, 1 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 2 }, + { 212, 3 }, + { 213, 0 }, + { 213, 2 }, + { 215, 0 }, + { 215, 2 }, + { 212, 5 }, + { 212, 4 }, + { 212, 3 }, + { 212, 5 }, + { 212, 3 }, + { 212, 5 }, + { 212, 3 }, + { 212, 4 }, + { 212, 5 }, + { 212, 4 }, + { 212, 3 }, + { 212, 3 }, + { 212, 3 }, + { 212, 2 }, + { 212, 3 }, + { 212, 5 }, + { 212, 5 }, + { 212, 4 }, + { 212, 5 }, + { 212, 3 }, + { 212, 4 }, + { 212, 4 }, + { 212, 4 }, + { 212, 6 }, + { 214, 1 }, + { 214, 1 }, + { 216, 2 }, + { 216, 0 }, + { 219, 3 }, + { 219, 0 }, + { 212, 3 }, + { 212, 6 }, + { 212, 5 }, + { 212, 5 }, + { 221, 0 }, + { 221, 2 }, + { 222, 0 }, + { 222, 2 }, + { 223, 0 }, + { 223, 2 }, + { 224, 0 }, + { 224, 2 }, + { 225, 0 }, + { 225, 2 }, + { 226, 0 }, + { 226, 2 }, + { 227, 0 }, + { 227, 2 }, + { 228, 0 }, + { 228, 2 }, + { 229, 0 }, + { 229, 2 }, + { 218, 9 }, + { 230, 2 }, + { 232, 2 }, + { 233, 2 }, + { 234, 2 }, + { 235, 2 }, + { 236, 2 }, + { 237, 2 }, + { 238, 2 }, + { 239, 2 }, + { 240, 2 }, + { 241, 2 }, + { 242, 2 }, + { 243, 2 }, + { 244, 2 }, + { 245, 2 }, + { 220, 0 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 220, 2 }, + { 217, 0 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 217, 2 }, + { 246, 1 }, + { 246, 4 }, + { 246, 2 }, + { 247, 1 }, + { 247, 2 }, + { 247, 2 }, + { 212, 3 }, + { 212, 3 }, + { 249, 1 }, + { 249, 2 }, + { 248, 6 }, + { 248, 10 }, + { 250, 10 }, + { 248, 5 }, + { 251, 3 }, + { 251, 1 }, + { 253, 2 }, + { 231, 3 }, + { 231, 1 }, + { 254, 1 }, + { 254, 1 }, + { 254, 1 }, + { 254, 1 }, + { 254, 1 }, + { 254, 2 }, + { 254, 2 }, + { 254, 2 }, + { 254, 2 }, + { 252, 12 }, + { 266, 1 }, + { 266, 3 }, + { 266, 4 }, + { 266, 6 }, + { 212, 1 }, + { 252, 2 }, + { 267, 2 }, + { 267, 0 }, + { 255, 4 }, + { 255, 2 }, + { 270, 2 }, + { 270, 1 }, + { 270, 0 }, + { 268, 1 }, + { 268, 0 }, + { 256, 2 }, + { 271, 2 }, + { 271, 3 }, + { 271, 4 }, + { 271, 5 }, + { 272, 1 }, + { 258, 4 }, + { 258, 6 }, + { 258, 0 }, + { 259, 0 }, + { 259, 6 }, + { 259, 4 }, + { 260, 4 }, + { 260, 0 }, + { 262, 0 }, + { 262, 3 }, + { 273, 4 }, + { 273, 2 }, + { 275, 2 }, + { 276, 1 }, + { 276, 1 }, + { 276, 0 }, + { 261, 0 }, + { 261, 3 }, + { 277, 3 }, + { 277, 1 }, + { 263, 0 }, + { 263, 2 }, + { 265, 0 }, + { 265, 2 }, + { 265, 4 }, + { 265, 4 }, + { 264, 0 }, + { 264, 2 }, + { 264, 4 }, + { 264, 4 }, + { 257, 0 }, + { 257, 2 }, + { 269, 3 }, + { 269, 1 }, + { 269, 3 }, + { 269, 3 }, + { 269, 1 }, + { 269, 2 }, + { 269, 2 }, + { 269, 1 }, + { 269, 2 }, + { 269, 2 }, + { 269, 1 }, + { 269, 1 }, + { 269, 1 }, + { 269, 1 }, + { 269, 4 }, + { 269, 4 }, + { 269, 3 }, + { 269, 4 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 3 }, + { 269, 5 }, + { 278, 3 }, + { 278, 1 }, + { 279, 1 }, + { 279, 0 }, + { 212, 3 }, + { 212, 7 }, + { 212, 7 }, + { 212, 7 }, + { 212, 7 }, + { 212, 8 }, + { 212, 9 }, + { 212, 3 }, + { 212, 5 }, + { 212, 5 }, }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -1969,66 +1653,43 @@ static void yy_accept(yyParser*); /* Forward Declaration */ /* ** Perform a reduce action and the shift that must immediately ** follow the reduce. -** -** The yyLookahead and yyLookaheadToken parameters provide reduce actions -** access to the lookahead token (if any). The yyLookahead will be YYNOCODE -** if the lookahead token has already been consumed. As this procedure is -** only called from one place, optimizing compilers will in-line it, which -** means that the extra parameters have no performance impact. */ static void yy_reduce( yyParser *yypParser, /* The parser */ - unsigned int yyruleno, /* Number of the rule by which to reduce */ - int yyLookahead, /* Lookahead token, or YYNOCODE if none */ - ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */ + int yyruleno /* Number of the rule by which to reduce */ ){ int yygoto; /* The next state */ int yyact; /* The next action */ + YYMINORTYPE yygotominor; /* The LHS of the rule reduced */ yyStackEntry *yymsp; /* The top of the parser's stack */ int yysize; /* Amount to pop the stack */ ParseARG_FETCH; - (void)yyLookahead; - (void)yyLookaheadToken; - yymsp = yypParser->yytos; + yymsp = &yypParser->yystack[yypParser->yyidx]; #ifndef NDEBUG - if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ - yysize = yyRuleInfo[yyruleno].nrhs; - if( yysize ){ - fprintf(yyTraceFILE, "%sReduce %d [%s], go to state %d.\n", - yyTracePrompt, - yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno); - }else{ - fprintf(yyTraceFILE, "%sReduce %d [%s].\n", - yyTracePrompt, yyruleno, yyRuleName[yyruleno]); - } + if( yyTraceFILE && yyruleno>=0 + && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ + fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, + yyRuleName[yyruleno]); } #endif /* NDEBUG */ - /* Check that the stack is large enough to grow by a single entry - ** if the RHS of the rule is empty. This ensures that there is room - ** enough on the stack to push the LHS value */ - if( yyRuleInfo[yyruleno].nrhs==0 ){ -#ifdef YYTRACKMAXSTACKDEPTH - if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ - yypParser->yyhwm++; - assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack)); - } -#endif -#if YYSTACKDEPTH>0 - if( yypParser->yytos>=yypParser->yystackEnd ){ - yyStackOverflow(yypParser); - return; - } -#else - if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){ - if( yyGrowStack(yypParser) ){ - yyStackOverflow(yypParser); - return; - } - yymsp = yypParser->yytos; - } -#endif - } + /* Silence complaints from purify about yygotominor being uninitialized + ** in some cases when it is copied into the stack after the following + ** switch. yygotominor is uninitialized when a rule reduces that does + ** not set the value of its left-hand side nonterminal. Leaving the + ** value of the nonterminal uninitialized is utterly harmless as long + ** as the value is never used. So really the only thing this code + ** accomplishes is to quieten purify. + ** + ** 2007-01-16: The wireshark project (www.wireshark.org) reports that + ** without this code, their parser segfaults. I'm not sure what there + ** parser is doing to make this happen. This is the second bug report + ** from wireshark this week. Clearly they are stressing Lemon in ways + ** that it has not been previously stressed... (SQLite ticket #2172) + */ + /*memset(&yygotominor, 0, sizeof(yygotominor));*/ + yygotominor = yyzerominor; + switch( yyruleno ){ /* Beginning here are the reduction cases. A typical example @@ -2039,194 +1700,288 @@ static void yy_reduce( ** #line ** break; */ -/********** Begin reduce actions **********************************************/ - YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ - case 119: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==119); +#line 63 "sql.y" {} +#line 1707 "sql.c" break; case 1: /* cmd ::= SHOW DATABASES */ +#line 66 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);} +#line 1712 "sql.c" break; case 2: /* cmd ::= SHOW MNODES */ +#line 67 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);} +#line 1717 "sql.c" break; case 3: /* cmd ::= SHOW DNODES */ +#line 68 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);} +#line 1722 "sql.c" break; case 4: /* cmd ::= SHOW ACCOUNTS */ +#line 69 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);} +#line 1727 "sql.c" break; case 5: /* cmd ::= SHOW USERS */ +#line 70 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);} +#line 1732 "sql.c" break; case 6: /* cmd ::= SHOW MODULES */ +#line 72 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0); } +#line 1737 "sql.c" break; case 7: /* cmd ::= SHOW QUERIES */ +#line 73 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0); } +#line 1742 "sql.c" break; case 8: /* cmd ::= SHOW CONNECTIONS */ +#line 74 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);} +#line 1747 "sql.c" break; case 9: /* cmd ::= SHOW STREAMS */ +#line 75 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0); } +#line 1752 "sql.c" break; case 10: /* cmd ::= SHOW VARIABLES */ +#line 76 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0); } +#line 1757 "sql.c" break; case 11: /* cmd ::= SHOW SCORES */ +#line 77 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0); } +#line 1762 "sql.c" break; case 12: /* cmd ::= SHOW GRANTS */ +#line 78 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0); } +#line 1767 "sql.c" break; case 13: /* cmd ::= SHOW VNODES */ +#line 80 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); } +#line 1772 "sql.c" break; case 14: /* cmd ::= SHOW VNODES IPTOKEN */ +#line 81 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); } +#line 1777 "sql.c" break; case 15: /* dbPrefix ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;} +#line 85 "sql.y" +{yygotominor.yy0.n = 0; yygotominor.yy0.type = 0;} +#line 1782 "sql.c" break; case 16: /* dbPrefix ::= ids DOT */ -{yylhsminor.yy0 = yymsp[-1].minor.yy0; } - yymsp[-1].minor.yy0 = yylhsminor.yy0; +#line 86 "sql.y" +{yygotominor.yy0 = yymsp[-1].minor.yy0; } +#line 1787 "sql.c" break; case 17: /* cpxName ::= */ -{yymsp[1].minor.yy0.n = 0; } +#line 89 "sql.y" +{yygotominor.yy0.n = 0; } +#line 1792 "sql.c" break; case 18: /* cpxName ::= DOT ids */ -{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1; } +#line 90 "sql.y" +{yygotominor.yy0 = yymsp[0].minor.yy0; yygotominor.yy0.n += 1; } +#line 1797 "sql.c" break; case 19: /* cmd ::= SHOW CREATE TABLE ids cpxName */ +#line 92 "sql.y" { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &yymsp[-1].minor.yy0); } +#line 1805 "sql.c" break; case 20: /* cmd ::= SHOW CREATE DATABASE ids */ +#line 97 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &yymsp[0].minor.yy0); } +#line 1812 "sql.c" break; case 21: /* cmd ::= SHOW dbPrefix TABLES */ +#line 101 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-1].minor.yy0, 0); } +#line 1819 "sql.c" break; case 22: /* cmd ::= SHOW dbPrefix TABLES LIKE ids */ +#line 105 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0); } +#line 1826 "sql.c" break; case 23: /* cmd ::= SHOW dbPrefix STABLES */ +#line 109 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &yymsp[-1].minor.yy0, 0); } +#line 1833 "sql.c" break; case 24: /* cmd ::= SHOW dbPrefix STABLES LIKE ids */ +#line 113 "sql.y" { SStrToken token; setDbName(&token, &yymsp[-3].minor.yy0); setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &yymsp[0].minor.yy0); } +#line 1842 "sql.c" break; case 25: /* cmd ::= SHOW dbPrefix VGROUPS */ +#line 119 "sql.y" { SStrToken token; setDbName(&token, &yymsp[-1].minor.yy0); setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0); } +#line 1851 "sql.c" break; case 26: /* cmd ::= SHOW dbPrefix VGROUPS ids */ +#line 125 "sql.y" { SStrToken token; setDbName(&token, &yymsp[-2].minor.yy0); setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &yymsp[0].minor.yy0); } +#line 1860 "sql.c" break; case 27: /* cmd ::= DROP TABLE ifexists ids cpxName */ +#line 132 "sql.y" { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0); } +#line 1868 "sql.c" break; case 28: /* cmd ::= DROP DATABASE ifexists ids */ +#line 137 "sql.y" { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0); } +#line 1873 "sql.c" break; case 29: /* cmd ::= DROP DNODE ids */ +#line 138 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0); } +#line 1878 "sql.c" break; case 30: /* cmd ::= DROP USER ids */ +#line 139 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0); } +#line 1883 "sql.c" break; case 31: /* cmd ::= DROP ACCOUNT ids */ +#line 140 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0); } +#line 1888 "sql.c" break; case 32: /* cmd ::= USE ids */ +#line 143 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);} +#line 1893 "sql.c" break; case 33: /* cmd ::= DESCRIBE ids cpxName */ +#line 146 "sql.y" { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0); } +#line 1901 "sql.c" break; case 34: /* cmd ::= ALTER USER ids PASS ids */ +#line 152 "sql.y" { setAlterUserSql(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL); } +#line 1906 "sql.c" break; case 35: /* cmd ::= ALTER USER ids PRIVILEGE ids */ +#line 153 "sql.y" { setAlterUserSql(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);} +#line 1911 "sql.c" break; case 36: /* cmd ::= ALTER DNODE ids ids */ +#line 154 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } +#line 1916 "sql.c" break; case 37: /* cmd ::= ALTER DNODE ids ids ids */ +#line 155 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } +#line 1921 "sql.c" break; case 38: /* cmd ::= ALTER LOCAL ids */ +#line 156 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0); } +#line 1926 "sql.c" break; case 39: /* cmd ::= ALTER LOCAL ids ids */ +#line 157 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } +#line 1931 "sql.c" break; case 40: /* cmd ::= ALTER DATABASE ids alter_db_optr */ -{ SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy234, &t);} +#line 158 "sql.y" +{ SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy478, &t);} +#line 1936 "sql.c" break; case 41: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy71);} +#line 160 "sql.y" +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy79);} +#line 1941 "sql.c" break; case 42: /* 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.yy71);} +#line 161 "sql.y" +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy79);} +#line 1946 "sql.c" break; case 43: /* ids ::= ID */ case 44: /* ids ::= STRING */ yytestcase(yyruleno==44); -{yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; +#line 167 "sql.y" +{yygotominor.yy0 = yymsp[0].minor.yy0; } +#line 1952 "sql.c" break; case 45: /* ifexists ::= IF EXISTS */ -{ yymsp[-1].minor.yy0.n = 1;} + case 47: /* ifnotexists ::= IF NOT EXISTS */ yytestcase(yyruleno==47); +#line 171 "sql.y" +{ yygotominor.yy0.n = 1;} +#line 1958 "sql.c" break; case 46: /* ifexists ::= */ case 48: /* ifnotexists ::= */ yytestcase(yyruleno==48); -{ yymsp[1].minor.yy0.n = 0;} - break; - case 47: /* ifnotexists ::= IF NOT EXISTS */ -{ yymsp[-2].minor.yy0.n = 1;} + case 156: /* distinct ::= */ yytestcase(yyruleno==156); +#line 172 "sql.y" +{ yygotominor.yy0.n = 0;} +#line 1965 "sql.c" break; case 49: /* cmd ::= CREATE DNODE ids */ +#line 180 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} +#line 1970 "sql.c" break; case 50: /* 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.yy71);} +#line 182 "sql.y" +{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy79);} +#line 1975 "sql.c" break; case 51: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy234, &yymsp[-2].minor.yy0);} +#line 183 "sql.y" +{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy478, &yymsp[-2].minor.yy0);} +#line 1980 "sql.c" break; case 52: /* cmd ::= CREATE USER ids PASS ids */ +#line 184 "sql.y" { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} +#line 1985 "sql.c" break; case 53: /* pps ::= */ case 55: /* tseries ::= */ yytestcase(yyruleno==55); @@ -2237,7 +1992,9 @@ static void yy_reduce( case 65: /* users ::= */ yytestcase(yyruleno==65); case 67: /* conns ::= */ yytestcase(yyruleno==67); case 69: /* state ::= */ yytestcase(yyruleno==69); -{ yymsp[1].minor.yy0.n = 0; } +#line 186 "sql.y" +{ yygotominor.yy0.n = 0; } +#line 1998 "sql.c" break; case 54: /* pps ::= PPS INTEGER */ case 56: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==56); @@ -2248,24 +2005,29 @@ static void yy_reduce( case 66: /* users ::= USERS INTEGER */ yytestcase(yyruleno==66); case 68: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==68); case 70: /* state ::= STATE ids */ yytestcase(yyruleno==70); -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } +#line 187 "sql.y" +{ yygotominor.yy0 = yymsp[0].minor.yy0; } +#line 2011 "sql.c" break; case 71: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ +#line 214 "sql.y" { - yylhsminor.yy71.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy71.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy71.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy71.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy71.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy71.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy71.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy71.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy71.stat = yymsp[0].minor.yy0; + yygotominor.yy79.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yygotominor.yy79.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yygotominor.yy79.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yygotominor.yy79.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yygotominor.yy79.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yygotominor.yy79.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yygotominor.yy79.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yygotominor.yy79.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yygotominor.yy79.stat = yymsp[0].minor.yy0; } - yymsp[-8].minor.yy71 = yylhsminor.yy71; +#line 2026 "sql.c" break; case 72: /* keep ::= KEEP tagitemlist */ -{ yymsp[-1].minor.yy421 = yymsp[0].minor.yy421; } +#line 228 "sql.y" +{ yygotominor.yy221 = yymsp[0].minor.yy221; } +#line 2031 "sql.c" break; case 73: /* cache ::= CACHE INTEGER */ case 74: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==74); @@ -2281,595 +2043,742 @@ static void yy_reduce( case 84: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==84); case 85: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==85); case 86: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==86); -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } +#line 230 "sql.y" +{ yygotominor.yy0 = yymsp[0].minor.yy0; } +#line 2049 "sql.c" break; case 87: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy234);} +#line 246 "sql.y" +{setDefaultCreateDbOption(&yygotominor.yy478);} +#line 2054 "sql.c" break; case 88: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 248 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2059 "sql.c" break; case 89: /* db_optr ::= db_optr replica */ case 104: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==104); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 249 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2065 "sql.c" break; case 90: /* db_optr ::= db_optr quorum */ case 105: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==105); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 250 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2071 "sql.c" break; case 91: /* db_optr ::= db_optr days */ -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 251 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2076 "sql.c" break; case 92: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 252 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } +#line 2081 "sql.c" break; case 93: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 253 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } +#line 2086 "sql.c" break; case 94: /* db_optr ::= db_optr blocks */ case 107: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==107); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 254 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2092 "sql.c" break; case 95: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 255 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2097 "sql.c" break; case 96: /* db_optr ::= db_optr wal */ case 109: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==109); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 256 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2103 "sql.c" break; case 97: /* db_optr ::= db_optr fsync */ case 110: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==110); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 257 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2109 "sql.c" break; case 98: /* db_optr ::= db_optr comp */ case 108: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==108); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 258 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2115 "sql.c" break; case 99: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 259 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.precision = yymsp[0].minor.yy0; } +#line 2120 "sql.c" break; case 100: /* db_optr ::= db_optr keep */ case 106: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==106); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.keep = yymsp[0].minor.yy421; } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 260 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.keep = yymsp[0].minor.yy221; } +#line 2126 "sql.c" break; case 101: /* db_optr ::= db_optr update */ case 111: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==111); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 261 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2132 "sql.c" break; case 102: /* db_optr ::= db_optr cachelast */ case 112: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==112); -{ yylhsminor.yy234 = yymsp[-1].minor.yy234; yylhsminor.yy234.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy234 = yylhsminor.yy234; +#line 262 "sql.y" +{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2138 "sql.c" break; case 103: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy234);} +#line 265 "sql.y" +{ setDefaultCreateDbOption(&yygotominor.yy478);} +#line 2143 "sql.c" break; case 113: /* typename ::= ids */ +#line 278 "sql.y" { yymsp[0].minor.yy0.type = 0; - tSqlSetColumnType (&yylhsminor.yy183, &yymsp[0].minor.yy0); + tSqlSetColumnType (&yygotominor.yy503, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy183 = yylhsminor.yy183; +#line 2151 "sql.c" break; case 114: /* typename ::= ids LP signed RP */ +#line 284 "sql.y" { - if (yymsp[-1].minor.yy325 <= 0) { + if (yymsp[-1].minor.yy109 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSqlSetColumnType(&yylhsminor.yy183, &yymsp[-3].minor.yy0); + tSqlSetColumnType(&yygotominor.yy503, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy325; // negative value of name length - tSqlSetColumnType(&yylhsminor.yy183, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy109; // negative value of name length + tSqlSetColumnType(&yygotominor.yy503, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy183 = yylhsminor.yy183; +#line 2164 "sql.c" break; case 115: /* typename ::= ids UNSIGNED */ +#line 295 "sql.y" { 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.yy183, &yymsp[-1].minor.yy0); + tSqlSetColumnType (&yygotominor.yy503, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy183 = yylhsminor.yy183; +#line 2173 "sql.c" break; case 116: /* signed ::= INTEGER */ -{ yylhsminor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy325 = yylhsminor.yy325; - break; - case 117: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + case 117: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==117); +#line 302 "sql.y" +{ yygotominor.yy109 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +#line 2179 "sql.c" break; case 118: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy325 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} + case 119: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==119); +#line 304 "sql.y" +{ yygotominor.yy109 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} +#line 2185 "sql.c" break; case 120: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy38;} +#line 308 "sql.y" +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy358;} +#line 2190 "sql.c" break; case 121: /* create_table_list ::= create_from_stable */ +#line 312 "sql.y" { SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy152); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy416); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy38 = pCreateTable; + yygotominor.yy358 = pCreateTable; } - yymsp[0].minor.yy38 = yylhsminor.yy38; +#line 2202 "sql.c" break; case 122: /* create_table_list ::= create_table_list create_from_stable */ +#line 321 "sql.y" { - taosArrayPush(yymsp[-1].minor.yy38->childTableInfo, &yymsp[0].minor.yy152); - yylhsminor.yy38 = yymsp[-1].minor.yy38; + taosArrayPush(yymsp[-1].minor.yy358->childTableInfo, &yymsp[0].minor.yy416); + yygotominor.yy358 = yymsp[-1].minor.yy358; } - yymsp[-1].minor.yy38 = yylhsminor.yy38; +#line 2210 "sql.c" break; case 123: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ +#line 327 "sql.y" { - yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-1].minor.yy421, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy358 = tSetCreateSqlElems(yymsp[-1].minor.yy221, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yygotominor.yy358, 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.yy38 = yylhsminor.yy38; +#line 2221 "sql.c" break; case 124: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ +#line 336 "sql.y" { - yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy358 = tSetCreateSqlElems(yymsp[-5].minor.yy221, yymsp[-1].minor.yy221, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yygotominor.yy358, 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.yy38 = yylhsminor.yy38; +#line 2232 "sql.c" break; case 125: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ +#line 347 "sql.y" { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; - yylhsminor.yy152 = createNewChildTableInfo(&yymsp[-5].minor.yy0, yymsp[-1].minor.yy421, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yygotominor.yy416 = createNewChildTableInfo(&yymsp[-5].minor.yy0, yymsp[-1].minor.yy221, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy152 = yylhsminor.yy152; +#line 2241 "sql.c" break; case 126: /* create_table_args ::= ifnotexists ids cpxName AS select */ +#line 355 "sql.y" { - yylhsminor.yy38 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy148, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy358 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy344, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yygotominor.yy358, 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.yy38 = yylhsminor.yy38; +#line 2252 "sql.c" break; case 127: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy183); yylhsminor.yy421 = yymsp[-2].minor.yy421; } - yymsp[-2].minor.yy421 = yylhsminor.yy421; +#line 366 "sql.y" +{taosArrayPush(yymsp[-2].minor.yy221, &yymsp[0].minor.yy503); yygotominor.yy221 = yymsp[-2].minor.yy221; } +#line 2257 "sql.c" break; case 128: /* columnlist ::= column */ -{yylhsminor.yy421 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy183);} - yymsp[0].minor.yy421 = yylhsminor.yy421; +#line 367 "sql.y" +{yygotominor.yy221 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yygotominor.yy221, &yymsp[0].minor.yy503);} +#line 2262 "sql.c" break; case 129: /* column ::= ids typename */ +#line 371 "sql.y" { - tSqlSetColumnInfo(&yylhsminor.yy183, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy183); + tSqlSetColumnInfo(&yygotominor.yy503, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy503); } - yymsp[-1].minor.yy183 = yylhsminor.yy183; +#line 2269 "sql.c" break; case 130: /* tagitemlist ::= tagitemlist COMMA tagitem */ -{ yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); } - yymsp[-2].minor.yy421 = yylhsminor.yy421; +#line 379 "sql.y" +{ yygotominor.yy221 = tVariantListAppend(yymsp[-2].minor.yy221, &yymsp[0].minor.yy106, -1); } +#line 2274 "sql.c" break; case 131: /* tagitemlist ::= tagitem */ -{ yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); } - yymsp[0].minor.yy421 = yylhsminor.yy421; +#line 380 "sql.y" +{ yygotominor.yy221 = tVariantListAppend(NULL, &yymsp[0].minor.yy106, -1); } +#line 2279 "sql.c" break; case 132: /* tagitem ::= INTEGER */ case 133: /* tagitem ::= FLOAT */ yytestcase(yyruleno==133); case 134: /* tagitem ::= STRING */ yytestcase(yyruleno==134); case 135: /* tagitem ::= BOOL */ yytestcase(yyruleno==135); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy430 = yylhsminor.yy430; +#line 382 "sql.y" +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yygotominor.yy106, &yymsp[0].minor.yy0); } +#line 2287 "sql.c" break; case 136: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy430, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy430 = yylhsminor.yy430; +#line 386 "sql.y" +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yygotominor.yy106, &yymsp[0].minor.yy0); } +#line 2292 "sql.c" break; case 137: /* tagitem ::= MINUS INTEGER */ case 138: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==138); case 139: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==139); case 140: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==140); +#line 388 "sql.y" { 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.yy430, &yymsp[-1].minor.yy0); + tVariantCreate(&yygotominor.yy106, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy430 = yylhsminor.yy430; +#line 2305 "sql.c" break; case 141: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ +#line 419 "sql.y" { - yylhsminor.yy148 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy166, yymsp[-9].minor.yy421, yymsp[-8].minor.yy78, yymsp[-4].minor.yy421, yymsp[-3].minor.yy421, &yymsp[-7].minor.yy400, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy421, &yymsp[0].minor.yy167, &yymsp[-1].minor.yy167); + yygotominor.yy344 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy178, yymsp[-9].minor.yy221, yymsp[-8].minor.yy50, yymsp[-4].minor.yy221, yymsp[-3].minor.yy221, &yymsp[-7].minor.yy280, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy221, &yymsp[0].minor.yy454, &yymsp[-1].minor.yy454); } - yymsp[-11].minor.yy148 = yylhsminor.yy148; +#line 2312 "sql.c" break; case 142: /* union ::= select */ -{ yylhsminor.yy153 = setSubclause(NULL, yymsp[0].minor.yy148); } - yymsp[0].minor.yy153 = yylhsminor.yy153; +#line 426 "sql.y" +{ yygotominor.yy273 = setSubclause(NULL, yymsp[0].minor.yy344); } +#line 2317 "sql.c" break; case 143: /* union ::= LP union RP */ -{ yymsp[-2].minor.yy153 = yymsp[-1].minor.yy153; } +#line 427 "sql.y" +{ yygotominor.yy273 = yymsp[-1].minor.yy273; } +#line 2322 "sql.c" break; case 144: /* union ::= union UNION ALL select */ -{ yylhsminor.yy153 = appendSelectClause(yymsp[-3].minor.yy153, yymsp[0].minor.yy148); } - yymsp[-3].minor.yy153 = yylhsminor.yy153; +#line 428 "sql.y" +{ yygotominor.yy273 = appendSelectClause(yymsp[-3].minor.yy273, yymsp[0].minor.yy344); } +#line 2327 "sql.c" break; case 145: /* union ::= union UNION ALL LP select RP */ -{ yylhsminor.yy153 = appendSelectClause(yymsp[-5].minor.yy153, yymsp[-1].minor.yy148); } - yymsp[-5].minor.yy153 = yylhsminor.yy153; +#line 429 "sql.y" +{ yygotominor.yy273 = appendSelectClause(yymsp[-5].minor.yy273, yymsp[-1].minor.yy344); } +#line 2332 "sql.c" break; case 146: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy153, NULL, TSDB_SQL_SELECT); } +#line 431 "sql.y" +{ setSqlInfo(pInfo, yymsp[0].minor.yy273, NULL, TSDB_SQL_SELECT); } +#line 2337 "sql.c" break; case 147: /* select ::= SELECT selcollist */ +#line 437 "sql.y" { - yylhsminor.yy148 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy166, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yygotominor.yy344 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy178, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +#line 2344 "sql.c" break; case 148: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy166 = yymsp[-1].minor.yy166;} - yymsp[-1].minor.yy166 = yylhsminor.yy166; +#line 449 "sql.y" +{yygotominor.yy178 = yymsp[-1].minor.yy178;} +#line 2349 "sql.c" break; case 149: /* sclp ::= */ -{yymsp[1].minor.yy166 = 0;} +#line 450 "sql.y" +{yygotominor.yy178 = 0;} +#line 2354 "sql.c" break; - case 150: /* selcollist ::= sclp expr as */ + case 150: /* selcollist ::= sclp distinct expr as */ +#line 451 "sql.y" { - yylhsminor.yy166 = tSqlExprListAppend(yymsp[-2].minor.yy166, yymsp[-1].minor.yy78, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yygotominor.yy178 = tSqlExprListAppend(yymsp[-3].minor.yy178, yymsp[-1].minor.yy50, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-2].minor.yy166 = yylhsminor.yy166; +#line 2361 "sql.c" break; case 151: /* selcollist ::= sclp STAR */ +#line 455 "sql.y" { tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL); - yylhsminor.yy166 = tSqlExprListAppend(yymsp[-1].minor.yy166, pNode, 0); + yygotominor.yy178 = tSqlExprListAppend(yymsp[-1].minor.yy178, pNode, 0, 0); } - yymsp[-1].minor.yy166 = yylhsminor.yy166; +#line 2369 "sql.c" break; case 152: /* as ::= AS ids */ -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } - break; - case 153: /* as ::= ids */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 153: /* as ::= ids */ yytestcase(yyruleno==153); +#line 464 "sql.y" +{ yygotominor.yy0 = yymsp[0].minor.yy0; } +#line 2375 "sql.c" break; case 154: /* as ::= */ -{ yymsp[1].minor.yy0.n = 0; } +#line 466 "sql.y" +{ yygotominor.yy0.n = 0; } +#line 2380 "sql.c" break; - case 155: /* from ::= FROM tablelist */ -{yymsp[-1].minor.yy421 = yymsp[0].minor.yy421;} + case 155: /* distinct ::= DISTINCT */ +#line 469 "sql.y" +{ yygotominor.yy0 = yymsp[0].minor.yy0; } +#line 2385 "sql.c" break; - case 156: /* tablelist ::= ids cpxName */ + case 157: /* from ::= FROM tablelist */ + case 172: /* orderby_opt ::= ORDER BY sortlist */ yytestcase(yyruleno==172); +#line 475 "sql.y" +{yygotominor.yy221 = yymsp[0].minor.yy221;} +#line 2391 "sql.c" + break; + case 158: /* tablelist ::= ids cpxName */ +#line 478 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy421 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); - yylhsminor.yy421 = tVariantListAppendToken(yylhsminor.yy421, &yymsp[-1].minor.yy0, -1); // table alias name + yygotominor.yy221 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[-1].minor.yy0, -1); // table alias name } - yymsp[-1].minor.yy421 = yylhsminor.yy421; +#line 2401 "sql.c" break; - case 157: /* tablelist ::= ids cpxName ids */ + case 159: /* tablelist ::= ids cpxName ids */ +#line 485 "sql.y" { toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type); yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy421 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - yylhsminor.yy421 = tVariantListAppendToken(yylhsminor.yy421, &yymsp[0].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[0].minor.yy0, -1); } - yymsp[-2].minor.yy421 = yylhsminor.yy421; +#line 2412 "sql.c" break; - case 158: /* tablelist ::= tablelist COMMA ids cpxName */ + case 160: /* tablelist ::= tablelist COMMA ids cpxName */ +#line 493 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy421 = tVariantListAppendToken(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy0, -1); - yylhsminor.yy421 = tVariantListAppendToken(yylhsminor.yy421, &yymsp[-1].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(yymsp[-3].minor.yy221, &yymsp[-1].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[-1].minor.yy0, -1); } - yymsp[-3].minor.yy421 = yylhsminor.yy421; +#line 2422 "sql.c" break; - case 159: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 161: /* tablelist ::= tablelist COMMA ids cpxName ids */ +#line 500 "sql.y" { toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type); yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy421 = tVariantListAppendToken(yymsp[-4].minor.yy421, &yymsp[-2].minor.yy0, -1); - yylhsminor.yy421 = tVariantListAppendToken(yylhsminor.yy421, &yymsp[0].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(yymsp[-4].minor.yy221, &yymsp[-2].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[0].minor.yy0, -1); } - yymsp[-4].minor.yy421 = yylhsminor.yy421; +#line 2433 "sql.c" break; - case 160: /* tmvar ::= VARIABLE */ -{yylhsminor.yy0 = yymsp[0].minor.yy0;} - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 162: /* tmvar ::= VARIABLE */ +#line 510 "sql.y" +{yygotominor.yy0 = yymsp[0].minor.yy0;} +#line 2438 "sql.c" break; - case 161: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy400.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy400.offset.n = 0; yymsp[-3].minor.yy400.offset.z = NULL; yymsp[-3].minor.yy400.offset.type = 0;} + case 163: /* interval_opt ::= INTERVAL LP tmvar RP */ +#line 513 "sql.y" +{yygotominor.yy280.interval = yymsp[-1].minor.yy0; yygotominor.yy280.offset.n = 0; yygotominor.yy280.offset.z = NULL; yygotominor.yy280.offset.type = 0;} +#line 2443 "sql.c" break; - case 162: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy400.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy400.offset = yymsp[-1].minor.yy0;} + case 164: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ +#line 514 "sql.y" +{yygotominor.yy280.interval = yymsp[-3].minor.yy0; yygotominor.yy280.offset = yymsp[-1].minor.yy0;} +#line 2448 "sql.c" break; - case 163: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy400, 0, sizeof(yymsp[1].minor.yy400));} + case 165: /* interval_opt ::= */ +#line 515 "sql.y" +{memset(&yygotominor.yy280, 0, sizeof(yygotominor.yy280));} +#line 2453 "sql.c" break; - case 164: /* fill_opt ::= */ -{yymsp[1].minor.yy421 = 0; } + case 166: /* fill_opt ::= */ +#line 519 "sql.y" +{yygotominor.yy221 = 0; } +#line 2458 "sql.c" break; - case 165: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 167: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ +#line 520 "sql.y" { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); tVariantCreate(&A, &yymsp[-3].minor.yy0); - tVariantListInsert(yymsp[-1].minor.yy421, &A, -1, 0); - yymsp[-5].minor.yy421 = yymsp[-1].minor.yy421; + tVariantListInsert(yymsp[-1].minor.yy221, &A, -1, 0); + yygotominor.yy221 = yymsp[-1].minor.yy221; } +#line 2470 "sql.c" break; - case 166: /* fill_opt ::= FILL LP ID RP */ + case 168: /* fill_opt ::= FILL LP ID RP */ +#line 529 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy421 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yygotominor.yy221 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } +#line 2478 "sql.c" break; - case 167: /* sliding_opt ::= SLIDING LP tmvar RP */ -{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } + case 169: /* sliding_opt ::= SLIDING LP tmvar RP */ +#line 535 "sql.y" +{yygotominor.yy0 = yymsp[-1].minor.yy0; } +#line 2483 "sql.c" break; - case 168: /* sliding_opt ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } + case 170: /* sliding_opt ::= */ +#line 536 "sql.y" +{yygotominor.yy0.n = 0; yygotominor.yy0.z = NULL; yygotominor.yy0.type = 0; } +#line 2488 "sql.c" break; - case 169: /* orderby_opt ::= */ -{yymsp[1].minor.yy421 = 0;} + case 171: /* orderby_opt ::= */ +#line 547 "sql.y" +{yygotominor.yy221 = 0;} +#line 2493 "sql.c" break; - case 170: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} - break; - case 171: /* sortlist ::= sortlist COMMA item sortorder */ + case 173: /* sortlist ::= sortlist COMMA item sortorder */ +#line 550 "sql.y" { - yylhsminor.yy421 = tVariantListAppend(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96); + yygotominor.yy221 = tVariantListAppend(yymsp[-3].minor.yy221, &yymsp[-1].minor.yy106, yymsp[0].minor.yy172); } - yymsp[-3].minor.yy421 = yylhsminor.yy421; +#line 2500 "sql.c" break; - case 172: /* sortlist ::= item sortorder */ + case 174: /* sortlist ::= item sortorder */ +#line 554 "sql.y" { - yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[-1].minor.yy430, yymsp[0].minor.yy96); + yygotominor.yy221 = tVariantListAppend(NULL, &yymsp[-1].minor.yy106, yymsp[0].minor.yy172); } - yymsp[-1].minor.yy421 = yylhsminor.yy421; +#line 2507 "sql.c" break; - case 173: /* item ::= ids cpxName */ + case 175: /* item ::= ids cpxName */ +#line 559 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy430, &yymsp[-1].minor.yy0); + tVariantCreate(&yygotominor.yy106, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy430 = yylhsminor.yy430; +#line 2517 "sql.c" break; - case 174: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy96 = TSDB_ORDER_ASC; } + case 176: /* sortorder ::= ASC */ + case 178: /* sortorder ::= */ yytestcase(yyruleno==178); +#line 567 "sql.y" +{ yygotominor.yy172 = TSDB_ORDER_ASC; } +#line 2523 "sql.c" break; - case 175: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy96 = TSDB_ORDER_DESC;} + case 177: /* sortorder ::= DESC */ +#line 568 "sql.y" +{ yygotominor.yy172 = TSDB_ORDER_DESC;} +#line 2528 "sql.c" break; - case 176: /* sortorder ::= */ -{ yymsp[1].minor.yy96 = TSDB_ORDER_ASC; } + case 179: /* groupby_opt ::= */ +#line 577 "sql.y" +{ yygotominor.yy221 = 0;} +#line 2533 "sql.c" break; - case 177: /* groupby_opt ::= */ -{ yymsp[1].minor.yy421 = 0;} + case 180: /* groupby_opt ::= GROUP BY grouplist */ +#line 578 "sql.y" +{ yygotominor.yy221 = yymsp[0].minor.yy221;} +#line 2538 "sql.c" break; - case 178: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} - break; - case 179: /* grouplist ::= grouplist COMMA item */ + case 181: /* grouplist ::= grouplist COMMA item */ +#line 580 "sql.y" { - yylhsminor.yy421 = tVariantListAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy430, -1); + yygotominor.yy221 = tVariantListAppend(yymsp[-2].minor.yy221, &yymsp[0].minor.yy106, -1); } - yymsp[-2].minor.yy421 = yylhsminor.yy421; +#line 2545 "sql.c" break; - case 180: /* grouplist ::= item */ + case 182: /* grouplist ::= item */ +#line 584 "sql.y" { - yylhsminor.yy421 = tVariantListAppend(NULL, &yymsp[0].minor.yy430, -1); + yygotominor.yy221 = tVariantListAppend(NULL, &yymsp[0].minor.yy106, -1); } - yymsp[0].minor.yy421 = yylhsminor.yy421; +#line 2552 "sql.c" break; - case 181: /* having_opt ::= */ - case 191: /* where_opt ::= */ yytestcase(yyruleno==191); - case 229: /* expritem ::= */ yytestcase(yyruleno==229); -{yymsp[1].minor.yy78 = 0;} + case 183: /* having_opt ::= */ + case 193: /* where_opt ::= */ yytestcase(yyruleno==193); + case 231: /* expritem ::= */ yytestcase(yyruleno==231); +#line 591 "sql.y" +{yygotominor.yy50 = 0;} +#line 2559 "sql.c" break; - case 182: /* having_opt ::= HAVING expr */ - case 192: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==192); -{yymsp[-1].minor.yy78 = yymsp[0].minor.yy78;} + case 184: /* having_opt ::= HAVING expr */ + case 194: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==194); + case 230: /* expritem ::= expr */ yytestcase(yyruleno==230); +#line 592 "sql.y" +{yygotominor.yy50 = yymsp[0].minor.yy50;} +#line 2566 "sql.c" break; - case 183: /* limit_opt ::= */ - case 187: /* slimit_opt ::= */ yytestcase(yyruleno==187); -{yymsp[1].minor.yy167.limit = -1; yymsp[1].minor.yy167.offset = 0;} + case 185: /* limit_opt ::= */ + case 189: /* slimit_opt ::= */ yytestcase(yyruleno==189); +#line 596 "sql.y" +{yygotominor.yy454.limit = -1; yygotominor.yy454.offset = 0;} +#line 2572 "sql.c" break; - case 184: /* limit_opt ::= LIMIT signed */ - case 188: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==188); -{yymsp[-1].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-1].minor.yy167.offset = 0;} + case 186: /* limit_opt ::= LIMIT signed */ + case 190: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==190); +#line 597 "sql.y" +{yygotominor.yy454.limit = yymsp[0].minor.yy109; yygotominor.yy454.offset = 0;} +#line 2578 "sql.c" break; - case 185: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy167.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[0].minor.yy325;} + case 187: /* limit_opt ::= LIMIT signed OFFSET signed */ +#line 599 "sql.y" +{ yygotominor.yy454.limit = yymsp[-2].minor.yy109; yygotominor.yy454.offset = yymsp[0].minor.yy109;} +#line 2583 "sql.c" break; - case 186: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[-2].minor.yy325;} + case 188: /* limit_opt ::= LIMIT signed COMMA signed */ +#line 601 "sql.y" +{ yygotominor.yy454.limit = yymsp[0].minor.yy109; yygotominor.yy454.offset = yymsp[-2].minor.yy109;} +#line 2588 "sql.c" break; - case 189: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy167.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[0].minor.yy325;} + case 191: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +#line 607 "sql.y" +{yygotominor.yy454.limit = yymsp[-2].minor.yy109; yygotominor.yy454.offset = yymsp[0].minor.yy109;} +#line 2593 "sql.c" break; - case 190: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy167.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy167.offset = yymsp[-2].minor.yy325;} + case 192: /* slimit_opt ::= SLIMIT signed COMMA signed */ +#line 609 "sql.y" +{yygotominor.yy454.limit = yymsp[0].minor.yy109; yygotominor.yy454.offset = yymsp[-2].minor.yy109;} +#line 2598 "sql.c" break; - case 193: /* expr ::= LP expr RP */ -{yylhsminor.yy78 = yymsp[-1].minor.yy78; yylhsminor.yy78->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy78->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 195: /* expr ::= LP expr RP */ +#line 622 "sql.y" +{yygotominor.yy50 = yymsp[-1].minor.yy50; yygotominor.yy50->token.z = yymsp[-2].minor.yy0.z; yygotominor.yy50->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} +#line 2603 "sql.c" break; - case 194: /* expr ::= ID */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 196: /* expr ::= ID */ +#line 624 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} +#line 2608 "sql.c" break; - case 195: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 197: /* expr ::= ID DOT ID */ +#line 625 "sql.y" +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} +#line 2613 "sql.c" break; - case 196: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 198: /* expr ::= ID DOT STAR */ +#line 626 "sql.y" +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} +#line 2618 "sql.c" break; - case 197: /* expr ::= INTEGER */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 199: /* expr ::= INTEGER */ +#line 628 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} +#line 2623 "sql.c" break; - case 198: /* expr ::= MINUS INTEGER */ - case 199: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==199); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy78 = yylhsminor.yy78; + case 200: /* expr ::= MINUS INTEGER */ + case 201: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==201); +#line 629 "sql.y" +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} +#line 2629 "sql.c" break; - case 200: /* expr ::= FLOAT */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 202: /* expr ::= FLOAT */ +#line 631 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} +#line 2634 "sql.c" break; - case 201: /* expr ::= MINUS FLOAT */ - case 202: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==202); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy78 = yylhsminor.yy78; + case 203: /* expr ::= MINUS FLOAT */ + case 204: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==204); +#line 632 "sql.y" +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} +#line 2640 "sql.c" break; - case 203: /* expr ::= STRING */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 205: /* expr ::= STRING */ +#line 634 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} +#line 2645 "sql.c" break; - case 204: /* expr ::= NOW */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 206: /* expr ::= NOW */ +#line 635 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } +#line 2650 "sql.c" break; - case 205: /* expr ::= VARIABLE */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 207: /* expr ::= VARIABLE */ +#line 636 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} +#line 2655 "sql.c" break; - case 206: /* expr ::= BOOL */ -{ yylhsminor.yy78 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy78 = yylhsminor.yy78; + case 208: /* expr ::= BOOL */ +#line 637 "sql.y" +{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} +#line 2660 "sql.c" break; - case 207: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy78 = tSqlExprCreateFunction(yymsp[-1].minor.yy166, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy78 = yylhsminor.yy78; + case 209: /* expr ::= ID LP exprlist RP */ +#line 640 "sql.y" +{ yygotominor.yy50 = tSqlExprCreateFunction(yymsp[-1].minor.yy178, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } +#line 2665 "sql.c" break; - case 208: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy78 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy78 = yylhsminor.yy78; + case 210: /* expr ::= ID LP STAR RP */ +#line 643 "sql.y" +{ yygotominor.yy50 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } +#line 2670 "sql.c" break; - case 209: /* expr ::= expr IS NULL */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, NULL, TK_ISNULL);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 211: /* expr ::= expr IS NULL */ +#line 646 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, NULL, TK_ISNULL);} +#line 2675 "sql.c" break; - case 210: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-3].minor.yy78, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy78 = yylhsminor.yy78; + case 212: /* expr ::= expr IS NOT NULL */ +#line 647 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-3].minor.yy50, NULL, TK_NOTNULL);} +#line 2680 "sql.c" break; - case 211: /* expr ::= expr LT expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LT);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 213: /* expr ::= expr LT expr */ +#line 650 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LT);} +#line 2685 "sql.c" break; - case 212: /* expr ::= expr GT expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_GT);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 214: /* expr ::= expr GT expr */ +#line 651 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_GT);} +#line 2690 "sql.c" break; - case 213: /* expr ::= expr LE expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LE);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 215: /* expr ::= expr LE expr */ +#line 652 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LE);} +#line 2695 "sql.c" break; - case 214: /* expr ::= expr GE expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_GE);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 216: /* expr ::= expr GE expr */ +#line 653 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_GE);} +#line 2700 "sql.c" break; - case 215: /* expr ::= expr NE expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_NE);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 217: /* expr ::= expr NE expr */ +#line 654 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_NE);} +#line 2705 "sql.c" break; - case 216: /* expr ::= expr EQ expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_EQ);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 218: /* expr ::= expr EQ expr */ +#line 655 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_EQ);} +#line 2710 "sql.c" break; - case 217: /* expr ::= expr AND expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_AND);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 219: /* expr ::= expr AND expr */ +#line 657 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_AND);} +#line 2715 "sql.c" break; - case 218: /* expr ::= expr OR expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_OR); } - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 220: /* expr ::= expr OR expr */ +#line 658 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_OR); } +#line 2720 "sql.c" break; - case 219: /* expr ::= expr PLUS expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_PLUS); } - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 221: /* expr ::= expr PLUS expr */ +#line 661 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_PLUS); } +#line 2725 "sql.c" break; - case 220: /* expr ::= expr MINUS expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_MINUS); } - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 222: /* expr ::= expr MINUS expr */ +#line 662 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_MINUS); } +#line 2730 "sql.c" break; - case 221: /* expr ::= expr STAR expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_STAR); } - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 223: /* expr ::= expr STAR expr */ +#line 663 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_STAR); } +#line 2735 "sql.c" break; - case 222: /* expr ::= expr SLASH expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_DIVIDE);} - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 224: /* expr ::= expr SLASH expr */ +#line 664 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_DIVIDE);} +#line 2740 "sql.c" break; - case 223: /* expr ::= expr REM expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_REM); } - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 225: /* expr ::= expr REM expr */ +#line 665 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_REM); } +#line 2745 "sql.c" break; - case 224: /* expr ::= expr LIKE expr */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-2].minor.yy78, yymsp[0].minor.yy78, TK_LIKE); } - yymsp[-2].minor.yy78 = yylhsminor.yy78; + case 226: /* expr ::= expr LIKE expr */ +#line 668 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LIKE); } +#line 2750 "sql.c" break; - case 225: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy78 = tSqlExprCreate(yymsp[-4].minor.yy78, (tSQLExpr*)yymsp[-1].minor.yy166, TK_IN); } - yymsp[-4].minor.yy78 = yylhsminor.yy78; + case 227: /* expr ::= expr IN LP exprlist RP */ +#line 671 "sql.y" +{yygotominor.yy50 = tSqlExprCreate(yymsp[-4].minor.yy50, (tSQLExpr*)yymsp[-1].minor.yy178, TK_IN); } +#line 2755 "sql.c" break; - case 226: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy166 = tSqlExprListAppend(yymsp[-2].minor.yy166,yymsp[0].minor.yy78,0);} - yymsp[-2].minor.yy166 = yylhsminor.yy166; + case 228: /* exprlist ::= exprlist COMMA expritem */ +#line 679 "sql.y" +{yygotominor.yy178 = tSqlExprListAppend(yymsp[-2].minor.yy178,yymsp[0].minor.yy50,0, 0);} +#line 2760 "sql.c" break; - case 227: /* exprlist ::= expritem */ -{yylhsminor.yy166 = tSqlExprListAppend(0,yymsp[0].minor.yy78,0);} - yymsp[0].minor.yy166 = yylhsminor.yy166; + case 229: /* exprlist ::= expritem */ +#line 680 "sql.y" +{yygotominor.yy178 = tSqlExprListAppend(0,yymsp[0].minor.yy50,0, 0);} +#line 2765 "sql.c" break; - case 228: /* expritem ::= expr */ -{yylhsminor.yy78 = yymsp[0].minor.yy78;} - yymsp[0].minor.yy78 = yylhsminor.yy78; - break; - case 230: /* cmd ::= RESET QUERY CACHE */ + case 232: /* cmd ::= RESET QUERY CACHE */ +#line 685 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} +#line 2770 "sql.c" break; - case 231: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 233: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ +#line 688 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); + SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy221, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } +#line 2779 "sql.c" break; - case 232: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 234: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ +#line 694 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2879,15 +2788,19 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } +#line 2792 "sql.c" break; - case 233: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 235: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ +#line 705 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); + SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy221, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } +#line 2801 "sql.c" break; - case 234: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 236: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ +#line 710 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2897,8 +2810,10 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } +#line 2814 "sql.c" break; - case 235: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 237: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ +#line 720 "sql.y" { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -2911,49 +2826,65 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } +#line 2830 "sql.c" break; - case 236: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 238: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ +#line 733 "sql.y" { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tVariantListAppend(A, &yymsp[0].minor.yy430, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy106, -1); SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } +#line 2844 "sql.c" break; - case 237: /* cmd ::= KILL CONNECTION INTEGER */ + case 239: /* cmd ::= KILL CONNECTION INTEGER */ +#line 745 "sql.y" {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} +#line 2849 "sql.c" break; - case 238: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 240: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ +#line 746 "sql.y" {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} +#line 2854 "sql.c" break; - case 239: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 241: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ +#line 747 "sql.y" {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} +#line 2859 "sql.c" break; default: break; -/********** End reduce actions ************************************************/ }; - assert( yyrulenoYY_MAX_SHIFT && yyact<=YY_MAX_SHIFTREDUCE) ); - - /* It is not possible for a REDUCE to be followed by an error */ - assert( yyact!=YY_ERROR_ACTION ); - - yymsp += yysize+1; - yypParser->yytos = yymsp; - yymsp->stateno = (YYACTIONTYPE)yyact; - yymsp->major = (YYCODETYPE)yygoto; - yyTraceShift(yypParser, yyact, "... then shift"); + yypParser->yyidx -= yysize; + yyact = yy_find_reduce_action(yymsp[-yysize].stateno,(YYCODETYPE)yygoto); + if( yyact < YYNSTATE ){ +#ifdef NDEBUG + /* If we are not debugging and the reduce action popped at least + ** one element off the stack, then we can push the new element back + ** onto the stack here, and skip the stack overflow test in yy_shift(). + ** That gives a significant speed improvement. */ + if( yysize ){ + yypParser->yyidx++; + yymsp -= yysize-1; + yymsp->stateno = (YYACTIONTYPE)yyact; + yymsp->major = (YYCODETYPE)yygoto; + yymsp->minor = yygotominor; + }else +#endif + { + yy_shift(yypParser,yyact,yygoto,&yygotominor); + } + }else{ + assert( yyact == YYNSTATE + YYNRULE + 1 ); + yy_accept(yypParser); + } } /* @@ -2969,11 +2900,9 @@ static void yy_parse_failed( fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); } #endif - while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser); + while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser fails */ -/************ Begin %parse_failure code ***************************************/ -/************ End %parse_failure code *****************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } #endif /* YYNOERRORRECOVERY */ @@ -2984,11 +2913,11 @@ static void yy_parse_failed( static void yy_syntax_error( yyParser *yypParser, /* The parser */ int yymajor, /* The major type of the error token */ - ParseTOKENTYPE yyminor /* The minor type of the error token */ + YYMINORTYPE yyminor /* The minor type of the error token */ ){ ParseARG_FETCH; -#define TOKEN yyminor -/************ Begin %syntax_error code ****************************************/ +#define TOKEN (yyminor.yy0) +#line 37 "sql.y" pInfo->valid = false; int32_t outputBufLen = tListLen(pInfo->pzErrMsg); @@ -3011,7 +2940,7 @@ static void yy_syntax_error( } assert(len <= outputBufLen); -/************ End %syntax_error code ******************************************/ +#line 2944 "sql.c" ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -3027,15 +2956,11 @@ static void yy_accept( fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); } #endif -#ifndef YYNOERRORRECOVERY - yypParser->yyerrcnt = -1; -#endif - assert( yypParser->yytos==yypParser->yystack ); + while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser accepts */ -/*********** Begin %parse_accept code *****************************************/ - -/*********** End %parse_accept code *******************************************/ +#line 61 "sql.y" +#line 2964 "sql.c" ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -3065,52 +2990,50 @@ void Parse( ParseARG_PDECL /* Optional %extra_argument parameter */ ){ YYMINORTYPE yyminorunion; - unsigned int yyact; /* The parser action. */ -#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) + int yyact; /* The parser action. */ int yyendofinput; /* True if we are at the end of input */ -#endif #ifdef YYERRORSYMBOL int yyerrorhit = 0; /* True if yymajor has invoked an error */ #endif yyParser *yypParser; /* The parser */ + /* (re)initialize the parser, if necessary */ yypParser = (yyParser*)yyp; - assert( yypParser->yytos!=0 ); -#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) - yyendofinput = (yymajor==0); + if( yypParser->yyidx<0 ){ +#if YYSTACKDEPTH<=0 + if( yypParser->yystksz <=0 ){ + /*memset(&yyminorunion, 0, sizeof(yyminorunion));*/ + yyminorunion = yyzerominor; + yyStackOverflow(yypParser, &yyminorunion); + return; + } #endif + yypParser->yyidx = 0; + yypParser->yyerrcnt = -1; + yypParser->yystack[0].stateno = 0; + yypParser->yystack[0].major = 0; + } + yyminorunion.yy0 = yyminor; + yyendofinput = (yymajor==0); ParseARG_STORE; #ifndef NDEBUG if( yyTraceFILE ){ - int stateno = yypParser->yytos->stateno; - if( stateno < YY_MIN_REDUCE ){ - fprintf(yyTraceFILE,"%sInput '%s' in state %d\n", - yyTracePrompt,yyTokenName[yymajor],stateno); - }else{ - fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n", - yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE); - } + fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]); } #endif do{ yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); - if( yyact >= YY_MIN_REDUCE ){ - yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor); - }else if( yyact <= YY_MAX_SHIFTREDUCE ){ - yy_shift(yypParser,yyact,yymajor,yyminor); -#ifndef YYNOERRORRECOVERY + if( yyactyyerrcnt--; -#endif yymajor = YYNOCODE; - }else if( yyact==YY_ACCEPT_ACTION ){ - yypParser->yytos--; - yy_accept(yypParser); - return; + }else if( yyact < YYNSTATE + YYNRULE ){ + yy_reduce(yypParser,yyact-YYNSTATE); }else{ assert( yyact == YY_ERROR_ACTION ); - yyminorunion.yy0 = yyminor; #ifdef YYERRORSYMBOL int yymx; #endif @@ -3140,9 +3063,9 @@ void Parse( ** */ if( yypParser->yyerrcnt<0 ){ - yy_syntax_error(yypParser,yymajor,yyminor); + yy_syntax_error(yypParser,yymajor,yyminorunion); } - yymx = yypParser->yytos->major; + yymx = yypParser->yystack[yypParser->yyidx].major; if( yymx==YYERRORSYMBOL || yyerrorhit ){ #ifndef NDEBUG if( yyTraceFILE ){ @@ -3150,26 +3073,26 @@ void Parse( yyTracePrompt,yyTokenName[yymajor]); } #endif - yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion); + yy_destructor(yypParser, (YYCODETYPE)yymajor,&yyminorunion); yymajor = YYNOCODE; }else{ - while( yypParser->yytos >= yypParser->yystack - && yymx != YYERRORSYMBOL - && (yyact = yy_find_reduce_action( - yypParser->yytos->stateno, - YYERRORSYMBOL)) >= YY_MIN_REDUCE + while( + yypParser->yyidx >= 0 && + yymx != YYERRORSYMBOL && + (yyact = yy_find_reduce_action( + yypParser->yystack[yypParser->yyidx].stateno, + YYERRORSYMBOL)) >= YYNSTATE ){ yy_pop_parser_stack(yypParser); } - if( yypParser->yytos < yypParser->yystack || yymajor==0 ){ + if( yypParser->yyidx < 0 || yymajor==0 ){ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yy_parse_failed(yypParser); -#ifndef YYNOERRORRECOVERY - yypParser->yyerrcnt = -1; -#endif yymajor = YYNOCODE; }else if( yymx!=YYERRORSYMBOL ){ - yy_shift(yypParser,yyact,YYERRORSYMBOL,yyminor); + YYMINORTYPE u2; + u2.YYERRSYMDT = 0; + yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2); } } yypParser->yyerrcnt = 3; @@ -3182,7 +3105,7 @@ void Parse( ** Applications can set this macro (for example inside %include) if ** they intend to abandon the parse upon the first syntax error seen. */ - yy_syntax_error(yypParser,yymajor, yyminor); + yy_syntax_error(yypParser,yymajor,yyminorunion); yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yymajor = YYNOCODE; @@ -3197,31 +3120,16 @@ void Parse( ** three input tokens have been successfully shifted. */ if( yypParser->yyerrcnt<=0 ){ - yy_syntax_error(yypParser,yymajor, yyminor); + yy_syntax_error(yypParser,yymajor,yyminorunion); } yypParser->yyerrcnt = 3; yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); if( yyendofinput ){ yy_parse_failed(yypParser); -#ifndef YYNOERRORRECOVERY - yypParser->yyerrcnt = -1; -#endif } yymajor = YYNOCODE; #endif } - }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack ); -#ifndef NDEBUG - if( yyTraceFILE ){ - yyStackEntry *i; - char cDiv = '['; - fprintf(yyTraceFILE,"%sReturn. Stack=",yyTracePrompt); - for(i=&yypParser->yystack[1]; i<=yypParser->yytos; i++){ - fprintf(yyTraceFILE,"%c%s", cDiv, yyTokenName[i->major]); - cDiv = ' '; - } - fprintf(yyTraceFILE,"]\n"); - } -#endif + }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 ); return; } From 87e45c7931daeed3518720161fe74090ac14198e Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 16 Jan 2021 15:09:02 +0800 Subject: [PATCH 02/34] [TD-225]update sql.c --- src/inc/ttokendef.h | 198 ++-- src/query/src/sql.c | 2758 ++++++++++++++++++++++--------------------- 2 files changed, 1529 insertions(+), 1427 deletions(-) diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index bc11f84e62..a4de75e938 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -17,105 +17,105 @@ #define TDENGINE_TTOKENDEF_H -#define TK_ID 1 -#define TK_BOOL 2 -#define TK_TINYINT 3 -#define TK_SMALLINT 4 -#define TK_INTEGER 5 -#define TK_BIGINT 6 -#define TK_FLOAT 7 -#define TK_DOUBLE 8 -#define TK_STRING 9 -#define TK_TIMESTAMP 10 -#define TK_BINARY 11 -#define TK_NCHAR 12 -#define TK_OR 13 -#define TK_AND 14 -#define TK_NOT 15 -#define TK_EQ 16 -#define TK_NE 17 -#define TK_ISNULL 18 -#define TK_NOTNULL 19 -#define TK_IS 20 -#define TK_LIKE 21 -#define TK_GLOB 22 -#define TK_BETWEEN 23 -#define TK_IN 24 -#define TK_GT 25 -#define TK_GE 26 -#define TK_LT 27 -#define TK_LE 28 -#define TK_BITAND 29 -#define TK_BITOR 30 -#define TK_LSHIFT 31 -#define TK_RSHIFT 32 -#define TK_PLUS 33 -#define TK_MINUS 34 -#define TK_DIVIDE 35 -#define TK_TIMES 36 -#define TK_STAR 37 -#define TK_SLASH 38 -#define TK_REM 39 -#define TK_CONCAT 40 -#define TK_UMINUS 41 -#define TK_UPLUS 42 -#define TK_BITNOT 43 -#define TK_SHOW 44 -#define TK_DATABASES 45 -#define TK_MNODES 46 -#define TK_DNODES 47 -#define TK_ACCOUNTS 48 -#define TK_USERS 49 -#define TK_MODULES 50 -#define TK_QUERIES 51 -#define TK_CONNECTIONS 52 -#define TK_STREAMS 53 -#define TK_VARIABLES 54 -#define TK_SCORES 55 -#define TK_GRANTS 56 -#define TK_VNODES 57 -#define TK_IPTOKEN 58 -#define TK_DOT 59 -#define TK_CREATE 60 -#define TK_TABLE 61 -#define TK_DATABASE 62 -#define TK_TABLES 63 -#define TK_STABLES 64 -#define TK_VGROUPS 65 -#define TK_DROP 66 -#define TK_DNODE 67 -#define TK_USER 68 -#define TK_ACCOUNT 69 -#define TK_USE 70 -#define TK_DESCRIBE 71 -#define TK_ALTER 72 -#define TK_PASS 73 -#define TK_PRIVILEGE 74 -#define TK_LOCAL 75 -#define TK_IF 76 -#define TK_EXISTS 77 -#define TK_PPS 78 -#define TK_TSERIES 79 -#define TK_DBS 80 -#define TK_STORAGE 81 -#define TK_QTIME 82 -#define TK_CONNS 83 -#define TK_STATE 84 -#define TK_KEEP 85 -#define TK_CACHE 86 -#define TK_REPLICA 87 -#define TK_QUORUM 88 -#define TK_DAYS 89 -#define TK_MINROWS 90 -#define TK_MAXROWS 91 -#define TK_BLOCKS 92 -#define TK_CTIME 93 -#define TK_WAL 94 -#define TK_FSYNC 95 -#define TK_COMP 96 -#define TK_PRECISION 97 -#define TK_UPDATE 98 -#define TK_CACHELAST 99 +#define TK_ID 1 +#define TK_BOOL 2 +#define TK_TINYINT 3 +#define TK_SMALLINT 4 +#define TK_INTEGER 5 +#define TK_BIGINT 6 +#define TK_FLOAT 7 +#define TK_DOUBLE 8 +#define TK_STRING 9 +#define TK_TIMESTAMP 10 +#define TK_BINARY 11 +#define TK_NCHAR 12 +#define TK_OR 13 +#define TK_AND 14 +#define TK_NOT 15 +#define TK_EQ 16 +#define TK_NE 17 +#define TK_ISNULL 18 +#define TK_NOTNULL 19 +#define TK_IS 20 +#define TK_LIKE 21 +#define TK_GLOB 22 +#define TK_BETWEEN 23 +#define TK_IN 24 +#define TK_GT 25 +#define TK_GE 26 +#define TK_LT 27 +#define TK_LE 28 +#define TK_BITAND 29 +#define TK_BITOR 30 +#define TK_LSHIFT 31 +#define TK_RSHIFT 32 +#define TK_PLUS 33 +#define TK_MINUS 34 +#define TK_DIVIDE 35 +#define TK_TIMES 36 +#define TK_STAR 37 +#define TK_SLASH 38 +#define TK_REM 39 +#define TK_CONCAT 40 +#define TK_UMINUS 41 +#define TK_UPLUS 42 +#define TK_BITNOT 43 +#define TK_SHOW 44 +#define TK_DATABASES 45 +#define TK_MNODES 46 +#define TK_DNODES 47 +#define TK_ACCOUNTS 48 +#define TK_USERS 49 +#define TK_MODULES 50 +#define TK_QUERIES 51 +#define TK_CONNECTIONS 52 +#define TK_STREAMS 53 +#define TK_VARIABLES 54 +#define TK_SCORES 55 +#define TK_GRANTS 56 +#define TK_VNODES 57 +#define TK_IPTOKEN 58 +#define TK_DOT 59 +#define TK_CREATE 60 +#define TK_TABLE 61 +#define TK_DATABASE 62 +#define TK_TABLES 63 +#define TK_STABLES 64 +#define TK_VGROUPS 65 +#define TK_DROP 66 +#define TK_DNODE 67 +#define TK_USER 68 +#define TK_ACCOUNT 69 +#define TK_USE 70 +#define TK_DESCRIBE 71 +#define TK_ALTER 72 +#define TK_PASS 73 +#define TK_PRIVILEGE 74 +#define TK_LOCAL 75 +#define TK_IF 76 +#define TK_EXISTS 77 +#define TK_PPS 78 +#define TK_TSERIES 79 +#define TK_DBS 80 +#define TK_STORAGE 81 +#define TK_QTIME 82 +#define TK_CONNS 83 +#define TK_STATE 84 +#define TK_KEEP 85 +#define TK_CACHE 86 +#define TK_REPLICA 87 +#define TK_QUORUM 88 +#define TK_DAYS 89 +#define TK_MINROWS 90 +#define TK_MAXROWS 91 +#define TK_BLOCKS 92 +#define TK_CTIME 93 +#define TK_WAL 94 +#define TK_FSYNC 95 +#define TK_COMP 96 +#define TK_PRECISION 97 +#define TK_UPDATE 98 +#define TK_CACHELAST 99 #define TK_LP 100 #define TK_RP 101 #define TK_UNSIGNED 102 diff --git a/src/query/src/sql.c b/src/query/src/sql.c index f559c55922..f540e49646 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -1,10 +1,29 @@ -/* Driver template for the LEMON parser generator. -** The author disclaims copyright to this source code. +/* +** 2000-05-29 +** +** The author disclaims copyright to this source code. In place of +** a legal notice, here is a blessing: +** +** May you do good and not evil. +** May you find forgiveness for yourself and forgive others. +** May you share freely, never taking more than you give. +** +************************************************************************* +** Driver template for the LEMON parser generator. +** +** The "lemon" program processes an LALR(1) input grammar file, then uses +** this template to construct a parser. The "lemon" program inserts text +** at each "%%" line. Also, any "P-a-r-s-e" identifer prefix (without the +** interstitial "-" characters) contained in this template is changed into +** the value of the %name directive from the grammar. Otherwise, the content +** of this template is copied straight through into the generate parser +** source file. +** +** The following is the concatenation of all %include directives from the +** input grammar file: */ -/* First off, code is included that follows the "include" declaration -** in the input grammar file. */ #include -#line 23 "sql.y" +/************ Begin %include sections from the grammar ************************/ #include #include @@ -17,56 +36,66 @@ #include "ttokendef.h" #include "tutil.h" #include "tvariant.h" -#line 21 "sql.c" -/* Next is all token values, in a form suitable for use by makeheaders. -** This section will be null unless lemon is run with the -m switch. -*/ -/* -** These constants (all generated automatically by the parser generator) -** specify the various kinds of tokens (terminals) that the parser -** understands. -** -** Each symbol here is a terminal symbol in the grammar. -*/ -/* Make sure the INTERFACE macro is defined. -*/ -#ifndef INTERFACE -# define INTERFACE 1 -#endif -/* The next thing included is series of defines which control +/**************** End of %include directives **********************************/ +/* These constants specify the various numeric values for terminal symbols +** in a format understandable to "makeheaders". This section is blank unless +** "lemon" is run with the "-m" command-line option. +***************** Begin makeheaders token definitions *************************/ +/**************** End makeheaders token definitions ***************************/ + +/* The next sections is a series of control #defines. ** various aspects of the generated parser. -** YYCODETYPE is the data type used for storing terminal -** and nonterminal numbers. "unsigned char" is -** used if there are fewer than 250 terminals -** and nonterminals. "int" is used otherwise. -** YYNOCODE is a number of type YYCODETYPE which corresponds -** to no legal terminal or nonterminal number. This -** number is used to fill in empty slots of the hash -** table. +** YYCODETYPE is the data type used to store the integer codes +** that represent terminal and non-terminal symbols. +** "unsigned char" is used if there are fewer than +** 256 symbols. Larger types otherwise. +** YYNOCODE is a number of type YYCODETYPE that is not used for +** any terminal or nonterminal symbol. ** YYFALLBACK If defined, this indicates that one or more tokens -** have fall-back values which should be used if the -** original value of the token will not parse. -** YYACTIONTYPE is the data type used for storing terminal -** and nonterminal numbers. "unsigned char" is -** used if there are fewer than 250 rules and -** states combined. "int" is used otherwise. -** ParseTOKENTYPE is the data type used for minor tokens given -** directly to the parser from the tokenizer. -** YYMINORTYPE is the data type used for all minor tokens. +** (also known as: "terminal symbols") have fall-back +** values which should be used if the original symbol +** would not parse. This permits keywords to sometimes +** be used as identifiers, for example. +** YYACTIONTYPE is the data type used for "action codes" - numbers +** that indicate what to do in response to the next +** token. +** ParseTOKENTYPE is the data type used for minor type for terminal +** symbols. Background: A "minor type" is a semantic +** value associated with a terminal or non-terminal +** symbols. For example, for an "ID" terminal symbol, +** the minor type might be the name of the identifier. +** Each non-terminal can have a different minor type. +** Terminal symbols all have the same minor type, though. +** This macros defines the minor type for terminal +** symbols. +** YYMINORTYPE is the data type used for all minor types. ** This is typically a union of many types, one of ** which is ParseTOKENTYPE. The entry in the union -** for base tokens is called "yy0". +** for terminal symbols is called "yy0". ** YYSTACKDEPTH is the maximum depth of the parser's stack. If ** zero the stack is dynamically sized using realloc() ** ParseARG_SDECL A static variable declaration for the %extra_argument ** ParseARG_PDECL A parameter declaration for the %extra_argument ** ParseARG_STORE Code to store %extra_argument into yypParser ** ParseARG_FETCH Code to extract %extra_argument from yypParser -** YYNSTATE the combined number of states. -** YYNRULE the number of rules in the grammar ** YYERRORSYMBOL is the code number of the error symbol. If not ** defined, then do no error processing. +** YYNSTATE the combined number of states. +** YYNRULE the number of rules in the grammar +** YYNTOKEN Number of terminal symbols +** YY_MAX_SHIFT Maximum value for shift actions +** YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions +** YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions +** YY_ERROR_ACTION The yy_action[] code for syntax error +** YY_ACCEPT_ACTION The yy_action[] code for accept +** YY_NO_ACTION The yy_action[] code for no-op +** YY_MIN_REDUCE Minimum value for reduce actions +** YY_MAX_REDUCE Maximum value for reduce actions */ +#ifndef INTERFACE +# define INTERFACE 1 +#endif +/************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int #define YYNOCODE 281 #define YYACTIONTYPE unsigned short int @@ -97,16 +126,19 @@ typedef union { #define ParseARG_PDECL ,SSqlInfo* pInfo #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo -#define YYNSTATE 433 -#define YYNRULE 242 #define YYFALLBACK 1 -#define YY_NO_ACTION (YYNSTATE+YYNRULE+2) -#define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) -#define YY_ERROR_ACTION (YYNSTATE+YYNRULE) - -/* The yyzerominor constant is used to initialize instances of -** YYMINORTYPE objects to zero. */ -static const YYMINORTYPE yyzerominor = { 0 }; +#define YYNSTATE 259 +#define YYNRULE 242 +#define YYNTOKEN 210 +#define YY_MAX_SHIFT 258 +#define YY_MIN_SHIFTREDUCE 433 +#define YY_MAX_SHIFTREDUCE 674 +#define YY_ERROR_ACTION 675 +#define YY_ACCEPT_ACTION 676 +#define YY_NO_ACTION 677 +#define YY_MIN_REDUCE 678 +#define YY_MAX_REDUCE 919 +/************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined ** otherwise. @@ -129,33 +161,35 @@ static const YYMINORTYPE yyzerominor = { 0 }; ** Suppose the action integer is N. Then the action is determined as ** follows ** -** 0 <= N < YYNSTATE Shift N. That is, push the lookahead +** 0 <= N <= YY_MAX_SHIFT Shift N. That is, push the lookahead ** token onto the stack and goto state N. ** -** YYNSTATE <= N < YYNSTATE+YYNRULE Reduce by rule N-YYNSTATE. +** N between YY_MIN_SHIFTREDUCE Shift to an arbitrary state then +** and YY_MAX_SHIFTREDUCE reduce by rule N-YY_MIN_SHIFTREDUCE. ** -** N == YYNSTATE+YYNRULE A syntax error has occurred. +** N == YY_ERROR_ACTION A syntax error has occurred. ** -** N == YYNSTATE+YYNRULE+1 The parser accepts its input. +** N == YY_ACCEPT_ACTION The parser accepts its input. ** -** N == YYNSTATE+YYNRULE+2 No such action. Denotes unused +** N == YY_NO_ACTION No such action. Denotes unused ** slots in the yy_action[] table. ** +** N between YY_MIN_REDUCE Reduce by rule N-YY_MIN_REDUCE +** and YY_MAX_REDUCE +** ** The action table is constructed as a single large table named yy_action[]. -** Given state S and lookahead X, the action is computed as +** Given state S and lookahead X, the action is computed as either: ** -** yy_action[ yy_shift_ofst[S] + X ] +** (A) N = yy_action[ yy_shift_ofst[S] + X ] +** (B) N = yy_default[S] ** -** If the index value yy_shift_ofst[S]+X is out of range or if the value -** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S] -** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table -** and that yy_default[S] should be used instead. +** The (A) formula is preferred. The B formula is used instead if +** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X. ** -** The formula above is for computing the action when the lookahead is +** The formulas above are for computing the action when the lookahead is ** a terminal symbol. If the lookahead is a non-terminal (as occurs after ** a reduce action) then the yy_reduce_ofst[] array is used in place of -** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of -** YY_SHIFT_USE_DFLT. +** the yy_shift_ofst[] array. ** ** The following are the tables generated in this section: ** @@ -167,252 +201,233 @@ static const YYMINORTYPE yyzerominor = { 0 }; ** yy_reduce_ofst[] For each state, the offset into yy_action for ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. -*/ -#define YY_ACTTAB_COUNT (690) +** +*********** Begin parsing tables **********************************************/ +#define YY_ACTTAB_COUNT (578) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 417, 36, 35, 79, 83, 34, 33, 32, 416, 88, - /* 10 */ 91, 82, 37, 38, 67, 39, 40, 85, 212, 174, - /* 20 */ 31, 676, 258, 211, 43, 41, 45, 42, 255, 254, - /* 30 */ 99, 172, 36, 35, 104, 102, 34, 33, 32, 37, - /* 40 */ 38, 433, 39, 40, 9, 320, 174, 31, 66, 121, - /* 50 */ 211, 43, 41, 45, 42, 34, 33, 32, 144, 36, - /* 60 */ 35, 180, 266, 34, 33, 32, 37, 38, 289, 39, - /* 70 */ 40, 356, 4, 174, 31, 144, 196, 211, 43, 41, - /* 80 */ 45, 42, 65, 419, 168, 290, 36, 35, 417, 307, - /* 90 */ 34, 33, 32, 90, 89, 38, 416, 39, 40, 233, - /* 100 */ 232, 174, 31, 52, 57, 211, 43, 41, 45, 42, - /* 110 */ 310, 321, 22, 318, 36, 35, 138, 136, 34, 33, - /* 120 */ 32, 53, 96, 95, 94, 306, 182, 308, 369, 230, - /* 130 */ 229, 134, 432, 431, 430, 429, 428, 427, 426, 425, - /* 140 */ 424, 423, 422, 421, 257, 101, 325, 186, 337, 336, - /* 150 */ 335, 334, 333, 332, 331, 330, 329, 328, 327, 326, - /* 160 */ 324, 323, 420, 17, 224, 251, 250, 223, 222, 221, - /* 170 */ 249, 220, 248, 247, 246, 219, 245, 244, 39, 40, - /* 180 */ 23, 553, 174, 31, 189, 23, 211, 43, 41, 45, - /* 190 */ 42, 193, 192, 11, 10, 36, 35, 111, 274, 34, - /* 200 */ 33, 32, 173, 296, 19, 13, 305, 111, 300, 392, - /* 210 */ 299, 391, 173, 296, 78, 77, 305, 235, 300, 351, - /* 220 */ 299, 156, 231, 394, 351, 23, 397, 157, 396, 49, - /* 230 */ 395, 93, 92, 151, 170, 171, 286, 285, 210, 43, - /* 240 */ 41, 45, 42, 345, 170, 171, 134, 36, 35, 50, - /* 250 */ 144, 34, 33, 32, 183, 184, 208, 226, 62, 169, - /* 260 */ 290, 18, 178, 377, 351, 23, 379, 378, 281, 28, - /* 270 */ 206, 376, 268, 374, 373, 375, 370, 372, 371, 134, - /* 280 */ 3, 125, 17, 252, 251, 250, 73, 69, 72, 249, - /* 290 */ 195, 248, 247, 246, 319, 245, 244, 159, 390, 48, - /* 300 */ 389, 44, 177, 55, 351, 353, 388, 214, 317, 23, - /* 310 */ 295, 44, 24, 24, 297, 14, 291, 304, 302, 303, - /* 320 */ 301, 14, 181, 64, 297, 277, 278, 276, 393, 298, - /* 330 */ 15, 48, 108, 265, 417, 58, 105, 266, 81, 298, - /* 340 */ 111, 198, 416, 243, 28, 111, 267, 106, 358, 18, - /* 350 */ 179, 164, 166, 269, 352, 163, 256, 28, 100, 409, - /* 360 */ 48, 387, 386, 385, 384, 383, 382, 381, 380, 368, - /* 370 */ 367, 366, 365, 388, 364, 388, 363, 362, 361, 24, - /* 380 */ 357, 355, 354, 76, 74, 344, 47, 71, 343, 225, - /* 390 */ 342, 341, 340, 339, 68, 66, 16, 215, 338, 8, - /* 400 */ 213, 63, 309, 5, 199, 288, 282, 7, 21, 271, - /* 410 */ 6, 20, 279, 167, 194, 110, 202, 109, 198, 275, - /* 420 */ 56, 263, 262, 261, 191, 61, 190, 260, 188, 187, - /* 430 */ 259, 253, 1, 2, 103, 415, 130, 131, 98, 97, - /* 440 */ 133, 237, 410, 403, 240, 127, 316, 242, 28, 158, - /* 450 */ 30, 117, 119, 129, 132, 217, 70, 216, 128, 241, - /* 460 */ 238, 239, 359, 162, 236, 201, 80, 203, 116, 226, - /* 470 */ 205, 207, 51, 284, 204, 46, 60, 165, 59, 677, - /* 480 */ 139, 418, 414, 413, 412, 411, 137, 677, 408, 407, - /* 490 */ 406, 405, 404, 677, 135, 185, 118, 402, 677, 197, - /* 500 */ 115, 209, 401, 114, 234, 243, 113, 280, 112, 120, - /* 510 */ 315, 264, 87, 54, 86, 400, 398, 677, 200, 677, - /* 520 */ 84, 399, 677, 677, 29, 677, 677, 677, 287, 145, - /* 530 */ 677, 283, 176, 314, 677, 677, 141, 677, 25, 27, - /* 540 */ 360, 126, 350, 349, 75, 348, 228, 677, 346, 227, - /* 550 */ 677, 677, 26, 140, 677, 218, 322, 124, 123, 122, - /* 560 */ 107, 677, 273, 272, 677, 677, 677, 677, 677, 677, - /* 570 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 580 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 590 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 600 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 270, - /* 610 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 620 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 630 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 640 */ 677, 677, 677, 313, 175, 312, 311, 677, 677, 677, - /* 650 */ 677, 677, 677, 677, 347, 677, 677, 677, 677, 677, - /* 660 */ 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - /* 670 */ 152, 142, 153, 155, 154, 150, 149, 147, 146, 161, - /* 680 */ 160, 677, 294, 293, 292, 148, 143, 677, 677, 12, + /* 0 */ 144, 476, 144, 23, 676, 258, 831, 549, 12, 477, + /* 10 */ 906, 169, 907, 37, 38, 820, 39, 40, 143, 23, + /* 20 */ 174, 31, 476, 476, 211, 43, 41, 45, 42, 164, + /* 30 */ 477, 477, 106, 36, 35, 233, 232, 34, 33, 32, + /* 40 */ 37, 38, 805, 39, 40, 820, 148, 174, 31, 163, + /* 50 */ 256, 211, 43, 41, 45, 42, 177, 166, 806, 196, + /* 60 */ 36, 35, 828, 903, 34, 33, 32, 434, 435, 436, + /* 70 */ 437, 438, 439, 440, 441, 442, 443, 444, 445, 257, + /* 80 */ 809, 226, 186, 37, 38, 719, 39, 40, 134, 199, + /* 90 */ 174, 31, 144, 798, 211, 43, 41, 45, 42, 111, + /* 100 */ 111, 168, 907, 36, 35, 57, 243, 34, 33, 32, + /* 110 */ 17, 224, 251, 250, 223, 222, 221, 249, 220, 248, + /* 120 */ 247, 246, 219, 245, 244, 179, 902, 778, 628, 766, + /* 130 */ 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, + /* 140 */ 777, 779, 780, 38, 18, 39, 40, 23, 809, 174, + /* 150 */ 31, 901, 28, 211, 43, 41, 45, 42, 111, 208, + /* 160 */ 859, 62, 36, 35, 23, 212, 34, 33, 32, 226, + /* 170 */ 39, 40, 180, 111, 174, 31, 160, 65, 211, 43, + /* 180 */ 41, 45, 42, 13, 178, 181, 806, 36, 35, 189, + /* 190 */ 584, 34, 33, 32, 173, 641, 193, 192, 632, 156, + /* 200 */ 635, 231, 638, 806, 161, 157, 797, 22, 799, 93, + /* 210 */ 92, 151, 173, 641, 609, 610, 632, 807, 635, 860, + /* 220 */ 638, 206, 17, 252, 251, 250, 170, 171, 23, 249, + /* 230 */ 210, 248, 247, 246, 63, 245, 244, 182, 9, 18, + /* 240 */ 230, 229, 66, 121, 170, 171, 809, 28, 784, 67, + /* 250 */ 146, 782, 783, 255, 254, 99, 785, 644, 787, 788, + /* 260 */ 786, 81, 789, 790, 588, 235, 243, 806, 195, 916, + /* 270 */ 43, 41, 45, 42, 728, 159, 596, 134, 36, 35, + /* 280 */ 800, 108, 34, 33, 32, 568, 720, 64, 565, 134, + /* 290 */ 566, 630, 567, 44, 79, 83, 808, 3, 125, 58, + /* 300 */ 88, 91, 82, 73, 69, 72, 640, 147, 85, 36, + /* 310 */ 35, 44, 105, 34, 33, 32, 183, 184, 576, 581, + /* 320 */ 28, 639, 138, 136, 640, 19, 198, 631, 96, 95, + /* 330 */ 94, 34, 33, 32, 172, 600, 601, 49, 660, 639, + /* 340 */ 48, 15, 642, 14, 634, 52, 637, 14, 633, 557, + /* 350 */ 636, 214, 149, 558, 24, 150, 24, 50, 48, 78, + /* 360 */ 77, 154, 55, 53, 548, 572, 570, 573, 571, 155, + /* 370 */ 11, 10, 90, 89, 153, 4, 104, 102, 142, 152, + /* 380 */ 145, 870, 869, 175, 822, 830, 29, 866, 865, 176, + /* 390 */ 569, 234, 837, 839, 107, 852, 851, 122, 123, 120, + /* 400 */ 124, 730, 595, 218, 28, 140, 26, 197, 227, 727, + /* 410 */ 228, 915, 75, 914, 912, 126, 748, 27, 25, 141, + /* 420 */ 717, 84, 715, 86, 87, 103, 54, 819, 713, 712, + /* 430 */ 185, 200, 135, 710, 709, 708, 707, 706, 137, 704, + /* 440 */ 702, 165, 700, 698, 696, 204, 139, 51, 46, 112, + /* 450 */ 209, 207, 205, 203, 201, 59, 30, 60, 853, 80, + /* 460 */ 236, 237, 238, 239, 240, 241, 242, 253, 674, 188, + /* 470 */ 162, 187, 216, 217, 673, 158, 190, 191, 70, 672, + /* 480 */ 665, 194, 711, 198, 578, 97, 98, 597, 705, 129, + /* 490 */ 56, 128, 749, 127, 130, 131, 133, 132, 1, 697, + /* 500 */ 109, 61, 2, 167, 202, 804, 117, 113, 114, 602, + /* 510 */ 115, 116, 118, 119, 110, 20, 6, 7, 643, 21, + /* 520 */ 5, 8, 645, 16, 68, 213, 517, 215, 513, 66, + /* 530 */ 511, 510, 509, 506, 480, 225, 74, 47, 71, 76, + /* 540 */ 24, 551, 550, 547, 501, 499, 491, 497, 493, 495, + /* 550 */ 489, 487, 519, 518, 516, 515, 514, 512, 508, 507, + /* 560 */ 48, 478, 449, 447, 678, 677, 677, 677, 677, 677, + /* 570 */ 677, 677, 677, 677, 677, 677, 100, 101, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 1, 33, 34, 61, 62, 37, 38, 39, 9, 67, - /* 10 */ 68, 69, 13, 14, 219, 16, 17, 75, 15, 20, - /* 20 */ 21, 211, 212, 24, 25, 26, 27, 28, 63, 64, - /* 30 */ 65, 59, 33, 34, 61, 62, 37, 38, 39, 13, - /* 40 */ 14, 0, 16, 17, 100, 250, 20, 21, 104, 105, - /* 50 */ 24, 25, 26, 27, 28, 37, 38, 39, 269, 33, - /* 60 */ 34, 66, 252, 37, 38, 39, 13, 14, 279, 16, - /* 70 */ 17, 5, 100, 20, 21, 269, 266, 24, 25, 26, - /* 80 */ 27, 28, 219, 59, 278, 279, 33, 34, 1, 1, - /* 90 */ 37, 38, 39, 73, 74, 14, 9, 16, 17, 33, - /* 100 */ 34, 20, 21, 106, 105, 24, 25, 26, 27, 28, - /* 110 */ 107, 248, 249, 250, 33, 34, 61, 62, 37, 38, - /* 120 */ 39, 124, 67, 68, 69, 37, 131, 101, 218, 134, - /* 130 */ 135, 221, 45, 46, 47, 48, 49, 50, 51, 52, - /* 140 */ 53, 54, 55, 56, 57, 21, 230, 60, 232, 233, - /* 150 */ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - /* 160 */ 244, 245, 58, 85, 86, 87, 88, 89, 90, 91, - /* 170 */ 92, 93, 94, 95, 96, 97, 98, 99, 16, 17, - /* 180 */ 214, 0, 20, 21, 130, 214, 24, 25, 26, 27, - /* 190 */ 28, 137, 138, 132, 133, 33, 34, 214, 106, 37, - /* 200 */ 38, 39, 1, 2, 112, 44, 5, 214, 7, 5, - /* 210 */ 9, 7, 1, 2, 132, 133, 5, 251, 7, 253, - /* 220 */ 9, 60, 251, 2, 253, 214, 5, 66, 7, 106, - /* 230 */ 9, 70, 71, 72, 33, 34, 119, 120, 37, 25, - /* 240 */ 26, 27, 28, 218, 33, 34, 221, 33, 34, 126, - /* 250 */ 269, 37, 38, 39, 33, 34, 273, 76, 275, 278, - /* 260 */ 279, 100, 251, 230, 253, 214, 233, 234, 275, 108, - /* 270 */ 277, 238, 37, 240, 241, 242, 218, 244, 245, 221, - /* 280 */ 61, 62, 85, 231, 87, 88, 67, 68, 69, 92, - /* 290 */ 129, 94, 95, 96, 101, 98, 99, 136, 5, 106, - /* 300 */ 7, 100, 251, 100, 253, 102, 254, 101, 101, 214, - /* 310 */ 101, 100, 106, 106, 113, 106, 101, 5, 5, 7, - /* 320 */ 7, 106, 214, 255, 113, 101, 101, 101, 107, 128, - /* 330 */ 106, 106, 106, 101, 1, 267, 100, 252, 73, 128, - /* 340 */ 214, 109, 9, 78, 108, 214, 111, 214, 253, 100, - /* 350 */ 231, 266, 231, 214, 246, 213, 214, 108, 21, 77, - /* 360 */ 106, 5, 5, 5, 5, 5, 5, 5, 5, 5, - /* 370 */ 5, 5, 5, 254, 5, 254, 5, 5, 5, 106, - /* 380 */ 101, 5, 5, 133, 133, 77, 16, 73, 5, 15, - /* 390 */ 5, 5, 5, 5, 73, 104, 100, 103, 9, 100, - /* 400 */ 103, 275, 107, 100, 271, 101, 275, 118, 106, 270, - /* 410 */ 118, 106, 101, 1, 130, 100, 100, 100, 109, 101, - /* 420 */ 110, 101, 86, 5, 5, 106, 139, 5, 5, 139, - /* 430 */ 5, 76, 220, 217, 59, 215, 226, 224, 216, 216, - /* 440 */ 222, 49, 215, 215, 53, 228, 252, 79, 108, 215, - /* 450 */ 127, 259, 257, 223, 225, 215, 219, 215, 227, 81, - /* 460 */ 80, 82, 229, 215, 83, 114, 84, 115, 260, 76, - /* 470 */ 116, 121, 125, 215, 272, 122, 215, 272, 215, 280, - /* 480 */ 214, 214, 214, 214, 214, 214, 214, 280, 214, 214, - /* 490 */ 214, 214, 214, 280, 214, 214, 258, 214, 280, 252, - /* 500 */ 261, 117, 214, 262, 247, 78, 263, 113, 264, 256, - /* 510 */ 265, 252, 214, 123, 214, 214, 254, 280, 272, 280, - /* 520 */ 214, 214, 280, 280, 268, 280, 280, 280, 276, 269, - /* 530 */ 280, 276, 247, 247, 280, 280, 214, 280, 214, 214, - /* 540 */ 214, 214, 214, 214, 214, 214, 214, 280, 214, 214, - /* 550 */ 280, 280, 214, 214, 280, 214, 214, 214, 214, 214, - /* 560 */ 214, 280, 214, 214, 280, 280, 280, 280, 280, 280, - /* 570 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 0 */ 269, 1, 269, 214, 211, 212, 214, 5, 269, 9, + /* 10 */ 279, 278, 279, 13, 14, 252, 16, 17, 269, 214, + /* 20 */ 20, 21, 1, 1, 24, 25, 26, 27, 28, 266, + /* 30 */ 9, 9, 214, 33, 34, 33, 34, 37, 38, 39, + /* 40 */ 13, 14, 253, 16, 17, 252, 269, 20, 21, 213, + /* 50 */ 214, 24, 25, 26, 27, 28, 251, 231, 253, 266, + /* 60 */ 33, 34, 270, 269, 37, 38, 39, 45, 46, 47, + /* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + /* 80 */ 254, 76, 60, 13, 14, 218, 16, 17, 221, 271, + /* 90 */ 20, 21, 269, 0, 24, 25, 26, 27, 28, 214, + /* 100 */ 214, 278, 279, 33, 34, 105, 78, 37, 38, 39, + /* 110 */ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + /* 120 */ 95, 96, 97, 98, 99, 231, 269, 230, 101, 232, + /* 130 */ 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + /* 140 */ 243, 244, 245, 14, 100, 16, 17, 214, 254, 20, + /* 150 */ 21, 269, 108, 24, 25, 26, 27, 28, 214, 273, + /* 160 */ 275, 275, 33, 34, 214, 15, 37, 38, 39, 76, + /* 170 */ 16, 17, 66, 214, 20, 21, 269, 219, 24, 25, + /* 180 */ 26, 27, 28, 44, 251, 214, 253, 33, 34, 130, + /* 190 */ 37, 37, 38, 39, 1, 2, 137, 138, 5, 60, + /* 200 */ 7, 251, 9, 253, 269, 66, 248, 249, 250, 70, + /* 210 */ 71, 72, 1, 2, 119, 120, 5, 246, 7, 275, + /* 220 */ 9, 277, 85, 231, 87, 88, 33, 34, 214, 92, + /* 230 */ 37, 94, 95, 96, 275, 98, 99, 131, 100, 100, + /* 240 */ 134, 135, 104, 105, 33, 34, 254, 108, 230, 219, + /* 250 */ 269, 233, 234, 63, 64, 65, 238, 107, 240, 241, + /* 260 */ 242, 73, 244, 245, 111, 251, 78, 253, 129, 254, + /* 270 */ 25, 26, 27, 28, 218, 136, 101, 221, 33, 34, + /* 280 */ 250, 106, 37, 38, 39, 2, 218, 255, 5, 221, + /* 290 */ 7, 1, 9, 100, 61, 62, 254, 61, 62, 267, + /* 300 */ 67, 68, 69, 67, 68, 69, 113, 269, 75, 33, + /* 310 */ 34, 100, 100, 37, 38, 39, 33, 34, 101, 106, + /* 320 */ 108, 128, 61, 62, 113, 112, 109, 37, 67, 68, + /* 330 */ 69, 37, 38, 39, 59, 101, 101, 106, 101, 128, + /* 340 */ 106, 106, 101, 106, 5, 106, 7, 106, 5, 101, + /* 350 */ 7, 101, 269, 101, 106, 269, 106, 126, 106, 132, + /* 360 */ 133, 269, 100, 124, 102, 5, 5, 7, 7, 269, + /* 370 */ 132, 133, 73, 74, 269, 100, 61, 62, 269, 269, + /* 380 */ 269, 247, 247, 247, 252, 214, 268, 247, 247, 247, + /* 390 */ 107, 247, 214, 214, 214, 276, 276, 214, 214, 256, + /* 400 */ 214, 214, 113, 214, 108, 214, 214, 252, 214, 214, + /* 410 */ 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + /* 420 */ 214, 214, 214, 214, 214, 59, 123, 265, 214, 214, + /* 430 */ 214, 272, 214, 214, 214, 214, 214, 214, 214, 214, + /* 440 */ 214, 272, 214, 214, 214, 272, 214, 125, 122, 264, + /* 450 */ 117, 121, 116, 115, 114, 215, 127, 215, 215, 84, + /* 460 */ 83, 49, 80, 82, 53, 81, 79, 76, 5, 5, + /* 470 */ 215, 139, 215, 215, 5, 215, 139, 5, 219, 5, + /* 480 */ 86, 130, 215, 109, 101, 216, 216, 101, 215, 223, + /* 490 */ 110, 227, 229, 228, 226, 224, 222, 225, 220, 215, + /* 500 */ 100, 106, 217, 1, 100, 252, 259, 263, 262, 101, + /* 510 */ 261, 260, 258, 257, 100, 106, 118, 118, 101, 106, + /* 520 */ 100, 100, 107, 100, 73, 103, 9, 103, 5, 104, + /* 530 */ 5, 5, 5, 5, 77, 15, 133, 16, 73, 133, + /* 540 */ 106, 5, 5, 101, 5, 5, 5, 5, 5, 5, + /* 550 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 560 */ 106, 77, 59, 58, 0, 280, 280, 280, 280, 280, + /* 570 */ 280, 280, 280, 280, 280, 280, 21, 21, 280, 280, /* 580 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, /* 590 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - /* 600 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 214, + /* 600 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, /* 610 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, /* 620 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, /* 630 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - /* 640 */ 280, 280, 280, 247, 247, 247, 247, 280, 280, 280, - /* 650 */ 280, 280, 280, 280, 254, 280, 280, 280, 280, 280, + /* 640 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 650 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, /* 660 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, - /* 670 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 680 */ 269, 280, 269, 269, 269, 269, 269, 280, 280, 269, + /* 670 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 680 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 690 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 700 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 710 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 720 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 730 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 740 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 750 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 760 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 770 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 780 */ 280, 280, 280, 280, 280, 280, 280, 280, }; -#define YY_SHIFT_USE_DFLT (-59) -#define YY_SHIFT_COUNT (258) -#define YY_SHIFT_MIN (-58) -#define YY_SHIFT_MAX (427) -static const short yy_shift_ofst[] = { - /* 0 */ 161, 78, 197, 393, 201, 211, 333, 333, 333, 333, - /* 10 */ 333, 333, -1, 87, 211, 221, 221, 221, 249, 333, - /* 20 */ 333, 333, 181, 333, 333, 265, 427, 427, -59, 211, +#define YY_SHIFT_COUNT (258) +#define YY_SHIFT_MIN (0) +#define YY_SHIFT_MAX (564) +static const unsigned short int yy_shift_ofst[] = { + /* 0 */ 139, 25, 137, 5, 193, 211, 21, 21, 21, 21, + /* 10 */ 21, 21, 0, 22, 211, 283, 283, 283, 44, 21, + /* 20 */ 21, 21, 93, 21, 21, 188, 28, 28, 578, 211, /* 30 */ 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - /* 40 */ 211, 211, 211, 211, 211, 211, 211, 221, 221, 66, - /* 50 */ 66, 66, 66, 66, 66, 66, 236, 333, 235, 333, - /* 60 */ 333, 333, 117, 117, 92, 333, 333, 333, 333, 333, - /* 70 */ 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, - /* 80 */ 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, - /* 90 */ 333, 333, 333, 333, 333, 333, 333, 333, 333, 333, - /* 100 */ 333, 333, 333, 333, 333, 340, 375, 375, 394, 394, - /* 110 */ 394, 375, 390, 347, 353, 384, 350, 354, 352, 351, - /* 120 */ 323, 340, 375, 375, 375, 393, 375, 382, 381, 392, - /* 130 */ 380, 379, 391, 378, 368, 375, 355, 375, 355, 375, - /* 140 */ -59, -59, 26, 53, 53, 53, 81, 162, 214, 214, - /* 150 */ 214, -58, -32, -32, -32, -32, 219, 55, -5, 54, - /* 160 */ 18, 18, -56, -35, 232, 226, 225, 224, 215, 209, - /* 170 */ 313, 312, 88, -28, 3, 123, -3, 207, 206, 193, - /* 180 */ 82, 203, 61, 293, 204, 20, -27, 425, 290, 423, - /* 190 */ 422, 287, 419, 418, 336, 284, 309, 320, 310, 319, - /* 200 */ 318, 317, 412, 316, 311, 315, 305, 292, 302, 289, - /* 210 */ 304, 303, 295, 299, 297, 296, 294, 291, 321, 389, - /* 220 */ 388, 387, 386, 385, 383, 308, 374, 314, 370, 251, - /* 230 */ 250, 273, 377, 376, 279, 273, 373, 372, 371, 369, - /* 240 */ 367, 366, 365, 364, 363, 362, 361, 360, 359, 358, - /* 250 */ 357, 356, 254, 282, 337, 124, 24, 104, 41, + /* 40 */ 211, 211, 211, 211, 211, 211, 211, 283, 283, 2, + /* 50 */ 2, 2, 2, 2, 2, 2, 212, 21, 153, 21, + /* 60 */ 21, 21, 95, 95, 213, 21, 21, 21, 21, 21, + /* 70 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + /* 80 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + /* 90 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + /* 100 */ 21, 21, 21, 21, 21, 296, 366, 366, 289, 289, + /* 110 */ 289, 366, 303, 322, 326, 333, 330, 336, 338, 340, + /* 120 */ 329, 296, 366, 366, 366, 5, 366, 375, 377, 412, + /* 130 */ 382, 381, 411, 384, 387, 366, 391, 366, 391, 366, + /* 140 */ 578, 578, 27, 70, 70, 70, 129, 154, 245, 245, + /* 150 */ 245, 233, 276, 276, 276, 276, 236, 261, 106, 59, + /* 160 */ 294, 294, 138, 190, 217, 175, 234, 235, 237, 241, + /* 170 */ 339, 343, 290, 275, 150, 231, 239, 248, 250, 252, + /* 180 */ 227, 262, 238, 360, 361, 299, 315, 463, 332, 464, + /* 190 */ 469, 337, 472, 474, 394, 351, 374, 383, 380, 395, + /* 200 */ 386, 400, 502, 404, 408, 414, 409, 398, 413, 399, + /* 210 */ 417, 420, 415, 421, 422, 423, 424, 425, 451, 517, + /* 220 */ 523, 525, 526, 527, 528, 457, 520, 465, 521, 403, + /* 230 */ 406, 434, 536, 537, 442, 434, 539, 540, 541, 542, + /* 240 */ 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, + /* 250 */ 553, 554, 454, 484, 555, 556, 503, 505, 564, }; -#define YY_REDUCE_USE_DFLT (-212) #define YY_REDUCE_COUNT (141) -#define YY_REDUCE_MIN (-211) -#define YY_REDUCE_MAX (420) +#define YY_REDUCE_MIN (-269) +#define YY_REDUCE_MAX (285) static const short yy_reduce_ofst[] = { - /* 0 */ -190, -84, 33, -137, -19, -194, -7, -17, 51, 11, - /* 10 */ -29, -34, 139, 142, -211, 121, 119, 52, 85, 133, - /* 20 */ 131, 126, -205, 108, 95, 58, 25, -90, 68, 420, - /* 30 */ 417, 416, 415, 414, 413, 411, 410, 409, 408, 407, - /* 40 */ 406, 405, 404, 403, 402, 401, 260, 400, 262, 399, - /* 50 */ 398, 397, 396, 286, 285, 257, 259, 395, 256, 349, - /* 60 */ 348, 346, 255, 252, 253, 345, 344, 343, 342, 341, - /* 70 */ 339, 338, 335, 334, 332, 331, 330, 329, 328, 327, - /* 80 */ 326, 325, 324, 322, 307, 306, 301, 300, 298, 288, - /* 90 */ 283, 281, 280, 278, 277, 276, 275, 274, 272, 271, - /* 100 */ 270, 269, 268, 267, 266, 247, 263, 261, 246, 205, - /* 110 */ 202, 258, 245, 244, 243, 241, 239, 208, 192, 238, - /* 120 */ 195, 194, 248, 242, 240, 237, 234, 233, 217, 231, - /* 130 */ 230, 210, 213, 229, 218, 228, 223, 227, 222, 220, - /* 140 */ 212, 216, + /* 0 */ -207, -103, 18, -42, -267, -177, -56, -114, -195, -67, + /* 10 */ -50, 14, -208, -164, -269, -174, -106, -8, -237, -182, + /* 20 */ -115, -41, 30, -29, -211, -133, 56, 68, 32, -261, + /* 30 */ -251, -223, -206, -143, -118, -93, -65, -19, 38, 83, + /* 40 */ 86, 92, 100, 105, 109, 110, 111, 15, 42, 134, + /* 50 */ 135, 136, 140, 141, 142, 144, 132, 171, 118, 178, + /* 60 */ 179, 180, 119, 120, 143, 183, 184, 186, 187, 189, + /* 70 */ 191, 192, 194, 195, 196, 197, 198, 199, 200, 201, + /* 80 */ 202, 203, 204, 205, 206, 207, 208, 209, 210, 214, + /* 90 */ 215, 216, 218, 219, 220, 221, 222, 223, 224, 225, + /* 100 */ 226, 228, 229, 230, 232, 155, 240, 242, 159, 169, + /* 110 */ 173, 243, 162, 185, 244, 246, 249, 251, 247, 254, + /* 120 */ 256, 253, 255, 257, 258, 259, 260, 263, 265, 264, + /* 130 */ 266, 268, 271, 272, 274, 267, 269, 273, 270, 284, + /* 140 */ 278, 285, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 675, 484, 473, 481, 664, 664, 675, 675, 675, 675, - /* 10 */ 675, 675, 587, 448, 664, 675, 675, 675, 675, 675, - /* 20 */ 675, 675, 481, 675, 675, 486, 486, 486, 582, 675, + /* 0 */ 675, 729, 718, 726, 909, 909, 675, 675, 675, 675, + /* 10 */ 675, 675, 832, 693, 909, 675, 675, 675, 675, 675, + /* 20 */ 675, 675, 726, 675, 675, 731, 731, 731, 827, 675, /* 30 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, /* 40 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, - /* 50 */ 675, 675, 675, 675, 675, 675, 675, 675, 589, 591, - /* 60 */ 593, 675, 611, 611, 580, 675, 675, 675, 675, 675, + /* 50 */ 675, 675, 675, 675, 675, 675, 675, 675, 834, 836, + /* 60 */ 838, 675, 856, 856, 825, 675, 675, 675, 675, 675, /* 70 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, - /* 80 */ 675, 675, 675, 675, 471, 675, 469, 675, 675, 675, - /* 90 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 458, - /* 100 */ 675, 675, 675, 675, 675, 675, 450, 450, 675, 675, - /* 110 */ 675, 450, 618, 622, 616, 604, 612, 603, 599, 598, - /* 120 */ 626, 675, 450, 450, 450, 481, 450, 502, 500, 498, - /* 130 */ 490, 496, 492, 494, 488, 450, 479, 450, 479, 450, - /* 140 */ 520, 536, 675, 627, 663, 617, 653, 652, 659, 651, - /* 150 */ 650, 675, 646, 647, 649, 648, 675, 675, 675, 675, - /* 160 */ 655, 654, 675, 675, 675, 675, 675, 675, 675, 675, - /* 170 */ 675, 675, 675, 629, 675, 623, 619, 675, 675, 675, - /* 180 */ 675, 546, 675, 675, 675, 675, 675, 675, 675, 675, - /* 190 */ 675, 675, 675, 675, 675, 675, 579, 675, 675, 590, - /* 200 */ 675, 675, 675, 675, 675, 675, 613, 675, 605, 675, - /* 210 */ 675, 675, 675, 675, 556, 675, 675, 675, 675, 675, + /* 80 */ 675, 675, 675, 675, 716, 675, 714, 675, 675, 675, + /* 90 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 703, + /* 100 */ 675, 675, 675, 675, 675, 675, 695, 695, 675, 675, + /* 110 */ 675, 695, 863, 867, 861, 849, 857, 848, 844, 843, + /* 120 */ 871, 675, 695, 695, 695, 726, 695, 747, 745, 743, + /* 130 */ 735, 741, 737, 739, 733, 695, 724, 695, 724, 695, + /* 140 */ 765, 781, 675, 872, 908, 862, 898, 897, 904, 896, + /* 150 */ 895, 675, 891, 892, 894, 893, 675, 675, 675, 675, + /* 160 */ 900, 899, 675, 675, 675, 675, 675, 675, 675, 675, + /* 170 */ 675, 675, 675, 874, 675, 868, 864, 675, 675, 675, + /* 180 */ 675, 791, 675, 675, 675, 675, 675, 675, 675, 675, + /* 190 */ 675, 675, 675, 675, 675, 675, 824, 675, 675, 835, + /* 200 */ 675, 675, 675, 675, 675, 675, 858, 675, 850, 675, + /* 210 */ 675, 675, 675, 675, 801, 675, 675, 675, 675, 675, /* 220 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, - /* 230 */ 675, 668, 675, 675, 675, 666, 675, 675, 675, 675, + /* 230 */ 675, 913, 675, 675, 675, 911, 675, 675, 675, 675, /* 240 */ 675, 675, 675, 675, 675, 675, 675, 675, 675, 675, - /* 250 */ 675, 675, 505, 675, 456, 454, 675, 446, 675, 674, - /* 260 */ 673, 672, 665, 578, 577, 576, 575, 588, 584, 586, - /* 270 */ 585, 583, 592, 594, 581, 597, 596, 601, 600, 602, - /* 280 */ 595, 615, 614, 607, 608, 610, 609, 606, 643, 661, - /* 290 */ 662, 660, 658, 657, 656, 642, 641, 640, 639, 638, - /* 300 */ 635, 637, 634, 636, 633, 632, 631, 630, 628, 645, - /* 310 */ 644, 625, 624, 621, 620, 574, 559, 557, 554, 558, - /* 320 */ 555, 552, 485, 535, 534, 533, 532, 531, 530, 529, - /* 330 */ 528, 527, 526, 525, 524, 523, 522, 521, 517, 513, - /* 340 */ 511, 510, 509, 506, 480, 483, 482, 671, 670, 669, - /* 350 */ 667, 561, 562, 548, 551, 550, 549, 547, 560, 504, - /* 360 */ 503, 501, 499, 491, 497, 493, 495, 489, 487, 475, - /* 370 */ 474, 545, 544, 543, 542, 541, 540, 539, 538, 537, - /* 380 */ 519, 518, 516, 515, 514, 512, 508, 507, 564, 573, - /* 390 */ 572, 571, 570, 569, 568, 567, 566, 565, 563, 472, - /* 400 */ 470, 468, 467, 466, 465, 464, 463, 462, 461, 478, - /* 410 */ 460, 459, 457, 455, 453, 452, 477, 476, 451, 449, - /* 420 */ 447, 445, 444, 443, 442, 441, 440, 439, 438, 437, - /* 430 */ 436, 435, 434, + /* 250 */ 675, 675, 750, 675, 701, 699, 675, 691, 675, }; +/********** End of lemon-generated parsing tables *****************************/ -/* The next table maps tokens into fallback tokens. If a construct -** like the following: +/* The next table maps tokens (terminal symbols) into fallback tokens. +** If a construct like the following: ** ** %fallback ID X Y Z. ** @@ -420,6 +435,10 @@ static const YYACTIONTYPE yy_default[] = { ** and Z. Whenever one of the tokens X, Y, or Z is input to the parser ** but it does not parse, the type of the token is changed to ID and ** the parse is retried before an error is thrown. +** +** This feature can be used, for example, to cause some keywords in a language +** to revert to identifiers if they keyword does not apply in the context where +** it appears. */ #ifdef YYFALLBACK static const YYCODETYPE yyFallback[] = { @@ -647,9 +666,13 @@ static const YYCODETYPE yyFallback[] = { ** + The semantic value stored at this level of the stack. This is ** the information used by the action routines in the grammar. ** It is sometimes called the "minor" token. +** +** After the "shift" half of a SHIFTREDUCE action, the stateno field +** actually contains the reduce action for the second half of the +** SHIFTREDUCE. */ struct yyStackEntry { - YYACTIONTYPE stateno; /* The state-number */ + YYACTIONTYPE stateno; /* The state-number, or reduce action in SHIFTREDUCE */ YYCODETYPE major; /* The major token value. This is the code ** number for the token at this stack level */ YYMINORTYPE minor; /* The user-supplied minor token value. This @@ -660,17 +683,21 @@ typedef struct yyStackEntry yyStackEntry; /* The state of the parser is completely contained in an instance of ** the following structure */ struct yyParser { - int yyidx; /* Index of top element in stack */ + yyStackEntry *yytos; /* Pointer to top element of the stack */ #ifdef YYTRACKMAXSTACKDEPTH - int yyidxMax; /* Maximum value of yyidx */ + int yyhwm; /* High-water mark of the stack */ #endif +#ifndef YYNOERRORRECOVERY int yyerrcnt; /* Shifts left before out of the error */ +#endif ParseARG_SDECL /* A place to hold %extra_argument */ #if YYSTACKDEPTH<=0 int yystksz; /* Current side of the stack */ yyStackEntry *yystack; /* The parser's stack */ + yyStackEntry yystk0; /* First stack entry */ #else yyStackEntry yystack[YYSTACKDEPTH]; /* The parser's stack */ + yyStackEntry *yystackEnd; /* Last entry in the stack */ #endif }; typedef struct yyParser yyParser; @@ -707,82 +734,292 @@ void ParseTrace(FILE *TraceFILE, char *zTracePrompt){ } #endif /* NDEBUG */ -#ifndef NDEBUG +#if defined(YYCOVERAGE) || !defined(NDEBUG) /* For tracing shifts, the names of all terminals and nonterminals ** are required. The following table supplies these names */ static const char *const yyTokenName[] = { - "$", "ID", "BOOL", "TINYINT", - "SMALLINT", "INTEGER", "BIGINT", "FLOAT", - "DOUBLE", "STRING", "TIMESTAMP", "BINARY", - "NCHAR", "OR", "AND", "NOT", - "EQ", "NE", "ISNULL", "NOTNULL", - "IS", "LIKE", "GLOB", "BETWEEN", - "IN", "GT", "GE", "LT", - "LE", "BITAND", "BITOR", "LSHIFT", - "RSHIFT", "PLUS", "MINUS", "DIVIDE", - "TIMES", "STAR", "SLASH", "REM", - "CONCAT", "UMINUS", "UPLUS", "BITNOT", - "SHOW", "DATABASES", "MNODES", "DNODES", - "ACCOUNTS", "USERS", "MODULES", "QUERIES", - "CONNECTIONS", "STREAMS", "VARIABLES", "SCORES", - "GRANTS", "VNODES", "IPTOKEN", "DOT", - "CREATE", "TABLE", "DATABASE", "TABLES", - "STABLES", "VGROUPS", "DROP", "DNODE", - "USER", "ACCOUNT", "USE", "DESCRIBE", - "ALTER", "PASS", "PRIVILEGE", "LOCAL", - "IF", "EXISTS", "PPS", "TSERIES", - "DBS", "STORAGE", "QTIME", "CONNS", - "STATE", "KEEP", "CACHE", "REPLICA", - "QUORUM", "DAYS", "MINROWS", "MAXROWS", - "BLOCKS", "CTIME", "WAL", "FSYNC", - "COMP", "PRECISION", "UPDATE", "CACHELAST", - "LP", "RP", "UNSIGNED", "TAGS", - "USING", "AS", "COMMA", "NULL", - "SELECT", "UNION", "ALL", "DISTINCT", - "FROM", "VARIABLE", "INTERVAL", "FILL", - "SLIDING", "ORDER", "BY", "ASC", - "DESC", "GROUP", "HAVING", "LIMIT", - "OFFSET", "SLIMIT", "SOFFSET", "WHERE", - "NOW", "RESET", "QUERY", "ADD", - "COLUMN", "TAG", "CHANGE", "SET", - "KILL", "CONNECTION", "STREAM", "COLON", - "ABORT", "AFTER", "ATTACH", "BEFORE", - "BEGIN", "CASCADE", "CLUSTER", "CONFLICT", - "COPY", "DEFERRED", "DELIMITERS", "DETACH", - "EACH", "END", "EXPLAIN", "FAIL", - "FOR", "IGNORE", "IMMEDIATE", "INITIALLY", - "INSTEAD", "MATCH", "KEY", "OF", - "RAISE", "REPLACE", "RESTRICT", "ROW", - "STATEMENT", "TRIGGER", "VIEW", "COUNT", - "SUM", "AVG", "MIN", "MAX", - "FIRST", "LAST", "TOP", "BOTTOM", - "STDDEV", "PERCENTILE", "APERCENTILE", "LEASTSQUARES", - "HISTOGRAM", "DIFF", "SPREAD", "TWA", - "INTERP", "LAST_ROW", "RATE", "IRATE", - "SUM_RATE", "SUM_IRATE", "AVG_RATE", "AVG_IRATE", - "TBID", "SEMI", "NONE", "PREV", - "LINEAR", "IMPORT", "METRIC", "TBNAME", - "JOIN", "METRICS", "STABLE", "INSERT", - "INTO", "VALUES", "error", "program", - "cmd", "dbPrefix", "ids", "cpxName", - "ifexists", "alter_db_optr", "acct_optr", "ifnotexists", - "db_optr", "pps", "tseries", "dbs", - "streams", "storage", "qtime", "users", - "conns", "state", "keep", "tagitemlist", - "cache", "replica", "quorum", "days", - "minrows", "maxrows", "blocks", "ctime", - "wal", "fsync", "comp", "prec", - "update", "cachelast", "typename", "signed", - "create_table_args", "create_table_list", "create_from_stable", "columnlist", - "select", "column", "tagitem", "selcollist", - "from", "where_opt", "interval_opt", "fill_opt", - "sliding_opt", "groupby_opt", "orderby_opt", "having_opt", - "slimit_opt", "limit_opt", "union", "sclp", - "distinct", "expr", "as", "tablelist", - "tmvar", "sortlist", "sortitem", "item", - "sortorder", "grouplist", "exprlist", "expritem", + /* 0 */ "$", + /* 1 */ "ID", + /* 2 */ "BOOL", + /* 3 */ "TINYINT", + /* 4 */ "SMALLINT", + /* 5 */ "INTEGER", + /* 6 */ "BIGINT", + /* 7 */ "FLOAT", + /* 8 */ "DOUBLE", + /* 9 */ "STRING", + /* 10 */ "TIMESTAMP", + /* 11 */ "BINARY", + /* 12 */ "NCHAR", + /* 13 */ "OR", + /* 14 */ "AND", + /* 15 */ "NOT", + /* 16 */ "EQ", + /* 17 */ "NE", + /* 18 */ "ISNULL", + /* 19 */ "NOTNULL", + /* 20 */ "IS", + /* 21 */ "LIKE", + /* 22 */ "GLOB", + /* 23 */ "BETWEEN", + /* 24 */ "IN", + /* 25 */ "GT", + /* 26 */ "GE", + /* 27 */ "LT", + /* 28 */ "LE", + /* 29 */ "BITAND", + /* 30 */ "BITOR", + /* 31 */ "LSHIFT", + /* 32 */ "RSHIFT", + /* 33 */ "PLUS", + /* 34 */ "MINUS", + /* 35 */ "DIVIDE", + /* 36 */ "TIMES", + /* 37 */ "STAR", + /* 38 */ "SLASH", + /* 39 */ "REM", + /* 40 */ "CONCAT", + /* 41 */ "UMINUS", + /* 42 */ "UPLUS", + /* 43 */ "BITNOT", + /* 44 */ "SHOW", + /* 45 */ "DATABASES", + /* 46 */ "MNODES", + /* 47 */ "DNODES", + /* 48 */ "ACCOUNTS", + /* 49 */ "USERS", + /* 50 */ "MODULES", + /* 51 */ "QUERIES", + /* 52 */ "CONNECTIONS", + /* 53 */ "STREAMS", + /* 54 */ "VARIABLES", + /* 55 */ "SCORES", + /* 56 */ "GRANTS", + /* 57 */ "VNODES", + /* 58 */ "IPTOKEN", + /* 59 */ "DOT", + /* 60 */ "CREATE", + /* 61 */ "TABLE", + /* 62 */ "DATABASE", + /* 63 */ "TABLES", + /* 64 */ "STABLES", + /* 65 */ "VGROUPS", + /* 66 */ "DROP", + /* 67 */ "DNODE", + /* 68 */ "USER", + /* 69 */ "ACCOUNT", + /* 70 */ "USE", + /* 71 */ "DESCRIBE", + /* 72 */ "ALTER", + /* 73 */ "PASS", + /* 74 */ "PRIVILEGE", + /* 75 */ "LOCAL", + /* 76 */ "IF", + /* 77 */ "EXISTS", + /* 78 */ "PPS", + /* 79 */ "TSERIES", + /* 80 */ "DBS", + /* 81 */ "STORAGE", + /* 82 */ "QTIME", + /* 83 */ "CONNS", + /* 84 */ "STATE", + /* 85 */ "KEEP", + /* 86 */ "CACHE", + /* 87 */ "REPLICA", + /* 88 */ "QUORUM", + /* 89 */ "DAYS", + /* 90 */ "MINROWS", + /* 91 */ "MAXROWS", + /* 92 */ "BLOCKS", + /* 93 */ "CTIME", + /* 94 */ "WAL", + /* 95 */ "FSYNC", + /* 96 */ "COMP", + /* 97 */ "PRECISION", + /* 98 */ "UPDATE", + /* 99 */ "CACHELAST", + /* 100 */ "LP", + /* 101 */ "RP", + /* 102 */ "UNSIGNED", + /* 103 */ "TAGS", + /* 104 */ "USING", + /* 105 */ "AS", + /* 106 */ "COMMA", + /* 107 */ "NULL", + /* 108 */ "SELECT", + /* 109 */ "UNION", + /* 110 */ "ALL", + /* 111 */ "DISTINCT", + /* 112 */ "FROM", + /* 113 */ "VARIABLE", + /* 114 */ "INTERVAL", + /* 115 */ "FILL", + /* 116 */ "SLIDING", + /* 117 */ "ORDER", + /* 118 */ "BY", + /* 119 */ "ASC", + /* 120 */ "DESC", + /* 121 */ "GROUP", + /* 122 */ "HAVING", + /* 123 */ "LIMIT", + /* 124 */ "OFFSET", + /* 125 */ "SLIMIT", + /* 126 */ "SOFFSET", + /* 127 */ "WHERE", + /* 128 */ "NOW", + /* 129 */ "RESET", + /* 130 */ "QUERY", + /* 131 */ "ADD", + /* 132 */ "COLUMN", + /* 133 */ "TAG", + /* 134 */ "CHANGE", + /* 135 */ "SET", + /* 136 */ "KILL", + /* 137 */ "CONNECTION", + /* 138 */ "STREAM", + /* 139 */ "COLON", + /* 140 */ "ABORT", + /* 141 */ "AFTER", + /* 142 */ "ATTACH", + /* 143 */ "BEFORE", + /* 144 */ "BEGIN", + /* 145 */ "CASCADE", + /* 146 */ "CLUSTER", + /* 147 */ "CONFLICT", + /* 148 */ "COPY", + /* 149 */ "DEFERRED", + /* 150 */ "DELIMITERS", + /* 151 */ "DETACH", + /* 152 */ "EACH", + /* 153 */ "END", + /* 154 */ "EXPLAIN", + /* 155 */ "FAIL", + /* 156 */ "FOR", + /* 157 */ "IGNORE", + /* 158 */ "IMMEDIATE", + /* 159 */ "INITIALLY", + /* 160 */ "INSTEAD", + /* 161 */ "MATCH", + /* 162 */ "KEY", + /* 163 */ "OF", + /* 164 */ "RAISE", + /* 165 */ "REPLACE", + /* 166 */ "RESTRICT", + /* 167 */ "ROW", + /* 168 */ "STATEMENT", + /* 169 */ "TRIGGER", + /* 170 */ "VIEW", + /* 171 */ "COUNT", + /* 172 */ "SUM", + /* 173 */ "AVG", + /* 174 */ "MIN", + /* 175 */ "MAX", + /* 176 */ "FIRST", + /* 177 */ "LAST", + /* 178 */ "TOP", + /* 179 */ "BOTTOM", + /* 180 */ "STDDEV", + /* 181 */ "PERCENTILE", + /* 182 */ "APERCENTILE", + /* 183 */ "LEASTSQUARES", + /* 184 */ "HISTOGRAM", + /* 185 */ "DIFF", + /* 186 */ "SPREAD", + /* 187 */ "TWA", + /* 188 */ "INTERP", + /* 189 */ "LAST_ROW", + /* 190 */ "RATE", + /* 191 */ "IRATE", + /* 192 */ "SUM_RATE", + /* 193 */ "SUM_IRATE", + /* 194 */ "AVG_RATE", + /* 195 */ "AVG_IRATE", + /* 196 */ "TBID", + /* 197 */ "SEMI", + /* 198 */ "NONE", + /* 199 */ "PREV", + /* 200 */ "LINEAR", + /* 201 */ "IMPORT", + /* 202 */ "METRIC", + /* 203 */ "TBNAME", + /* 204 */ "JOIN", + /* 205 */ "METRICS", + /* 206 */ "STABLE", + /* 207 */ "INSERT", + /* 208 */ "INTO", + /* 209 */ "VALUES", + /* 210 */ "error", + /* 211 */ "program", + /* 212 */ "cmd", + /* 213 */ "dbPrefix", + /* 214 */ "ids", + /* 215 */ "cpxName", + /* 216 */ "ifexists", + /* 217 */ "alter_db_optr", + /* 218 */ "acct_optr", + /* 219 */ "ifnotexists", + /* 220 */ "db_optr", + /* 221 */ "pps", + /* 222 */ "tseries", + /* 223 */ "dbs", + /* 224 */ "streams", + /* 225 */ "storage", + /* 226 */ "qtime", + /* 227 */ "users", + /* 228 */ "conns", + /* 229 */ "state", + /* 230 */ "keep", + /* 231 */ "tagitemlist", + /* 232 */ "cache", + /* 233 */ "replica", + /* 234 */ "quorum", + /* 235 */ "days", + /* 236 */ "minrows", + /* 237 */ "maxrows", + /* 238 */ "blocks", + /* 239 */ "ctime", + /* 240 */ "wal", + /* 241 */ "fsync", + /* 242 */ "comp", + /* 243 */ "prec", + /* 244 */ "update", + /* 245 */ "cachelast", + /* 246 */ "typename", + /* 247 */ "signed", + /* 248 */ "create_table_args", + /* 249 */ "create_table_list", + /* 250 */ "create_from_stable", + /* 251 */ "columnlist", + /* 252 */ "select", + /* 253 */ "column", + /* 254 */ "tagitem", + /* 255 */ "selcollist", + /* 256 */ "from", + /* 257 */ "where_opt", + /* 258 */ "interval_opt", + /* 259 */ "fill_opt", + /* 260 */ "sliding_opt", + /* 261 */ "groupby_opt", + /* 262 */ "orderby_opt", + /* 263 */ "having_opt", + /* 264 */ "slimit_opt", + /* 265 */ "limit_opt", + /* 266 */ "union", + /* 267 */ "sclp", + /* 268 */ "distinct", + /* 269 */ "expr", + /* 270 */ "as", + /* 271 */ "tablelist", + /* 272 */ "tmvar", + /* 273 */ "sortlist", + /* 274 */ "sortitem", + /* 275 */ "item", + /* 276 */ "sortorder", + /* 277 */ "grouplist", + /* 278 */ "exprlist", + /* 279 */ "expritem", }; -#endif /* NDEBUG */ +#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ #ifndef NDEBUG /* For tracing reduce actions, the names of all rules are required. @@ -1036,27 +1273,74 @@ static const char *const yyRuleName[] = { #if YYSTACKDEPTH<=0 /* -** Try to increase the size of the parser stack. +** Try to increase the size of the parser stack. Return the number +** of errors. Return 0 on success. */ -static void yyGrowStack(yyParser *p){ +static int yyGrowStack(yyParser *p){ int newSize; + int idx; yyStackEntry *pNew; newSize = p->yystksz*2 + 100; - pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); + idx = p->yytos ? (int)(p->yytos - p->yystack) : 0; + if( p->yystack==&p->yystk0 ){ + pNew = malloc(newSize*sizeof(pNew[0])); + if( pNew ) pNew[0] = p->yystk0; + }else{ + pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); + } if( pNew ){ p->yystack = pNew; - p->yystksz = newSize; + p->yytos = &p->yystack[idx]; #ifndef NDEBUG if( yyTraceFILE ){ - fprintf(yyTraceFILE,"%sStack grows to %d entries!\n", - yyTracePrompt, p->yystksz); + fprintf(yyTraceFILE,"%sStack grows from %d to %d entries.\n", + yyTracePrompt, p->yystksz, newSize); } #endif + p->yystksz = newSize; } + return pNew==0; } #endif +/* Datatype of the argument to the memory allocated passed as the +** second argument to ParseAlloc() below. This can be changed by +** putting an appropriate #define in the %include section of the input +** grammar. +*/ +#ifndef YYMALLOCARGTYPE +# define YYMALLOCARGTYPE size_t +#endif + +/* Initialize a new parser that has already been allocated. +*/ +void ParseInit(void *yypParser){ + yyParser *pParser = (yyParser*)yypParser; +#ifdef YYTRACKMAXSTACKDEPTH + pParser->yyhwm = 0; +#endif +#if YYSTACKDEPTH<=0 + pParser->yytos = NULL; + pParser->yystack = NULL; + pParser->yystksz = 0; + if( yyGrowStack(pParser) ){ + pParser->yystack = &pParser->yystk0; + pParser->yystksz = 1; + } +#endif +#ifndef YYNOERRORRECOVERY + pParser->yyerrcnt = -1; +#endif + pParser->yytos = pParser->yystack; + pParser->yystack[0].stateno = 0; + pParser->yystack[0].major = 0; +#if YYSTACKDEPTH>0 + pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1]; +#endif +} + +#ifndef Parse_ENGINEALWAYSONSTACK /* ** This function allocates a new parser. ** The only argument is a pointer to a function which works like @@ -1069,27 +1353,21 @@ static void yyGrowStack(yyParser *p){ ** A pointer to a parser. This pointer is used in subsequent calls ** to Parse and ParseFree. */ -void *ParseAlloc(void *(*mallocProc)(size_t)){ +void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){ yyParser *pParser; - pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); - if( pParser ){ - pParser->yyidx = -1; -#ifdef YYTRACKMAXSTACKDEPTH - pParser->yyidxMax = 0; -#endif -#if YYSTACKDEPTH<=0 - pParser->yystack = NULL; - pParser->yystksz = 0; - yyGrowStack(pParser); -#endif - } + pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) ); + if( pParser ) ParseInit(pParser); return pParser; } +#endif /* Parse_ENGINEALWAYSONSTACK */ -/* The following function deletes the value associated with a -** symbol. The symbol can be either a terminal or nonterminal. -** "yymajor" is the symbol code, and "yypminor" is a pointer to -** the value. + +/* The following function deletes the "minor type" or semantic value +** associated with a symbol. The symbol can be either a terminal +** or nonterminal. "yymajor" is the symbol code, and "yypminor" is +** a pointer to the value to be deleted. The code used to do the +** deletions is derived from the %destructor and/or %token_destructor +** directives of the input grammar. */ static void yy_destructor( yyParser *yypParser, /* The parser */ @@ -1105,9 +1383,10 @@ static void yy_destructor( ** being destroyed before it is finished parsing. ** ** Note: during a reduce, the only symbols destroyed are those - ** which appear on the RHS of the rule, but which are not used + ** which appear on the RHS of the rule, but which are *not* used ** inside the C code. */ +/********* Begin destructor definitions ***************************************/ case 230: /* keep */ case 231: /* tagitemlist */ case 251: /* columnlist */ @@ -1117,32 +1396,24 @@ static void yy_destructor( case 273: /* sortlist */ case 277: /* grouplist */ { -#line 227 "sql.y" taosArrayDestroy((yypminor->yy221)); -#line 1123 "sql.c" } break; case 249: /* create_table_list */ { -#line 311 "sql.y" destroyCreateTableSql((yypminor->yy358)); -#line 1130 "sql.c" } break; case 252: /* select */ { -#line 418 "sql.y" doDestroyQuerySql((yypminor->yy344)); -#line 1137 "sql.c" } break; case 255: /* selcollist */ case 267: /* sclp */ case 278: /* exprlist */ { -#line 445 "sql.y" tSqlExprListDestroy((yypminor->yy178)); -#line 1146 "sql.c" } break; case 257: /* where_opt */ @@ -1150,25 +1421,20 @@ tSqlExprListDestroy((yypminor->yy178)); case 269: /* expr */ case 279: /* expritem */ { -#line 612 "sql.y" tSqlExprDestroy((yypminor->yy50)); -#line 1156 "sql.c" } break; case 266: /* union */ { -#line 424 "sql.y" destroyAllSelectClause((yypminor->yy273)); -#line 1163 "sql.c" } break; case 274: /* sortitem */ { -#line 545 "sql.y" tVariantDestroy(&(yypminor->yy106)); -#line 1170 "sql.c" } break; +/********* End destructor definitions *****************************************/ default: break; /* If no destructor action specified: do nothing */ } } @@ -1178,51 +1444,53 @@ tVariantDestroy(&(yypminor->yy106)); ** ** If there is a destructor routine associated with the token which ** is popped from the stack, then call it. -** -** Return the major token number for the symbol popped. */ -static int yy_pop_parser_stack(yyParser *pParser){ - YYCODETYPE yymajor; - yyStackEntry *yytos = &pParser->yystack[pParser->yyidx]; - - if( pParser->yyidx<0 ) return 0; +static void yy_pop_parser_stack(yyParser *pParser){ + yyStackEntry *yytos; + assert( pParser->yytos!=0 ); + assert( pParser->yytos > pParser->yystack ); + yytos = pParser->yytos--; #ifndef NDEBUG - if( yyTraceFILE && pParser->yyidx>=0 ){ + if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sPopping %s\n", yyTracePrompt, yyTokenName[yytos->major]); } #endif - yymajor = yytos->major; - yy_destructor(pParser, yymajor, &yytos->minor); - pParser->yyidx--; - return yymajor; + yy_destructor(pParser, yytos->major, &yytos->minor); } +/* +** Clear all secondary memory allocations from the parser +*/ +void ParseFinalize(void *p){ + yyParser *pParser = (yyParser*)p; + while( pParser->yytos>pParser->yystack ) yy_pop_parser_stack(pParser); +#if YYSTACKDEPTH<=0 + if( pParser->yystack!=&pParser->yystk0 ) free(pParser->yystack); +#endif +} + +#ifndef Parse_ENGINEALWAYSONSTACK /* -** Deallocate and destroy a parser. Destructors are all called for +** Deallocate and destroy a parser. Destructors are called for ** all stack elements before shutting the parser down. ** -** Inputs: -**
    -**
  • A pointer to the parser. This should be a pointer -** obtained from ParseAlloc. -**
  • A pointer to a function used to reclaim memory obtained -** from malloc. -**
+** If the YYPARSEFREENEVERNULL macro exists (for example because it +** is defined in a %include section of the input grammar) then it is +** assumed that the input pointer is never NULL. */ void ParseFree( void *p, /* The parser to be deleted */ void (*freeProc)(void*) /* Function used to reclaim memory */ ){ - yyParser *pParser = (yyParser*)p; - if( pParser==0 ) return; - while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser); -#if YYSTACKDEPTH<=0 - free(pParser->yystack); +#ifndef YYPARSEFREENEVERNULL + if( p==0 ) return; #endif - (*freeProc)((void*)pParser); + ParseFinalize(p); + (*freeProc)(p); } +#endif /* Parse_ENGINEALWAYSONSTACK */ /* ** Return the peak depth of the stack for a parser. @@ -1230,33 +1498,70 @@ void ParseFree( #ifdef YYTRACKMAXSTACKDEPTH int ParseStackPeak(void *p){ yyParser *pParser = (yyParser*)p; - return pParser->yyidxMax; + return pParser->yyhwm; +} +#endif + +/* This array of booleans keeps track of the parser statement +** coverage. The element yycoverage[X][Y] is set when the parser +** is in state X and has a lookahead token Y. In a well-tested +** systems, every element of this matrix should end up being set. +*/ +#if defined(YYCOVERAGE) +static unsigned char yycoverage[YYNSTATE][YYNTOKEN]; +#endif + +/* +** Write into out a description of every state/lookahead combination that +** +** (1) has not been used by the parser, and +** (2) is not a syntax error. +** +** Return the number of missed state/lookahead combinations. +*/ +#if defined(YYCOVERAGE) +int ParseCoverage(FILE *out){ + int stateno, iLookAhead, i; + int nMissed = 0; + for(stateno=0; statenoyystack[pParser->yyidx].stateno; + int stateno = pParser->yytos->stateno; - if( stateno>YY_SHIFT_COUNT - || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){ - return yy_default[stateno]; - } - assert( iLookAhead!=YYNOCODE ); - i += iLookAhead; - if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ - if( iLookAhead>0 ){ + if( stateno>YY_MAX_SHIFT ) return stateno; + assert( stateno <= YY_SHIFT_COUNT ); +#if defined(YYCOVERAGE) + yycoverage[stateno][iLookAhead] = 1; +#endif + do{ + i = yy_shift_ofst[stateno]; + assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) ); + assert( iLookAhead!=YYNOCODE ); + assert( iLookAhead < YYNTOKEN ); + i += iLookAhead; + if( yy_lookahead[i]!=iLookAhead ){ #ifdef YYFALLBACK YYCODETYPE iFallback; /* Fallback token */ if( iLookAhead=YY_ACTTAB_COUNT j0 ){ #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n", - yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]); + yyTracePrompt, yyTokenName[iLookAhead], + yyTokenName[YYWILDCARD]); } #endif /* NDEBUG */ return yy_action[j]; } } #endif /* YYWILDCARD */ + return yy_default[stateno]; + }else{ + return yy_action[i]; } - return yy_default[stateno]; - }else{ - return yy_action[i]; - } + }while(1); } /* ** Find the appropriate action for a parser given the non-terminal ** look-ahead token iLookAhead. -** -** If the look-ahead token is YYNOCODE, then check to see if the action is -** independent of the look-ahead. If it is, return the action, otherwise -** return YY_NO_ACTION. */ static int yy_find_reduce_action( int stateno, /* Current state number */ @@ -1320,7 +1624,6 @@ static int yy_find_reduce_action( assert( stateno<=YY_REDUCE_COUNT ); #endif i = yy_reduce_ofst[stateno]; - assert( i!=YY_REDUCE_USE_DFLT ); assert( iLookAhead!=YYNOCODE ); i += iLookAhead; #ifdef YYERRORSYMBOL @@ -1337,20 +1640,42 @@ static int yy_find_reduce_action( /* ** The following routine is called if the stack overflows. */ -static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){ +static void yyStackOverflow(yyParser *yypParser){ ParseARG_FETCH; - yypParser->yyidx--; #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); } #endif - while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); + while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will execute if the parser ** stack every overflows */ +/******** Begin %stack_overflow code ******************************************/ +/******** End %stack_overflow code ********************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument var */ } +/* +** Print tracing information for a SHIFT action +*/ +#ifndef NDEBUG +static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){ + if( yyTraceFILE ){ + if( yyNewStateyytos->major], + yyNewState); + }else{ + fprintf(yyTraceFILE,"%s%s '%s', pending reduce %d\n", + yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major], + yyNewState - YY_MIN_REDUCE); + } + } +} +#else +# define yyTraceShift(X,Y,Z) +#endif + /* ** Perform a shift action. */ @@ -1358,294 +1683,290 @@ static void yy_shift( yyParser *yypParser, /* The parser to be shifted */ int yyNewState, /* The new state to shift in */ int yyMajor, /* The major token to shift in */ - YYMINORTYPE *yypMinor /* Pointer to the minor token to shift in */ + ParseTOKENTYPE yyMinor /* The minor token to shift in */ ){ yyStackEntry *yytos; - yypParser->yyidx++; + yypParser->yytos++; #ifdef YYTRACKMAXSTACKDEPTH - if( yypParser->yyidx>yypParser->yyidxMax ){ - yypParser->yyidxMax = yypParser->yyidx; + if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ + yypParser->yyhwm++; + assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack) ); } #endif #if YYSTACKDEPTH>0 - if( yypParser->yyidx>=YYSTACKDEPTH ){ - yyStackOverflow(yypParser, yypMinor); + if( yypParser->yytos>yypParser->yystackEnd ){ + yypParser->yytos--; + yyStackOverflow(yypParser); return; } #else - if( yypParser->yyidx>=yypParser->yystksz ){ - yyGrowStack(yypParser); - if( yypParser->yyidx>=yypParser->yystksz ){ - yyStackOverflow(yypParser, yypMinor); + if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){ + if( yyGrowStack(yypParser) ){ + yypParser->yytos--; + yyStackOverflow(yypParser); return; } } #endif - yytos = &yypParser->yystack[yypParser->yyidx]; + if( yyNewState > YY_MAX_SHIFT ){ + yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE; + } + yytos = yypParser->yytos; yytos->stateno = (YYACTIONTYPE)yyNewState; yytos->major = (YYCODETYPE)yyMajor; - yytos->minor = *yypMinor; -#ifndef NDEBUG - if( yyTraceFILE && yypParser->yyidx>0 ){ - int i; - fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState); - fprintf(yyTraceFILE,"%sStack:",yyTracePrompt); - for(i=1; i<=yypParser->yyidx; i++) - fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]); - fprintf(yyTraceFILE,"\n"); - } -#endif + yytos->minor.yy0 = yyMinor; + yyTraceShift(yypParser, yyNewState, "Shift"); } /* The following table contains information about every rule that ** is used during the reduce. */ static const struct { - YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ - unsigned char nrhs; /* Number of right-hand side symbols in the rule */ + YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ + signed char nrhs; /* Negative of the number of RHS symbols in the rule */ } yyRuleInfo[] = { - { 211, 1 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 2 }, - { 212, 3 }, - { 213, 0 }, - { 213, 2 }, - { 215, 0 }, - { 215, 2 }, - { 212, 5 }, - { 212, 4 }, - { 212, 3 }, - { 212, 5 }, - { 212, 3 }, - { 212, 5 }, - { 212, 3 }, - { 212, 4 }, - { 212, 5 }, - { 212, 4 }, - { 212, 3 }, - { 212, 3 }, - { 212, 3 }, - { 212, 2 }, - { 212, 3 }, - { 212, 5 }, - { 212, 5 }, - { 212, 4 }, - { 212, 5 }, - { 212, 3 }, - { 212, 4 }, - { 212, 4 }, - { 212, 4 }, - { 212, 6 }, - { 214, 1 }, - { 214, 1 }, - { 216, 2 }, - { 216, 0 }, - { 219, 3 }, - { 219, 0 }, - { 212, 3 }, - { 212, 6 }, - { 212, 5 }, - { 212, 5 }, - { 221, 0 }, - { 221, 2 }, - { 222, 0 }, - { 222, 2 }, - { 223, 0 }, - { 223, 2 }, - { 224, 0 }, - { 224, 2 }, - { 225, 0 }, - { 225, 2 }, - { 226, 0 }, - { 226, 2 }, - { 227, 0 }, - { 227, 2 }, - { 228, 0 }, - { 228, 2 }, - { 229, 0 }, - { 229, 2 }, - { 218, 9 }, - { 230, 2 }, - { 232, 2 }, - { 233, 2 }, - { 234, 2 }, - { 235, 2 }, - { 236, 2 }, - { 237, 2 }, - { 238, 2 }, - { 239, 2 }, - { 240, 2 }, - { 241, 2 }, - { 242, 2 }, - { 243, 2 }, - { 244, 2 }, - { 245, 2 }, - { 220, 0 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 220, 2 }, - { 217, 0 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 217, 2 }, - { 246, 1 }, - { 246, 4 }, - { 246, 2 }, - { 247, 1 }, - { 247, 2 }, - { 247, 2 }, - { 212, 3 }, - { 212, 3 }, - { 249, 1 }, - { 249, 2 }, - { 248, 6 }, - { 248, 10 }, - { 250, 10 }, - { 248, 5 }, - { 251, 3 }, - { 251, 1 }, - { 253, 2 }, - { 231, 3 }, - { 231, 1 }, - { 254, 1 }, - { 254, 1 }, - { 254, 1 }, - { 254, 1 }, - { 254, 1 }, - { 254, 2 }, - { 254, 2 }, - { 254, 2 }, - { 254, 2 }, - { 252, 12 }, - { 266, 1 }, - { 266, 3 }, - { 266, 4 }, - { 266, 6 }, - { 212, 1 }, - { 252, 2 }, - { 267, 2 }, - { 267, 0 }, - { 255, 4 }, - { 255, 2 }, - { 270, 2 }, - { 270, 1 }, - { 270, 0 }, - { 268, 1 }, - { 268, 0 }, - { 256, 2 }, - { 271, 2 }, - { 271, 3 }, - { 271, 4 }, - { 271, 5 }, - { 272, 1 }, - { 258, 4 }, - { 258, 6 }, - { 258, 0 }, - { 259, 0 }, - { 259, 6 }, - { 259, 4 }, - { 260, 4 }, - { 260, 0 }, - { 262, 0 }, - { 262, 3 }, - { 273, 4 }, - { 273, 2 }, - { 275, 2 }, - { 276, 1 }, - { 276, 1 }, - { 276, 0 }, - { 261, 0 }, - { 261, 3 }, - { 277, 3 }, - { 277, 1 }, - { 263, 0 }, - { 263, 2 }, - { 265, 0 }, - { 265, 2 }, - { 265, 4 }, - { 265, 4 }, - { 264, 0 }, - { 264, 2 }, - { 264, 4 }, - { 264, 4 }, - { 257, 0 }, - { 257, 2 }, - { 269, 3 }, - { 269, 1 }, - { 269, 3 }, - { 269, 3 }, - { 269, 1 }, - { 269, 2 }, - { 269, 2 }, - { 269, 1 }, - { 269, 2 }, - { 269, 2 }, - { 269, 1 }, - { 269, 1 }, - { 269, 1 }, - { 269, 1 }, - { 269, 4 }, - { 269, 4 }, - { 269, 3 }, - { 269, 4 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 3 }, - { 269, 5 }, - { 278, 3 }, - { 278, 1 }, - { 279, 1 }, - { 279, 0 }, - { 212, 3 }, - { 212, 7 }, - { 212, 7 }, - { 212, 7 }, - { 212, 7 }, - { 212, 8 }, - { 212, 9 }, - { 212, 3 }, - { 212, 5 }, - { 212, 5 }, + { 211, -1 }, /* (0) program ::= cmd */ + { 212, -2 }, /* (1) cmd ::= SHOW DATABASES */ + { 212, -2 }, /* (2) cmd ::= SHOW MNODES */ + { 212, -2 }, /* (3) cmd ::= SHOW DNODES */ + { 212, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */ + { 212, -2 }, /* (5) cmd ::= SHOW USERS */ + { 212, -2 }, /* (6) cmd ::= SHOW MODULES */ + { 212, -2 }, /* (7) cmd ::= SHOW QUERIES */ + { 212, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */ + { 212, -2 }, /* (9) cmd ::= SHOW STREAMS */ + { 212, -2 }, /* (10) cmd ::= SHOW VARIABLES */ + { 212, -2 }, /* (11) cmd ::= SHOW SCORES */ + { 212, -2 }, /* (12) cmd ::= SHOW GRANTS */ + { 212, -2 }, /* (13) cmd ::= SHOW VNODES */ + { 212, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */ + { 213, 0 }, /* (15) dbPrefix ::= */ + { 213, -2 }, /* (16) dbPrefix ::= ids DOT */ + { 215, 0 }, /* (17) cpxName ::= */ + { 215, -2 }, /* (18) cpxName ::= DOT ids */ + { 212, -5 }, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */ + { 212, -4 }, /* (20) cmd ::= SHOW CREATE DATABASE ids */ + { 212, -3 }, /* (21) cmd ::= SHOW dbPrefix TABLES */ + { 212, -5 }, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + { 212, -3 }, /* (23) cmd ::= SHOW dbPrefix STABLES */ + { 212, -5 }, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + { 212, -3 }, /* (25) cmd ::= SHOW dbPrefix VGROUPS */ + { 212, -4 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */ + { 212, -5 }, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */ + { 212, -4 }, /* (28) cmd ::= DROP DATABASE ifexists ids */ + { 212, -3 }, /* (29) cmd ::= DROP DNODE ids */ + { 212, -3 }, /* (30) cmd ::= DROP USER ids */ + { 212, -3 }, /* (31) cmd ::= DROP ACCOUNT ids */ + { 212, -2 }, /* (32) cmd ::= USE ids */ + { 212, -3 }, /* (33) cmd ::= DESCRIBE ids cpxName */ + { 212, -5 }, /* (34) cmd ::= ALTER USER ids PASS ids */ + { 212, -5 }, /* (35) cmd ::= ALTER USER ids PRIVILEGE ids */ + { 212, -4 }, /* (36) cmd ::= ALTER DNODE ids ids */ + { 212, -5 }, /* (37) cmd ::= ALTER DNODE ids ids ids */ + { 212, -3 }, /* (38) cmd ::= ALTER LOCAL ids */ + { 212, -4 }, /* (39) cmd ::= ALTER LOCAL ids ids */ + { 212, -4 }, /* (40) cmd ::= ALTER DATABASE ids alter_db_optr */ + { 212, -4 }, /* (41) cmd ::= ALTER ACCOUNT ids acct_optr */ + { 212, -6 }, /* (42) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + { 214, -1 }, /* (43) ids ::= ID */ + { 214, -1 }, /* (44) ids ::= STRING */ + { 216, -2 }, /* (45) ifexists ::= IF EXISTS */ + { 216, 0 }, /* (46) ifexists ::= */ + { 219, -3 }, /* (47) ifnotexists ::= IF NOT EXISTS */ + { 219, 0 }, /* (48) ifnotexists ::= */ + { 212, -3 }, /* (49) cmd ::= CREATE DNODE ids */ + { 212, -6 }, /* (50) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + { 212, -5 }, /* (51) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + { 212, -5 }, /* (52) cmd ::= CREATE USER ids PASS ids */ + { 221, 0 }, /* (53) pps ::= */ + { 221, -2 }, /* (54) pps ::= PPS INTEGER */ + { 222, 0 }, /* (55) tseries ::= */ + { 222, -2 }, /* (56) tseries ::= TSERIES INTEGER */ + { 223, 0 }, /* (57) dbs ::= */ + { 223, -2 }, /* (58) dbs ::= DBS INTEGER */ + { 224, 0 }, /* (59) streams ::= */ + { 224, -2 }, /* (60) streams ::= STREAMS INTEGER */ + { 225, 0 }, /* (61) storage ::= */ + { 225, -2 }, /* (62) storage ::= STORAGE INTEGER */ + { 226, 0 }, /* (63) qtime ::= */ + { 226, -2 }, /* (64) qtime ::= QTIME INTEGER */ + { 227, 0 }, /* (65) users ::= */ + { 227, -2 }, /* (66) users ::= USERS INTEGER */ + { 228, 0 }, /* (67) conns ::= */ + { 228, -2 }, /* (68) conns ::= CONNS INTEGER */ + { 229, 0 }, /* (69) state ::= */ + { 229, -2 }, /* (70) state ::= STATE ids */ + { 218, -9 }, /* (71) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + { 230, -2 }, /* (72) keep ::= KEEP tagitemlist */ + { 232, -2 }, /* (73) cache ::= CACHE INTEGER */ + { 233, -2 }, /* (74) replica ::= REPLICA INTEGER */ + { 234, -2 }, /* (75) quorum ::= QUORUM INTEGER */ + { 235, -2 }, /* (76) days ::= DAYS INTEGER */ + { 236, -2 }, /* (77) minrows ::= MINROWS INTEGER */ + { 237, -2 }, /* (78) maxrows ::= MAXROWS INTEGER */ + { 238, -2 }, /* (79) blocks ::= BLOCKS INTEGER */ + { 239, -2 }, /* (80) ctime ::= CTIME INTEGER */ + { 240, -2 }, /* (81) wal ::= WAL INTEGER */ + { 241, -2 }, /* (82) fsync ::= FSYNC INTEGER */ + { 242, -2 }, /* (83) comp ::= COMP INTEGER */ + { 243, -2 }, /* (84) prec ::= PRECISION STRING */ + { 244, -2 }, /* (85) update ::= UPDATE INTEGER */ + { 245, -2 }, /* (86) cachelast ::= CACHELAST INTEGER */ + { 220, 0 }, /* (87) db_optr ::= */ + { 220, -2 }, /* (88) db_optr ::= db_optr cache */ + { 220, -2 }, /* (89) db_optr ::= db_optr replica */ + { 220, -2 }, /* (90) db_optr ::= db_optr quorum */ + { 220, -2 }, /* (91) db_optr ::= db_optr days */ + { 220, -2 }, /* (92) db_optr ::= db_optr minrows */ + { 220, -2 }, /* (93) db_optr ::= db_optr maxrows */ + { 220, -2 }, /* (94) db_optr ::= db_optr blocks */ + { 220, -2 }, /* (95) db_optr ::= db_optr ctime */ + { 220, -2 }, /* (96) db_optr ::= db_optr wal */ + { 220, -2 }, /* (97) db_optr ::= db_optr fsync */ + { 220, -2 }, /* (98) db_optr ::= db_optr comp */ + { 220, -2 }, /* (99) db_optr ::= db_optr prec */ + { 220, -2 }, /* (100) db_optr ::= db_optr keep */ + { 220, -2 }, /* (101) db_optr ::= db_optr update */ + { 220, -2 }, /* (102) db_optr ::= db_optr cachelast */ + { 217, 0 }, /* (103) alter_db_optr ::= */ + { 217, -2 }, /* (104) alter_db_optr ::= alter_db_optr replica */ + { 217, -2 }, /* (105) alter_db_optr ::= alter_db_optr quorum */ + { 217, -2 }, /* (106) alter_db_optr ::= alter_db_optr keep */ + { 217, -2 }, /* (107) alter_db_optr ::= alter_db_optr blocks */ + { 217, -2 }, /* (108) alter_db_optr ::= alter_db_optr comp */ + { 217, -2 }, /* (109) alter_db_optr ::= alter_db_optr wal */ + { 217, -2 }, /* (110) alter_db_optr ::= alter_db_optr fsync */ + { 217, -2 }, /* (111) alter_db_optr ::= alter_db_optr update */ + { 217, -2 }, /* (112) alter_db_optr ::= alter_db_optr cachelast */ + { 246, -1 }, /* (113) typename ::= ids */ + { 246, -4 }, /* (114) typename ::= ids LP signed RP */ + { 246, -2 }, /* (115) typename ::= ids UNSIGNED */ + { 247, -1 }, /* (116) signed ::= INTEGER */ + { 247, -2 }, /* (117) signed ::= PLUS INTEGER */ + { 247, -2 }, /* (118) signed ::= MINUS INTEGER */ + { 212, -3 }, /* (119) cmd ::= CREATE TABLE create_table_args */ + { 212, -3 }, /* (120) cmd ::= CREATE TABLE create_table_list */ + { 249, -1 }, /* (121) create_table_list ::= create_from_stable */ + { 249, -2 }, /* (122) create_table_list ::= create_table_list create_from_stable */ + { 248, -6 }, /* (123) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 248, -10 }, /* (124) create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 250, -10 }, /* (125) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + { 248, -5 }, /* (126) create_table_args ::= ifnotexists ids cpxName AS select */ + { 251, -3 }, /* (127) columnlist ::= columnlist COMMA column */ + { 251, -1 }, /* (128) columnlist ::= column */ + { 253, -2 }, /* (129) column ::= ids typename */ + { 231, -3 }, /* (130) tagitemlist ::= tagitemlist COMMA tagitem */ + { 231, -1 }, /* (131) tagitemlist ::= tagitem */ + { 254, -1 }, /* (132) tagitem ::= INTEGER */ + { 254, -1 }, /* (133) tagitem ::= FLOAT */ + { 254, -1 }, /* (134) tagitem ::= STRING */ + { 254, -1 }, /* (135) tagitem ::= BOOL */ + { 254, -1 }, /* (136) tagitem ::= NULL */ + { 254, -2 }, /* (137) tagitem ::= MINUS INTEGER */ + { 254, -2 }, /* (138) tagitem ::= MINUS FLOAT */ + { 254, -2 }, /* (139) tagitem ::= PLUS INTEGER */ + { 254, -2 }, /* (140) tagitem ::= PLUS FLOAT */ + { 252, -12 }, /* (141) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + { 266, -1 }, /* (142) union ::= select */ + { 266, -3 }, /* (143) union ::= LP union RP */ + { 266, -4 }, /* (144) union ::= union UNION ALL select */ + { 266, -6 }, /* (145) union ::= union UNION ALL LP select RP */ + { 212, -1 }, /* (146) cmd ::= union */ + { 252, -2 }, /* (147) select ::= SELECT selcollist */ + { 267, -2 }, /* (148) sclp ::= selcollist COMMA */ + { 267, 0 }, /* (149) sclp ::= */ + { 255, -4 }, /* (150) selcollist ::= sclp distinct expr as */ + { 255, -2 }, /* (151) selcollist ::= sclp STAR */ + { 270, -2 }, /* (152) as ::= AS ids */ + { 270, -1 }, /* (153) as ::= ids */ + { 270, 0 }, /* (154) as ::= */ + { 268, -1 }, /* (155) distinct ::= DISTINCT */ + { 268, 0 }, /* (156) distinct ::= */ + { 256, -2 }, /* (157) from ::= FROM tablelist */ + { 271, -2 }, /* (158) tablelist ::= ids cpxName */ + { 271, -3 }, /* (159) tablelist ::= ids cpxName ids */ + { 271, -4 }, /* (160) tablelist ::= tablelist COMMA ids cpxName */ + { 271, -5 }, /* (161) tablelist ::= tablelist COMMA ids cpxName ids */ + { 272, -1 }, /* (162) tmvar ::= VARIABLE */ + { 258, -4 }, /* (163) interval_opt ::= INTERVAL LP tmvar RP */ + { 258, -6 }, /* (164) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 258, 0 }, /* (165) interval_opt ::= */ + { 259, 0 }, /* (166) fill_opt ::= */ + { 259, -6 }, /* (167) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 259, -4 }, /* (168) fill_opt ::= FILL LP ID RP */ + { 260, -4 }, /* (169) sliding_opt ::= SLIDING LP tmvar RP */ + { 260, 0 }, /* (170) sliding_opt ::= */ + { 262, 0 }, /* (171) orderby_opt ::= */ + { 262, -3 }, /* (172) orderby_opt ::= ORDER BY sortlist */ + { 273, -4 }, /* (173) sortlist ::= sortlist COMMA item sortorder */ + { 273, -2 }, /* (174) sortlist ::= item sortorder */ + { 275, -2 }, /* (175) item ::= ids cpxName */ + { 276, -1 }, /* (176) sortorder ::= ASC */ + { 276, -1 }, /* (177) sortorder ::= DESC */ + { 276, 0 }, /* (178) sortorder ::= */ + { 261, 0 }, /* (179) groupby_opt ::= */ + { 261, -3 }, /* (180) groupby_opt ::= GROUP BY grouplist */ + { 277, -3 }, /* (181) grouplist ::= grouplist COMMA item */ + { 277, -1 }, /* (182) grouplist ::= item */ + { 263, 0 }, /* (183) having_opt ::= */ + { 263, -2 }, /* (184) having_opt ::= HAVING expr */ + { 265, 0 }, /* (185) limit_opt ::= */ + { 265, -2 }, /* (186) limit_opt ::= LIMIT signed */ + { 265, -4 }, /* (187) limit_opt ::= LIMIT signed OFFSET signed */ + { 265, -4 }, /* (188) limit_opt ::= LIMIT signed COMMA signed */ + { 264, 0 }, /* (189) slimit_opt ::= */ + { 264, -2 }, /* (190) slimit_opt ::= SLIMIT signed */ + { 264, -4 }, /* (191) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 264, -4 }, /* (192) slimit_opt ::= SLIMIT signed COMMA signed */ + { 257, 0 }, /* (193) where_opt ::= */ + { 257, -2 }, /* (194) where_opt ::= WHERE expr */ + { 269, -3 }, /* (195) expr ::= LP expr RP */ + { 269, -1 }, /* (196) expr ::= ID */ + { 269, -3 }, /* (197) expr ::= ID DOT ID */ + { 269, -3 }, /* (198) expr ::= ID DOT STAR */ + { 269, -1 }, /* (199) expr ::= INTEGER */ + { 269, -2 }, /* (200) expr ::= MINUS INTEGER */ + { 269, -2 }, /* (201) expr ::= PLUS INTEGER */ + { 269, -1 }, /* (202) expr ::= FLOAT */ + { 269, -2 }, /* (203) expr ::= MINUS FLOAT */ + { 269, -2 }, /* (204) expr ::= PLUS FLOAT */ + { 269, -1 }, /* (205) expr ::= STRING */ + { 269, -1 }, /* (206) expr ::= NOW */ + { 269, -1 }, /* (207) expr ::= VARIABLE */ + { 269, -1 }, /* (208) expr ::= BOOL */ + { 269, -4 }, /* (209) expr ::= ID LP exprlist RP */ + { 269, -4 }, /* (210) expr ::= ID LP STAR RP */ + { 269, -3 }, /* (211) expr ::= expr IS NULL */ + { 269, -4 }, /* (212) expr ::= expr IS NOT NULL */ + { 269, -3 }, /* (213) expr ::= expr LT expr */ + { 269, -3 }, /* (214) expr ::= expr GT expr */ + { 269, -3 }, /* (215) expr ::= expr LE expr */ + { 269, -3 }, /* (216) expr ::= expr GE expr */ + { 269, -3 }, /* (217) expr ::= expr NE expr */ + { 269, -3 }, /* (218) expr ::= expr EQ expr */ + { 269, -3 }, /* (219) expr ::= expr AND expr */ + { 269, -3 }, /* (220) expr ::= expr OR expr */ + { 269, -3 }, /* (221) expr ::= expr PLUS expr */ + { 269, -3 }, /* (222) expr ::= expr MINUS expr */ + { 269, -3 }, /* (223) expr ::= expr STAR expr */ + { 269, -3 }, /* (224) expr ::= expr SLASH expr */ + { 269, -3 }, /* (225) expr ::= expr REM expr */ + { 269, -3 }, /* (226) expr ::= expr LIKE expr */ + { 269, -5 }, /* (227) expr ::= expr IN LP exprlist RP */ + { 278, -3 }, /* (228) exprlist ::= exprlist COMMA expritem */ + { 278, -1 }, /* (229) exprlist ::= expritem */ + { 279, -1 }, /* (230) expritem ::= expr */ + { 279, 0 }, /* (231) expritem ::= */ + { 212, -3 }, /* (232) cmd ::= RESET QUERY CACHE */ + { 212, -7 }, /* (233) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 212, -7 }, /* (234) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 212, -7 }, /* (235) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 212, -7 }, /* (236) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 212, -8 }, /* (237) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 212, -9 }, /* (238) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 212, -3 }, /* (239) cmd ::= KILL CONNECTION INTEGER */ + { 212, -5 }, /* (240) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 212, -5 }, /* (241) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -1653,43 +1974,66 @@ static void yy_accept(yyParser*); /* Forward Declaration */ /* ** Perform a reduce action and the shift that must immediately ** follow the reduce. +** +** The yyLookahead and yyLookaheadToken parameters provide reduce actions +** access to the lookahead token (if any). The yyLookahead will be YYNOCODE +** if the lookahead token has already been consumed. As this procedure is +** only called from one place, optimizing compilers will in-line it, which +** means that the extra parameters have no performance impact. */ static void yy_reduce( yyParser *yypParser, /* The parser */ - int yyruleno /* Number of the rule by which to reduce */ + unsigned int yyruleno, /* Number of the rule by which to reduce */ + int yyLookahead, /* Lookahead token, or YYNOCODE if none */ + ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */ ){ int yygoto; /* The next state */ int yyact; /* The next action */ - YYMINORTYPE yygotominor; /* The LHS of the rule reduced */ yyStackEntry *yymsp; /* The top of the parser's stack */ int yysize; /* Amount to pop the stack */ ParseARG_FETCH; - yymsp = &yypParser->yystack[yypParser->yyidx]; + (void)yyLookahead; + (void)yyLookaheadToken; + yymsp = yypParser->yytos; #ifndef NDEBUG - if( yyTraceFILE && yyruleno>=0 - && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ - fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, - yyRuleName[yyruleno]); + if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ + yysize = yyRuleInfo[yyruleno].nrhs; + if( yysize ){ + fprintf(yyTraceFILE, "%sReduce %d [%s], go to state %d.\n", + yyTracePrompt, + yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno); + }else{ + fprintf(yyTraceFILE, "%sReduce %d [%s].\n", + yyTracePrompt, yyruleno, yyRuleName[yyruleno]); + } } #endif /* NDEBUG */ - /* Silence complaints from purify about yygotominor being uninitialized - ** in some cases when it is copied into the stack after the following - ** switch. yygotominor is uninitialized when a rule reduces that does - ** not set the value of its left-hand side nonterminal. Leaving the - ** value of the nonterminal uninitialized is utterly harmless as long - ** as the value is never used. So really the only thing this code - ** accomplishes is to quieten purify. - ** - ** 2007-01-16: The wireshark project (www.wireshark.org) reports that - ** without this code, their parser segfaults. I'm not sure what there - ** parser is doing to make this happen. This is the second bug report - ** from wireshark this week. Clearly they are stressing Lemon in ways - ** that it has not been previously stressed... (SQLite ticket #2172) - */ - /*memset(&yygotominor, 0, sizeof(yygotominor));*/ - yygotominor = yyzerominor; - + /* Check that the stack is large enough to grow by a single entry + ** if the RHS of the rule is empty. This ensures that there is room + ** enough on the stack to push the LHS value */ + if( yyRuleInfo[yyruleno].nrhs==0 ){ +#ifdef YYTRACKMAXSTACKDEPTH + if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ + yypParser->yyhwm++; + assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack)); + } +#endif +#if YYSTACKDEPTH>0 + if( yypParser->yytos>=yypParser->yystackEnd ){ + yyStackOverflow(yypParser); + return; + } +#else + if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){ + if( yyGrowStack(yypParser) ){ + yyStackOverflow(yypParser); + return; + } + yymsp = yypParser->yytos; + } +#endif + } switch( yyruleno ){ /* Beginning here are the reduction cases. A typical example @@ -1700,288 +2044,195 @@ static void yy_reduce( ** #line ** break; */ +/********** Begin reduce actions **********************************************/ + YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ -#line 63 "sql.y" + case 119: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==119); {} -#line 1707 "sql.c" break; case 1: /* cmd ::= SHOW DATABASES */ -#line 66 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_DB, 0, 0);} -#line 1712 "sql.c" break; case 2: /* cmd ::= SHOW MNODES */ -#line 67 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_MNODE, 0, 0);} -#line 1717 "sql.c" break; case 3: /* cmd ::= SHOW DNODES */ -#line 68 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_DNODE, 0, 0);} -#line 1722 "sql.c" break; case 4: /* cmd ::= SHOW ACCOUNTS */ -#line 69 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_ACCT, 0, 0);} -#line 1727 "sql.c" break; case 5: /* cmd ::= SHOW USERS */ -#line 70 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_USER, 0, 0);} -#line 1732 "sql.c" break; case 6: /* cmd ::= SHOW MODULES */ -#line 72 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_MODULE, 0, 0); } -#line 1737 "sql.c" break; case 7: /* cmd ::= SHOW QUERIES */ -#line 73 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0); } -#line 1742 "sql.c" break; case 8: /* cmd ::= SHOW CONNECTIONS */ -#line 74 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);} -#line 1747 "sql.c" break; case 9: /* cmd ::= SHOW STREAMS */ -#line 75 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0); } -#line 1752 "sql.c" break; case 10: /* cmd ::= SHOW VARIABLES */ -#line 76 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0); } -#line 1757 "sql.c" break; case 11: /* cmd ::= SHOW SCORES */ -#line 77 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0); } -#line 1762 "sql.c" break; case 12: /* cmd ::= SHOW GRANTS */ -#line 78 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0); } -#line 1767 "sql.c" break; case 13: /* cmd ::= SHOW VNODES */ -#line 80 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); } -#line 1772 "sql.c" break; case 14: /* cmd ::= SHOW VNODES IPTOKEN */ -#line 81 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); } -#line 1777 "sql.c" break; case 15: /* dbPrefix ::= */ -#line 85 "sql.y" -{yygotominor.yy0.n = 0; yygotominor.yy0.type = 0;} -#line 1782 "sql.c" +{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;} break; case 16: /* dbPrefix ::= ids DOT */ -#line 86 "sql.y" -{yygotominor.yy0 = yymsp[-1].minor.yy0; } -#line 1787 "sql.c" +{yylhsminor.yy0 = yymsp[-1].minor.yy0; } + yymsp[-1].minor.yy0 = yylhsminor.yy0; break; case 17: /* cpxName ::= */ -#line 89 "sql.y" -{yygotominor.yy0.n = 0; } -#line 1792 "sql.c" +{yymsp[1].minor.yy0.n = 0; } break; case 18: /* cpxName ::= DOT ids */ -#line 90 "sql.y" -{yygotominor.yy0 = yymsp[0].minor.yy0; yygotominor.yy0.n += 1; } -#line 1797 "sql.c" +{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1; } break; case 19: /* cmd ::= SHOW CREATE TABLE ids cpxName */ -#line 92 "sql.y" { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_TABLE, 1, &yymsp[-1].minor.yy0); } -#line 1805 "sql.c" break; case 20: /* cmd ::= SHOW CREATE DATABASE ids */ -#line 97 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_SHOW_CREATE_DATABASE, 1, &yymsp[0].minor.yy0); } -#line 1812 "sql.c" break; case 21: /* cmd ::= SHOW dbPrefix TABLES */ -#line 101 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-1].minor.yy0, 0); } -#line 1819 "sql.c" break; case 22: /* cmd ::= SHOW dbPrefix TABLES LIKE ids */ -#line 105 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_TABLE, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0); } -#line 1826 "sql.c" break; case 23: /* cmd ::= SHOW dbPrefix STABLES */ -#line 109 "sql.y" { setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &yymsp[-1].minor.yy0, 0); } -#line 1833 "sql.c" break; case 24: /* cmd ::= SHOW dbPrefix STABLES LIKE ids */ -#line 113 "sql.y" { SStrToken token; setDbName(&token, &yymsp[-3].minor.yy0); setShowOptions(pInfo, TSDB_MGMT_TABLE_METRIC, &token, &yymsp[0].minor.yy0); } -#line 1842 "sql.c" break; case 25: /* cmd ::= SHOW dbPrefix VGROUPS */ -#line 119 "sql.y" { SStrToken token; setDbName(&token, &yymsp[-1].minor.yy0); setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, 0); } -#line 1851 "sql.c" break; case 26: /* cmd ::= SHOW dbPrefix VGROUPS ids */ -#line 125 "sql.y" { SStrToken token; setDbName(&token, &yymsp[-2].minor.yy0); setShowOptions(pInfo, TSDB_MGMT_TABLE_VGROUP, &token, &yymsp[0].minor.yy0); } -#line 1860 "sql.c" break; case 27: /* cmd ::= DROP TABLE ifexists ids cpxName */ -#line 132 "sql.y" { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; setDropDbTableInfo(pInfo, TSDB_SQL_DROP_TABLE, &yymsp[-1].minor.yy0, &yymsp[-2].minor.yy0); } -#line 1868 "sql.c" break; case 28: /* cmd ::= DROP DATABASE ifexists ids */ -#line 137 "sql.y" { setDropDbTableInfo(pInfo, TSDB_SQL_DROP_DB, &yymsp[0].minor.yy0, &yymsp[-1].minor.yy0); } -#line 1873 "sql.c" break; case 29: /* cmd ::= DROP DNODE ids */ -#line 138 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_DROP_DNODE, 1, &yymsp[0].minor.yy0); } -#line 1878 "sql.c" break; case 30: /* cmd ::= DROP USER ids */ -#line 139 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_DROP_USER, 1, &yymsp[0].minor.yy0); } -#line 1883 "sql.c" break; case 31: /* cmd ::= DROP ACCOUNT ids */ -#line 140 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_DROP_ACCT, 1, &yymsp[0].minor.yy0); } -#line 1888 "sql.c" break; case 32: /* cmd ::= USE ids */ -#line 143 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_USE_DB, 1, &yymsp[0].minor.yy0);} -#line 1893 "sql.c" break; case 33: /* cmd ::= DESCRIBE ids cpxName */ -#line 146 "sql.y" { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; setDCLSQLElems(pInfo, TSDB_SQL_DESCRIBE_TABLE, 1, &yymsp[-1].minor.yy0); } -#line 1901 "sql.c" break; case 34: /* cmd ::= ALTER USER ids PASS ids */ -#line 152 "sql.y" { setAlterUserSql(pInfo, TSDB_ALTER_USER_PASSWD, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, NULL); } -#line 1906 "sql.c" break; case 35: /* cmd ::= ALTER USER ids PRIVILEGE ids */ -#line 153 "sql.y" { setAlterUserSql(pInfo, TSDB_ALTER_USER_PRIVILEGES, &yymsp[-2].minor.yy0, NULL, &yymsp[0].minor.yy0);} -#line 1911 "sql.c" break; case 36: /* cmd ::= ALTER DNODE ids ids */ -#line 154 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } -#line 1916 "sql.c" break; case 37: /* cmd ::= ALTER DNODE ids ids ids */ -#line 155 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } -#line 1921 "sql.c" break; case 38: /* cmd ::= ALTER LOCAL ids */ -#line 156 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &yymsp[0].minor.yy0); } -#line 1926 "sql.c" break; case 39: /* cmd ::= ALTER LOCAL ids ids */ -#line 157 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } -#line 1931 "sql.c" break; case 40: /* cmd ::= ALTER DATABASE ids alter_db_optr */ -#line 158 "sql.y" { SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy478, &t);} -#line 1936 "sql.c" break; case 41: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -#line 160 "sql.y" { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy79);} -#line 1941 "sql.c" break; case 42: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ -#line 161 "sql.y" { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy79);} -#line 1946 "sql.c" break; case 43: /* ids ::= ID */ case 44: /* ids ::= STRING */ yytestcase(yyruleno==44); -#line 167 "sql.y" -{yygotominor.yy0 = yymsp[0].minor.yy0; } -#line 1952 "sql.c" +{yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 45: /* ifexists ::= IF EXISTS */ - case 47: /* ifnotexists ::= IF NOT EXISTS */ yytestcase(yyruleno==47); -#line 171 "sql.y" -{ yygotominor.yy0.n = 1;} -#line 1958 "sql.c" +{ yymsp[-1].minor.yy0.n = 1;} break; case 46: /* ifexists ::= */ case 48: /* ifnotexists ::= */ yytestcase(yyruleno==48); case 156: /* distinct ::= */ yytestcase(yyruleno==156); -#line 172 "sql.y" -{ yygotominor.yy0.n = 0;} -#line 1965 "sql.c" +{ yymsp[1].minor.yy0.n = 0;} + break; + case 47: /* ifnotexists ::= IF NOT EXISTS */ +{ yymsp[-2].minor.yy0.n = 1;} break; case 49: /* cmd ::= CREATE DNODE ids */ -#line 180 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} -#line 1970 "sql.c" break; case 50: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ -#line 182 "sql.y" { setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy79);} -#line 1975 "sql.c" break; case 51: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -#line 183 "sql.y" { setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy478, &yymsp[-2].minor.yy0);} -#line 1980 "sql.c" break; case 52: /* cmd ::= CREATE USER ids PASS ids */ -#line 184 "sql.y" { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} -#line 1985 "sql.c" break; case 53: /* pps ::= */ case 55: /* tseries ::= */ yytestcase(yyruleno==55); @@ -1992,9 +2243,7 @@ static void yy_reduce( case 65: /* users ::= */ yytestcase(yyruleno==65); case 67: /* conns ::= */ yytestcase(yyruleno==67); case 69: /* state ::= */ yytestcase(yyruleno==69); -#line 186 "sql.y" -{ yygotominor.yy0.n = 0; } -#line 1998 "sql.c" +{ yymsp[1].minor.yy0.n = 0; } break; case 54: /* pps ::= PPS INTEGER */ case 56: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==56); @@ -2005,29 +2254,24 @@ static void yy_reduce( case 66: /* users ::= USERS INTEGER */ yytestcase(yyruleno==66); case 68: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==68); case 70: /* state ::= STATE ids */ yytestcase(yyruleno==70); -#line 187 "sql.y" -{ yygotominor.yy0 = yymsp[0].minor.yy0; } -#line 2011 "sql.c" +{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 71: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ -#line 214 "sql.y" { - yygotominor.yy79.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yygotominor.yy79.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yygotominor.yy79.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yygotominor.yy79.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yygotominor.yy79.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yygotominor.yy79.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yygotominor.yy79.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yygotominor.yy79.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yygotominor.yy79.stat = yymsp[0].minor.yy0; + yylhsminor.yy79.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy79.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy79.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy79.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy79.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy79.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy79.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy79.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy79.stat = yymsp[0].minor.yy0; } -#line 2026 "sql.c" + yymsp[-8].minor.yy79 = yylhsminor.yy79; break; case 72: /* keep ::= KEEP tagitemlist */ -#line 228 "sql.y" -{ yygotominor.yy221 = yymsp[0].minor.yy221; } -#line 2031 "sql.c" +{ yymsp[-1].minor.yy221 = yymsp[0].minor.yy221; } break; case 73: /* cache ::= CACHE INTEGER */ case 74: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==74); @@ -2043,742 +2287,599 @@ static void yy_reduce( case 84: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==84); case 85: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==85); case 86: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==86); -#line 230 "sql.y" -{ yygotominor.yy0 = yymsp[0].minor.yy0; } -#line 2049 "sql.c" +{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 87: /* db_optr ::= */ -#line 246 "sql.y" -{setDefaultCreateDbOption(&yygotominor.yy478);} -#line 2054 "sql.c" +{setDefaultCreateDbOption(&yymsp[1].minor.yy478);} break; case 88: /* db_optr ::= db_optr cache */ -#line 248 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2059 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 89: /* db_optr ::= db_optr replica */ case 104: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==104); -#line 249 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2065 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 90: /* db_optr ::= db_optr quorum */ case 105: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==105); -#line 250 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2071 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 91: /* db_optr ::= db_optr days */ -#line 251 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2076 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 92: /* db_optr ::= db_optr minrows */ -#line 252 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } -#line 2081 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 93: /* db_optr ::= db_optr maxrows */ -#line 253 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } -#line 2086 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 94: /* db_optr ::= db_optr blocks */ case 107: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==107); -#line 254 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2092 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 95: /* db_optr ::= db_optr ctime */ -#line 255 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2097 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 96: /* db_optr ::= db_optr wal */ case 109: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==109); -#line 256 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2103 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 97: /* db_optr ::= db_optr fsync */ case 110: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==110); -#line 257 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2109 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 98: /* db_optr ::= db_optr comp */ case 108: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==108); -#line 258 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2115 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 99: /* db_optr ::= db_optr prec */ -#line 259 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.precision = yymsp[0].minor.yy0; } -#line 2120 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 100: /* db_optr ::= db_optr keep */ case 106: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==106); -#line 260 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.keep = yymsp[0].minor.yy221; } -#line 2126 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.keep = yymsp[0].minor.yy221; } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 101: /* db_optr ::= db_optr update */ case 111: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==111); -#line 261 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2132 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 102: /* db_optr ::= db_optr cachelast */ case 112: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==112); -#line 262 "sql.y" -{ yygotominor.yy478 = yymsp[-1].minor.yy478; yygotominor.yy478.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2138 "sql.c" +{ yylhsminor.yy478 = yymsp[-1].minor.yy478; yylhsminor.yy478.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy478 = yylhsminor.yy478; break; case 103: /* alter_db_optr ::= */ -#line 265 "sql.y" -{ setDefaultCreateDbOption(&yygotominor.yy478);} -#line 2143 "sql.c" +{ setDefaultCreateDbOption(&yymsp[1].minor.yy478);} break; case 113: /* typename ::= ids */ -#line 278 "sql.y" { yymsp[0].minor.yy0.type = 0; - tSqlSetColumnType (&yygotominor.yy503, &yymsp[0].minor.yy0); + tSqlSetColumnType (&yylhsminor.yy503, &yymsp[0].minor.yy0); } -#line 2151 "sql.c" + yymsp[0].minor.yy503 = yylhsminor.yy503; break; case 114: /* typename ::= ids LP signed RP */ -#line 284 "sql.y" { if (yymsp[-1].minor.yy109 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSqlSetColumnType(&yygotominor.yy503, &yymsp[-3].minor.yy0); + tSqlSetColumnType(&yylhsminor.yy503, &yymsp[-3].minor.yy0); } else { yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy109; // negative value of name length - tSqlSetColumnType(&yygotominor.yy503, &yymsp[-3].minor.yy0); + tSqlSetColumnType(&yylhsminor.yy503, &yymsp[-3].minor.yy0); } } -#line 2164 "sql.c" + yymsp[-3].minor.yy503 = yylhsminor.yy503; break; case 115: /* typename ::= ids UNSIGNED */ -#line 295 "sql.y" { 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 (&yygotominor.yy503, &yymsp[-1].minor.yy0); + tSqlSetColumnType (&yylhsminor.yy503, &yymsp[-1].minor.yy0); } -#line 2173 "sql.c" + yymsp[-1].minor.yy503 = yylhsminor.yy503; break; case 116: /* signed ::= INTEGER */ - case 117: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==117); -#line 302 "sql.y" -{ yygotominor.yy109 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } -#line 2179 "sql.c" +{ yylhsminor.yy109 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy109 = yylhsminor.yy109; + break; + case 117: /* signed ::= PLUS INTEGER */ +{ yymsp[-1].minor.yy109 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 118: /* signed ::= MINUS INTEGER */ - case 119: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==119); -#line 304 "sql.y" -{ yygotominor.yy109 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} -#line 2185 "sql.c" +{ yymsp[-1].minor.yy109 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 120: /* cmd ::= CREATE TABLE create_table_list */ -#line 308 "sql.y" { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy358;} -#line 2190 "sql.c" break; case 121: /* create_table_list ::= create_from_stable */ -#line 312 "sql.y" { SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy416); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yygotominor.yy358 = pCreateTable; + yylhsminor.yy358 = pCreateTable; } -#line 2202 "sql.c" + yymsp[0].minor.yy358 = yylhsminor.yy358; break; case 122: /* create_table_list ::= create_table_list create_from_stable */ -#line 321 "sql.y" { taosArrayPush(yymsp[-1].minor.yy358->childTableInfo, &yymsp[0].minor.yy416); - yygotominor.yy358 = yymsp[-1].minor.yy358; + yylhsminor.yy358 = yymsp[-1].minor.yy358; } -#line 2210 "sql.c" + yymsp[-1].minor.yy358 = yylhsminor.yy358; break; case 123: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ -#line 327 "sql.y" { - yygotominor.yy358 = tSetCreateSqlElems(yymsp[-1].minor.yy221, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yygotominor.yy358, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy358 = tSetCreateSqlElems(yymsp[-1].minor.yy221, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy358, 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); } -#line 2221 "sql.c" + yymsp[-5].minor.yy358 = yylhsminor.yy358; break; case 124: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ -#line 336 "sql.y" { - yygotominor.yy358 = tSetCreateSqlElems(yymsp[-5].minor.yy221, yymsp[-1].minor.yy221, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yygotominor.yy358, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy358 = tSetCreateSqlElems(yymsp[-5].minor.yy221, yymsp[-1].minor.yy221, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy358, 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); } -#line 2232 "sql.c" + yymsp[-9].minor.yy358 = yylhsminor.yy358; break; case 125: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ -#line 347 "sql.y" { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; - yygotominor.yy416 = createNewChildTableInfo(&yymsp[-5].minor.yy0, yymsp[-1].minor.yy221, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy416 = createNewChildTableInfo(&yymsp[-5].minor.yy0, yymsp[-1].minor.yy221, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } -#line 2241 "sql.c" + yymsp[-9].minor.yy416 = yylhsminor.yy416; break; case 126: /* create_table_args ::= ifnotexists ids cpxName AS select */ -#line 355 "sql.y" { - yygotominor.yy358 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy344, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yygotominor.yy358, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy358 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy344, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy358, 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); } -#line 2252 "sql.c" + yymsp[-4].minor.yy358 = yylhsminor.yy358; break; case 127: /* columnlist ::= columnlist COMMA column */ -#line 366 "sql.y" -{taosArrayPush(yymsp[-2].minor.yy221, &yymsp[0].minor.yy503); yygotominor.yy221 = yymsp[-2].minor.yy221; } -#line 2257 "sql.c" +{taosArrayPush(yymsp[-2].minor.yy221, &yymsp[0].minor.yy503); yylhsminor.yy221 = yymsp[-2].minor.yy221; } + yymsp[-2].minor.yy221 = yylhsminor.yy221; break; case 128: /* columnlist ::= column */ -#line 367 "sql.y" -{yygotominor.yy221 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yygotominor.yy221, &yymsp[0].minor.yy503);} -#line 2262 "sql.c" +{yylhsminor.yy221 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy221, &yymsp[0].minor.yy503);} + yymsp[0].minor.yy221 = yylhsminor.yy221; break; case 129: /* column ::= ids typename */ -#line 371 "sql.y" { - tSqlSetColumnInfo(&yygotominor.yy503, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy503); + tSqlSetColumnInfo(&yylhsminor.yy503, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy503); } -#line 2269 "sql.c" + yymsp[-1].minor.yy503 = yylhsminor.yy503; break; case 130: /* tagitemlist ::= tagitemlist COMMA tagitem */ -#line 379 "sql.y" -{ yygotominor.yy221 = tVariantListAppend(yymsp[-2].minor.yy221, &yymsp[0].minor.yy106, -1); } -#line 2274 "sql.c" +{ yylhsminor.yy221 = tVariantListAppend(yymsp[-2].minor.yy221, &yymsp[0].minor.yy106, -1); } + yymsp[-2].minor.yy221 = yylhsminor.yy221; break; case 131: /* tagitemlist ::= tagitem */ -#line 380 "sql.y" -{ yygotominor.yy221 = tVariantListAppend(NULL, &yymsp[0].minor.yy106, -1); } -#line 2279 "sql.c" +{ yylhsminor.yy221 = tVariantListAppend(NULL, &yymsp[0].minor.yy106, -1); } + yymsp[0].minor.yy221 = yylhsminor.yy221; break; case 132: /* tagitem ::= INTEGER */ case 133: /* tagitem ::= FLOAT */ yytestcase(yyruleno==133); case 134: /* tagitem ::= STRING */ yytestcase(yyruleno==134); case 135: /* tagitem ::= BOOL */ yytestcase(yyruleno==135); -#line 382 "sql.y" -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yygotominor.yy106, &yymsp[0].minor.yy0); } -#line 2287 "sql.c" +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy106, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy106 = yylhsminor.yy106; break; case 136: /* tagitem ::= NULL */ -#line 386 "sql.y" -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yygotominor.yy106, &yymsp[0].minor.yy0); } -#line 2292 "sql.c" +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy106, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy106 = yylhsminor.yy106; break; case 137: /* tagitem ::= MINUS INTEGER */ case 138: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==138); case 139: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==139); case 140: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==140); -#line 388 "sql.y" { 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(&yygotominor.yy106, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy106, &yymsp[-1].minor.yy0); } -#line 2305 "sql.c" + yymsp[-1].minor.yy106 = yylhsminor.yy106; break; case 141: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ -#line 419 "sql.y" { - yygotominor.yy344 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy178, yymsp[-9].minor.yy221, yymsp[-8].minor.yy50, yymsp[-4].minor.yy221, yymsp[-3].minor.yy221, &yymsp[-7].minor.yy280, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy221, &yymsp[0].minor.yy454, &yymsp[-1].minor.yy454); + yylhsminor.yy344 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy178, yymsp[-9].minor.yy221, yymsp[-8].minor.yy50, yymsp[-4].minor.yy221, yymsp[-3].minor.yy221, &yymsp[-7].minor.yy280, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy221, &yymsp[0].minor.yy454, &yymsp[-1].minor.yy454); } -#line 2312 "sql.c" + yymsp[-11].minor.yy344 = yylhsminor.yy344; break; case 142: /* union ::= select */ -#line 426 "sql.y" -{ yygotominor.yy273 = setSubclause(NULL, yymsp[0].minor.yy344); } -#line 2317 "sql.c" +{ yylhsminor.yy273 = setSubclause(NULL, yymsp[0].minor.yy344); } + yymsp[0].minor.yy273 = yylhsminor.yy273; break; case 143: /* union ::= LP union RP */ -#line 427 "sql.y" -{ yygotominor.yy273 = yymsp[-1].minor.yy273; } -#line 2322 "sql.c" +{ yymsp[-2].minor.yy273 = yymsp[-1].minor.yy273; } break; case 144: /* union ::= union UNION ALL select */ -#line 428 "sql.y" -{ yygotominor.yy273 = appendSelectClause(yymsp[-3].minor.yy273, yymsp[0].minor.yy344); } -#line 2327 "sql.c" +{ yylhsminor.yy273 = appendSelectClause(yymsp[-3].minor.yy273, yymsp[0].minor.yy344); } + yymsp[-3].minor.yy273 = yylhsminor.yy273; break; case 145: /* union ::= union UNION ALL LP select RP */ -#line 429 "sql.y" -{ yygotominor.yy273 = appendSelectClause(yymsp[-5].minor.yy273, yymsp[-1].minor.yy344); } -#line 2332 "sql.c" +{ yylhsminor.yy273 = appendSelectClause(yymsp[-5].minor.yy273, yymsp[-1].minor.yy344); } + yymsp[-5].minor.yy273 = yylhsminor.yy273; break; case 146: /* cmd ::= union */ -#line 431 "sql.y" { setSqlInfo(pInfo, yymsp[0].minor.yy273, NULL, TSDB_SQL_SELECT); } -#line 2337 "sql.c" break; case 147: /* select ::= SELECT selcollist */ -#line 437 "sql.y" { - yygotominor.yy344 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy178, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy344 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy178, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } -#line 2344 "sql.c" + yymsp[-1].minor.yy344 = yylhsminor.yy344; break; case 148: /* sclp ::= selcollist COMMA */ -#line 449 "sql.y" -{yygotominor.yy178 = yymsp[-1].minor.yy178;} -#line 2349 "sql.c" +{yylhsminor.yy178 = yymsp[-1].minor.yy178;} + yymsp[-1].minor.yy178 = yylhsminor.yy178; break; case 149: /* sclp ::= */ -#line 450 "sql.y" -{yygotominor.yy178 = 0;} -#line 2354 "sql.c" +{yymsp[1].minor.yy178 = 0;} break; case 150: /* selcollist ::= sclp distinct expr as */ -#line 451 "sql.y" { - yygotominor.yy178 = tSqlExprListAppend(yymsp[-3].minor.yy178, yymsp[-1].minor.yy50, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy178 = tSqlExprListAppend(yymsp[-3].minor.yy178, yymsp[-1].minor.yy50, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } -#line 2361 "sql.c" + yymsp[-3].minor.yy178 = yylhsminor.yy178; break; case 151: /* selcollist ::= sclp STAR */ -#line 455 "sql.y" { tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL); - yygotominor.yy178 = tSqlExprListAppend(yymsp[-1].minor.yy178, pNode, 0, 0); + yylhsminor.yy178 = tSqlExprListAppend(yymsp[-1].minor.yy178, pNode, 0, 0); } -#line 2369 "sql.c" + yymsp[-1].minor.yy178 = yylhsminor.yy178; break; case 152: /* as ::= AS ids */ - case 153: /* as ::= ids */ yytestcase(yyruleno==153); -#line 464 "sql.y" -{ yygotominor.yy0 = yymsp[0].minor.yy0; } -#line 2375 "sql.c" +{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } + break; + case 153: /* as ::= ids */ +{ yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 154: /* as ::= */ -#line 466 "sql.y" -{ yygotominor.yy0.n = 0; } -#line 2380 "sql.c" +{ yymsp[1].minor.yy0.n = 0; } break; case 155: /* distinct ::= DISTINCT */ -#line 469 "sql.y" -{ yygotominor.yy0 = yymsp[0].minor.yy0; } -#line 2385 "sql.c" +{ yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 157: /* from ::= FROM tablelist */ - case 172: /* orderby_opt ::= ORDER BY sortlist */ yytestcase(yyruleno==172); -#line 475 "sql.y" -{yygotominor.yy221 = yymsp[0].minor.yy221;} -#line 2391 "sql.c" +{yymsp[-1].minor.yy221 = yymsp[0].minor.yy221;} break; case 158: /* tablelist ::= ids cpxName */ -#line 478 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yygotominor.yy221 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); - yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[-1].minor.yy0, -1); // table alias name + yylhsminor.yy221 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(yylhsminor.yy221, &yymsp[-1].minor.yy0, -1); // table alias name } -#line 2401 "sql.c" + yymsp[-1].minor.yy221 = yylhsminor.yy221; break; case 159: /* tablelist ::= ids cpxName ids */ -#line 485 "sql.y" { toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type); yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yygotominor.yy221 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[0].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(yylhsminor.yy221, &yymsp[0].minor.yy0, -1); } -#line 2412 "sql.c" + yymsp[-2].minor.yy221 = yylhsminor.yy221; break; case 160: /* tablelist ::= tablelist COMMA ids cpxName */ -#line 493 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yygotominor.yy221 = tVariantListAppendToken(yymsp[-3].minor.yy221, &yymsp[-1].minor.yy0, -1); - yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(yymsp[-3].minor.yy221, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(yylhsminor.yy221, &yymsp[-1].minor.yy0, -1); } -#line 2422 "sql.c" + yymsp[-3].minor.yy221 = yylhsminor.yy221; break; case 161: /* tablelist ::= tablelist COMMA ids cpxName ids */ -#line 500 "sql.y" { toTSDBType(yymsp[-2].minor.yy0.type); toTSDBType(yymsp[0].minor.yy0.type); yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yygotominor.yy221 = tVariantListAppendToken(yymsp[-4].minor.yy221, &yymsp[-2].minor.yy0, -1); - yygotominor.yy221 = tVariantListAppendToken(yygotominor.yy221, &yymsp[0].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(yymsp[-4].minor.yy221, &yymsp[-2].minor.yy0, -1); + yylhsminor.yy221 = tVariantListAppendToken(yylhsminor.yy221, &yymsp[0].minor.yy0, -1); } -#line 2433 "sql.c" + yymsp[-4].minor.yy221 = yylhsminor.yy221; break; case 162: /* tmvar ::= VARIABLE */ -#line 510 "sql.y" -{yygotominor.yy0 = yymsp[0].minor.yy0;} -#line 2438 "sql.c" +{yylhsminor.yy0 = yymsp[0].minor.yy0;} + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 163: /* interval_opt ::= INTERVAL LP tmvar RP */ -#line 513 "sql.y" -{yygotominor.yy280.interval = yymsp[-1].minor.yy0; yygotominor.yy280.offset.n = 0; yygotominor.yy280.offset.z = NULL; yygotominor.yy280.offset.type = 0;} -#line 2443 "sql.c" +{yymsp[-3].minor.yy280.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy280.offset.n = 0; yymsp[-3].minor.yy280.offset.z = NULL; yymsp[-3].minor.yy280.offset.type = 0;} break; case 164: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -#line 514 "sql.y" -{yygotominor.yy280.interval = yymsp[-3].minor.yy0; yygotominor.yy280.offset = yymsp[-1].minor.yy0;} -#line 2448 "sql.c" +{yymsp[-5].minor.yy280.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy280.offset = yymsp[-1].minor.yy0;} break; case 165: /* interval_opt ::= */ -#line 515 "sql.y" -{memset(&yygotominor.yy280, 0, sizeof(yygotominor.yy280));} -#line 2453 "sql.c" +{memset(&yymsp[1].minor.yy280, 0, sizeof(yymsp[1].minor.yy280));} break; case 166: /* fill_opt ::= */ -#line 519 "sql.y" -{yygotominor.yy221 = 0; } -#line 2458 "sql.c" +{yymsp[1].minor.yy221 = 0; } break; case 167: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ -#line 520 "sql.y" { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); tVariantCreate(&A, &yymsp[-3].minor.yy0); tVariantListInsert(yymsp[-1].minor.yy221, &A, -1, 0); - yygotominor.yy221 = yymsp[-1].minor.yy221; + yymsp[-5].minor.yy221 = yymsp[-1].minor.yy221; } -#line 2470 "sql.c" break; case 168: /* fill_opt ::= FILL LP ID RP */ -#line 529 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); - yygotominor.yy221 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy221 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } -#line 2478 "sql.c" break; case 169: /* sliding_opt ::= SLIDING LP tmvar RP */ -#line 535 "sql.y" -{yygotominor.yy0 = yymsp[-1].minor.yy0; } -#line 2483 "sql.c" +{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; case 170: /* sliding_opt ::= */ -#line 536 "sql.y" -{yygotominor.yy0.n = 0; yygotominor.yy0.z = NULL; yygotominor.yy0.type = 0; } -#line 2488 "sql.c" +{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; case 171: /* orderby_opt ::= */ -#line 547 "sql.y" -{yygotominor.yy221 = 0;} -#line 2493 "sql.c" +{yymsp[1].minor.yy221 = 0;} + break; + case 172: /* orderby_opt ::= ORDER BY sortlist */ +{yymsp[-2].minor.yy221 = yymsp[0].minor.yy221;} break; case 173: /* sortlist ::= sortlist COMMA item sortorder */ -#line 550 "sql.y" { - yygotominor.yy221 = tVariantListAppend(yymsp[-3].minor.yy221, &yymsp[-1].minor.yy106, yymsp[0].minor.yy172); + yylhsminor.yy221 = tVariantListAppend(yymsp[-3].minor.yy221, &yymsp[-1].minor.yy106, yymsp[0].minor.yy172); } -#line 2500 "sql.c" + yymsp[-3].minor.yy221 = yylhsminor.yy221; break; case 174: /* sortlist ::= item sortorder */ -#line 554 "sql.y" { - yygotominor.yy221 = tVariantListAppend(NULL, &yymsp[-1].minor.yy106, yymsp[0].minor.yy172); + yylhsminor.yy221 = tVariantListAppend(NULL, &yymsp[-1].minor.yy106, yymsp[0].minor.yy172); } -#line 2507 "sql.c" + yymsp[-1].minor.yy221 = yylhsminor.yy221; break; case 175: /* item ::= ids cpxName */ -#line 559 "sql.y" { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yygotominor.yy106, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy106, &yymsp[-1].minor.yy0); } -#line 2517 "sql.c" + yymsp[-1].minor.yy106 = yylhsminor.yy106; break; case 176: /* sortorder ::= ASC */ - case 178: /* sortorder ::= */ yytestcase(yyruleno==178); -#line 567 "sql.y" -{ yygotominor.yy172 = TSDB_ORDER_ASC; } -#line 2523 "sql.c" +{ yymsp[0].minor.yy172 = TSDB_ORDER_ASC; } break; case 177: /* sortorder ::= DESC */ -#line 568 "sql.y" -{ yygotominor.yy172 = TSDB_ORDER_DESC;} -#line 2528 "sql.c" +{ yymsp[0].minor.yy172 = TSDB_ORDER_DESC;} + break; + case 178: /* sortorder ::= */ +{ yymsp[1].minor.yy172 = TSDB_ORDER_ASC; } break; case 179: /* groupby_opt ::= */ -#line 577 "sql.y" -{ yygotominor.yy221 = 0;} -#line 2533 "sql.c" +{ yymsp[1].minor.yy221 = 0;} break; case 180: /* groupby_opt ::= GROUP BY grouplist */ -#line 578 "sql.y" -{ yygotominor.yy221 = yymsp[0].minor.yy221;} -#line 2538 "sql.c" +{ yymsp[-2].minor.yy221 = yymsp[0].minor.yy221;} break; case 181: /* grouplist ::= grouplist COMMA item */ -#line 580 "sql.y" { - yygotominor.yy221 = tVariantListAppend(yymsp[-2].minor.yy221, &yymsp[0].minor.yy106, -1); + yylhsminor.yy221 = tVariantListAppend(yymsp[-2].minor.yy221, &yymsp[0].minor.yy106, -1); } -#line 2545 "sql.c" + yymsp[-2].minor.yy221 = yylhsminor.yy221; break; case 182: /* grouplist ::= item */ -#line 584 "sql.y" { - yygotominor.yy221 = tVariantListAppend(NULL, &yymsp[0].minor.yy106, -1); + yylhsminor.yy221 = tVariantListAppend(NULL, &yymsp[0].minor.yy106, -1); } -#line 2552 "sql.c" + yymsp[0].minor.yy221 = yylhsminor.yy221; break; case 183: /* having_opt ::= */ case 193: /* where_opt ::= */ yytestcase(yyruleno==193); case 231: /* expritem ::= */ yytestcase(yyruleno==231); -#line 591 "sql.y" -{yygotominor.yy50 = 0;} -#line 2559 "sql.c" +{yymsp[1].minor.yy50 = 0;} break; case 184: /* having_opt ::= HAVING expr */ case 194: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==194); - case 230: /* expritem ::= expr */ yytestcase(yyruleno==230); -#line 592 "sql.y" -{yygotominor.yy50 = yymsp[0].minor.yy50;} -#line 2566 "sql.c" +{yymsp[-1].minor.yy50 = yymsp[0].minor.yy50;} break; case 185: /* limit_opt ::= */ case 189: /* slimit_opt ::= */ yytestcase(yyruleno==189); -#line 596 "sql.y" -{yygotominor.yy454.limit = -1; yygotominor.yy454.offset = 0;} -#line 2572 "sql.c" +{yymsp[1].minor.yy454.limit = -1; yymsp[1].minor.yy454.offset = 0;} break; case 186: /* limit_opt ::= LIMIT signed */ case 190: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==190); -#line 597 "sql.y" -{yygotominor.yy454.limit = yymsp[0].minor.yy109; yygotominor.yy454.offset = 0;} -#line 2578 "sql.c" +{yymsp[-1].minor.yy454.limit = yymsp[0].minor.yy109; yymsp[-1].minor.yy454.offset = 0;} break; case 187: /* limit_opt ::= LIMIT signed OFFSET signed */ -#line 599 "sql.y" -{ yygotominor.yy454.limit = yymsp[-2].minor.yy109; yygotominor.yy454.offset = yymsp[0].minor.yy109;} -#line 2583 "sql.c" +{ yymsp[-3].minor.yy454.limit = yymsp[-2].minor.yy109; yymsp[-3].minor.yy454.offset = yymsp[0].minor.yy109;} break; case 188: /* limit_opt ::= LIMIT signed COMMA signed */ -#line 601 "sql.y" -{ yygotominor.yy454.limit = yymsp[0].minor.yy109; yygotominor.yy454.offset = yymsp[-2].minor.yy109;} -#line 2588 "sql.c" +{ yymsp[-3].minor.yy454.limit = yymsp[0].minor.yy109; yymsp[-3].minor.yy454.offset = yymsp[-2].minor.yy109;} break; case 191: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -#line 607 "sql.y" -{yygotominor.yy454.limit = yymsp[-2].minor.yy109; yygotominor.yy454.offset = yymsp[0].minor.yy109;} -#line 2593 "sql.c" +{yymsp[-3].minor.yy454.limit = yymsp[-2].minor.yy109; yymsp[-3].minor.yy454.offset = yymsp[0].minor.yy109;} break; case 192: /* slimit_opt ::= SLIMIT signed COMMA signed */ -#line 609 "sql.y" -{yygotominor.yy454.limit = yymsp[0].minor.yy109; yygotominor.yy454.offset = yymsp[-2].minor.yy109;} -#line 2598 "sql.c" +{yymsp[-3].minor.yy454.limit = yymsp[0].minor.yy109; yymsp[-3].minor.yy454.offset = yymsp[-2].minor.yy109;} break; case 195: /* expr ::= LP expr RP */ -#line 622 "sql.y" -{yygotominor.yy50 = yymsp[-1].minor.yy50; yygotominor.yy50->token.z = yymsp[-2].minor.yy0.z; yygotominor.yy50->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} -#line 2603 "sql.c" +{yylhsminor.yy50 = yymsp[-1].minor.yy50; yylhsminor.yy50->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy50->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 196: /* expr ::= ID */ -#line 624 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} -#line 2608 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 197: /* expr ::= ID DOT ID */ -#line 625 "sql.y" -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} -#line 2613 "sql.c" +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 198: /* expr ::= ID DOT STAR */ -#line 626 "sql.y" -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} -#line 2618 "sql.c" +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 199: /* expr ::= INTEGER */ -#line 628 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} -#line 2623 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 200: /* expr ::= MINUS INTEGER */ case 201: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==201); -#line 629 "sql.y" -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} -#line 2629 "sql.c" +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy50 = yylhsminor.yy50; break; case 202: /* expr ::= FLOAT */ -#line 631 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} -#line 2634 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 203: /* expr ::= MINUS FLOAT */ case 204: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==204); -#line 632 "sql.y" -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} -#line 2640 "sql.c" +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy50 = yylhsminor.yy50; break; case 205: /* expr ::= STRING */ -#line 634 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} -#line 2645 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 206: /* expr ::= NOW */ -#line 635 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } -#line 2650 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 207: /* expr ::= VARIABLE */ -#line 636 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} -#line 2655 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 208: /* expr ::= BOOL */ -#line 637 "sql.y" -{ yygotominor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} -#line 2660 "sql.c" +{ yylhsminor.yy50 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 209: /* expr ::= ID LP exprlist RP */ -#line 640 "sql.y" -{ yygotominor.yy50 = tSqlExprCreateFunction(yymsp[-1].minor.yy178, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } -#line 2665 "sql.c" +{ yylhsminor.yy50 = tSqlExprCreateFunction(yymsp[-1].minor.yy178, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy50 = yylhsminor.yy50; break; case 210: /* expr ::= ID LP STAR RP */ -#line 643 "sql.y" -{ yygotominor.yy50 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } -#line 2670 "sql.c" +{ yylhsminor.yy50 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy50 = yylhsminor.yy50; break; case 211: /* expr ::= expr IS NULL */ -#line 646 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, NULL, TK_ISNULL);} -#line 2675 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, NULL, TK_ISNULL);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 212: /* expr ::= expr IS NOT NULL */ -#line 647 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-3].minor.yy50, NULL, TK_NOTNULL);} -#line 2680 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-3].minor.yy50, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy50 = yylhsminor.yy50; break; case 213: /* expr ::= expr LT expr */ -#line 650 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LT);} -#line 2685 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LT);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 214: /* expr ::= expr GT expr */ -#line 651 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_GT);} -#line 2690 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_GT);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 215: /* expr ::= expr LE expr */ -#line 652 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LE);} -#line 2695 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LE);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 216: /* expr ::= expr GE expr */ -#line 653 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_GE);} -#line 2700 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_GE);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 217: /* expr ::= expr NE expr */ -#line 654 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_NE);} -#line 2705 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_NE);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 218: /* expr ::= expr EQ expr */ -#line 655 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_EQ);} -#line 2710 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_EQ);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 219: /* expr ::= expr AND expr */ -#line 657 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_AND);} -#line 2715 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_AND);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 220: /* expr ::= expr OR expr */ -#line 658 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_OR); } -#line 2720 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_OR); } + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 221: /* expr ::= expr PLUS expr */ -#line 661 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_PLUS); } -#line 2725 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_PLUS); } + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 222: /* expr ::= expr MINUS expr */ -#line 662 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_MINUS); } -#line 2730 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_MINUS); } + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 223: /* expr ::= expr STAR expr */ -#line 663 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_STAR); } -#line 2735 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_STAR); } + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 224: /* expr ::= expr SLASH expr */ -#line 664 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_DIVIDE);} -#line 2740 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_DIVIDE);} + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 225: /* expr ::= expr REM expr */ -#line 665 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_REM); } -#line 2745 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_REM); } + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 226: /* expr ::= expr LIKE expr */ -#line 668 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LIKE); } -#line 2750 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-2].minor.yy50, yymsp[0].minor.yy50, TK_LIKE); } + yymsp[-2].minor.yy50 = yylhsminor.yy50; break; case 227: /* expr ::= expr IN LP exprlist RP */ -#line 671 "sql.y" -{yygotominor.yy50 = tSqlExprCreate(yymsp[-4].minor.yy50, (tSQLExpr*)yymsp[-1].minor.yy178, TK_IN); } -#line 2755 "sql.c" +{yylhsminor.yy50 = tSqlExprCreate(yymsp[-4].minor.yy50, (tSQLExpr*)yymsp[-1].minor.yy178, TK_IN); } + yymsp[-4].minor.yy50 = yylhsminor.yy50; break; case 228: /* exprlist ::= exprlist COMMA expritem */ -#line 679 "sql.y" -{yygotominor.yy178 = tSqlExprListAppend(yymsp[-2].minor.yy178,yymsp[0].minor.yy50,0, 0);} -#line 2760 "sql.c" +{yylhsminor.yy178 = tSqlExprListAppend(yymsp[-2].minor.yy178,yymsp[0].minor.yy50,0, 0);} + yymsp[-2].minor.yy178 = yylhsminor.yy178; break; case 229: /* exprlist ::= expritem */ -#line 680 "sql.y" -{yygotominor.yy178 = tSqlExprListAppend(0,yymsp[0].minor.yy50,0, 0);} -#line 2765 "sql.c" +{yylhsminor.yy178 = tSqlExprListAppend(0,yymsp[0].minor.yy50,0, 0);} + yymsp[0].minor.yy178 = yylhsminor.yy178; + break; + case 230: /* expritem ::= expr */ +{yylhsminor.yy50 = yymsp[0].minor.yy50;} + yymsp[0].minor.yy50 = yylhsminor.yy50; break; case 232: /* cmd ::= RESET QUERY CACHE */ -#line 685 "sql.y" { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} -#line 2770 "sql.c" break; case 233: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ -#line 688 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy221, NULL, TSDB_ALTER_TABLE_ADD_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } -#line 2779 "sql.c" break; case 234: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ -#line 694 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2788,19 +2889,15 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, K, TSDB_ALTER_TABLE_DROP_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } -#line 2792 "sql.c" break; case 235: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ -#line 705 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy221, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } -#line 2801 "sql.c" break; case 236: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ -#line 710 "sql.y" { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2810,10 +2907,8 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, NULL, A, TSDB_ALTER_TABLE_DROP_TAG_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } -#line 2814 "sql.c" break; case 237: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ -#line 720 "sql.y" { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -2826,10 +2921,8 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-5].minor.yy0, NULL, A, TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } -#line 2830 "sql.c" break; case 238: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ -#line 733 "sql.y" { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -2840,51 +2933,37 @@ static void yy_reduce( SAlterTableSQL* pAlterTable = tAlterTableSqlElems(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } -#line 2844 "sql.c" break; case 239: /* cmd ::= KILL CONNECTION INTEGER */ -#line 745 "sql.y" {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} -#line 2849 "sql.c" break; case 240: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ -#line 746 "sql.y" {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} -#line 2854 "sql.c" break; case 241: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ -#line 747 "sql.y" {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} -#line 2859 "sql.c" break; default: break; +/********** End reduce actions ************************************************/ }; + assert( yyrulenoyyidx -= yysize; - yyact = yy_find_reduce_action(yymsp[-yysize].stateno,(YYCODETYPE)yygoto); - if( yyact < YYNSTATE ){ -#ifdef NDEBUG - /* If we are not debugging and the reduce action popped at least - ** one element off the stack, then we can push the new element back - ** onto the stack here, and skip the stack overflow test in yy_shift(). - ** That gives a significant speed improvement. */ - if( yysize ){ - yypParser->yyidx++; - yymsp -= yysize-1; - yymsp->stateno = (YYACTIONTYPE)yyact; - yymsp->major = (YYCODETYPE)yygoto; - yymsp->minor = yygotominor; - }else -#endif - { - yy_shift(yypParser,yyact,yygoto,&yygotominor); - } - }else{ - assert( yyact == YYNSTATE + YYNRULE + 1 ); - yy_accept(yypParser); - } + yyact = yy_find_reduce_action(yymsp[yysize].stateno,(YYCODETYPE)yygoto); + + /* There are no SHIFTREDUCE actions on nonterminals because the table + ** generator has simplified them to pure REDUCE actions. */ + assert( !(yyact>YY_MAX_SHIFT && yyact<=YY_MAX_SHIFTREDUCE) ); + + /* It is not possible for a REDUCE to be followed by an error */ + assert( yyact!=YY_ERROR_ACTION ); + + yymsp += yysize+1; + yypParser->yytos = yymsp; + yymsp->stateno = (YYACTIONTYPE)yyact; + yymsp->major = (YYCODETYPE)yygoto; + yyTraceShift(yypParser, yyact, "... then shift"); } /* @@ -2900,9 +2979,11 @@ static void yy_parse_failed( fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); } #endif - while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); + while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser fails */ +/************ Begin %parse_failure code ***************************************/ +/************ End %parse_failure code *****************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } #endif /* YYNOERRORRECOVERY */ @@ -2913,11 +2994,11 @@ static void yy_parse_failed( static void yy_syntax_error( yyParser *yypParser, /* The parser */ int yymajor, /* The major type of the error token */ - YYMINORTYPE yyminor /* The minor type of the error token */ + ParseTOKENTYPE yyminor /* The minor type of the error token */ ){ ParseARG_FETCH; -#define TOKEN (yyminor.yy0) -#line 37 "sql.y" +#define TOKEN yyminor +/************ Begin %syntax_error code ****************************************/ pInfo->valid = false; int32_t outputBufLen = tListLen(pInfo->pzErrMsg); @@ -2940,7 +3021,7 @@ static void yy_syntax_error( } assert(len <= outputBufLen); -#line 2944 "sql.c" +/************ End %syntax_error code ******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -2956,11 +3037,15 @@ static void yy_accept( fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); } #endif - while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); +#ifndef YYNOERRORRECOVERY + yypParser->yyerrcnt = -1; +#endif + assert( yypParser->yytos==yypParser->yystack ); /* Here code is inserted which will be executed whenever the ** parser accepts */ -#line 61 "sql.y" -#line 2964 "sql.c" +/*********** Begin %parse_accept code *****************************************/ + +/*********** End %parse_accept code *******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -2990,50 +3075,52 @@ void Parse( ParseARG_PDECL /* Optional %extra_argument parameter */ ){ YYMINORTYPE yyminorunion; - int yyact; /* The parser action. */ + unsigned int yyact; /* The parser action. */ +#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) int yyendofinput; /* True if we are at the end of input */ +#endif #ifdef YYERRORSYMBOL int yyerrorhit = 0; /* True if yymajor has invoked an error */ #endif yyParser *yypParser; /* The parser */ - /* (re)initialize the parser, if necessary */ yypParser = (yyParser*)yyp; - if( yypParser->yyidx<0 ){ -#if YYSTACKDEPTH<=0 - if( yypParser->yystksz <=0 ){ - /*memset(&yyminorunion, 0, sizeof(yyminorunion));*/ - yyminorunion = yyzerominor; - yyStackOverflow(yypParser, &yyminorunion); - return; - } -#endif - yypParser->yyidx = 0; - yypParser->yyerrcnt = -1; - yypParser->yystack[0].stateno = 0; - yypParser->yystack[0].major = 0; - } - yyminorunion.yy0 = yyminor; + assert( yypParser->yytos!=0 ); +#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) yyendofinput = (yymajor==0); +#endif ParseARG_STORE; #ifndef NDEBUG if( yyTraceFILE ){ - fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]); + int stateno = yypParser->yytos->stateno; + if( stateno < YY_MIN_REDUCE ){ + fprintf(yyTraceFILE,"%sInput '%s' in state %d\n", + yyTracePrompt,yyTokenName[yymajor],stateno); + }else{ + fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n", + yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE); + } } #endif do{ yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); - if( yyact= YY_MIN_REDUCE ){ + yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor); + }else if( yyact <= YY_MAX_SHIFTREDUCE ){ + yy_shift(yypParser,yyact,yymajor,yyminor); +#ifndef YYNOERRORRECOVERY yypParser->yyerrcnt--; +#endif yymajor = YYNOCODE; - }else if( yyact < YYNSTATE + YYNRULE ){ - yy_reduce(yypParser,yyact-YYNSTATE); + }else if( yyact==YY_ACCEPT_ACTION ){ + yypParser->yytos--; + yy_accept(yypParser); + return; }else{ assert( yyact == YY_ERROR_ACTION ); + yyminorunion.yy0 = yyminor; #ifdef YYERRORSYMBOL int yymx; #endif @@ -3063,9 +3150,9 @@ void Parse( ** */ if( yypParser->yyerrcnt<0 ){ - yy_syntax_error(yypParser,yymajor,yyminorunion); + yy_syntax_error(yypParser,yymajor,yyminor); } - yymx = yypParser->yystack[yypParser->yyidx].major; + yymx = yypParser->yytos->major; if( yymx==YYERRORSYMBOL || yyerrorhit ){ #ifndef NDEBUG if( yyTraceFILE ){ @@ -3073,26 +3160,26 @@ void Parse( yyTracePrompt,yyTokenName[yymajor]); } #endif - yy_destructor(yypParser, (YYCODETYPE)yymajor,&yyminorunion); + yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion); yymajor = YYNOCODE; }else{ - while( - yypParser->yyidx >= 0 && - yymx != YYERRORSYMBOL && - (yyact = yy_find_reduce_action( - yypParser->yystack[yypParser->yyidx].stateno, - YYERRORSYMBOL)) >= YYNSTATE + while( yypParser->yytos >= yypParser->yystack + && yymx != YYERRORSYMBOL + && (yyact = yy_find_reduce_action( + yypParser->yytos->stateno, + YYERRORSYMBOL)) >= YY_MIN_REDUCE ){ yy_pop_parser_stack(yypParser); } - if( yypParser->yyidx < 0 || yymajor==0 ){ + if( yypParser->yytos < yypParser->yystack || yymajor==0 ){ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yy_parse_failed(yypParser); +#ifndef YYNOERRORRECOVERY + yypParser->yyerrcnt = -1; +#endif yymajor = YYNOCODE; }else if( yymx!=YYERRORSYMBOL ){ - YYMINORTYPE u2; - u2.YYERRSYMDT = 0; - yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2); + yy_shift(yypParser,yyact,YYERRORSYMBOL,yyminor); } } yypParser->yyerrcnt = 3; @@ -3105,7 +3192,7 @@ void Parse( ** Applications can set this macro (for example inside %include) if ** they intend to abandon the parse upon the first syntax error seen. */ - yy_syntax_error(yypParser,yymajor,yyminorunion); + yy_syntax_error(yypParser,yymajor, yyminor); yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yymajor = YYNOCODE; @@ -3120,16 +3207,31 @@ void Parse( ** three input tokens have been successfully shifted. */ if( yypParser->yyerrcnt<=0 ){ - yy_syntax_error(yypParser,yymajor,yyminorunion); + yy_syntax_error(yypParser,yymajor, yyminor); } yypParser->yyerrcnt = 3; yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); if( yyendofinput ){ yy_parse_failed(yypParser); +#ifndef YYNOERRORRECOVERY + yypParser->yyerrcnt = -1; +#endif } yymajor = YYNOCODE; #endif } - }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 ); + }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack ); +#ifndef NDEBUG + if( yyTraceFILE ){ + yyStackEntry *i; + char cDiv = '['; + fprintf(yyTraceFILE,"%sReturn. Stack=",yyTracePrompt); + for(i=&yypParser->yystack[1]; i<=yypParser->yytos; i++){ + fprintf(yyTraceFILE,"%c%s", cDiv, yyTokenName[i->major]); + cDiv = ' '; + } + fprintf(yyTraceFILE,"]\n"); + } +#endif return; } From 0bca04440ff1d01f864670c9e8b82368142aabbd Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 14 Jan 2021 12:56:03 +0000 Subject: [PATCH 03/34] TD-2571 --- src/client/inc/tsclient.h | 2 ++ src/client/src/tscLocalMerge.c | 4 ++-- src/client/src/tscSQLParser.c | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index 900fab53a2..26a2502106 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -223,6 +223,8 @@ typedef struct SQueryInfo { int32_t udColumnId; // current user-defined constant output field column id, monotonically decreases from TSDB_UD_COLUMN_INDEX int16_t resColumnId; // result column id + bool distinctTag; // distinct tag or not + } SQueryInfo; typedef struct { diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c index 4aa751574c..80dde8576f 100644 --- a/src/client/src/tscLocalMerge.c +++ b/src/client/src/tscLocalMerge.c @@ -1102,7 +1102,7 @@ static int64_t getNumOfResultLocal(SQueryInfo *pQueryInfo, SQLFunctionCtx *pCtx) * the number of output result is decided by main output */ int32_t functionId = pCtx[j].functionId; - if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG || functionId == TSDB_FUNC_TAGPRJ) { + if (functionId == TSDB_FUNC_TS || functionId == TSDB_FUNC_TAG) { continue; } @@ -1184,7 +1184,7 @@ bool needToMerge(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer, tFilePage int16_t functionId = pLocalReducer->pCtx[0].functionId; // todo opt performance - if ((/*functionId == TSDB_FUNC_PRJ || */functionId == TSDB_FUNC_ARITHM) || (tscIsProjectionQueryOnSTable(pQueryInfo, 0))) { // column projection query + if ((/*functionId == TSDB_FUNC_PRJ || */functionId == TSDB_FUNC_ARITHM) || (tscIsProjectionQueryOnSTable(pQueryInfo, 0) && pQueryInfo->distinctTag == false)) { // column projection query ret = 1; // disable merge procedure } else { tOrderDescriptor *pDesc = pLocalReducer->pDesc; diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index ffb2927cbd..94b01f0a65 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -1476,23 +1476,39 @@ static void addPrimaryTsColIntoResult(SQueryInfo* pQueryInfo) { pQueryInfo->type |= TSDB_QUERY_TYPE_PROJECTION_QUERY; } +bool isValidDistinctSql(SQueryInfo* pQueryInfo) { + if (pQueryInfo == NULL) { + return false; + } + if ((pQueryInfo->type & TSDB_QUERY_TYPE_STABLE_QUERY) != TSDB_QUERY_TYPE_STABLE_QUERY) { + return false; + } + if (tscQueryTags(pQueryInfo) && tscSqlExprNumOfExprs(pQueryInfo) == 1){ + return true; + } + return false; +} int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSelection, bool isSTable, bool joinQuery, bool intervalQuery) { assert(pSelection != NULL && pCmd != NULL); const char* msg2 = "functions can not be mixed up"; const char* msg3 = "not support query expression"; const char* msg5 = "invalid function name"; + const char* msg6 = "only support distinct one tag"; SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, clauseIndex); if (pQueryInfo->colList == NULL) { pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES); } - + bool hasDistinct = false; for (int32_t i = 0; i < pSelection->nExpr; ++i) { int32_t outputIndex = (int32_t)tscSqlExprNumOfExprs(pQueryInfo); tSqlExprItem* pItem = &pSelection->a[i]; - + + if (hasDistinct == false) { + hasDistinct = (pItem->distinct == true); + } // project on all fields int32_t optr = pItem->pNode->nSQLOptr; @@ -1526,6 +1542,13 @@ int32_t parseSelectClause(SSqlCmd* pCmd, int32_t clauseIndex, tSQLExprList* pSel } } + if (hasDistinct == true) { + if (!isValidDistinctSql(pQueryInfo)) { + return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6); + } + pQueryInfo->distinctTag = true; + } + // there is only one user-defined column in the final result field, add the timestamp column. size_t numOfSrcCols = taosArrayGetSize(pQueryInfo->colList); if (numOfSrcCols <= 0 && !tscQueryTags(pQueryInfo)) { @@ -4605,6 +4628,12 @@ int32_t parseOrderbyClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQu setDefaultOrderInfo(pQueryInfo); STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0); + + if (pQueryInfo->distinctTag == true) { + pQueryInfo->order.order = TSDB_ORDER_ASC; + pQueryInfo->order.orderColId = 0; + return TSDB_CODE_SUCCESS; + } if (pQuerySql->pSortOrder == NULL) { return TSDB_CODE_SUCCESS; } From 182fb5f485e801edcef002c2d4fb8b7b0a2b0188 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 18 Jan 2021 09:54:10 +0000 Subject: [PATCH 04/34] add test case --- .../general/parser/select_distinct_tag.sim | 61 +++++++++++++++++++ tests/script/jenkins/basic.txt | 1 + 2 files changed, 62 insertions(+) create mode 100644 tests/script/general/parser/select_distinct_tag.sim diff --git a/tests/script/general/parser/select_distinct_tag.sim b/tests/script/general/parser/select_distinct_tag.sim new file mode 100644 index 0000000000..7ea9dc444f --- /dev/null +++ b/tests/script/general/parser/select_distinct_tag.sim @@ -0,0 +1,61 @@ +system sh/stop_dnodes.sh + +system sh/deploy.sh -n dnode1 -i 1 +system sh/cfg.sh -n dnode1 -c walLevel -v 0 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5 +system sh/exec.sh -n dnode1 -s start +sleep 100 +sql connect + +$dbPrefix = sav_db +$tbPrefix = sav_tb +$stbPrefix = sav_stb +$tbNum = 20 +$rowNum = 10 +$totalNum = $tbNum * $rowNum +$ts0 = 1537146000000 +$delta = 600000 +print ========== alter.sim +$i = 0 +$db = $dbPrefix +$stb = $stbPrefix + +sql drop database if exists $db +sql create database $db +sql use $db +print ====== create tables +sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 int) + +$i = 0 +$ts = $ts0 +while $i < $tbNum + $tb = $tbPrefix . $i + sql create table $tb using $stb tags( $i , 0 ) + $i = $i + 1 +endw + +print ====== table created + +#### select distinct tag +sql select distinct t1 from $stb +if $rows != $tbNum then + return -1 +endi + +#### select distinct tag +sql select distinct t2 from $stb +if $rows != 1 then + print $rows + return -1 +endi + +#### unsupport sql +sql_error select distinct t1, t2 from &stb + +sql drop database $db +sql show databases +if $rows != 0 then + return -1 +endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 90d01b7215..b5f608f3d3 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -159,6 +159,7 @@ cd ../../../debug; make ./test.sh -f general/parser/union.sim ./test.sh -f general/parser/topbot.sim ./test.sh -f general/parser/function.sim +./test.sh -f general/parser/select_distinct_tag.sim ./test.sh -f general/stable/disk.sim ./test.sh -f general/stable/dnode3.sim From 1c16f49682595abcee20d2aa6ecf03047aaef05b Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 19 Jan 2021 10:27:14 +0000 Subject: [PATCH 05/34] fix bug when calloc failed --- src/client/src/tscSql.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 106f62fb74..fa7c1f83ba 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -110,6 +110,7 @@ static SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pa rpcClose(pDnodeConn); free(pObj->tscCorMgmtEpSet); free(pObj); + return NULL; } memcpy(pObj->tscCorMgmtEpSet, &corMgmtEpSet, sizeof(SRpcCorEpSet)); From d1e4046340b404cada0d26eafebf97fa12e86a6d Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 19 Jan 2021 22:37:22 +0000 Subject: [PATCH 06/34] add block dist info --- src/client/src/tscSQLParser.c | 18 ++++- src/client/src/tscUtil.c | 4 +- src/common/inc/tname.h | 2 + src/common/src/tname.c | 8 +++ src/inc/taosdef.h | 2 + src/inc/tsdb.h | 19 ++++- src/query/inc/qExecutor.h | 1 + src/query/src/qExecutor.c | 130 +++++++++++++++++++++++++++++++++- src/tsdb/src/tsdbRead.c | 108 ++++++++++++++++++++++++++++ src/util/inc/tstoken.h | 3 + 10 files changed, 287 insertions(+), 8 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 64268124da..2886c22f5d 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -41,7 +41,7 @@ #define COLUMN_INDEX_INITIAL_VAL (-3) #define COLUMN_INDEX_INITIALIZER \ { COLUMN_INDEX_INITIAL_VAL, COLUMN_INDEX_INITIAL_VAL } -#define COLUMN_INDEX_VALIDE(index) (((index).tableIndex >= 0) && ((index).columnIndex >= TSDB_TBNAME_COLUMN_INDEX)) +#define COLUMN_INDEX_VALIDE(index) (((index).tableIndex >= 0) && ((index).columnIndex >= TSDB_BLOCK_DIST_COLUMN_INDEX)) #define TBNAME_LIST_SEP "," typedef struct SColumnList { // todo refactor @@ -1706,6 +1706,9 @@ int32_t addProjectionExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, t if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) { SSchema colSchema = tGetTableNameColumnSchema(); tscAddSpecialColumnForSelect(pQueryInfo, startPos, TSDB_FUNC_TAGPRJ, &index, &colSchema, TSDB_COL_TAG); + } else if (index.columnIndex == TSDB_BLOCK_DIST_COLUMN_INDEX) { + SSchema colSchema = tGetBlockDistColumnSchema(); + tscAddSpecialColumnForSelect(pQueryInfo, startPos, TSDB_FUNC_PRJ, &index, &colSchema, TSDB_COL_TAG); } else { STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex); STableMeta* pTableMeta = pTableMetaInfo->pTableMeta; @@ -2381,6 +2384,14 @@ static bool isTablenameToken(SStrToken* token) { return (strncasecmp(TSQL_TBNAME_L, tmpToken.z, tmpToken.n) == 0 && tmpToken.n == strlen(TSQL_TBNAME_L)); } +static bool isTableBlockDistToken(SStrToken* token) { + SStrToken tmpToken = *token; + SStrToken tableToken = {0}; + + extractTableNameFromToken(&tmpToken, &tableToken); + + return (strncasecmp(TSQL_BLOCK_DIST, tmpToken.z, tmpToken.n) == 0 && tmpToken.n == strlen(TSQL_BLOCK_DIST_L)); +} static int16_t doGetColumnIndex(SQueryInfo* pQueryInfo, int32_t index, SStrToken* pToken) { STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, index)->pTableMeta; @@ -2410,6 +2421,8 @@ int32_t doGetColumnIndexByName(SSqlCmd* pCmd, SStrToken* pToken, SQueryInfo* pQu if (isTablenameToken(pToken)) { pIndex->columnIndex = TSDB_TBNAME_COLUMN_INDEX; + } else if (isTableBlockDistToken(pToken)) { + pIndex->columnIndex = TSDB_BLOCK_DIST_COLUMN_INDEX; } else if (strncasecmp(pToken->z, DEFAULT_PRIMARY_TIMESTAMP_COL_NAME, pToken->n) == 0) { pIndex->columnIndex = PRIMARYKEY_TIMESTAMP_COL_INDEX; } else { @@ -2650,8 +2663,7 @@ int32_t setShowInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { if (!validateIpAddress(pDnodeIp->z, pDnodeIp->n)) { return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg4); } - } - + } return TSDB_CODE_SUCCESS; } diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 02cd9b9692..005d83bf2c 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -1091,6 +1091,8 @@ static SSqlExpr* doBuildSqlExpr(SQueryInfo* pQueryInfo, int16_t functionId, SCol // set the correct columnIndex index if (pColIndex->columnIndex == TSDB_TBNAME_COLUMN_INDEX) { pExpr->colInfo.colId = TSDB_TBNAME_COLUMN_INDEX; + } else if (pColIndex->columnIndex == TSDB_BLOCK_DIST_COLUMN_INDEX) { + pExpr->colInfo.colId = TSDB_BLOCK_DIST_COLUMN_INDEX; } else if (pColIndex->columnIndex <= TSDB_UD_COLUMN_INDEX) { pExpr->colInfo.colId = pColIndex->columnIndex; } else { @@ -1507,7 +1509,7 @@ bool tscValidateColumnId(STableMetaInfo* pTableMetaInfo, int32_t colId, int32_t return false; } - if (colId == TSDB_TBNAME_COLUMN_INDEX || (colId <= TSDB_UD_COLUMN_INDEX && numOfParams == 2)) { + if (colId == TSDB_TBNAME_COLUMN_INDEX || colId == TSDB_BLOCK_DIST_COLUMN_INDEX || (colId <= TSDB_UD_COLUMN_INDEX && numOfParams == 2)) { return true; } diff --git a/src/common/inc/tname.h b/src/common/inc/tname.h index 44f1047543..6631d4e450 100644 --- a/src/common/inc/tname.h +++ b/src/common/inc/tname.h @@ -31,6 +31,8 @@ void extractTableNameFromToken(SStrToken *pToken, SStrToken* pTable); SSchema tGetTableNameColumnSchema(); +SSchema tGetBlockDistColumnSchema(); + SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const char* name); bool tscValidateTableNameLength(size_t len); diff --git a/src/common/src/tname.c b/src/common/src/tname.c index f35867ede3..31d473866a 100644 --- a/src/common/src/tname.c +++ b/src/common/src/tname.c @@ -58,6 +58,14 @@ SSchema tGetTableNameColumnSchema() { tstrncpy(s.name, TSQL_TBNAME_L, TSDB_COL_NAME_LEN); return s; } +SSchema tGetBlockDistColumnSchema() { + SSchema s = {0}; + s.bytes = TSDB_MAX_BINARY_LEN;; + s.type = TSDB_DATA_TYPE_BINARY; + s.colId = TSDB_BLOCK_DIST_COLUMN_INDEX; + tstrncpy(s.name, TSQL_BLOCK_DIST_L, TSDB_COL_NAME_LEN); + return s; +} SSchema tGetUserSpecifiedColumnSchema(tVariant* pVal, SStrToken* exprStr, const char* name) { SSchema s = {0}; diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h index d751dbb969..6fea049074 100644 --- a/src/inc/taosdef.h +++ b/src/inc/taosdef.h @@ -235,7 +235,9 @@ do { \ #define TSDB_MAX_REPLICA 5 #define TSDB_TBNAME_COLUMN_INDEX (-1) +#define TSDB_BLOCK_DIST_COLUMN_INDEX (-2) #define TSDB_UD_COLUMN_INDEX (-100) + #define TSDB_MULTI_TABLEMETA_MAX_NUM 100000 // maximum batch size allowed to load table meta #define TSDB_MIN_CACHE_BLOCK_SIZE 1 diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index 262bf30309..dae886189b 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -232,13 +232,30 @@ SArray* tsdbGetQueriedTableList(TsdbQueryHandleT *pHandle); TsdbQueryHandleT tsdbQueryRowsInExternalWindow(TSDB_REPO_T *tsdb, STsdbQueryCond *pCond, STableGroupInfo *groupList, void *qinfo, SMemRef* pRef); + /** - * move to next block if exists + * get num of rows in mem table + * + * @param pHandle + * @return row size + */ + +int64_t tsdbGetNumOfRowsInMemTable(TsdbQueryHandleT* pHandle); + +/** + * move to next block if exists * * @param pQueryHandle * @return */ bool tsdbNextDataBlock(TsdbQueryHandleT *pQueryHandle); +/** + * move to next block if exists but not merge data in memtable + * + * @param pQueryHandle + * @return + */ +bool tsdbNextDataBlockWithoutMerge(TsdbQueryHandleT *pQueryHandle); /** * Get current data block information diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h index 79d98432c8..b5174ca43e 100644 --- a/src/query/inc/qExecutor.h +++ b/src/query/inc/qExecutor.h @@ -194,6 +194,7 @@ typedef struct SQueryRuntimeEnv { bool hasTagResults; // if there are tag values in final result or not bool timeWindowInterpo;// if the time window start/end required interpolation bool queryWindowIdentical; // all query time windows are identical for all tables in one group + bool queryBlockDist; // if query data block distribution int32_t interBufSize; // intermediate buffer sizse int32_t prevGroupId; // previous executed group id SDiskbasedResultBuf* pResultBuf; // query result buffer based on blocked-wised disk file diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 110b0d198c..8ca935d24c 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -28,6 +28,7 @@ #include "queryLog.h" #include "tlosertree.h" #include "ttype.h" +#include "tcompare.h" #define MAX_ROWS_PER_RESBUF_PAGE ((1u<<12) - 1) @@ -90,6 +91,13 @@ typedef struct { STSCursor cur; } SQueryStatusInfo; +typedef struct { + SArray *dataBlockInfos; + int64_t firstSeekTimeUs; + int64_t numOfRowsInMemTable; + char *result; +} STableBlockDist; + #if 0 static UNUSED_FUNC void *u_malloc (size_t __size) { uint32_t v = rand(); @@ -1907,6 +1915,10 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int16_t order if (pIndex->colId == TSDB_TBNAME_COLUMN_INDEX) { // todo refactor SSchema s = tGetTableNameColumnSchema(); + pCtx->inputBytes = s.bytes; + pCtx->inputType = s.type; + } else if (pIndex->colId == TSDB_BLOCK_DIST_COLUMN_INDEX) { + SSchema s = tGetBlockDistColumnSchema(); pCtx->inputBytes = s.bytes; pCtx->inputType = s.type; } else { @@ -4381,7 +4393,57 @@ static void updateOffsetVal(SQueryRuntimeEnv *pRuntimeEnv, SDataBlockInfo *pBloc qDebug("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, numOfRes:%d, lastKey:%"PRId64, GET_QINFO_ADDR(pRuntimeEnv), pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows, numOfRes, pQuery->current->lastKey); } +static void freeTableBlockDist(STableBlockDist *pTableBlockDist) { + if (pTableBlockDist != NULL) { + taosArrayDestroy(pTableBlockDist->dataBlockInfos); + free(pTableBlockDist->result); + free(pTableBlockDist); + } +} +static int32_t getPercentileFromSortedArray(const SArray* pArray, float rate) { + size_t len = taosArrayGetSize(pArray); + if (len == 0) { + return 0; + } + assert(rate >= 0 && rate <= 1.0); + int idx = (int32_t)((len - 1) * rate); + return ((SDataBlockInfo *)(taosArrayGet(pArray, idx)))->rows; +} +static int32_t compareBlockInfo(const void *pLeft, const void *pRight) { + int32_t left = ((SDataBlockInfo *)pLeft)->rows; + int32_t right = ((SDataBlockInfo *)pRight)->rows; + if (left > right) return 1; + if (left < right) return -1; + return 0; +} +static void generateBlockDistResult(STableBlockDist *pTableBlockDist) { + if (pTableBlockDist == NULL) { + return; + } + int64_t min = INT64_MAX, max = INT64_MIN, avg = 0; + SArray* blockInfos= pTableBlockDist->dataBlockInfos; + int64_t totalRows = 0, totalBlocks = taosArrayGetSize(blockInfos); + for (size_t i = 0; i < taosArrayGetSize(blockInfos); i++) { + SDataBlockInfo *blockInfo = taosArrayGet(blockInfos, i); + int64_t rows = blockInfo->rows; + min = MIN(min, rows); + max = MAX(max, rows); + totalRows += rows; + } + avg = totalBlocks > 0 ? (int32_t)(((totalRows * 1.0)/totalBlocks)) : 0; + + taosArraySort(blockInfos, compareBlockInfo); + + sprintf(pTableBlockDist->result, + "summery: \n\t 5th=[%d], 25th=[%d], 50th=[%d],75th=[%d], 95th=[%d], 99th=[%d] \n\t min=[%ld], max=[%ld], avg = [%ld] \n\t totalRows=[%ld], totalBlocks=[%ld] \n\t seekHeaderTimeCost=[%ld(us)] \n\t rowsInMem=[%ld]", + getPercentileFromSortedArray(blockInfos, 0.05), getPercentileFromSortedArray(blockInfos, 0.25), getPercentileFromSortedArray(blockInfos, 0.50), + getPercentileFromSortedArray(blockInfos, 0.75), getPercentileFromSortedArray(blockInfos, 0.95), getPercentileFromSortedArray(blockInfos, 0.99), + min, max, avg, + totalRows, totalBlocks, + pTableBlockDist->firstSeekTimeUs, + pTableBlockDist->numOfRowsInMemTable); +} void skipBlocks(SQueryRuntimeEnv *pRuntimeEnv) { SQuery *pQuery = pRuntimeEnv->pQuery; @@ -5836,6 +5898,58 @@ static void tableQueryImpl(SQInfo *pQInfo) { pRuntimeEnv->summary.elapsedTime += (taosGetTimestampUs() - st); assert(pQInfo->tableqinfoGroupInfo.numOfTables == 1); } +static void buildTableBlockDistResult(SQInfo *pQInfo) { + SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv; + SQuery *pQuery = pRuntimeEnv->pQuery; + pQuery->pos = 0; + + STableBlockDist *pTableBlockDist = calloc(1, sizeof(STableBlockDist)); + pTableBlockDist->dataBlockInfos = taosArrayInit(512, sizeof(SDataBlockInfo)); + pTableBlockDist->result = malloc(512); + + TsdbQueryHandleT pQueryHandle = pRuntimeEnv->pQueryHandle; + SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER; + SSchema blockDistSchema = tGetBlockDistColumnSchema(); + + int64_t startTime = taosGetTimestampUs(); + while (tsdbNextDataBlockWithoutMerge(pQueryHandle)) { + if (isQueryKilled(GET_QINFO_ADDR(pRuntimeEnv))) { + freeTableBlockDist(pTableBlockDist); + longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED); + } + if (pTableBlockDist->firstSeekTimeUs == 0) { + pTableBlockDist->firstSeekTimeUs = taosGetTimestampUs() - startTime; + } + + tsdbRetrieveDataBlockInfo(pQueryHandle, &blockInfo); + taosArrayPush(pTableBlockDist->dataBlockInfos, &blockInfo); + } + if (terrno != TSDB_CODE_SUCCESS) { + freeTableBlockDist(pTableBlockDist); + longjmp(pRuntimeEnv->env, terrno); + } + + pTableBlockDist->numOfRowsInMemTable = tsdbGetNumOfRowsInMemTable(pQueryHandle); + + generateBlockDistResult(pTableBlockDist); + + int type = -1; + assert(pQuery->numOfOutput == 1); + SExprInfo* pExprInfo = pQuery->pExpr1; + for (int32_t j = 0; j < pQuery->numOfOutput; j++) { + if (pExprInfo[j].base.colInfo.colId == TSDB_BLOCK_DIST_COLUMN_INDEX) { + type = blockDistSchema.type; + } + assert(type == TSDB_DATA_TYPE_BINARY); + STR_TO_VARSTR(pQuery->sdata[j]->data, pTableBlockDist->result); + } + + freeTableBlockDist(pTableBlockDist); + + pQuery->rec.rows = 1; + setQueryStatus(pQuery, QUERY_COMPLETED); + return; +} static void stableQueryImpl(SQInfo *pQInfo) { SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv; @@ -5864,7 +5978,10 @@ static int32_t getColumnIndexInSource(SQueryTableMsg *pQueryMsg, SSqlFuncMsg *pE if (TSDB_COL_IS_TAG(pExprMsg->colInfo.flag)) { if (pExprMsg->colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) { return TSDB_TBNAME_COLUMN_INDEX; + } else if (pExprMsg->colInfo.colId == TSDB_BLOCK_DIST_COLUMN_INDEX) { + return TSDB_BLOCK_DIST_COLUMN_INDEX; } + while(j < pQueryMsg->numOfTags) { if (pExprMsg->colInfo.colId == pTagCols[j].colId) { @@ -6321,6 +6438,10 @@ static int32_t createQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t num SSchema s = tGetTableNameColumnSchema(); type = s.type; bytes = s.bytes; + } else if (pExprs[i].base.colInfo.colId == TSDB_BLOCK_DIST_COLUMN_INDEX) { + SSchema s = tGetBlockDistColumnSchema(); + type = s.type; + bytes = s.bytes; } else if (pExprs[i].base.colInfo.colId <= TSDB_UD_COLUMN_INDEX) { // it is a user-defined constant value column assert(pExprs[i].base.functionId == TSDB_FUNC_PRJ); @@ -6334,7 +6455,7 @@ static int32_t createQueryFuncExprFromMsg(SQueryTableMsg *pQueryMsg, int32_t num } else { int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].base, pTagCols); if (TSDB_COL_IS_TAG(pExprs[i].base.colInfo.flag)) { - if (j < TSDB_TBNAME_COLUMN_INDEX || j >= pQueryMsg->numOfTags) { + if (j < TSDB_BLOCK_DIST_COLUMN_INDEX || j >= pQueryMsg->numOfTags) { return TSDB_CODE_QRY_INVALID_MSG; } } else { @@ -6504,7 +6625,7 @@ static void doUpdateExprColumnIndex(SQuery *pQuery) { } } - assert(f < pQuery->numOfTags || pColIndex->colId == TSDB_TBNAME_COLUMN_INDEX); + assert(f < pQuery->numOfTags || pColIndex->colId == TSDB_TBNAME_COLUMN_INDEX || pColIndex->colId == TSDB_BLOCK_DIST_COLUMN_INDEX); } } } @@ -6707,9 +6828,10 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGrou index += 1; } } - colIdCheck(pQuery); + pQInfo->runtimeEnv.queryBlockDist = (numOfOutput == 1 && pExprs[0].base.colInfo.colId == TSDB_BLOCK_DIST_COLUMN_INDEX); + qDebug("qmsg:%p QInfo:%p created", pQueryMsg, pQInfo); return pQInfo; @@ -7219,6 +7341,8 @@ bool qTableQuery(qinfo_t qinfo) { buildTagQueryResult(pQInfo); } else if (pQInfo->runtimeEnv.stableQuery) { stableQueryImpl(pQInfo); + } else if (pQInfo->runtimeEnv.queryBlockDist){ + buildTableBlockDistResult(pQInfo); } else { tableQueryImpl(pQInfo); } diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 2444283435..11c6de68f8 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -210,6 +210,36 @@ static void tsdbMayUnTakeMemSnapshot(STsdbQueryHandle* pQueryHandle) { pQueryHandle->pMemRef = NULL; } +int64_t tsdbGetNumOfRowsInMemTable(TsdbQueryHandleT* pHandle) { + STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle; + + size_t size = taosArrayGetSize(pQueryHandle->pTableCheckInfo); + assert(pQueryHandle->activeIndex < size && pQueryHandle->activeIndex >= 0 && size >= 1); + STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, pQueryHandle->activeIndex); + + + int64_t rows = 0; + SMemRef* pMemRef = pQueryHandle->pMemRef; + if (pMemRef == NULL) { return rows; } + + STableData* pMem = NULL; + STableData* pIMem = NULL; + + SMemTable *pMemT = (SMemTable *)(pMemRef->mem); + SMemTable *pIMemT = (SMemTable *)(pMemRef->imem); + + if (pMemT && pCheckInfo->tableId.tid < pMemT->maxTables) { + pMem = pMemT->tData[pCheckInfo->tableId.tid]; + rows += (pMem && pMem->uid == pCheckInfo->tableId.uid) ? pMem->numOfRows: 0; + } + if (pIMemT && pCheckInfo->tableId.tid < pIMemT->maxTables) { + pIMem = pIMemT->tData[pCheckInfo->tableId.tid]; + rows += (pIMem && pIMem->uid == pCheckInfo->tableId.uid) ? pIMem->numOfRows: 0; + } + + return rows; +} + static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STableGroupInfo* pGroupList, STsdbMeta* pMeta) { size_t sizeOfGroup = taosArrayGetSize(pGroupList->pGroupList); assert(sizeOfGroup >= 1 && pMeta != NULL); @@ -2218,6 +2248,84 @@ bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) { return ret; } +bool tsdbNextDataBlockWithoutMerge(TsdbQueryHandleT* pHandle) { + STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle; + + int64_t stime = taosGetTimestampUs(); + int64_t elapsedTime = stime; + + size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo); + assert(numOfTables > 0); + + if (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL) { + SMemRef* pMemRef = pQueryHandle->pMemRef; + tsdbMayTakeMemSnapshot(pQueryHandle); + bool ret = getNeighborRows(pQueryHandle); + tsdbMayUnTakeMemSnapshot(pQueryHandle); + + // restore the pMemRef + pQueryHandle->pMemRef = pMemRef; + return ret; + } else if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { + // the last row is cached in buffer, return it directly. + // here note that the pQueryHandle->window must be the TS_INITIALIZER + int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); + SQueryFilePos* cur = &pQueryHandle->cur; + + SDataRow pRow = NULL; + TSKEY key = TSKEY_INITIAL_VAL; + int32_t step = ASCENDING_TRAVERSE(pQueryHandle->order)? 1:-1; + + if (++pQueryHandle->activeIndex < numOfTables) { + STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, pQueryHandle->activeIndex); + int32_t ret = tsdbGetCachedLastRow(pCheckInfo->pTableObj, &pRow, &key); + if (ret != TSDB_CODE_SUCCESS) { + return false; + } + + copyOneRowFromMem(pQueryHandle, pQueryHandle->outputCapacity, 0, pRow, numOfCols, pCheckInfo->pTableObj); + tfree(pRow); + + // update the last key value + pCheckInfo->lastKey = key + step; + + cur->rows = 1; // only one row + cur->lastKey = key + step; + cur->mixBlock = true; + cur->win.skey = key; + cur->win.ekey = key; + + return true; + } + + return false; + } + + if (pQueryHandle->checkFiles) { + // check if the query range overlaps with the file data block + bool exists = true; + + int32_t code = getDataBlocksInFiles(pQueryHandle, &exists); + if (code != TSDB_CODE_SUCCESS) { + pQueryHandle->activeIndex = 0; + pQueryHandle->checkFiles = false; + + return false; + } + + if (exists) { + pQueryHandle->cost.checkForNextTime += (taosGetTimestampUs() - stime); + return exists; + } + + pQueryHandle->activeIndex = 0; + pQueryHandle->checkFiles = false; + } + + elapsedTime = taosGetTimestampUs() - stime; + pQueryHandle->cost.checkForNextTime += elapsedTime; + return false; +} /* * 1. no data at all (pTable->lastKey = TSKEY_INITIAL_VAL), just return TSKEY_INITIAL_VAL * 2. has data but not loaded, just return lastKey but not set pRes diff --git a/src/util/inc/tstoken.h b/src/util/inc/tstoken.h index b36d0017e8..7af03d96af 100644 --- a/src/util/inc/tstoken.h +++ b/src/util/inc/tstoken.h @@ -27,6 +27,9 @@ extern "C" { #define TSQL_TBNAME "TBNAME" #define TSQL_TBNAME_L "tbname" +#define TSQL_BLOCK_DIST "_BLOCK_DIST" +#define TSQL_BLOCK_DIST_L "_block_dist" + // used to denote the minimum unite in sql parsing typedef struct SStrToken { uint32_t n; From 0a0e68e2080401a31776638cc561f8460ef761a6 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 19 Jan 2021 23:03:59 +0000 Subject: [PATCH 07/34] fix compile error --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 8ca935d24c..90e4ca8139 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4436,7 +4436,7 @@ static void generateBlockDistResult(STableBlockDist *pTableBlockDist) { taosArraySort(blockInfos, compareBlockInfo); sprintf(pTableBlockDist->result, - "summery: \n\t 5th=[%d], 25th=[%d], 50th=[%d],75th=[%d], 95th=[%d], 99th=[%d] \n\t min=[%ld], max=[%ld], avg = [%ld] \n\t totalRows=[%ld], totalBlocks=[%ld] \n\t seekHeaderTimeCost=[%ld(us)] \n\t rowsInMem=[%ld]", + "summery: \n\t 5th=[%d], 25th=[%d], 50th=[%d],75th=[%d], 95th=[%d], 99th=[%d] \n\t min=[%"PRId64"], max=[%"PRId64"], avg = [%"PRId64"] \n\t totalRows=[%"PRId64"], totalBlocks=[%"PRId64"] \n\t seekHeaderTimeCost=[%"PRId64"(us)] \n\t rowsInMem=[%"PRId64"]", getPercentileFromSortedArray(blockInfos, 0.05), getPercentileFromSortedArray(blockInfos, 0.25), getPercentileFromSortedArray(blockInfos, 0.50), getPercentileFromSortedArray(blockInfos, 0.75), getPercentileFromSortedArray(blockInfos, 0.95), getPercentileFromSortedArray(blockInfos, 0.99), min, max, avg, From 33b428a4ca230db3d1975dae91d1fc15d98fdc60 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 00:40:09 +0000 Subject: [PATCH 08/34] fix compile error in windows --- src/query/src/qExecutor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 90e4ca8139..b9eaa7f7c4 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4401,8 +4401,8 @@ static void freeTableBlockDist(STableBlockDist *pTableBlockDist) { } } static int32_t getPercentileFromSortedArray(const SArray* pArray, float rate) { - size_t len = taosArrayGetSize(pArray); - if (len == 0) { + int32_t len = taosArrayGetSize(pArray); + if (len <= 0) { return 0; } assert(rate >= 0 && rate <= 1.0); @@ -4431,7 +4431,7 @@ static void generateBlockDistResult(STableBlockDist *pTableBlockDist) { max = MAX(max, rows); totalRows += rows; } - avg = totalBlocks > 0 ? (int32_t)(((totalRows * 1.0)/totalBlocks)) : 0; + avg = totalBlocks > 0 ? (int64_t)(totalRows/totalBlocks) : 0; taosArraySort(blockInfos, compareBlockInfo); From 89822564219ff33ad0a146543647b1831be71e0a Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 01:39:49 +0000 Subject: [PATCH 09/34] fix compile error on windows --- src/query/src/qExecutor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index b9eaa7f7c4..a6b29c7c93 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4435,7 +4435,7 @@ static void generateBlockDistResult(STableBlockDist *pTableBlockDist) { taosArraySort(blockInfos, compareBlockInfo); - sprintf(pTableBlockDist->result, + int sz = sprintf(pTableBlockDist->result, "summery: \n\t 5th=[%d], 25th=[%d], 50th=[%d],75th=[%d], 95th=[%d], 99th=[%d] \n\t min=[%"PRId64"], max=[%"PRId64"], avg = [%"PRId64"] \n\t totalRows=[%"PRId64"], totalBlocks=[%"PRId64"] \n\t seekHeaderTimeCost=[%"PRId64"(us)] \n\t rowsInMem=[%"PRId64"]", getPercentileFromSortedArray(blockInfos, 0.05), getPercentileFromSortedArray(blockInfos, 0.25), getPercentileFromSortedArray(blockInfos, 0.50), getPercentileFromSortedArray(blockInfos, 0.75), getPercentileFromSortedArray(blockInfos, 0.95), getPercentileFromSortedArray(blockInfos, 0.99), @@ -4443,6 +4443,8 @@ static void generateBlockDistResult(STableBlockDist *pTableBlockDist) { totalRows, totalBlocks, pTableBlockDist->firstSeekTimeUs, pTableBlockDist->numOfRowsInMemTable); + UNUSE(sz); + return; } void skipBlocks(SQueryRuntimeEnv *pRuntimeEnv) { SQuery *pQuery = pRuntimeEnv->pQuery; From 9b387049ccae7d4c340c4be9188a645cd8aff961 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 01:45:35 +0000 Subject: [PATCH 10/34] fix compile error on windows --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index a6b29c7c93..2ccf012bf1 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4443,7 +4443,7 @@ static void generateBlockDistResult(STableBlockDist *pTableBlockDist) { totalRows, totalBlocks, pTableBlockDist->firstSeekTimeUs, pTableBlockDist->numOfRowsInMemTable); - UNUSE(sz); + UNUSED(sz); return; } void skipBlocks(SQueryRuntimeEnv *pRuntimeEnv) { From 40da35fa079c16db0f059726a28c08833f40d8e1 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 01:58:36 +0000 Subject: [PATCH 11/34] fix compile error on windows --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 2ccf012bf1..08731a87d7 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4401,7 +4401,7 @@ static void freeTableBlockDist(STableBlockDist *pTableBlockDist) { } } static int32_t getPercentileFromSortedArray(const SArray* pArray, float rate) { - int32_t len = taosArrayGetSize(pArray); + int32_t len = (int32_t)taosArrayGetSize(pArray); if (len <= 0) { return 0; } From 9be6fb9b1e40aebb51c0090946d9503811bcd0c5 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 02:29:42 +0000 Subject: [PATCH 12/34] fix compile error on windows --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 08731a87d7..e15caaf0e9 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4409,7 +4409,7 @@ static int32_t getPercentileFromSortedArray(const SArray* pArray, float rate) { int idx = (int32_t)((len - 1) * rate); return ((SDataBlockInfo *)(taosArrayGet(pArray, idx)))->rows; } -static int32_t compareBlockInfo(const void *pLeft, const void *pRight) { +static int compareBlockInfo(const void *pLeft, const void *pRight) { int32_t left = ((SDataBlockInfo *)pLeft)->rows; int32_t right = ((SDataBlockInfo *)pRight)->rows; if (left > right) return 1; From 92db1ea6e82064e68a8b75b9bb023c68d9c410ac Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 02:42:15 +0000 Subject: [PATCH 13/34] fix compile error on windows --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index e15caaf0e9..bda0a15425 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -4400,7 +4400,7 @@ static void freeTableBlockDist(STableBlockDist *pTableBlockDist) { free(pTableBlockDist); } } -static int32_t getPercentileFromSortedArray(const SArray* pArray, float rate) { +static int32_t getPercentileFromSortedArray(const SArray* pArray, double rate) { int32_t len = (int32_t)taosArrayGetSize(pArray); if (len <= 0) { return 0; From e396be72383353aae58dafa4ee0d9a13a67980d3 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 02:56:18 +0000 Subject: [PATCH 14/34] fix compile error on windows --- src/query/src/qExecutor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index bda0a15425..ef6c114acc 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5907,7 +5907,7 @@ static void buildTableBlockDistResult(SQInfo *pQInfo) { STableBlockDist *pTableBlockDist = calloc(1, sizeof(STableBlockDist)); pTableBlockDist->dataBlockInfos = taosArrayInit(512, sizeof(SDataBlockInfo)); - pTableBlockDist->result = malloc(512); + pTableBlockDist->result = (char *)malloc(512); TsdbQueryHandleT pQueryHandle = pRuntimeEnv->pQueryHandle; SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER; @@ -5943,7 +5943,7 @@ static void buildTableBlockDistResult(SQInfo *pQInfo) { type = blockDistSchema.type; } assert(type == TSDB_DATA_TYPE_BINARY); - STR_TO_VARSTR(pQuery->sdata[j]->data, pTableBlockDist->result); + STR_TO_VARSTR(pQuery->sdata[j]->data, (char *)(pTableBlockDist->result)); } freeTableBlockDist(pTableBlockDist); From 27e2cceaf52dbedfd41a8afcb59d2a8e57fbbc77 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 20 Jan 2021 03:11:46 +0000 Subject: [PATCH 15/34] fix compile error on windows --- src/query/src/qExecutor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index ef6c114acc..960127b15d 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5943,7 +5943,7 @@ static void buildTableBlockDistResult(SQInfo *pQInfo) { type = blockDistSchema.type; } assert(type == TSDB_DATA_TYPE_BINARY); - STR_TO_VARSTR(pQuery->sdata[j]->data, (char *)(pTableBlockDist->result)); + STR_WITH_SIZE_TO_VARSTR(pQuery->sdata[j]->data, pTableBlockDist->result, (VarDataLenT)strlen(pTableBlockDist->result)); } freeTableBlockDist(pTableBlockDist); From 365d3140ce590e8e137ecd6e992ba81b71121cdc Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 21 Jan 2021 17:48:30 +0800 Subject: [PATCH 16/34] [TD-225]merge develop --- src/query/src/sql.c | 2216 ++++++++++++++++++++++--------------------- 1 file changed, 1112 insertions(+), 1104 deletions(-) diff --git a/src/query/src/sql.c b/src/query/src/sql.c index cc5d6c0b4a..e53bc2dfc1 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -97,27 +97,27 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 280 +#define YYNOCODE 282 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SStrToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SQuerySQL* yy30; - SCreateTableSQL* yy38; - SCreatedTableInfo yy78; - SLimitVal yy126; - int yy130; - SArray* yy135; - SSubclauseInfo* yy153; - SIntervalVal yy160; - TAOS_FIELD yy181; - SCreateDbInfo yy256; - tSQLExprList* yy266; - SCreateAcctInfo yy277; - tVariant yy308; - tSQLExpr* yy316; - int64_t yy531; + SCreatedTableInfo yy42; + SCreateAcctInfo yy47; + SQuerySQL* yy114; + TAOS_FIELD yy179; + SLimitVal yy204; + SSubclauseInfo* yy219; + int yy222; + SArray* yy247; + SCreateDbInfo yy262; + tSQLExpr* yy326; + SCreateTableSQL* yy358; + tVariant yy378; + int64_t yy403; + SIntervalVal yy430; + tSQLExprList* yy522; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -127,17 +127,17 @@ typedef union { #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo #define YYFALLBACK 1 -#define YYNSTATE 282 -#define YYNRULE 248 -#define YYNTOKEN 209 -#define YY_MAX_SHIFT 281 -#define YY_MIN_SHIFTREDUCE 461 -#define YY_MAX_SHIFTREDUCE 708 -#define YY_ERROR_ACTION 709 -#define YY_ACCEPT_ACTION 710 -#define YY_NO_ACTION 711 -#define YY_MIN_REDUCE 712 -#define YY_MAX_REDUCE 959 +#define YYNSTATE 283 +#define YYNRULE 250 +#define YYNTOKEN 210 +#define YY_MAX_SHIFT 282 +#define YY_MIN_SHIFTREDUCE 463 +#define YY_MAX_SHIFTREDUCE 712 +#define YY_ERROR_ACTION 713 +#define YY_ACCEPT_ACTION 714 +#define YY_NO_ACTION 715 +#define YY_MIN_REDUCE 716 +#define YY_MAX_REDUCE 965 /************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined @@ -203,243 +203,241 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (622) +#define YY_ACTTAB_COUNT (615) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 158, 505, 158, 710, 281, 857, 15, 578, 182, 506, - /* 10 */ 941, 185, 942, 41, 42, 157, 43, 44, 26, 179, - /* 20 */ 190, 35, 505, 505, 231, 47, 45, 49, 46, 868, - /* 30 */ 506, 506, 846, 40, 39, 256, 255, 38, 37, 36, - /* 40 */ 41, 42, 162, 43, 44, 857, 951, 190, 35, 178, - /* 50 */ 279, 231, 47, 45, 49, 46, 180, 195, 843, 214, - /* 60 */ 40, 39, 938, 61, 38, 37, 36, 462, 463, 464, - /* 70 */ 465, 466, 467, 468, 469, 470, 471, 472, 473, 280, - /* 80 */ 198, 846, 204, 41, 42, 865, 43, 44, 246, 266, - /* 90 */ 190, 35, 158, 834, 231, 47, 45, 49, 46, 122, - /* 100 */ 122, 184, 942, 40, 39, 122, 62, 38, 37, 36, - /* 110 */ 20, 244, 274, 273, 243, 242, 241, 272, 240, 271, - /* 120 */ 270, 269, 239, 268, 267, 38, 37, 36, 813, 657, - /* 130 */ 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, - /* 140 */ 811, 812, 814, 815, 42, 200, 43, 44, 253, 252, - /* 150 */ 190, 35, 937, 275, 231, 47, 45, 49, 46, 228, - /* 160 */ 895, 66, 226, 40, 39, 115, 894, 38, 37, 36, - /* 170 */ 26, 43, 44, 32, 26, 190, 35, 846, 207, 231, - /* 180 */ 47, 45, 49, 46, 26, 211, 210, 754, 40, 39, - /* 190 */ 146, 845, 38, 37, 36, 189, 670, 117, 835, 661, - /* 200 */ 71, 664, 26, 667, 763, 189, 670, 146, 193, 661, - /* 210 */ 843, 664, 194, 667, 843, 189, 670, 16, 26, 661, - /* 220 */ 936, 664, 249, 667, 843, 10, 21, 186, 187, 70, - /* 230 */ 132, 230, 837, 166, 32, 196, 69, 186, 187, 167, - /* 240 */ 250, 615, 843, 122, 102, 101, 165, 186, 187, 174, - /* 250 */ 20, 26, 274, 273, 219, 905, 254, 272, 843, 271, - /* 260 */ 270, 269, 607, 268, 267, 832, 833, 25, 836, 819, - /* 270 */ 216, 90, 817, 818, 21, 246, 266, 820, 68, 822, - /* 280 */ 823, 821, 32, 824, 825, 47, 45, 49, 46, 258, - /* 290 */ 33, 843, 199, 40, 39, 48, 26, 38, 37, 36, - /* 300 */ 197, 217, 213, 248, 67, 48, 27, 669, 659, 173, - /* 310 */ 278, 277, 109, 755, 232, 48, 146, 669, 599, 638, - /* 320 */ 639, 596, 668, 597, 844, 598, 612, 669, 175, 40, - /* 330 */ 39, 22, 668, 38, 37, 36, 842, 160, 625, 88, - /* 340 */ 92, 188, 668, 119, 660, 82, 97, 100, 91, 201, - /* 350 */ 202, 99, 98, 629, 94, 3, 136, 161, 52, 152, - /* 360 */ 148, 29, 77, 73, 76, 150, 105, 104, 103, 630, - /* 370 */ 689, 671, 53, 56, 18, 17, 17, 663, 163, 666, - /* 380 */ 662, 588, 665, 4, 81, 80, 27, 234, 589, 164, - /* 390 */ 57, 54, 27, 52, 12, 11, 87, 86, 59, 603, - /* 400 */ 577, 604, 14, 13, 601, 170, 602, 673, 114, 112, - /* 410 */ 171, 169, 156, 168, 159, 859, 904, 191, 901, 116, - /* 420 */ 900, 192, 257, 867, 600, 872, 874, 887, 118, 886, - /* 430 */ 133, 134, 32, 131, 135, 765, 238, 154, 30, 247, - /* 440 */ 762, 956, 78, 955, 953, 137, 251, 950, 84, 113, - /* 450 */ 949, 947, 138, 783, 31, 28, 155, 752, 93, 750, - /* 460 */ 215, 95, 96, 748, 624, 58, 747, 203, 147, 745, - /* 470 */ 744, 743, 742, 220, 741, 55, 149, 50, 181, 229, - /* 480 */ 224, 856, 227, 124, 151, 738, 736, 734, 732, 730, - /* 490 */ 225, 223, 221, 153, 34, 218, 89, 63, 64, 259, - /* 500 */ 260, 888, 261, 262, 264, 263, 265, 276, 708, 205, - /* 510 */ 206, 707, 208, 209, 706, 176, 236, 237, 694, 177, - /* 520 */ 172, 212, 74, 216, 65, 609, 746, 60, 233, 106, - /* 530 */ 6, 183, 740, 141, 107, 140, 784, 139, 142, 144, - /* 540 */ 143, 145, 739, 1, 108, 841, 731, 2, 626, 129, - /* 550 */ 127, 125, 123, 126, 128, 120, 222, 130, 631, 121, - /* 560 */ 23, 7, 8, 672, 24, 5, 9, 674, 19, 72, - /* 570 */ 235, 546, 542, 70, 540, 539, 538, 535, 509, 245, - /* 580 */ 79, 75, 27, 83, 51, 580, 579, 576, 530, 528, - /* 590 */ 520, 526, 522, 85, 524, 518, 516, 548, 547, 545, - /* 600 */ 544, 543, 541, 537, 536, 52, 507, 477, 475, 110, - /* 610 */ 712, 711, 711, 711, 711, 711, 711, 711, 711, 711, - /* 620 */ 711, 111, + /* 0 */ 872, 507, 159, 714, 282, 159, 15, 580, 183, 508, + /* 10 */ 663, 186, 948, 41, 42, 947, 43, 44, 26, 158, + /* 20 */ 191, 35, 507, 507, 232, 47, 45, 49, 46, 163, + /* 30 */ 508, 508, 850, 40, 39, 257, 256, 38, 37, 36, + /* 40 */ 41, 42, 118, 43, 44, 861, 664, 191, 35, 179, + /* 50 */ 280, 232, 47, 45, 49, 46, 181, 869, 847, 215, + /* 60 */ 40, 39, 957, 123, 38, 37, 36, 464, 465, 466, + /* 70 */ 467, 468, 469, 470, 471, 472, 473, 474, 475, 281, + /* 80 */ 91, 196, 205, 41, 42, 267, 43, 44, 839, 247, + /* 90 */ 191, 35, 159, 944, 232, 47, 45, 49, 46, 123, + /* 100 */ 220, 185, 948, 40, 39, 850, 62, 38, 37, 36, + /* 110 */ 20, 245, 275, 274, 244, 243, 242, 273, 241, 272, + /* 120 */ 271, 270, 240, 269, 268, 901, 267, 227, 817, 661, + /* 130 */ 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, + /* 140 */ 815, 816, 818, 819, 42, 208, 43, 44, 642, 643, + /* 150 */ 191, 35, 212, 211, 232, 47, 45, 49, 46, 229, + /* 160 */ 861, 67, 21, 40, 39, 247, 276, 38, 37, 36, + /* 170 */ 32, 43, 44, 197, 180, 191, 35, 849, 70, 232, + /* 180 */ 47, 45, 49, 46, 16, 38, 37, 36, 40, 39, + /* 190 */ 850, 123, 38, 37, 36, 190, 674, 72, 26, 665, + /* 200 */ 167, 668, 667, 671, 670, 61, 168, 836, 837, 25, + /* 210 */ 840, 103, 102, 166, 190, 674, 758, 199, 665, 147, + /* 220 */ 668, 767, 671, 20, 147, 275, 274, 187, 188, 841, + /* 230 */ 273, 231, 272, 271, 270, 838, 269, 268, 846, 198, + /* 240 */ 823, 21, 249, 821, 822, 943, 187, 188, 824, 32, + /* 250 */ 826, 827, 825, 900, 828, 829, 123, 3, 137, 47, + /* 260 */ 45, 49, 46, 29, 78, 74, 77, 40, 39, 617, + /* 270 */ 214, 38, 37, 36, 233, 601, 759, 174, 598, 147, + /* 280 */ 599, 26, 600, 201, 89, 93, 254, 253, 26, 942, + /* 290 */ 83, 98, 101, 92, 26, 48, 153, 149, 26, 95, + /* 300 */ 175, 26, 151, 106, 105, 104, 202, 203, 673, 26, + /* 310 */ 69, 40, 39, 200, 48, 38, 37, 36, 68, 194, + /* 320 */ 10, 847, 63, 672, 71, 133, 195, 673, 847, 279, + /* 330 */ 278, 110, 250, 666, 847, 669, 251, 614, 847, 255, + /* 340 */ 116, 847, 672, 22, 621, 848, 609, 259, 32, 847, + /* 350 */ 218, 629, 633, 634, 217, 27, 120, 52, 18, 693, + /* 360 */ 675, 189, 53, 176, 17, 17, 590, 677, 56, 235, + /* 370 */ 591, 27, 100, 99, 27, 52, 82, 81, 12, 11, + /* 380 */ 161, 602, 54, 59, 162, 579, 57, 88, 87, 14, + /* 390 */ 13, 605, 603, 606, 604, 115, 113, 164, 165, 171, + /* 400 */ 911, 172, 170, 4, 157, 169, 160, 910, 192, 907, + /* 410 */ 906, 193, 258, 117, 871, 33, 878, 880, 119, 863, + /* 420 */ 893, 892, 134, 135, 132, 136, 769, 32, 239, 155, + /* 430 */ 30, 248, 766, 216, 962, 79, 961, 114, 959, 138, + /* 440 */ 252, 956, 85, 955, 628, 953, 221, 139, 182, 225, + /* 450 */ 787, 31, 28, 58, 156, 756, 94, 860, 55, 50, + /* 460 */ 754, 96, 230, 124, 228, 125, 97, 752, 126, 127, + /* 470 */ 226, 128, 224, 222, 751, 34, 204, 148, 90, 749, + /* 480 */ 260, 261, 262, 748, 747, 746, 745, 263, 150, 152, + /* 490 */ 742, 740, 264, 738, 736, 734, 265, 154, 266, 219, + /* 500 */ 64, 65, 894, 277, 712, 206, 207, 177, 237, 238, + /* 510 */ 711, 178, 173, 209, 75, 210, 710, 698, 217, 213, + /* 520 */ 750, 611, 107, 60, 744, 234, 142, 141, 788, 140, + /* 530 */ 143, 144, 146, 145, 1, 108, 743, 2, 109, 735, + /* 540 */ 66, 6, 184, 630, 845, 121, 223, 131, 129, 130, + /* 550 */ 635, 122, 5, 23, 7, 8, 24, 676, 9, 19, + /* 560 */ 678, 71, 73, 236, 548, 544, 542, 541, 540, 537, + /* 570 */ 511, 246, 76, 27, 51, 582, 80, 84, 581, 578, + /* 580 */ 532, 86, 530, 522, 528, 524, 526, 520, 518, 550, + /* 590 */ 549, 547, 546, 545, 543, 539, 538, 52, 509, 479, + /* 600 */ 477, 716, 715, 715, 715, 715, 715, 715, 715, 715, + /* 610 */ 715, 715, 715, 111, 112, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 268, 1, 268, 210, 211, 252, 268, 5, 230, 9, - /* 10 */ 278, 277, 278, 13, 14, 268, 16, 17, 213, 266, - /* 20 */ 20, 21, 1, 1, 24, 25, 26, 27, 28, 213, - /* 30 */ 9, 9, 254, 33, 34, 33, 34, 37, 38, 39, - /* 40 */ 13, 14, 268, 16, 17, 252, 254, 20, 21, 212, - /* 50 */ 213, 24, 25, 26, 27, 28, 251, 230, 253, 266, - /* 60 */ 33, 34, 268, 218, 37, 38, 39, 45, 46, 47, + /* 0 */ 214, 1, 270, 211, 212, 270, 270, 5, 231, 9, + /* 10 */ 1, 279, 280, 13, 14, 280, 16, 17, 214, 270, + /* 20 */ 20, 21, 1, 1, 24, 25, 26, 27, 28, 270, + /* 30 */ 9, 9, 255, 33, 34, 33, 34, 37, 38, 39, + /* 40 */ 13, 14, 214, 16, 17, 253, 37, 20, 21, 213, + /* 50 */ 214, 24, 25, 26, 27, 28, 252, 271, 254, 267, + /* 60 */ 33, 34, 255, 214, 37, 38, 39, 45, 46, 47, /* 70 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - /* 80 */ 66, 254, 60, 13, 14, 269, 16, 17, 77, 79, - /* 90 */ 20, 21, 268, 248, 24, 25, 26, 27, 28, 213, - /* 100 */ 213, 277, 278, 33, 34, 213, 106, 37, 38, 39, + /* 80 */ 74, 231, 60, 13, 14, 79, 16, 17, 0, 77, + /* 90 */ 20, 21, 270, 270, 24, 25, 26, 27, 28, 214, + /* 100 */ 272, 279, 280, 33, 34, 255, 106, 37, 38, 39, /* 110 */ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - /* 120 */ 96, 97, 98, 99, 100, 37, 38, 39, 229, 102, - /* 130 */ 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, - /* 140 */ 241, 242, 243, 244, 14, 131, 16, 17, 134, 135, - /* 150 */ 20, 21, 268, 230, 24, 25, 26, 27, 28, 272, - /* 160 */ 274, 274, 276, 33, 34, 101, 274, 37, 38, 39, - /* 170 */ 213, 16, 17, 109, 213, 20, 21, 254, 130, 24, - /* 180 */ 25, 26, 27, 28, 213, 137, 138, 217, 33, 34, - /* 190 */ 220, 254, 37, 38, 39, 1, 2, 213, 0, 5, - /* 200 */ 218, 7, 213, 9, 217, 1, 2, 220, 251, 5, - /* 210 */ 253, 7, 251, 9, 253, 1, 2, 44, 213, 5, - /* 220 */ 268, 7, 251, 9, 253, 101, 101, 33, 34, 105, - /* 230 */ 106, 37, 250, 60, 109, 66, 218, 33, 34, 66, - /* 240 */ 251, 37, 253, 213, 71, 72, 73, 33, 34, 268, - /* 250 */ 86, 213, 88, 89, 270, 246, 251, 93, 253, 95, - /* 260 */ 96, 97, 102, 99, 100, 247, 248, 249, 250, 229, - /* 270 */ 110, 74, 232, 233, 101, 77, 79, 237, 255, 239, - /* 280 */ 240, 241, 109, 243, 244, 25, 26, 27, 28, 251, - /* 290 */ 267, 253, 213, 33, 34, 101, 213, 37, 38, 39, - /* 300 */ 131, 102, 129, 134, 274, 101, 107, 113, 1, 136, - /* 310 */ 63, 64, 65, 217, 15, 101, 220, 113, 2, 119, - /* 320 */ 120, 5, 128, 7, 245, 9, 107, 113, 268, 33, - /* 330 */ 34, 112, 128, 37, 38, 39, 253, 268, 102, 61, - /* 340 */ 62, 59, 128, 107, 37, 67, 68, 69, 70, 33, - /* 350 */ 34, 74, 75, 102, 76, 61, 62, 268, 107, 61, - /* 360 */ 62, 67, 68, 69, 70, 67, 68, 69, 70, 102, - /* 370 */ 102, 102, 107, 107, 107, 107, 107, 5, 268, 7, - /* 380 */ 5, 102, 7, 101, 132, 133, 107, 102, 102, 268, - /* 390 */ 124, 126, 107, 107, 132, 133, 132, 133, 101, 5, - /* 400 */ 103, 7, 132, 133, 5, 268, 7, 108, 61, 62, - /* 410 */ 268, 268, 268, 268, 268, 252, 246, 246, 246, 213, - /* 420 */ 246, 246, 246, 213, 108, 213, 213, 275, 213, 275, - /* 430 */ 213, 213, 109, 256, 213, 213, 213, 213, 213, 213, - /* 440 */ 213, 213, 213, 213, 213, 213, 213, 213, 213, 59, - /* 450 */ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, - /* 460 */ 252, 213, 213, 213, 113, 123, 213, 213, 213, 213, - /* 470 */ 213, 213, 213, 271, 213, 125, 213, 122, 271, 117, - /* 480 */ 271, 265, 121, 263, 213, 213, 213, 213, 213, 213, - /* 490 */ 116, 115, 114, 213, 127, 214, 85, 214, 214, 84, - /* 500 */ 49, 214, 81, 83, 82, 53, 80, 77, 5, 139, - /* 510 */ 5, 5, 139, 5, 5, 214, 214, 214, 87, 214, - /* 520 */ 214, 130, 218, 110, 107, 102, 214, 111, 104, 215, - /* 530 */ 101, 1, 214, 222, 215, 226, 228, 227, 225, 224, - /* 540 */ 223, 221, 214, 219, 215, 252, 214, 216, 102, 258, - /* 550 */ 260, 262, 264, 261, 259, 101, 101, 257, 102, 101, - /* 560 */ 107, 118, 118, 102, 107, 101, 101, 108, 101, 74, - /* 570 */ 104, 9, 5, 105, 5, 5, 5, 5, 78, 15, - /* 580 */ 133, 74, 107, 133, 16, 5, 5, 102, 5, 5, - /* 590 */ 5, 5, 5, 133, 5, 5, 5, 5, 5, 5, - /* 600 */ 5, 5, 5, 5, 5, 107, 78, 59, 58, 21, - /* 610 */ 0, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 620 */ 279, 21, 279, 279, 279, 279, 279, 279, 279, 279, - /* 630 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 640 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 650 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 660 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 670 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 680 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 690 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 700 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 710 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 720 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 730 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 740 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 750 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 760 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 770 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 780 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 790 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 800 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 810 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 820 */ 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - /* 830 */ 279, + /* 120 */ 96, 97, 98, 99, 100, 276, 79, 278, 230, 102, + /* 130 */ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, + /* 140 */ 242, 243, 244, 245, 14, 131, 16, 17, 120, 121, + /* 150 */ 20, 21, 138, 139, 24, 25, 26, 27, 28, 274, + /* 160 */ 253, 276, 101, 33, 34, 77, 231, 37, 38, 39, + /* 170 */ 109, 16, 17, 66, 267, 20, 21, 255, 219, 24, + /* 180 */ 25, 26, 27, 28, 44, 37, 38, 39, 33, 34, + /* 190 */ 255, 214, 37, 38, 39, 1, 2, 219, 214, 5, + /* 200 */ 60, 7, 5, 9, 7, 219, 66, 248, 249, 250, + /* 210 */ 251, 71, 72, 73, 1, 2, 218, 66, 5, 221, + /* 220 */ 7, 218, 9, 86, 221, 88, 89, 33, 34, 251, + /* 230 */ 93, 37, 95, 96, 97, 249, 99, 100, 254, 132, + /* 240 */ 230, 101, 135, 233, 234, 270, 33, 34, 238, 109, + /* 250 */ 240, 241, 242, 276, 244, 245, 214, 61, 62, 25, + /* 260 */ 26, 27, 28, 67, 68, 69, 70, 33, 34, 37, + /* 270 */ 130, 37, 38, 39, 15, 2, 218, 137, 5, 221, + /* 280 */ 7, 214, 9, 132, 61, 62, 135, 136, 214, 270, + /* 290 */ 67, 68, 69, 70, 214, 101, 61, 62, 214, 76, + /* 300 */ 270, 214, 67, 68, 69, 70, 33, 34, 114, 214, + /* 310 */ 256, 33, 34, 214, 101, 37, 38, 39, 276, 252, + /* 320 */ 101, 254, 268, 129, 105, 106, 252, 114, 254, 63, + /* 330 */ 64, 65, 252, 5, 254, 7, 252, 107, 254, 252, + /* 340 */ 101, 254, 129, 113, 112, 246, 102, 252, 109, 254, + /* 350 */ 102, 102, 102, 102, 110, 107, 107, 107, 107, 102, + /* 360 */ 102, 59, 107, 270, 107, 107, 102, 108, 107, 102, + /* 370 */ 102, 107, 74, 75, 107, 107, 133, 134, 133, 134, + /* 380 */ 270, 108, 127, 101, 270, 103, 125, 133, 134, 133, + /* 390 */ 134, 5, 5, 7, 7, 61, 62, 270, 270, 270, + /* 400 */ 247, 270, 270, 101, 270, 270, 270, 247, 247, 247, + /* 410 */ 247, 247, 247, 214, 214, 269, 214, 214, 214, 253, + /* 420 */ 277, 277, 214, 214, 257, 214, 214, 109, 214, 214, + /* 430 */ 214, 214, 214, 253, 214, 214, 214, 59, 214, 214, + /* 440 */ 214, 214, 214, 214, 114, 214, 273, 214, 273, 273, + /* 450 */ 214, 214, 214, 124, 214, 214, 214, 266, 126, 123, + /* 460 */ 214, 214, 118, 265, 122, 264, 214, 214, 263, 262, + /* 470 */ 117, 261, 116, 115, 214, 128, 214, 214, 85, 214, + /* 480 */ 84, 49, 81, 214, 214, 214, 214, 83, 214, 214, + /* 490 */ 214, 214, 53, 214, 214, 214, 82, 214, 80, 215, + /* 500 */ 215, 215, 215, 77, 5, 140, 5, 215, 215, 215, + /* 510 */ 5, 215, 215, 140, 219, 5, 5, 87, 110, 131, + /* 520 */ 215, 102, 216, 111, 215, 104, 223, 227, 229, 228, + /* 530 */ 226, 224, 222, 225, 220, 216, 215, 217, 216, 215, + /* 540 */ 107, 101, 1, 102, 253, 101, 101, 258, 260, 259, + /* 550 */ 102, 101, 101, 107, 119, 119, 107, 102, 101, 101, + /* 560 */ 108, 105, 74, 104, 9, 5, 5, 5, 5, 5, + /* 570 */ 78, 15, 74, 107, 16, 5, 134, 134, 5, 102, + /* 580 */ 5, 134, 5, 5, 5, 5, 5, 5, 5, 5, + /* 590 */ 5, 5, 5, 5, 5, 5, 5, 107, 78, 59, + /* 600 */ 58, 0, 281, 281, 281, 281, 281, 281, 281, 281, + /* 610 */ 281, 281, 281, 21, 21, 281, 281, 281, 281, 281, + /* 620 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 630 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 640 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 650 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 660 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 670 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 680 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 690 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 700 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 710 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 720 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 730 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 740 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 750 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 760 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 770 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 780 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 790 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 800 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 810 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, + /* 820 */ 281, 281, 281, 281, 281, }; -#define YY_SHIFT_COUNT (281) +#define YY_SHIFT_COUNT (282) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (610) +#define YY_SHIFT_MAX (601) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 173, 24, 164, 11, 194, 214, 21, 21, 21, 21, - /* 10 */ 21, 21, 21, 21, 21, 0, 22, 214, 316, 316, - /* 20 */ 316, 125, 21, 21, 21, 198, 21, 21, 197, 11, - /* 30 */ 10, 10, 622, 204, 214, 214, 214, 214, 214, 214, - /* 40 */ 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, - /* 50 */ 214, 316, 316, 2, 2, 2, 2, 2, 2, 2, - /* 60 */ 64, 21, 21, 21, 21, 21, 200, 200, 219, 21, + /* 0 */ 140, 24, 137, 12, 194, 213, 21, 21, 21, 21, + /* 10 */ 21, 21, 21, 21, 21, 0, 22, 213, 273, 273, + /* 20 */ 273, 61, 21, 21, 21, 88, 21, 21, 6, 12, + /* 30 */ 47, 47, 615, 213, 213, 213, 213, 213, 213, 213, + /* 40 */ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, + /* 50 */ 213, 273, 273, 2, 2, 2, 2, 2, 2, 2, + /* 60 */ 239, 21, 21, 232, 21, 21, 21, 28, 28, 230, /* 70 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 80 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 90 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, /* 100 */ 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - /* 110 */ 21, 21, 21, 21, 21, 323, 390, 390, 390, 351, - /* 120 */ 351, 351, 390, 342, 350, 355, 362, 361, 374, 376, - /* 130 */ 378, 367, 323, 390, 390, 390, 11, 390, 390, 411, - /* 140 */ 415, 451, 421, 420, 452, 422, 426, 390, 430, 390, - /* 150 */ 430, 390, 430, 390, 622, 622, 27, 70, 70, 70, - /* 160 */ 130, 155, 260, 260, 260, 278, 294, 298, 296, 296, - /* 170 */ 296, 296, 14, 48, 88, 88, 124, 169, 247, 160, - /* 180 */ 199, 236, 251, 267, 268, 269, 372, 375, 307, 282, - /* 190 */ 299, 265, 266, 279, 285, 286, 252, 262, 264, 297, - /* 200 */ 270, 394, 399, 277, 347, 503, 370, 505, 506, 373, - /* 210 */ 508, 509, 431, 391, 413, 423, 416, 424, 429, 417, - /* 220 */ 446, 454, 530, 455, 456, 458, 453, 443, 457, 444, - /* 230 */ 461, 464, 459, 465, 424, 467, 466, 468, 495, 562, - /* 240 */ 567, 569, 570, 571, 572, 500, 564, 507, 447, 475, - /* 250 */ 475, 568, 450, 460, 475, 580, 581, 485, 475, 583, - /* 260 */ 584, 585, 586, 587, 589, 590, 591, 592, 593, 594, - /* 270 */ 595, 596, 597, 598, 599, 498, 528, 588, 600, 548, - /* 280 */ 550, 610, + /* 110 */ 21, 21, 21, 21, 21, 21, 318, 378, 378, 378, + /* 120 */ 330, 330, 330, 378, 329, 332, 336, 344, 342, 353, + /* 130 */ 356, 358, 347, 318, 378, 378, 378, 12, 378, 378, + /* 140 */ 393, 396, 432, 401, 404, 439, 414, 418, 378, 426, + /* 150 */ 378, 426, 378, 426, 378, 615, 615, 27, 70, 70, + /* 160 */ 70, 130, 155, 234, 234, 234, 223, 196, 235, 278, + /* 170 */ 278, 278, 278, 151, 14, 148, 148, 219, 107, 266, + /* 180 */ 244, 248, 249, 250, 251, 257, 258, 197, 328, 9, + /* 190 */ 302, 259, 255, 261, 264, 267, 268, 243, 245, 254, + /* 200 */ 282, 256, 386, 387, 298, 334, 499, 365, 501, 505, + /* 210 */ 373, 510, 511, 430, 388, 408, 419, 412, 421, 440, + /* 220 */ 433, 441, 444, 541, 445, 448, 450, 446, 435, 449, + /* 230 */ 436, 455, 451, 452, 457, 421, 458, 459, 456, 488, + /* 240 */ 555, 560, 561, 562, 563, 564, 492, 556, 498, 442, + /* 250 */ 466, 466, 558, 443, 447, 466, 570, 573, 477, 466, + /* 260 */ 575, 577, 578, 579, 580, 581, 582, 583, 584, 585, + /* 270 */ 586, 587, 588, 589, 590, 591, 490, 520, 592, 593, + /* 280 */ 540, 542, 601, }; -#define YY_REDUCE_COUNT (155) +#define YY_REDUCE_COUNT (156) #define YY_REDUCE_MIN (-268) -#define YY_REDUCE_MAX (332) +#define YY_REDUCE_MAX (324) static const short yy_reduce_ofst[] = { - /* 0 */ -207, -101, 40, 18, -266, -176, -195, -114, -113, -43, - /* 10 */ -39, -29, -11, 5, 38, -184, -163, -268, -222, -173, - /* 20 */ -77, -247, -16, -108, 30, -18, 79, 83, -30, -155, - /* 30 */ -13, 96, 23, -262, -253, -226, -206, -116, -48, -19, - /* 40 */ 60, 69, 89, 110, 121, 137, 142, 143, 144, 145, - /* 50 */ 146, -208, -63, 9, 170, 171, 172, 174, 175, 176, - /* 60 */ 163, 206, 210, 212, 213, 215, 152, 154, 177, 217, - /* 70 */ 218, 221, 222, 223, 224, 225, 226, 227, 228, 229, - /* 80 */ 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, - /* 90 */ 241, 242, 243, 244, 245, 246, 248, 249, 250, 253, - /* 100 */ 254, 255, 256, 257, 258, 259, 261, 263, 271, 272, - /* 110 */ 273, 274, 275, 276, 280, 208, 281, 283, 284, 202, - /* 120 */ 207, 209, 287, 216, 288, 220, 289, 292, 290, 295, - /* 130 */ 291, 300, 293, 301, 302, 303, 304, 305, 306, 308, - /* 140 */ 310, 309, 311, 313, 317, 315, 320, 312, 314, 318, - /* 150 */ 319, 328, 329, 332, 324, 331, + /* 0 */ -208, -102, 10, -41, -268, -178, -196, -151, -115, 67, + /* 10 */ 74, 80, 84, 87, 95, -214, -164, -265, -223, -150, + /* 20 */ -65, -93, -172, -23, 42, -22, 99, -16, -2, -14, + /* 30 */ 3, 58, 54, -264, -251, -241, -177, -25, 19, 30, + /* 40 */ 93, 110, 114, 127, 128, 129, 131, 132, 134, 135, + /* 50 */ 136, -193, -78, 153, 160, 161, 162, 163, 164, 165, + /* 60 */ 166, 199, 200, 146, 202, 203, 204, 143, 144, 167, + /* 70 */ 208, 209, 211, 212, 214, 215, 216, 217, 218, 220, + /* 80 */ 221, 222, 224, 225, 226, 227, 228, 229, 231, 233, + /* 90 */ 236, 237, 238, 240, 241, 242, 246, 247, 252, 253, + /* 100 */ 260, 262, 263, 265, 269, 270, 271, 272, 274, 275, + /* 110 */ 276, 277, 279, 280, 281, 283, 180, 284, 285, 286, + /* 120 */ 173, 175, 176, 287, 191, 198, 201, 205, 207, 210, + /* 130 */ 288, 290, 289, 291, 292, 293, 294, 295, 296, 297, + /* 140 */ 299, 301, 300, 303, 304, 307, 308, 310, 305, 306, + /* 150 */ 309, 319, 321, 322, 324, 314, 320, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 709, 764, 753, 761, 944, 944, 709, 709, 709, 709, - /* 10 */ 709, 709, 709, 709, 709, 869, 727, 944, 709, 709, - /* 20 */ 709, 709, 709, 709, 709, 761, 709, 709, 766, 761, - /* 30 */ 766, 766, 864, 709, 709, 709, 709, 709, 709, 709, - /* 40 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - /* 50 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - /* 60 */ 709, 709, 709, 871, 873, 709, 891, 891, 862, 709, - /* 70 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - /* 80 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - /* 90 */ 709, 709, 709, 751, 709, 749, 709, 709, 709, 709, - /* 100 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 737, - /* 110 */ 709, 709, 709, 709, 709, 709, 729, 729, 729, 709, - /* 120 */ 709, 709, 729, 898, 902, 896, 884, 892, 883, 879, - /* 130 */ 878, 906, 709, 729, 729, 729, 761, 729, 729, 782, - /* 140 */ 780, 778, 770, 776, 772, 774, 768, 729, 759, 729, - /* 150 */ 759, 729, 759, 729, 800, 816, 709, 907, 943, 897, - /* 160 */ 933, 932, 939, 931, 930, 709, 709, 709, 926, 927, - /* 170 */ 929, 928, 709, 709, 935, 934, 709, 709, 709, 709, - /* 180 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 909, - /* 190 */ 709, 903, 899, 709, 709, 709, 709, 709, 709, 826, - /* 200 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - /* 210 */ 709, 709, 709, 709, 861, 709, 709, 709, 709, 870, - /* 220 */ 709, 709, 709, 709, 709, 709, 893, 709, 885, 709, - /* 230 */ 709, 709, 709, 709, 838, 709, 709, 709, 709, 709, - /* 240 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 954, - /* 250 */ 952, 709, 709, 709, 948, 709, 709, 709, 946, 709, - /* 260 */ 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - /* 270 */ 709, 709, 709, 709, 709, 785, 709, 735, 733, 709, - /* 280 */ 725, 709, + /* 0 */ 713, 768, 757, 765, 950, 950, 713, 713, 713, 713, + /* 10 */ 713, 713, 713, 713, 713, 873, 731, 950, 713, 713, + /* 20 */ 713, 713, 713, 713, 713, 765, 713, 713, 770, 765, + /* 30 */ 770, 770, 868, 713, 713, 713, 713, 713, 713, 713, + /* 40 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 50 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 60 */ 713, 713, 713, 875, 877, 879, 713, 897, 897, 866, + /* 70 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 80 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 90 */ 713, 713, 713, 713, 755, 713, 753, 713, 713, 713, + /* 100 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 110 */ 741, 713, 713, 713, 713, 713, 713, 733, 733, 733, + /* 120 */ 713, 713, 713, 733, 904, 908, 902, 890, 898, 889, + /* 130 */ 885, 884, 912, 713, 733, 733, 733, 765, 733, 733, + /* 140 */ 786, 784, 782, 774, 780, 776, 778, 772, 733, 763, + /* 150 */ 733, 763, 733, 763, 733, 804, 820, 713, 913, 949, + /* 160 */ 903, 939, 938, 945, 937, 936, 713, 713, 713, 932, + /* 170 */ 933, 935, 934, 713, 713, 941, 940, 713, 713, 713, + /* 180 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 190 */ 915, 713, 909, 905, 713, 713, 713, 713, 713, 713, + /* 200 */ 830, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 210 */ 713, 713, 713, 713, 713, 865, 713, 713, 713, 713, + /* 220 */ 876, 713, 713, 713, 713, 713, 713, 899, 713, 891, + /* 230 */ 713, 713, 713, 713, 713, 842, 713, 713, 713, 713, + /* 240 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 250 */ 960, 958, 713, 713, 713, 954, 713, 713, 713, 952, + /* 260 */ 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, + /* 270 */ 713, 713, 713, 713, 713, 713, 789, 713, 739, 737, + /* 280 */ 713, 729, 713, }; /********** End of lemon-generated parsing tables *****************************/ @@ -571,6 +569,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* SELECT => nothing */ 0, /* UNION => nothing */ 1, /* ALL => ID */ + 0, /* DISTINCT => nothing */ 0, /* FROM => nothing */ 0, /* VARIABLE => nothing */ 0, /* INTERVAL => nothing */ @@ -866,173 +865,175 @@ static const char *const yyTokenName[] = { /* 109 */ "SELECT", /* 110 */ "UNION", /* 111 */ "ALL", - /* 112 */ "FROM", - /* 113 */ "VARIABLE", - /* 114 */ "INTERVAL", - /* 115 */ "FILL", - /* 116 */ "SLIDING", - /* 117 */ "ORDER", - /* 118 */ "BY", - /* 119 */ "ASC", - /* 120 */ "DESC", - /* 121 */ "GROUP", - /* 122 */ "HAVING", - /* 123 */ "LIMIT", - /* 124 */ "OFFSET", - /* 125 */ "SLIMIT", - /* 126 */ "SOFFSET", - /* 127 */ "WHERE", - /* 128 */ "NOW", - /* 129 */ "RESET", - /* 130 */ "QUERY", - /* 131 */ "ADD", - /* 132 */ "COLUMN", - /* 133 */ "TAG", - /* 134 */ "CHANGE", - /* 135 */ "SET", - /* 136 */ "KILL", - /* 137 */ "CONNECTION", - /* 138 */ "STREAM", - /* 139 */ "COLON", - /* 140 */ "ABORT", - /* 141 */ "AFTER", - /* 142 */ "ATTACH", - /* 143 */ "BEFORE", - /* 144 */ "BEGIN", - /* 145 */ "CASCADE", - /* 146 */ "CLUSTER", - /* 147 */ "CONFLICT", - /* 148 */ "COPY", - /* 149 */ "DEFERRED", - /* 150 */ "DELIMITERS", - /* 151 */ "DETACH", - /* 152 */ "EACH", - /* 153 */ "END", - /* 154 */ "EXPLAIN", - /* 155 */ "FAIL", - /* 156 */ "FOR", - /* 157 */ "IGNORE", - /* 158 */ "IMMEDIATE", - /* 159 */ "INITIALLY", - /* 160 */ "INSTEAD", - /* 161 */ "MATCH", - /* 162 */ "KEY", - /* 163 */ "OF", - /* 164 */ "RAISE", - /* 165 */ "REPLACE", - /* 166 */ "RESTRICT", - /* 167 */ "ROW", - /* 168 */ "STATEMENT", - /* 169 */ "TRIGGER", - /* 170 */ "VIEW", - /* 171 */ "COUNT", - /* 172 */ "SUM", - /* 173 */ "AVG", - /* 174 */ "MIN", - /* 175 */ "MAX", - /* 176 */ "FIRST", - /* 177 */ "LAST", - /* 178 */ "TOP", - /* 179 */ "BOTTOM", - /* 180 */ "STDDEV", - /* 181 */ "PERCENTILE", - /* 182 */ "APERCENTILE", - /* 183 */ "LEASTSQUARES", - /* 184 */ "HISTOGRAM", - /* 185 */ "DIFF", - /* 186 */ "SPREAD", - /* 187 */ "TWA", - /* 188 */ "INTERP", - /* 189 */ "LAST_ROW", - /* 190 */ "RATE", - /* 191 */ "IRATE", - /* 192 */ "SUM_RATE", - /* 193 */ "SUM_IRATE", - /* 194 */ "AVG_RATE", - /* 195 */ "AVG_IRATE", - /* 196 */ "TBID", - /* 197 */ "SEMI", - /* 198 */ "NONE", - /* 199 */ "PREV", - /* 200 */ "LINEAR", - /* 201 */ "IMPORT", - /* 202 */ "METRIC", - /* 203 */ "TBNAME", - /* 204 */ "JOIN", - /* 205 */ "METRICS", - /* 206 */ "INSERT", - /* 207 */ "INTO", - /* 208 */ "VALUES", - /* 209 */ "error", - /* 210 */ "program", - /* 211 */ "cmd", - /* 212 */ "dbPrefix", - /* 213 */ "ids", - /* 214 */ "cpxName", - /* 215 */ "ifexists", - /* 216 */ "alter_db_optr", - /* 217 */ "acct_optr", - /* 218 */ "ifnotexists", - /* 219 */ "db_optr", - /* 220 */ "pps", - /* 221 */ "tseries", - /* 222 */ "dbs", - /* 223 */ "streams", - /* 224 */ "storage", - /* 225 */ "qtime", - /* 226 */ "users", - /* 227 */ "conns", - /* 228 */ "state", - /* 229 */ "keep", - /* 230 */ "tagitemlist", - /* 231 */ "cache", - /* 232 */ "replica", - /* 233 */ "quorum", - /* 234 */ "days", - /* 235 */ "minrows", - /* 236 */ "maxrows", - /* 237 */ "blocks", - /* 238 */ "ctime", - /* 239 */ "wal", - /* 240 */ "fsync", - /* 241 */ "comp", - /* 242 */ "prec", - /* 243 */ "update", - /* 244 */ "cachelast", - /* 245 */ "typename", - /* 246 */ "signed", - /* 247 */ "create_table_args", - /* 248 */ "create_stable_args", - /* 249 */ "create_table_list", - /* 250 */ "create_from_stable", - /* 251 */ "columnlist", - /* 252 */ "select", - /* 253 */ "column", - /* 254 */ "tagitem", - /* 255 */ "selcollist", - /* 256 */ "from", - /* 257 */ "where_opt", - /* 258 */ "interval_opt", - /* 259 */ "fill_opt", - /* 260 */ "sliding_opt", - /* 261 */ "groupby_opt", - /* 262 */ "orderby_opt", - /* 263 */ "having_opt", - /* 264 */ "slimit_opt", - /* 265 */ "limit_opt", - /* 266 */ "union", - /* 267 */ "sclp", - /* 268 */ "expr", - /* 269 */ "as", - /* 270 */ "tablelist", - /* 271 */ "tmvar", - /* 272 */ "sortlist", - /* 273 */ "sortitem", - /* 274 */ "item", - /* 275 */ "sortorder", - /* 276 */ "grouplist", - /* 277 */ "exprlist", - /* 278 */ "expritem", + /* 112 */ "DISTINCT", + /* 113 */ "FROM", + /* 114 */ "VARIABLE", + /* 115 */ "INTERVAL", + /* 116 */ "FILL", + /* 117 */ "SLIDING", + /* 118 */ "ORDER", + /* 119 */ "BY", + /* 120 */ "ASC", + /* 121 */ "DESC", + /* 122 */ "GROUP", + /* 123 */ "HAVING", + /* 124 */ "LIMIT", + /* 125 */ "OFFSET", + /* 126 */ "SLIMIT", + /* 127 */ "SOFFSET", + /* 128 */ "WHERE", + /* 129 */ "NOW", + /* 130 */ "RESET", + /* 131 */ "QUERY", + /* 132 */ "ADD", + /* 133 */ "COLUMN", + /* 134 */ "TAG", + /* 135 */ "CHANGE", + /* 136 */ "SET", + /* 137 */ "KILL", + /* 138 */ "CONNECTION", + /* 139 */ "STREAM", + /* 140 */ "COLON", + /* 141 */ "ABORT", + /* 142 */ "AFTER", + /* 143 */ "ATTACH", + /* 144 */ "BEFORE", + /* 145 */ "BEGIN", + /* 146 */ "CASCADE", + /* 147 */ "CLUSTER", + /* 148 */ "CONFLICT", + /* 149 */ "COPY", + /* 150 */ "DEFERRED", + /* 151 */ "DELIMITERS", + /* 152 */ "DETACH", + /* 153 */ "EACH", + /* 154 */ "END", + /* 155 */ "EXPLAIN", + /* 156 */ "FAIL", + /* 157 */ "FOR", + /* 158 */ "IGNORE", + /* 159 */ "IMMEDIATE", + /* 160 */ "INITIALLY", + /* 161 */ "INSTEAD", + /* 162 */ "MATCH", + /* 163 */ "KEY", + /* 164 */ "OF", + /* 165 */ "RAISE", + /* 166 */ "REPLACE", + /* 167 */ "RESTRICT", + /* 168 */ "ROW", + /* 169 */ "STATEMENT", + /* 170 */ "TRIGGER", + /* 171 */ "VIEW", + /* 172 */ "COUNT", + /* 173 */ "SUM", + /* 174 */ "AVG", + /* 175 */ "MIN", + /* 176 */ "MAX", + /* 177 */ "FIRST", + /* 178 */ "LAST", + /* 179 */ "TOP", + /* 180 */ "BOTTOM", + /* 181 */ "STDDEV", + /* 182 */ "PERCENTILE", + /* 183 */ "APERCENTILE", + /* 184 */ "LEASTSQUARES", + /* 185 */ "HISTOGRAM", + /* 186 */ "DIFF", + /* 187 */ "SPREAD", + /* 188 */ "TWA", + /* 189 */ "INTERP", + /* 190 */ "LAST_ROW", + /* 191 */ "RATE", + /* 192 */ "IRATE", + /* 193 */ "SUM_RATE", + /* 194 */ "SUM_IRATE", + /* 195 */ "AVG_RATE", + /* 196 */ "AVG_IRATE", + /* 197 */ "TBID", + /* 198 */ "SEMI", + /* 199 */ "NONE", + /* 200 */ "PREV", + /* 201 */ "LINEAR", + /* 202 */ "IMPORT", + /* 203 */ "METRIC", + /* 204 */ "TBNAME", + /* 205 */ "JOIN", + /* 206 */ "METRICS", + /* 207 */ "INSERT", + /* 208 */ "INTO", + /* 209 */ "VALUES", + /* 210 */ "error", + /* 211 */ "program", + /* 212 */ "cmd", + /* 213 */ "dbPrefix", + /* 214 */ "ids", + /* 215 */ "cpxName", + /* 216 */ "ifexists", + /* 217 */ "alter_db_optr", + /* 218 */ "acct_optr", + /* 219 */ "ifnotexists", + /* 220 */ "db_optr", + /* 221 */ "pps", + /* 222 */ "tseries", + /* 223 */ "dbs", + /* 224 */ "streams", + /* 225 */ "storage", + /* 226 */ "qtime", + /* 227 */ "users", + /* 228 */ "conns", + /* 229 */ "state", + /* 230 */ "keep", + /* 231 */ "tagitemlist", + /* 232 */ "cache", + /* 233 */ "replica", + /* 234 */ "quorum", + /* 235 */ "days", + /* 236 */ "minrows", + /* 237 */ "maxrows", + /* 238 */ "blocks", + /* 239 */ "ctime", + /* 240 */ "wal", + /* 241 */ "fsync", + /* 242 */ "comp", + /* 243 */ "prec", + /* 244 */ "update", + /* 245 */ "cachelast", + /* 246 */ "typename", + /* 247 */ "signed", + /* 248 */ "create_table_args", + /* 249 */ "create_stable_args", + /* 250 */ "create_table_list", + /* 251 */ "create_from_stable", + /* 252 */ "columnlist", + /* 253 */ "select", + /* 254 */ "column", + /* 255 */ "tagitem", + /* 256 */ "selcollist", + /* 257 */ "from", + /* 258 */ "where_opt", + /* 259 */ "interval_opt", + /* 260 */ "fill_opt", + /* 261 */ "sliding_opt", + /* 262 */ "groupby_opt", + /* 263 */ "orderby_opt", + /* 264 */ "having_opt", + /* 265 */ "slimit_opt", + /* 266 */ "limit_opt", + /* 267 */ "union", + /* 268 */ "sclp", + /* 269 */ "distinct", + /* 270 */ "expr", + /* 271 */ "as", + /* 272 */ "tablelist", + /* 273 */ "tmvar", + /* 274 */ "sortlist", + /* 275 */ "sortitem", + /* 276 */ "item", + /* 277 */ "sortorder", + /* 278 */ "grouplist", + /* 279 */ "exprlist", + /* 280 */ "expritem", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1193,101 +1194,103 @@ static const char *const yyRuleName[] = { /* 150 */ "select ::= SELECT selcollist", /* 151 */ "sclp ::= selcollist COMMA", /* 152 */ "sclp ::=", - /* 153 */ "selcollist ::= sclp expr as", + /* 153 */ "selcollist ::= sclp distinct expr as", /* 154 */ "selcollist ::= sclp STAR", /* 155 */ "as ::= AS ids", /* 156 */ "as ::= ids", /* 157 */ "as ::=", - /* 158 */ "from ::= FROM tablelist", - /* 159 */ "tablelist ::= ids cpxName", - /* 160 */ "tablelist ::= ids cpxName ids", - /* 161 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 162 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 163 */ "tmvar ::= VARIABLE", - /* 164 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 165 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 166 */ "interval_opt ::=", - /* 167 */ "fill_opt ::=", - /* 168 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 169 */ "fill_opt ::= FILL LP ID RP", - /* 170 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 171 */ "sliding_opt ::=", - /* 172 */ "orderby_opt ::=", - /* 173 */ "orderby_opt ::= ORDER BY sortlist", - /* 174 */ "sortlist ::= sortlist COMMA item sortorder", - /* 175 */ "sortlist ::= item sortorder", - /* 176 */ "item ::= ids cpxName", - /* 177 */ "sortorder ::= ASC", - /* 178 */ "sortorder ::= DESC", - /* 179 */ "sortorder ::=", - /* 180 */ "groupby_opt ::=", - /* 181 */ "groupby_opt ::= GROUP BY grouplist", - /* 182 */ "grouplist ::= grouplist COMMA item", - /* 183 */ "grouplist ::= item", - /* 184 */ "having_opt ::=", - /* 185 */ "having_opt ::= HAVING expr", - /* 186 */ "limit_opt ::=", - /* 187 */ "limit_opt ::= LIMIT signed", - /* 188 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 189 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 190 */ "slimit_opt ::=", - /* 191 */ "slimit_opt ::= SLIMIT signed", - /* 192 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 193 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 194 */ "where_opt ::=", - /* 195 */ "where_opt ::= WHERE expr", - /* 196 */ "expr ::= LP expr RP", - /* 197 */ "expr ::= ID", - /* 198 */ "expr ::= ID DOT ID", - /* 199 */ "expr ::= ID DOT STAR", - /* 200 */ "expr ::= INTEGER", - /* 201 */ "expr ::= MINUS INTEGER", - /* 202 */ "expr ::= PLUS INTEGER", - /* 203 */ "expr ::= FLOAT", - /* 204 */ "expr ::= MINUS FLOAT", - /* 205 */ "expr ::= PLUS FLOAT", - /* 206 */ "expr ::= STRING", - /* 207 */ "expr ::= NOW", - /* 208 */ "expr ::= VARIABLE", - /* 209 */ "expr ::= BOOL", - /* 210 */ "expr ::= ID LP exprlist RP", - /* 211 */ "expr ::= ID LP STAR RP", - /* 212 */ "expr ::= expr IS NULL", - /* 213 */ "expr ::= expr IS NOT NULL", - /* 214 */ "expr ::= expr LT expr", - /* 215 */ "expr ::= expr GT expr", - /* 216 */ "expr ::= expr LE expr", - /* 217 */ "expr ::= expr GE expr", - /* 218 */ "expr ::= expr NE expr", - /* 219 */ "expr ::= expr EQ expr", - /* 220 */ "expr ::= expr AND expr", - /* 221 */ "expr ::= expr OR expr", - /* 222 */ "expr ::= expr PLUS expr", - /* 223 */ "expr ::= expr MINUS expr", - /* 224 */ "expr ::= expr STAR expr", - /* 225 */ "expr ::= expr SLASH expr", - /* 226 */ "expr ::= expr REM expr", - /* 227 */ "expr ::= expr LIKE expr", - /* 228 */ "expr ::= expr IN LP exprlist RP", - /* 229 */ "exprlist ::= exprlist COMMA expritem", - /* 230 */ "exprlist ::= expritem", - /* 231 */ "expritem ::= expr", - /* 232 */ "expritem ::=", - /* 233 */ "cmd ::= RESET QUERY CACHE", - /* 234 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 235 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 236 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 237 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 238 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 239 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 240 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 241 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 242 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 243 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 244 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 245 */ "cmd ::= KILL CONNECTION INTEGER", - /* 246 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 247 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 158 */ "distinct ::= DISTINCT", + /* 159 */ "distinct ::=", + /* 160 */ "from ::= FROM tablelist", + /* 161 */ "tablelist ::= ids cpxName", + /* 162 */ "tablelist ::= ids cpxName ids", + /* 163 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 164 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 165 */ "tmvar ::= VARIABLE", + /* 166 */ "interval_opt ::= INTERVAL LP tmvar RP", + /* 167 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 168 */ "interval_opt ::=", + /* 169 */ "fill_opt ::=", + /* 170 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 171 */ "fill_opt ::= FILL LP ID RP", + /* 172 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 173 */ "sliding_opt ::=", + /* 174 */ "orderby_opt ::=", + /* 175 */ "orderby_opt ::= ORDER BY sortlist", + /* 176 */ "sortlist ::= sortlist COMMA item sortorder", + /* 177 */ "sortlist ::= item sortorder", + /* 178 */ "item ::= ids cpxName", + /* 179 */ "sortorder ::= ASC", + /* 180 */ "sortorder ::= DESC", + /* 181 */ "sortorder ::=", + /* 182 */ "groupby_opt ::=", + /* 183 */ "groupby_opt ::= GROUP BY grouplist", + /* 184 */ "grouplist ::= grouplist COMMA item", + /* 185 */ "grouplist ::= item", + /* 186 */ "having_opt ::=", + /* 187 */ "having_opt ::= HAVING expr", + /* 188 */ "limit_opt ::=", + /* 189 */ "limit_opt ::= LIMIT signed", + /* 190 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 191 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 192 */ "slimit_opt ::=", + /* 193 */ "slimit_opt ::= SLIMIT signed", + /* 194 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 195 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 196 */ "where_opt ::=", + /* 197 */ "where_opt ::= WHERE expr", + /* 198 */ "expr ::= LP expr RP", + /* 199 */ "expr ::= ID", + /* 200 */ "expr ::= ID DOT ID", + /* 201 */ "expr ::= ID DOT STAR", + /* 202 */ "expr ::= INTEGER", + /* 203 */ "expr ::= MINUS INTEGER", + /* 204 */ "expr ::= PLUS INTEGER", + /* 205 */ "expr ::= FLOAT", + /* 206 */ "expr ::= MINUS FLOAT", + /* 207 */ "expr ::= PLUS FLOAT", + /* 208 */ "expr ::= STRING", + /* 209 */ "expr ::= NOW", + /* 210 */ "expr ::= VARIABLE", + /* 211 */ "expr ::= BOOL", + /* 212 */ "expr ::= ID LP exprlist RP", + /* 213 */ "expr ::= ID LP STAR RP", + /* 214 */ "expr ::= expr IS NULL", + /* 215 */ "expr ::= expr IS NOT NULL", + /* 216 */ "expr ::= expr LT expr", + /* 217 */ "expr ::= expr GT expr", + /* 218 */ "expr ::= expr LE expr", + /* 219 */ "expr ::= expr GE expr", + /* 220 */ "expr ::= expr NE expr", + /* 221 */ "expr ::= expr EQ expr", + /* 222 */ "expr ::= expr AND expr", + /* 223 */ "expr ::= expr OR expr", + /* 224 */ "expr ::= expr PLUS expr", + /* 225 */ "expr ::= expr MINUS expr", + /* 226 */ "expr ::= expr STAR expr", + /* 227 */ "expr ::= expr SLASH expr", + /* 228 */ "expr ::= expr REM expr", + /* 229 */ "expr ::= expr LIKE expr", + /* 230 */ "expr ::= expr IN LP exprlist RP", + /* 231 */ "exprlist ::= exprlist COMMA expritem", + /* 232 */ "exprlist ::= expritem", + /* 233 */ "expritem ::= expr", + /* 234 */ "expritem ::=", + /* 235 */ "cmd ::= RESET QUERY CACHE", + /* 236 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 237 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 238 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 239 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 240 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 241 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 242 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 243 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 244 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 245 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 246 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 247 */ "cmd ::= KILL CONNECTION INTEGER", + /* 248 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 249 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -1408,51 +1411,51 @@ static void yy_destructor( ** inside the C code. */ /********* Begin destructor definitions ***************************************/ - case 229: /* keep */ - case 230: /* tagitemlist */ - case 251: /* columnlist */ - case 259: /* fill_opt */ - case 261: /* groupby_opt */ - case 262: /* orderby_opt */ - case 272: /* sortlist */ - case 276: /* grouplist */ + case 230: /* keep */ + case 231: /* tagitemlist */ + case 252: /* columnlist */ + case 260: /* fill_opt */ + case 262: /* groupby_opt */ + case 263: /* orderby_opt */ + case 274: /* sortlist */ + case 278: /* grouplist */ { -taosArrayDestroy((yypminor->yy135)); +taosArrayDestroy((yypminor->yy247)); } break; - case 249: /* create_table_list */ + case 250: /* create_table_list */ { -destroyCreateTableSql((yypminor->yy38)); +destroyCreateTableSql((yypminor->yy358)); } break; - case 252: /* select */ + case 253: /* select */ { -doDestroyQuerySql((yypminor->yy30)); +doDestroyQuerySql((yypminor->yy114)); } break; - case 255: /* selcollist */ - case 267: /* sclp */ - case 277: /* exprlist */ + case 256: /* selcollist */ + case 268: /* sclp */ + case 279: /* exprlist */ { -tSqlExprListDestroy((yypminor->yy266)); +tSqlExprListDestroy((yypminor->yy522)); } break; - case 257: /* where_opt */ - case 263: /* having_opt */ - case 268: /* expr */ - case 278: /* expritem */ + case 258: /* where_opt */ + case 264: /* having_opt */ + case 270: /* expr */ + case 280: /* expritem */ { -tSqlExprDestroy((yypminor->yy316)); +tSqlExprDestroy((yypminor->yy326)); } break; - case 266: /* union */ + case 267: /* union */ { -destroyAllSelectClause((yypminor->yy153)); +destroyAllSelectClause((yypminor->yy219)); } break; - case 273: /* sortitem */ + case 275: /* sortitem */ { -tVariantDestroy(&(yypminor->yy308)); +tVariantDestroy(&(yypminor->yy378)); } break; /********* End destructor definitions *****************************************/ @@ -1746,254 +1749,256 @@ static const struct { YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ signed char nrhs; /* Negative of the number of RHS symbols in the rule */ } yyRuleInfo[] = { - { 210, -1 }, /* (0) program ::= cmd */ - { 211, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 211, -2 }, /* (2) cmd ::= SHOW MNODES */ - { 211, -2 }, /* (3) cmd ::= SHOW DNODES */ - { 211, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */ - { 211, -2 }, /* (5) cmd ::= SHOW USERS */ - { 211, -2 }, /* (6) cmd ::= SHOW MODULES */ - { 211, -2 }, /* (7) cmd ::= SHOW QUERIES */ - { 211, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */ - { 211, -2 }, /* (9) cmd ::= SHOW STREAMS */ - { 211, -2 }, /* (10) cmd ::= SHOW VARIABLES */ - { 211, -2 }, /* (11) cmd ::= SHOW SCORES */ - { 211, -2 }, /* (12) cmd ::= SHOW GRANTS */ - { 211, -2 }, /* (13) cmd ::= SHOW VNODES */ - { 211, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */ - { 212, 0 }, /* (15) dbPrefix ::= */ - { 212, -2 }, /* (16) dbPrefix ::= ids DOT */ - { 214, 0 }, /* (17) cpxName ::= */ - { 214, -2 }, /* (18) cpxName ::= DOT ids */ - { 211, -5 }, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 211, -4 }, /* (20) cmd ::= SHOW CREATE DATABASE ids */ - { 211, -3 }, /* (21) cmd ::= SHOW dbPrefix TABLES */ - { 211, -5 }, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 211, -3 }, /* (23) cmd ::= SHOW dbPrefix STABLES */ - { 211, -5 }, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 211, -3 }, /* (25) cmd ::= SHOW dbPrefix VGROUPS */ - { 211, -4 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 211, -5 }, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */ - { 211, -5 }, /* (28) cmd ::= DROP STABLE ifexists ids cpxName */ - { 211, -4 }, /* (29) cmd ::= DROP DATABASE ifexists ids */ - { 211, -3 }, /* (30) cmd ::= DROP DNODE ids */ - { 211, -3 }, /* (31) cmd ::= DROP USER ids */ - { 211, -3 }, /* (32) cmd ::= DROP ACCOUNT ids */ - { 211, -2 }, /* (33) cmd ::= USE ids */ - { 211, -3 }, /* (34) cmd ::= DESCRIBE ids cpxName */ - { 211, -5 }, /* (35) cmd ::= ALTER USER ids PASS ids */ - { 211, -5 }, /* (36) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 211, -4 }, /* (37) cmd ::= ALTER DNODE ids ids */ - { 211, -5 }, /* (38) cmd ::= ALTER DNODE ids ids ids */ - { 211, -3 }, /* (39) cmd ::= ALTER LOCAL ids */ - { 211, -4 }, /* (40) cmd ::= ALTER LOCAL ids ids */ - { 211, -4 }, /* (41) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 211, -4 }, /* (42) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 211, -6 }, /* (43) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 213, -1 }, /* (44) ids ::= ID */ - { 213, -1 }, /* (45) ids ::= STRING */ - { 215, -2 }, /* (46) ifexists ::= IF EXISTS */ - { 215, 0 }, /* (47) ifexists ::= */ - { 218, -3 }, /* (48) ifnotexists ::= IF NOT EXISTS */ - { 218, 0 }, /* (49) ifnotexists ::= */ - { 211, -3 }, /* (50) cmd ::= CREATE DNODE ids */ - { 211, -6 }, /* (51) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 211, -5 }, /* (52) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 211, -5 }, /* (53) cmd ::= CREATE USER ids PASS ids */ - { 220, 0 }, /* (54) pps ::= */ - { 220, -2 }, /* (55) pps ::= PPS INTEGER */ - { 221, 0 }, /* (56) tseries ::= */ - { 221, -2 }, /* (57) tseries ::= TSERIES INTEGER */ - { 222, 0 }, /* (58) dbs ::= */ - { 222, -2 }, /* (59) dbs ::= DBS INTEGER */ - { 223, 0 }, /* (60) streams ::= */ - { 223, -2 }, /* (61) streams ::= STREAMS INTEGER */ - { 224, 0 }, /* (62) storage ::= */ - { 224, -2 }, /* (63) storage ::= STORAGE INTEGER */ - { 225, 0 }, /* (64) qtime ::= */ - { 225, -2 }, /* (65) qtime ::= QTIME INTEGER */ - { 226, 0 }, /* (66) users ::= */ - { 226, -2 }, /* (67) users ::= USERS INTEGER */ - { 227, 0 }, /* (68) conns ::= */ - { 227, -2 }, /* (69) conns ::= CONNS INTEGER */ - { 228, 0 }, /* (70) state ::= */ - { 228, -2 }, /* (71) state ::= STATE ids */ - { 217, -9 }, /* (72) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 229, -2 }, /* (73) keep ::= KEEP tagitemlist */ - { 231, -2 }, /* (74) cache ::= CACHE INTEGER */ - { 232, -2 }, /* (75) replica ::= REPLICA INTEGER */ - { 233, -2 }, /* (76) quorum ::= QUORUM INTEGER */ - { 234, -2 }, /* (77) days ::= DAYS INTEGER */ - { 235, -2 }, /* (78) minrows ::= MINROWS INTEGER */ - { 236, -2 }, /* (79) maxrows ::= MAXROWS INTEGER */ - { 237, -2 }, /* (80) blocks ::= BLOCKS INTEGER */ - { 238, -2 }, /* (81) ctime ::= CTIME INTEGER */ - { 239, -2 }, /* (82) wal ::= WAL INTEGER */ - { 240, -2 }, /* (83) fsync ::= FSYNC INTEGER */ - { 241, -2 }, /* (84) comp ::= COMP INTEGER */ - { 242, -2 }, /* (85) prec ::= PRECISION STRING */ - { 243, -2 }, /* (86) update ::= UPDATE INTEGER */ - { 244, -2 }, /* (87) cachelast ::= CACHELAST INTEGER */ - { 219, 0 }, /* (88) db_optr ::= */ - { 219, -2 }, /* (89) db_optr ::= db_optr cache */ - { 219, -2 }, /* (90) db_optr ::= db_optr replica */ - { 219, -2 }, /* (91) db_optr ::= db_optr quorum */ - { 219, -2 }, /* (92) db_optr ::= db_optr days */ - { 219, -2 }, /* (93) db_optr ::= db_optr minrows */ - { 219, -2 }, /* (94) db_optr ::= db_optr maxrows */ - { 219, -2 }, /* (95) db_optr ::= db_optr blocks */ - { 219, -2 }, /* (96) db_optr ::= db_optr ctime */ - { 219, -2 }, /* (97) db_optr ::= db_optr wal */ - { 219, -2 }, /* (98) db_optr ::= db_optr fsync */ - { 219, -2 }, /* (99) db_optr ::= db_optr comp */ - { 219, -2 }, /* (100) db_optr ::= db_optr prec */ - { 219, -2 }, /* (101) db_optr ::= db_optr keep */ - { 219, -2 }, /* (102) db_optr ::= db_optr update */ - { 219, -2 }, /* (103) db_optr ::= db_optr cachelast */ - { 216, 0 }, /* (104) alter_db_optr ::= */ - { 216, -2 }, /* (105) alter_db_optr ::= alter_db_optr replica */ - { 216, -2 }, /* (106) alter_db_optr ::= alter_db_optr quorum */ - { 216, -2 }, /* (107) alter_db_optr ::= alter_db_optr keep */ - { 216, -2 }, /* (108) alter_db_optr ::= alter_db_optr blocks */ - { 216, -2 }, /* (109) alter_db_optr ::= alter_db_optr comp */ - { 216, -2 }, /* (110) alter_db_optr ::= alter_db_optr wal */ - { 216, -2 }, /* (111) alter_db_optr ::= alter_db_optr fsync */ - { 216, -2 }, /* (112) alter_db_optr ::= alter_db_optr update */ - { 216, -2 }, /* (113) alter_db_optr ::= alter_db_optr cachelast */ - { 245, -1 }, /* (114) typename ::= ids */ - { 245, -4 }, /* (115) typename ::= ids LP signed RP */ - { 245, -2 }, /* (116) typename ::= ids UNSIGNED */ - { 246, -1 }, /* (117) signed ::= INTEGER */ - { 246, -2 }, /* (118) signed ::= PLUS INTEGER */ - { 246, -2 }, /* (119) signed ::= MINUS INTEGER */ - { 211, -3 }, /* (120) cmd ::= CREATE TABLE create_table_args */ - { 211, -3 }, /* (121) cmd ::= CREATE TABLE create_stable_args */ - { 211, -3 }, /* (122) cmd ::= CREATE STABLE create_stable_args */ - { 211, -3 }, /* (123) cmd ::= CREATE TABLE create_table_list */ - { 249, -1 }, /* (124) create_table_list ::= create_from_stable */ - { 249, -2 }, /* (125) create_table_list ::= create_table_list create_from_stable */ - { 247, -6 }, /* (126) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 248, -10 }, /* (127) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 250, -10 }, /* (128) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 247, -5 }, /* (129) create_table_args ::= ifnotexists ids cpxName AS select */ - { 251, -3 }, /* (130) columnlist ::= columnlist COMMA column */ - { 251, -1 }, /* (131) columnlist ::= column */ - { 253, -2 }, /* (132) column ::= ids typename */ - { 230, -3 }, /* (133) tagitemlist ::= tagitemlist COMMA tagitem */ - { 230, -1 }, /* (134) tagitemlist ::= tagitem */ - { 254, -1 }, /* (135) tagitem ::= INTEGER */ - { 254, -1 }, /* (136) tagitem ::= FLOAT */ - { 254, -1 }, /* (137) tagitem ::= STRING */ - { 254, -1 }, /* (138) tagitem ::= BOOL */ - { 254, -1 }, /* (139) tagitem ::= NULL */ - { 254, -2 }, /* (140) tagitem ::= MINUS INTEGER */ - { 254, -2 }, /* (141) tagitem ::= MINUS FLOAT */ - { 254, -2 }, /* (142) tagitem ::= PLUS INTEGER */ - { 254, -2 }, /* (143) tagitem ::= PLUS FLOAT */ - { 252, -12 }, /* (144) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - { 266, -1 }, /* (145) union ::= select */ - { 266, -3 }, /* (146) union ::= LP union RP */ - { 266, -4 }, /* (147) union ::= union UNION ALL select */ - { 266, -6 }, /* (148) union ::= union UNION ALL LP select RP */ - { 211, -1 }, /* (149) cmd ::= union */ - { 252, -2 }, /* (150) select ::= SELECT selcollist */ - { 267, -2 }, /* (151) sclp ::= selcollist COMMA */ - { 267, 0 }, /* (152) sclp ::= */ - { 255, -3 }, /* (153) selcollist ::= sclp expr as */ - { 255, -2 }, /* (154) selcollist ::= sclp STAR */ - { 269, -2 }, /* (155) as ::= AS ids */ - { 269, -1 }, /* (156) as ::= ids */ - { 269, 0 }, /* (157) as ::= */ - { 256, -2 }, /* (158) from ::= FROM tablelist */ - { 270, -2 }, /* (159) tablelist ::= ids cpxName */ - { 270, -3 }, /* (160) tablelist ::= ids cpxName ids */ - { 270, -4 }, /* (161) tablelist ::= tablelist COMMA ids cpxName */ - { 270, -5 }, /* (162) tablelist ::= tablelist COMMA ids cpxName ids */ - { 271, -1 }, /* (163) tmvar ::= VARIABLE */ - { 258, -4 }, /* (164) interval_opt ::= INTERVAL LP tmvar RP */ - { 258, -6 }, /* (165) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 258, 0 }, /* (166) interval_opt ::= */ - { 259, 0 }, /* (167) fill_opt ::= */ - { 259, -6 }, /* (168) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 259, -4 }, /* (169) fill_opt ::= FILL LP ID RP */ - { 260, -4 }, /* (170) sliding_opt ::= SLIDING LP tmvar RP */ - { 260, 0 }, /* (171) sliding_opt ::= */ - { 262, 0 }, /* (172) orderby_opt ::= */ - { 262, -3 }, /* (173) orderby_opt ::= ORDER BY sortlist */ - { 272, -4 }, /* (174) sortlist ::= sortlist COMMA item sortorder */ - { 272, -2 }, /* (175) sortlist ::= item sortorder */ - { 274, -2 }, /* (176) item ::= ids cpxName */ - { 275, -1 }, /* (177) sortorder ::= ASC */ - { 275, -1 }, /* (178) sortorder ::= DESC */ - { 275, 0 }, /* (179) sortorder ::= */ - { 261, 0 }, /* (180) groupby_opt ::= */ - { 261, -3 }, /* (181) groupby_opt ::= GROUP BY grouplist */ - { 276, -3 }, /* (182) grouplist ::= grouplist COMMA item */ - { 276, -1 }, /* (183) grouplist ::= item */ - { 263, 0 }, /* (184) having_opt ::= */ - { 263, -2 }, /* (185) having_opt ::= HAVING expr */ - { 265, 0 }, /* (186) limit_opt ::= */ - { 265, -2 }, /* (187) limit_opt ::= LIMIT signed */ - { 265, -4 }, /* (188) limit_opt ::= LIMIT signed OFFSET signed */ - { 265, -4 }, /* (189) limit_opt ::= LIMIT signed COMMA signed */ - { 264, 0 }, /* (190) slimit_opt ::= */ - { 264, -2 }, /* (191) slimit_opt ::= SLIMIT signed */ - { 264, -4 }, /* (192) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 264, -4 }, /* (193) slimit_opt ::= SLIMIT signed COMMA signed */ - { 257, 0 }, /* (194) where_opt ::= */ - { 257, -2 }, /* (195) where_opt ::= WHERE expr */ - { 268, -3 }, /* (196) expr ::= LP expr RP */ - { 268, -1 }, /* (197) expr ::= ID */ - { 268, -3 }, /* (198) expr ::= ID DOT ID */ - { 268, -3 }, /* (199) expr ::= ID DOT STAR */ - { 268, -1 }, /* (200) expr ::= INTEGER */ - { 268, -2 }, /* (201) expr ::= MINUS INTEGER */ - { 268, -2 }, /* (202) expr ::= PLUS INTEGER */ - { 268, -1 }, /* (203) expr ::= FLOAT */ - { 268, -2 }, /* (204) expr ::= MINUS FLOAT */ - { 268, -2 }, /* (205) expr ::= PLUS FLOAT */ - { 268, -1 }, /* (206) expr ::= STRING */ - { 268, -1 }, /* (207) expr ::= NOW */ - { 268, -1 }, /* (208) expr ::= VARIABLE */ - { 268, -1 }, /* (209) expr ::= BOOL */ - { 268, -4 }, /* (210) expr ::= ID LP exprlist RP */ - { 268, -4 }, /* (211) expr ::= ID LP STAR RP */ - { 268, -3 }, /* (212) expr ::= expr IS NULL */ - { 268, -4 }, /* (213) expr ::= expr IS NOT NULL */ - { 268, -3 }, /* (214) expr ::= expr LT expr */ - { 268, -3 }, /* (215) expr ::= expr GT expr */ - { 268, -3 }, /* (216) expr ::= expr LE expr */ - { 268, -3 }, /* (217) expr ::= expr GE expr */ - { 268, -3 }, /* (218) expr ::= expr NE expr */ - { 268, -3 }, /* (219) expr ::= expr EQ expr */ - { 268, -3 }, /* (220) expr ::= expr AND expr */ - { 268, -3 }, /* (221) expr ::= expr OR expr */ - { 268, -3 }, /* (222) expr ::= expr PLUS expr */ - { 268, -3 }, /* (223) expr ::= expr MINUS expr */ - { 268, -3 }, /* (224) expr ::= expr STAR expr */ - { 268, -3 }, /* (225) expr ::= expr SLASH expr */ - { 268, -3 }, /* (226) expr ::= expr REM expr */ - { 268, -3 }, /* (227) expr ::= expr LIKE expr */ - { 268, -5 }, /* (228) expr ::= expr IN LP exprlist RP */ - { 277, -3 }, /* (229) exprlist ::= exprlist COMMA expritem */ - { 277, -1 }, /* (230) exprlist ::= expritem */ - { 278, -1 }, /* (231) expritem ::= expr */ - { 278, 0 }, /* (232) expritem ::= */ - { 211, -3 }, /* (233) cmd ::= RESET QUERY CACHE */ - { 211, -7 }, /* (234) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 211, -7 }, /* (235) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 211, -7 }, /* (236) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 211, -7 }, /* (237) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 211, -8 }, /* (238) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 211, -9 }, /* (239) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 211, -7 }, /* (240) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 211, -7 }, /* (241) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 211, -7 }, /* (242) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 211, -7 }, /* (243) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 211, -8 }, /* (244) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 211, -3 }, /* (245) cmd ::= KILL CONNECTION INTEGER */ - { 211, -5 }, /* (246) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 211, -5 }, /* (247) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 211, -1 }, /* (0) program ::= cmd */ + { 212, -2 }, /* (1) cmd ::= SHOW DATABASES */ + { 212, -2 }, /* (2) cmd ::= SHOW MNODES */ + { 212, -2 }, /* (3) cmd ::= SHOW DNODES */ + { 212, -2 }, /* (4) cmd ::= SHOW ACCOUNTS */ + { 212, -2 }, /* (5) cmd ::= SHOW USERS */ + { 212, -2 }, /* (6) cmd ::= SHOW MODULES */ + { 212, -2 }, /* (7) cmd ::= SHOW QUERIES */ + { 212, -2 }, /* (8) cmd ::= SHOW CONNECTIONS */ + { 212, -2 }, /* (9) cmd ::= SHOW STREAMS */ + { 212, -2 }, /* (10) cmd ::= SHOW VARIABLES */ + { 212, -2 }, /* (11) cmd ::= SHOW SCORES */ + { 212, -2 }, /* (12) cmd ::= SHOW GRANTS */ + { 212, -2 }, /* (13) cmd ::= SHOW VNODES */ + { 212, -3 }, /* (14) cmd ::= SHOW VNODES IPTOKEN */ + { 213, 0 }, /* (15) dbPrefix ::= */ + { 213, -2 }, /* (16) dbPrefix ::= ids DOT */ + { 215, 0 }, /* (17) cpxName ::= */ + { 215, -2 }, /* (18) cpxName ::= DOT ids */ + { 212, -5 }, /* (19) cmd ::= SHOW CREATE TABLE ids cpxName */ + { 212, -4 }, /* (20) cmd ::= SHOW CREATE DATABASE ids */ + { 212, -3 }, /* (21) cmd ::= SHOW dbPrefix TABLES */ + { 212, -5 }, /* (22) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + { 212, -3 }, /* (23) cmd ::= SHOW dbPrefix STABLES */ + { 212, -5 }, /* (24) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + { 212, -3 }, /* (25) cmd ::= SHOW dbPrefix VGROUPS */ + { 212, -4 }, /* (26) cmd ::= SHOW dbPrefix VGROUPS ids */ + { 212, -5 }, /* (27) cmd ::= DROP TABLE ifexists ids cpxName */ + { 212, -5 }, /* (28) cmd ::= DROP STABLE ifexists ids cpxName */ + { 212, -4 }, /* (29) cmd ::= DROP DATABASE ifexists ids */ + { 212, -3 }, /* (30) cmd ::= DROP DNODE ids */ + { 212, -3 }, /* (31) cmd ::= DROP USER ids */ + { 212, -3 }, /* (32) cmd ::= DROP ACCOUNT ids */ + { 212, -2 }, /* (33) cmd ::= USE ids */ + { 212, -3 }, /* (34) cmd ::= DESCRIBE ids cpxName */ + { 212, -5 }, /* (35) cmd ::= ALTER USER ids PASS ids */ + { 212, -5 }, /* (36) cmd ::= ALTER USER ids PRIVILEGE ids */ + { 212, -4 }, /* (37) cmd ::= ALTER DNODE ids ids */ + { 212, -5 }, /* (38) cmd ::= ALTER DNODE ids ids ids */ + { 212, -3 }, /* (39) cmd ::= ALTER LOCAL ids */ + { 212, -4 }, /* (40) cmd ::= ALTER LOCAL ids ids */ + { 212, -4 }, /* (41) cmd ::= ALTER DATABASE ids alter_db_optr */ + { 212, -4 }, /* (42) cmd ::= ALTER ACCOUNT ids acct_optr */ + { 212, -6 }, /* (43) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + { 214, -1 }, /* (44) ids ::= ID */ + { 214, -1 }, /* (45) ids ::= STRING */ + { 216, -2 }, /* (46) ifexists ::= IF EXISTS */ + { 216, 0 }, /* (47) ifexists ::= */ + { 219, -3 }, /* (48) ifnotexists ::= IF NOT EXISTS */ + { 219, 0 }, /* (49) ifnotexists ::= */ + { 212, -3 }, /* (50) cmd ::= CREATE DNODE ids */ + { 212, -6 }, /* (51) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + { 212, -5 }, /* (52) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + { 212, -5 }, /* (53) cmd ::= CREATE USER ids PASS ids */ + { 221, 0 }, /* (54) pps ::= */ + { 221, -2 }, /* (55) pps ::= PPS INTEGER */ + { 222, 0 }, /* (56) tseries ::= */ + { 222, -2 }, /* (57) tseries ::= TSERIES INTEGER */ + { 223, 0 }, /* (58) dbs ::= */ + { 223, -2 }, /* (59) dbs ::= DBS INTEGER */ + { 224, 0 }, /* (60) streams ::= */ + { 224, -2 }, /* (61) streams ::= STREAMS INTEGER */ + { 225, 0 }, /* (62) storage ::= */ + { 225, -2 }, /* (63) storage ::= STORAGE INTEGER */ + { 226, 0 }, /* (64) qtime ::= */ + { 226, -2 }, /* (65) qtime ::= QTIME INTEGER */ + { 227, 0 }, /* (66) users ::= */ + { 227, -2 }, /* (67) users ::= USERS INTEGER */ + { 228, 0 }, /* (68) conns ::= */ + { 228, -2 }, /* (69) conns ::= CONNS INTEGER */ + { 229, 0 }, /* (70) state ::= */ + { 229, -2 }, /* (71) state ::= STATE ids */ + { 218, -9 }, /* (72) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + { 230, -2 }, /* (73) keep ::= KEEP tagitemlist */ + { 232, -2 }, /* (74) cache ::= CACHE INTEGER */ + { 233, -2 }, /* (75) replica ::= REPLICA INTEGER */ + { 234, -2 }, /* (76) quorum ::= QUORUM INTEGER */ + { 235, -2 }, /* (77) days ::= DAYS INTEGER */ + { 236, -2 }, /* (78) minrows ::= MINROWS INTEGER */ + { 237, -2 }, /* (79) maxrows ::= MAXROWS INTEGER */ + { 238, -2 }, /* (80) blocks ::= BLOCKS INTEGER */ + { 239, -2 }, /* (81) ctime ::= CTIME INTEGER */ + { 240, -2 }, /* (82) wal ::= WAL INTEGER */ + { 241, -2 }, /* (83) fsync ::= FSYNC INTEGER */ + { 242, -2 }, /* (84) comp ::= COMP INTEGER */ + { 243, -2 }, /* (85) prec ::= PRECISION STRING */ + { 244, -2 }, /* (86) update ::= UPDATE INTEGER */ + { 245, -2 }, /* (87) cachelast ::= CACHELAST INTEGER */ + { 220, 0 }, /* (88) db_optr ::= */ + { 220, -2 }, /* (89) db_optr ::= db_optr cache */ + { 220, -2 }, /* (90) db_optr ::= db_optr replica */ + { 220, -2 }, /* (91) db_optr ::= db_optr quorum */ + { 220, -2 }, /* (92) db_optr ::= db_optr days */ + { 220, -2 }, /* (93) db_optr ::= db_optr minrows */ + { 220, -2 }, /* (94) db_optr ::= db_optr maxrows */ + { 220, -2 }, /* (95) db_optr ::= db_optr blocks */ + { 220, -2 }, /* (96) db_optr ::= db_optr ctime */ + { 220, -2 }, /* (97) db_optr ::= db_optr wal */ + { 220, -2 }, /* (98) db_optr ::= db_optr fsync */ + { 220, -2 }, /* (99) db_optr ::= db_optr comp */ + { 220, -2 }, /* (100) db_optr ::= db_optr prec */ + { 220, -2 }, /* (101) db_optr ::= db_optr keep */ + { 220, -2 }, /* (102) db_optr ::= db_optr update */ + { 220, -2 }, /* (103) db_optr ::= db_optr cachelast */ + { 217, 0 }, /* (104) alter_db_optr ::= */ + { 217, -2 }, /* (105) alter_db_optr ::= alter_db_optr replica */ + { 217, -2 }, /* (106) alter_db_optr ::= alter_db_optr quorum */ + { 217, -2 }, /* (107) alter_db_optr ::= alter_db_optr keep */ + { 217, -2 }, /* (108) alter_db_optr ::= alter_db_optr blocks */ + { 217, -2 }, /* (109) alter_db_optr ::= alter_db_optr comp */ + { 217, -2 }, /* (110) alter_db_optr ::= alter_db_optr wal */ + { 217, -2 }, /* (111) alter_db_optr ::= alter_db_optr fsync */ + { 217, -2 }, /* (112) alter_db_optr ::= alter_db_optr update */ + { 217, -2 }, /* (113) alter_db_optr ::= alter_db_optr cachelast */ + { 246, -1 }, /* (114) typename ::= ids */ + { 246, -4 }, /* (115) typename ::= ids LP signed RP */ + { 246, -2 }, /* (116) typename ::= ids UNSIGNED */ + { 247, -1 }, /* (117) signed ::= INTEGER */ + { 247, -2 }, /* (118) signed ::= PLUS INTEGER */ + { 247, -2 }, /* (119) signed ::= MINUS INTEGER */ + { 212, -3 }, /* (120) cmd ::= CREATE TABLE create_table_args */ + { 212, -3 }, /* (121) cmd ::= CREATE TABLE create_stable_args */ + { 212, -3 }, /* (122) cmd ::= CREATE STABLE create_stable_args */ + { 212, -3 }, /* (123) cmd ::= CREATE TABLE create_table_list */ + { 250, -1 }, /* (124) create_table_list ::= create_from_stable */ + { 250, -2 }, /* (125) create_table_list ::= create_table_list create_from_stable */ + { 248, -6 }, /* (126) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 249, -10 }, /* (127) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 251, -10 }, /* (128) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + { 248, -5 }, /* (129) create_table_args ::= ifnotexists ids cpxName AS select */ + { 252, -3 }, /* (130) columnlist ::= columnlist COMMA column */ + { 252, -1 }, /* (131) columnlist ::= column */ + { 254, -2 }, /* (132) column ::= ids typename */ + { 231, -3 }, /* (133) tagitemlist ::= tagitemlist COMMA tagitem */ + { 231, -1 }, /* (134) tagitemlist ::= tagitem */ + { 255, -1 }, /* (135) tagitem ::= INTEGER */ + { 255, -1 }, /* (136) tagitem ::= FLOAT */ + { 255, -1 }, /* (137) tagitem ::= STRING */ + { 255, -1 }, /* (138) tagitem ::= BOOL */ + { 255, -1 }, /* (139) tagitem ::= NULL */ + { 255, -2 }, /* (140) tagitem ::= MINUS INTEGER */ + { 255, -2 }, /* (141) tagitem ::= MINUS FLOAT */ + { 255, -2 }, /* (142) tagitem ::= PLUS INTEGER */ + { 255, -2 }, /* (143) tagitem ::= PLUS FLOAT */ + { 253, -12 }, /* (144) select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + { 267, -1 }, /* (145) union ::= select */ + { 267, -3 }, /* (146) union ::= LP union RP */ + { 267, -4 }, /* (147) union ::= union UNION ALL select */ + { 267, -6 }, /* (148) union ::= union UNION ALL LP select RP */ + { 212, -1 }, /* (149) cmd ::= union */ + { 253, -2 }, /* (150) select ::= SELECT selcollist */ + { 268, -2 }, /* (151) sclp ::= selcollist COMMA */ + { 268, 0 }, /* (152) sclp ::= */ + { 256, -4 }, /* (153) selcollist ::= sclp distinct expr as */ + { 256, -2 }, /* (154) selcollist ::= sclp STAR */ + { 271, -2 }, /* (155) as ::= AS ids */ + { 271, -1 }, /* (156) as ::= ids */ + { 271, 0 }, /* (157) as ::= */ + { 269, -1 }, /* (158) distinct ::= DISTINCT */ + { 269, 0 }, /* (159) distinct ::= */ + { 257, -2 }, /* (160) from ::= FROM tablelist */ + { 272, -2 }, /* (161) tablelist ::= ids cpxName */ + { 272, -3 }, /* (162) tablelist ::= ids cpxName ids */ + { 272, -4 }, /* (163) tablelist ::= tablelist COMMA ids cpxName */ + { 272, -5 }, /* (164) tablelist ::= tablelist COMMA ids cpxName ids */ + { 273, -1 }, /* (165) tmvar ::= VARIABLE */ + { 259, -4 }, /* (166) interval_opt ::= INTERVAL LP tmvar RP */ + { 259, -6 }, /* (167) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 259, 0 }, /* (168) interval_opt ::= */ + { 260, 0 }, /* (169) fill_opt ::= */ + { 260, -6 }, /* (170) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 260, -4 }, /* (171) fill_opt ::= FILL LP ID RP */ + { 261, -4 }, /* (172) sliding_opt ::= SLIDING LP tmvar RP */ + { 261, 0 }, /* (173) sliding_opt ::= */ + { 263, 0 }, /* (174) orderby_opt ::= */ + { 263, -3 }, /* (175) orderby_opt ::= ORDER BY sortlist */ + { 274, -4 }, /* (176) sortlist ::= sortlist COMMA item sortorder */ + { 274, -2 }, /* (177) sortlist ::= item sortorder */ + { 276, -2 }, /* (178) item ::= ids cpxName */ + { 277, -1 }, /* (179) sortorder ::= ASC */ + { 277, -1 }, /* (180) sortorder ::= DESC */ + { 277, 0 }, /* (181) sortorder ::= */ + { 262, 0 }, /* (182) groupby_opt ::= */ + { 262, -3 }, /* (183) groupby_opt ::= GROUP BY grouplist */ + { 278, -3 }, /* (184) grouplist ::= grouplist COMMA item */ + { 278, -1 }, /* (185) grouplist ::= item */ + { 264, 0 }, /* (186) having_opt ::= */ + { 264, -2 }, /* (187) having_opt ::= HAVING expr */ + { 266, 0 }, /* (188) limit_opt ::= */ + { 266, -2 }, /* (189) limit_opt ::= LIMIT signed */ + { 266, -4 }, /* (190) limit_opt ::= LIMIT signed OFFSET signed */ + { 266, -4 }, /* (191) limit_opt ::= LIMIT signed COMMA signed */ + { 265, 0 }, /* (192) slimit_opt ::= */ + { 265, -2 }, /* (193) slimit_opt ::= SLIMIT signed */ + { 265, -4 }, /* (194) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 265, -4 }, /* (195) slimit_opt ::= SLIMIT signed COMMA signed */ + { 258, 0 }, /* (196) where_opt ::= */ + { 258, -2 }, /* (197) where_opt ::= WHERE expr */ + { 270, -3 }, /* (198) expr ::= LP expr RP */ + { 270, -1 }, /* (199) expr ::= ID */ + { 270, -3 }, /* (200) expr ::= ID DOT ID */ + { 270, -3 }, /* (201) expr ::= ID DOT STAR */ + { 270, -1 }, /* (202) expr ::= INTEGER */ + { 270, -2 }, /* (203) expr ::= MINUS INTEGER */ + { 270, -2 }, /* (204) expr ::= PLUS INTEGER */ + { 270, -1 }, /* (205) expr ::= FLOAT */ + { 270, -2 }, /* (206) expr ::= MINUS FLOAT */ + { 270, -2 }, /* (207) expr ::= PLUS FLOAT */ + { 270, -1 }, /* (208) expr ::= STRING */ + { 270, -1 }, /* (209) expr ::= NOW */ + { 270, -1 }, /* (210) expr ::= VARIABLE */ + { 270, -1 }, /* (211) expr ::= BOOL */ + { 270, -4 }, /* (212) expr ::= ID LP exprlist RP */ + { 270, -4 }, /* (213) expr ::= ID LP STAR RP */ + { 270, -3 }, /* (214) expr ::= expr IS NULL */ + { 270, -4 }, /* (215) expr ::= expr IS NOT NULL */ + { 270, -3 }, /* (216) expr ::= expr LT expr */ + { 270, -3 }, /* (217) expr ::= expr GT expr */ + { 270, -3 }, /* (218) expr ::= expr LE expr */ + { 270, -3 }, /* (219) expr ::= expr GE expr */ + { 270, -3 }, /* (220) expr ::= expr NE expr */ + { 270, -3 }, /* (221) expr ::= expr EQ expr */ + { 270, -3 }, /* (222) expr ::= expr AND expr */ + { 270, -3 }, /* (223) expr ::= expr OR expr */ + { 270, -3 }, /* (224) expr ::= expr PLUS expr */ + { 270, -3 }, /* (225) expr ::= expr MINUS expr */ + { 270, -3 }, /* (226) expr ::= expr STAR expr */ + { 270, -3 }, /* (227) expr ::= expr SLASH expr */ + { 270, -3 }, /* (228) expr ::= expr REM expr */ + { 270, -3 }, /* (229) expr ::= expr LIKE expr */ + { 270, -5 }, /* (230) expr ::= expr IN LP exprlist RP */ + { 279, -3 }, /* (231) exprlist ::= exprlist COMMA expritem */ + { 279, -1 }, /* (232) exprlist ::= expritem */ + { 280, -1 }, /* (233) expritem ::= expr */ + { 280, 0 }, /* (234) expritem ::= */ + { 212, -3 }, /* (235) cmd ::= RESET QUERY CACHE */ + { 212, -7 }, /* (236) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 212, -7 }, /* (237) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 212, -7 }, /* (238) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 212, -7 }, /* (239) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 212, -8 }, /* (240) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 212, -9 }, /* (241) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 212, -7 }, /* (242) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 212, -7 }, /* (243) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 212, -7 }, /* (244) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 212, -7 }, /* (245) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 212, -8 }, /* (246) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 212, -3 }, /* (247) cmd ::= KILL CONNECTION INTEGER */ + { 212, -5 }, /* (248) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 212, -5 }, /* (249) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2233,14 +2238,13 @@ static void yy_reduce( { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; case 41: /* cmd ::= ALTER DATABASE ids alter_db_optr */ -{ SStrToken t = {0}; - setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy256, &t);} +{ SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &t);} break; case 42: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy277);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy47);} break; case 43: /* 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.yy277);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy47);} break; case 44: /* ids ::= ID */ case 45: /* ids ::= STRING */ yytestcase(yyruleno==45); @@ -2252,6 +2256,7 @@ static void yy_reduce( break; case 47: /* ifexists ::= */ case 49: /* ifnotexists ::= */ yytestcase(yyruleno==49); + case 159: /* distinct ::= */ yytestcase(yyruleno==159); { yymsp[1].minor.yy0.n = 0;} break; case 48: /* ifnotexists ::= IF NOT EXISTS */ @@ -2261,11 +2266,10 @@ static void yy_reduce( { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} break; case 51: /* 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.yy277);} +{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy47);} break; case 52: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -{ - setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy256, &yymsp[-2].minor.yy0);} +{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &yymsp[-2].minor.yy0);} break; case 53: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} @@ -2294,20 +2298,20 @@ static void yy_reduce( break; case 72: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy277.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy277.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy277.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy277.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy277.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy277.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy277.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy277.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy277.stat = yymsp[0].minor.yy0; + yylhsminor.yy47.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy47.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy47.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy47.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy47.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy47.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy47.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy47.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy47.stat = yymsp[0].minor.yy0; } - yymsp[-8].minor.yy277 = yylhsminor.yy277; + yymsp[-8].minor.yy47 = yylhsminor.yy47; break; case 73: /* keep ::= KEEP tagitemlist */ -{ yymsp[-1].minor.yy135 = yymsp[0].minor.yy135; } +{ yymsp[-1].minor.yy247 = yymsp[0].minor.yy247; } break; case 74: /* cache ::= CACHE INTEGER */ case 75: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==75); @@ -2326,208 +2330,208 @@ static void yy_reduce( { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 88: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy256);} +{setDefaultCreateDbOption(&yymsp[1].minor.yy262);} break; case 89: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 90: /* db_optr ::= db_optr replica */ case 105: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==105); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 91: /* db_optr ::= db_optr quorum */ case 106: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==106); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 92: /* db_optr ::= db_optr days */ -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 93: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 94: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 95: /* db_optr ::= db_optr blocks */ case 108: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==108); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 96: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 97: /* db_optr ::= db_optr wal */ case 110: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==110); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 98: /* db_optr ::= db_optr fsync */ case 111: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==111); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 99: /* db_optr ::= db_optr comp */ case 109: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==109); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 100: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 101: /* db_optr ::= db_optr keep */ case 107: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==107); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.keep = yymsp[0].minor.yy135; } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.keep = yymsp[0].minor.yy247; } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 102: /* db_optr ::= db_optr update */ case 112: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==112); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 103: /* db_optr ::= db_optr cachelast */ case 113: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==113); -{ yylhsminor.yy256 = yymsp[-1].minor.yy256; yylhsminor.yy256.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; +{ yylhsminor.yy262 = yymsp[-1].minor.yy262; yylhsminor.yy262.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy262 = yylhsminor.yy262; break; case 104: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy256);} +{ setDefaultCreateDbOption(&yymsp[1].minor.yy262);} break; case 114: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSqlSetColumnType (&yylhsminor.yy181, &yymsp[0].minor.yy0); + tSqlSetColumnType (&yylhsminor.yy179, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy181 = yylhsminor.yy181; + yymsp[0].minor.yy179 = yylhsminor.yy179; break; case 115: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy531 <= 0) { + if (yymsp[-1].minor.yy403 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSqlSetColumnType(&yylhsminor.yy181, &yymsp[-3].minor.yy0); + tSqlSetColumnType(&yylhsminor.yy179, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy531; // negative value of name length - tSqlSetColumnType(&yylhsminor.yy181, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy403; // negative value of name length + tSqlSetColumnType(&yylhsminor.yy179, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy181 = yylhsminor.yy181; + yymsp[-3].minor.yy179 = yylhsminor.yy179; break; case 116: /* 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.yy181, &yymsp[-1].minor.yy0); + tSqlSetColumnType (&yylhsminor.yy179, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy181 = yylhsminor.yy181; + yymsp[-1].minor.yy179 = yylhsminor.yy179; break; case 117: /* signed ::= INTEGER */ -{ yylhsminor.yy531 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy531 = yylhsminor.yy531; +{ yylhsminor.yy403 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy403 = yylhsminor.yy403; break; case 118: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy531 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yymsp[-1].minor.yy403 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 119: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy531 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} +{ yymsp[-1].minor.yy403 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 123: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy38;} +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy358;} break; case 124: /* create_table_list ::= create_from_stable */ { SCreateTableSQL* pCreateTable = calloc(1, sizeof(SCreateTableSQL)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy78); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy42); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy38 = pCreateTable; + yylhsminor.yy358 = pCreateTable; } - yymsp[0].minor.yy38 = yylhsminor.yy38; + yymsp[0].minor.yy358 = yylhsminor.yy358; break; case 125: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy38->childTableInfo, &yymsp[0].minor.yy78); - yylhsminor.yy38 = yymsp[-1].minor.yy38; + taosArrayPush(yymsp[-1].minor.yy358->childTableInfo, &yymsp[0].minor.yy42); + yylhsminor.yy358 = yymsp[-1].minor.yy358; } - yymsp[-1].minor.yy38 = yylhsminor.yy38; + yymsp[-1].minor.yy358 = yylhsminor.yy358; break; case 126: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-1].minor.yy135, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy358 = tSetCreateSqlElems(yymsp[-1].minor.yy247, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy358, 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.yy38 = yylhsminor.yy38; + yymsp[-5].minor.yy358 = yylhsminor.yy358; break; case 127: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy38 = tSetCreateSqlElems(yymsp[-5].minor.yy135, yymsp[-1].minor.yy135, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy358 = tSetCreateSqlElems(yymsp[-5].minor.yy247, yymsp[-1].minor.yy247, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy358, 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.yy38 = yylhsminor.yy38; + yymsp[-9].minor.yy358 = yylhsminor.yy358; break; case 128: /* 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.yy78 = createNewChildTableInfo(&yymsp[-5].minor.yy0, yymsp[-1].minor.yy135, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy42 = createNewChildTableInfo(&yymsp[-5].minor.yy0, yymsp[-1].minor.yy247, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy78 = yylhsminor.yy78; + yymsp[-9].minor.yy42 = yylhsminor.yy42; break; case 129: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy38 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy30, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy38, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy358 = tSetCreateSqlElems(NULL, NULL, yymsp[0].minor.yy114, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy358, 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.yy38 = yylhsminor.yy38; + yymsp[-4].minor.yy358 = yylhsminor.yy358; break; case 130: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy135, &yymsp[0].minor.yy181); yylhsminor.yy135 = yymsp[-2].minor.yy135; } - yymsp[-2].minor.yy135 = yylhsminor.yy135; +{taosArrayPush(yymsp[-2].minor.yy247, &yymsp[0].minor.yy179); yylhsminor.yy247 = yymsp[-2].minor.yy247; } + yymsp[-2].minor.yy247 = yylhsminor.yy247; break; case 131: /* columnlist ::= column */ -{yylhsminor.yy135 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy135, &yymsp[0].minor.yy181);} - yymsp[0].minor.yy135 = yylhsminor.yy135; +{yylhsminor.yy247 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy247, &yymsp[0].minor.yy179);} + yymsp[0].minor.yy247 = yylhsminor.yy247; break; case 132: /* column ::= ids typename */ { - tSqlSetColumnInfo(&yylhsminor.yy181, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy181); + tSqlSetColumnInfo(&yylhsminor.yy179, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy179); } - yymsp[-1].minor.yy181 = yylhsminor.yy181; + yymsp[-1].minor.yy179 = yylhsminor.yy179; break; case 133: /* tagitemlist ::= tagitemlist COMMA tagitem */ -{ yylhsminor.yy135 = tVariantListAppend(yymsp[-2].minor.yy135, &yymsp[0].minor.yy308, -1); } - yymsp[-2].minor.yy135 = yylhsminor.yy135; +{ yylhsminor.yy247 = tVariantListAppend(yymsp[-2].minor.yy247, &yymsp[0].minor.yy378, -1); } + yymsp[-2].minor.yy247 = yylhsminor.yy247; break; case 134: /* tagitemlist ::= tagitem */ -{ yylhsminor.yy135 = tVariantListAppend(NULL, &yymsp[0].minor.yy308, -1); } - yymsp[0].minor.yy135 = yylhsminor.yy135; +{ yylhsminor.yy247 = tVariantListAppend(NULL, &yymsp[0].minor.yy378, -1); } + yymsp[0].minor.yy247 = yylhsminor.yy247; break; case 135: /* tagitem ::= INTEGER */ case 136: /* tagitem ::= FLOAT */ yytestcase(yyruleno==136); case 137: /* tagitem ::= STRING */ yytestcase(yyruleno==137); case 138: /* tagitem ::= BOOL */ yytestcase(yyruleno==138); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy308, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy308 = yylhsminor.yy308; +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy378, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy378 = yylhsminor.yy378; break; case 139: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy308, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy308 = yylhsminor.yy308; +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy378, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy378 = yylhsminor.yy378; break; case 140: /* tagitem ::= MINUS INTEGER */ case 141: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==141); @@ -2537,59 +2541,59 @@ static void yy_reduce( yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; toTSDBType(yymsp[-1].minor.yy0.type); - tVariantCreate(&yylhsminor.yy308, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy378, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy308 = yylhsminor.yy308; + yymsp[-1].minor.yy378 = yylhsminor.yy378; break; case 144: /* select ::= SELECT selcollist from where_opt interval_opt fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy30 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy266, yymsp[-9].minor.yy135, yymsp[-8].minor.yy316, yymsp[-4].minor.yy135, yymsp[-3].minor.yy135, &yymsp[-7].minor.yy160, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy135, &yymsp[0].minor.yy126, &yymsp[-1].minor.yy126); + yylhsminor.yy114 = tSetQuerySqlElems(&yymsp[-11].minor.yy0, yymsp[-10].minor.yy522, yymsp[-9].minor.yy247, yymsp[-8].minor.yy326, yymsp[-4].minor.yy247, yymsp[-3].minor.yy247, &yymsp[-7].minor.yy430, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy247, &yymsp[0].minor.yy204, &yymsp[-1].minor.yy204); } - yymsp[-11].minor.yy30 = yylhsminor.yy30; + yymsp[-11].minor.yy114 = yylhsminor.yy114; break; case 145: /* union ::= select */ -{ yylhsminor.yy153 = setSubclause(NULL, yymsp[0].minor.yy30); } - yymsp[0].minor.yy153 = yylhsminor.yy153; +{ yylhsminor.yy219 = setSubclause(NULL, yymsp[0].minor.yy114); } + yymsp[0].minor.yy219 = yylhsminor.yy219; break; case 146: /* union ::= LP union RP */ -{ yymsp[-2].minor.yy153 = yymsp[-1].minor.yy153; } +{ yymsp[-2].minor.yy219 = yymsp[-1].minor.yy219; } break; case 147: /* union ::= union UNION ALL select */ -{ yylhsminor.yy153 = appendSelectClause(yymsp[-3].minor.yy153, yymsp[0].minor.yy30); } - yymsp[-3].minor.yy153 = yylhsminor.yy153; +{ yylhsminor.yy219 = appendSelectClause(yymsp[-3].minor.yy219, yymsp[0].minor.yy114); } + yymsp[-3].minor.yy219 = yylhsminor.yy219; break; case 148: /* union ::= union UNION ALL LP select RP */ -{ yylhsminor.yy153 = appendSelectClause(yymsp[-5].minor.yy153, yymsp[-1].minor.yy30); } - yymsp[-5].minor.yy153 = yylhsminor.yy153; +{ yylhsminor.yy219 = appendSelectClause(yymsp[-5].minor.yy219, yymsp[-1].minor.yy114); } + yymsp[-5].minor.yy219 = yylhsminor.yy219; break; case 149: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy153, NULL, TSDB_SQL_SELECT); } +{ setSqlInfo(pInfo, yymsp[0].minor.yy219, NULL, TSDB_SQL_SELECT); } break; case 150: /* select ::= SELECT selcollist */ { - yylhsminor.yy30 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy266, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy114 = tSetQuerySqlElems(&yymsp[-1].minor.yy0, yymsp[0].minor.yy522, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy30 = yylhsminor.yy30; + yymsp[-1].minor.yy114 = yylhsminor.yy114; break; case 151: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy266 = yymsp[-1].minor.yy266;} - yymsp[-1].minor.yy266 = yylhsminor.yy266; +{yylhsminor.yy522 = yymsp[-1].minor.yy522;} + yymsp[-1].minor.yy522 = yylhsminor.yy522; break; case 152: /* sclp ::= */ -{yymsp[1].minor.yy266 = 0;} +{yymsp[1].minor.yy522 = 0;} break; - case 153: /* selcollist ::= sclp expr as */ + case 153: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy266 = tSqlExprListAppend(yymsp[-2].minor.yy266, yymsp[-1].minor.yy316, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy522 = tSqlExprListAppend(yymsp[-3].minor.yy522, yymsp[-1].minor.yy326, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-2].minor.yy266 = yylhsminor.yy266; + yymsp[-3].minor.yy522 = yylhsminor.yy522; break; case 154: /* selcollist ::= sclp STAR */ { tSQLExpr *pNode = tSqlExprIdValueCreate(NULL, TK_ALL); - yylhsminor.yy266 = tSqlExprListAppend(yymsp[-1].minor.yy266, pNode, 0); + yylhsminor.yy522 = tSqlExprListAppend(yymsp[-1].minor.yy522, pNode, 0, 0); } - yymsp[-1].minor.yy266 = yylhsminor.yy266; + yymsp[-1].minor.yy522 = yylhsminor.yy522; break; case 155: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } @@ -2601,317 +2605,321 @@ static void yy_reduce( case 157: /* as ::= */ { yymsp[1].minor.yy0.n = 0; } break; - case 158: /* from ::= FROM tablelist */ -{yymsp[-1].minor.yy135 = yymsp[0].minor.yy135;} + case 158: /* distinct ::= DISTINCT */ +{ yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 159: /* tablelist ::= ids cpxName */ + case 160: /* from ::= FROM tablelist */ +{yymsp[-1].minor.yy247 = yymsp[0].minor.yy247;} + break; + case 161: /* tablelist ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy135 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); - yylhsminor.yy135 = tVariantListAppendToken(yylhsminor.yy135, &yymsp[-1].minor.yy0, -1); // table alias name + yylhsminor.yy247 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(yylhsminor.yy247, &yymsp[-1].minor.yy0, -1); // table alias name } - yymsp[-1].minor.yy135 = yylhsminor.yy135; + yymsp[-1].minor.yy247 = yylhsminor.yy247; break; - case 160: /* tablelist ::= ids cpxName ids */ + case 162: /* 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.yy135 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - yylhsminor.yy135 = tVariantListAppendToken(yylhsminor.yy135, &yymsp[0].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(yylhsminor.yy247, &yymsp[0].minor.yy0, -1); } - yymsp[-2].minor.yy135 = yylhsminor.yy135; + yymsp[-2].minor.yy247 = yylhsminor.yy247; break; - case 161: /* tablelist ::= tablelist COMMA ids cpxName */ + case 163: /* tablelist ::= tablelist COMMA ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy135 = tVariantListAppendToken(yymsp[-3].minor.yy135, &yymsp[-1].minor.yy0, -1); - yylhsminor.yy135 = tVariantListAppendToken(yylhsminor.yy135, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(yymsp[-3].minor.yy247, &yymsp[-1].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(yylhsminor.yy247, &yymsp[-1].minor.yy0, -1); } - yymsp[-3].minor.yy135 = yylhsminor.yy135; + yymsp[-3].minor.yy247 = yylhsminor.yy247; break; - case 162: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 164: /* 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.yy135 = tVariantListAppendToken(yymsp[-4].minor.yy135, &yymsp[-2].minor.yy0, -1); - yylhsminor.yy135 = tVariantListAppendToken(yylhsminor.yy135, &yymsp[0].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(yymsp[-4].minor.yy247, &yymsp[-2].minor.yy0, -1); + yylhsminor.yy247 = tVariantListAppendToken(yylhsminor.yy247, &yymsp[0].minor.yy0, -1); } - yymsp[-4].minor.yy135 = yylhsminor.yy135; + yymsp[-4].minor.yy247 = yylhsminor.yy247; break; - case 163: /* tmvar ::= VARIABLE */ + case 165: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 164: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy160.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy160.offset.n = 0; yymsp[-3].minor.yy160.offset.z = NULL; yymsp[-3].minor.yy160.offset.type = 0;} + case 166: /* interval_opt ::= INTERVAL LP tmvar RP */ +{yymsp[-3].minor.yy430.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy430.offset.n = 0; yymsp[-3].minor.yy430.offset.z = NULL; yymsp[-3].minor.yy430.offset.type = 0;} break; - case 165: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy160.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy160.offset = yymsp[-1].minor.yy0;} + case 167: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ +{yymsp[-5].minor.yy430.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy430.offset = yymsp[-1].minor.yy0;} break; - case 166: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy160, 0, sizeof(yymsp[1].minor.yy160));} + case 168: /* interval_opt ::= */ +{memset(&yymsp[1].minor.yy430, 0, sizeof(yymsp[1].minor.yy430));} break; - case 167: /* fill_opt ::= */ -{yymsp[1].minor.yy135 = 0; } + case 169: /* fill_opt ::= */ +{yymsp[1].minor.yy247 = 0; } break; - case 168: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 170: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); tVariantCreate(&A, &yymsp[-3].minor.yy0); - tVariantListInsert(yymsp[-1].minor.yy135, &A, -1, 0); - yymsp[-5].minor.yy135 = yymsp[-1].minor.yy135; + tVariantListInsert(yymsp[-1].minor.yy247, &A, -1, 0); + yymsp[-5].minor.yy247 = yymsp[-1].minor.yy247; } break; - case 169: /* fill_opt ::= FILL LP ID RP */ + case 171: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy135 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy247 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 170: /* sliding_opt ::= SLIDING LP tmvar RP */ + case 172: /* sliding_opt ::= SLIDING LP tmvar RP */ {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; - case 171: /* sliding_opt ::= */ + case 173: /* sliding_opt ::= */ {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; - case 172: /* orderby_opt ::= */ -{yymsp[1].minor.yy135 = 0;} + case 174: /* orderby_opt ::= */ +{yymsp[1].minor.yy247 = 0;} break; - case 173: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy135 = yymsp[0].minor.yy135;} + case 175: /* orderby_opt ::= ORDER BY sortlist */ +{yymsp[-2].minor.yy247 = yymsp[0].minor.yy247;} break; - case 174: /* sortlist ::= sortlist COMMA item sortorder */ + case 176: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy135 = tVariantListAppend(yymsp[-3].minor.yy135, &yymsp[-1].minor.yy308, yymsp[0].minor.yy130); + yylhsminor.yy247 = tVariantListAppend(yymsp[-3].minor.yy247, &yymsp[-1].minor.yy378, yymsp[0].minor.yy222); } - yymsp[-3].minor.yy135 = yylhsminor.yy135; + yymsp[-3].minor.yy247 = yylhsminor.yy247; break; - case 175: /* sortlist ::= item sortorder */ + case 177: /* sortlist ::= item sortorder */ { - yylhsminor.yy135 = tVariantListAppend(NULL, &yymsp[-1].minor.yy308, yymsp[0].minor.yy130); + yylhsminor.yy247 = tVariantListAppend(NULL, &yymsp[-1].minor.yy378, yymsp[0].minor.yy222); } - yymsp[-1].minor.yy135 = yylhsminor.yy135; + yymsp[-1].minor.yy247 = yylhsminor.yy247; break; - case 176: /* item ::= ids cpxName */ + case 178: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy308, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy378, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy308 = yylhsminor.yy308; + yymsp[-1].minor.yy378 = yylhsminor.yy378; break; - case 177: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy130 = TSDB_ORDER_ASC; } + case 179: /* sortorder ::= ASC */ +{ yymsp[0].minor.yy222 = TSDB_ORDER_ASC; } break; - case 178: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy130 = TSDB_ORDER_DESC;} + case 180: /* sortorder ::= DESC */ +{ yymsp[0].minor.yy222 = TSDB_ORDER_DESC;} break; - case 179: /* sortorder ::= */ -{ yymsp[1].minor.yy130 = TSDB_ORDER_ASC; } + case 181: /* sortorder ::= */ +{ yymsp[1].minor.yy222 = TSDB_ORDER_ASC; } break; - case 180: /* groupby_opt ::= */ -{ yymsp[1].minor.yy135 = 0;} + case 182: /* groupby_opt ::= */ +{ yymsp[1].minor.yy247 = 0;} break; - case 181: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy135 = yymsp[0].minor.yy135;} + case 183: /* groupby_opt ::= GROUP BY grouplist */ +{ yymsp[-2].minor.yy247 = yymsp[0].minor.yy247;} break; - case 182: /* grouplist ::= grouplist COMMA item */ + case 184: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy135 = tVariantListAppend(yymsp[-2].minor.yy135, &yymsp[0].minor.yy308, -1); + yylhsminor.yy247 = tVariantListAppend(yymsp[-2].minor.yy247, &yymsp[0].minor.yy378, -1); } - yymsp[-2].minor.yy135 = yylhsminor.yy135; + yymsp[-2].minor.yy247 = yylhsminor.yy247; break; - case 183: /* grouplist ::= item */ + case 185: /* grouplist ::= item */ { - yylhsminor.yy135 = tVariantListAppend(NULL, &yymsp[0].minor.yy308, -1); + yylhsminor.yy247 = tVariantListAppend(NULL, &yymsp[0].minor.yy378, -1); } - yymsp[0].minor.yy135 = yylhsminor.yy135; + yymsp[0].minor.yy247 = yylhsminor.yy247; break; - case 184: /* having_opt ::= */ - case 194: /* where_opt ::= */ yytestcase(yyruleno==194); - case 232: /* expritem ::= */ yytestcase(yyruleno==232); -{yymsp[1].minor.yy316 = 0;} + case 186: /* having_opt ::= */ + case 196: /* where_opt ::= */ yytestcase(yyruleno==196); + case 234: /* expritem ::= */ yytestcase(yyruleno==234); +{yymsp[1].minor.yy326 = 0;} break; - case 185: /* having_opt ::= HAVING expr */ - case 195: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==195); -{yymsp[-1].minor.yy316 = yymsp[0].minor.yy316;} + case 187: /* having_opt ::= HAVING expr */ + case 197: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==197); +{yymsp[-1].minor.yy326 = yymsp[0].minor.yy326;} break; - case 186: /* limit_opt ::= */ - case 190: /* slimit_opt ::= */ yytestcase(yyruleno==190); -{yymsp[1].minor.yy126.limit = -1; yymsp[1].minor.yy126.offset = 0;} + case 188: /* limit_opt ::= */ + case 192: /* slimit_opt ::= */ yytestcase(yyruleno==192); +{yymsp[1].minor.yy204.limit = -1; yymsp[1].minor.yy204.offset = 0;} break; - case 187: /* limit_opt ::= LIMIT signed */ - case 191: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==191); -{yymsp[-1].minor.yy126.limit = yymsp[0].minor.yy531; yymsp[-1].minor.yy126.offset = 0;} + case 189: /* limit_opt ::= LIMIT signed */ + case 193: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==193); +{yymsp[-1].minor.yy204.limit = yymsp[0].minor.yy403; yymsp[-1].minor.yy204.offset = 0;} break; - case 188: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy126.limit = yymsp[-2].minor.yy531; yymsp[-3].minor.yy126.offset = yymsp[0].minor.yy531;} + case 190: /* limit_opt ::= LIMIT signed OFFSET signed */ +{ yymsp[-3].minor.yy204.limit = yymsp[-2].minor.yy403; yymsp[-3].minor.yy204.offset = yymsp[0].minor.yy403;} break; - case 189: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy126.limit = yymsp[0].minor.yy531; yymsp[-3].minor.yy126.offset = yymsp[-2].minor.yy531;} + case 191: /* limit_opt ::= LIMIT signed COMMA signed */ +{ yymsp[-3].minor.yy204.limit = yymsp[0].minor.yy403; yymsp[-3].minor.yy204.offset = yymsp[-2].minor.yy403;} break; - case 192: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy126.limit = yymsp[-2].minor.yy531; yymsp[-3].minor.yy126.offset = yymsp[0].minor.yy531;} + case 194: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +{yymsp[-3].minor.yy204.limit = yymsp[-2].minor.yy403; yymsp[-3].minor.yy204.offset = yymsp[0].minor.yy403;} break; - case 193: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy126.limit = yymsp[0].minor.yy531; yymsp[-3].minor.yy126.offset = yymsp[-2].minor.yy531;} + case 195: /* slimit_opt ::= SLIMIT signed COMMA signed */ +{yymsp[-3].minor.yy204.limit = yymsp[0].minor.yy403; yymsp[-3].minor.yy204.offset = yymsp[-2].minor.yy403;} break; - case 196: /* expr ::= LP expr RP */ -{yylhsminor.yy316 = yymsp[-1].minor.yy316; yylhsminor.yy316->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy316->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 198: /* expr ::= LP expr RP */ +{yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy326->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 197: /* expr ::= ID */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 199: /* expr ::= ID */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 198: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 200: /* expr ::= ID DOT ID */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 199: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 201: /* expr ::= ID DOT STAR */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 200: /* expr ::= INTEGER */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 202: /* expr ::= INTEGER */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 201: /* expr ::= MINUS INTEGER */ - case 202: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==202); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy316 = yylhsminor.yy316; + case 203: /* expr ::= MINUS INTEGER */ + case 204: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==204); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 203: /* expr ::= FLOAT */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 205: /* expr ::= FLOAT */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 204: /* expr ::= MINUS FLOAT */ - case 205: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==205); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy316 = yylhsminor.yy316; + case 206: /* expr ::= MINUS FLOAT */ + case 207: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==207); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 206: /* expr ::= STRING */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 208: /* expr ::= STRING */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 207: /* expr ::= NOW */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 209: /* expr ::= NOW */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 208: /* expr ::= VARIABLE */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 210: /* expr ::= VARIABLE */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 209: /* expr ::= BOOL */ -{ yylhsminor.yy316 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 211: /* expr ::= BOOL */ +{ yylhsminor.yy326 = tSqlExprIdValueCreate(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 210: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy316 = tSqlExprCreateFunction(yymsp[-1].minor.yy266, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy316 = yylhsminor.yy316; + case 212: /* expr ::= ID LP exprlist RP */ +{ yylhsminor.yy326 = tSqlExprCreateFunction(yymsp[-1].minor.yy522, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy326 = yylhsminor.yy326; break; - case 211: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy316 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy316 = yylhsminor.yy316; + case 213: /* expr ::= ID LP STAR RP */ +{ yylhsminor.yy326 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy326 = yylhsminor.yy326; break; - case 212: /* expr ::= expr IS NULL */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, NULL, TK_ISNULL);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 214: /* expr ::= expr IS NULL */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, NULL, TK_ISNULL);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 213: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-3].minor.yy316, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy316 = yylhsminor.yy316; + case 215: /* expr ::= expr IS NOT NULL */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-3].minor.yy326, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy326 = yylhsminor.yy326; break; - case 214: /* expr ::= expr LT expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_LT);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 216: /* expr ::= expr LT expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_LT);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 215: /* expr ::= expr GT expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_GT);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 217: /* expr ::= expr GT expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_GT);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 216: /* expr ::= expr LE expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_LE);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 218: /* expr ::= expr LE expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_LE);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 217: /* expr ::= expr GE expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_GE);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 219: /* expr ::= expr GE expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_GE);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 218: /* expr ::= expr NE expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_NE);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 220: /* expr ::= expr NE expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_NE);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 219: /* expr ::= expr EQ expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_EQ);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 221: /* expr ::= expr EQ expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_EQ);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 220: /* expr ::= expr AND expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_AND);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 222: /* expr ::= expr AND expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_AND);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 221: /* expr ::= expr OR expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_OR); } - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 223: /* expr ::= expr OR expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_OR); } + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 222: /* expr ::= expr PLUS expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_PLUS); } - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 224: /* expr ::= expr PLUS expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_PLUS); } + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 223: /* expr ::= expr MINUS expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_MINUS); } - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 225: /* expr ::= expr MINUS expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_MINUS); } + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 224: /* expr ::= expr STAR expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_STAR); } - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 226: /* expr ::= expr STAR expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_STAR); } + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 225: /* expr ::= expr SLASH expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_DIVIDE);} - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 227: /* expr ::= expr SLASH expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_DIVIDE);} + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 226: /* expr ::= expr REM expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_REM); } - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 228: /* expr ::= expr REM expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_REM); } + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 227: /* expr ::= expr LIKE expr */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-2].minor.yy316, yymsp[0].minor.yy316, TK_LIKE); } - yymsp[-2].minor.yy316 = yylhsminor.yy316; + case 229: /* expr ::= expr LIKE expr */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-2].minor.yy326, yymsp[0].minor.yy326, TK_LIKE); } + yymsp[-2].minor.yy326 = yylhsminor.yy326; break; - case 228: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy316 = tSqlExprCreate(yymsp[-4].minor.yy316, (tSQLExpr*)yymsp[-1].minor.yy266, TK_IN); } - yymsp[-4].minor.yy316 = yylhsminor.yy316; + case 230: /* expr ::= expr IN LP exprlist RP */ +{yylhsminor.yy326 = tSqlExprCreate(yymsp[-4].minor.yy326, (tSQLExpr*)yymsp[-1].minor.yy522, TK_IN); } + yymsp[-4].minor.yy326 = yylhsminor.yy326; break; - case 229: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy266 = tSqlExprListAppend(yymsp[-2].minor.yy266,yymsp[0].minor.yy316,0);} - yymsp[-2].minor.yy266 = yylhsminor.yy266; + case 231: /* exprlist ::= exprlist COMMA expritem */ +{yylhsminor.yy522 = tSqlExprListAppend(yymsp[-2].minor.yy522,yymsp[0].minor.yy326,0, 0);} + yymsp[-2].minor.yy522 = yylhsminor.yy522; break; - case 230: /* exprlist ::= expritem */ -{yylhsminor.yy266 = tSqlExprListAppend(0,yymsp[0].minor.yy316,0);} - yymsp[0].minor.yy266 = yylhsminor.yy266; + case 232: /* exprlist ::= expritem */ +{yylhsminor.yy522 = tSqlExprListAppend(0,yymsp[0].minor.yy326,0, 0);} + yymsp[0].minor.yy522 = yylhsminor.yy522; break; - case 231: /* expritem ::= expr */ -{yylhsminor.yy316 = yymsp[0].minor.yy316;} - yymsp[0].minor.yy316 = yylhsminor.yy316; + case 233: /* expritem ::= expr */ +{yylhsminor.yy326 = yymsp[0].minor.yy326;} + yymsp[0].minor.yy326 = yylhsminor.yy326; break; - case 233: /* cmd ::= RESET QUERY CACHE */ + case 235: /* cmd ::= RESET QUERY CACHE */ { setDCLSQLElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 234: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 236: /* 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.yy135, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy247, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 235: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 237: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2922,14 +2930,14 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 236: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 238: /* 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.yy135, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy247, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 237: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 239: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2940,7 +2948,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 238: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 240: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -2954,26 +2962,26 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 239: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 241: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tVariantListAppend(A, &yymsp[0].minor.yy308, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy378, -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); } break; - case 240: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 242: /* 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.yy135, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy247, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 241: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 243: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -2984,14 +2992,14 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 242: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 244: /* 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.yy135, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tAlterTableSqlElems(&yymsp[-4].minor.yy0, yymsp[0].minor.yy247, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 243: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 245: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3002,7 +3010,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 244: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 246: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3016,13 +3024,13 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 245: /* cmd ::= KILL CONNECTION INTEGER */ + case 247: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 246: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 248: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} break; - case 247: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 249: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} break; default: From d50054c73215a10366c39b6b17657fc0aabc4447 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 21 Jan 2021 22:29:12 +0800 Subject: [PATCH 17/34] [TD-2790]: fix the bug that tableMeta is not updated if parse error occurs. --- src/client/inc/tscUtil.h | 4 ++-- src/client/inc/tsclient.h | 2 +- src/client/src/tscAsync.c | 2 +- src/client/src/tscParseInsert.c | 13 +++++-------- src/client/src/tscSql.c | 2 +- src/client/src/tscSubquery.c | 2 +- src/client/src/tscUtil.c | 23 +++++++++++++++-------- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h index e614ddc872..ce623cdc03 100644 --- a/src/client/inc/tscUtil.h +++ b/src/client/inc/tscUtil.h @@ -99,14 +99,14 @@ static FORCE_INLINE SQueryInfo* tscGetQueryInfoDetail(SSqlCmd* pCmd, int32_t sub } int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOffset, SName* name, STableMeta* pTableMeta, STableDataBlocks** dataBlocks); -void tscDestroyDataBlock(STableDataBlocks* pDataBlock); +void tscDestroyDataBlock(STableDataBlocks* pDataBlock, bool removeMeta); void tscSortRemoveDataBlockDupRows(STableDataBlocks* dataBuf); SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, int16_t bytes, uint32_t offset); void* tscDestroyBlockArrayList(SArray* pDataBlockList); -void* tscDestroyBlockHashTable(SHashObj* pBlockHashTable); +void* tscDestroyBlockHashTable(SHashObj* pBlockHashTable, bool removeMeta); int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock); int32_t tscMergeTableDataBlocks(SSqlObj* pSql, bool freeBlockMap); diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index 0a26cc87e3..7fc5cbe08e 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -411,7 +411,7 @@ void tscRestoreSQLFuncForSTableQuery(SQueryInfo *pQueryInfo); int32_t tscCreateResPointerInfo(SSqlRes *pRes, SQueryInfo *pQueryInfo); void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo); -void tscResetSqlCmdObj(SSqlCmd *pCmd); +void tscResetSqlCmd(SSqlCmd *pCmd, bool removeMeta); /** * free query result of the sql object diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c index 4eae2b7a87..8e5f621b37 100644 --- a/src/client/src/tscAsync.c +++ b/src/client/src/tscAsync.c @@ -351,7 +351,7 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) { if (pCmd->command == TSDB_SQL_SELECT) { tscDebug("%p redo parse sql string and proceed", pSql); pCmd->parseFinished = false; - tscResetSqlCmdObj(pCmd); + tscResetSqlCmd(pCmd, true); code = tsParseSql(pSql, true); if (code == TSDB_CODE_TSC_ACTION_IN_PROGRESS) { diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c index 2466ae060e..c0a8762180 100644 --- a/src/client/src/tscParseInsert.c +++ b/src/client/src/tscParseInsert.c @@ -1036,11 +1036,7 @@ static int32_t validateDataSource(SSqlCmd *pCmd, int8_t type, const char *sql) { } /** - * usage: insert into table1 values() () table2 values()() - * - * @param str - * @param acct - * @param db + * parse insert sql * @param pSql * @return */ @@ -1343,10 +1339,11 @@ int tsParseSql(SSqlObj *pSql, bool initial) { // make a backup as tsParseInsertSql may modify the string char* sqlstr = strdup(pSql->sqlstr); ret = tsParseInsertSql(pSql); - if (sqlstr == NULL || pSql->parseRetry >= 1 || ret != TSDB_CODE_TSC_INVALID_SQL) { + if ((sqlstr == NULL) || (pSql->parseRetry >= 1) || + (ret != TSDB_CODE_TSC_SQL_SYNTAX_ERROR && ret != TSDB_CODE_TSC_INVALID_SQL)) { free(sqlstr); } else { - tscResetSqlCmdObj(pCmd); + tscResetSqlCmd(pCmd, true); free(pSql->sqlstr); pSql->sqlstr = sqlstr; pSql->parseRetry++; @@ -1358,7 +1355,7 @@ int tsParseSql(SSqlObj *pSql, bool initial) { SSqlInfo SQLInfo = qSQLParse(pSql->sqlstr); ret = tscToSQLCmd(pSql, &SQLInfo); if (ret == TSDB_CODE_TSC_INVALID_SQL && pSql->parseRetry == 0 && SQLInfo.type == TSDB_SQL_NULL) { - tscResetSqlCmdObj(pCmd); + tscResetSqlCmd(pCmd, true); pSql->parseRetry++; ret = tscToSQLCmd(pSql, &SQLInfo); } diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 106f62fb74..b0154b0e2c 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -936,7 +936,7 @@ int taos_validate_sql(TAOS *taos, const char *sql) { static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t tblListLen) { // must before clean the sqlcmd object - tscResetSqlCmdObj(&pSql->cmd); + tscResetSqlCmd(&pSql->cmd, false); SSqlCmd *pCmd = &pSql->cmd; diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index 4d928bc31a..629707525a 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -2441,7 +2441,7 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows) pParentObj->cmd.parseFinished = false; - tscResetSqlCmdObj(&pParentObj->cmd); + tscResetSqlCmd(&pParentObj->cmd, false); // in case of insert, redo parsing the sql string and build new submit data block for two reasons: // 1. the table Id(tid & uid) may have been update, the submit block needs to be updated accordingly. diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index beca5bb2af..99e4fd40d8 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -381,7 +381,7 @@ void tscFreeQueryInfo(SSqlCmd* pCmd) { tfree(pCmd->pQueryInfo); } -void tscResetSqlCmdObj(SSqlCmd* pCmd) { +void tscResetSqlCmd(SSqlCmd* pCmd, bool removeMeta) { pCmd->command = 0; pCmd->numOfCols = 0; pCmd->count = 0; @@ -399,7 +399,7 @@ void tscResetSqlCmdObj(SSqlCmd* pCmd) { pCmd->numOfTables = 0; tfree(pCmd->pTableNameList); - pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList); + pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList, removeMeta); pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks); tscFreeQueryInfo(pCmd); } @@ -501,7 +501,7 @@ void tscFreeSqlObj(SSqlObj* pSql) { pSql->self = 0; tscFreeSqlResult(pSql); - tscResetSqlCmdObj(pCmd); + tscResetSqlCmd(pCmd, false); tfree(pCmd->tagData.data); pCmd->tagData.dataLen = 0; @@ -515,7 +515,7 @@ void tscFreeSqlObj(SSqlObj* pSql) { free(pSql); } -void tscDestroyDataBlock(STableDataBlocks* pDataBlock) { +void tscDestroyDataBlock(STableDataBlocks* pDataBlock, bool removeMeta) { if (pDataBlock == NULL) { return; } @@ -528,6 +528,13 @@ void tscDestroyDataBlock(STableDataBlocks* pDataBlock) { tfree(pDataBlock->pTableMeta); } + if (removeMeta) { + char name[TSDB_TABLE_FNAME_LEN] = {0}; + tNameExtractFullName(&pDataBlock->tableName, name); + + taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN)); + } + tfree(pDataBlock); } @@ -563,21 +570,21 @@ void* tscDestroyBlockArrayList(SArray* pDataBlockList) { size_t size = taosArrayGetSize(pDataBlockList); for (int32_t i = 0; i < size; i++) { void* d = taosArrayGetP(pDataBlockList, i); - tscDestroyDataBlock(d); + tscDestroyDataBlock(d, false); } taosArrayDestroy(pDataBlockList); return NULL; } -void* tscDestroyBlockHashTable(SHashObj* pBlockHashTable) { +void* tscDestroyBlockHashTable(SHashObj* pBlockHashTable, bool removeMeta) { if (pBlockHashTable == NULL) { return NULL; } STableDataBlocks** p = taosHashIterate(pBlockHashTable, NULL); while(p) { - tscDestroyDataBlock(*p); + tscDestroyDataBlock(*p, removeMeta); p = taosHashIterate(pBlockHashTable, p); } @@ -791,7 +798,7 @@ static void extractTableNameList(SSqlCmd* pCmd, bool freeBlockMap) { } if (freeBlockMap) { - pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList); + pCmd->pTableBlockHashList = tscDestroyBlockHashTable(pCmd->pTableBlockHashList, false); } } From 5697e1f589262a49f9e1ee126b12a69b3c4b4d87 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Thu, 21 Jan 2021 15:12:50 -1000 Subject: [PATCH 18/34] add assert --- src/client/src/tscServer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 4b8fa45619..8403876566 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -2228,6 +2228,8 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) { SSqlRes *pRes = &pSql->res; SSqlCmd *pCmd = &pSql->cmd; + assert(pRes->rspLen >= sizeof(SRetrieveTableRsp)); + SRetrieveTableRsp *pRetrieve = (SRetrieveTableRsp *)pRes->pRsp; if (pRetrieve == NULL) { pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY; From e2efebe9f646fc31922cb4befb7bea3780fc5a30 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 22 Jan 2021 11:55:29 +0800 Subject: [PATCH 19/34] [TD-225] update the function name. --- src/query/inc/sql.y | 4 ++-- src/query/src/sql.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index 257c1a921e..cd02d4fb00 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -161,7 +161,7 @@ cmd ::= ALTER DNODE ids(X) ids(Y). { setDCLSQLElems(pInfo, TSDB_SQL cmd ::= ALTER DNODE ids(X) ids(Y) ids(Z). { setDCLSQLElems(pInfo, TSDB_SQL_CFG_DNODE, 3, &X, &Y, &Z); } cmd ::= ALTER LOCAL ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 1, &X); } cmd ::= ALTER LOCAL ids(X) ids(Y). { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &X, &Y); } -cmd ::= ALTER DATABASE ids(X) alter_db_optr(Y). { SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &X, &Y, &t);} +cmd ::= ALTER DATABASE ids(X) alter_db_optr(Y). { SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &X, &Y, &t);} cmd ::= ALTER ACCOUNT ids(X) acct_optr(Z). { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &X, NULL, &Z);} cmd ::= ALTER ACCOUNT ids(X) PASS ids(Y) acct_optr(Z). { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &X, &Y, &Z);} @@ -186,7 +186,7 @@ ifnotexists(X) ::= . { X.n = 0;} cmd ::= CREATE DNODE ids(X). { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &X);} 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). { setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);} +cmd ::= CREATE DATABASE ifnotexists(Z) ids(X) db_optr(Y). { setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &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/sql.c b/src/query/src/sql.c index e53bc2dfc1..0f945d0230 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -2238,7 +2238,7 @@ static void yy_reduce( { setDCLSQLElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; case 41: /* cmd ::= ALTER DATABASE ids alter_db_optr */ -{ SStrToken t = {0}; setCreateDBSQL(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &t);} +{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &t);} break; case 42: /* cmd ::= ALTER ACCOUNT ids acct_optr */ { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy47);} @@ -2269,7 +2269,7 @@ static void yy_reduce( { setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy47);} break; case 52: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -{ setCreateDBSQL(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &yymsp[-2].minor.yy0);} +{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy262, &yymsp[-2].minor.yy0);} break; case 53: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} From 861ad5afc8affe892bc658581571fd4be8c26d78 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Thu, 21 Jan 2021 19:17:17 -1000 Subject: [PATCH 20/34] fix bug --- src/query/src/qPercentile.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/query/src/qPercentile.c b/src/query/src/qPercentile.c index 3e4891092a..523fa42547 100644 --- a/src/query/src/qPercentile.c +++ b/src/query/src/qPercentile.c @@ -115,6 +115,11 @@ int32_t tBucketIntHash(tMemBucket *pBucket, const void *value) { GET_TYPED_DATA(v, int64_t, pBucket->type, value); int32_t index = -1; + + if (v > pBucket->range.i64MaxVal || v < pBucket->range.i64MinVal) { + return index; + } + // divide the value range into 1024 buckets uint64_t span = pBucket->range.i64MaxVal - pBucket->range.i64MinVal; if (span < pBucket->numOfSlots) { @@ -128,7 +133,7 @@ int32_t tBucketIntHash(tMemBucket *pBucket, const void *value) { } } - assert(v >= pBucket->range.i64MinVal && v <= pBucket->range.i64MaxVal && index >= 0 && index < pBucket->numOfSlots); + assert(index >= 0 && index < pBucket->numOfSlots); return index; } @@ -137,6 +142,11 @@ int32_t tBucketUintHash(tMemBucket *pBucket, const void *value) { GET_TYPED_DATA(v, uint64_t, pBucket->type, value); int32_t index = -1; + + if (v > pBucket->range.u64MaxVal || v < pBucket->range.u64MinVal) { + return index; + } + // divide the value range into 1024 buckets uint64_t span = pBucket->range.u64MaxVal - pBucket->range.u64MinVal; if (span < pBucket->numOfSlots) { @@ -150,7 +160,7 @@ int32_t tBucketUintHash(tMemBucket *pBucket, const void *value) { } } - assert(v >= pBucket->range.u64MinVal && v <= pBucket->range.i64MaxVal && index >= 0 && index < pBucket->numOfSlots); + assert(index >= 0 && index < pBucket->numOfSlots); return index; } @@ -164,6 +174,10 @@ int32_t tBucketDoubleHash(tMemBucket *pBucket, const void *value) { int32_t index = -1; + if (v > pBucket->range.dMaxVal || v < pBucket->range.dMinVal) { + return index; + } + // divide a range of [dMinVal, dMaxVal] into 1024 buckets double span = pBucket->range.dMaxVal - pBucket->range.dMinVal; if (span < pBucket->numOfSlots) { @@ -177,7 +191,7 @@ int32_t tBucketDoubleHash(tMemBucket *pBucket, const void *value) { } } - assert(v >= pBucket->range.dMinVal && v <= pBucket->range.dMaxVal && index >= 0 && index < pBucket->numOfSlots); + assert(index >= 0 && index < pBucket->numOfSlots); return index; } @@ -309,9 +323,13 @@ int32_t tMemBucketPut(tMemBucket *pBucket, const void *data, size_t size) { int32_t bytes = pBucket->bytes; for (int32_t i = 0; i < size; ++i) { char *d = (char *) data + i * bytes; - count += 1; int32_t index = (pBucket->hashFunc)(pBucket, d); + if (index < 0) { + continue; + } + + count += 1; tMemBucketSlot *pSlot = &pBucket->pSlots[index]; tMemBucketUpdateBoundingBox(&pSlot->range, d, pBucket->type); From e6b4aaf54ac38a903682b8ce415310d6bbb11230 Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Thu, 21 Jan 2021 19:34:15 -1000 Subject: [PATCH 21/34] fix bug --- src/client/src/tscSubquery.c | 48 ++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index 4d928bc31a..9e009c35a3 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -582,13 +582,14 @@ void freeJoinSubqueryObj(SSqlObj* pSql) { pSql->subState.numOfSub = 0; } -static void quitAllSubquery(SSqlObj* pSqlSub, SSqlObj* pSqlObj, SJoinSupporter* pSupporter) { +static int32_t quitAllSubquery(SSqlObj* pSqlSub, SSqlObj* pSqlObj, SJoinSupporter* pSupporter) { if (subAndCheckDone(pSqlSub, pSqlObj, pSupporter->subqueryIndex)) { tscError("%p all subquery return and query failed, global code:%s", pSqlObj, tstrerror(pSqlObj->res.code)); freeJoinSubqueryObj(pSqlObj); - return; + return 0; } + return 1; //tscDestroyJoinSupporter(pSupporter); } @@ -835,7 +836,9 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow if (pParentSql->res.code != TSDB_CODE_SUCCESS) { tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows, pParentSql->res.code); - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } tscAsyncResultOnError(pParentSql); @@ -850,7 +853,9 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex); pParentSql->res.code = numOfRows; - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } tscAsyncResultOnError(pParentSql); return; @@ -867,7 +872,9 @@ static void tidTagRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow tscError("%p failed to malloc memory", pSql); pParentSql->res.code = TAOS_SYSTEM_ERROR(errno); - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } tscAsyncResultOnError(pParentSql); return; @@ -985,7 +992,9 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow if (pParentSql->res.code != TSDB_CODE_SUCCESS) { tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows, pParentSql->res.code); - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)){ + return; + } tscAsyncResultOnError(pParentSql); @@ -999,7 +1008,9 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow tscError("%p sub query failed, code:%s, index:%d", pSql, tstrerror(numOfRows), pSupporter->subqueryIndex); pParentSql->res.code = numOfRows; - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)){ + return; + } tscAsyncResultOnError(pParentSql); return; @@ -1014,7 +1025,9 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow pParentSql->res.code = TAOS_SYSTEM_ERROR(errno); - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } tscAsyncResultOnError(pParentSql); @@ -1032,7 +1045,9 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow pParentSql->res.code = TAOS_SYSTEM_ERROR(errno); - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)){ + return; + } tscAsyncResultOnError(pParentSql); @@ -1129,8 +1144,10 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR if (pParentSql->res.code != TSDB_CODE_SUCCESS) { tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, numOfRows, pParentSql->res.code); - quitAllSubquery(pSql, pParentSql, pSupporter); - + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } + tscAsyncResultOnError(pParentSql); return; @@ -1472,7 +1489,9 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) { // retrieve actual query results from vnode during the second stage join subquery if (pParentSql->res.code != TSDB_CODE_SUCCESS) { tscError("%p abort query due to other subquery failure. code:%d, global code:%d", pSql, code, pParentSql->res.code); - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } tscAsyncResultOnError(pParentSql); @@ -1486,7 +1505,10 @@ void tscJoinQueryCallback(void* param, TAOS_RES* tres, int code) { tscError("%p abort query, code:%s, global code:%s", pSql, tstrerror(code), tstrerror(pParentSql->res.code)); pParentSql->res.code = code; - quitAllSubquery(pSql, pParentSql, pSupporter); + if (quitAllSubquery(pSql, pParentSql, pSupporter)) { + return; + } + tscAsyncResultOnError(pParentSql); return; From 3368e49039c65b03d1b4846bb019819be5c45f3b Mon Sep 17 00:00:00 2001 From: dapan1121 <89396746@qq.com> Date: Fri, 22 Jan 2021 16:23:23 +0800 Subject: [PATCH 22/34] add assert --- src/client/src/tscSQLParser.c | 8 ++++++-- src/common/src/tname.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 9745597d99..38d32cc025 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -902,13 +902,17 @@ int32_t parseSlidingClause(SSqlObj* pSql, SQueryInfo* pQueryInfo, SQuerySQL* pQu int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SStrToken* pTableName, SSqlObj* pSql) { const char* msg1 = "name too long"; + const char* msg2 = "acctId too long"; SSqlCmd* pCmd = &pSql->cmd; int32_t code = TSDB_CODE_SUCCESS; if (hasSpecifyDB(pTableName)) { // db has been specified in sql string so we ignore current db path - tNameSetAcctId(&pTableMetaInfo->name, getAccountId(pSql)); - + code = tNameSetAcctId(&pTableMetaInfo->name, getAccountId(pSql)); + if (code != 0) { + return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2); + } + char name[TSDB_TABLE_FNAME_LEN] = {0}; strncpy(name, pTableName->z, pTableName->n); diff --git a/src/common/src/tname.c b/src/common/src/tname.c index 5c49e2e102..bbb0a8c082 100644 --- a/src/common/src/tname.c +++ b/src/common/src/tname.c @@ -367,6 +367,9 @@ int32_t tNameSetAcctId(SName* dst, const char* acct) { } tstrncpy(dst->acctId, acct, tListLen(dst->acctId)); + + assert(strlen(dst->acctId) > 0); + return 0; } @@ -383,12 +386,14 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) { int32_t len = (int32_t)(p - str); // too long account id or too long db name - if (len >= tListLen(dst->acctId) || len == 0) { + if ((len >= tListLen(dst->acctId)) || (len <= 0)) { return -1; } memcpy (dst->acctId, str, len); dst->acctId[len] = 0; + + assert(strlen(dst->acctId) > 0); } if ((type & T_NAME_DB) == T_NAME_DB) { @@ -404,7 +409,7 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) { } // too long account id or too long db name - if (len >= tListLen(dst->dbname) || len == 0) { + if ((len >= tListLen(dst->dbname)) || (len <= 0)) { return -1; } @@ -419,7 +424,7 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type) { int32_t len = (int32_t) strlen(start); // too long account id or too long db name - if (len >= tListLen(dst->tname) || len == 0) { + if ((len >= tListLen(dst->tname)) || (len <= 0)) { return -1; } From 20a7ae54693925643ac26b50fc69d54987e850c3 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 22 Jan 2021 16:26:05 +0800 Subject: [PATCH 23/34] TD-2820 --- src/util/src/tref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/src/tref.c b/src/util/src/tref.c index 3ef45e9b19..ebae8ece14 100644 --- a/src/util/src/tref.c +++ b/src/util/src/tref.c @@ -274,7 +274,7 @@ void *taosIterateRef(int rsetId, int64_t rid) { return NULL; } - if (rid <= 0) { + if (rid < 0) { uTrace("rsetId:%d rid:%" PRId64 " failed to iterate, rid not valid", rsetId, rid); terrno = TSDB_CODE_REF_NOT_EXIST; return NULL; From 9dc0bf6c86a01da3c44e9ced8d46858dcd8e8f20 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 22 Jan 2021 23:14:45 +0800 Subject: [PATCH 24/34] [TD-2339]: interpolation can be applied along with the time window. --- src/client/src/tscSQLParser.c | 19 +- src/inc/tsdb.h | 8 +- src/inc/ttype.h | 38 ++ src/query/inc/qExecutor.h | 5 +- src/query/inc/qFill.h | 2 +- src/query/inc/tsqlfunction.h | 2 +- src/query/src/qAggMain.c | 124 ++--- src/query/src/qExecutor.c | 169 +++++-- src/query/src/qFill.c | 24 +- src/tsdb/src/tsdbRead.c | 429 +++++++++++------ tests/script/general/parser/interp_test.sim | 492 ++++++++++++-------- 11 files changed, 826 insertions(+), 486 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 9745597d99..30caee26a3 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -2194,6 +2194,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col if (getColumnIndexByName(pCmd, &pParamElem->pNode->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) { return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3); } + if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) { return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg6); } @@ -4524,10 +4525,10 @@ int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuery return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2); } - size_t size = tscNumOfFields(pQueryInfo); + size_t numOfFields = tscNumOfFields(pQueryInfo); if (pQueryInfo->fillVal == NULL) { - pQueryInfo->fillVal = calloc(size, sizeof(int64_t)); + pQueryInfo->fillVal = calloc(numOfFields, sizeof(int64_t)); if (pQueryInfo->fillVal == NULL) { return TSDB_CODE_TSC_OUT_OF_MEMORY; } @@ -4537,7 +4538,7 @@ int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuery pQueryInfo->fillType = TSDB_FILL_NONE; } else if (strncasecmp(pItem->pVar.pz, "null", 4) == 0 && pItem->pVar.nLen == 4) { pQueryInfo->fillType = TSDB_FILL_NULL; - for (int32_t i = START_INTERPO_COL_IDX; i < size; ++i) { + for (int32_t i = START_INTERPO_COL_IDX; i < numOfFields; ++i) { TAOS_FIELD* pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i); setNull((char*)&pQueryInfo->fillVal[i], pField->type, pField->bytes); } @@ -4551,7 +4552,7 @@ int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuery pQueryInfo->fillType = TSDB_FILL_SET_VALUE; size_t num = taosArrayGetSize(pFillToken); - if (num == 1) { + if (num == 1) { // no actual value, return with error code return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1); } @@ -4562,11 +4563,11 @@ int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuery if (tscIsPointInterpQuery(pQueryInfo)) { startPos = 0; - if (numOfFillVal > size) { - numOfFillVal = (int32_t)size; + if (numOfFillVal > numOfFields) { + numOfFillVal = (int32_t)numOfFields; } } else { - numOfFillVal = (int16_t)((num > (int32_t)size) ? (int32_t)size : num); + numOfFillVal = (int16_t)((num > (int32_t)numOfFields) ? (int32_t)numOfFields : num); } int32_t j = 1; @@ -4586,10 +4587,10 @@ int32_t parseFillClause(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SQuerySQL* pQuery } } - if ((num < size) || ((num - 1 < size) && (tscIsPointInterpQuery(pQueryInfo)))) { + if ((num < numOfFields) || ((num - 1 < numOfFields) && (tscIsPointInterpQuery(pQueryInfo)))) { tVariantListItem* lastItem = taosArrayGetLast(pFillToken); - for (int32_t i = numOfFillVal; i < size; ++i) { + for (int32_t i = numOfFillVal; i < numOfFields; ++i) { TAOS_FIELD* pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i); if (pField->type == TSDB_DATA_TYPE_BINARY || pField->type == TSDB_DATA_TYPE_NCHAR) { diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h index 262bf30309..f663de49f0 100644 --- a/src/inc/tsdb.h +++ b/src/inc/tsdb.h @@ -114,6 +114,8 @@ void* tsdbGetTableTagVal(const void* pTable, int32_t colId, int16_t type, int16_ char* tsdbGetTableName(void *pTable); #define TSDB_TABLEID(_table) ((STableId*) (_table)) +#define TSDB_PREV_ROW 0x1 +#define TSDB_NEXT_ROW 0x2 STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg); @@ -141,7 +143,6 @@ typedef struct { int64_t tableTotalDataSize; // In bytes int64_t tableTotalDiskSize; // In bytes } STableInfo; -STableInfo *tsdbGetTableInfo(TSDB_REPO_T *pRepo, STableId tid); // -- FOR INSERT DATA /** @@ -160,9 +161,10 @@ typedef void *TsdbQueryHandleT; // Use void to hide implementation details // query condition to build vnode iterator typedef struct STsdbQueryCond { STimeWindow twindow; - int32_t order; // desc|asc order to iterate the data block + int32_t order; // desc|asc order to iterate the data block int32_t numOfCols; SColumnInfo *colList; + bool loadExternalRows; // load external rows or not } STsdbQueryCond; typedef struct SMemRef { @@ -240,6 +242,8 @@ TsdbQueryHandleT tsdbQueryRowsInExternalWindow(TSDB_REPO_T *tsdb, STsdbQueryCond */ bool tsdbNextDataBlock(TsdbQueryHandleT *pQueryHandle); +SArray* tsdbGetExternalRow(TsdbQueryHandleT *pHandle, SMemRef* pMemRef, int16_t type); + /** * Get current data block information * diff --git a/src/inc/ttype.h b/src/inc/ttype.h index 686c986f5b..32638ebb9d 100644 --- a/src/inc/ttype.h +++ b/src/inc/ttype.h @@ -45,6 +45,7 @@ typedef struct tstr { case TSDB_DATA_TYPE_USMALLINT: \ (_v) = (_finalType)GET_UINT16_VAL(_data); \ break; \ + case TSDB_DATA_TYPE_TIMESTAMP:\ case TSDB_DATA_TYPE_BIGINT: \ (_v) = (_finalType)(GET_INT64_VAL(_data)); \ break; \ @@ -66,6 +67,43 @@ typedef struct tstr { } \ } while (0) +#define SET_TYPED_DATA(_v, _type, _data) \ + do { \ + switch (_type) { \ + case TSDB_DATA_TYPE_BOOL: \ + case TSDB_DATA_TYPE_TINYINT: \ + *(int8_t *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_UTINYINT: \ + *(uint8_t *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_SMALLINT: \ + *(int16_t *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_USMALLINT: \ + *(uint16_t *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_BIGINT: \ + *(int64_t *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_UBIGINT: \ + *(uint64_t *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_FLOAT: \ + *(float *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_DOUBLE: \ + *(double *)(_v) = (_data); \ + break; \ + case TSDB_DATA_TYPE_UINT: \ + *(uint32_t *)(_v) = (_data); \ + break; \ + default: \ + *(int32_t *)(_v) = (_data); \ + break; \ + } \ + } while (0) + #define IS_SIGNED_NUMERIC_TYPE(_t) ((_t) >= TSDB_DATA_TYPE_TINYINT && (_t) <= TSDB_DATA_TYPE_BIGINT) #define IS_UNSIGNED_NUMERIC_TYPE(_t) ((_t) >= TSDB_DATA_TYPE_UTINYINT && (_t) <= TSDB_DATA_TYPE_UBIGINT) #define IS_FLOAT_TYPE(_t) ((_t) == TSDB_DATA_TYPE_FLOAT || (_t) == TSDB_DATA_TYPE_DOUBLE) diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h index 79d98432c8..0ed609c6c2 100644 --- a/src/query/inc/qExecutor.h +++ b/src/query/inc/qExecutor.h @@ -164,13 +164,14 @@ typedef struct SQuery { SColumnInfo* tagColList; int32_t numOfFilterCols; int64_t* fillVal; - uint32_t status; // query status + uint32_t status; // query status SResultRec rec; int32_t pos; tFilePage** sdata; STableQueryInfo* current; + int32_t numOfCheckedBlocks; // number of check data blocks - SOrderedPrjQueryInfo prjInfo; // limit value for each vgroup, only available in global order projection query. + SOrderedPrjQueryInfo prjInfo; // limit value for each vgroup, only available in global order projection query. SSingleColumnFilterInfo* pFilterInfo; } SQuery; diff --git a/src/query/inc/qFill.h b/src/query/inc/qFill.h index 93537ec3da..9b7f0fb529 100644 --- a/src/query/inc/qFill.h +++ b/src/query/inc/qFill.h @@ -86,7 +86,7 @@ bool taosFillHasMoreResults(SFillInfo* pFillInfo); int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, int64_t ekey, int32_t maxNumOfRows); -int32_t taosGetLinearInterpolationVal(int32_t type, SPoint *point1, SPoint *point2, SPoint *point); +int32_t taosGetLinearInterpolationVal(SPoint* point, int32_t outputType, SPoint* point1, SPoint* point2, int32_t inputType); int64_t taosFillResultDataBlock(SFillInfo* pFillInfo, tFilePage** output, int32_t capacity); diff --git a/src/query/inc/tsqlfunction.h b/src/query/inc/tsqlfunction.h index 51048bbe72..94933fbebf 100644 --- a/src/query/inc/tsqlfunction.h +++ b/src/query/inc/tsqlfunction.h @@ -153,7 +153,7 @@ typedef struct SResultRowCellInfo { typedef struct SPoint1 { int64_t key; - double val; + union{double val; char* ptr;}; } SPoint1; #define GET_ROWCELL_INTERBUF(_c) ((void*) ((char*)(_c) + sizeof(SResultRowCellInfo))) diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c index 543b205112..4d6b0e01c1 100644 --- a/src/query/src/qAggMain.c +++ b/src/query/src/qAggMain.c @@ -3776,89 +3776,67 @@ void twa_function_finalizer(SQLFunctionCtx *pCtx) { * * @param pCtx */ -static void interp_function(SQLFunctionCtx *pCtx) { - // at this point, the value is existed, return directly - SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx); - SInterpInfoDetail* pInfo = GET_ROWCELL_INTERBUF(pResInfo); - assert(pCtx->startOffset == 0); +static void interp_function_impl(SQLFunctionCtx *pCtx) { + int32_t type = pCtx->param[2].i64; + if (type == TSDB_FILL_NONE) { + return; + } - if (pCtx->size == 1) { - char *pData = GET_INPUT_DATA_LIST(pCtx); - assignVal(pCtx->aOutputBuf, pData, pCtx->inputBytes, pCtx->inputType); + if (pCtx->inputType == TSDB_DATA_TYPE_TIMESTAMP) { + *(TSKEY *) pCtx->aOutputBuf = pCtx->nStartQueryTimestamp; } else { - /* - * use interpolation to generate the result. - * Note: the result of primary timestamp column uses the timestamp specified by user in the query sql - */ - assert(pCtx->size == 2); - if (pInfo->type == TSDB_FILL_NONE) { // set no output result + if (pCtx->start.key == INT64_MIN) { + assert(pCtx->end.key == INT64_MIN); return; } - - if (pInfo->primaryCol == 1) { - *(TSKEY *) pCtx->aOutputBuf = pInfo->ts; - } else { - if (pInfo->type == TSDB_FILL_NULL) { - if (pCtx->outputType == TSDB_DATA_TYPE_BINARY || pCtx->outputType == TSDB_DATA_TYPE_NCHAR) { - setVardataNull(pCtx->aOutputBuf, pCtx->outputType); + + if (type == TSDB_FILL_NULL) { + setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes); + } else if (type == TSDB_FILL_SET_VALUE) { + tVariantDump(&pCtx->param[1], pCtx->aOutputBuf, pCtx->inputType, true); + } else if (type == TSDB_FILL_PREV) { + if (IS_NUMERIC_TYPE(pCtx->inputType) || pCtx->inputType == TSDB_DATA_TYPE_BOOL) { + SET_TYPED_DATA(pCtx->aOutputBuf, pCtx->inputType, pCtx->start.val); + } else { + assignVal(pCtx->aOutputBuf, pCtx->start.ptr, pCtx->outputBytes, pCtx->inputType); + } + } else if (type == TSDB_FILL_LINEAR) { + SPoint point1 = {.key = pCtx->start.key, .val = &pCtx->start.val}; + SPoint point2 = {.key = pCtx->end.key, .val = &pCtx->end.val}; + SPoint point = {.key = pCtx->nStartQueryTimestamp, .val = pCtx->aOutputBuf}; + + int32_t srcType = pCtx->inputType; + if (IS_NUMERIC_TYPE(srcType)) { // TODO should find the not null data? + if (isNull((char *)&pCtx->start.val, srcType) || isNull((char *)&pCtx->end.val, srcType)) { + setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes); } else { - setNull(pCtx->aOutputBuf, pCtx->outputType, pCtx->outputBytes); - } - - SET_VAL(pCtx, pCtx->size, 1); - } else if (pInfo->type == TSDB_FILL_SET_VALUE) { - tVariantDump(&pCtx->param[1], pCtx->aOutputBuf, pCtx->inputType, true); - } else if (pInfo->type == TSDB_FILL_PREV) { - char *data = GET_INPUT_DATA(pCtx, 0); - assignVal(pCtx->aOutputBuf, data, pCtx->outputBytes, pCtx->outputType); - - SET_VAL(pCtx, pCtx->size, 1); - } else if (pInfo->type == TSDB_FILL_LINEAR) { - char *data1 = GET_INPUT_DATA(pCtx, 0); - char *data2 = GET_INPUT_DATA(pCtx, 1); - - TSKEY key1 = pCtx->ptsList[0]; - TSKEY key2 = pCtx->ptsList[1]; - - SPoint point1 = {.key = key1, .val = data1}; - SPoint point2 = {.key = key2, .val = data2}; - - SPoint point = {.key = pInfo->ts, .val = pCtx->aOutputBuf}; - - int32_t srcType = pCtx->inputType; - if ((srcType >= TSDB_DATA_TYPE_TINYINT && srcType <= TSDB_DATA_TYPE_BIGINT) || - srcType == TSDB_DATA_TYPE_TIMESTAMP || srcType == TSDB_DATA_TYPE_DOUBLE) { - point1.val = data1; - point2.val = data2; - - if (isNull(data1, srcType) || isNull(data2, srcType)) { - setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes); - } else { - taosGetLinearInterpolationVal(pCtx->outputType, &point1, &point2, &point); - } - } else if (srcType == TSDB_DATA_TYPE_FLOAT) { - point1.val = data1; - point2.val = data2; - - if (isNull(data1, srcType) || isNull(data2, srcType)) { - setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes); - } else { - taosGetLinearInterpolationVal(pCtx->outputType, &point1, &point2, &point); - } - - } else { - if (srcType == TSDB_DATA_TYPE_BINARY || srcType == TSDB_DATA_TYPE_NCHAR) { - setVardataNull(pCtx->aOutputBuf, pCtx->inputType); - } else { - setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes); - } + taosGetLinearInterpolationVal(&point, pCtx->outputType, &point1, &point2, TSDB_DATA_TYPE_DOUBLE); } + } else { + setNull(pCtx->aOutputBuf, srcType, pCtx->inputBytes); } } } - - SET_VAL(pCtx, pCtx->size, 1); + + SET_VAL(pCtx, 1, 1); + +} +static void interp_function(SQLFunctionCtx *pCtx) { + // at this point, the value is existed, return directly + if (pCtx->size > 0) { + // impose the timestamp check + TSKEY key = GET_TS_DATA(pCtx, 0); + if (key == pCtx->nStartQueryTimestamp) { + char *pData = GET_INPUT_DATA(pCtx, 0); + assignVal(pCtx->aOutputBuf, pData, pCtx->inputBytes, pCtx->inputType); + SET_VAL(pCtx, 1, 1); + } else { + interp_function_impl(pCtx); + } + } else { //no qualified data rows and interpolation is required + interp_function_impl(pCtx); + } } static bool ts_comp_function_setup(SQLFunctionCtx *pCtx) { diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index f8b5d0497a..99b1203fd1 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -408,7 +408,7 @@ static bool isTopBottomQuery(SQuery *pQuery) { static bool timeWindowInterpoRequired(SQuery *pQuery) { for(int32_t i = 0; i < pQuery->numOfOutput; ++i) { int32_t functionId = pQuery->pExpr1[i].base.functionId; - if (functionId == TSDB_FUNC_TWA) { + if (functionId == TSDB_FUNC_TWA || functionId == TSDB_FUNC_INTERP) { return true; } } @@ -818,6 +818,7 @@ static int32_t getNumOfRowsInTimeWindow(SQuery *pQuery, SDataBlockInfo *pDataBlo return num; } +// TODO decouple the data block and the SQLFunctionCtx static void doBlockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow *pWin, int32_t offset, int32_t forwardStep, TSKEY *tsCol, int32_t numOfTotal) { SQuery *pQuery = pRuntimeEnv->pQuery; SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx; @@ -825,8 +826,8 @@ static void doBlockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow bool hasPrev = pCtx[0].preAggVals.isSet; for (int32_t k = 0; k < pQuery->numOfOutput; ++k) { - pCtx[k].nStartQueryTimestamp = pWin->skey; pCtx[k].size = forwardStep; + pCtx[k].nStartQueryTimestamp = pWin->skey; pCtx[k].startOffset = (QUERY_IS_ASC_QUERY(pQuery)) ? offset : offset - (forwardStep - 1); int32_t functionId = pQuery->pExpr1[k].base.functionId; @@ -1029,7 +1030,8 @@ static void setNotInterpoWindowKey(SQLFunctionCtx* pCtx, int32_t numOfOutput, in } // window start key interpolation -static bool setTimeWindowInterpolationStartTs(SQueryRuntimeEnv* pRuntimeEnv, int32_t pos, int32_t numOfRows, SArray* pDataBlock, TSKEY* tsCols, STimeWindow* win) { +static bool setTimeWindowInterpolationStartTs(SQueryRuntimeEnv* pRuntimeEnv, int32_t pos, int32_t numOfRows, + SArray* pDataBlock, TSKEY* tsCols, STimeWindow* win, int16_t type) { SQuery* pQuery = pRuntimeEnv->pQuery; TSKEY curTs = tsCols[pos]; @@ -1118,6 +1120,8 @@ static void doWindowBorderInterpolation(SQueryRuntimeEnv* pRuntimeEnv, SDataBloc assert(pDataBlock != NULL); SQuery* pQuery = pRuntimeEnv->pQuery; + int32_t fillType = pQuery->fillType; + int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order); SColumnInfoData *pColInfo = taosArrayGet(pDataBlock, 0); @@ -1126,7 +1130,7 @@ static void doWindowBorderInterpolation(SQueryRuntimeEnv* pRuntimeEnv, SDataBloc bool done = resultRowInterpolated(pResult, RESULT_ROW_START_INTERP); if (!done) { int32_t startRowIndex = startPos; - bool interp = setTimeWindowInterpolationStartTs(pRuntimeEnv, startRowIndex, pDataBlockInfo->rows, pDataBlock, tsCols, win); + bool interp = setTimeWindowInterpolationStartTs(pRuntimeEnv, startRowIndex, pDataBlockInfo->rows, pDataBlock, tsCols, win, fillType); if (interp) { setResultRowInterpo(pResult, RESULT_ROW_START_INTERP); } @@ -1134,6 +1138,12 @@ static void doWindowBorderInterpolation(SQueryRuntimeEnv* pRuntimeEnv, SDataBloc setNotInterpoWindowKey(pRuntimeEnv->pCtx, pQuery->numOfOutput, RESULT_ROW_START_INTERP); } + // point interpolation does not require the end key time window interpolation. + if (isPointInterpoQuery(pQuery)) { + return; + } + + // interpolation query does not generate the time window end interpolation done = resultRowInterpolated(pResult, RESULT_ROW_END_INTERP); if (!done) { int32_t endRowIndex = startPos + (forwardStep - 1) * step; @@ -1259,7 +1269,7 @@ static void blockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis * for (int32_t k = 0; k < pQuery->numOfOutput; ++k) { int32_t functionId = pQuery->pExpr1[k].base.functionId; if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) { - pCtx[k].nStartQueryTimestamp = pDataBlockInfo->window.skey; + pCtx[k].nStartQueryTimestamp = pQuery->window.skey; aAggs[functionId].xFunction(&pCtx[k]); } } @@ -1423,18 +1433,20 @@ static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx return true; } -void doRowwiseTimeWindowInterpolation(SQueryRuntimeEnv* pRuntimeEnv, SArray* pDataBlock, TSKEY prevTs, int32_t prevRowIndex, TSKEY curTs, int32_t curRowIndex, TSKEY windowKey, int32_t type) { - SQuery* pQuery = pRuntimeEnv->pQuery; +void doRowwiseTimeWindowInterpolation(SQueryRuntimeEnv *pRuntimeEnv, SArray *pDataBlock, TSKEY prevTs, + int32_t prevRowIndex, TSKEY curTs, int32_t curRowIndex, TSKEY windowKey, + int32_t type) { + SQuery *pQuery = pRuntimeEnv->pQuery; for (int32_t k = 0; k < pQuery->numOfOutput; ++k) { int32_t functionId = pQuery->pExpr1[k].base.functionId; - if (functionId != TSDB_FUNC_TWA) { + if (functionId != TSDB_FUNC_TWA && functionId != TSDB_FUNC_INTERP) { pRuntimeEnv->pCtx[k].start.key = INT64_MIN; continue; } - SColIndex* pColIndex = &pQuery->pExpr1[k].base.colInfo; - int16_t index = pColIndex->colIndex; - SColumnInfoData* pColInfo = taosArrayGet(pDataBlock, index); + SColIndex * pColIndex = &pQuery->pExpr1[k].base.colInfo; + int16_t index = pColIndex->colIndex; + SColumnInfoData *pColInfo = taosArrayGet(pDataBlock, index); assert(pColInfo->info.colId == pColIndex->colId && curTs != windowKey); double v1 = 0, v2 = 0, v = 0; @@ -1450,14 +1462,25 @@ void doRowwiseTimeWindowInterpolation(SQueryRuntimeEnv* pRuntimeEnv, SArray* pDa SPoint point1 = (SPoint){.key = prevTs, .val = &v1}; SPoint point2 = (SPoint){.key = curTs, .val = &v2}; SPoint point = (SPoint){.key = windowKey, .val = &v}; - taosGetLinearInterpolationVal(TSDB_DATA_TYPE_DOUBLE, &point1, &point2, &point); - if (type == RESULT_ROW_START_INTERP) { - pRuntimeEnv->pCtx[k].start.key = point.key; - pRuntimeEnv->pCtx[k].start.val = v; + if (functionId == TSDB_FUNC_TWA) { + taosGetLinearInterpolationVal(&point, TSDB_DATA_TYPE_DOUBLE, &point1, &point2, TSDB_DATA_TYPE_DOUBLE); + + if (type == RESULT_ROW_START_INTERP) { + pRuntimeEnv->pCtx[k].start.key = point.key; + pRuntimeEnv->pCtx[k].start.val = v; + } else { + pRuntimeEnv->pCtx[k].end.key = point.key; + pRuntimeEnv->pCtx[k].end.val = v; + } } else { - pRuntimeEnv->pCtx[k].end.key = point.key; - pRuntimeEnv->pCtx[k].end.val = v; + if (type == RESULT_ROW_START_INTERP) { + pRuntimeEnv->pCtx[k].start.key = prevTs; + pRuntimeEnv->pCtx[k].start.val = v1; + + pRuntimeEnv->pCtx[k].end.key = curTs; + pRuntimeEnv->pCtx[k].end.val = v2; + } } } } @@ -1796,13 +1819,7 @@ void setExecParams(SQuery *pQuery, SQLFunctionCtx *pCtx, void* inputData, TSKEY pCtx->preAggVals.statis.max = pBlockInfo->window.ekey; } } else if (functionId == TSDB_FUNC_INTERP) { - SResultRowCellInfo* pInfo = GET_RES_INFO(pCtx); - - SInterpInfoDetail *pInterpInfo = (SInterpInfoDetail *)GET_ROWCELL_INTERBUF(pInfo); - pInterpInfo->type = (int8_t)pQuery->fillType; - pInterpInfo->ts = pQuery->window.skey; - pInterpInfo->primaryCol = (colId == PRIMARYKEY_TIMESTAMP_COL_INDEX); - + pCtx->param[2].i64 = (int8_t) pQuery->fillType; if (pQuery->fillVal != NULL) { if (isNull((const char*) &pQuery->fillVal[colIndex], pCtx->inputType)) { pCtx->param[1].nType = TSDB_DATA_TYPE_NULL; @@ -2579,7 +2596,6 @@ int32_t loadDataBlockOnDemand(SQueryRuntimeEnv *pRuntimeEnv, SResultRowInfo * pW if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTsBuf > 0) { *status = BLK_DATA_ALL_NEEDED; } else { // check if this data block is required to load - // Calculate all time windows that are overlapping or contain current data block. // If current data block is contained by all possible time window, do not load current data block. if (QUERY_IS_INTERVAL_QUERY(pQuery) && overlapWithTimeWindow(pQuery, pBlockInfo)) { @@ -2818,6 +2834,10 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) { while (tsdbNextDataBlock(pQueryHandle)) { summary->totalBlocks += 1; + if (IS_MASTER_SCAN(pRuntimeEnv)) { + pQuery->numOfCheckedBlocks += 1; + } + if (isQueryKilled(GET_QINFO_ADDR(pRuntimeEnv))) { longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED); } @@ -3557,7 +3577,7 @@ void setQueryStatus(SQuery *pQuery, int8_t status) { } } -bool needScanDataBlocksAgain(SQueryRuntimeEnv *pRuntimeEnv) { +bool needRepeatScan(SQueryRuntimeEnv *pRuntimeEnv) { SQuery *pQuery = pRuntimeEnv->pQuery; bool toContinue = false; @@ -3711,7 +3731,7 @@ void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) { } } - if (!needScanDataBlocksAgain(pRuntimeEnv)) { + if (!needRepeatScan(pRuntimeEnv)) { // restore the status code and jump out of loop if (pRuntimeEnv->scanFlag == REPEAT_SCAN) { pQuery->status = qstatus.status; @@ -3737,24 +3757,72 @@ void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) { qDebug("QInfo:%p start to repeat scan data blocks due to query func required, qrange:%"PRId64"-%"PRId64, pQInfo, cond.twindow.skey, cond.twindow.ekey); + } - // check if query is killed or not - if (isQueryKilled(pQInfo)) { - longjmp(pRuntimeEnv->env, TSDB_CODE_TSC_QUERY_CANCELLED); + if (needReverseScan(pQuery)) { + setEnvBeforeReverseScan(pRuntimeEnv, &qstatus); + + // reverse scan from current position + qDebug("QInfo:%p start to reverse scan", pQInfo); + doScanAllDataBlocks(pRuntimeEnv); + + clearEnvAfterReverseScan(pRuntimeEnv, &qstatus); + } + + if (isPointInterpoQuery(pQuery) && pQuery->numOfCheckedBlocks == 0) { + SArray *prev = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_PREV_ROW); + SArray *next = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_NEXT_ROW); + + if (prev == NULL || next == NULL) { + return; + } + + // setup the pCtx->start/end info and calculate the interpolation value + SColumnInfoData *startTs = taosArrayGet(prev, 0); + SColumnInfoData *endTs = taosArrayGet(next, 0); + + for (int32_t i = 0; i < pQuery->numOfOutput; ++i) { + SQLFunctionCtx* pCtx = &pRuntimeEnv->pCtx[i]; + + int32_t functionId = pQuery->pExpr1[i].base.functionId; + SColIndex *pColIndex = &pQuery->pExpr1[i].base.colInfo; + + if (!TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) { + aAggs[functionId].xFunction(pCtx); + continue; + } + + SColumnInfoData *p = taosArrayGet(prev, pColIndex->colIndex); + SColumnInfoData *n = taosArrayGet(next, pColIndex->colIndex); + + assert(p->info.colId == pColIndex->colId); + + pCtx->start.key = *(TSKEY *)startTs->pData; + pCtx->end.key = *(TSKEY *)endTs->pData; + + if (p->info.type != TSDB_DATA_TYPE_BINARY && p->info.type != TSDB_DATA_TYPE_NCHAR) { + GET_TYPED_DATA(pCtx->start.val, double, p->info.type, p->pData); + GET_TYPED_DATA(pCtx->end.val, double, n->info.type, n->pData); + } else { // string pointer + pCtx->start.ptr = p->pData; + pCtx->end.ptr = n->pData; + } + + pCtx->param[2].i64 = (int8_t)pQuery->fillType; + pCtx->nStartQueryTimestamp = pQuery->window.skey; + if (pQuery->fillVal != NULL) { + if (isNull((const char*) &pQuery->fillVal[i], pCtx->inputType)) { + pCtx->param[1].nType = TSDB_DATA_TYPE_NULL; + } else { // todo refactor, tVariantCreateFromBinary should handle the NULL value + if (pCtx->inputType != TSDB_DATA_TYPE_BINARY && pCtx->inputType != TSDB_DATA_TYPE_NCHAR) { + tVariantCreateFromBinary(&pCtx->param[1], (char*) &pQuery->fillVal[i], pCtx->inputBytes, pCtx->inputType); + } + } + } + + aAggs[functionId].xFunction(pCtx); } } - - if (!needReverseScan(pQuery)) { - return; - } - - setEnvBeforeReverseScan(pRuntimeEnv, &qstatus); - - // reverse scan from current position - qDebug("QInfo:%p start to reverse scan", pQInfo); - doScanAllDataBlocks(pRuntimeEnv); - - clearEnvAfterReverseScan(pRuntimeEnv, &qstatus); } void finalizeQueryResult(SQueryRuntimeEnv *pRuntimeEnv) { @@ -4891,6 +4959,7 @@ static bool multiTableMultioutputHelper(SQInfo *pQInfo, int32_t index) { .order = pQuery->order.order, .colList = pQuery->colList, .numOfCols = pQuery->numOfCols, + .loadExternalRows = false, }; // todo refactor @@ -4985,6 +5054,7 @@ STsdbQueryCond createTsdbQueryCond(SQuery* pQuery, STimeWindow* win) { .colList = pQuery->colList, .order = pQuery->order.order, .numOfCols = pQuery->numOfCols, + .loadExternalRows = false, }; TIME_WINDOW_COPY(cond.twindow, *win); @@ -5727,8 +5797,17 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) { } } + // TODO opt performance +// if (isPointInterpoQuery(pQuery)) { +// SArray *prev = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_PREV_ROW); +// +// for(int32_t i = 0; i < pQuery->numOfCols; ++i) { +// SColumnInfoData *p = taosArrayGet(prev, i); +// memcpy(pRuntimeEnv->prevRow[i], p->pData, p->info.bytes); +// } +// } + scanOneTableDataBlocks(pRuntimeEnv, newStartKey); - assert(!Q_STATUS_EQUAL(pQuery->status, QUERY_NOT_COMPLETED)); finalizeQueryResult(pRuntimeEnv); @@ -5736,7 +5815,7 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) { pQuery->rec.rows = 0; // not fill or no result generated during this query - if (pQuery->fillType == TSDB_FILL_NONE || pRuntimeEnv->windowResInfo.size == 0) { + if (pQuery->fillType == TSDB_FILL_NONE || pRuntimeEnv->windowResInfo.size == 0 || isPointInterpoQuery(pQuery)) { // all data scanned, the group by normal column can return int32_t numOfClosed = numOfClosedResultRows(&pRuntimeEnv->windowResInfo); if (pQuery->limit.offset > numOfClosed) { @@ -5771,7 +5850,7 @@ static void tableQueryImpl(SQInfo *pQInfo) { SQuery * pQuery = pRuntimeEnv->pQuery; if (hasNotReturnedResults(pRuntimeEnv)) { - if (pQuery->fillType != TSDB_FILL_NONE) { + if (pQuery->fillType != TSDB_FILL_NONE && !isPointInterpoQuery(pQuery)) { /* * There are remain results that are not returned due to result interpolation * So, we do keep in this procedure instead of launching retrieve procedure for next results. diff --git a/src/query/src/qFill.c b/src/query/src/qFill.c index 65b58467b7..481c25c5b4 100644 --- a/src/query/src/qFill.c +++ b/src/query/src/qFill.c @@ -120,7 +120,7 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, tFilePage** data, char** sr point1 = (SPoint){.key = *(TSKEY*)(prev), .val = prev + pCol->col.offset}; point2 = (SPoint){.key = ts, .val = srcData[i] + pFillInfo->index * bytes}; point = (SPoint){.key = pFillInfo->currentKey, .val = val1}; - taosGetLinearInterpolationVal(type, &point1, &point2, &point); + taosGetLinearInterpolationVal(&point, type, &point1, &point2, type); } } else { setNullValueForRow(pFillInfo, data, pFillInfo->numOfCols, index); @@ -479,25 +479,13 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t ma return (numOfRes > maxNumOfRows) ? maxNumOfRows : numOfRes; } -int32_t taosGetLinearInterpolationVal(int32_t type, SPoint* point1, SPoint* point2, SPoint* point) { - double v1 = -1; - double v2 = -1; - - GET_TYPED_DATA(v1, double, type, point1->val); - GET_TYPED_DATA(v2, double, type, point2->val); +int32_t taosGetLinearInterpolationVal(SPoint* point, int32_t outputType, SPoint* point1, SPoint* point2, int32_t inputType) { + double v1 = -1, v2 = -1; + GET_TYPED_DATA(v1, double, inputType, point1->val); + GET_TYPED_DATA(v2, double, inputType, point2->val); double r = DO_INTERPOLATION(v1, v2, point1->key, point2->key, point->key); - - switch(type) { - case TSDB_DATA_TYPE_TINYINT: *(int8_t*) point->val = (int8_t) r;break; - case TSDB_DATA_TYPE_SMALLINT: *(int16_t*) point->val = (int16_t) r;break; - case TSDB_DATA_TYPE_INT: *(int32_t*) point->val = (int32_t) r;break; - case TSDB_DATA_TYPE_BIGINT: *(int64_t*) point->val = (int64_t) r;break; - case TSDB_DATA_TYPE_DOUBLE: *(double*) point->val = (double) r;break; - case TSDB_DATA_TYPE_FLOAT: *(float*) point->val = (float) r;break; - default: - assert(0); - } + SET_TYPED_DATA(point->val, outputType, r); return TSDB_CODE_SUCCESS; } diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 90f673eaee..4c98aaa307 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -111,6 +111,7 @@ typedef struct STsdbQueryHandle { int32_t activeIndex; bool checkFiles; // check file stage bool cachelastrow; // check if last row cached + bool loadExternalRow; // load time window external data rows void* qinfo; // query info handle, for debug purpose int32_t type; // query type: retrieve all data blocks, 2. retrieve only last row, 3. retrieve direct prev|next rows SFileGroup* pFileGroup; @@ -125,6 +126,8 @@ typedef struct STsdbQueryHandle { SDataBlockLoadInfo dataBlockLoadInfo; /* record current block load information */ SLoadCompBlockInfo compBlockLoadInfo; /* record current compblock information in SQuery */ + SArray *prev; // previous row which is before than time window + SArray *next; // next row which is after the query time window SIOCostSummary cost; } STsdbQueryHandle; @@ -141,10 +144,10 @@ static int32_t tsdbGetCachedLastRow(STable* pTable, SDataRow* pRes, TSKEY* lastK static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle); static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo* pCheckInfo, SCompBlock* pBlock); static int32_t binarySearchForKey(char* pValue, int num, TSKEY key, int order); -static int tsdbReadRowsFromCache(STableCheckInfo* pCheckInfo, TSKEY maxKey, int maxRowsToRead, STimeWindow* win, - STsdbQueryHandle* pQueryHandle); -static int tsdbCheckInfoCompar(const void* key1, const void* key2); - +static int32_t tsdbReadRowsFromCache(STableCheckInfo* pCheckInfo, TSKEY maxKey, int maxRowsToRead, STimeWindow* win, STsdbQueryHandle* pQueryHandle); +static int32_t tsdbCheckInfoCompar(const void* key1, const void* key2); +static int32_t doGetExternalRow(STsdbQueryHandle* pQueryHandle, int16_t type, SMemRef* pMemRef); +static void* doFreeColumnInfoData(SArray* pColumnInfoData); static void tsdbInitDataBlockLoadInfo(SDataBlockLoadInfo* pBlockLoadInfo) { pBlockLoadInfo->slot = -1; @@ -294,6 +297,7 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(TSDB_REPO_T* tsdb, STsdbQueryCond* pQueryHandle->allocSize = 0; pQueryHandle->locateStart = false; pQueryHandle->pMemRef = pMemRef; + pQueryHandle->loadExternalRow = pCond->loadExternalRows; if (tsdbInitReadHelper(&pQueryHandle->rhelper, (STsdbRepo*) tsdb) != 0) { goto out_of_memory; @@ -410,10 +414,11 @@ SArray* tsdbGetQueriedTableList(TsdbQueryHandleT *pHandle) { TsdbQueryHandleT tsdbQueryRowsInExternalWindow(TSDB_REPO_T *tsdb, STsdbQueryCond* pCond, STableGroupInfo *groupList, void* qinfo, SMemRef* pRef) { STsdbQueryHandle *pQueryHandle = (STsdbQueryHandle*) tsdbQueryTables(tsdb, pCond, groupList, qinfo, pRef); + pQueryHandle->loadExternalRow = true; if (pQueryHandle != NULL) { - pQueryHandle->type = TSDB_QUERY_TYPE_EXTERNAL; changeQueryHandleForInterpQuery(pQueryHandle); } + return pQueryHandle; } @@ -1900,17 +1905,22 @@ static bool doHasDataInBuffer(STsdbQueryHandle* pQueryHandle) { pQueryHandle->activeIndex += 1; } + if (pQueryHandle->loadExternalRow && pQueryHandle->window.skey == pQueryHandle->window.ekey) { + SMemRef* pMemRef = pQueryHandle->pMemRef; + doGetExternalRow(pQueryHandle, TSDB_PREV_ROW, pMemRef); + doGetExternalRow(pQueryHandle, TSDB_NEXT_ROW, pMemRef); + } + // no data in memtable or imemtable, decrease the memory reference. tsdbMayUnTakeMemSnapshot(pQueryHandle); return false; } +//todo not unref yet, since it is not support multi-group interpolation query static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle) { // filter the queried time stamp in the first place STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle; - pQueryHandle->order = TSDB_ORDER_DESC; - - assert(pQueryHandle->window.skey == pQueryHandle->window.ekey); +// pQueryHandle->order = TSDB_ORDER_DESC; // starts from the buffer in case of descending timestamp order check data blocks size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo); @@ -1940,7 +1950,7 @@ static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle) { taosArrayPush(pQueryHandle->pTableCheckInfo, &info); // update the query time window according to the chosen last timestamp - pQueryHandle->window = (STimeWindow) {info.lastKey, TSKEY_INITIAL_VAL}; +// pQueryHandle->window = (STimeWindow) {info.lastKey, TSKEY_INITIAL_VAL}; } static int tsdbReadRowsFromCache(STableCheckInfo* pCheckInfo, TSKEY maxKey, int maxRowsToRead, STimeWindow* win, @@ -2029,110 +2039,147 @@ static void destroyHelper(void* param) { free(param); } -static bool getNeighborRows(STsdbQueryHandle* pQueryHandle) { - assert (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL); - - SDataBlockInfo blockInfo = {{0}, 0}; - - pQueryHandle->type = TSDB_QUERY_TYPE_ALL; - pQueryHandle->order = TSDB_ORDER_DESC; - - if (!tsdbNextDataBlock((void*) pQueryHandle)) { - return false; - } - - tsdbRetrieveDataBlockInfo((void*) pQueryHandle, &blockInfo); - /*SArray *pDataBlock = */tsdbRetrieveDataBlock((void*) pQueryHandle, pQueryHandle->defaultLoadColumn); - if (terrno != TSDB_CODE_SUCCESS) { - return false; - } - - if (pQueryHandle->cur.win.ekey == pQueryHandle->window.skey) { - // data already retrieve, discard other data rows and return - int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); - for (int32_t i = 0; i < numOfCols; ++i) { - SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); - memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), pCol->info.bytes); - } - - pQueryHandle->cur.win = (STimeWindow){pQueryHandle->window.skey, pQueryHandle->window.skey}; - pQueryHandle->window = pQueryHandle->cur.win; - pQueryHandle->cur.rows = 1; - pQueryHandle->type = TSDB_QUERY_TYPE_ALL; - return true; - } else { - STimeWindow win = (STimeWindow) {pQueryHandle->window.skey, INT64_MAX}; - STsdbQueryCond cond = { - .order = TSDB_ORDER_ASC, - .numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)) - }; - cond.twindow = win; - - cond.colList = calloc(cond.numOfCols, sizeof(SColumnInfo)); - if (cond.colList == NULL) { - terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; - return false; - } - - for(int32_t i = 0; i < cond.numOfCols; ++i) { - SColumnInfoData* pColInfoData = taosArrayGet(pQueryHandle->pColumns, i); - memcpy(&cond.colList[i], &pColInfoData->info, sizeof(SColumnInfo)); - } - - STsdbQueryHandle* pSecQueryHandle = tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pQueryHandle->pMemRef); - - tfree(cond.colList); - - pSecQueryHandle->pTableCheckInfo = createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey); - if (pSecQueryHandle->pTableCheckInfo == NULL) { - tsdbCleanupQueryHandle(pSecQueryHandle); - return false; - } - - if (!tsdbNextDataBlock((void*) pSecQueryHandle)) { - tsdbCleanupQueryHandle(pSecQueryHandle); - return false; - } - - tsdbRetrieveDataBlockInfo((void*) pSecQueryHandle, &blockInfo); - tsdbRetrieveDataBlock((void*) pSecQueryHandle, pSecQueryHandle->defaultLoadColumn); - - int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pSecQueryHandle)); - size_t si = taosArrayGetSize(pSecQueryHandle->pTableCheckInfo); - - for (int32_t i = 0; i < numOfCols; ++i) { - SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); - memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), pCol->info.bytes); - - SColumnInfoData* pCol1 = taosArrayGet(pSecQueryHandle->pColumns, i); - assert(pCol->info.colId == pCol1->info.colId); - - memcpy((char*)pCol->pData + pCol->info.bytes, pCol1->pData, pCol1->info.bytes); - } - - SColumnInfoData* pTSCol = taosArrayGet(pQueryHandle->pColumns, 0); - - // it is ascending order - pQueryHandle->order = TSDB_ORDER_DESC; - pQueryHandle->window = pQueryHandle->cur.win; - pQueryHandle->cur.win = (STimeWindow){((TSKEY*)pTSCol->pData)[0], ((TSKEY*)pTSCol->pData)[1]}; - pQueryHandle->cur.rows = 2; - pQueryHandle->cur.mixBlock = true; - - int32_t step = -1;// one step for ascending order traverse - for (int32_t j = 0; j < si; ++j) { - STableCheckInfo* pCheckInfo = (STableCheckInfo*) taosArrayGet(pQueryHandle->pTableCheckInfo, j); - pCheckInfo->lastKey = pQueryHandle->cur.win.ekey + step; - } - - tsdbCleanupQueryHandle(pSecQueryHandle); - } - - //disable it after retrieve data - pQueryHandle->type = TSDB_QUERY_TYPE_EXTERNAL; - pQueryHandle->checkFiles = false; - return true; -} +//static bool getNeighborRows(STsdbQueryHandle* pQueryHandle) { +// assert(pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL); +// +// SDataBlockInfo blockInfo = {{0}, 0}; +// +// pQueryHandle->type = TSDB_QUERY_TYPE_ALL; +// pQueryHandle->order = TSDB_ORDER_DESC; +// +// if (!tsdbNextDataBlock((void*)pQueryHandle)) { +// return false; +// } +// +// tsdbRetrieveDataBlockInfo((void*)pQueryHandle, &blockInfo); +// /*SArray *pDataBlock = */ tsdbRetrieveDataBlock((void*)pQueryHandle, pQueryHandle->defaultLoadColumn); +// if (terrno != TSDB_CODE_SUCCESS) { +// return false; +// } +// +// STimeWindow* win = &pQueryHandle->window; +// +// // the skey == ekey means only one data row is required. +// // the data row of this timestamp is already retrieved, discard other data rows and return. +// if (win->skey == win->ekey) { +// if (pQueryHandle->cur.win.ekey == win->skey) { +// int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); +// for (int32_t i = 0; i < numOfCols; ++i) { +// SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); +// memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), +// pCol->info.bytes); +// } +// +// pQueryHandle->cur.win = (STimeWindow){win->skey, win->skey}; +// pQueryHandle->window = pQueryHandle->cur.win; +// pQueryHandle->cur.rows = 1; +// pQueryHandle->type = TSDB_QUERY_TYPE_ALL; +// return true; +// } else { +// STimeWindow win1 = (STimeWindow){pQueryHandle->window.skey, INT64_MAX}; +// STsdbQueryCond cond = {.order = TSDB_ORDER_ASC, .numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle))}; +// +// cond.twindow = win1; +// +// cond.colList = calloc(cond.numOfCols, sizeof(SColumnInfo)); +// if (cond.colList == NULL) { +// terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; +// return false; +// } +// +// for (int32_t i = 0; i < cond.numOfCols; ++i) { +// SColumnInfoData* pColInfoData = taosArrayGet(pQueryHandle->pColumns, i); +// memcpy(&cond.colList[i], &pColInfoData->info, sizeof(SColumnInfo)); +// } +// +// STsdbQueryHandle* pSecQueryHandle = +// tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pQueryHandle->pMemRef); +// +// tfree(cond.colList); +// +// pSecQueryHandle->pTableCheckInfo = +// createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey); +// if (pSecQueryHandle->pTableCheckInfo == NULL) { +// tsdbCleanupQueryHandle(pSecQueryHandle); +// return false; +// } +// +// if (!tsdbNextDataBlock((void*)pSecQueryHandle)) { +// tsdbCleanupQueryHandle(pSecQueryHandle); +// return false; +// } +// +// tsdbRetrieveDataBlockInfo((void*)pSecQueryHandle, &blockInfo); +// tsdbRetrieveDataBlock((void*)pSecQueryHandle, pSecQueryHandle->defaultLoadColumn); +// +// int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pSecQueryHandle)); +// size_t si = taosArrayGetSize(pSecQueryHandle->pTableCheckInfo); +// +// for (int32_t i = 0; i < numOfCols; ++i) { +// SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); +// memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), +// pCol->info.bytes); +// +// SColumnInfoData* pCol1 = taosArrayGet(pSecQueryHandle->pColumns, i); +// assert(pCol->info.colId == pCol1->info.colId); +// +// memcpy((char*)pCol->pData + pCol->info.bytes, pCol1->pData, pCol1->info.bytes); +// } +// +// SColumnInfoData* pTSCol = taosArrayGet(pQueryHandle->pColumns, 0); +// +// // it is ascending order +// pQueryHandle->order = TSDB_ORDER_DESC; +// pQueryHandle->window = pQueryHandle->cur.win; +// pQueryHandle->cur.win = (STimeWindow){((TSKEY*)pTSCol->pData)[0], ((TSKEY*)pTSCol->pData)[1]}; +// pQueryHandle->cur.rows = 2; +// pQueryHandle->cur.mixBlock = true; +// +// int32_t step = -1; // one step for ascending order traverse +// for (int32_t j = 0; j < si; ++j) { +// STableCheckInfo* pCheckInfo = (STableCheckInfo*)taosArrayGet(pQueryHandle->pTableCheckInfo, j); +// pCheckInfo->lastKey = pQueryHandle->cur.win.ekey + step; +// } +// +// tsdbCleanupQueryHandle(pSecQueryHandle); +// } +// } else { // go back to normal query +// if (pQueryHandle->cur.win.ekey == win->skey) { +// pQueryHandle->type = TSDB_QUERY_TYPE_ALL; +// +// STsdbQueryCond cond = {.order = TSDB_ORDER_ASC, .numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle))}; +// +// cond.twindow = pQueryHandle->oriWindow;; +// +// cond.colList = calloc(cond.numOfCols, sizeof(SColumnInfo)); +// if (cond.colList == NULL) { +// terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; +// return false; +// } +// +// STsdbQueryHandle* pSecQueryHandle = +// tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pQueryHandle->pMemRef); +// +// tfree(cond.colList); +// +// pSecQueryHandle->pTableCheckInfo = +// createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey); +// if (pSecQueryHandle->pTableCheckInfo == NULL) { +// tsdbCleanupQueryHandle(pSecQueryHandle); +// return false; +// } +// +// return true; +// } else { +// // save the pre rows for interpolation query. +// } +// } +// +// // disable it after retrieve data +// pQueryHandle->type = TSDB_QUERY_TYPE_EXTERNAL; +// pQueryHandle->checkFiles = false; +// return true; +//} // handle data in cache situation bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) { @@ -2144,16 +2191,16 @@ bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) { size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo); assert(numOfTables > 0); - if (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL) { - SMemRef* pMemRef = pQueryHandle->pMemRef; - tsdbMayTakeMemSnapshot(pQueryHandle); - bool ret = getNeighborRows(pQueryHandle); - tsdbMayUnTakeMemSnapshot(pQueryHandle); - - // restore the pMemRef - pQueryHandle->pMemRef = pMemRef; - return ret; - } else if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { +// if (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL) { +// SMemRef* pMemRef = pQueryHandle->pMemRef; +// tsdbMayTakeMemSnapshot(pQueryHandle); +// bool ret = getNeighborRows(pQueryHandle); +// tsdbMayUnTakeMemSnapshot(pQueryHandle); +// +// // restore the pMemRef +// pQueryHandle->pMemRef = pMemRef; +// return ret; + /*} else*/ if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { // the last row is cached in buffer, return it directly. // here note that the pQueryHandle->window must be the TS_INITIALIZER int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); @@ -2218,6 +2265,115 @@ bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) { return ret; } +static int32_t doGetExternalRow(STsdbQueryHandle* pQueryHandle, int16_t type, SMemRef* pMemRef) { + STsdbQueryHandle* pSecQueryHandle = NULL; + + if (type == TSDB_PREV_ROW && pQueryHandle->prev) { + return TSDB_CODE_SUCCESS; + } + + if (type == TSDB_NEXT_ROW && pQueryHandle->next) { + return TSDB_CODE_SUCCESS; + } + + // prepare the structure + int32_t numOfCols = QH_GET_NUM_OF_COLS(pQueryHandle); + + if (type == TSDB_PREV_ROW) { + pQueryHandle->prev = taosArrayInit(numOfCols, sizeof(SColumnInfoData)); + if (pQueryHandle->prev == NULL) { + terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; + goto out_of_memory; + } + } else { + pQueryHandle->next = taosArrayInit(numOfCols, sizeof(SColumnInfoData)); + if (pQueryHandle->next == NULL) { + terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; + goto out_of_memory; + } + } + + SArray* row = (type == TSDB_PREV_ROW)? pQueryHandle->prev:pQueryHandle->next; + + for (int32_t i = 0; i < numOfCols; ++i) { + SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); + + SColumnInfoData colInfo = {{0}, 0}; + colInfo.info = pCol->info; + colInfo.pData = calloc(1, pCol->info.bytes); + if (colInfo.pData == NULL) { + terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; + goto out_of_memory; + } + + taosArrayPush(row, &colInfo); + } + + // load the previous row + STsdbQueryCond cond = {.numOfCols = numOfCols, .loadExternalRows = false,}; + if (type == TSDB_PREV_ROW) { + cond.order = TSDB_ORDER_DESC; + cond.twindow = (STimeWindow){pQueryHandle->window.skey, INT64_MIN}; + } else { + cond.order = TSDB_ORDER_ASC; + cond.twindow = (STimeWindow){pQueryHandle->window.skey, INT64_MAX}; + } + + cond.colList = calloc(cond.numOfCols, sizeof(SColumnInfo)); + if (cond.colList == NULL) { + terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; + goto out_of_memory; + } + + for (int32_t i = 0; i < cond.numOfCols; ++i) { + SColumnInfoData* pColInfoData = taosArrayGet(pQueryHandle->pColumns, i); + memcpy(&cond.colList[i], &pColInfoData->info, sizeof(SColumnInfo)); + } + + pSecQueryHandle = tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pMemRef); + + tfree(cond.colList); + pSecQueryHandle->pTableCheckInfo = createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey); + if (pSecQueryHandle->pTableCheckInfo == NULL) { + terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; + goto out_of_memory; + } + + if (!tsdbNextDataBlock((void*)pSecQueryHandle)) { + // no result in current query, free the corresponding result rows structure + if (type == TSDB_PREV_ROW) { + pQueryHandle->prev = doFreeColumnInfoData(pQueryHandle->prev); + } else { + pQueryHandle->next = doFreeColumnInfoData(pQueryHandle->next); + } + + goto out_of_memory; + } + + SDataBlockInfo blockInfo = {{0}, 0}; + tsdbRetrieveDataBlockInfo((void*)pSecQueryHandle, &blockInfo); + tsdbRetrieveDataBlock((void*)pSecQueryHandle, pSecQueryHandle->defaultLoadColumn); + + row = (type == TSDB_PREV_ROW)? pQueryHandle->prev:pQueryHandle->next; + int32_t pos = (type == TSDB_PREV_ROW)?pSecQueryHandle->cur.rows - 1:0; + + for (int32_t i = 0; i < numOfCols; ++i) { + SColumnInfoData* pCol = taosArrayGet(row, i); + SColumnInfoData* s = taosArrayGet(pSecQueryHandle->pColumns, i); + memcpy((char*)pCol->pData, (char*)s->pData + s->info.bytes * pos, pCol->info.bytes); + } + +out_of_memory: + tsdbCleanupQueryHandle(pSecQueryHandle); + return terrno; +} + +SArray* tsdbGetExternalRow(TsdbQueryHandleT *pHandle, SMemRef* pMemRef, int16_t type) { + STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle; + assert(type == TSDB_PREV_ROW || type == TSDB_NEXT_ROW); + return (type == TSDB_PREV_ROW)? pQueryHandle->prev:pQueryHandle->next; +} + /* * 1. no data at all (pTable->lastKey = TSKEY_INITIAL_VAL), just return TSKEY_INITIAL_VAL * 2. has data but not loaded, just return lastKey but not set pRes @@ -2890,6 +3046,21 @@ int32_t tsdbGetTableGroupFromIdList(TSDB_REPO_T* tsdb, SArray* pTableIdList, STa return TSDB_CODE_SUCCESS; } +static void* doFreeColumnInfoData(SArray* pColumnInfoData) { + if (pColumnInfoData == NULL) { + return NULL; + } + + size_t cols = taosArrayGetSize(pColumnInfoData); + for (int32_t i = 0; i < cols; ++i) { + SColumnInfoData* pColInfo = taosArrayGet(pColumnInfoData, i); + tfree(pColInfo->pData); + } + + taosArrayDestroy(pColumnInfoData); + return NULL; +} + void tsdbCleanupQueryHandle(TsdbQueryHandleT queryHandle) { STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*)queryHandle; if (pQueryHandle == NULL) { @@ -2907,14 +3078,7 @@ void tsdbCleanupQueryHandle(TsdbQueryHandleT queryHandle) { taosArrayDestroy(pQueryHandle->pTableCheckInfo); } - if (pQueryHandle->pColumns != NULL) { - size_t cols = taosArrayGetSize(pQueryHandle->pColumns); - for (int32_t i = 0; i < cols; ++i) { - SColumnInfoData* pColInfo = taosArrayGet(pQueryHandle->pColumns, i); - tfree(pColInfo->pData); - } - taosArrayDestroy(pQueryHandle->pColumns); - } + pQueryHandle->pColumns = doFreeColumnInfoData(pQueryHandle->pColumns); taosArrayDestroy(pQueryHandle->defaultLoadColumn); tfree(pQueryHandle->pDataBlockInfo); @@ -2928,6 +3092,9 @@ void tsdbCleanupQueryHandle(TsdbQueryHandleT queryHandle) { tdFreeDataCols(pQueryHandle->pDataCols); pQueryHandle->pDataCols = NULL; + pQueryHandle->prev = doFreeColumnInfoData(pQueryHandle->prev); + pQueryHandle->next = doFreeColumnInfoData(pQueryHandle->next); + SIOCostSummary* pCost = &pQueryHandle->cost; tsdbDebug("%p :io-cost summary: statis-info:%"PRId64" us, datablock:%" PRId64" us, check data:%"PRId64" us, %p", pQueryHandle, pCost->statisInfoLoadTime, pCost->blockLoadTime, pCost->checkForNextTime, pQueryHandle->qinfo); diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim index 819e5741d3..295a56e4b3 100644 --- a/tests/script/general/parser/interp_test.sim +++ b/tests/script/general/parser/interp_test.sim @@ -638,209 +638,293 @@ if $data24 != NULL then return -1 endi - ## interp(*) from stb + group by + fill(prev) - $t = $ts0 + 1000 - sql select interp(*) from $stb where ts = $t fill(prev) group by tbname - print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09 - print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29 - if $rows != $tbNum then - return -1 - endi - if $data00 != @18-09-17 09:00:01.000@ then - return -1 - endi - if $data01 != 0 then - return -1 - endi - if $data02 != 0 then - return -1 - endi - if $data03 != 0.00000 then - return -1 - endi - if $data04 != 0.000000000 then - return -1 - endi - if $data05 != 0 then - return -1 - endi - if $data06 != 0 then - return -1 - endi - if $data07 != 1 then - return -1 - endi - if $data08 != binary0 then - return -1 - endi - if $data09 != nchar0 then - return -1 - endi - if $data20 != @18-09-17 09:00:01.000@ then - return -1 - endi - if $data21 != 0 then - return -1 - endi - if $data22 != NULL then - return -1 - endi - if $data23 != 0.00000 then - return -1 - endi - if $data24 != NULL then - return -1 - endi - if $data25 != 0 then - return -1 - endi - if $data26 != 0 then - return -1 - endi - if $data27 != 1 then - return -1 - endi - if $data28 != binary0 then - return -1 - endi - if $data29 != nchar0 then - return -1 - endi +## interp(*) from stb + group by + fill(prev) +$t = $ts0 + 1000 +sql select interp(*) from $stb where ts = $t fill(prev) group by tbname +print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09 +print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29 +if $rows != $tbNum then + return -1 +endi +if $data00 != @18-09-17 09:00:01.000@ then + return -1 +endi +if $data01 != 0 then + return -1 +endi +if $data02 != 0 then + return -1 +endi +if $data03 != 0.00000 then + return -1 +endi +if $data04 != 0.000000000 then + return -1 +endi +if $data05 != 0 then + return -1 +endi +if $data06 != 0 then + return -1 +endi +if $data07 != 1 then + return -1 +endi +if $data08 != binary0 then + return -1 +endi +if $data09 != nchar0 then + return -1 +endi +if $data20 != @18-09-17 09:00:01.000@ then + return -1 +endi +if $data21 != 0 then + return -1 +endi +if $data22 != NULL then + return -1 +endi +if $data23 != 0.00000 then + return -1 +endi +if $data24 != NULL then + return -1 +endi +if $data25 != 0 then + return -1 +endi +if $data26 != 0 then + return -1 +endi +if $data27 != 1 then + return -1 +endi +if $data28 != binary0 then + return -1 +endi +if $data29 != nchar0 then + return -1 +endi - ## interp(*) from stb + group by + fill(linear) - $t = $ts0 + 1000 - sql select interp(*) from $stb where ts = $t fill(linear) group by tbname - print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09 - print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29 - if $rows != $tbNum then - return -1 - endi - if $data00 != @18-09-17 09:00:01.000@ then - return -1 - endi - if $data01 != 0 then - return -1 - endi - if $data02 != 0 then - return -1 - endi - if $data03 != 0.00167 then - return -1 - endi - if $data04 != 0.001666667 then - return -1 - endi - if $data05 != 0 then - return -1 - endi - if $data06 != 0 then - return -1 - endi - if $data07 != NULL then - return -1 - endi - if $data08 != NULL then - return -1 - endi - if $data09 != NULL then - return -1 - endi - if $data20 != @18-09-17 09:00:01.000@ then - return -1 - endi - if $data21 != 0 then - return -1 - endi - if $data22 != NULL then - return -1 - endi - if $data23 != 0.00167 then - return -1 - endi - if $data24 != NULL then - return -1 - endi - if $data25 != 0 then - return -1 - endi - if $data26 != 0 then - return -1 - endi - if $data27 != NULL then - return -1 - endi - if $data28 != NULL then - return -1 - endi - if $data29 != NULL then - return -1 - endi +## interp(*) from stb + group by + fill(linear) +$t = $ts0 + 1000 +sql select interp(*) from $stb where ts = $t fill(linear) group by tbname +print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09 +print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29 +if $rows != $tbNum then + return -1 +endi +if $data00 != @18-09-17 09:00:01.000@ then + return -1 +endi +if $data01 != 0 then + return -1 +endi +if $data02 != 0 then + return -1 +endi +if $data03 != 0.00167 then + return -1 +endi +if $data04 != 0.001666667 then + return -1 +endi +if $data05 != 0 then + return -1 +endi +if $data06 != 0 then + return -1 +endi +if $data07 != NULL then + return -1 +endi +if $data08 != NULL then + return -1 +endi +if $data09 != NULL then + return -1 +endi +if $data20 != @18-09-17 09:00:01.000@ then + return -1 +endi +if $data21 != 0 then + return -1 +endi +if $data22 != NULL then + return -1 +endi +if $data23 != 0.00167 then + return -1 +endi +if $data24 != NULL then + return -1 +endi +if $data25 != 0 then + return -1 +endi +if $data26 != 0 then + return -1 +endi +if $data27 != NULL then + return -1 +endi +if $data28 != NULL then + return -1 +endi +if $data29 != NULL then + return -1 +endi - ## interp(*) from stb + group by + fill(value) - $t = $ts0 + 1000 - sql select interp(*) from $stb where ts = $t fill(value, -1, -2) group by tbname - print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09 - print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29 - if $rows != $tbNum then - return -1 - endi - if $data00 != @18-09-17 09:00:01.000@ then - return -1 - endi - if $data01 != -2 then - return -1 - endi - if $data02 != -2 then - return -1 - endi - if $data03 != -2.00000 then - return -1 - endi - if $data04 != -2.000000000 then - return -1 - endi - if $data05 != -2 then - return -1 - endi - if $data06 != -2 then - return -1 - endi - if $data07 != 1 then - return -1 - endi - if $data08 != NULL then - return -1 - endi - if $data09 != NULL then - return -1 - endi - if $data20 != @18-09-17 09:00:01.000@ then - return -1 - endi - if $data21 != -2 then - return -1 - endi - if $data22 != -2 then - return -1 - endi - if $data23 != -2.00000 then - return -1 - endi - if $data24 != -2.000000000 then - return -1 - endi - if $data25 != -2 then - return -1 - endi - if $data26 != -2 then - return -1 - endi - if $data27 != 1 then - return -1 - endi - if $data28 != NULL then - return -1 - endi - if $data29 != NULL then - return -1 - endi + ## interp(*) from stb + group by + fill(value) +$t = $ts0 + 1000 +sql select interp(*) from $stb where ts = $t fill(value, -1, -2) group by tbname +print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09 +print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29 +if $rows != $tbNum then + return -1 +endi +if $data00 != @18-09-17 09:00:01.000@ then + return -1 +endi +if $data01 != -2 then + return -1 +endi +if $data02 != -2 then + return -1 +endi +if $data03 != -2.00000 then + return -1 +endi +if $data04 != -2.000000000 then + return -1 +endi +if $data05 != -2 then + return -1 +endi +if $data06 != -2 then + return -1 +endi +if $data07 != 1 then + return -1 +endi +if $data08 != NULL then + return -1 +endi +if $data09 != NULL then + return -1 +endi +if $data20 != @18-09-17 09:00:01.000@ then + return -1 +endi +if $data21 != -2 then + return -1 +endi +if $data22 != -2 then + return -1 +endi +if $data23 != -2.00000 then + return -1 +endi +if $data24 != -2.000000000 then + return -1 +endi +if $data25 != -2 then + return -1 +endi +if $data26 != -2 then + return -1 +endi +if $data27 != 1 then + return -1 +endi +if $data28 != NULL then + return -1 +endi +if $data29 != NULL then + return -1 +endi + +sql_error select interp(ts,c1) from intp_tb0 where ts>'2018-11-25 19:19:00' and ts<'2018-11-25 19:19:12'; +sql select interp(ts,c1) from intp_tb0 where ts>'2018-11-25 19:19:00' and ts<'2018-11-25 19:19:12' interval(1s) fill(linear); +if $rows != 0 then + return -1 +endi + +sql select interp(c1) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' interval(18m); +if $rows != 0 then + return -1 +endi + +if $data00 != @2018-11-25 18:30:00.000@ then + return -1 +endi + +if $data01 != 3 then + return -1 +endi + +sql select interp(c1,c3,c4,ts) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' interval(18m) fill(linear) +if $rows != 5 then + return -1 +endi + +if $data00 != @2018-11-25 17:54:00.000@ then + return -1 +endi + +if $data01 != 0 then + return -1 +endi + +if $data02 != 0.00000 then + return -1 +endi + +if $data03 != 0.000000000 then + return -1 +endi + +if $data04 != @2018-11-25 17:54:00.000@ then + return -1 +endi + +if $data10 != @2018-11-25 18:12:00.000@ then + return -1 +endi + +if $data11 != 1 then + return -1 +endi + +if $data12 != 1.20000 then + return -1 +endi + +if $data13 != 1.200000000 then + return -1 +endi + +if $data14 != @2018-11-25 18:12:00.000@ then + return -1 +endi + +if $data40 != @2018-11-25 19:06:00.000@ then + return -1 +endi + +if $data41 != 6 then + return -1 +endi + +if $data42 != 6.60000 then + return -1 +endi + +if $data43 != 6.600000000 then + return -1 +endi + +if $data44 != @2018-11-25 19:06:00.000@ then + return -1 +endi \ No newline at end of file From 7ee01d6d5ee83ec190bb3b7c897107d37027730d Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 14:49:06 +0800 Subject: [PATCH 25/34] [TD-225]refactor. --- src/client/inc/tsclient.h | 6 +- src/client/src/tscLocalMerge.c | 2 +- src/client/src/tscSQLParser.c | 14 +- src/client/src/tscSql.c | 2 +- src/client/src/tscSubquery.c | 2 +- src/client/src/tscUtil.c | 4 +- src/{query/inc/qAst.h => common/inc/texpr.h} | 38 +++-- src/common/inc/tname.h | 15 ++ src/{query/src/qAst.c => common/src/texpr.c} | 23 ++- src/query/inc/{tsqlfunction.h => qAggMain.h} | 10 +- src/query/inc/qExecutor.h | 2 +- src/query/src/qAggMain.c | 12 +- src/query/src/qExecutor.c | 7 +- src/query/src/qExtbuffer.c | 4 +- src/query/src/qFill.c | 2 +- src/query/tests/astTest.cpp | 2 +- src/query/tests/patternMatchTest.cpp | 2 +- src/tsdb/src/tsdbRead.c | 166 +------------------ 18 files changed, 88 insertions(+), 225 deletions(-) rename src/{query/inc/qAst.h => common/inc/texpr.h} (83%) rename src/{query/src/qAst.c => common/src/texpr.c} (96%) rename src/query/inc/{tsqlfunction.h => qAggMain.h} (97%) diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index 7fc5cbe08e..c1b6b0c2b9 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -22,15 +22,15 @@ extern "C" { #include "os.h" +#include "qAggMain.h" #include "taos.h" #include "taosdef.h" #include "taosmsg.h" #include "tarray.h" -#include "tglobal.h" -#include "tsqlfunction.h" -#include "tutil.h" #include "tcache.h" +#include "tglobal.h" #include "tref.h" +#include "tutil.h" #include "qExecutor.h" #include "qSqlparser.h" diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c index 5b5fe8e798..d1ccc1fbb0 100644 --- a/src/client/src/tscLocalMerge.c +++ b/src/client/src/tscLocalMerge.c @@ -16,7 +16,7 @@ #include "tscLocalMerge.h" #include "tscSubquery.h" #include "os.h" -#include "qAst.h" +#include "texpr.h" #include "tlosertree.h" #include "tscLog.h" #include "tscUtil.h" diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 30caee26a3..bdbe9d39c9 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -20,7 +20,7 @@ #include "os.h" #include "ttype.h" -#include "qAst.h" +#include "texpr.h" #include "taos.h" #include "taosmsg.h" #include "tcompare.h" @@ -1354,7 +1354,7 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, int32_t clauseIndex, int32_t int32_t ret = exprTreeFromSqlExpr(pCmd, &pNode, pItem->pNode, pQueryInfo, colList, NULL); if (ret != TSDB_CODE_SUCCESS) { taosArrayDestroy(colList); - tExprTreeDestroy(&pNode, NULL); + tExprTreeDestroy(pNode, NULL); return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2); } @@ -1363,9 +1363,9 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, int32_t clauseIndex, int32_t for(int32_t k = 0; k < numOfNode; ++k) { SColIndex* pIndex = taosArrayGet(colList, k); if (TSDB_COL_IS_TAG(pIndex->flag)) { - tExprTreeDestroy(&pNode, NULL); + tExprTreeDestroy(pNode, NULL); taosArrayDestroy(colList); - tExprTreeDestroy(&pNode, NULL); + return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3); } } @@ -1392,7 +1392,7 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, int32_t clauseIndex, int32_t tbufCloseWriter(&bw); taosArrayDestroy(colList); - tExprTreeDestroy(&pNode, NULL); + tExprTreeDestroy(pNode, NULL); } else { columnList.num = 0; columnList.ids[0] = (SColumnIndex) {0, 0}; @@ -1424,7 +1424,7 @@ static int32_t handleArithmeticExpr(SSqlCmd* pCmd, int32_t clauseIndex, int32_t int32_t ret = exprTreeFromSqlExpr(pCmd, &pArithExprInfo->pExpr, pItem->pNode, pQueryInfo, NULL, &pArithExprInfo->uid); if (ret != TSDB_CODE_SUCCESS) { - tExprTreeDestroy(&pArithExprInfo->pExpr, NULL); + tExprTreeDestroy(pArithExprInfo->pExpr, NULL); return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), "invalid expression in select clause"); } @@ -4304,7 +4304,7 @@ static int32_t getTagQueryCondExpr(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SCondE doCompactQueryExpr(pExpr); tSqlExprDestroy(p1); - tExprTreeDestroy(&p, NULL); + tExprTreeDestroy(p, NULL); taosArrayDestroy(colList); if (pQueryInfo->tagCond.pCond != NULL && taosArrayGetSize(pQueryInfo->tagCond.pCond) > 0 && !UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) { diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index b0154b0e2c..7e7007444a 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -15,7 +15,7 @@ #include "hash.h" #include "os.h" -#include "qAst.h" +#include "texpr.h" #include "tkey.h" #include "tcache.h" #include "tnote.h" diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index 629707525a..aacdf9103e 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -16,7 +16,7 @@ #include "os.h" -#include "qAst.h" +#include "texpr.h" #include "qTsbuf.h" #include "tcompare.h" #include "tscLog.h" diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 99e4fd40d8..9e30ac8d82 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -16,7 +16,7 @@ #include "tscUtil.h" #include "hash.h" #include "os.h" -#include "qAst.h" +#include "texpr.h" #include "taosmsg.h" #include "tkey.h" #include "tmd5.h" @@ -1054,7 +1054,7 @@ void tscFieldInfoClear(SFieldInfo* pFieldInfo) { SInternalField* pInfo = taosArrayGet(pFieldInfo->internalField, i); if (pInfo->pArithExprInfo != NULL) { - tExprTreeDestroy(&pInfo->pArithExprInfo->pExpr, NULL); + tExprTreeDestroy(pInfo->pArithExprInfo->pExpr, NULL); SSqlFuncMsg* pFuncMsg = &pInfo->pArithExprInfo->base; for(int32_t j = 0; j < pFuncMsg->numOfParams; ++j) { diff --git a/src/query/inc/qAst.h b/src/common/inc/texpr.h similarity index 83% rename from src/query/inc/qAst.h rename to src/common/inc/texpr.h index 39af7261ef..acfbffc01e 100644 --- a/src/query/inc/qAst.h +++ b/src/common/inc/texpr.h @@ -31,6 +31,15 @@ extern "C" { struct tExprNode; struct SSchema; +#define QUERY_COND_REL_PREFIX_IN "IN|" +#define QUERY_COND_REL_PREFIX_LIKE "LIKE|" + +#define QUERY_COND_REL_PREFIX_IN_LEN 3 +#define QUERY_COND_REL_PREFIX_LIKE_LEN 5 + +typedef bool (*__result_filter_fn_t)(const void *, void *); +typedef void (*__do_filter_suppl_fn_t)(void *, void *); + enum { TSQL_NODE_DUMMY = 0x0, TSQL_NODE_EXPR = 0x1, @@ -38,9 +47,6 @@ enum { TSQL_NODE_VALUE = 0x4, }; -typedef bool (*__result_filter_fn_t)(const void *, void *); -typedef void (*__do_filter_suppl_fn_t)(void *, void *); - /** * this structure is used to filter data in tags, so the offset of filtered tag column in tagdata string is required */ @@ -52,12 +58,6 @@ typedef struct tQueryInfo { bool indexed; // indexed columns } tQueryInfo; -typedef struct SExprTraverseSupp { - __result_filter_fn_t nodeFilterFn; - __do_filter_suppl_fn_t setupInfoFn; - void * pExtInfo; -} SExprTraverseSupp; - typedef struct tExprNode { uint8_t nodeType; union { @@ -65,7 +65,7 @@ typedef struct tExprNode { uint8_t optr; // filter operator uint8_t hasPK; // 0: do not contain primary filter, 1: contain void * info; // support filter operation on this expression only available for leaf node - + struct tExprNode *pLeft; // left child pointer struct tExprNode *pRight; // right child pointer } _node; @@ -74,19 +74,27 @@ typedef struct tExprNode { }; } tExprNode; -void arithmeticTreeTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order, - char *(*cb)(void *, const char*, int32_t)); +typedef struct SExprTraverseSupp { + __result_filter_fn_t nodeFilterFn; + __do_filter_suppl_fn_t setupInfoFn; + void * pExtInfo; +} SExprTraverseSupp; + +void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *)); tExprNode* exprTreeFromBinary(const void* data, size_t size); tExprNode* exprTreeFromTableName(const char* tbnameCond); void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree); -void tExprNodeDestroy(tExprNode *pNode, void (*fp)(void *)); -void tExprTreeDestroy(tExprNode **pExprs, void (*fp)(void*)); - bool exprTreeApplayFilter(tExprNode *pExpr, const void *pItem, SExprTraverseSupp *param); +typedef void (*_arithmetic_operator_fn_t)(void *left, int32_t numLeft, int32_t leftType, void *right, int32_t numRight, + int32_t rightType, void *output, int32_t order); + +void arithmeticTreeTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, void *param, int32_t order, + char *(*cb)(void *, const char*, int32_t)); + #ifdef __cplusplus } #endif diff --git a/src/common/inc/tname.h b/src/common/inc/tname.h index bc1611cefe..92387560a7 100644 --- a/src/common/inc/tname.h +++ b/src/common/inc/tname.h @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + #ifndef TDENGINE_NAME_H #define TDENGINE_NAME_H diff --git a/src/query/src/qAst.c b/src/common/src/texpr.c similarity index 96% rename from src/query/src/qAst.c rename to src/common/src/texpr.c index bd87cacb4b..10e93d0edc 100644 --- a/src/query/src/qAst.c +++ b/src/common/src/texpr.c @@ -16,18 +16,15 @@ #include "os.h" #include "exception.h" -#include "qArithmeticOperator.h" -#include "qAst.h" #include "taosdef.h" #include "taosmsg.h" #include "tarray.h" #include "tbuffer.h" #include "tcompare.h" -#include "tname.h" -#include "tschemautil.h" #include "tsdb.h" #include "tskiplist.h" -#include "tsqlfunction.h" +#include "texpr.h" + static uint8_t UNUSED_FUNC isQueryOnPrimaryKey(const char *primaryColumnName, const tExprNode *pLeft, const tExprNode *pRight) { if (pLeft->nodeType == TSQL_NODE_COL) { @@ -102,13 +99,15 @@ static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOf } } -void tExprNodeDestroy(tExprNode *pNode, void (*fp)(void *)) { +static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)); + +void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *)) { if (pNode == NULL) { return; } if (pNode->nodeType == TSQL_NODE_EXPR) { - tExprTreeDestroy(&pNode, fp); + doExprTreeDestroy(&pNode, fp); } else if (pNode->nodeType == TSQL_NODE_VALUE) { tVariantDestroy(pNode->pVal); } else if (pNode->nodeType == TSQL_NODE_COL) { @@ -118,14 +117,14 @@ void tExprNodeDestroy(tExprNode *pNode, void (*fp)(void *)) { free(pNode); } -void tExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) { +static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) { if (*pExpr == NULL) { return; } if ((*pExpr)->nodeType == TSQL_NODE_EXPR) { - tExprTreeDestroy(&(*pExpr)->_node.pLeft, fp); - tExprTreeDestroy(&(*pExpr)->_node.pRight, fp); + doExprTreeDestroy(&(*pExpr)->_node.pLeft, fp); + doExprTreeDestroy(&(*pExpr)->_node.pRight, fp); if (fp != NULL) { fp((*pExpr)->_node.info); @@ -342,7 +341,7 @@ static tExprNode* exprTreeFromBinaryImpl(SBufferReader* br) { } tExprNode* pExpr = exception_calloc(1, sizeof(tExprNode)); - CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, pExpr, NULL); + CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, pExpr, NULL); pExpr->nodeType = tbufReadUint8(br); if (pExpr->nodeType == TSQL_NODE_VALUE) { @@ -396,7 +395,7 @@ tExprNode* exprTreeFromTableName(const char* tbnameCond) { int32_t anchor = CLEANUP_GET_ANCHOR(); tExprNode* expr = exception_calloc(1, sizeof(tExprNode)); - CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, expr, NULL); + CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, expr, NULL); expr->nodeType = TSQL_NODE_EXPR; diff --git a/src/query/inc/tsqlfunction.h b/src/query/inc/qAggMain.h similarity index 97% rename from src/query/inc/tsqlfunction.h rename to src/query/inc/qAggMain.h index 94933fbebf..53af502e27 100644 --- a/src/query/inc/tsqlfunction.h +++ b/src/query/inc/qAggMain.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#ifndef TDENGINE_TSQLFUNCTION_H -#define TDENGINE_TSQLFUNCTION_H +#ifndef TDENGINE_QAGGMAIN_H +#define TDENGINE_QAGGMAIN_H #ifdef __cplusplus extern "C" { @@ -97,11 +97,7 @@ extern "C" { #define DATA_SET_FLAG ',' // to denote the output area has data, not null value #define DATA_SET_FLAG_SIZE sizeof(DATA_SET_FLAG) -#define QUERY_COND_REL_PREFIX_IN "IN|" -#define QUERY_COND_REL_PREFIX_LIKE "LIKE|" -#define QUERY_COND_REL_PREFIX_IN_LEN 3 -#define QUERY_COND_REL_PREFIX_LIKE_LEN 5 #define QUERY_ASC_FORWARD_STEP 1 #define QUERY_DESC_FORWARD_STEP -1 @@ -279,4 +275,4 @@ static FORCE_INLINE void initResultInfo(SResultRowCellInfo *pResInfo, uint32_t b } #endif -#endif // TDENGINE_TSQLFUNCTION_H +#endif // TDENGINE_QAGGMAIN_H diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h index 0ed609c6c2..63259651d4 100644 --- a/src/query/inc/qExecutor.h +++ b/src/query/inc/qExecutor.h @@ -18,6 +18,7 @@ #include "os.h" #include "hash.h" +#include "qAggMain.h" #include "qFill.h" #include "qResultbuf.h" #include "qSqlparser.h" @@ -27,7 +28,6 @@ #include "tarray.h" #include "tlockfree.h" #include "tsdb.h" -#include "tsqlfunction.h" struct SColumnFilterElem; typedef bool (*__filter_func_t)(struct SColumnFilterElem* pFilter, const char* val1, const char* val2, int16_t type); diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c index 4d6b0e01c1..9d05677752 100644 --- a/src/query/src/qAggMain.c +++ b/src/query/src/qAggMain.c @@ -14,17 +14,17 @@ */ #include "os.h" -#include "qAst.h" +#include "taosdef.h" +#include "taosmsg.h" +#include "texpr.h" +#include "ttype.h" + +#include "qAggMain.h" #include "qFill.h" #include "qHistogram.h" #include "qPercentile.h" #include "qTsbuf.h" -#include "taosdef.h" -#include "taosmsg.h" #include "queryLog.h" -#include "tscSubquery.h" -#include "tsqlfunction.h" -#include "ttype.h" #define GET_INPUT_DATA_LIST(x) (((char *)((x)->aInputElemBuf)) + ((x)->startOffset) * ((x)->inputBytes)) #define GET_INPUT_DATA(x, y) (GET_INPUT_DATA_LIST(x) + (y) * (x)->inputBytes) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 99b1203fd1..abea2c9548 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -20,7 +20,7 @@ #include "exception.h" #include "hash.h" -#include "qAst.h" +#include "texpr.h" #include "qExecutor.h" #include "qResultbuf.h" #include "qUtil.h" @@ -6798,7 +6798,8 @@ _cleanup_query: for (int32_t i = 0; i < numOfOutput; ++i) { SExprInfo* pExprInfo = &pExprs[i]; if (pExprInfo->pExpr != NULL) { - tExprTreeDestroy(&pExprInfo->pExpr, NULL); + tExprTreeDestroy(pExprInfo->pExpr, NULL); + pExprInfo->pExpr = NULL; } } @@ -6914,7 +6915,7 @@ static void* destroyQueryFuncExpr(SExprInfo* pExprInfo, int32_t numOfExpr) { for (int32_t i = 0; i < numOfExpr; ++i) { if (pExprInfo[i].pExpr != NULL) { - tExprNodeDestroy(pExprInfo[i].pExpr, NULL); + tExprTreeDestroy(pExprInfo[i].pExpr, NULL); } } diff --git a/src/query/src/qExtbuffer.c b/src/query/src/qExtbuffer.c index fa3fe285a8..e4c62d90e3 100644 --- a/src/query/src/qExtbuffer.c +++ b/src/query/src/qExtbuffer.c @@ -12,13 +12,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -#include "os.h" #include "qExtbuffer.h" +#include "os.h" +#include "qAggMain.h" #include "queryLog.h" #include "taos.h" #include "taosdef.h" #include "taosmsg.h" -#include "tsqlfunction.h" #include "tulog.h" #define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \ diff --git a/src/query/src/qFill.c b/src/query/src/qFill.c index 481c25c5b4..c82f8f632d 100644 --- a/src/query/src/qFill.c +++ b/src/query/src/qFill.c @@ -15,9 +15,9 @@ #include "os.h" +#include "qAggMain.h" #include "taosdef.h" #include "taosmsg.h" -#include "tsqlfunction.h" #include "ttype.h" #include "qFill.h" diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp index 728de4357c..ce7b2f94a1 100644 --- a/src/query/tests/astTest.cpp +++ b/src/query/tests/astTest.cpp @@ -3,7 +3,7 @@ #include #include -#include "qAst.h" +#include "texpr.h" #include "taosmsg.h" #include "tsdb.h" #include "tskiplist.h" diff --git a/src/query/tests/patternMatchTest.cpp b/src/query/tests/patternMatchTest.cpp index fa2b58a10b..f3e0d3e119 100644 --- a/src/query/tests/patternMatchTest.cpp +++ b/src/query/tests/patternMatchTest.cpp @@ -3,7 +3,7 @@ #include #include -#include "tsqlfunction.h" +#include "qAggMain.h" #include "tcompare.h" TEST(testCase, patternMatchTest) { diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 4c98aaa307..1845685ff5 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -19,10 +19,10 @@ #include "tcompare.h" #include "exception.h" -#include "../../query/inc/qAst.h" // todo move to common module #include "tlosertree.h" #include "tsdb.h" #include "tsdbMain.h" +#include "texpr.h" #define EXTRA_BYTES 2 #define ASCENDING_TRAVERSE(o) (o == TSDB_ORDER_ASC) @@ -1920,7 +1920,6 @@ static bool doHasDataInBuffer(STsdbQueryHandle* pQueryHandle) { static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle) { // filter the queried time stamp in the first place STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle; -// pQueryHandle->order = TSDB_ORDER_DESC; // starts from the buffer in case of descending timestamp order check data blocks size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo); @@ -1948,9 +1947,6 @@ static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle) { info.lastKey = pQueryHandle->window.skey; taosArrayPush(pQueryHandle->pTableCheckInfo, &info); - - // update the query time window according to the chosen last timestamp -// pQueryHandle->window = (STimeWindow) {info.lastKey, TSKEY_INITIAL_VAL}; } static int tsdbReadRowsFromCache(STableCheckInfo* pCheckInfo, TSKEY maxKey, int maxRowsToRead, STimeWindow* win, @@ -2030,7 +2026,6 @@ static void destroyHelper(void* param) { return; } - tQueryInfo* pInfo = (tQueryInfo*)param; if (pInfo->optr != TSDB_RELATION_IN) { tfree(pInfo->q); @@ -2039,148 +2034,6 @@ static void destroyHelper(void* param) { free(param); } -//static bool getNeighborRows(STsdbQueryHandle* pQueryHandle) { -// assert(pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL); -// -// SDataBlockInfo blockInfo = {{0}, 0}; -// -// pQueryHandle->type = TSDB_QUERY_TYPE_ALL; -// pQueryHandle->order = TSDB_ORDER_DESC; -// -// if (!tsdbNextDataBlock((void*)pQueryHandle)) { -// return false; -// } -// -// tsdbRetrieveDataBlockInfo((void*)pQueryHandle, &blockInfo); -// /*SArray *pDataBlock = */ tsdbRetrieveDataBlock((void*)pQueryHandle, pQueryHandle->defaultLoadColumn); -// if (terrno != TSDB_CODE_SUCCESS) { -// return false; -// } -// -// STimeWindow* win = &pQueryHandle->window; -// -// // the skey == ekey means only one data row is required. -// // the data row of this timestamp is already retrieved, discard other data rows and return. -// if (win->skey == win->ekey) { -// if (pQueryHandle->cur.win.ekey == win->skey) { -// int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); -// for (int32_t i = 0; i < numOfCols; ++i) { -// SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); -// memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), -// pCol->info.bytes); -// } -// -// pQueryHandle->cur.win = (STimeWindow){win->skey, win->skey}; -// pQueryHandle->window = pQueryHandle->cur.win; -// pQueryHandle->cur.rows = 1; -// pQueryHandle->type = TSDB_QUERY_TYPE_ALL; -// return true; -// } else { -// STimeWindow win1 = (STimeWindow){pQueryHandle->window.skey, INT64_MAX}; -// STsdbQueryCond cond = {.order = TSDB_ORDER_ASC, .numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle))}; -// -// cond.twindow = win1; -// -// cond.colList = calloc(cond.numOfCols, sizeof(SColumnInfo)); -// if (cond.colList == NULL) { -// terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; -// return false; -// } -// -// for (int32_t i = 0; i < cond.numOfCols; ++i) { -// SColumnInfoData* pColInfoData = taosArrayGet(pQueryHandle->pColumns, i); -// memcpy(&cond.colList[i], &pColInfoData->info, sizeof(SColumnInfo)); -// } -// -// STsdbQueryHandle* pSecQueryHandle = -// tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pQueryHandle->pMemRef); -// -// tfree(cond.colList); -// -// pSecQueryHandle->pTableCheckInfo = -// createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey); -// if (pSecQueryHandle->pTableCheckInfo == NULL) { -// tsdbCleanupQueryHandle(pSecQueryHandle); -// return false; -// } -// -// if (!tsdbNextDataBlock((void*)pSecQueryHandle)) { -// tsdbCleanupQueryHandle(pSecQueryHandle); -// return false; -// } -// -// tsdbRetrieveDataBlockInfo((void*)pSecQueryHandle, &blockInfo); -// tsdbRetrieveDataBlock((void*)pSecQueryHandle, pSecQueryHandle->defaultLoadColumn); -// -// int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pSecQueryHandle)); -// size_t si = taosArrayGetSize(pSecQueryHandle->pTableCheckInfo); -// -// for (int32_t i = 0; i < numOfCols; ++i) { -// SColumnInfoData* pCol = taosArrayGet(pQueryHandle->pColumns, i); -// memcpy((char*)pCol->pData, (char*)pCol->pData + pCol->info.bytes * (pQueryHandle->cur.rows - 1), -// pCol->info.bytes); -// -// SColumnInfoData* pCol1 = taosArrayGet(pSecQueryHandle->pColumns, i); -// assert(pCol->info.colId == pCol1->info.colId); -// -// memcpy((char*)pCol->pData + pCol->info.bytes, pCol1->pData, pCol1->info.bytes); -// } -// -// SColumnInfoData* pTSCol = taosArrayGet(pQueryHandle->pColumns, 0); -// -// // it is ascending order -// pQueryHandle->order = TSDB_ORDER_DESC; -// pQueryHandle->window = pQueryHandle->cur.win; -// pQueryHandle->cur.win = (STimeWindow){((TSKEY*)pTSCol->pData)[0], ((TSKEY*)pTSCol->pData)[1]}; -// pQueryHandle->cur.rows = 2; -// pQueryHandle->cur.mixBlock = true; -// -// int32_t step = -1; // one step for ascending order traverse -// for (int32_t j = 0; j < si; ++j) { -// STableCheckInfo* pCheckInfo = (STableCheckInfo*)taosArrayGet(pQueryHandle->pTableCheckInfo, j); -// pCheckInfo->lastKey = pQueryHandle->cur.win.ekey + step; -// } -// -// tsdbCleanupQueryHandle(pSecQueryHandle); -// } -// } else { // go back to normal query -// if (pQueryHandle->cur.win.ekey == win->skey) { -// pQueryHandle->type = TSDB_QUERY_TYPE_ALL; -// -// STsdbQueryCond cond = {.order = TSDB_ORDER_ASC, .numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle))}; -// -// cond.twindow = pQueryHandle->oriWindow;; -// -// cond.colList = calloc(cond.numOfCols, sizeof(SColumnInfo)); -// if (cond.colList == NULL) { -// terrno = TSDB_CODE_QRY_OUT_OF_MEMORY; -// return false; -// } -// -// STsdbQueryHandle* pSecQueryHandle = -// tsdbQueryTablesImpl(pQueryHandle->pTsdb, &cond, pQueryHandle->qinfo, pQueryHandle->pMemRef); -// -// tfree(cond.colList); -// -// pSecQueryHandle->pTableCheckInfo = -// createCheckInfoFromCheckInfo(pQueryHandle->pTableCheckInfo, pSecQueryHandle->window.skey); -// if (pSecQueryHandle->pTableCheckInfo == NULL) { -// tsdbCleanupQueryHandle(pSecQueryHandle); -// return false; -// } -// -// return true; -// } else { -// // save the pre rows for interpolation query. -// } -// } -// -// // disable it after retrieve data -// pQueryHandle->type = TSDB_QUERY_TYPE_EXTERNAL; -// pQueryHandle->checkFiles = false; -// return true; -//} - // handle data in cache situation bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) { STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle; @@ -2191,16 +2044,7 @@ bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) { size_t numOfTables = taosArrayGetSize(pQueryHandle->pTableCheckInfo); assert(numOfTables > 0); -// if (pQueryHandle->type == TSDB_QUERY_TYPE_EXTERNAL) { -// SMemRef* pMemRef = pQueryHandle->pMemRef; -// tsdbMayTakeMemSnapshot(pQueryHandle); -// bool ret = getNeighborRows(pQueryHandle); -// tsdbMayUnTakeMemSnapshot(pQueryHandle); -// -// // restore the pMemRef -// pQueryHandle->pMemRef = pMemRef; -// return ret; - /*} else*/ if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { + if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST && pQueryHandle->cachelastrow) { // the last row is cached in buffer, return it directly. // here note that the pQueryHandle->window must be the TS_INITIALIZER int32_t numOfCols = (int32_t)(QH_GET_NUM_OF_COLS(pQueryHandle)); @@ -2872,7 +2716,7 @@ static int32_t doQueryTableList(STable* pSTable, SArray* pRes, tExprNode* pExpr) }; getTableListfromSkipList(pExpr, pSTable->pIndex, pRes, &supp); - tExprTreeDestroy(&pExpr, destroyHelper); + tExprTreeDestroy(pExpr, destroyHelper); return TSDB_CODE_SUCCESS; } @@ -2929,10 +2773,10 @@ int32_t tsdbQuerySTableByTagCond(TSDB_REPO_T* tsdb, uint64_t uid, TSKEY skey, co if (expr == NULL) { expr = exprTreeFromBinary(pTagCond, len); } else { - CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, expr, NULL); + CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, expr, NULL); tExprNode* tagExpr = exprTreeFromBinary(pTagCond, len); if (tagExpr != NULL) { - CLEANUP_PUSH_VOID_PTR_PTR(true, tExprNodeDestroy, tagExpr, NULL); + CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, tagExpr, NULL); tExprNode* tbnameExpr = expr; expr = calloc(1, sizeof(tExprNode)); if (expr == NULL) { From f56eb0d446d20f39db5b67b9676e9b982c78a6ef Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 14:50:01 +0800 Subject: [PATCH 26/34] [TD-225]fix memory leak. #4914 --- src/common/src/texpr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index 10e93d0edc..b4edc2f382 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -269,8 +269,9 @@ void arithmeticTreeTraverse(tExprNode *pExprs, int32_t numOfRows, char *pOutput, } } - free(pLeftOutput); - free(pRightOutput); + tfree(pdata); + tfree(pLeftOutput); + tfree(pRightOutput); } static void exprTreeToBinaryImpl(SBufferWriter* bw, tExprNode* expr) { From af428c4d2479ff9c1ac0a119ebef47543baa5a44 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 14:57:47 +0800 Subject: [PATCH 27/34] [TD-225]refactor codes. --- .../inc/qArithmeticOperator.h => common/inc/tarithoperator.h} | 0 .../src/qArithmeticOperator.c => common/src/tarithoperator.c} | 2 +- src/common/src/texpr.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{query/inc/qArithmeticOperator.h => common/inc/tarithoperator.h} (100%) rename src/{query/src/qArithmeticOperator.c => common/src/tarithoperator.c} (99%) diff --git a/src/query/inc/qArithmeticOperator.h b/src/common/inc/tarithoperator.h similarity index 100% rename from src/query/inc/qArithmeticOperator.h rename to src/common/inc/tarithoperator.h diff --git a/src/query/src/qArithmeticOperator.c b/src/common/src/tarithoperator.c similarity index 99% rename from src/query/src/qArithmeticOperator.c rename to src/common/src/tarithoperator.c index 677951bd07..1cb667d259 100644 --- a/src/query/src/qArithmeticOperator.c +++ b/src/common/src/tarithoperator.c @@ -15,9 +15,9 @@ #include "os.h" -#include "qArithmeticOperator.h" #include "ttype.h" #include "tutil.h" +#include "tarithoperator.h" #define ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord) \ { \ diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index b4edc2f382..f941fc4501 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -24,7 +24,7 @@ #include "tsdb.h" #include "tskiplist.h" #include "texpr.h" - +#include "tarithoperator.h" static uint8_t UNUSED_FUNC isQueryOnPrimaryKey(const char *primaryColumnName, const tExprNode *pLeft, const tExprNode *pRight) { if (pLeft->nodeType == TSQL_NODE_COL) { From f1657736e185ce3b17ce8db4ca5fa37e9e8bdc55 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:07:43 +0800 Subject: [PATCH 28/34] [TD-225]refactor. --- src/query/src/qExecutor.c | 116 ++++++++++++++++++++------------------ src/tsdb/src/tsdbRead.c | 4 +- 2 files changed, 64 insertions(+), 56 deletions(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index abea2c9548..77eb4e1cc7 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -3704,6 +3704,67 @@ static void restoreTimeWindow(STableGroupInfo* pTableGroupInfo, STsdbQueryCond* pKeyInfo->lastKey = pCond->twindow.skey; } +static void handleInterpolationQuery(SQInfo* pQInfo) { + SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv; + + SQuery *pQuery = pRuntimeEnv->pQuery; + if (pQuery->numOfCheckedBlocks > 0 || !isPointInterpoQuery(pQuery)) { + return; + } + + SArray *prev = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_PREV_ROW); + SArray *next = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_NEXT_ROW); + if (prev == NULL || next == NULL) { + return; + } + + // setup the pCtx->start/end info and calculate the interpolation value + SColumnInfoData *startTs = taosArrayGet(prev, 0); + SColumnInfoData *endTs = taosArrayGet(next, 0); + + for (int32_t i = 0; i < pQuery->numOfOutput; ++i) { + SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i]; + + int32_t functionId = pQuery->pExpr1[i].base.functionId; + SColIndex *pColIndex = &pQuery->pExpr1[i].base.colInfo; + + if (!TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) { + aAggs[functionId].xFunction(pCtx); + continue; + } + + SColumnInfoData *p = taosArrayGet(prev, pColIndex->colIndex); + SColumnInfoData *n = taosArrayGet(next, pColIndex->colIndex); + + assert(p->info.colId == pColIndex->colId); + + pCtx->start.key = *(TSKEY *)startTs->pData; + pCtx->end.key = *(TSKEY *)endTs->pData; + + if (p->info.type != TSDB_DATA_TYPE_BINARY && p->info.type != TSDB_DATA_TYPE_NCHAR) { + GET_TYPED_DATA(pCtx->start.val, double, p->info.type, p->pData); + GET_TYPED_DATA(pCtx->end.val, double, n->info.type, n->pData); + } else { // string pointer + pCtx->start.ptr = p->pData; + pCtx->end.ptr = n->pData; + } + + pCtx->param[2].i64 = (int8_t)pQuery->fillType; + pCtx->nStartQueryTimestamp = pQuery->window.skey; + if (pQuery->fillVal != NULL) { + if (isNull((const char *)&pQuery->fillVal[i], pCtx->inputType)) { + pCtx->param[1].nType = TSDB_DATA_TYPE_NULL; + } else { // todo refactor, tVariantCreateFromBinary should handle the NULL value + if (pCtx->inputType != TSDB_DATA_TYPE_BINARY && pCtx->inputType != TSDB_DATA_TYPE_NCHAR) { + tVariantCreateFromBinary(&pCtx->param[1], (char *)&pQuery->fillVal[i], pCtx->inputBytes, pCtx->inputType); + } + } + } + + aAggs[functionId].xFunction(pCtx); + } +} + void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) { SQInfo *pQInfo = (SQInfo *) GET_QINFO_ADDR(pRuntimeEnv); SQuery *pQuery = pRuntimeEnv->pQuery; @@ -3769,60 +3830,7 @@ void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) { clearEnvAfterReverseScan(pRuntimeEnv, &qstatus); } - if (isPointInterpoQuery(pQuery) && pQuery->numOfCheckedBlocks == 0) { - SArray *prev = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_PREV_ROW); - SArray *next = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_NEXT_ROW); - - if (prev == NULL || next == NULL) { - return; - } - - // setup the pCtx->start/end info and calculate the interpolation value - SColumnInfoData *startTs = taosArrayGet(prev, 0); - SColumnInfoData *endTs = taosArrayGet(next, 0); - - for (int32_t i = 0; i < pQuery->numOfOutput; ++i) { - SQLFunctionCtx* pCtx = &pRuntimeEnv->pCtx[i]; - - int32_t functionId = pQuery->pExpr1[i].base.functionId; - SColIndex *pColIndex = &pQuery->pExpr1[i].base.colInfo; - - if (!TSDB_COL_IS_NORMAL_COL(pColIndex->flag)) { - aAggs[functionId].xFunction(pCtx); - continue; - } - - SColumnInfoData *p = taosArrayGet(prev, pColIndex->colIndex); - SColumnInfoData *n = taosArrayGet(next, pColIndex->colIndex); - - assert(p->info.colId == pColIndex->colId); - - pCtx->start.key = *(TSKEY *)startTs->pData; - pCtx->end.key = *(TSKEY *)endTs->pData; - - if (p->info.type != TSDB_DATA_TYPE_BINARY && p->info.type != TSDB_DATA_TYPE_NCHAR) { - GET_TYPED_DATA(pCtx->start.val, double, p->info.type, p->pData); - GET_TYPED_DATA(pCtx->end.val, double, n->info.type, n->pData); - } else { // string pointer - pCtx->start.ptr = p->pData; - pCtx->end.ptr = n->pData; - } - - pCtx->param[2].i64 = (int8_t)pQuery->fillType; - pCtx->nStartQueryTimestamp = pQuery->window.skey; - if (pQuery->fillVal != NULL) { - if (isNull((const char*) &pQuery->fillVal[i], pCtx->inputType)) { - pCtx->param[1].nType = TSDB_DATA_TYPE_NULL; - } else { // todo refactor, tVariantCreateFromBinary should handle the NULL value - if (pCtx->inputType != TSDB_DATA_TYPE_BINARY && pCtx->inputType != TSDB_DATA_TYPE_NCHAR) { - tVariantCreateFromBinary(&pCtx->param[1], (char*) &pQuery->fillVal[i], pCtx->inputBytes, pCtx->inputType); - } - } - } - - aAggs[functionId].xFunction(pCtx); - } - } + handleInterpolationQuery(pQInfo); } void finalizeQueryResult(SQueryRuntimeEnv *pRuntimeEnv) { diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 1845685ff5..0b3b65c184 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -1929,8 +1929,8 @@ static void changeQueryHandleForInterpQuery(TsdbQueryHandleT pHandle) { STableCheckInfo* pCheckInfo = taosArrayGet(pQueryHandle->pTableCheckInfo, i); // the first qualified table for interpolation query - if (pQueryHandle->window.skey <= pCheckInfo->pTableObj->lastKey && - pCheckInfo->pTableObj->lastKey != TSKEY_INITIAL_VAL) { + if ((pQueryHandle->window.skey <= pCheckInfo->pTableObj->lastKey) && + (pCheckInfo->pTableObj->lastKey != TSKEY_INITIAL_VAL)) { break; } From 7da756f2c0f142cfb50cd7028da3d541cc18324c Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:10:30 +0800 Subject: [PATCH 29/34] [TD-225]fix compiler error. --- src/tsdb/src/tsdbRead.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 0b3b65c184..a7a5236389 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -2121,7 +2121,7 @@ static int32_t doGetExternalRow(STsdbQueryHandle* pQueryHandle, int16_t type, SM } // prepare the structure - int32_t numOfCols = QH_GET_NUM_OF_COLS(pQueryHandle); + int32_t numOfCols = (int32_t) QH_GET_NUM_OF_COLS(pQueryHandle); if (type == TSDB_PREV_ROW) { pQueryHandle->prev = taosArrayInit(numOfCols, sizeof(SColumnInfoData)); From 7081fdf8fdbc2e12280fb96dde40025fbc67942c Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:14:53 +0800 Subject: [PATCH 30/34] [TD-225]update the sim. --- tests/script/general/parser/testSuite.sim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim index 90cccb80e5..1868ff9683 100644 --- a/tests/script/general/parser/testSuite.sim +++ b/tests/script/general/parser/testSuite.sim @@ -105,3 +105,5 @@ sleep 100 run general/parser/sliding.sim sleep 100 run general/parser/function.sim +sleep 100 +run general/parse/stableOp.sim From 7f56eb9de3af7461d1d0318ba09dc464242bba37 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:29:30 +0800 Subject: [PATCH 31/34] [TD-225]fix compiler error. --- src/inc/ttype.h | 70 +++++++++++++++++++-------------------- src/query/src/qExecutor.c | 11 ------ 2 files changed, 35 insertions(+), 46 deletions(-) diff --git a/src/inc/ttype.h b/src/inc/ttype.h index 32638ebb9d..3a70a970e3 100644 --- a/src/inc/ttype.h +++ b/src/inc/ttype.h @@ -67,41 +67,41 @@ typedef struct tstr { } \ } while (0) -#define SET_TYPED_DATA(_v, _type, _data) \ - do { \ - switch (_type) { \ - case TSDB_DATA_TYPE_BOOL: \ - case TSDB_DATA_TYPE_TINYINT: \ - *(int8_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_UTINYINT: \ - *(uint8_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_SMALLINT: \ - *(int16_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_USMALLINT: \ - *(uint16_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_BIGINT: \ - *(int64_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_UBIGINT: \ - *(uint64_t *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_FLOAT: \ - *(float *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_DOUBLE: \ - *(double *)(_v) = (_data); \ - break; \ - case TSDB_DATA_TYPE_UINT: \ - *(uint32_t *)(_v) = (_data); \ - break; \ - default: \ - *(int32_t *)(_v) = (_data); \ - break; \ - } \ +#define SET_TYPED_DATA(_v, _type, _data) \ + do { \ + switch (_type) { \ + case TSDB_DATA_TYPE_BOOL: \ + case TSDB_DATA_TYPE_TINYINT: \ + *(int8_t *)(_v) = (int8_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_UTINYINT: \ + *(uint8_t *)(_v) = (uint8_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_SMALLINT: \ + *(int16_t *)(_v) = (int16_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_USMALLINT: \ + *(uint16_t *)(_v) = (uint16_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_BIGINT: \ + *(int64_t *)(_v) = (int64_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_UBIGINT: \ + *(uint64_t *)(_v) = (uint64_t)(_data); \ + break; \ + case TSDB_DATA_TYPE_FLOAT: \ + *(float *)(_v) = (float)(_data); \ + break; \ + case TSDB_DATA_TYPE_DOUBLE: \ + *(double *)(_v) = (double)(_data); \ + break; \ + case TSDB_DATA_TYPE_UINT: \ + *(uint32_t *)(_v) = (uint32_t)(_data); \ + break; \ + default: \ + *(int32_t *)(_v) = (_data); \ + break; \ + } \ } while (0) #define IS_SIGNED_NUMERIC_TYPE(_t) ((_t) >= TSDB_DATA_TYPE_TINYINT && (_t) <= TSDB_DATA_TYPE_BIGINT) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 77eb4e1cc7..33e13d77cc 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5805,18 +5805,7 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) { } } - // TODO opt performance -// if (isPointInterpoQuery(pQuery)) { -// SArray *prev = tsdbGetExternalRow(pRuntimeEnv->pQueryHandle, &pQInfo->memRef, TSDB_PREV_ROW); -// -// for(int32_t i = 0; i < pQuery->numOfCols; ++i) { -// SColumnInfoData *p = taosArrayGet(prev, i); -// memcpy(pRuntimeEnv->prevRow[i], p->pData, p->info.bytes); -// } -// } - scanOneTableDataBlocks(pRuntimeEnv, newStartKey); - finalizeQueryResult(pRuntimeEnv); // skip offset result rows From 146d7153c069b571f280b53d9e0e78644f02105b Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:35:05 +0800 Subject: [PATCH 32/34] [TD-225]fix error. --- src/client/src/tscStream.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c index f14538fba9..d787f5b515 100644 --- a/src/client/src/tscStream.c +++ b/src/client/src/tscStream.c @@ -191,9 +191,10 @@ static void tscProcessStreamQueryCallback(void *param, TAOS_RES *tres, int numOf STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(&pStream->pSql->cmd, 0, 0); - assert(0); -// char* name = pTableMetaInfo->name; -// taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN)); + char name[TSDB_TABLE_FNAME_LEN] = {0}; + tNameExtractFullName(&pTableMetaInfo->name, name); + + taosHashRemove(tscTableMetaInfo, name, strnlen(name, TSDB_TABLE_FNAME_LEN)); pTableMetaInfo->vgroupList = tscVgroupInfoClear(pTableMetaInfo->vgroupList); tscSetRetryTimer(pStream, pStream->pSql, retryDelay); @@ -292,8 +293,8 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf pStream->stime += 1; } -// tscDebug("%p stream:%p, query on:%s, fetch result completed, fetched rows:%" PRId64, pSql, pStream, pTableMetaInfo->name, -// pStream->numOfRes); + tscDebug("%p stream:%p, query on:%s, fetch result completed, fetched rows:%" PRId64, pSql, pStream, tNameGetTableName(&pTableMetaInfo->name), + pStream->numOfRes); tfree(pTableMetaInfo->pTableMeta); @@ -556,8 +557,8 @@ static void tscCreateStream(void *param, TAOS_RES *res, int code) { taosTmrReset(tscProcessStreamTimer, (int32_t)starttime, pStream, tscTmr, &pStream->pTimer); -// tscDebug("%p stream:%p is opened, query on:%s, interval:%" PRId64 ", sliding:%" PRId64 ", first launched in:%" PRId64 ", sql:%s", pSql, -// pStream, pTableMetaInfo->name, pStream->interval.interval, pStream->interval.sliding, starttime, pSql->sqlstr); + tscDebug("%p stream:%p is opened, query on:%s, interval:%" PRId64 ", sliding:%" PRId64 ", first launched in:%" PRId64 ", sql:%s", pSql, + pStream, tNameGetTableName(&pTableMetaInfo->name), pStream->interval.interval, pStream->interval.sliding, starttime, pSql->sqlstr); } void tscSetStreamDestTable(SSqlStream* pStream, const char* dstTable) { From 2b126c41068ac89a8501074ae6c07db272893c31 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:39:42 +0800 Subject: [PATCH 33/34] [TD-225]fix compiler error. --- src/inc/ttype.h | 2 +- src/query/src/qAggMain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/ttype.h b/src/inc/ttype.h index 3a70a970e3..05622a16be 100644 --- a/src/inc/ttype.h +++ b/src/inc/ttype.h @@ -99,7 +99,7 @@ typedef struct tstr { *(uint32_t *)(_v) = (uint32_t)(_data); \ break; \ default: \ - *(int32_t *)(_v) = (_data); \ + *(int32_t *)(_v) = (int32_t)(_data); \ break; \ } \ } while (0) diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c index 9d05677752..12c8a16f1f 100644 --- a/src/query/src/qAggMain.c +++ b/src/query/src/qAggMain.c @@ -3778,7 +3778,7 @@ void twa_function_finalizer(SQLFunctionCtx *pCtx) { */ static void interp_function_impl(SQLFunctionCtx *pCtx) { - int32_t type = pCtx->param[2].i64; + int32_t type = (int32_t) pCtx->param[2].i64; if (type == TSDB_FILL_NONE) { return; } From dd47b64c41cfb41edbc53924ff560674473e890d Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 23 Jan 2021 15:49:29 +0800 Subject: [PATCH 34/34] [TD-225]fix error in sim script. --- tests/script/general/parser/interp_test.sim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim index 295a56e4b3..2860180830 100644 --- a/tests/script/general/parser/interp_test.sim +++ b/tests/script/general/parser/interp_test.sim @@ -852,11 +852,11 @@ if $rows != 0 then endi sql select interp(c1) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' interval(18m); -if $rows != 0 then +if $rows != 1 then return -1 endi -if $data00 != @2018-11-25 18:30:00.000@ then +if $data00 != @18-11-25 18:30:00.000@ then return -1 endi @@ -869,7 +869,7 @@ if $rows != 5 then return -1 endi -if $data00 != @2018-11-25 17:54:00.000@ then +if $data00 != @18-11-25 17:54:00.000@ then return -1 endi @@ -885,11 +885,11 @@ if $data03 != 0.000000000 then return -1 endi -if $data04 != @2018-11-25 17:54:00.000@ then +if $data04 != @18-11-25 17:54:00.000@ then return -1 endi -if $data10 != @2018-11-25 18:12:00.000@ then +if $data10 != @18-11-25 18:12:00.000@ then return -1 endi @@ -905,11 +905,11 @@ if $data13 != 1.200000000 then return -1 endi -if $data14 != @2018-11-25 18:12:00.000@ then +if $data14 != @18-11-25 18:12:00.000@ then return -1 endi -if $data40 != @2018-11-25 19:06:00.000@ then +if $data40 != @18-11-25 19:06:00.000@ then return -1 endi @@ -925,6 +925,6 @@ if $data43 != 6.600000000 then return -1 endi -if $data44 != @2018-11-25 19:06:00.000@ then +if $data44 != @18-11-25 19:06:00.000@ then return -1 endi \ No newline at end of file