From 1f46b47ff497c339d9fdb96ce2dcca1d91581706 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 10 Jun 2021 17:03:20 +0800 Subject: [PATCH 01/37] [TD-4652] update initial test --- src/connector/python/taos/cinterface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py index 0f690aeb27..ff922c1155 100644 --- a/src/connector/python/taos/cinterface.py +++ b/src/connector/python/taos/cinterface.py @@ -10,11 +10,11 @@ def _convert_millisecond_to_datetime(milli): return datetime.datetime.fromtimestamp(milli / 1000.0) -def _convert_microsecond_to_datetime(micro): +def _convert_microsecond_to_datetime(micro): #checkpoint return datetime.datetime.fromtimestamp(micro / 1000000.0) -def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False): +def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):#checkpoint """Function to convert C bool row to python row """ _timestamp_converter = _convert_millisecond_to_datetime From cd3fb30a6c101255a842886453f0f22dc4bb8fd4 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 11 Jun 2021 14:07:41 +0800 Subject: [PATCH 02/37] [TD-4652] adding test case --- tests/pytest/dbmgmt/nanoSecondCheck.py | 93 ++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 tests/pytest/dbmgmt/nanoSecondCheck.py diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py new file mode 100644 index 0000000000..3cd8168b35 --- /dev/null +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -0,0 +1,93 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations + +import sys +from util.log import * +from util.cases import * +from util.sql import * +import time +from datetime import datetime +import os + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + tdSql.execute('reset query cache') + tdSql.execute('drop database if exists db') + tdSql.execute('create database db precision "ns"') + tdSql.query('show databases') + tdSql.checkData(0,16,'ns') + tdSql.execute('use db') + tdSql.execute('create table tb (ts timestamp, speed int)') + tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1)') + tdSql.execute('insert into tb values(1623254400223456789, 1)') + os.system('sudo timedatectl set-ntp off') + os.system('sudo timedatectl set-time 2021-06-10') + tdSql.execute('insert into tb values(now + 500000000b, 1)') + + ##TODO: after the connector is updated, run the following commented code + # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400150000000') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.150000000\'') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts > 1623254400223456788 and ts < 1623254400223456790') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 00:00:00.223456788\' and ts < \'2021-06-10 00:00:00.223456790\'') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts > 1623254400400000000') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 00:00:00.400000000\'') + # tdSql.checkData(0,0,1) + + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') + # tdSql.query('select count(*) from tb where ts > now') + # tdSql.checkData(0,0,3) + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') + # tdSql.query('select count(*) from tb where ts > now + 300000000b') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') + # tdSql.checkData(0,0,3) + + # tdSql.query('select count(*) from tb where ts <= \'2021-06-10 0:00:00.223456789\'') + # tdSql.checkData(0,0,2) + + # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\'') + # tdSql.checkData(0,0,0) + + # tdSql.query('select count(*) from tb where ts <> \'2021-06-10 0:00:00.223456789\'') + # tdSql.checkData(0,0,2) + + # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400950000000') + # tdSql.checkData(0,0,2) + + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) \ No newline at end of file From 308d87c84a13e97946271e5b356f18c60d2263e7 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 11 Jun 2021 15:52:07 +0800 Subject: [PATCH 03/37] [TD-4652] add test case --- tests/pytest/dbmgmt/nanoSecondCheck.py | 117 ++++++++++++++++++++----- 1 file changed, 96 insertions(+), 21 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 3cd8168b35..3e42d6a178 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -38,51 +38,126 @@ class TDTestCase: tdSql.execute('use db') tdSql.execute('create table tb (ts timestamp, speed int)') tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1)') - tdSql.execute('insert into tb values(1623254400223456789, 1)') + tdSql.execute('insert into tb values(1623254400150000000, 2)') + tdSql.execute('import into tb values(1623254400300000000, 3)') + tdSql.execute('import into tb values(1623254400299999999, 4)') + tdSql.execute('insert into tb values(1623254400300000001, 5)') os.system('sudo timedatectl set-ntp off') os.system('sudo timedatectl set-time 2021-06-10') - tdSql.execute('insert into tb values(now + 500000000b, 1)') + tdSql.execute('insert into tb values(now + 500000000b, 6)') + tdSql.execute('insert into tb values(1623254400999999999, 7)') + ##TODO: after the connector is updated, run the following commented code - # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400150000000') + ##TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented + + # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400110000000') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.150000000\'') + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.110000000\'') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > 1623254400223456788 and ts < 1623254400223456790') + # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 00:00:00.223456788\' and ts < \'2021-06-10 00:00:00.223456790\'') + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\'') # tdSql.checkData(0,0,1) # tdSql.query('select count(*) from tb where ts > 1623254400400000000') - # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 00:00:00.400000000\'') - # tdSql.checkData(0,0,1) + # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\'') + # tdSql.checkData(0,0,5) # os.system('sudo timedatectl set-ntp off') # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now') - # tdSql.checkData(0,0,3) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now + 300000000b') - # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts > now + 400000000b') + # tdSql.checkData(0,0,2) # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') - # tdSql.checkData(0,0,3) + # tdSql.checkData(0,0,7) - # tdSql.query('select count(*) from tb where ts <= \'2021-06-10 0:00:00.223456789\'') - # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb where ts <= 1623254400300000000') + # tdSql.checkData(0,0,4) # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\'') # tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts <> \'2021-06-10 0:00:00.223456789\'') + # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000') + # tdSql.checkData(0,0,5) + + # tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\'') + # tdSql.checkData(0,0,3) + + #tdSql.query('select avg(speed) from tb interval(5000000000b)') + # tdSql.checkRows(1) + + #tdSql.query('select avg(speed) from tb interval(100000000b)') + #tdSql.checkRows(5) + + #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b)') + #tdSql.checkRows(5) + + #tdSql.query('select last(*) from tb') + #tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') + #tdSql.checkData(0,0, 1623254400999999999) + + #tdSql.query('select first(*) from tb') + #tdSql.checkData(0,0, 1623254400100000001) + #tdSql.checkData(0,0, 2021-06-10 0:00:00.100000001) + + tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp)') + tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\')') + tdSql.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000)') + tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000)') + tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999)') + tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001)') + os.system('sudo timedatectl set-ntp off') + os.system('sudo timedatectl set-time 2021-06-10') + tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999)') + + # tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\'') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000') + # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\'') + # tdSql.checkData(0,0,5) + + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-11') + # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b') # tdSql.checkData(0,0,2) - # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400950000000') - # tdSql.checkData(0,0,2) + # tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\'') + # tdSql.checkData(0,0,7) + + # tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000') + # tdSql.checkData(0,0,5) + + # tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\'') + # tdSql.checkData(0,0,0) + + # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000') + # tdSql.checkData(0,0,5) + + # tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\'') + # tdSql.checkData(0,0,3) + + # tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999') + # tdSql.checkData(0,0,6) + + # tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\'') + # tdSql.checkData(0,0,6) + + # tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999') + # tdSql.checkData(0,0,6) + + # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\'') + # tdSql.checkData(0,0,6) + + os.system('sudo timedatectl set-ntp on') def stop(self): tdSql.close() From a7762c65a90b67751c03894a03c3faab3a25c5c7 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 11 Jun 2021 16:13:29 +0800 Subject: [PATCH 04/37] [TD-4652] adding exception tests --- tests/pytest/dbmgmt/nanoSecondCheck.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 3e42d6a178..0bf461e820 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -157,6 +157,17 @@ class TDTestCase: # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\'') # tdSql.checkData(0,0,6) + tdSql.execute('create table tb3 (ts timestamp, speed int)') + + tdSql.error('insert into tb3 values(16232544001500000, 2)') + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2)') + # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\'') + # tdSql.checkRows(1) + + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2)') + # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\'') + # tdSql.checkRows(1) + os.system('sudo timedatectl set-ntp on') def stop(self): From 78f303144aedf1a794a51ca0fca6cdae35e0702e Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 15 Jun 2021 17:23:50 +0800 Subject: [PATCH 05/37] [TD-3086] tag support timestamp --- src/client/src/tscSQLParser.c | 38 +++++++++++++++++++++++++---------- src/common/src/tvariant.c | 4 ++++ src/query/inc/sql.y | 1 + src/query/src/qExecutor.c | 4 +++- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index d8524c3e03..9426303a7c 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -1276,7 +1276,7 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC const char* msg1 = "invalid number of tag columns"; const char* msg2 = "tag length too long"; const char* msg3 = "duplicated column names"; - const char* msg4 = "timestamp not allowed in tags"; + //const char* msg4 = "timestamp not allowed in tags"; const char* msg5 = "invalid data type in tags"; const char* msg6 = "invalid tag name"; const char* msg7 = "invalid binary/nchar tag length"; @@ -1292,10 +1292,10 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC for (int32_t i = 0; i < numOfTags; ++i) { TAOS_FIELD* p = taosArrayGet(pTagsList, i); - if (p->type == TSDB_DATA_TYPE_TIMESTAMP) { - invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4); - return false; - } + //if (p->type == TSDB_DATA_TYPE_TIMESTAMP) { + // invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4); + // return false; + //} if (!isValidDataType(p->type)) { invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5); @@ -1353,7 +1353,7 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC * tags name /column name is truncated in sql.y */ bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) { - const char* msg1 = "timestamp not allowed in tags"; + //const char* msg1 = "timestamp not allowed in tags"; const char* msg2 = "duplicated column names"; const char* msg3 = "tag length too long"; const char* msg4 = "invalid tag name"; @@ -1376,10 +1376,10 @@ bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField) { } // no timestamp allowable - if (pTagField->type == TSDB_DATA_TYPE_TIMESTAMP) { - invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1); - return false; - } + //if (pTagField->type == TSDB_DATA_TYPE_TIMESTAMP) { + // invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1); + // return false; + //} if ((pTagField->type < TSDB_DATA_TYPE_BOOL) || (pTagField->type > TSDB_DATA_TYPE_UBIGINT)) { invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6); @@ -8001,8 +8001,24 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS *pExpr = calloc(1, sizeof(tExprNode)); (*pExpr)->nodeType = TSQL_NODE_VALUE; (*pExpr)->pVal = calloc(1, sizeof(tVariant)); - tVariantAssign((*pExpr)->pVal, &pSqlExpr->value); + + int32_t type = -1; + STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta; + if (pCols != NULL) { + SColIndex* idx = taosArrayGet(pCols, 0); + SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex); + if (pSchema != NULL) { + type = pSchema->type; + } + } + if (type == TSDB_DATA_TYPE_TIMESTAMP) { + int32_t ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal); + if (ret != TSDB_CODE_SUCCESS) { + return ret; + } + } + return TSDB_CODE_SUCCESS; } else if (pSqlExpr->type == SQL_NODE_SQLFUNCTION) { // arithmetic expression on the results of aggregation functions diff --git a/src/common/src/tvariant.c b/src/common/src/tvariant.c index 33dab51633..1168eeb231 100644 --- a/src/common/src/tvariant.c +++ b/src/common/src/tvariant.c @@ -77,6 +77,10 @@ void tVariantCreate(tVariant *pVar, SStrToken *token) { pVar->nLen = strRmquote(pVar->pz, token->n); break; } + case TSDB_DATA_TYPE_TIMESTAMP: { + pVar->i64 = taosGetTimestamp(TSDB_TIME_PRECISION_NANO); + break; + } default: { // nType == 0 means the null value type = TSDB_DATA_TYPE_NULL; diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index fbb59e4a72..0740369924 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -433,6 +433,7 @@ tagitem(A) ::= FLOAT(X). { toTSDBType(X.type); tVariantCreate(&A, &X); } tagitem(A) ::= STRING(X). { toTSDBType(X.type); tVariantCreate(&A, &X); } tagitem(A) ::= BOOL(X). { toTSDBType(X.type); tVariantCreate(&A, &X); } tagitem(A) ::= NULL(X). { X.type = 0; tVariantCreate(&A, &X); } +tagitem(A) ::= NOW(X). { X.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&A, &X);} tagitem(A) ::= MINUS(X) INTEGER(Y).{ X.n += Y.n; diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 395903f75e..e6b40f40d6 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -2889,7 +2889,9 @@ void setTagValue(SOperatorInfo* pOperatorInfo, void *pTable, SQLFunctionCtx* pCt doSetTagValueInParam(pTable, pLocalExprInfo->base.colInfo.colId, &pCtx[idx].tag, pLocalExprInfo->base.resType, pLocalExprInfo->base.resBytes); - if (IS_NUMERIC_TYPE(pLocalExprInfo->base.resType) || pLocalExprInfo->base.resType == TSDB_DATA_TYPE_BOOL) { + if (IS_NUMERIC_TYPE(pLocalExprInfo->base.resType) + || pLocalExprInfo->base.resType == TSDB_DATA_TYPE_BOOL + || pLocalExprInfo->base.resType == TSDB_DATA_TYPE_TIMESTAMP) { memcpy(pRuntimeEnv->tagVal + offset, &pCtx[idx].tag.i64, pLocalExprInfo->base.resBytes); } else { memcpy(pRuntimeEnv->tagVal + offset, pCtx[idx].tag.pz, pCtx[idx].tag.nLen); From 04b3a7d4829c7d681a68b7f43908bc0964997134 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Tue, 15 Jun 2021 19:49:40 +0800 Subject: [PATCH 06/37] [TD-4652] update test case --- tests/pytest/dbmgmt/nanoSecondCheck.py | 184 ++++++++++++++----------- 1 file changed, 103 insertions(+), 81 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 0bf461e820..a55823e639 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -32,68 +32,74 @@ class TDTestCase: tdSql.execute('reset query cache') tdSql.execute('drop database if exists db') - tdSql.execute('create database db precision "ns"') - tdSql.query('show databases') + tdSql.execute('create database db precision "ns";') + tdSql.query('show databases;') tdSql.checkData(0,16,'ns') tdSql.execute('use db') tdSql.execute('create table tb (ts timestamp, speed int)') - tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1)') - tdSql.execute('insert into tb values(1623254400150000000, 2)') - tdSql.execute('import into tb values(1623254400300000000, 3)') - tdSql.execute('import into tb values(1623254400299999999, 4)') - tdSql.execute('insert into tb values(1623254400300000001, 5)') - os.system('sudo timedatectl set-ntp off') - os.system('sudo timedatectl set-time 2021-06-10') - tdSql.execute('insert into tb values(now + 500000000b, 6)') - tdSql.execute('insert into tb values(1623254400999999999, 7)') + tdSql.execute('insert into tb values(\'2021-06-10 0:00:00.100000001\', 1);') + tdSql.execute('insert into tb values(1623254400150000000, 2);') + tdSql.execute('import into tb values(1623254400300000000, 3);') + tdSql.execute('import into tb values(1623254400299999999, 4);') + tdSql.execute('insert into tb values(1623254400300000001, 5);') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') + tdSql.execute('insert into tb values(1623254400999999999, 7);') ##TODO: after the connector is updated, run the following commented code ##TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented - - # tdSql.query('select count(*) from tb where ts > 1623254400000000000 and ts < 1623254400110000000') + # tdSql.query('select * from tb;') + # tdSql.checkRows(6) + # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.000000000\' and ts < \'2021-06-10 0:00:00.110000000\'') + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\';') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000') + # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\'') + # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\';') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > 1623254400400000000') - # tdSql.checkData(0,0,2) - # tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\'') + # tdSql.query('select count(*) from tb where ts > 1623254400400000000;') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';') # tdSql.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now + 400000000b') - # tdSql.checkData(0,0,2) - - # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\'') - # tdSql.checkData(0,0,7) - - # tdSql.query('select count(*) from tb where ts <= 1623254400300000000') - # tdSql.checkData(0,0,4) - - # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\'') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') + # tdSql.query('select count(*) from tb where ts > now + 400000000b;') # tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000') + # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\';') + # tdSql.checkData(0,0,6) + + # tdSql.query('select count(*) from tb where ts <= 1623254400300000000;') + # tdSql.checkData(0,0,4) + + # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';') + # tdSql.checkData(0,0,0) + + # tdSql.query('select count(*) from tb where ts = 1623254400150000000;') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\';') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;') # tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\'') + # tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';') # tdSql.checkData(0,0,3) - #tdSql.query('select avg(speed) from tb interval(5000000000b)') + #tdSql.query('select avg(speed) from tb interval(5000000000b);') # tdSql.checkRows(1) #tdSql.query('select avg(speed) from tb interval(100000000b)') - #tdSql.checkRows(5) + #tdSql.checkRows(4) - #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b)') - #tdSql.checkRows(5) + #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + #tdSql.checkRows(4) #tdSql.query('select last(*) from tb') #tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') @@ -103,69 +109,85 @@ class TDTestCase: #tdSql.checkData(0,0, 1623254400100000001) #tdSql.checkData(0,0, 2021-06-10 0:00:00.100000001) - tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp)') - tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\')') - tdSql.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000)') - tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000)') - tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999)') - tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001)') - os.system('sudo timedatectl set-ntp off') - os.system('sudo timedatectl set-time 2021-06-10') - tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') - tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999)') + #tdSql.execute('insert into tb values(now + 500000000b, 6);') + # tdSql.query('select * from tb;') + # tdSql.checkRows(7) - # tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000') + tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp);') + tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\');') + tdSql.execute('insert into tb2 values(1623254400150000000, 2, 1623340800150000000);') + tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);') + tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);') + tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') + #tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') + + # tdSql.query('select * from tb2;') + # tdSql.checkRows(6) + # tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\'') + # tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\';') # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000') - # tdSql.checkData(0,0,2) - # tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\'') + # tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000;') + # tdSql.checkData(0,0,1) + # tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';') # tdSql.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-11') - # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b') - # tdSql.checkData(0,0,2) - - - # tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\'') - # tdSql.checkData(0,0,7) - - # tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000') - # tdSql.checkData(0,0,5) - - # tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\'') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-11') + # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') # tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000') + + # tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';') + # tdSql.checkData(0,0,6) + + # tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000;') # tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\'') + # tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\';') + # tdSql.checkData(0,0,0) + + # tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\';') + # tdSql.checkData(0,0,1) + + # tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') + # tdSql.checkData(0,0,0) + + # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;') + # tdSql.checkData(0,0,5) + + # tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\';') # tdSql.checkData(0,0,3) - # tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999') - # tdSql.checkData(0,0,6) + # tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999;') + # tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\'') - # tdSql.checkData(0,0,6) + # tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';') + # tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999') - # tdSql.checkData(0,0,6) + # tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999;') + # tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\'') - # tdSql.checkData(0,0,6) + # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') + # tdSql.checkData(0,0,5) - tdSql.execute('create table tb3 (ts timestamp, speed int)') + # tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') + # tdSql.query('select * from tb2;') + # tdSql.checkRows(7) - tdSql.error('insert into tb3 values(16232544001500000, 2)') - tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2)') - # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\'') + tdSql.execute('create table tb3 (ts timestamp, speed int);') + + tdSql.error('insert into tb3 values(16232544001500000, 2);') + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);') + # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\';') # tdSql.checkRows(1) - tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2)') - # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\'') + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);') + # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\';') # tdSql.checkRows(1) os.system('sudo timedatectl set-ntp on') From 68e2be0330c66d5d61d39a11de0e13ad78b3d016 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 15 Jun 2021 21:52:13 +0800 Subject: [PATCH 07/37] [TD-3086] tag support timestamp --- src/client/src/tscSQLParser.c | 11 +- src/inc/ttokendef.h | 250 ++- src/query/src/sql.c | 3107 ++++++++++++++------------------- 3 files changed, 1451 insertions(+), 1917 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 9426303a7c..e9a4f87cb0 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -6791,7 +6791,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) { const int32_t STABLE_INDEX = 1; STableMetaInfo* pStableMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX); - + // super table name, create table by using dst int32_t numOfTables = (int32_t) taosArrayGetSize(pCreateTable->childTableInfo); for(int32_t j = 0; j < numOfTables; ++j) { @@ -6820,6 +6820,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) { // too long tag values will return invalid sql, not be truncated automatically SSchema *pTagSchema = tscGetTableTagSchema(pStableMetaInfo->pTableMeta); + STableComInfo tinfo = tscGetTableInfo(pStableMetaInfo->pTableMeta); STagData *pTag = &pCreateTableInfo->tagdata; SKVRowBuilder kvRowBuilder = {0}; @@ -6869,8 +6870,12 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) { tdDestroyKVRowBuilder(&kvRowBuilder); return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3); } + } else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { + pItem->pVar.i64 = + convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); } + ret = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); // check again after the convert since it may be converted from binary to nchar. @@ -6915,7 +6920,11 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) { tdDestroyKVRowBuilder(&kvRowBuilder); return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3); } + } else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { + pItem->pVar.i64 = + convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); } + ret = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index fb860137f3..1b9094819b 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -16,106 +16,105 @@ #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_TOPICS 46 -#define TK_MNODES 47 -#define TK_DNODES 48 -#define TK_ACCOUNTS 49 -#define TK_USERS 50 -#define TK_MODULES 51 -#define TK_QUERIES 52 -#define TK_CONNECTIONS 53 -#define TK_STREAMS 54 -#define TK_VARIABLES 55 -#define TK_SCORES 56 -#define TK_GRANTS 57 -#define TK_VNODES 58 -#define TK_IPTOKEN 59 -#define TK_DOT 60 -#define TK_CREATE 61 -#define TK_TABLE 62 -#define TK_STABLE 63 -#define TK_DATABASE 64 -#define TK_TABLES 65 -#define TK_STABLES 66 -#define TK_VGROUPS 67 -#define TK_DROP 68 -#define TK_TOPIC 69 -#define TK_DNODE 70 -#define TK_USER 71 -#define TK_ACCOUNT 72 -#define TK_USE 73 -#define TK_DESCRIBE 74 -#define TK_ALTER 75 -#define TK_PASS 76 -#define TK_PRIVILEGE 77 -#define TK_LOCAL 78 -#define TK_IF 79 -#define TK_EXISTS 80 -#define TK_PPS 81 -#define TK_TSERIES 82 -#define TK_DBS 83 -#define TK_STORAGE 84 -#define TK_QTIME 85 -#define TK_CONNS 86 -#define TK_STATE 87 -#define TK_COMMA 88 -#define TK_KEEP 89 -#define TK_CACHE 90 -#define TK_REPLICA 91 -#define TK_QUORUM 92 -#define TK_DAYS 93 -#define TK_MINROWS 94 -#define TK_MAXROWS 95 -#define TK_BLOCKS 96 -#define TK_CTIME 97 -#define TK_WAL 98 -#define TK_FSYNC 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_TOPICS 46 +#define TK_MNODES 47 +#define TK_DNODES 48 +#define TK_ACCOUNTS 49 +#define TK_USERS 50 +#define TK_MODULES 51 +#define TK_QUERIES 52 +#define TK_CONNECTIONS 53 +#define TK_STREAMS 54 +#define TK_VARIABLES 55 +#define TK_SCORES 56 +#define TK_GRANTS 57 +#define TK_VNODES 58 +#define TK_IPTOKEN 59 +#define TK_DOT 60 +#define TK_CREATE 61 +#define TK_TABLE 62 +#define TK_STABLE 63 +#define TK_DATABASE 64 +#define TK_TABLES 65 +#define TK_STABLES 66 +#define TK_VGROUPS 67 +#define TK_DROP 68 +#define TK_TOPIC 69 +#define TK_DNODE 70 +#define TK_USER 71 +#define TK_ACCOUNT 72 +#define TK_USE 73 +#define TK_DESCRIBE 74 +#define TK_ALTER 75 +#define TK_PASS 76 +#define TK_PRIVILEGE 77 +#define TK_LOCAL 78 +#define TK_IF 79 +#define TK_EXISTS 80 +#define TK_PPS 81 +#define TK_TSERIES 82 +#define TK_DBS 83 +#define TK_STORAGE 84 +#define TK_QTIME 85 +#define TK_CONNS 86 +#define TK_STATE 87 +#define TK_COMMA 88 +#define TK_KEEP 89 +#define TK_CACHE 90 +#define TK_REPLICA 91 +#define TK_QUORUM 92 +#define TK_DAYS 93 +#define TK_MINROWS 94 +#define TK_MAXROWS 95 +#define TK_BLOCKS 96 +#define TK_CTIME 97 +#define TK_WAL 98 +#define TK_FSYNC 99 #define TK_COMP 100 #define TK_PRECISION 101 #define TK_UPDATE 102 @@ -128,29 +127,29 @@ #define TK_USING 109 #define TK_AS 110 #define TK_NULL 111 -#define TK_SELECT 112 -#define TK_UNION 113 -#define TK_ALL 114 -#define TK_DISTINCT 115 -#define TK_FROM 116 -#define TK_VARIABLE 117 -#define TK_INTERVAL 118 -#define TK_SESSION 119 -#define TK_STATE_WINDOW 120 -#define TK_FILL 121 -#define TK_SLIDING 122 -#define TK_ORDER 123 -#define TK_BY 124 -#define TK_ASC 125 -#define TK_DESC 126 -#define TK_GROUP 127 -#define TK_HAVING 128 -#define TK_LIMIT 129 -#define TK_OFFSET 130 -#define TK_SLIMIT 131 -#define TK_SOFFSET 132 -#define TK_WHERE 133 -#define TK_NOW 134 +#define TK_NOW 112 +#define TK_SELECT 113 +#define TK_UNION 114 +#define TK_ALL 115 +#define TK_DISTINCT 116 +#define TK_FROM 117 +#define TK_VARIABLE 118 +#define TK_INTERVAL 119 +#define TK_SESSION 120 +#define TK_STATE_WINDOW 121 +#define TK_FILL 122 +#define TK_SLIDING 123 +#define TK_ORDER 124 +#define TK_BY 125 +#define TK_ASC 126 +#define TK_DESC 127 +#define TK_GROUP 128 +#define TK_HAVING 129 +#define TK_LIMIT 130 +#define TK_OFFSET 131 +#define TK_SLIMIT 132 +#define TK_SOFFSET 133 +#define TK_WHERE 134 #define TK_RESET 135 #define TK_QUERY 136 #define TK_SYNCDB 137 @@ -207,11 +206,6 @@ #define TK_VALUES 188 - - - - - #define TK_SPACE 300 #define TK_COMMENT 301 #define TK_ILLEGAL 302 diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 83deb641f5..1358504bc6 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -1,29 +1,9 @@ -/* -** 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 ************************/ #include #include @@ -36,66 +16,55 @@ #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. +/* 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 270 #define YYACTIONTYPE unsigned short int @@ -127,19 +96,16 @@ typedef union { #define ParseARG_PDECL ,SSqlInfo* pInfo #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo +#define YYNSTATE 543 +#define YYNRULE 284 #define YYFALLBACK 1 -#define YYNSTATE 342 -#define YYNRULE 283 -#define YYNTOKEN 189 -#define YY_MAX_SHIFT 341 -#define YY_MIN_SHIFTREDUCE 542 -#define YY_MAX_SHIFTREDUCE 824 -#define YY_ERROR_ACTION 825 -#define YY_ACCEPT_ACTION 826 -#define YY_NO_ACTION 827 -#define YY_MIN_REDUCE 828 -#define YY_MAX_REDUCE 1110 -/************* 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. @@ -162,35 +128,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: ** @@ -202,284 +166,309 @@ 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 (725) +*/ +#define YY_ACTTAB_COUNT (843) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 224, 590, 235, 999, 978, 144, 978, 590, 195, 591, - /* 10 */ 964, 826, 341, 52, 53, 591, 56, 57, 227, 1087, - /* 20 */ 230, 46, 246, 55, 283, 60, 58, 62, 59, 218, - /* 30 */ 339, 622, 237, 51, 50, 195, 978, 49, 48, 47, - /* 40 */ 52, 53, 34, 56, 57, 226, 1087, 230, 46, 590, - /* 50 */ 55, 283, 60, 58, 62, 59, 151, 591, 976, 990, - /* 60 */ 51, 50, 228, 151, 49, 48, 47, 53, 996, 56, - /* 70 */ 57, 266, 265, 230, 46, 259, 55, 283, 60, 58, - /* 80 */ 62, 59, 299, 75, 220, 151, 51, 50, 975, 299, - /* 90 */ 49, 48, 47, 543, 544, 545, 546, 547, 548, 549, - /* 100 */ 550, 551, 552, 553, 554, 555, 340, 6, 94, 219, - /* 110 */ 76, 52, 53, 82, 56, 57, 963, 195, 230, 46, - /* 120 */ 41, 55, 283, 60, 58, 62, 59, 1036, 1086, 278, - /* 130 */ 325, 51, 50, 763, 1035, 49, 48, 47, 52, 54, - /* 140 */ 22, 56, 57, 966, 990, 230, 46, 35, 55, 283, - /* 150 */ 60, 58, 62, 59, 280, 193, 87, 874, 51, 50, - /* 160 */ 221, 178, 49, 48, 47, 260, 40, 297, 334, 333, - /* 170 */ 296, 295, 294, 332, 293, 331, 330, 329, 292, 328, - /* 180 */ 327, 938, 926, 927, 928, 929, 930, 931, 932, 933, - /* 190 */ 934, 935, 936, 937, 939, 940, 56, 57, 146, 990, - /* 200 */ 230, 46, 199, 55, 283, 60, 58, 62, 59, 49, - /* 210 */ 48, 47, 23, 51, 50, 222, 727, 49, 48, 47, - /* 220 */ 229, 778, 972, 883, 767, 115, 770, 178, 773, 204, - /* 230 */ 325, 229, 778, 335, 907, 767, 205, 770, 769, 773, - /* 240 */ 772, 128, 127, 203, 338, 337, 136, 15, 40, 14, - /* 250 */ 334, 333, 215, 216, 151, 332, 282, 331, 330, 329, - /* 260 */ 977, 328, 327, 215, 216, 946, 236, 944, 945, 590, - /* 270 */ 1083, 34, 947, 82, 949, 950, 948, 591, 951, 952, - /* 280 */ 41, 60, 58, 62, 59, 34, 768, 251, 771, 51, - /* 290 */ 50, 1, 166, 49, 48, 47, 255, 254, 34, 113, - /* 300 */ 107, 118, 1082, 258, 240, 74, 117, 123, 126, 116, - /* 310 */ 245, 696, 212, 233, 693, 120, 694, 975, 695, 5, - /* 320 */ 37, 168, 91, 672, 61, 88, 167, 101, 96, 100, - /* 330 */ 779, 974, 711, 51, 50, 61, 775, 49, 48, 47, - /* 340 */ 234, 779, 242, 243, 975, 34, 34, 775, 34, 284, - /* 350 */ 776, 315, 314, 774, 961, 962, 33, 965, 187, 185, - /* 360 */ 183, 89, 34, 34, 774, 182, 131, 130, 129, 34, - /* 370 */ 34, 34, 1081, 28, 241, 77, 239, 1106, 303, 302, - /* 380 */ 247, 700, 244, 701, 310, 309, 708, 304, 305, 875, - /* 390 */ 306, 975, 975, 178, 975, 13, 3, 179, 777, 93, - /* 400 */ 90, 142, 140, 139, 307, 311, 1098, 64, 975, 975, - /* 410 */ 715, 312, 313, 317, 8, 975, 975, 975, 744, 745, - /* 420 */ 697, 79, 80, 25, 24, 735, 24, 765, 262, 262, - /* 430 */ 67, 70, 35, 35, 64, 92, 64, 32, 125, 124, - /* 440 */ 289, 736, 799, 213, 780, 782, 106, 17, 105, 16, - /* 450 */ 682, 286, 684, 288, 683, 698, 19, 699, 18, 112, - /* 460 */ 73, 111, 671, 766, 21, 214, 20, 197, 198, 200, - /* 470 */ 194, 201, 202, 71, 68, 208, 1046, 209, 207, 192, - /* 480 */ 206, 196, 1045, 231, 1042, 1041, 991, 256, 232, 316, - /* 490 */ 143, 44, 998, 1028, 1009, 1006, 1007, 1011, 263, 145, - /* 500 */ 973, 141, 267, 149, 272, 1027, 162, 163, 223, 726, - /* 510 */ 269, 276, 155, 152, 971, 164, 165, 886, 988, 291, - /* 520 */ 42, 190, 38, 300, 882, 72, 301, 63, 69, 153, - /* 530 */ 1105, 281, 154, 103, 1104, 277, 279, 156, 275, 157, - /* 540 */ 273, 271, 1101, 169, 308, 1097, 109, 1096, 268, 1093, - /* 550 */ 170, 904, 39, 36, 43, 161, 191, 871, 119, 869, - /* 560 */ 121, 122, 867, 866, 248, 181, 864, 863, 862, 45, - /* 570 */ 861, 860, 859, 184, 186, 856, 854, 852, 850, 188, - /* 580 */ 847, 189, 326, 261, 78, 83, 114, 270, 1029, 318, - /* 590 */ 319, 320, 321, 322, 323, 217, 238, 290, 324, 336, - /* 600 */ 824, 210, 249, 250, 97, 98, 211, 823, 252, 253, - /* 610 */ 822, 257, 805, 804, 262, 264, 9, 285, 177, 172, - /* 620 */ 905, 175, 173, 171, 132, 865, 174, 176, 133, 858, - /* 630 */ 4, 857, 942, 134, 135, 703, 906, 849, 848, 81, - /* 640 */ 2, 158, 29, 159, 160, 84, 148, 728, 147, 225, - /* 650 */ 731, 954, 85, 30, 733, 86, 274, 10, 737, 150, - /* 660 */ 31, 781, 11, 95, 7, 12, 26, 783, 27, 635, - /* 670 */ 287, 631, 629, 93, 628, 627, 624, 594, 298, 99, - /* 680 */ 65, 35, 674, 102, 66, 673, 104, 108, 670, 616, - /* 690 */ 110, 614, 606, 612, 608, 610, 604, 602, 638, 637, - /* 700 */ 636, 634, 633, 632, 630, 626, 625, 180, 592, 559, - /* 710 */ 557, 828, 827, 827, 827, 827, 827, 827, 827, 827, - /* 720 */ 827, 827, 827, 137, 138, + /* 0 */ 526, 51, 50, 125, 124, 49, 48, 47, 525, 142, + /* 10 */ 140, 139, 52, 53, 32, 56, 57, 289, 543, 230, + /* 20 */ 46, 529, 55, 283, 60, 58, 62, 59, 338, 337, + /* 30 */ 136, 528, 51, 50, 828, 341, 49, 48, 47, 52, + /* 40 */ 53, 349, 56, 57, 481, 70, 230, 46, 178, 55, + /* 50 */ 283, 60, 58, 62, 59, 151, 395, 13, 394, 51, + /* 60 */ 50, 93, 90, 49, 48, 47, 52, 53, 245, 56, + /* 70 */ 57, 64, 410, 230, 46, 251, 55, 283, 60, 58, + /* 80 */ 62, 59, 357, 468, 255, 254, 51, 50, 71, 415, + /* 90 */ 49, 48, 47, 52, 54, 34, 56, 57, 259, 144, + /* 100 */ 230, 46, 526, 55, 283, 60, 58, 62, 59, 76, + /* 110 */ 525, 315, 314, 51, 50, 92, 236, 49, 48, 47, + /* 120 */ 348, 64, 60, 58, 62, 59, 369, 21, 278, 20, + /* 130 */ 51, 50, 399, 288, 49, 48, 47, 317, 247, 412, + /* 140 */ 244, 463, 310, 309, 91, 67, 542, 541, 540, 539, + /* 150 */ 538, 537, 536, 535, 534, 533, 532, 531, 530, 340, + /* 160 */ 360, 53, 219, 56, 57, 266, 265, 230, 46, 393, + /* 170 */ 55, 283, 60, 58, 62, 59, 418, 417, 33, 409, + /* 180 */ 51, 50, 240, 228, 49, 48, 47, 56, 57, 8, + /* 190 */ 68, 230, 46, 517, 55, 283, 60, 58, 62, 59, + /* 200 */ 49, 48, 47, 151, 51, 50, 1, 166, 49, 48, + /* 210 */ 47, 423, 435, 434, 433, 432, 431, 430, 429, 428, + /* 220 */ 427, 426, 425, 424, 422, 421, 229, 385, 6, 392, + /* 230 */ 396, 391, 389, 34, 388, 374, 373, 40, 297, 334, + /* 240 */ 333, 296, 295, 294, 332, 293, 331, 330, 329, 292, + /* 250 */ 328, 327, 241, 23, 239, 35, 303, 302, 215, 216, + /* 260 */ 229, 385, 282, 180, 396, 73, 389, 465, 388, 112, + /* 270 */ 204, 111, 280, 286, 87, 313, 19, 205, 18, 463, + /* 280 */ 80, 34, 128, 127, 203, 35, 138, 491, 262, 493, + /* 290 */ 492, 443, 215, 216, 490, 178, 488, 487, 489, 34, + /* 300 */ 486, 485, 40, 408, 334, 333, 453, 195, 452, 332, + /* 310 */ 284, 331, 330, 329, 82, 328, 327, 226, 378, 451, + /* 320 */ 398, 450, 41, 312, 113, 107, 118, 463, 195, 137, + /* 330 */ 61, 117, 123, 126, 116, 501, 384, 387, 227, 378, + /* 340 */ 120, 311, 390, 386, 258, 463, 74, 456, 34, 34, + /* 350 */ 459, 34, 458, 212, 457, 24, 397, 34, 34, 187, + /* 360 */ 185, 183, 679, 34, 61, 34, 182, 131, 130, 129, + /* 370 */ 384, 387, 526, 383, 5, 37, 168, 386, 242, 243, + /* 380 */ 525, 167, 101, 96, 100, 17, 106, 16, 105, 75, + /* 390 */ 307, 306, 24, 305, 463, 463, 15, 463, 14, 304, + /* 400 */ 234, 25, 94, 463, 463, 233, 401, 220, 64, 463, + /* 410 */ 379, 463, 146, 79, 35, 526, 82, 3, 179, 365, + /* 420 */ 89, 262, 347, 525, 41, 482, 366, 335, 502, 178, + /* 430 */ 362, 115, 260, 34, 77, 246, 325, 416, 151, 357, + /* 440 */ 237, 299, 151, 357, 413, 350, 235, 224, 500, 195, + /* 450 */ 413, 413, 218, 339, 499, 222, 455, 454, 498, 221, + /* 460 */ 377, 497, 496, 495, 494, 484, 480, 479, 478, 477, + /* 470 */ 476, 464, 475, 474, 473, 35, 28, 467, 469, 470, + /* 480 */ 466, 110, 108, 104, 102, 99, 66, 65, 298, 441, + /* 490 */ 442, 440, 439, 438, 437, 95, 27, 93, 287, 436, + /* 500 */ 26, 285, 12, 400, 7, 11, 376, 10, 31, 88, + /* 510 */ 352, 30, 150, 370, 367, 225, 274, 86, 148, 364, + /* 520 */ 85, 84, 363, 147, 264, 257, 345, 361, 358, 29, + /* 530 */ 9, 346, 81, 344, 253, 343, 250, 342, 2, 141, + /* 540 */ 262, 252, 4, 249, 524, 523, 504, 135, 518, 503, + /* 550 */ 483, 134, 516, 336, 133, 132, 326, 509, 324, 176, + /* 560 */ 177, 323, 322, 321, 320, 319, 175, 114, 318, 173, + /* 570 */ 211, 174, 210, 98, 172, 299, 171, 420, 471, 290, + /* 580 */ 97, 45, 161, 158, 156, 268, 153, 69, 160, 276, + /* 590 */ 269, 829, 238, 159, 157, 217, 372, 270, 83, 78, + /* 600 */ 261, 829, 829, 271, 829, 829, 273, 829, 829, 829, + /* 610 */ 829, 829, 829, 275, 829, 277, 368, 829, 155, 281, + /* 620 */ 154, 279, 189, 63, 527, 152, 162, 72, 406, 829, + /* 630 */ 188, 522, 521, 520, 829, 519, 829, 186, 223, 184, + /* 640 */ 267, 515, 829, 514, 513, 829, 829, 512, 375, 829, + /* 650 */ 829, 371, 829, 829, 829, 829, 829, 829, 829, 829, + /* 660 */ 829, 829, 829, 829, 829, 407, 263, 325, 829, 829, + /* 670 */ 356, 829, 829, 829, 829, 316, 829, 829, 829, 829, + /* 680 */ 829, 829, 829, 829, 829, 829, 829, 829, 829, 829, + /* 690 */ 44, 829, 511, 510, 181, 248, 508, 507, 122, 121, + /* 700 */ 506, 829, 119, 505, 191, 43, 36, 829, 829, 39, + /* 710 */ 472, 170, 462, 461, 109, 460, 308, 169, 448, 447, + /* 720 */ 103, 829, 829, 829, 829, 829, 446, 301, 444, 300, + /* 730 */ 38, 190, 42, 291, 419, 165, 164, 829, 411, 163, + /* 740 */ 272, 149, 145, 359, 355, 354, 353, 351, 143, 256, + /* 750 */ 829, 829, 829, 829, 829, 829, 829, 829, 829, 829, + /* 760 */ 829, 829, 829, 829, 829, 829, 829, 829, 829, 829, + /* 770 */ 829, 829, 829, 829, 829, 829, 829, 829, 829, 829, + /* 780 */ 829, 829, 829, 829, 829, 829, 829, 232, 405, 404, + /* 790 */ 231, 403, 402, 829, 829, 829, 829, 829, 829, 829, + /* 800 */ 829, 829, 829, 449, 445, 414, 829, 829, 829, 829, + /* 810 */ 829, 829, 829, 829, 829, 829, 829, 829, 829, 829, + /* 820 */ 829, 829, 829, 196, 206, 192, 207, 209, 208, 202, + /* 830 */ 201, 194, 200, 198, 197, 214, 213, 382, 381, 380, + /* 840 */ 199, 193, 22, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 236, 1, 236, 193, 240, 193, 240, 1, 257, 9, - /* 10 */ 0, 190, 191, 13, 14, 9, 16, 17, 267, 268, - /* 20 */ 20, 21, 193, 23, 24, 25, 26, 27, 28, 192, - /* 30 */ 193, 5, 236, 33, 34, 257, 240, 37, 38, 39, - /* 40 */ 13, 14, 193, 16, 17, 267, 268, 20, 21, 1, - /* 50 */ 23, 24, 25, 26, 27, 28, 193, 9, 229, 238, - /* 60 */ 33, 34, 60, 193, 37, 38, 39, 14, 258, 16, - /* 70 */ 17, 259, 260, 20, 21, 254, 23, 24, 25, 26, - /* 80 */ 27, 28, 79, 199, 235, 193, 33, 34, 239, 79, - /* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51, - /* 100 */ 52, 53, 54, 55, 56, 57, 58, 105, 199, 61, - /* 110 */ 110, 13, 14, 105, 16, 17, 232, 257, 20, 21, - /* 120 */ 112, 23, 24, 25, 26, 27, 28, 264, 268, 266, - /* 130 */ 81, 33, 34, 106, 264, 37, 38, 39, 13, 14, - /* 140 */ 257, 16, 17, 234, 238, 20, 21, 88, 23, 24, - /* 150 */ 25, 26, 27, 28, 262, 257, 264, 198, 33, 34, - /* 160 */ 254, 202, 37, 38, 39, 106, 89, 90, 91, 92, - /* 170 */ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - /* 180 */ 103, 213, 214, 215, 216, 217, 218, 219, 220, 221, - /* 190 */ 222, 223, 224, 225, 226, 227, 16, 17, 88, 238, - /* 200 */ 20, 21, 257, 23, 24, 25, 26, 27, 28, 37, - /* 210 */ 38, 39, 44, 33, 34, 254, 106, 37, 38, 39, - /* 220 */ 1, 2, 193, 198, 5, 76, 7, 202, 9, 61, - /* 230 */ 81, 1, 2, 211, 212, 5, 68, 7, 5, 9, - /* 240 */ 7, 73, 74, 75, 65, 66, 67, 139, 89, 141, - /* 250 */ 91, 92, 33, 34, 193, 96, 37, 98, 99, 100, - /* 260 */ 240, 102, 103, 33, 34, 213, 237, 215, 216, 1, - /* 270 */ 257, 193, 220, 105, 222, 223, 224, 9, 226, 227, - /* 280 */ 112, 25, 26, 27, 28, 193, 5, 136, 7, 33, - /* 290 */ 34, 200, 201, 37, 38, 39, 145, 146, 193, 62, - /* 300 */ 63, 64, 257, 135, 68, 137, 69, 70, 71, 72, - /* 310 */ 68, 2, 144, 235, 5, 78, 7, 239, 9, 62, - /* 320 */ 63, 64, 199, 5, 105, 264, 69, 70, 71, 72, - /* 330 */ 111, 239, 37, 33, 34, 105, 117, 37, 38, 39, - /* 340 */ 235, 111, 33, 34, 239, 193, 193, 117, 193, 15, - /* 350 */ 117, 33, 34, 134, 231, 232, 233, 234, 62, 63, - /* 360 */ 64, 241, 193, 193, 134, 69, 70, 71, 72, 193, - /* 370 */ 193, 193, 257, 105, 138, 255, 140, 240, 142, 143, - /* 380 */ 138, 5, 140, 7, 142, 143, 88, 235, 235, 198, - /* 390 */ 235, 239, 239, 202, 239, 105, 196, 197, 117, 109, - /* 400 */ 110, 62, 63, 64, 235, 235, 240, 88, 239, 239, - /* 410 */ 115, 235, 235, 235, 116, 239, 239, 239, 125, 126, - /* 420 */ 111, 106, 106, 88, 88, 106, 88, 1, 113, 113, - /* 430 */ 88, 88, 88, 88, 88, 88, 88, 105, 76, 77, - /* 440 */ 108, 106, 106, 257, 106, 111, 139, 139, 141, 141, - /* 450 */ 106, 106, 106, 106, 106, 5, 139, 7, 141, 139, - /* 460 */ 105, 141, 107, 37, 139, 257, 141, 257, 257, 257, - /* 470 */ 257, 257, 257, 130, 132, 257, 230, 257, 257, 257, - /* 480 */ 257, 257, 230, 230, 230, 230, 238, 193, 230, 230, - /* 490 */ 193, 256, 193, 265, 193, 193, 193, 193, 238, 193, - /* 500 */ 238, 60, 261, 193, 193, 265, 242, 193, 261, 117, - /* 510 */ 261, 261, 249, 252, 193, 193, 193, 193, 253, 193, - /* 520 */ 193, 193, 193, 193, 193, 129, 193, 128, 131, 251, - /* 530 */ 193, 123, 250, 193, 193, 122, 127, 248, 121, 247, - /* 540 */ 120, 119, 193, 193, 193, 193, 193, 193, 118, 193, - /* 550 */ 193, 193, 193, 193, 193, 243, 193, 193, 193, 193, - /* 560 */ 193, 193, 193, 193, 193, 193, 193, 193, 193, 133, - /* 570 */ 193, 193, 193, 193, 193, 193, 193, 193, 193, 193, - /* 580 */ 193, 193, 104, 194, 194, 194, 87, 194, 194, 86, - /* 590 */ 50, 83, 85, 54, 84, 194, 194, 194, 82, 79, - /* 600 */ 5, 194, 147, 5, 199, 199, 194, 5, 147, 5, - /* 610 */ 5, 136, 91, 90, 113, 88, 105, 108, 203, 208, - /* 620 */ 210, 205, 204, 209, 195, 194, 207, 206, 195, 194, - /* 630 */ 196, 194, 228, 195, 195, 106, 212, 194, 194, 114, - /* 640 */ 200, 246, 105, 245, 244, 88, 88, 106, 105, 1, - /* 650 */ 106, 228, 105, 88, 106, 105, 105, 124, 106, 105, - /* 660 */ 88, 106, 124, 76, 105, 105, 105, 111, 105, 9, - /* 670 */ 108, 5, 5, 109, 5, 5, 5, 80, 15, 76, - /* 680 */ 16, 88, 5, 141, 16, 5, 141, 141, 106, 5, - /* 690 */ 141, 5, 5, 5, 5, 5, 5, 5, 5, 5, - /* 700 */ 5, 5, 5, 5, 5, 5, 5, 88, 80, 60, - /* 710 */ 59, 0, 269, 269, 269, 269, 269, 269, 269, 269, - /* 720 */ 269, 269, 269, 21, 21, 269, 269, 269, 269, 269, - /* 730 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 740 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + /* 0 */ 1, 33, 34, 76, 77, 37, 38, 39, 9, 62, + /* 10 */ 63, 64, 13, 14, 105, 16, 17, 108, 0, 20, + /* 20 */ 21, 59, 23, 24, 25, 26, 27, 28, 65, 66, + /* 30 */ 67, 60, 33, 34, 190, 191, 37, 38, 39, 13, + /* 40 */ 14, 37, 16, 17, 198, 88, 20, 21, 202, 23, + /* 50 */ 24, 25, 26, 27, 28, 193, 5, 105, 7, 33, + /* 60 */ 34, 109, 110, 37, 38, 39, 13, 14, 68, 16, + /* 70 */ 17, 88, 193, 20, 21, 136, 23, 24, 25, 26, + /* 80 */ 27, 28, 238, 5, 145, 146, 33, 34, 131, 106, + /* 90 */ 37, 38, 39, 13, 14, 193, 16, 17, 254, 193, + /* 100 */ 20, 21, 1, 23, 24, 25, 26, 27, 28, 110, + /* 110 */ 9, 33, 34, 33, 34, 88, 237, 37, 38, 39, + /* 120 */ 116, 88, 25, 26, 27, 28, 264, 139, 266, 141, + /* 130 */ 33, 34, 106, 106, 37, 38, 39, 235, 138, 106, + /* 140 */ 140, 239, 142, 143, 199, 88, 45, 46, 47, 48, + /* 150 */ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + /* 160 */ 88, 14, 61, 16, 17, 259, 260, 20, 21, 118, + /* 170 */ 23, 24, 25, 26, 27, 28, 231, 232, 233, 234, + /* 180 */ 33, 34, 68, 60, 37, 38, 39, 16, 17, 117, + /* 190 */ 133, 20, 21, 80, 23, 24, 25, 26, 27, 28, + /* 200 */ 37, 38, 39, 193, 33, 34, 200, 201, 37, 38, + /* 210 */ 39, 213, 214, 215, 216, 217, 218, 219, 220, 221, + /* 220 */ 222, 223, 224, 225, 226, 227, 1, 2, 105, 5, + /* 230 */ 5, 7, 7, 193, 9, 126, 127, 89, 90, 91, + /* 240 */ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, + /* 250 */ 102, 103, 138, 44, 140, 88, 142, 143, 33, 34, + /* 260 */ 1, 2, 37, 88, 5, 105, 7, 107, 9, 139, + /* 270 */ 61, 141, 262, 106, 264, 235, 139, 68, 141, 239, + /* 280 */ 106, 193, 73, 74, 75, 88, 21, 213, 114, 215, + /* 290 */ 216, 198, 33, 34, 220, 202, 222, 223, 224, 193, + /* 300 */ 226, 227, 89, 106, 91, 92, 5, 257, 7, 96, + /* 310 */ 15, 98, 99, 100, 105, 102, 103, 267, 268, 5, + /* 320 */ 1, 7, 113, 235, 62, 63, 64, 239, 257, 21, + /* 330 */ 105, 69, 70, 71, 72, 5, 111, 112, 267, 268, + /* 340 */ 78, 235, 118, 118, 135, 239, 137, 2, 193, 193, + /* 350 */ 5, 193, 7, 144, 9, 88, 37, 193, 193, 62, + /* 360 */ 63, 64, 0, 193, 105, 193, 69, 70, 71, 72, + /* 370 */ 111, 112, 1, 106, 62, 63, 64, 118, 33, 34, + /* 380 */ 9, 69, 70, 71, 72, 139, 139, 141, 141, 199, + /* 390 */ 235, 235, 88, 235, 239, 239, 139, 239, 141, 235, + /* 400 */ 235, 88, 199, 239, 239, 235, 111, 235, 88, 239, + /* 410 */ 106, 239, 88, 106, 88, 1, 105, 196, 197, 106, + /* 420 */ 241, 114, 232, 9, 113, 198, 106, 211, 212, 202, + /* 430 */ 106, 76, 106, 193, 255, 193, 81, 234, 193, 238, + /* 440 */ 236, 79, 193, 238, 240, 193, 236, 236, 5, 257, + /* 450 */ 240, 240, 192, 193, 5, 254, 111, 112, 5, 254, + /* 460 */ 268, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 470 */ 5, 229, 5, 5, 5, 88, 105, 5, 106, 239, + /* 480 */ 5, 141, 141, 141, 141, 76, 16, 16, 15, 5, + /* 490 */ 80, 5, 5, 5, 5, 76, 105, 109, 108, 9, + /* 500 */ 105, 108, 105, 111, 105, 125, 106, 125, 88, 264, + /* 510 */ 258, 88, 105, 264, 106, 1, 105, 105, 88, 106, + /* 520 */ 105, 88, 106, 105, 88, 136, 91, 106, 106, 105, + /* 530 */ 105, 90, 115, 5, 5, 5, 5, 5, 200, 60, + /* 540 */ 114, 147, 196, 147, 194, 194, 212, 195, 194, 5, + /* 550 */ 228, 195, 194, 79, 195, 195, 104, 194, 82, 206, + /* 560 */ 203, 84, 54, 85, 83, 50, 205, 87, 86, 204, + /* 570 */ 194, 207, 194, 199, 208, 79, 209, 228, 210, 194, + /* 580 */ 199, 134, 243, 246, 248, 119, 251, 132, 244, 261, + /* 590 */ 261, 269, 194, 245, 247, 194, 194, 194, 194, 194, + /* 600 */ 194, 269, 269, 120, 269, 269, 121, 269, 269, 269, + /* 610 */ 269, 269, 269, 122, 269, 123, 118, 269, 249, 124, + /* 620 */ 250, 128, 193, 129, 193, 252, 242, 130, 253, 269, + /* 630 */ 193, 193, 193, 193, 269, 193, 269, 193, 261, 193, + /* 640 */ 261, 193, 269, 193, 193, 269, 269, 193, 265, 269, + /* 650 */ 269, 265, 269, 269, 269, 269, 269, 269, 269, 269, + /* 660 */ 269, 269, 269, 269, 269, 238, 238, 81, 269, 269, + /* 670 */ 238, 269, 269, 269, 269, 230, 269, 269, 269, 269, + /* 680 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + /* 690 */ 256, 269, 193, 193, 193, 193, 193, 193, 193, 193, + /* 700 */ 193, 269, 193, 193, 193, 193, 193, 269, 269, 193, + /* 710 */ 193, 193, 193, 193, 193, 193, 193, 193, 193, 193, + /* 720 */ 193, 269, 269, 269, 269, 269, 193, 193, 193, 193, + /* 730 */ 193, 193, 193, 193, 193, 193, 193, 269, 193, 193, + /* 740 */ 193, 193, 193, 193, 193, 193, 193, 193, 193, 193, /* 750 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, /* 760 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, /* 770 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 780 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 790 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 800 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, + /* 780 */ 269, 269, 269, 269, 269, 269, 269, 230, 230, 230, + /* 790 */ 230, 230, 230, 269, 269, 269, 269, 269, 269, 269, + /* 800 */ 269, 269, 269, 240, 240, 240, 269, 269, 269, 269, /* 810 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 820 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 830 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 840 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 850 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 860 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 870 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 880 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 890 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 900 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 910 */ 269, 269, 269, 269, + /* 820 */ 269, 269, 269, 257, 257, 257, 257, 257, 257, 257, + /* 830 */ 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, + /* 840 */ 257, 257, 257, }; -#define YY_SHIFT_COUNT (341) -#define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (711) -static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 168, 77, 77, 159, 159, 3, 219, 230, 268, 6, - /* 10 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 20 */ 6, 6, 0, 48, 230, 309, 309, 309, 8, 8, - /* 30 */ 6, 6, 6, 10, 6, 6, 149, 3, 49, 49, - /* 40 */ 26, 725, 725, 725, 230, 230, 230, 230, 230, 230, - /* 50 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, - /* 60 */ 230, 230, 230, 230, 309, 309, 309, 318, 318, 318, - /* 70 */ 318, 318, 318, 318, 6, 6, 6, 295, 6, 6, - /* 80 */ 6, 8, 8, 6, 6, 6, 6, 293, 293, 298, - /* 90 */ 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 100 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 110 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 120 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 130 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 140 */ 6, 6, 6, 441, 441, 441, 392, 392, 392, 441, - /* 150 */ 392, 441, 396, 397, 399, 408, 409, 413, 417, 420, - /* 160 */ 422, 430, 436, 441, 441, 441, 478, 3, 3, 441, - /* 170 */ 441, 499, 503, 540, 508, 507, 539, 510, 516, 478, - /* 180 */ 26, 441, 520, 520, 441, 520, 441, 520, 441, 441, - /* 190 */ 725, 725, 27, 98, 125, 98, 98, 53, 180, 256, - /* 200 */ 256, 256, 256, 237, 257, 296, 300, 300, 300, 300, - /* 210 */ 236, 242, 151, 172, 172, 233, 281, 290, 179, 339, - /* 220 */ 59, 315, 316, 110, 319, 335, 336, 338, 426, 2, - /* 230 */ 334, 342, 343, 344, 345, 346, 347, 348, 332, 108, - /* 240 */ 307, 308, 376, 450, 317, 320, 355, 325, 362, 595, - /* 250 */ 455, 598, 602, 461, 604, 605, 521, 523, 475, 501, - /* 260 */ 509, 511, 525, 529, 537, 527, 557, 541, 543, 544, - /* 270 */ 558, 547, 548, 550, 648, 551, 552, 554, 565, 533, - /* 280 */ 572, 538, 555, 559, 556, 560, 509, 561, 562, 563, - /* 290 */ 564, 587, 660, 666, 667, 669, 670, 671, 597, 663, - /* 300 */ 603, 664, 542, 545, 593, 593, 593, 593, 668, 546, - /* 310 */ 549, 593, 593, 593, 677, 680, 582, 593, 684, 686, - /* 320 */ 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, - /* 330 */ 697, 698, 699, 700, 701, 619, 628, 702, 703, 649, - /* 340 */ 651, 711, +#define YY_SHIFT_USE_DFLT (-92) +#define YY_SHIFT_COUNT (341) +#define YY_SHIFT_MIN (-91) +#define YY_SHIFT_MAX (586) +static const short yy_shift_ofst[] = { + /* 0 */ 209, 148, 148, 213, 213, 496, 225, 259, 371, 414, + /* 10 */ 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, + /* 20 */ 414, 414, -1, 101, 259, 345, 345, 345, 311, 311, + /* 30 */ 414, 414, 414, 362, 414, 414, 355, 496, 586, 586, + /* 40 */ 544, -92, -92, -92, 259, 259, 259, 259, 259, 259, + /* 50 */ 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + /* 60 */ 259, 259, 259, 259, 345, 345, 345, 78, 78, 78, + /* 70 */ 78, 78, 78, 78, 414, 414, 414, 4, 414, 414, + /* 80 */ 414, 311, 311, 414, 414, 414, 414, 109, 109, 72, + /* 90 */ 311, 414, 414, 414, 414, 414, 414, 414, 414, 414, + /* 100 */ 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, + /* 110 */ 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, + /* 120 */ 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, + /* 130 */ 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, + /* 140 */ 414, 414, 414, 479, 479, 479, 498, 498, 498, 479, + /* 150 */ 498, 479, 497, 455, 494, 495, 493, 492, 491, 485, + /* 160 */ 483, 466, 447, 479, 479, 479, 452, 496, 496, 479, + /* 170 */ 479, 480, 482, 515, 481, 478, 508, 477, 476, 452, + /* 180 */ 544, 479, 474, 474, 479, 474, 479, 474, 479, 479, + /* 190 */ -92, -92, 26, 53, 80, 53, 53, 147, 171, 97, + /* 200 */ 97, 97, 97, 262, 312, 297, -32, -32, -32, -32, + /* 210 */ 114, 0, -61, 163, 163, 224, 51, -48, -37, -53, + /* 220 */ 326, 307, 174, 324, 320, 313, 304, 267, 319, 123, + /* 230 */ 295, 57, -43, 197, 167, 33, 27, -17, -91, 257, + /* 240 */ 247, 246, 314, 301, 137, 130, 160, -12, -73, 532, + /* 250 */ 396, 531, 530, 394, 529, 528, 435, 441, 389, 426, + /* 260 */ 393, 425, 417, 422, 424, 436, 433, 421, 418, 416, + /* 270 */ 430, 415, 413, 412, 514, 411, 408, 407, 423, 382, + /* 280 */ 420, 380, 400, 399, 392, 397, 393, 395, 390, 391, + /* 290 */ 388, 419, 490, 489, 488, 487, 486, 484, 410, 473, + /* 300 */ 409, 471, 343, 342, 387, 387, 387, 387, 470, 341, + /* 310 */ 340, 387, 387, 387, 475, 472, 372, 387, 469, 468, + /* 320 */ 467, 465, 464, 463, 462, 461, 460, 459, 458, 457, + /* 330 */ 456, 453, 449, 443, 330, 175, 113, 308, 265, -29, + /* 340 */ -38, 18, }; +#define YY_REDUCE_USE_DFLT (-157) #define YY_REDUCE_COUNT (191) -#define YY_REDUCE_MIN (-249) -#define YY_REDUCE_MAX (444) +#define YY_REDUCE_MIN (-156) +#define YY_REDUCE_MAX (585) static const short yy_reduce_ofst[] = { - /* 0 */ -179, -32, -32, 52, 52, 123, -249, -222, -188, -151, - /* 10 */ -137, -108, 78, 105, 152, 153, 155, 169, 170, 176, - /* 20 */ 177, 178, -190, -163, -140, -236, -234, -204, -94, -39, - /* 30 */ -130, 61, 29, -91, -171, 92, -41, -116, 25, 191, - /* 40 */ 22, 120, 91, 200, -117, -102, -55, 13, 45, 115, - /* 50 */ 186, 208, 210, 211, 212, 213, 214, 215, 218, 220, - /* 60 */ 221, 222, 223, 224, 20, 137, 166, 246, 252, 253, - /* 70 */ 254, 255, 258, 259, 294, 297, 299, 235, 301, 302, - /* 80 */ 303, 248, 260, 304, 306, 310, 311, 228, 240, 264, - /* 90 */ 262, 314, 321, 322, 323, 324, 326, 327, 328, 329, - /* 100 */ 330, 331, 333, 337, 340, 341, 349, 350, 351, 352, - /* 110 */ 353, 354, 356, 357, 358, 359, 360, 361, 363, 364, - /* 120 */ 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - /* 130 */ 375, 377, 378, 379, 380, 381, 382, 383, 384, 385, - /* 140 */ 386, 387, 388, 389, 390, 391, 241, 247, 249, 393, - /* 150 */ 250, 394, 265, 261, 278, 282, 263, 289, 292, 395, - /* 160 */ 398, 400, 312, 401, 402, 403, 404, 405, 406, 407, - /* 170 */ 412, 410, 414, 411, 418, 419, 416, 421, 415, 423, - /* 180 */ 424, 431, 429, 433, 435, 438, 437, 439, 443, 444, - /* 190 */ 440, 434, + /* 0 */ -156, -2, -2, 74, 74, -55, 71, 50, -94, 172, + /* 10 */ -138, 10, 170, 165, 164, 158, 156, 155, 106, 88, + /* 20 */ 40, -98, 252, 260, 192, 211, 210, 204, 205, 201, + /* 30 */ 249, 245, -121, 203, 242, 240, 227, 190, 93, -154, + /* 40 */ 216, 179, 6, 221, 585, 584, 583, 582, 581, 580, + /* 50 */ 579, 578, 577, 576, 575, 574, 573, 572, 571, 570, + /* 60 */ 569, 568, 567, 566, 565, 564, 563, 562, 561, 560, + /* 70 */ 559, 558, 557, 445, 556, 555, 554, 434, 553, 552, + /* 80 */ 551, 432, 428, 550, 549, 548, 547, 386, 383, 384, + /* 90 */ 427, 546, 545, 543, 542, 541, 540, 539, 538, 537, + /* 100 */ 536, 535, 534, 533, 527, 526, 525, 524, 523, 522, + /* 110 */ 521, 520, 519, 518, 517, 516, 513, 512, 511, 510, + /* 120 */ 509, 507, 506, 505, 504, 503, 502, 501, 500, 499, + /* 130 */ 454, 451, 450, 448, 446, 444, 442, 440, 439, 438, + /* 140 */ 437, 431, 429, 406, 405, 404, 379, 377, 329, 403, + /* 150 */ 328, 402, 375, 373, 335, 370, 369, 336, 347, 337, + /* 160 */ 348, 344, 339, 401, 398, 385, 349, 381, 374, 378, + /* 170 */ 376, 368, 367, 366, 365, 364, 361, 353, 357, 322, + /* 180 */ 334, 363, 360, 359, 358, 356, 354, 352, 351, 350, + /* 190 */ 338, 346, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 825, 941, 884, 953, 872, 881, 1089, 1089, 825, 825, - /* 10 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 20 */ 825, 825, 1000, 844, 1089, 825, 825, 825, 825, 825, - /* 30 */ 825, 825, 825, 881, 825, 825, 887, 881, 887, 887, - /* 40 */ 825, 995, 925, 943, 825, 825, 825, 825, 825, 825, - /* 50 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 60 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 70 */ 825, 825, 825, 825, 825, 825, 825, 1002, 1008, 1005, - /* 80 */ 825, 825, 825, 1010, 825, 825, 825, 1032, 1032, 993, - /* 90 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 100 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 110 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 870, - /* 120 */ 825, 868, 825, 825, 825, 825, 825, 825, 825, 825, - /* 130 */ 825, 825, 825, 825, 825, 825, 855, 825, 825, 825, - /* 140 */ 825, 825, 825, 846, 846, 846, 825, 825, 825, 846, - /* 150 */ 825, 846, 1039, 1043, 1037, 1025, 1033, 1024, 1020, 1018, - /* 160 */ 1016, 1015, 1047, 846, 846, 846, 885, 881, 881, 846, - /* 170 */ 846, 903, 901, 899, 891, 897, 893, 895, 889, 873, - /* 180 */ 825, 846, 879, 879, 846, 879, 846, 879, 846, 846, - /* 190 */ 925, 943, 825, 1048, 825, 1088, 1038, 1078, 1077, 1084, - /* 200 */ 1076, 1075, 1074, 825, 825, 825, 1070, 1071, 1073, 1072, - /* 210 */ 825, 825, 825, 1080, 1079, 825, 825, 825, 825, 825, - /* 220 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 1050, - /* 230 */ 825, 1044, 1040, 825, 825, 825, 825, 825, 825, 825, - /* 240 */ 825, 825, 825, 825, 825, 825, 955, 825, 825, 825, - /* 250 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 992, - /* 260 */ 825, 825, 825, 825, 825, 1004, 1003, 825, 825, 825, - /* 270 */ 825, 825, 825, 825, 825, 825, 825, 825, 1034, 825, - /* 280 */ 1026, 825, 825, 825, 825, 825, 967, 825, 825, 825, - /* 290 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 300 */ 825, 825, 825, 825, 1107, 1102, 1103, 1100, 825, 825, - /* 310 */ 825, 1099, 1094, 1095, 825, 825, 825, 1092, 825, 825, - /* 320 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 330 */ 825, 825, 825, 825, 825, 909, 825, 853, 851, 825, - /* 340 */ 842, 825, + /* 0 */ 827, 656, 599, 668, 587, 596, 805, 805, 827, 827, + /* 10 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 20 */ 827, 827, 716, 559, 805, 827, 827, 827, 827, 827, + /* 30 */ 827, 827, 827, 596, 827, 827, 602, 596, 602, 602, + /* 40 */ 827, 711, 640, 658, 827, 827, 827, 827, 827, 827, + /* 50 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 60 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 70 */ 827, 827, 827, 827, 827, 827, 827, 718, 724, 721, + /* 80 */ 827, 827, 827, 726, 827, 827, 827, 748, 748, 709, + /* 90 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 100 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 110 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 585, + /* 120 */ 827, 583, 827, 827, 827, 827, 827, 827, 827, 827, + /* 130 */ 827, 827, 827, 827, 827, 827, 570, 827, 827, 827, + /* 140 */ 827, 827, 827, 561, 561, 561, 827, 827, 827, 561, + /* 150 */ 827, 561, 755, 759, 753, 741, 749, 740, 736, 734, + /* 160 */ 732, 731, 763, 561, 561, 561, 600, 596, 596, 561, + /* 170 */ 561, 618, 616, 614, 606, 612, 608, 610, 604, 588, + /* 180 */ 827, 561, 594, 594, 561, 594, 561, 594, 561, 561, + /* 190 */ 640, 658, 827, 764, 827, 804, 754, 794, 793, 800, + /* 200 */ 792, 791, 790, 827, 827, 827, 786, 787, 789, 788, + /* 210 */ 827, 827, 827, 796, 795, 827, 827, 827, 827, 827, + /* 220 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 766, + /* 230 */ 827, 760, 756, 827, 827, 827, 827, 827, 827, 827, + /* 240 */ 827, 827, 827, 827, 827, 827, 670, 827, 827, 827, + /* 250 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 708, + /* 260 */ 827, 827, 827, 827, 827, 720, 719, 827, 827, 827, + /* 270 */ 827, 827, 827, 827, 827, 827, 827, 827, 750, 827, + /* 280 */ 742, 827, 827, 827, 827, 827, 682, 827, 827, 827, + /* 290 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 300 */ 827, 827, 827, 827, 823, 818, 819, 816, 827, 827, + /* 310 */ 827, 815, 810, 811, 827, 827, 827, 808, 827, 827, + /* 320 */ 827, 827, 827, 827, 827, 827, 827, 827, 827, 827, + /* 330 */ 827, 827, 827, 827, 827, 624, 827, 568, 566, 827, + /* 340 */ 557, 827, 826, 825, 824, 807, 806, 678, 717, 713, + /* 350 */ 715, 714, 712, 725, 722, 723, 707, 706, 705, 727, + /* 360 */ 710, 730, 729, 733, 735, 738, 737, 739, 728, 752, + /* 370 */ 751, 744, 745, 747, 746, 743, 783, 802, 803, 801, + /* 380 */ 799, 798, 797, 782, 781, 780, 777, 776, 775, 772, + /* 390 */ 778, 774, 771, 779, 773, 770, 769, 768, 767, 765, + /* 400 */ 785, 784, 762, 761, 758, 757, 704, 688, 683, 680, + /* 410 */ 687, 686, 685, 693, 692, 684, 681, 677, 676, 601, + /* 420 */ 657, 655, 654, 653, 652, 651, 650, 649, 648, 647, + /* 430 */ 646, 645, 644, 643, 642, 641, 636, 632, 630, 629, + /* 440 */ 628, 625, 595, 598, 597, 822, 821, 820, 817, 814, + /* 450 */ 703, 702, 701, 700, 699, 698, 697, 696, 695, 694, + /* 460 */ 813, 812, 809, 690, 691, 672, 675, 674, 673, 671, + /* 470 */ 689, 620, 619, 617, 615, 607, 613, 609, 611, 605, + /* 480 */ 603, 590, 589, 669, 639, 667, 666, 665, 664, 663, + /* 490 */ 662, 661, 660, 659, 638, 637, 635, 634, 633, 631, + /* 500 */ 627, 626, 622, 623, 621, 586, 584, 582, 581, 580, + /* 510 */ 579, 578, 577, 576, 575, 574, 573, 593, 572, 571, + /* 520 */ 569, 567, 565, 564, 563, 592, 591, 562, 560, 558, + /* 530 */ 556, 555, 554, 553, 552, 551, 550, 549, 548, 547, + /* 540 */ 546, 545, 544, }; -/********** 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. ** @@ -487,10 +476,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[] = { @@ -606,6 +591,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* USING => nothing */ 0, /* AS => nothing */ 1, /* NULL => ID */ + 1, /* NOW => ID */ 0, /* SELECT => nothing */ 0, /* UNION => nothing */ 1, /* ALL => ID */ @@ -628,7 +614,6 @@ static const YYCODETYPE yyFallback[] = { 0, /* SLIMIT => nothing */ 0, /* SOFFSET => nothing */ 0, /* WHERE => nothing */ - 1, /* NOW => ID */ 0, /* RESET => nothing */ 0, /* QUERY => nothing */ 0, /* SYNCDB => nothing */ @@ -697,13 +682,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 @@ -714,21 +695,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; @@ -765,281 +742,80 @@ 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 */ "TOPICS", - /* 47 */ "MNODES", - /* 48 */ "DNODES", - /* 49 */ "ACCOUNTS", - /* 50 */ "USERS", - /* 51 */ "MODULES", - /* 52 */ "QUERIES", - /* 53 */ "CONNECTIONS", - /* 54 */ "STREAMS", - /* 55 */ "VARIABLES", - /* 56 */ "SCORES", - /* 57 */ "GRANTS", - /* 58 */ "VNODES", - /* 59 */ "IPTOKEN", - /* 60 */ "DOT", - /* 61 */ "CREATE", - /* 62 */ "TABLE", - /* 63 */ "STABLE", - /* 64 */ "DATABASE", - /* 65 */ "TABLES", - /* 66 */ "STABLES", - /* 67 */ "VGROUPS", - /* 68 */ "DROP", - /* 69 */ "TOPIC", - /* 70 */ "DNODE", - /* 71 */ "USER", - /* 72 */ "ACCOUNT", - /* 73 */ "USE", - /* 74 */ "DESCRIBE", - /* 75 */ "ALTER", - /* 76 */ "PASS", - /* 77 */ "PRIVILEGE", - /* 78 */ "LOCAL", - /* 79 */ "IF", - /* 80 */ "EXISTS", - /* 81 */ "PPS", - /* 82 */ "TSERIES", - /* 83 */ "DBS", - /* 84 */ "STORAGE", - /* 85 */ "QTIME", - /* 86 */ "CONNS", - /* 87 */ "STATE", - /* 88 */ "COMMA", - /* 89 */ "KEEP", - /* 90 */ "CACHE", - /* 91 */ "REPLICA", - /* 92 */ "QUORUM", - /* 93 */ "DAYS", - /* 94 */ "MINROWS", - /* 95 */ "MAXROWS", - /* 96 */ "BLOCKS", - /* 97 */ "CTIME", - /* 98 */ "WAL", - /* 99 */ "FSYNC", - /* 100 */ "COMP", - /* 101 */ "PRECISION", - /* 102 */ "UPDATE", - /* 103 */ "CACHELAST", - /* 104 */ "PARTITIONS", - /* 105 */ "LP", - /* 106 */ "RP", - /* 107 */ "UNSIGNED", - /* 108 */ "TAGS", - /* 109 */ "USING", - /* 110 */ "AS", - /* 111 */ "NULL", - /* 112 */ "SELECT", - /* 113 */ "UNION", - /* 114 */ "ALL", - /* 115 */ "DISTINCT", - /* 116 */ "FROM", - /* 117 */ "VARIABLE", - /* 118 */ "INTERVAL", - /* 119 */ "SESSION", - /* 120 */ "STATE_WINDOW", - /* 121 */ "FILL", - /* 122 */ "SLIDING", - /* 123 */ "ORDER", - /* 124 */ "BY", - /* 125 */ "ASC", - /* 126 */ "DESC", - /* 127 */ "GROUP", - /* 128 */ "HAVING", - /* 129 */ "LIMIT", - /* 130 */ "OFFSET", - /* 131 */ "SLIMIT", - /* 132 */ "SOFFSET", - /* 133 */ "WHERE", - /* 134 */ "NOW", - /* 135 */ "RESET", - /* 136 */ "QUERY", - /* 137 */ "SYNCDB", - /* 138 */ "ADD", - /* 139 */ "COLUMN", - /* 140 */ "MODIFY", - /* 141 */ "TAG", - /* 142 */ "CHANGE", - /* 143 */ "SET", - /* 144 */ "KILL", - /* 145 */ "CONNECTION", - /* 146 */ "STREAM", - /* 147 */ "COLON", - /* 148 */ "ABORT", - /* 149 */ "AFTER", - /* 150 */ "ATTACH", - /* 151 */ "BEFORE", - /* 152 */ "BEGIN", - /* 153 */ "CASCADE", - /* 154 */ "CLUSTER", - /* 155 */ "CONFLICT", - /* 156 */ "COPY", - /* 157 */ "DEFERRED", - /* 158 */ "DELIMITERS", - /* 159 */ "DETACH", - /* 160 */ "EACH", - /* 161 */ "END", - /* 162 */ "EXPLAIN", - /* 163 */ "FAIL", - /* 164 */ "FOR", - /* 165 */ "IGNORE", - /* 166 */ "IMMEDIATE", - /* 167 */ "INITIALLY", - /* 168 */ "INSTEAD", - /* 169 */ "MATCH", - /* 170 */ "KEY", - /* 171 */ "OF", - /* 172 */ "RAISE", - /* 173 */ "REPLACE", - /* 174 */ "RESTRICT", - /* 175 */ "ROW", - /* 176 */ "STATEMENT", - /* 177 */ "TRIGGER", - /* 178 */ "VIEW", - /* 179 */ "SEMI", - /* 180 */ "NONE", - /* 181 */ "PREV", - /* 182 */ "LINEAR", - /* 183 */ "IMPORT", - /* 184 */ "TBNAME", - /* 185 */ "JOIN", - /* 186 */ "INSERT", - /* 187 */ "INTO", - /* 188 */ "VALUES", - /* 189 */ "error", - /* 190 */ "program", - /* 191 */ "cmd", - /* 192 */ "dbPrefix", - /* 193 */ "ids", - /* 194 */ "cpxName", - /* 195 */ "ifexists", - /* 196 */ "alter_db_optr", - /* 197 */ "alter_topic_optr", - /* 198 */ "acct_optr", - /* 199 */ "ifnotexists", - /* 200 */ "db_optr", - /* 201 */ "topic_optr", - /* 202 */ "pps", - /* 203 */ "tseries", - /* 204 */ "dbs", - /* 205 */ "streams", - /* 206 */ "storage", - /* 207 */ "qtime", - /* 208 */ "users", - /* 209 */ "conns", - /* 210 */ "state", - /* 211 */ "intitemlist", - /* 212 */ "intitem", - /* 213 */ "keep", - /* 214 */ "cache", - /* 215 */ "replica", - /* 216 */ "quorum", - /* 217 */ "days", - /* 218 */ "minrows", - /* 219 */ "maxrows", - /* 220 */ "blocks", - /* 221 */ "ctime", - /* 222 */ "wal", - /* 223 */ "fsync", - /* 224 */ "comp", - /* 225 */ "prec", - /* 226 */ "update", - /* 227 */ "cachelast", - /* 228 */ "partitions", - /* 229 */ "typename", - /* 230 */ "signed", - /* 231 */ "create_table_args", - /* 232 */ "create_stable_args", - /* 233 */ "create_table_list", - /* 234 */ "create_from_stable", - /* 235 */ "columnlist", - /* 236 */ "tagitemlist", - /* 237 */ "tagNamelist", - /* 238 */ "select", - /* 239 */ "column", - /* 240 */ "tagitem", - /* 241 */ "selcollist", - /* 242 */ "from", - /* 243 */ "where_opt", - /* 244 */ "interval_opt", - /* 245 */ "session_option", - /* 246 */ "windowstate_option", - /* 247 */ "fill_opt", - /* 248 */ "sliding_opt", - /* 249 */ "groupby_opt", - /* 250 */ "orderby_opt", - /* 251 */ "having_opt", - /* 252 */ "slimit_opt", - /* 253 */ "limit_opt", - /* 254 */ "union", - /* 255 */ "sclp", - /* 256 */ "distinct", - /* 257 */ "expr", - /* 258 */ "as", - /* 259 */ "tablelist", - /* 260 */ "sub", - /* 261 */ "tmvar", - /* 262 */ "sortlist", - /* 263 */ "sortitem", - /* 264 */ "item", - /* 265 */ "sortorder", - /* 266 */ "grouplist", - /* 267 */ "exprlist", - /* 268 */ "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", "TOPICS", "MNODES", + "DNODES", "ACCOUNTS", "USERS", "MODULES", + "QUERIES", "CONNECTIONS", "STREAMS", "VARIABLES", + "SCORES", "GRANTS", "VNODES", "IPTOKEN", + "DOT", "CREATE", "TABLE", "STABLE", + "DATABASE", "TABLES", "STABLES", "VGROUPS", + "DROP", "TOPIC", "DNODE", "USER", + "ACCOUNT", "USE", "DESCRIBE", "ALTER", + "PASS", "PRIVILEGE", "LOCAL", "IF", + "EXISTS", "PPS", "TSERIES", "DBS", + "STORAGE", "QTIME", "CONNS", "STATE", + "COMMA", "KEEP", "CACHE", "REPLICA", + "QUORUM", "DAYS", "MINROWS", "MAXROWS", + "BLOCKS", "CTIME", "WAL", "FSYNC", + "COMP", "PRECISION", "UPDATE", "CACHELAST", + "PARTITIONS", "LP", "RP", "UNSIGNED", + "TAGS", "USING", "AS", "NULL", + "NOW", "SELECT", "UNION", "ALL", + "DISTINCT", "FROM", "VARIABLE", "INTERVAL", + "SESSION", "STATE_WINDOW", "FILL", "SLIDING", + "ORDER", "BY", "ASC", "DESC", + "GROUP", "HAVING", "LIMIT", "OFFSET", + "SLIMIT", "SOFFSET", "WHERE", "RESET", + "QUERY", "SYNCDB", "ADD", "COLUMN", + "MODIFY", "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", "SEMI", + "NONE", "PREV", "LINEAR", "IMPORT", + "TBNAME", "JOIN", "INSERT", "INTO", + "VALUES", "error", "program", "cmd", + "dbPrefix", "ids", "cpxName", "ifexists", + "alter_db_optr", "alter_topic_optr", "acct_optr", "ifnotexists", + "db_optr", "topic_optr", "pps", "tseries", + "dbs", "streams", "storage", "qtime", + "users", "conns", "state", "intitemlist", + "intitem", "keep", "cache", "replica", + "quorum", "days", "minrows", "maxrows", + "blocks", "ctime", "wal", "fsync", + "comp", "prec", "update", "cachelast", + "partitions", "typename", "signed", "create_table_args", + "create_stable_args", "create_table_list", "create_from_stable", "columnlist", + "tagitemlist", "tagNamelist", "select", "column", + "tagitem", "selcollist", "from", "where_opt", + "interval_opt", "session_option", "windowstate_option", "fill_opt", + "sliding_opt", "groupby_opt", "orderby_opt", "having_opt", + "slimit_opt", "limit_opt", "union", "sclp", + "distinct", "expr", "as", "tablelist", + "sub", "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. @@ -1201,207 +977,161 @@ static const char *const yyRuleName[] = { /* 153 */ "tagitem ::= STRING", /* 154 */ "tagitem ::= BOOL", /* 155 */ "tagitem ::= NULL", - /* 156 */ "tagitem ::= MINUS INTEGER", - /* 157 */ "tagitem ::= MINUS FLOAT", - /* 158 */ "tagitem ::= PLUS INTEGER", - /* 159 */ "tagitem ::= PLUS FLOAT", - /* 160 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", - /* 161 */ "select ::= LP select RP", - /* 162 */ "union ::= select", - /* 163 */ "union ::= union UNION ALL select", - /* 164 */ "cmd ::= union", - /* 165 */ "select ::= SELECT selcollist", - /* 166 */ "sclp ::= selcollist COMMA", - /* 167 */ "sclp ::=", - /* 168 */ "selcollist ::= sclp distinct expr as", - /* 169 */ "selcollist ::= sclp STAR", - /* 170 */ "as ::= AS ids", - /* 171 */ "as ::= ids", - /* 172 */ "as ::=", - /* 173 */ "distinct ::= DISTINCT", - /* 174 */ "distinct ::=", - /* 175 */ "from ::= FROM tablelist", - /* 176 */ "from ::= FROM sub", - /* 177 */ "sub ::= LP union RP", - /* 178 */ "sub ::= LP union RP ids", - /* 179 */ "sub ::= sub COMMA LP union RP ids", - /* 180 */ "tablelist ::= ids cpxName", - /* 181 */ "tablelist ::= ids cpxName ids", - /* 182 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 183 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 184 */ "tmvar ::= VARIABLE", - /* 185 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 186 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 187 */ "interval_opt ::=", - /* 188 */ "session_option ::=", - /* 189 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 190 */ "windowstate_option ::=", - /* 191 */ "windowstate_option ::= STATE_WINDOW LP ids RP", - /* 192 */ "fill_opt ::=", - /* 193 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 194 */ "fill_opt ::= FILL LP ID RP", - /* 195 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 196 */ "sliding_opt ::=", - /* 197 */ "orderby_opt ::=", - /* 198 */ "orderby_opt ::= ORDER BY sortlist", - /* 199 */ "sortlist ::= sortlist COMMA item sortorder", - /* 200 */ "sortlist ::= item sortorder", - /* 201 */ "item ::= ids cpxName", - /* 202 */ "sortorder ::= ASC", - /* 203 */ "sortorder ::= DESC", - /* 204 */ "sortorder ::=", - /* 205 */ "groupby_opt ::=", - /* 206 */ "groupby_opt ::= GROUP BY grouplist", - /* 207 */ "grouplist ::= grouplist COMMA item", - /* 208 */ "grouplist ::= item", - /* 209 */ "having_opt ::=", - /* 210 */ "having_opt ::= HAVING expr", - /* 211 */ "limit_opt ::=", - /* 212 */ "limit_opt ::= LIMIT signed", - /* 213 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 214 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 215 */ "slimit_opt ::=", - /* 216 */ "slimit_opt ::= SLIMIT signed", - /* 217 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 218 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 219 */ "where_opt ::=", - /* 220 */ "where_opt ::= WHERE expr", - /* 221 */ "expr ::= LP expr RP", - /* 222 */ "expr ::= ID", - /* 223 */ "expr ::= ID DOT ID", - /* 224 */ "expr ::= ID DOT STAR", - /* 225 */ "expr ::= INTEGER", - /* 226 */ "expr ::= MINUS INTEGER", - /* 227 */ "expr ::= PLUS INTEGER", - /* 228 */ "expr ::= FLOAT", - /* 229 */ "expr ::= MINUS FLOAT", - /* 230 */ "expr ::= PLUS FLOAT", - /* 231 */ "expr ::= STRING", - /* 232 */ "expr ::= NOW", - /* 233 */ "expr ::= VARIABLE", - /* 234 */ "expr ::= PLUS VARIABLE", - /* 235 */ "expr ::= MINUS VARIABLE", - /* 236 */ "expr ::= BOOL", - /* 237 */ "expr ::= NULL", - /* 238 */ "expr ::= ID LP exprlist RP", - /* 239 */ "expr ::= ID LP STAR RP", - /* 240 */ "expr ::= expr IS NULL", - /* 241 */ "expr ::= expr IS NOT NULL", - /* 242 */ "expr ::= expr LT expr", - /* 243 */ "expr ::= expr GT expr", - /* 244 */ "expr ::= expr LE expr", - /* 245 */ "expr ::= expr GE expr", - /* 246 */ "expr ::= expr NE expr", - /* 247 */ "expr ::= expr EQ expr", - /* 248 */ "expr ::= expr BETWEEN expr AND expr", - /* 249 */ "expr ::= expr AND expr", - /* 250 */ "expr ::= expr OR expr", - /* 251 */ "expr ::= expr PLUS expr", - /* 252 */ "expr ::= expr MINUS expr", - /* 253 */ "expr ::= expr STAR expr", - /* 254 */ "expr ::= expr SLASH expr", - /* 255 */ "expr ::= expr REM expr", - /* 256 */ "expr ::= expr LIKE expr", - /* 257 */ "expr ::= expr IN LP exprlist RP", - /* 258 */ "exprlist ::= exprlist COMMA expritem", - /* 259 */ "exprlist ::= expritem", - /* 260 */ "expritem ::= expr", - /* 261 */ "expritem ::=", - /* 262 */ "cmd ::= RESET QUERY CACHE", - /* 263 */ "cmd ::= SYNCDB ids REPLICA", - /* 264 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 265 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 266 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", - /* 267 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 268 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 269 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 270 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 271 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", - /* 272 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 273 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 274 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", - /* 275 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 276 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 277 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 278 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", - /* 279 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", - /* 280 */ "cmd ::= KILL CONNECTION INTEGER", - /* 281 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 282 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 156 */ "tagitem ::= NOW", + /* 157 */ "tagitem ::= MINUS INTEGER", + /* 158 */ "tagitem ::= MINUS FLOAT", + /* 159 */ "tagitem ::= PLUS INTEGER", + /* 160 */ "tagitem ::= PLUS FLOAT", + /* 161 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", + /* 162 */ "select ::= LP select RP", + /* 163 */ "union ::= select", + /* 164 */ "union ::= union UNION ALL select", + /* 165 */ "cmd ::= union", + /* 166 */ "select ::= SELECT selcollist", + /* 167 */ "sclp ::= selcollist COMMA", + /* 168 */ "sclp ::=", + /* 169 */ "selcollist ::= sclp distinct expr as", + /* 170 */ "selcollist ::= sclp STAR", + /* 171 */ "as ::= AS ids", + /* 172 */ "as ::= ids", + /* 173 */ "as ::=", + /* 174 */ "distinct ::= DISTINCT", + /* 175 */ "distinct ::=", + /* 176 */ "from ::= FROM tablelist", + /* 177 */ "from ::= FROM sub", + /* 178 */ "sub ::= LP union RP", + /* 179 */ "sub ::= LP union RP ids", + /* 180 */ "sub ::= sub COMMA LP union RP ids", + /* 181 */ "tablelist ::= ids cpxName", + /* 182 */ "tablelist ::= ids cpxName ids", + /* 183 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 184 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 185 */ "tmvar ::= VARIABLE", + /* 186 */ "interval_opt ::= INTERVAL LP tmvar RP", + /* 187 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 188 */ "interval_opt ::=", + /* 189 */ "session_option ::=", + /* 190 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 191 */ "windowstate_option ::=", + /* 192 */ "windowstate_option ::= STATE_WINDOW LP ids RP", + /* 193 */ "fill_opt ::=", + /* 194 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 195 */ "fill_opt ::= FILL LP ID RP", + /* 196 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 197 */ "sliding_opt ::=", + /* 198 */ "orderby_opt ::=", + /* 199 */ "orderby_opt ::= ORDER BY sortlist", + /* 200 */ "sortlist ::= sortlist COMMA item sortorder", + /* 201 */ "sortlist ::= item sortorder", + /* 202 */ "item ::= ids cpxName", + /* 203 */ "sortorder ::= ASC", + /* 204 */ "sortorder ::= DESC", + /* 205 */ "sortorder ::=", + /* 206 */ "groupby_opt ::=", + /* 207 */ "groupby_opt ::= GROUP BY grouplist", + /* 208 */ "grouplist ::= grouplist COMMA item", + /* 209 */ "grouplist ::= item", + /* 210 */ "having_opt ::=", + /* 211 */ "having_opt ::= HAVING expr", + /* 212 */ "limit_opt ::=", + /* 213 */ "limit_opt ::= LIMIT signed", + /* 214 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 215 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 216 */ "slimit_opt ::=", + /* 217 */ "slimit_opt ::= SLIMIT signed", + /* 218 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 219 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 220 */ "where_opt ::=", + /* 221 */ "where_opt ::= WHERE expr", + /* 222 */ "expr ::= LP expr RP", + /* 223 */ "expr ::= ID", + /* 224 */ "expr ::= ID DOT ID", + /* 225 */ "expr ::= ID DOT STAR", + /* 226 */ "expr ::= INTEGER", + /* 227 */ "expr ::= MINUS INTEGER", + /* 228 */ "expr ::= PLUS INTEGER", + /* 229 */ "expr ::= FLOAT", + /* 230 */ "expr ::= MINUS FLOAT", + /* 231 */ "expr ::= PLUS FLOAT", + /* 232 */ "expr ::= STRING", + /* 233 */ "expr ::= NOW", + /* 234 */ "expr ::= VARIABLE", + /* 235 */ "expr ::= PLUS VARIABLE", + /* 236 */ "expr ::= MINUS VARIABLE", + /* 237 */ "expr ::= BOOL", + /* 238 */ "expr ::= NULL", + /* 239 */ "expr ::= ID LP exprlist RP", + /* 240 */ "expr ::= ID LP STAR RP", + /* 241 */ "expr ::= expr IS NULL", + /* 242 */ "expr ::= expr IS NOT NULL", + /* 243 */ "expr ::= expr LT expr", + /* 244 */ "expr ::= expr GT expr", + /* 245 */ "expr ::= expr LE expr", + /* 246 */ "expr ::= expr GE expr", + /* 247 */ "expr ::= expr NE expr", + /* 248 */ "expr ::= expr EQ expr", + /* 249 */ "expr ::= expr BETWEEN expr AND expr", + /* 250 */ "expr ::= expr AND expr", + /* 251 */ "expr ::= expr OR expr", + /* 252 */ "expr ::= expr PLUS expr", + /* 253 */ "expr ::= expr MINUS expr", + /* 254 */ "expr ::= expr STAR expr", + /* 255 */ "expr ::= expr SLASH expr", + /* 256 */ "expr ::= expr REM expr", + /* 257 */ "expr ::= expr LIKE expr", + /* 258 */ "expr ::= expr IN LP exprlist RP", + /* 259 */ "exprlist ::= exprlist COMMA expritem", + /* 260 */ "exprlist ::= expritem", + /* 261 */ "expritem ::= expr", + /* 262 */ "expritem ::=", + /* 263 */ "cmd ::= RESET QUERY CACHE", + /* 264 */ "cmd ::= SYNCDB ids REPLICA", + /* 265 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 266 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 267 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", + /* 268 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 269 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 270 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 271 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 272 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", + /* 273 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 274 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 275 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", + /* 276 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 277 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 278 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 279 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", + /* 280 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", + /* 281 */ "cmd ::= KILL CONNECTION INTEGER", + /* 282 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 283 */ "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 @@ -1414,21 +1144,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 */ @@ -1444,10 +1180,9 @@ 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 211: /* intitemlist */ case 213: /* keep */ case 235: /* columnlist */ @@ -1504,7 +1239,6 @@ destroyAllSqlNode((yypminor->yy93)); tVariantDestroy(&(yypminor->yy518)); } break; -/********* End destructor definitions *****************************************/ default: break; /* If no destructor action specified: do nothing */ } } @@ -1514,53 +1248,51 @@ tVariantDestroy(&(yypminor->yy518)); ** ** 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. @@ -1568,70 +1300,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 */ @@ -1694,6 +1390,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 @@ -1710,42 +1407,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. */ @@ -1753,331 +1428,336 @@ 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[] = { - { 190, -1 }, /* (0) program ::= cmd */ - { 191, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 191, -2 }, /* (2) cmd ::= SHOW TOPICS */ - { 191, -2 }, /* (3) cmd ::= SHOW MNODES */ - { 191, -2 }, /* (4) cmd ::= SHOW DNODES */ - { 191, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ - { 191, -2 }, /* (6) cmd ::= SHOW USERS */ - { 191, -2 }, /* (7) cmd ::= SHOW MODULES */ - { 191, -2 }, /* (8) cmd ::= SHOW QUERIES */ - { 191, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ - { 191, -2 }, /* (10) cmd ::= SHOW STREAMS */ - { 191, -2 }, /* (11) cmd ::= SHOW VARIABLES */ - { 191, -2 }, /* (12) cmd ::= SHOW SCORES */ - { 191, -2 }, /* (13) cmd ::= SHOW GRANTS */ - { 191, -2 }, /* (14) cmd ::= SHOW VNODES */ - { 191, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ - { 192, 0 }, /* (16) dbPrefix ::= */ - { 192, -2 }, /* (17) dbPrefix ::= ids DOT */ - { 194, 0 }, /* (18) cpxName ::= */ - { 194, -2 }, /* (19) cpxName ::= DOT ids */ - { 191, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 191, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */ - { 191, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */ - { 191, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */ - { 191, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 191, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */ - { 191, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 191, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ - { 191, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 191, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ - { 191, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ - { 191, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */ - { 191, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */ - { 191, -3 }, /* (33) cmd ::= DROP DNODE ids */ - { 191, -3 }, /* (34) cmd ::= DROP USER ids */ - { 191, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */ - { 191, -2 }, /* (36) cmd ::= USE ids */ - { 191, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */ - { 191, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */ - { 191, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 191, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */ - { 191, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */ - { 191, -3 }, /* (42) cmd ::= ALTER LOCAL ids */ - { 191, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */ - { 191, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 191, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */ - { 191, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 191, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 193, -1 }, /* (48) ids ::= ID */ - { 193, -1 }, /* (49) ids ::= STRING */ - { 195, -2 }, /* (50) ifexists ::= IF EXISTS */ - { 195, 0 }, /* (51) ifexists ::= */ - { 199, -3 }, /* (52) ifnotexists ::= IF NOT EXISTS */ - { 199, 0 }, /* (53) ifnotexists ::= */ - { 191, -3 }, /* (54) cmd ::= CREATE DNODE ids */ - { 191, -6 }, /* (55) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 191, -5 }, /* (56) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 191, -5 }, /* (57) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - { 191, -5 }, /* (58) cmd ::= CREATE USER ids PASS ids */ - { 202, 0 }, /* (59) pps ::= */ - { 202, -2 }, /* (60) pps ::= PPS INTEGER */ - { 203, 0 }, /* (61) tseries ::= */ - { 203, -2 }, /* (62) tseries ::= TSERIES INTEGER */ - { 204, 0 }, /* (63) dbs ::= */ - { 204, -2 }, /* (64) dbs ::= DBS INTEGER */ - { 205, 0 }, /* (65) streams ::= */ - { 205, -2 }, /* (66) streams ::= STREAMS INTEGER */ - { 206, 0 }, /* (67) storage ::= */ - { 206, -2 }, /* (68) storage ::= STORAGE INTEGER */ - { 207, 0 }, /* (69) qtime ::= */ - { 207, -2 }, /* (70) qtime ::= QTIME INTEGER */ - { 208, 0 }, /* (71) users ::= */ - { 208, -2 }, /* (72) users ::= USERS INTEGER */ - { 209, 0 }, /* (73) conns ::= */ - { 209, -2 }, /* (74) conns ::= CONNS INTEGER */ - { 210, 0 }, /* (75) state ::= */ - { 210, -2 }, /* (76) state ::= STATE ids */ - { 198, -9 }, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 211, -3 }, /* (78) intitemlist ::= intitemlist COMMA intitem */ - { 211, -1 }, /* (79) intitemlist ::= intitem */ - { 212, -1 }, /* (80) intitem ::= INTEGER */ - { 213, -2 }, /* (81) keep ::= KEEP intitemlist */ - { 214, -2 }, /* (82) cache ::= CACHE INTEGER */ - { 215, -2 }, /* (83) replica ::= REPLICA INTEGER */ - { 216, -2 }, /* (84) quorum ::= QUORUM INTEGER */ - { 217, -2 }, /* (85) days ::= DAYS INTEGER */ - { 218, -2 }, /* (86) minrows ::= MINROWS INTEGER */ - { 219, -2 }, /* (87) maxrows ::= MAXROWS INTEGER */ - { 220, -2 }, /* (88) blocks ::= BLOCKS INTEGER */ - { 221, -2 }, /* (89) ctime ::= CTIME INTEGER */ - { 222, -2 }, /* (90) wal ::= WAL INTEGER */ - { 223, -2 }, /* (91) fsync ::= FSYNC INTEGER */ - { 224, -2 }, /* (92) comp ::= COMP INTEGER */ - { 225, -2 }, /* (93) prec ::= PRECISION STRING */ - { 226, -2 }, /* (94) update ::= UPDATE INTEGER */ - { 227, -2 }, /* (95) cachelast ::= CACHELAST INTEGER */ - { 228, -2 }, /* (96) partitions ::= PARTITIONS INTEGER */ - { 200, 0 }, /* (97) db_optr ::= */ - { 200, -2 }, /* (98) db_optr ::= db_optr cache */ - { 200, -2 }, /* (99) db_optr ::= db_optr replica */ - { 200, -2 }, /* (100) db_optr ::= db_optr quorum */ - { 200, -2 }, /* (101) db_optr ::= db_optr days */ - { 200, -2 }, /* (102) db_optr ::= db_optr minrows */ - { 200, -2 }, /* (103) db_optr ::= db_optr maxrows */ - { 200, -2 }, /* (104) db_optr ::= db_optr blocks */ - { 200, -2 }, /* (105) db_optr ::= db_optr ctime */ - { 200, -2 }, /* (106) db_optr ::= db_optr wal */ - { 200, -2 }, /* (107) db_optr ::= db_optr fsync */ - { 200, -2 }, /* (108) db_optr ::= db_optr comp */ - { 200, -2 }, /* (109) db_optr ::= db_optr prec */ - { 200, -2 }, /* (110) db_optr ::= db_optr keep */ - { 200, -2 }, /* (111) db_optr ::= db_optr update */ - { 200, -2 }, /* (112) db_optr ::= db_optr cachelast */ - { 201, -1 }, /* (113) topic_optr ::= db_optr */ - { 201, -2 }, /* (114) topic_optr ::= topic_optr partitions */ - { 196, 0 }, /* (115) alter_db_optr ::= */ - { 196, -2 }, /* (116) alter_db_optr ::= alter_db_optr replica */ - { 196, -2 }, /* (117) alter_db_optr ::= alter_db_optr quorum */ - { 196, -2 }, /* (118) alter_db_optr ::= alter_db_optr keep */ - { 196, -2 }, /* (119) alter_db_optr ::= alter_db_optr blocks */ - { 196, -2 }, /* (120) alter_db_optr ::= alter_db_optr comp */ - { 196, -2 }, /* (121) alter_db_optr ::= alter_db_optr wal */ - { 196, -2 }, /* (122) alter_db_optr ::= alter_db_optr fsync */ - { 196, -2 }, /* (123) alter_db_optr ::= alter_db_optr update */ - { 196, -2 }, /* (124) alter_db_optr ::= alter_db_optr cachelast */ - { 197, -1 }, /* (125) alter_topic_optr ::= alter_db_optr */ - { 197, -2 }, /* (126) alter_topic_optr ::= alter_topic_optr partitions */ - { 229, -1 }, /* (127) typename ::= ids */ - { 229, -4 }, /* (128) typename ::= ids LP signed RP */ - { 229, -2 }, /* (129) typename ::= ids UNSIGNED */ - { 230, -1 }, /* (130) signed ::= INTEGER */ - { 230, -2 }, /* (131) signed ::= PLUS INTEGER */ - { 230, -2 }, /* (132) signed ::= MINUS INTEGER */ - { 191, -3 }, /* (133) cmd ::= CREATE TABLE create_table_args */ - { 191, -3 }, /* (134) cmd ::= CREATE TABLE create_stable_args */ - { 191, -3 }, /* (135) cmd ::= CREATE STABLE create_stable_args */ - { 191, -3 }, /* (136) cmd ::= CREATE TABLE create_table_list */ - { 233, -1 }, /* (137) create_table_list ::= create_from_stable */ - { 233, -2 }, /* (138) create_table_list ::= create_table_list create_from_stable */ - { 231, -6 }, /* (139) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 232, -10 }, /* (140) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 234, -10 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 234, -13 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 237, -3 }, /* (143) tagNamelist ::= tagNamelist COMMA ids */ - { 237, -1 }, /* (144) tagNamelist ::= ids */ - { 231, -5 }, /* (145) create_table_args ::= ifnotexists ids cpxName AS select */ - { 235, -3 }, /* (146) columnlist ::= columnlist COMMA column */ - { 235, -1 }, /* (147) columnlist ::= column */ - { 239, -2 }, /* (148) column ::= ids typename */ - { 236, -3 }, /* (149) tagitemlist ::= tagitemlist COMMA tagitem */ - { 236, -1 }, /* (150) tagitemlist ::= tagitem */ - { 240, -1 }, /* (151) tagitem ::= INTEGER */ - { 240, -1 }, /* (152) tagitem ::= FLOAT */ - { 240, -1 }, /* (153) tagitem ::= STRING */ - { 240, -1 }, /* (154) tagitem ::= BOOL */ - { 240, -1 }, /* (155) tagitem ::= NULL */ - { 240, -2 }, /* (156) tagitem ::= MINUS INTEGER */ - { 240, -2 }, /* (157) tagitem ::= MINUS FLOAT */ - { 240, -2 }, /* (158) tagitem ::= PLUS INTEGER */ - { 240, -2 }, /* (159) tagitem ::= PLUS FLOAT */ - { 238, -14 }, /* (160) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - { 238, -3 }, /* (161) select ::= LP select RP */ - { 254, -1 }, /* (162) union ::= select */ - { 254, -4 }, /* (163) union ::= union UNION ALL select */ - { 191, -1 }, /* (164) cmd ::= union */ - { 238, -2 }, /* (165) select ::= SELECT selcollist */ - { 255, -2 }, /* (166) sclp ::= selcollist COMMA */ - { 255, 0 }, /* (167) sclp ::= */ - { 241, -4 }, /* (168) selcollist ::= sclp distinct expr as */ - { 241, -2 }, /* (169) selcollist ::= sclp STAR */ - { 258, -2 }, /* (170) as ::= AS ids */ - { 258, -1 }, /* (171) as ::= ids */ - { 258, 0 }, /* (172) as ::= */ - { 256, -1 }, /* (173) distinct ::= DISTINCT */ - { 256, 0 }, /* (174) distinct ::= */ - { 242, -2 }, /* (175) from ::= FROM tablelist */ - { 242, -2 }, /* (176) from ::= FROM sub */ - { 260, -3 }, /* (177) sub ::= LP union RP */ - { 260, -4 }, /* (178) sub ::= LP union RP ids */ - { 260, -6 }, /* (179) sub ::= sub COMMA LP union RP ids */ - { 259, -2 }, /* (180) tablelist ::= ids cpxName */ - { 259, -3 }, /* (181) tablelist ::= ids cpxName ids */ - { 259, -4 }, /* (182) tablelist ::= tablelist COMMA ids cpxName */ - { 259, -5 }, /* (183) tablelist ::= tablelist COMMA ids cpxName ids */ - { 261, -1 }, /* (184) tmvar ::= VARIABLE */ - { 244, -4 }, /* (185) interval_opt ::= INTERVAL LP tmvar RP */ - { 244, -6 }, /* (186) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 244, 0 }, /* (187) interval_opt ::= */ - { 245, 0 }, /* (188) session_option ::= */ - { 245, -7 }, /* (189) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 246, 0 }, /* (190) windowstate_option ::= */ - { 246, -4 }, /* (191) windowstate_option ::= STATE_WINDOW LP ids RP */ - { 247, 0 }, /* (192) fill_opt ::= */ - { 247, -6 }, /* (193) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 247, -4 }, /* (194) fill_opt ::= FILL LP ID RP */ - { 248, -4 }, /* (195) sliding_opt ::= SLIDING LP tmvar RP */ - { 248, 0 }, /* (196) sliding_opt ::= */ - { 250, 0 }, /* (197) orderby_opt ::= */ - { 250, -3 }, /* (198) orderby_opt ::= ORDER BY sortlist */ - { 262, -4 }, /* (199) sortlist ::= sortlist COMMA item sortorder */ - { 262, -2 }, /* (200) sortlist ::= item sortorder */ - { 264, -2 }, /* (201) item ::= ids cpxName */ - { 265, -1 }, /* (202) sortorder ::= ASC */ - { 265, -1 }, /* (203) sortorder ::= DESC */ - { 265, 0 }, /* (204) sortorder ::= */ - { 249, 0 }, /* (205) groupby_opt ::= */ - { 249, -3 }, /* (206) groupby_opt ::= GROUP BY grouplist */ - { 266, -3 }, /* (207) grouplist ::= grouplist COMMA item */ - { 266, -1 }, /* (208) grouplist ::= item */ - { 251, 0 }, /* (209) having_opt ::= */ - { 251, -2 }, /* (210) having_opt ::= HAVING expr */ - { 253, 0 }, /* (211) limit_opt ::= */ - { 253, -2 }, /* (212) limit_opt ::= LIMIT signed */ - { 253, -4 }, /* (213) limit_opt ::= LIMIT signed OFFSET signed */ - { 253, -4 }, /* (214) limit_opt ::= LIMIT signed COMMA signed */ - { 252, 0 }, /* (215) slimit_opt ::= */ - { 252, -2 }, /* (216) slimit_opt ::= SLIMIT signed */ - { 252, -4 }, /* (217) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 252, -4 }, /* (218) slimit_opt ::= SLIMIT signed COMMA signed */ - { 243, 0 }, /* (219) where_opt ::= */ - { 243, -2 }, /* (220) where_opt ::= WHERE expr */ - { 257, -3 }, /* (221) expr ::= LP expr RP */ - { 257, -1 }, /* (222) expr ::= ID */ - { 257, -3 }, /* (223) expr ::= ID DOT ID */ - { 257, -3 }, /* (224) expr ::= ID DOT STAR */ - { 257, -1 }, /* (225) expr ::= INTEGER */ - { 257, -2 }, /* (226) expr ::= MINUS INTEGER */ - { 257, -2 }, /* (227) expr ::= PLUS INTEGER */ - { 257, -1 }, /* (228) expr ::= FLOAT */ - { 257, -2 }, /* (229) expr ::= MINUS FLOAT */ - { 257, -2 }, /* (230) expr ::= PLUS FLOAT */ - { 257, -1 }, /* (231) expr ::= STRING */ - { 257, -1 }, /* (232) expr ::= NOW */ - { 257, -1 }, /* (233) expr ::= VARIABLE */ - { 257, -2 }, /* (234) expr ::= PLUS VARIABLE */ - { 257, -2 }, /* (235) expr ::= MINUS VARIABLE */ - { 257, -1 }, /* (236) expr ::= BOOL */ - { 257, -1 }, /* (237) expr ::= NULL */ - { 257, -4 }, /* (238) expr ::= ID LP exprlist RP */ - { 257, -4 }, /* (239) expr ::= ID LP STAR RP */ - { 257, -3 }, /* (240) expr ::= expr IS NULL */ - { 257, -4 }, /* (241) expr ::= expr IS NOT NULL */ - { 257, -3 }, /* (242) expr ::= expr LT expr */ - { 257, -3 }, /* (243) expr ::= expr GT expr */ - { 257, -3 }, /* (244) expr ::= expr LE expr */ - { 257, -3 }, /* (245) expr ::= expr GE expr */ - { 257, -3 }, /* (246) expr ::= expr NE expr */ - { 257, -3 }, /* (247) expr ::= expr EQ expr */ - { 257, -5 }, /* (248) expr ::= expr BETWEEN expr AND expr */ - { 257, -3 }, /* (249) expr ::= expr AND expr */ - { 257, -3 }, /* (250) expr ::= expr OR expr */ - { 257, -3 }, /* (251) expr ::= expr PLUS expr */ - { 257, -3 }, /* (252) expr ::= expr MINUS expr */ - { 257, -3 }, /* (253) expr ::= expr STAR expr */ - { 257, -3 }, /* (254) expr ::= expr SLASH expr */ - { 257, -3 }, /* (255) expr ::= expr REM expr */ - { 257, -3 }, /* (256) expr ::= expr LIKE expr */ - { 257, -5 }, /* (257) expr ::= expr IN LP exprlist RP */ - { 267, -3 }, /* (258) exprlist ::= exprlist COMMA expritem */ - { 267, -1 }, /* (259) exprlist ::= expritem */ - { 268, -1 }, /* (260) expritem ::= expr */ - { 268, 0 }, /* (261) expritem ::= */ - { 191, -3 }, /* (262) cmd ::= RESET QUERY CACHE */ - { 191, -3 }, /* (263) cmd ::= SYNCDB ids REPLICA */ - { 191, -7 }, /* (264) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 191, -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 191, -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - { 191, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 191, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 191, -8 }, /* (269) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 191, -9 }, /* (270) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 191, -7 }, /* (271) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - { 191, -7 }, /* (272) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 191, -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 191, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - { 191, -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 191, -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 191, -8 }, /* (277) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 191, -9 }, /* (278) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - { 191, -7 }, /* (279) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - { 191, -3 }, /* (280) cmd ::= KILL CONNECTION INTEGER */ - { 191, -5 }, /* (281) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 191, -5 }, /* (282) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 190, 1 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 2 }, + { 191, 3 }, + { 192, 0 }, + { 192, 2 }, + { 194, 0 }, + { 194, 2 }, + { 191, 5 }, + { 191, 5 }, + { 191, 4 }, + { 191, 3 }, + { 191, 5 }, + { 191, 3 }, + { 191, 5 }, + { 191, 3 }, + { 191, 4 }, + { 191, 5 }, + { 191, 5 }, + { 191, 4 }, + { 191, 4 }, + { 191, 3 }, + { 191, 3 }, + { 191, 3 }, + { 191, 2 }, + { 191, 3 }, + { 191, 5 }, + { 191, 5 }, + { 191, 4 }, + { 191, 5 }, + { 191, 3 }, + { 191, 4 }, + { 191, 4 }, + { 191, 4 }, + { 191, 4 }, + { 191, 6 }, + { 193, 1 }, + { 193, 1 }, + { 195, 2 }, + { 195, 0 }, + { 199, 3 }, + { 199, 0 }, + { 191, 3 }, + { 191, 6 }, + { 191, 5 }, + { 191, 5 }, + { 191, 5 }, + { 202, 0 }, + { 202, 2 }, + { 203, 0 }, + { 203, 2 }, + { 204, 0 }, + { 204, 2 }, + { 205, 0 }, + { 205, 2 }, + { 206, 0 }, + { 206, 2 }, + { 207, 0 }, + { 207, 2 }, + { 208, 0 }, + { 208, 2 }, + { 209, 0 }, + { 209, 2 }, + { 210, 0 }, + { 210, 2 }, + { 198, 9 }, + { 211, 3 }, + { 211, 1 }, + { 212, 1 }, + { 213, 2 }, + { 214, 2 }, + { 215, 2 }, + { 216, 2 }, + { 217, 2 }, + { 218, 2 }, + { 219, 2 }, + { 220, 2 }, + { 221, 2 }, + { 222, 2 }, + { 223, 2 }, + { 224, 2 }, + { 225, 2 }, + { 226, 2 }, + { 227, 2 }, + { 228, 2 }, + { 200, 0 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 201, 1 }, + { 201, 2 }, + { 196, 0 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 196, 2 }, + { 197, 1 }, + { 197, 2 }, + { 229, 1 }, + { 229, 4 }, + { 229, 2 }, + { 230, 1 }, + { 230, 2 }, + { 230, 2 }, + { 191, 3 }, + { 191, 3 }, + { 191, 3 }, + { 191, 3 }, + { 233, 1 }, + { 233, 2 }, + { 231, 6 }, + { 232, 10 }, + { 234, 10 }, + { 234, 13 }, + { 237, 3 }, + { 237, 1 }, + { 231, 5 }, + { 235, 3 }, + { 235, 1 }, + { 239, 2 }, + { 236, 3 }, + { 236, 1 }, + { 240, 1 }, + { 240, 1 }, + { 240, 1 }, + { 240, 1 }, + { 240, 1 }, + { 240, 1 }, + { 240, 2 }, + { 240, 2 }, + { 240, 2 }, + { 240, 2 }, + { 238, 14 }, + { 238, 3 }, + { 254, 1 }, + { 254, 4 }, + { 191, 1 }, + { 238, 2 }, + { 255, 2 }, + { 255, 0 }, + { 241, 4 }, + { 241, 2 }, + { 258, 2 }, + { 258, 1 }, + { 258, 0 }, + { 256, 1 }, + { 256, 0 }, + { 242, 2 }, + { 242, 2 }, + { 260, 3 }, + { 260, 4 }, + { 260, 6 }, + { 259, 2 }, + { 259, 3 }, + { 259, 4 }, + { 259, 5 }, + { 261, 1 }, + { 244, 4 }, + { 244, 6 }, + { 244, 0 }, + { 245, 0 }, + { 245, 7 }, + { 246, 0 }, + { 246, 4 }, + { 247, 0 }, + { 247, 6 }, + { 247, 4 }, + { 248, 4 }, + { 248, 0 }, + { 250, 0 }, + { 250, 3 }, + { 262, 4 }, + { 262, 2 }, + { 264, 2 }, + { 265, 1 }, + { 265, 1 }, + { 265, 0 }, + { 249, 0 }, + { 249, 3 }, + { 266, 3 }, + { 266, 1 }, + { 251, 0 }, + { 251, 2 }, + { 253, 0 }, + { 253, 2 }, + { 253, 4 }, + { 253, 4 }, + { 252, 0 }, + { 252, 2 }, + { 252, 4 }, + { 252, 4 }, + { 243, 0 }, + { 243, 2 }, + { 257, 3 }, + { 257, 1 }, + { 257, 3 }, + { 257, 3 }, + { 257, 1 }, + { 257, 2 }, + { 257, 2 }, + { 257, 1 }, + { 257, 2 }, + { 257, 2 }, + { 257, 1 }, + { 257, 1 }, + { 257, 1 }, + { 257, 2 }, + { 257, 2 }, + { 257, 1 }, + { 257, 1 }, + { 257, 4 }, + { 257, 4 }, + { 257, 3 }, + { 257, 4 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 5 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 3 }, + { 257, 5 }, + { 267, 3 }, + { 267, 1 }, + { 268, 1 }, + { 268, 0 }, + { 191, 3 }, + { 191, 3 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 8 }, + { 191, 9 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 7 }, + { 191, 8 }, + { 191, 9 }, + { 191, 7 }, + { 191, 3 }, + { 191, 5 }, + { 191, 5 }, }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2085,66 +1765,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 @@ -2155,12 +1812,7 @@ static void yy_reduce( ** #line ** break; */ -/********** Begin reduce actions **********************************************/ - YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ - case 133: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==133); - case 134: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==134); - case 135: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==135); {} break; case 1: /* cmd ::= SHOW DATABASES */ @@ -2209,17 +1861,16 @@ static void yy_reduce( { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); } break; case 16: /* dbPrefix ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;} +{yygotominor.yy0.n = 0; yygotominor.yy0.type = 0;} break; case 17: /* dbPrefix ::= ids DOT */ -{yylhsminor.yy0 = yymsp[-1].minor.yy0; } - yymsp[-1].minor.yy0 = yylhsminor.yy0; +{yygotominor.yy0 = yymsp[-1].minor.yy0; } break; case 18: /* cpxName ::= */ -{yymsp[1].minor.yy0.n = 0; } +{yygotominor.yy0.n = 0; } break; case 19: /* cpxName ::= DOT ids */ -{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1; } +{yygotominor.yy0 = yymsp[0].minor.yy0; yygotominor.yy0.n += 1; } break; case 20: /* cmd ::= SHOW CREATE TABLE ids cpxName */ { @@ -2340,19 +1991,16 @@ static void yy_reduce( break; case 48: /* ids ::= ID */ case 49: /* ids ::= STRING */ yytestcase(yyruleno==49); -{yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; +{yygotominor.yy0 = yymsp[0].minor.yy0; } break; case 50: /* ifexists ::= IF EXISTS */ -{ yymsp[-1].minor.yy0.n = 1;} + case 52: /* ifnotexists ::= IF NOT EXISTS */ yytestcase(yyruleno==52); +{ yygotominor.yy0.n = 1;} break; case 51: /* ifexists ::= */ case 53: /* ifnotexists ::= */ yytestcase(yyruleno==53); - case 174: /* distinct ::= */ yytestcase(yyruleno==174); -{ yymsp[1].minor.yy0.n = 0;} - break; - case 52: /* ifnotexists ::= IF NOT EXISTS */ -{ yymsp[-2].minor.yy0.n = 1;} + case 175: /* distinct ::= */ yytestcase(yyruleno==175); +{ yygotominor.yy0.n = 0;} break; case 54: /* cmd ::= CREATE DNODE ids */ { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} @@ -2376,7 +2024,7 @@ static void yy_reduce( case 71: /* users ::= */ yytestcase(yyruleno==71); case 73: /* conns ::= */ yytestcase(yyruleno==73); case 75: /* state ::= */ yytestcase(yyruleno==75); -{ yymsp[1].minor.yy0.n = 0; } +{ yygotominor.yy0.n = 0; } break; case 60: /* pps ::= PPS INTEGER */ case 62: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==62); @@ -2387,42 +2035,38 @@ static void yy_reduce( case 72: /* users ::= USERS INTEGER */ yytestcase(yyruleno==72); case 74: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==74); case 76: /* state ::= STATE ids */ yytestcase(yyruleno==76); -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } +{ yygotominor.yy0 = yymsp[0].minor.yy0; } break; case 77: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy77.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy77.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy77.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy77.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy77.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy77.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy77.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy77.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy77.stat = yymsp[0].minor.yy0; + yygotominor.yy77.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yygotominor.yy77.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yygotominor.yy77.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yygotominor.yy77.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yygotominor.yy77.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yygotominor.yy77.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yygotominor.yy77.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yygotominor.yy77.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yygotominor.yy77.stat = yymsp[0].minor.yy0; } - yymsp[-8].minor.yy77 = yylhsminor.yy77; break; case 78: /* intitemlist ::= intitemlist COMMA intitem */ case 149: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==149); -{ yylhsminor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1); } - yymsp[-2].minor.yy93 = yylhsminor.yy93; +{ yygotominor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1); } break; case 79: /* intitemlist ::= intitem */ case 150: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==150); -{ yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); } - yymsp[0].minor.yy93 = yylhsminor.yy93; +{ yygotominor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); } break; case 80: /* intitem ::= INTEGER */ case 151: /* tagitem ::= INTEGER */ yytestcase(yyruleno==151); case 152: /* tagitem ::= FLOAT */ yytestcase(yyruleno==152); case 153: /* tagitem ::= STRING */ yytestcase(yyruleno==153); case 154: /* tagitem ::= BOOL */ yytestcase(yyruleno==154); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy518, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy518 = yylhsminor.yy518; +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yygotominor.yy518, &yymsp[0].minor.yy0); } break; case 81: /* keep ::= KEEP intitemlist */ -{ yymsp[-1].minor.yy93 = yymsp[0].minor.yy93; } +{ yygotominor.yy93 = yymsp[0].minor.yy93; } break; case 82: /* cache ::= CACHE INTEGER */ case 83: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==83); @@ -2439,129 +2083,109 @@ static void yy_reduce( case 94: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==94); case 95: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==95); case 96: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==96); -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } +{ yygotominor.yy0 = yymsp[0].minor.yy0; } break; case 97: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy372); yymsp[1].minor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;} +{setDefaultCreateDbOption(&yygotominor.yy372); yygotominor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 98: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 99: /* db_optr ::= db_optr replica */ case 116: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==116); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 100: /* db_optr ::= db_optr quorum */ case 117: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==117); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 101: /* db_optr ::= db_optr days */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 102: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } break; case 103: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } break; case 104: /* db_optr ::= db_optr blocks */ case 119: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==119); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 105: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 106: /* db_optr ::= db_optr wal */ case 121: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==121); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 107: /* db_optr ::= db_optr fsync */ case 122: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==122); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 108: /* db_optr ::= db_optr comp */ case 120: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==120); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 109: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.precision = yymsp[0].minor.yy0; } break; case 110: /* db_optr ::= db_optr keep */ case 118: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==118); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.keep = yymsp[0].minor.yy93; } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.keep = yymsp[0].minor.yy93; } break; case 111: /* db_optr ::= db_optr update */ case 123: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==123); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 112: /* db_optr ::= db_optr cachelast */ case 124: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==124); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 113: /* topic_optr ::= db_optr */ case 125: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==125); -{ yylhsminor.yy372 = yymsp[0].minor.yy372; yylhsminor.yy372.dbType = TSDB_DB_TYPE_TOPIC; } - yymsp[0].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[0].minor.yy372; yygotominor.yy372.dbType = TSDB_DB_TYPE_TOPIC; } break; case 114: /* topic_optr ::= topic_optr partitions */ case 126: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==126); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; +{ yygotominor.yy372 = yymsp[-1].minor.yy372; yygotominor.yy372.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 115: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy372); yymsp[1].minor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;} +{ setDefaultCreateDbOption(&yygotominor.yy372); yygotominor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 127: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yylhsminor.yy325, &yymsp[0].minor.yy0); + tSetColumnType (&yygotominor.yy325, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy325 = yylhsminor.yy325; break; case 128: /* typename ::= ids LP signed RP */ { if (yymsp[-1].minor.yy279 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yylhsminor.yy325, &yymsp[-3].minor.yy0); + tSetColumnType(&yygotominor.yy325, &yymsp[-3].minor.yy0); } else { yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy279; // negative value of name length - tSetColumnType(&yylhsminor.yy325, &yymsp[-3].minor.yy0); + tSetColumnType(&yygotominor.yy325, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy325 = yylhsminor.yy325; break; case 129: /* typename ::= ids UNSIGNED */ { yymsp[-1].minor.yy0.type = 0; yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z); - tSetColumnType (&yylhsminor.yy325, &yymsp[-1].minor.yy0); + tSetColumnType (&yygotominor.yy325, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy325 = yylhsminor.yy325; break; case 130: /* signed ::= INTEGER */ -{ yylhsminor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy279 = yylhsminor.yy279; - break; - case 131: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + case 131: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==131); +{ yygotominor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 132: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy279 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} + case 133: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==133); + case 134: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==134); + case 135: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==135); +{ yygotominor.yy279 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 136: /* cmd ::= CREATE TABLE create_table_list */ { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy532;} @@ -2573,503 +2197,429 @@ static void yy_reduce( taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy528); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy532 = pCreateTable; + yygotominor.yy532 = pCreateTable; } - yymsp[0].minor.yy532 = yylhsminor.yy532; break; case 138: /* create_table_list ::= create_table_list create_from_stable */ { taosArrayPush(yymsp[-1].minor.yy532->childTableInfo, &yymsp[0].minor.yy528); - yylhsminor.yy532 = yymsp[-1].minor.yy532; + yygotominor.yy532 = yymsp[-1].minor.yy532; } - yymsp[-1].minor.yy532 = yylhsminor.yy532; break; case 139: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy532 = tSetCreateTableInfo(yymsp[-1].minor.yy93, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy532 = tSetCreateTableInfo(yymsp[-1].minor.yy93, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yygotominor.yy532, 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.yy532 = yylhsminor.yy532; break; case 140: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy532 = tSetCreateTableInfo(yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy532 = tSetCreateTableInfo(yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yygotominor.yy532, 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.yy532 = yylhsminor.yy532; break; case 141: /* 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.yy528 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy93, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yygotominor.yy528 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy93, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy528 = yylhsminor.yy528; break; case 142: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ { yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n; - yylhsminor.yy528 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yygotominor.yy528 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy528 = yylhsminor.yy528; break; case 143: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy0); yylhsminor.yy93 = yymsp[-2].minor.yy93; } - yymsp[-2].minor.yy93 = yylhsminor.yy93; +{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy0); yygotominor.yy93 = yymsp[-2].minor.yy93; } break; case 144: /* tagNamelist ::= ids */ -{yylhsminor.yy93 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy93, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy93 = yylhsminor.yy93; +{yygotominor.yy93 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yygotominor.yy93, &yymsp[0].minor.yy0);} break; case 145: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy532 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy224, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy532 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy224, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yygotominor.yy532, 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.yy532 = yylhsminor.yy532; break; case 146: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy325); yylhsminor.yy93 = yymsp[-2].minor.yy93; } - yymsp[-2].minor.yy93 = yylhsminor.yy93; +{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy325); yygotominor.yy93 = yymsp[-2].minor.yy93; } break; case 147: /* columnlist ::= column */ -{yylhsminor.yy93 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy93, &yymsp[0].minor.yy325);} - yymsp[0].minor.yy93 = yylhsminor.yy93; +{yygotominor.yy93 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yygotominor.yy93, &yymsp[0].minor.yy325);} break; case 148: /* column ::= ids typename */ { - tSetColumnInfo(&yylhsminor.yy325, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy325); + tSetColumnInfo(&yygotominor.yy325, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy325); } - yymsp[-1].minor.yy325 = yylhsminor.yy325; break; case 155: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy518, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy518 = yylhsminor.yy518; +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yygotominor.yy518, &yymsp[0].minor.yy0); } break; - case 156: /* tagitem ::= MINUS INTEGER */ - case 157: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==157); - case 158: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==158); - case 159: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==159); + case 156: /* tagitem ::= NOW */ +{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yygotominor.yy518, &yymsp[0].minor.yy0);} + break; + case 157: /* tagitem ::= MINUS INTEGER */ + case 158: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==158); + case 159: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==159); + case 160: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==160); { 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.yy518, &yymsp[-1].minor.yy0); + tVariantCreate(&yygotominor.yy518, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy518 = yylhsminor.yy518; break; - case 160: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + case 161: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy93, yymsp[-11].minor.yy330, yymsp[-10].minor.yy68, yymsp[-4].minor.yy93, yymsp[-3].minor.yy93, &yymsp[-9].minor.yy42, &yymsp[-8].minor.yy15, &yymsp[-7].minor.yy274, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy93, &yymsp[0].minor.yy284, &yymsp[-1].minor.yy284, yymsp[-2].minor.yy68); + yygotominor.yy224 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy93, yymsp[-11].minor.yy330, yymsp[-10].minor.yy68, yymsp[-4].minor.yy93, yymsp[-3].minor.yy93, &yymsp[-9].minor.yy42, &yymsp[-8].minor.yy15, &yymsp[-7].minor.yy274, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy93, &yymsp[0].minor.yy284, &yymsp[-1].minor.yy284, yymsp[-2].minor.yy68); } - yymsp[-13].minor.yy224 = yylhsminor.yy224; break; - case 161: /* select ::= LP select RP */ -{yymsp[-2].minor.yy224 = yymsp[-1].minor.yy224;} + case 162: /* select ::= LP select RP */ +{yygotominor.yy224 = yymsp[-1].minor.yy224;} break; - case 162: /* union ::= select */ -{ yylhsminor.yy93 = setSubclause(NULL, yymsp[0].minor.yy224); } - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 163: /* union ::= select */ +{ yygotominor.yy93 = setSubclause(NULL, yymsp[0].minor.yy224); } break; - case 163: /* union ::= union UNION ALL select */ -{ yylhsminor.yy93 = appendSelectClause(yymsp[-3].minor.yy93, yymsp[0].minor.yy224); } - yymsp[-3].minor.yy93 = yylhsminor.yy93; + case 164: /* union ::= union UNION ALL select */ +{ yygotominor.yy93 = appendSelectClause(yymsp[-3].minor.yy93, yymsp[0].minor.yy224); } break; - case 164: /* cmd ::= union */ + case 165: /* cmd ::= union */ { setSqlInfo(pInfo, yymsp[0].minor.yy93, NULL, TSDB_SQL_SELECT); } break; - case 165: /* select ::= SELECT selcollist */ + case 166: /* select ::= SELECT selcollist */ { - yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy93, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yygotominor.yy224 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy93, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy224 = yylhsminor.yy224; break; - case 166: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy93 = yymsp[-1].minor.yy93;} - yymsp[-1].minor.yy93 = yylhsminor.yy93; + case 167: /* sclp ::= selcollist COMMA */ +{yygotominor.yy93 = yymsp[-1].minor.yy93;} break; - case 167: /* sclp ::= */ - case 197: /* orderby_opt ::= */ yytestcase(yyruleno==197); -{yymsp[1].minor.yy93 = 0;} + case 168: /* sclp ::= */ + case 198: /* orderby_opt ::= */ yytestcase(yyruleno==198); +{yygotominor.yy93 = 0;} break; - case 168: /* selcollist ::= sclp distinct expr as */ + case 169: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy93 = tSqlExprListAppend(yymsp[-3].minor.yy93, yymsp[-1].minor.yy68, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yygotominor.yy93 = tSqlExprListAppend(yymsp[-3].minor.yy93, yymsp[-1].minor.yy68, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy93 = yylhsminor.yy93; break; - case 169: /* selcollist ::= sclp STAR */ + case 170: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yylhsminor.yy93 = tSqlExprListAppend(yymsp[-1].minor.yy93, pNode, 0, 0); + yygotominor.yy93 = tSqlExprListAppend(yymsp[-1].minor.yy93, pNode, 0, 0); } - yymsp[-1].minor.yy93 = yylhsminor.yy93; break; - case 170: /* as ::= AS ids */ -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } + case 171: /* as ::= AS ids */ + case 172: /* as ::= ids */ yytestcase(yyruleno==172); +{ yygotominor.yy0 = yymsp[0].minor.yy0; } break; - case 171: /* as ::= ids */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 173: /* as ::= */ +{ yygotominor.yy0.n = 0; } break; - case 172: /* as ::= */ -{ yymsp[1].minor.yy0.n = 0; } + case 174: /* distinct ::= DISTINCT */ +{ yygotominor.yy0 = yymsp[0].minor.yy0; } break; - case 173: /* distinct ::= DISTINCT */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 176: /* from ::= FROM tablelist */ + case 177: /* from ::= FROM sub */ yytestcase(yyruleno==177); +{yygotominor.yy330 = yymsp[0].minor.yy330;} break; - case 175: /* from ::= FROM tablelist */ - case 176: /* from ::= FROM sub */ yytestcase(yyruleno==176); -{yymsp[-1].minor.yy330 = yymsp[0].minor.yy330;} + case 178: /* sub ::= LP union RP */ +{yygotominor.yy330 = addSubqueryElem(NULL, yymsp[-1].minor.yy93, NULL);} break; - case 177: /* sub ::= LP union RP */ -{yymsp[-2].minor.yy330 = addSubqueryElem(NULL, yymsp[-1].minor.yy93, NULL);} + case 179: /* sub ::= LP union RP ids */ +{yygotominor.yy330 = addSubqueryElem(NULL, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} break; - case 178: /* sub ::= LP union RP ids */ -{yymsp[-3].minor.yy330 = addSubqueryElem(NULL, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} + case 180: /* sub ::= sub COMMA LP union RP ids */ +{yygotominor.yy330 = addSubqueryElem(yymsp[-5].minor.yy330, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} break; - case 179: /* sub ::= sub COMMA LP union RP ids */ -{yylhsminor.yy330 = addSubqueryElem(yymsp[-5].minor.yy330, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} - yymsp[-5].minor.yy330 = yylhsminor.yy330; - break; - case 180: /* tablelist ::= ids cpxName */ + case 181: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yygotominor.yy330 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } - yymsp[-1].minor.yy330 = yylhsminor.yy330; break; - case 181: /* tablelist ::= ids cpxName ids */ + case 182: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yygotominor.yy330 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy330 = yylhsminor.yy330; break; - case 182: /* tablelist ::= tablelist COMMA ids cpxName */ + case 183: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(yymsp[-3].minor.yy330, &yymsp[-1].minor.yy0, NULL); + yygotominor.yy330 = setTableNameList(yymsp[-3].minor.yy330, &yymsp[-1].minor.yy0, NULL); } - yymsp[-3].minor.yy330 = yylhsminor.yy330; break; - case 183: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 184: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(yymsp[-4].minor.yy330, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yygotominor.yy330 = setTableNameList(yymsp[-4].minor.yy330, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-4].minor.yy330 = yylhsminor.yy330; break; - case 184: /* tmvar ::= VARIABLE */ -{yylhsminor.yy0 = yymsp[0].minor.yy0;} - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 185: /* tmvar ::= VARIABLE */ +{yygotominor.yy0 = yymsp[0].minor.yy0;} break; - case 185: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy42.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy42.offset.n = 0;} + case 186: /* interval_opt ::= INTERVAL LP tmvar RP */ +{yygotominor.yy42.interval = yymsp[-1].minor.yy0; yygotominor.yy42.offset.n = 0;} break; - case 186: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy42.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy42.offset = yymsp[-1].minor.yy0;} + case 187: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ +{yygotominor.yy42.interval = yymsp[-3].minor.yy0; yygotominor.yy42.offset = yymsp[-1].minor.yy0;} break; - case 187: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy42, 0, sizeof(yymsp[1].minor.yy42));} + case 188: /* interval_opt ::= */ +{memset(&yygotominor.yy42, 0, sizeof(yygotominor.yy42));} break; - case 188: /* session_option ::= */ -{yymsp[1].minor.yy15.col.n = 0; yymsp[1].minor.yy15.gap.n = 0;} + case 189: /* session_option ::= */ +{yygotominor.yy15.col.n = 0; yygotominor.yy15.gap.n = 0;} break; - case 189: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + case 190: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yymsp[-6].minor.yy15.col = yymsp[-4].minor.yy0; - yymsp[-6].minor.yy15.gap = yymsp[-1].minor.yy0; + yygotominor.yy15.col = yymsp[-4].minor.yy0; + yygotominor.yy15.gap = yymsp[-1].minor.yy0; } break; - case 190: /* windowstate_option ::= */ -{ yymsp[1].minor.yy274.col.n = 0; yymsp[1].minor.yy274.col.z = NULL;} + case 191: /* windowstate_option ::= */ +{ yygotominor.yy274.col.n = 0; yygotominor.yy274.col.z = NULL;} break; - case 191: /* windowstate_option ::= STATE_WINDOW LP ids RP */ -{ yymsp[-3].minor.yy274.col = yymsp[-1].minor.yy0; } + case 192: /* windowstate_option ::= STATE_WINDOW LP ids RP */ +{ yygotominor.yy274.col = yymsp[-1].minor.yy0; } break; - case 192: /* fill_opt ::= */ -{ yymsp[1].minor.yy93 = 0; } + case 193: /* fill_opt ::= */ +{ yygotominor.yy93 = 0; } break; - case 193: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 194: /* 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.yy93, &A, -1, 0); - yymsp[-5].minor.yy93 = yymsp[-1].minor.yy93; + yygotominor.yy93 = yymsp[-1].minor.yy93; } break; - case 194: /* fill_opt ::= FILL LP ID RP */ + case 195: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy93 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yygotominor.yy93 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 195: /* sliding_opt ::= SLIDING LP tmvar RP */ -{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } + case 196: /* sliding_opt ::= SLIDING LP tmvar RP */ +{yygotominor.yy0 = yymsp[-1].minor.yy0; } break; - case 196: /* sliding_opt ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } + case 197: /* sliding_opt ::= */ +{yygotominor.yy0.n = 0; yygotominor.yy0.z = NULL; yygotominor.yy0.type = 0; } break; - case 198: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy93 = yymsp[0].minor.yy93;} + case 199: /* orderby_opt ::= ORDER BY sortlist */ +{yygotominor.yy93 = yymsp[0].minor.yy93;} break; - case 199: /* sortlist ::= sortlist COMMA item sortorder */ + case 200: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy93 = tVariantListAppend(yymsp[-3].minor.yy93, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150); + yygotominor.yy93 = tVariantListAppend(yymsp[-3].minor.yy93, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150); } - yymsp[-3].minor.yy93 = yylhsminor.yy93; break; - case 200: /* sortlist ::= item sortorder */ + case 201: /* sortlist ::= item sortorder */ { - yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150); + yygotominor.yy93 = tVariantListAppend(NULL, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150); } - yymsp[-1].minor.yy93 = yylhsminor.yy93; break; - case 201: /* item ::= ids cpxName */ + case 202: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy518, &yymsp[-1].minor.yy0); + tVariantCreate(&yygotominor.yy518, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy518 = yylhsminor.yy518; break; - case 202: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy150 = TSDB_ORDER_ASC; } + case 203: /* sortorder ::= ASC */ + case 205: /* sortorder ::= */ yytestcase(yyruleno==205); +{ yygotominor.yy150 = TSDB_ORDER_ASC; } break; - case 203: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy150 = TSDB_ORDER_DESC;} + case 204: /* sortorder ::= DESC */ +{ yygotominor.yy150 = TSDB_ORDER_DESC;} break; - case 204: /* sortorder ::= */ -{ yymsp[1].minor.yy150 = TSDB_ORDER_ASC; } + case 206: /* groupby_opt ::= */ +{ yygotominor.yy93 = 0;} break; - case 205: /* groupby_opt ::= */ -{ yymsp[1].minor.yy93 = 0;} + case 207: /* groupby_opt ::= GROUP BY grouplist */ +{ yygotominor.yy93 = yymsp[0].minor.yy93;} break; - case 206: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy93 = yymsp[0].minor.yy93;} - break; - case 207: /* grouplist ::= grouplist COMMA item */ + case 208: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1); + yygotominor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1); } - yymsp[-2].minor.yy93 = yylhsminor.yy93; break; - case 208: /* grouplist ::= item */ + case 209: /* grouplist ::= item */ { - yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); + yygotominor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); } - yymsp[0].minor.yy93 = yylhsminor.yy93; break; - case 209: /* having_opt ::= */ - case 219: /* where_opt ::= */ yytestcase(yyruleno==219); - case 261: /* expritem ::= */ yytestcase(yyruleno==261); -{yymsp[1].minor.yy68 = 0;} + case 210: /* having_opt ::= */ + case 220: /* where_opt ::= */ yytestcase(yyruleno==220); + case 262: /* expritem ::= */ yytestcase(yyruleno==262); +{yygotominor.yy68 = 0;} break; - case 210: /* having_opt ::= HAVING expr */ - case 220: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==220); -{yymsp[-1].minor.yy68 = yymsp[0].minor.yy68;} + case 211: /* having_opt ::= HAVING expr */ + case 221: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==221); + case 261: /* expritem ::= expr */ yytestcase(yyruleno==261); +{yygotominor.yy68 = yymsp[0].minor.yy68;} break; - case 211: /* limit_opt ::= */ - case 215: /* slimit_opt ::= */ yytestcase(yyruleno==215); -{yymsp[1].minor.yy284.limit = -1; yymsp[1].minor.yy284.offset = 0;} + case 212: /* limit_opt ::= */ + case 216: /* slimit_opt ::= */ yytestcase(yyruleno==216); +{yygotominor.yy284.limit = -1; yygotominor.yy284.offset = 0;} break; - case 212: /* limit_opt ::= LIMIT signed */ - case 216: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==216); -{yymsp[-1].minor.yy284.limit = yymsp[0].minor.yy279; yymsp[-1].minor.yy284.offset = 0;} + case 213: /* limit_opt ::= LIMIT signed */ + case 217: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==217); +{yygotominor.yy284.limit = yymsp[0].minor.yy279; yygotominor.yy284.offset = 0;} break; - case 213: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy284.limit = yymsp[-2].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[0].minor.yy279;} + case 214: /* limit_opt ::= LIMIT signed OFFSET signed */ +{ yygotominor.yy284.limit = yymsp[-2].minor.yy279; yygotominor.yy284.offset = yymsp[0].minor.yy279;} break; - case 214: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy284.limit = yymsp[0].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[-2].minor.yy279;} + case 215: /* limit_opt ::= LIMIT signed COMMA signed */ +{ yygotominor.yy284.limit = yymsp[0].minor.yy279; yygotominor.yy284.offset = yymsp[-2].minor.yy279;} break; - case 217: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy284.limit = yymsp[-2].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[0].minor.yy279;} + case 218: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +{yygotominor.yy284.limit = yymsp[-2].minor.yy279; yygotominor.yy284.offset = yymsp[0].minor.yy279;} break; - case 218: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy284.limit = yymsp[0].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[-2].minor.yy279;} + case 219: /* slimit_opt ::= SLIMIT signed COMMA signed */ +{yygotominor.yy284.limit = yymsp[0].minor.yy279; yygotominor.yy284.offset = yymsp[-2].minor.yy279;} break; - case 221: /* expr ::= LP expr RP */ -{yylhsminor.yy68 = yymsp[-1].minor.yy68; yylhsminor.yy68->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy68->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 222: /* expr ::= LP expr RP */ +{yygotominor.yy68 = yymsp[-1].minor.yy68; yygotominor.yy68->token.z = yymsp[-2].minor.yy0.z; yygotominor.yy68->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} break; - case 222: /* expr ::= ID */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 223: /* expr ::= ID */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} break; - case 223: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 224: /* expr ::= ID DOT ID */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} break; - case 224: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 225: /* expr ::= ID DOT STAR */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} break; - case 225: /* expr ::= INTEGER */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 226: /* expr ::= INTEGER */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} break; - case 226: /* expr ::= MINUS INTEGER */ - case 227: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==227); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy68 = yylhsminor.yy68; + case 227: /* expr ::= MINUS INTEGER */ + case 228: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==228); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} break; - case 228: /* expr ::= FLOAT */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 229: /* expr ::= FLOAT */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} break; - case 229: /* expr ::= MINUS FLOAT */ - case 230: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==230); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy68 = yylhsminor.yy68; + case 230: /* expr ::= MINUS FLOAT */ + case 231: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==231); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} break; - case 231: /* expr ::= STRING */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 232: /* expr ::= STRING */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} break; - case 232: /* expr ::= NOW */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 233: /* expr ::= NOW */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } break; - case 233: /* expr ::= VARIABLE */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 234: /* expr ::= VARIABLE */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} break; - case 234: /* expr ::= PLUS VARIABLE */ - case 235: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==235); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} - yymsp[-1].minor.yy68 = yylhsminor.yy68; + case 235: /* expr ::= PLUS VARIABLE */ + case 236: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==236); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} break; - case 236: /* expr ::= BOOL */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 237: /* expr ::= BOOL */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} break; - case 237: /* expr ::= NULL */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 238: /* expr ::= NULL */ +{ yygotominor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} break; - case 238: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy68 = tSqlExprCreateFunction(yymsp[-1].minor.yy93, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy68 = yylhsminor.yy68; + case 239: /* expr ::= ID LP exprlist RP */ +{ yygotominor.yy68 = tSqlExprCreateFunction(yymsp[-1].minor.yy93, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } break; - case 239: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy68 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy68 = yylhsminor.yy68; + case 240: /* expr ::= ID LP STAR RP */ +{ yygotominor.yy68 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } break; - case 240: /* expr ::= expr IS NULL */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, NULL, TK_ISNULL);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 241: /* expr ::= expr IS NULL */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, NULL, TK_ISNULL);} break; - case 241: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-3].minor.yy68, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy68 = yylhsminor.yy68; + case 242: /* expr ::= expr IS NOT NULL */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-3].minor.yy68, NULL, TK_NOTNULL);} break; - case 242: /* expr ::= expr LT expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LT);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 243: /* expr ::= expr LT expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LT);} break; - case 243: /* expr ::= expr GT expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GT);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 244: /* expr ::= expr GT expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GT);} break; - case 244: /* expr ::= expr LE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 245: /* expr ::= expr LE expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LE);} break; - case 245: /* expr ::= expr GE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 246: /* expr ::= expr GE expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GE);} break; - case 246: /* expr ::= expr NE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_NE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 247: /* expr ::= expr NE expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_NE);} break; - case 247: /* expr ::= expr EQ expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_EQ);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 248: /* expr ::= expr EQ expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_EQ);} break; - case 248: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy68); yylhsminor.yy68 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy68, yymsp[-2].minor.yy68, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy68, TK_LE), TK_AND);} - yymsp[-4].minor.yy68 = yylhsminor.yy68; + case 249: /* expr ::= expr BETWEEN expr AND expr */ +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy68); yygotominor.yy68 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy68, yymsp[-2].minor.yy68, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy68, TK_LE), TK_AND);} break; - case 249: /* expr ::= expr AND expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_AND);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 250: /* expr ::= expr AND expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_AND);} break; - case 250: /* expr ::= expr OR expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_OR); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 251: /* expr ::= expr OR expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_OR); } break; - case 251: /* expr ::= expr PLUS expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_PLUS); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 252: /* expr ::= expr PLUS expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_PLUS); } break; - case 252: /* expr ::= expr MINUS expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_MINUS); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 253: /* expr ::= expr MINUS expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_MINUS); } break; - case 253: /* expr ::= expr STAR expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_STAR); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 254: /* expr ::= expr STAR expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_STAR); } break; - case 254: /* expr ::= expr SLASH expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_DIVIDE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 255: /* expr ::= expr SLASH expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_DIVIDE);} break; - case 255: /* expr ::= expr REM expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_REM); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 256: /* expr ::= expr REM expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_REM); } break; - case 256: /* expr ::= expr LIKE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LIKE); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 257: /* expr ::= expr LIKE expr */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LIKE); } break; - case 257: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-4].minor.yy68, (tSqlExpr*)yymsp[-1].minor.yy93, TK_IN); } - yymsp[-4].minor.yy68 = yylhsminor.yy68; + case 258: /* expr ::= expr IN LP exprlist RP */ +{yygotominor.yy68 = tSqlExprCreate(yymsp[-4].minor.yy68, (tSqlExpr*)yymsp[-1].minor.yy93, TK_IN); } break; - case 258: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy93 = tSqlExprListAppend(yymsp[-2].minor.yy93,yymsp[0].minor.yy68,0, 0);} - yymsp[-2].minor.yy93 = yylhsminor.yy93; + case 259: /* exprlist ::= exprlist COMMA expritem */ +{yygotominor.yy93 = tSqlExprListAppend(yymsp[-2].minor.yy93,yymsp[0].minor.yy68,0, 0);} break; - case 259: /* exprlist ::= expritem */ -{yylhsminor.yy93 = tSqlExprListAppend(0,yymsp[0].minor.yy68,0, 0);} - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 260: /* exprlist ::= expritem */ +{yygotominor.yy93 = tSqlExprListAppend(0,yymsp[0].minor.yy68,0, 0);} break; - case 260: /* expritem ::= expr */ -{yylhsminor.yy68 = yymsp[0].minor.yy68;} - yymsp[0].minor.yy68 = yylhsminor.yy68; - break; - case 262: /* cmd ::= RESET QUERY CACHE */ + case 263: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 263: /* cmd ::= SYNCDB ids REPLICA */ + case 264: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 264: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 265: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 265: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 266: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3080,21 +2630,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 266: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + case 267: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 267: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 268: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 268: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 269: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3105,7 +2655,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 269: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 270: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3119,7 +2669,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 270: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 271: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -3131,21 +2681,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 271: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + case 272: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 272: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 273: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 273: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 274: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3156,21 +2706,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 274: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + case 275: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 275: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 276: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 276: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 277: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3181,7 +2731,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 277: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 278: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3195,7 +2745,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 278: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + case 279: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; @@ -3207,43 +2757,50 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 279: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + case 280: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 280: /* cmd ::= KILL CONNECTION INTEGER */ + case 281: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 281: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 282: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} break; - case 282: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 283: /* 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: 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); + } } /* @@ -3259,11 +2816,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 */ @@ -3274,11 +2829,10 @@ 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) pInfo->valid = false; int32_t outputBufLen = tListLen(pInfo->msg); @@ -3301,7 +2855,6 @@ static void yy_syntax_error( } assert(len <= outputBufLen); -/************ End %syntax_error code ******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -3317,15 +2870,10 @@ 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 *******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -3355,52 +2903,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 @@ -3430,9 +2976,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 ){ @@ -3440,26 +2986,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; @@ -3472,7 +3018,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; @@ -3487,31 +3033,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 1031e421aafec7d28fcf75cee1c1eb84bbc96208 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 15 Jun 2021 22:22:52 +0800 Subject: [PATCH 08/37] [TD-3086] tag support timestam --- src/client/src/tscSQLParser.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index e9a4f87cb0..75a81c2096 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -8007,28 +8007,21 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS assert(pSqlExpr->pRight == NULL); if (pSqlExpr->type == SQL_NODE_VALUE) { + int32_t ret = TSDB_CODE_SUCCESS; *pExpr = calloc(1, sizeof(tExprNode)); (*pExpr)->nodeType = TSQL_NODE_VALUE; (*pExpr)->pVal = calloc(1, sizeof(tVariant)); tVariantAssign((*pExpr)->pVal, &pSqlExpr->value); - int32_t type = -1; STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta; if (pCols != NULL) { SColIndex* idx = taosArrayGet(pCols, 0); SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex); - if (pSchema != NULL) { - type = pSchema->type; + if (pSchema != NULL && pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { + ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal); } } - if (type == TSDB_DATA_TYPE_TIMESTAMP) { - int32_t ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal); - if (ret != TSDB_CODE_SUCCESS) { - return ret; - } - } - - return TSDB_CODE_SUCCESS; + return ret; } else if (pSqlExpr->type == SQL_NODE_SQLFUNCTION) { // arithmetic expression on the results of aggregation functions *pExpr = calloc(1, sizeof(tExprNode)); From 85f75ffac9562bf47696bcf4f4c70229b84a8cbb Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 16 Jun 2021 10:11:14 +0800 Subject: [PATCH 09/37] [TD-3086] tag support timestamp --- src/client/src/tscSQLParser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 75a81c2096..8d51ffc577 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -8017,7 +8017,8 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS if (pCols != NULL) { SColIndex* idx = taosArrayGet(pCols, 0); SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex); - if (pSchema != NULL && pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { + // convert time by precision + if (pSchema != NULL && TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && TSDB_DATA_TYPE_BINARY == (*pExpr)->pVal->nType) { ret = setColumnFilterInfoForTimestamp(pCmd, pQueryInfo, (*pExpr)->pVal); } } From dd69450387f2875ec80a035e43845bcdc76b05e2 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 16 Jun 2021 16:07:44 +0800 Subject: [PATCH 10/37] [td-225]update sql.y --- src/inc/ttokendef.h | 198 ++-- src/query/src/sql.c | 2592 +++++++++++++++++++++++++------------------ 2 files changed, 1633 insertions(+), 1157 deletions(-) diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index 82ef859924..d15f044b65 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -16,105 +16,105 @@ #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_TOPICS 46 -#define TK_MNODES 47 -#define TK_DNODES 48 -#define TK_ACCOUNTS 49 -#define TK_USERS 50 -#define TK_MODULES 51 -#define TK_QUERIES 52 -#define TK_CONNECTIONS 53 -#define TK_STREAMS 54 -#define TK_VARIABLES 55 -#define TK_SCORES 56 -#define TK_GRANTS 57 -#define TK_VNODES 58 -#define TK_IPTOKEN 59 -#define TK_DOT 60 -#define TK_CREATE 61 -#define TK_TABLE 62 -#define TK_STABLE 63 -#define TK_DATABASE 64 -#define TK_TABLES 65 -#define TK_STABLES 66 -#define TK_VGROUPS 67 -#define TK_DROP 68 -#define TK_TOPIC 69 -#define TK_DNODE 70 -#define TK_USER 71 -#define TK_ACCOUNT 72 -#define TK_USE 73 -#define TK_DESCRIBE 74 -#define TK_ALTER 75 -#define TK_PASS 76 -#define TK_PRIVILEGE 77 -#define TK_LOCAL 78 -#define TK_COMPACT 79 -#define TK_LP 80 -#define TK_RP 81 -#define TK_IF 82 -#define TK_EXISTS 83 -#define TK_PPS 84 -#define TK_TSERIES 85 -#define TK_DBS 86 -#define TK_STORAGE 87 -#define TK_QTIME 88 -#define TK_CONNS 89 -#define TK_STATE 90 -#define TK_COMMA 91 -#define TK_KEEP 92 -#define TK_CACHE 93 -#define TK_REPLICA 94 -#define TK_QUORUM 95 -#define TK_DAYS 96 -#define TK_MINROWS 97 -#define TK_MAXROWS 98 -#define TK_BLOCKS 99 +#define TK_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_TOPICS 46 +#define TK_MNODES 47 +#define TK_DNODES 48 +#define TK_ACCOUNTS 49 +#define TK_USERS 50 +#define TK_MODULES 51 +#define TK_QUERIES 52 +#define TK_CONNECTIONS 53 +#define TK_STREAMS 54 +#define TK_VARIABLES 55 +#define TK_SCORES 56 +#define TK_GRANTS 57 +#define TK_VNODES 58 +#define TK_IPTOKEN 59 +#define TK_DOT 60 +#define TK_CREATE 61 +#define TK_TABLE 62 +#define TK_STABLE 63 +#define TK_DATABASE 64 +#define TK_TABLES 65 +#define TK_STABLES 66 +#define TK_VGROUPS 67 +#define TK_DROP 68 +#define TK_TOPIC 69 +#define TK_DNODE 70 +#define TK_USER 71 +#define TK_ACCOUNT 72 +#define TK_USE 73 +#define TK_DESCRIBE 74 +#define TK_ALTER 75 +#define TK_PASS 76 +#define TK_PRIVILEGE 77 +#define TK_LOCAL 78 +#define TK_COMPACT 79 +#define TK_LP 80 +#define TK_RP 81 +#define TK_IF 82 +#define TK_EXISTS 83 +#define TK_PPS 84 +#define TK_TSERIES 85 +#define TK_DBS 86 +#define TK_STORAGE 87 +#define TK_QTIME 88 +#define TK_CONNS 89 +#define TK_STATE 90 +#define TK_COMMA 91 +#define TK_KEEP 92 +#define TK_CACHE 93 +#define TK_REPLICA 94 +#define TK_QUORUM 95 +#define TK_DAYS 96 +#define TK_MINROWS 97 +#define TK_MAXROWS 98 +#define TK_BLOCKS 99 #define TK_CTIME 100 #define TK_WAL 101 #define TK_FSYNC 102 diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 508d52e83b..d3f478ebeb 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -1,9 +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 +/************ Begin %include sections from the grammar ************************/ #include #include @@ -16,55 +36,66 @@ #include "ttokendef.h" #include "tutil.h" #include "tvariant.h" -/* 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 271 #define YYACTIONTYPE unsigned short int @@ -96,16 +127,19 @@ typedef union { #define ParseARG_PDECL ,SSqlInfo* pInfo #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo -#define YYNSTATE 549 -#define YYNRULE 285 #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 347 +#define YYNRULE 285 +#define YYNTOKEN 190 +#define YY_MAX_SHIFT 346 +#define YY_MIN_SHIFTREDUCE 549 +#define YY_MAX_SHIFTREDUCE 833 +#define YY_ERROR_ACTION 834 +#define YY_ACCEPT_ACTION 835 +#define YY_NO_ACTION 836 +#define YY_MIN_REDUCE 837 +#define YY_MAX_REDUCE 1121 +/************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined ** otherwise. @@ -128,33 +162,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: ** @@ -166,311 +202,286 @@ 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 (854) +** +*********** Begin parsing tables **********************************************/ +#define YY_ACTTAB_COUNT (735) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 532, 53, 52, 126, 125, 51, 50, 49, 531, 143, - /* 10 */ 141, 140, 54, 55, 14, 58, 59, 379, 378, 239, - /* 20 */ 48, 450, 57, 300, 62, 60, 63, 61, 343, 342, - /* 30 */ 137, 25, 53, 52, 835, 346, 51, 50, 49, 54, - /* 40 */ 55, 549, 58, 59, 94, 91, 239, 48, 237, 57, - /* 50 */ 300, 62, 60, 63, 61, 443, 71, 442, 152, 53, - /* 60 */ 52, 389, 253, 51, 50, 49, 54, 55, 6, 58, - /* 70 */ 59, 257, 256, 239, 48, 74, 57, 300, 62, 60, - /* 80 */ 63, 61, 22, 362, 21, 92, 53, 52, 532, 95, - /* 90 */ 51, 50, 49, 51, 50, 49, 531, 72, 440, 261, - /* 100 */ 439, 54, 56, 471, 58, 59, 232, 449, 239, 48, - /* 110 */ 77, 57, 300, 62, 60, 63, 61, 397, 396, 34, - /* 120 */ 388, 53, 52, 474, 395, 51, 50, 49, 282, 113, - /* 130 */ 88, 112, 548, 547, 546, 545, 544, 543, 542, 541, - /* 140 */ 540, 539, 538, 537, 536, 345, 35, 55, 220, 58, - /* 150 */ 59, 320, 319, 239, 48, 535, 57, 300, 62, 60, - /* 160 */ 63, 61, 534, 33, 145, 247, 53, 52, 532, 441, - /* 170 */ 51, 50, 49, 58, 59, 152, 531, 239, 48, 81, - /* 180 */ 57, 300, 62, 60, 63, 61, 20, 302, 19, 322, - /* 190 */ 53, 52, 288, 469, 51, 50, 49, 402, 414, 413, - /* 200 */ 412, 411, 410, 409, 408, 407, 406, 405, 404, 403, - /* 210 */ 401, 400, 438, 264, 41, 296, 339, 338, 295, 294, - /* 220 */ 293, 337, 292, 336, 335, 334, 291, 333, 332, 238, - /* 230 */ 433, 268, 267, 444, 446, 437, 249, 436, 246, 523, - /* 240 */ 315, 314, 24, 62, 60, 63, 61, 374, 35, 280, - /* 250 */ 139, 53, 52, 83, 35, 51, 50, 49, 459, 205, - /* 260 */ 458, 217, 218, 3, 180, 301, 206, 457, 240, 456, - /* 270 */ 445, 129, 128, 204, 18, 68, 17, 305, 83, 497, - /* 280 */ 76, 499, 498, 354, 448, 35, 496, 42, 494, 493, - /* 290 */ 495, 318, 492, 491, 431, 469, 41, 317, 339, 338, - /* 300 */ 138, 469, 35, 337, 25, 336, 335, 334, 64, 333, - /* 310 */ 332, 242, 42, 352, 114, 108, 119, 532, 69, 235, - /* 320 */ 236, 118, 124, 127, 117, 531, 462, 197, 316, 465, - /* 330 */ 121, 464, 469, 463, 260, 507, 75, 425, 238, 433, - /* 340 */ 432, 435, 444, 213, 437, 312, 436, 434, 35, 469, - /* 350 */ 365, 80, 188, 186, 184, 35, 35, 244, 245, 183, - /* 360 */ 132, 131, 130, 353, 35, 35, 5, 38, 169, 181, - /* 370 */ 217, 218, 35, 168, 102, 97, 101, 9, 197, 197, - /* 380 */ 686, 107, 243, 106, 241, 264, 308, 307, 425, 425, - /* 390 */ 16, 311, 15, 116, 426, 469, 29, 152, 310, 309, - /* 400 */ 487, 330, 469, 469, 25, 179, 394, 230, 229, 152, - /* 410 */ 287, 469, 469, 391, 285, 221, 65, 64, 506, 469, - /* 420 */ 93, 387, 370, 65, 36, 371, 1, 167, 367, 262, - /* 430 */ 90, 36, 26, 340, 508, 65, 461, 460, 147, 36, - /* 440 */ 505, 422, 35, 488, 78, 362, 179, 362, 179, 432, - /* 450 */ 435, 248, 355, 504, 233, 231, 434, 503, 392, 392, - /* 460 */ 225, 223, 298, 222, 392, 197, 219, 344, 502, 89, - /* 470 */ 501, 500, 490, 486, 485, 424, 484, 483, 482, 481, - /* 480 */ 480, 375, 479, 36, 475, 473, 472, 111, 470, 476, - /* 490 */ 304, 109, 67, 105, 103, 66, 8, 447, 430, 7, - /* 500 */ 100, 297, 303, 421, 420, 419, 418, 417, 416, 96, - /* 510 */ 94, 28, 12, 415, 286, 284, 27, 13, 357, 32, - /* 520 */ 11, 31, 151, 226, 372, 276, 87, 82, 369, 86, - /* 530 */ 149, 368, 366, 148, 259, 85, 30, 264, 363, 10, - /* 540 */ 349, 255, 348, 254, 252, 266, 251, 347, 351, 142, - /* 550 */ 4, 530, 350, 529, 509, 136, 2, 524, 489, 135, - /* 560 */ 522, 327, 134, 133, 341, 515, 178, 331, 329, 510, - /* 570 */ 173, 328, 177, 326, 325, 176, 324, 174, 175, 323, - /* 580 */ 99, 115, 212, 172, 211, 477, 289, 298, 234, 98, - /* 590 */ 270, 214, 161, 157, 155, 162, 46, 70, 278, 377, - /* 600 */ 836, 271, 272, 84, 399, 159, 380, 79, 273, 263, - /* 610 */ 836, 836, 190, 836, 275, 533, 277, 189, 279, 528, - /* 620 */ 527, 283, 160, 526, 281, 158, 836, 47, 156, 73, - /* 630 */ 373, 154, 525, 836, 187, 153, 836, 385, 836, 386, - /* 640 */ 836, 836, 265, 836, 836, 163, 224, 269, 836, 361, - /* 650 */ 836, 836, 836, 836, 836, 836, 185, 376, 836, 321, - /* 660 */ 836, 836, 836, 836, 836, 836, 228, 836, 45, 836, - /* 670 */ 836, 836, 836, 384, 193, 836, 836, 836, 836, 330, - /* 680 */ 836, 836, 836, 836, 836, 836, 836, 836, 836, 836, - /* 690 */ 836, 836, 836, 836, 836, 836, 836, 836, 836, 836, - /* 700 */ 521, 836, 520, 519, 518, 836, 517, 516, 182, 250, - /* 710 */ 514, 513, 123, 122, 512, 120, 836, 511, 192, 44, - /* 720 */ 836, 37, 40, 478, 171, 468, 467, 110, 466, 836, - /* 730 */ 836, 836, 313, 836, 170, 454, 836, 453, 104, 452, - /* 740 */ 306, 423, 299, 836, 39, 191, 43, 290, 398, 166, - /* 750 */ 165, 390, 164, 274, 150, 146, 364, 360, 359, 358, - /* 760 */ 356, 144, 258, 836, 836, 836, 836, 836, 836, 836, - /* 770 */ 836, 836, 836, 836, 836, 836, 836, 836, 836, 836, - /* 780 */ 836, 836, 836, 836, 836, 836, 836, 836, 836, 836, - /* 790 */ 836, 836, 836, 836, 836, 836, 836, 836, 836, 836, - /* 800 */ 836, 383, 227, 382, 381, 836, 836, 836, 836, 836, - /* 810 */ 836, 836, 836, 836, 836, 455, 451, 393, 836, 836, - /* 820 */ 836, 836, 836, 836, 836, 836, 836, 836, 836, 836, - /* 830 */ 836, 836, 836, 836, 836, 207, 210, 209, 208, 203, - /* 840 */ 202, 196, 201, 199, 198, 216, 215, 429, 428, 427, - /* 850 */ 200, 195, 194, 23, + /* 0 */ 23, 598, 1010, 598, 219, 344, 194, 835, 346, 599, + /* 10 */ 598, 599, 197, 54, 55, 225, 58, 59, 599, 988, + /* 20 */ 239, 48, 1097, 57, 300, 62, 60, 63, 61, 1001, + /* 30 */ 1001, 231, 233, 53, 52, 988, 988, 51, 50, 49, + /* 40 */ 54, 55, 35, 58, 59, 222, 223, 239, 48, 598, + /* 50 */ 57, 300, 62, 60, 63, 61, 1001, 599, 152, 236, + /* 60 */ 53, 52, 235, 152, 51, 50, 49, 55, 1007, 58, + /* 70 */ 59, 630, 261, 239, 48, 240, 57, 300, 62, 60, + /* 80 */ 63, 61, 29, 83, 982, 221, 53, 52, 145, 985, + /* 90 */ 51, 50, 49, 550, 551, 552, 553, 554, 555, 556, + /* 100 */ 557, 558, 559, 560, 561, 562, 345, 80, 772, 220, + /* 110 */ 95, 77, 54, 55, 35, 58, 59, 42, 197, 239, + /* 120 */ 48, 197, 57, 300, 62, 60, 63, 61, 1098, 232, + /* 130 */ 1046, 1098, 53, 52, 197, 89, 51, 50, 49, 54, + /* 140 */ 56, 264, 58, 59, 1098, 976, 239, 48, 974, 57, + /* 150 */ 300, 62, 60, 63, 61, 268, 267, 229, 298, 53, + /* 160 */ 52, 985, 248, 51, 50, 49, 41, 296, 339, 338, + /* 170 */ 295, 294, 293, 337, 292, 336, 335, 334, 291, 333, + /* 180 */ 332, 948, 936, 937, 938, 939, 940, 941, 942, 943, + /* 190 */ 944, 945, 946, 947, 949, 950, 58, 59, 24, 986, + /* 200 */ 239, 48, 253, 57, 300, 62, 60, 63, 61, 35, + /* 210 */ 195, 257, 256, 53, 52, 205, 330, 51, 50, 49, + /* 220 */ 53, 52, 206, 14, 51, 50, 49, 129, 128, 204, + /* 230 */ 298, 238, 787, 305, 83, 776, 81, 779, 116, 782, + /* 240 */ 200, 238, 787, 883, 35, 776, 330, 779, 179, 782, + /* 250 */ 114, 108, 119, 94, 91, 1094, 984, 118, 124, 127, + /* 260 */ 117, 987, 35, 217, 218, 152, 121, 301, 42, 41, + /* 270 */ 264, 339, 338, 217, 218, 242, 337, 1093, 336, 335, + /* 280 */ 334, 704, 333, 332, 701, 1117, 702, 230, 703, 1092, + /* 290 */ 260, 985, 75, 956, 680, 954, 955, 340, 917, 213, + /* 300 */ 957, 247, 959, 960, 958, 309, 961, 962, 152, 985, + /* 310 */ 64, 35, 244, 245, 1, 167, 62, 60, 63, 61, + /* 320 */ 64, 893, 320, 319, 53, 52, 179, 1109, 51, 50, + /* 330 */ 49, 5, 38, 169, 92, 282, 215, 88, 168, 102, + /* 340 */ 97, 101, 788, 783, 720, 76, 243, 35, 241, 784, + /* 350 */ 308, 307, 788, 783, 310, 188, 186, 184, 985, 784, + /* 360 */ 35, 35, 183, 132, 131, 130, 971, 972, 34, 975, + /* 370 */ 35, 68, 249, 35, 246, 35, 315, 314, 973, 778, + /* 380 */ 1047, 781, 280, 884, 51, 50, 49, 777, 179, 780, + /* 390 */ 311, 705, 706, 71, 985, 343, 342, 137, 143, 141, + /* 400 */ 140, 90, 717, 312, 316, 3, 180, 985, 985, 753, + /* 410 */ 754, 774, 33, 317, 69, 78, 318, 985, 322, 302, + /* 420 */ 985, 262, 985, 736, 724, 744, 745, 690, 216, 9, + /* 430 */ 285, 36, 692, 147, 72, 65, 26, 36, 287, 691, + /* 440 */ 36, 288, 65, 808, 789, 237, 597, 775, 93, 65, + /* 450 */ 16, 74, 15, 25, 25, 107, 25, 106, 18, 709, + /* 460 */ 17, 710, 707, 198, 708, 6, 20, 113, 19, 112, + /* 470 */ 199, 22, 201, 21, 126, 125, 196, 202, 203, 679, + /* 480 */ 208, 209, 210, 207, 193, 1057, 1056, 227, 1053, 1052, + /* 490 */ 228, 321, 258, 785, 144, 1009, 45, 1020, 1017, 1018, + /* 500 */ 1002, 786, 265, 1022, 1039, 163, 146, 150, 274, 1038, + /* 510 */ 983, 164, 142, 981, 165, 166, 791, 896, 290, 43, + /* 520 */ 735, 999, 191, 39, 279, 154, 269, 299, 892, 306, + /* 530 */ 224, 1116, 104, 1115, 271, 1112, 278, 170, 73, 70, + /* 540 */ 153, 47, 313, 283, 1108, 281, 110, 1107, 1104, 171, + /* 550 */ 914, 155, 277, 40, 37, 44, 275, 156, 192, 273, + /* 560 */ 880, 120, 878, 122, 123, 158, 876, 875, 270, 250, + /* 570 */ 182, 873, 872, 871, 870, 869, 46, 868, 185, 331, + /* 580 */ 187, 865, 863, 861, 859, 189, 856, 190, 115, 263, + /* 590 */ 79, 84, 272, 323, 1040, 324, 325, 326, 327, 328, + /* 600 */ 329, 341, 833, 252, 214, 832, 251, 254, 234, 289, + /* 610 */ 255, 831, 814, 813, 259, 211, 212, 264, 98, 10, + /* 620 */ 99, 82, 284, 712, 266, 85, 30, 874, 737, 148, + /* 630 */ 867, 174, 133, 173, 915, 172, 175, 176, 178, 177, + /* 640 */ 134, 135, 916, 136, 866, 952, 858, 4, 857, 740, + /* 650 */ 162, 159, 157, 149, 86, 160, 964, 2, 161, 742, + /* 660 */ 87, 226, 276, 31, 746, 151, 11, 32, 13, 12, + /* 670 */ 27, 28, 286, 643, 94, 96, 639, 637, 636, 635, + /* 680 */ 632, 297, 7, 100, 602, 790, 303, 792, 8, 304, + /* 690 */ 103, 682, 66, 105, 36, 67, 109, 111, 681, 678, + /* 700 */ 624, 622, 614, 620, 616, 618, 612, 610, 646, 645, + /* 710 */ 644, 642, 641, 640, 638, 634, 633, 181, 600, 566, + /* 720 */ 564, 837, 836, 836, 836, 836, 836, 836, 836, 836, + /* 730 */ 836, 836, 836, 138, 139, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 1, 33, 34, 76, 77, 37, 38, 39, 9, 62, - /* 10 */ 63, 64, 13, 14, 80, 16, 17, 127, 128, 20, - /* 20 */ 21, 81, 23, 24, 25, 26, 27, 28, 65, 66, - /* 30 */ 67, 91, 33, 34, 191, 192, 37, 38, 39, 13, - /* 40 */ 14, 0, 16, 17, 110, 111, 20, 21, 60, 23, - /* 50 */ 24, 25, 26, 27, 28, 5, 91, 7, 194, 33, - /* 60 */ 34, 194, 137, 37, 38, 39, 13, 14, 80, 16, - /* 70 */ 17, 146, 147, 20, 21, 80, 23, 24, 25, 26, - /* 80 */ 27, 28, 140, 240, 142, 201, 33, 34, 1, 201, - /* 90 */ 37, 38, 39, 37, 38, 39, 9, 132, 5, 256, - /* 100 */ 7, 13, 14, 108, 16, 17, 239, 81, 20, 21, - /* 110 */ 111, 23, 24, 25, 26, 27, 28, 233, 234, 235, - /* 120 */ 236, 33, 34, 5, 236, 37, 38, 39, 264, 140, - /* 130 */ 266, 142, 45, 46, 47, 48, 49, 50, 51, 52, - /* 140 */ 53, 54, 55, 56, 57, 58, 194, 14, 61, 16, - /* 150 */ 17, 33, 34, 20, 21, 59, 23, 24, 25, 26, - /* 160 */ 27, 28, 60, 80, 194, 68, 33, 34, 1, 119, - /* 170 */ 37, 38, 39, 16, 17, 194, 9, 20, 21, 81, - /* 180 */ 23, 24, 25, 26, 27, 28, 140, 15, 142, 237, - /* 190 */ 33, 34, 109, 241, 37, 38, 39, 215, 216, 217, - /* 200 */ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - /* 210 */ 228, 229, 119, 115, 92, 93, 94, 95, 96, 97, - /* 220 */ 98, 99, 100, 101, 102, 103, 104, 105, 106, 1, - /* 230 */ 2, 261, 262, 5, 1, 7, 139, 9, 141, 83, - /* 240 */ 143, 144, 44, 25, 26, 27, 28, 266, 194, 268, - /* 250 */ 21, 33, 34, 80, 194, 37, 38, 39, 5, 61, - /* 260 */ 7, 33, 34, 197, 198, 37, 68, 5, 200, 7, - /* 270 */ 37, 73, 74, 75, 140, 91, 142, 79, 80, 215, - /* 280 */ 201, 217, 218, 37, 112, 194, 222, 114, 224, 225, - /* 290 */ 226, 237, 228, 229, 81, 241, 92, 237, 94, 95, - /* 300 */ 21, 241, 194, 99, 91, 101, 102, 103, 80, 105, - /* 310 */ 106, 68, 114, 234, 62, 63, 64, 1, 134, 200, - /* 320 */ 200, 69, 70, 71, 72, 9, 2, 259, 237, 5, - /* 330 */ 78, 7, 241, 9, 136, 5, 138, 269, 1, 2, - /* 340 */ 112, 113, 5, 145, 7, 237, 9, 119, 194, 241, - /* 350 */ 91, 81, 62, 63, 64, 194, 194, 33, 34, 69, - /* 360 */ 70, 71, 72, 117, 194, 194, 62, 63, 64, 91, - /* 370 */ 33, 34, 194, 69, 70, 71, 72, 118, 259, 259, - /* 380 */ 0, 140, 139, 142, 141, 115, 143, 144, 269, 269, - /* 390 */ 140, 237, 142, 76, 81, 241, 80, 194, 237, 237, - /* 400 */ 199, 84, 241, 241, 91, 204, 81, 237, 237, 194, - /* 410 */ 81, 241, 241, 81, 81, 237, 91, 80, 5, 241, - /* 420 */ 91, 81, 81, 91, 91, 81, 202, 203, 81, 81, - /* 430 */ 243, 91, 91, 213, 214, 91, 112, 113, 91, 91, - /* 440 */ 5, 199, 194, 199, 257, 240, 204, 240, 204, 112, - /* 450 */ 113, 194, 194, 5, 238, 238, 119, 5, 242, 242, - /* 460 */ 238, 256, 82, 256, 242, 259, 193, 194, 5, 266, - /* 470 */ 5, 5, 5, 5, 5, 269, 5, 5, 5, 5, - /* 480 */ 5, 266, 5, 91, 81, 5, 5, 142, 231, 241, - /* 490 */ 58, 142, 16, 142, 142, 16, 80, 112, 81, 80, - /* 500 */ 76, 15, 24, 83, 5, 5, 5, 5, 5, 76, - /* 510 */ 110, 80, 126, 9, 109, 109, 80, 80, 260, 91, - /* 520 */ 126, 91, 80, 1, 81, 80, 80, 116, 81, 80, - /* 530 */ 91, 81, 81, 80, 137, 91, 80, 115, 81, 80, - /* 540 */ 5, 5, 5, 148, 5, 91, 148, 5, 93, 60, - /* 550 */ 197, 195, 94, 195, 5, 196, 202, 195, 230, 196, - /* 560 */ 195, 54, 196, 196, 82, 195, 205, 107, 85, 214, - /* 570 */ 210, 87, 208, 88, 86, 207, 50, 206, 209, 89, - /* 580 */ 201, 90, 195, 211, 195, 212, 195, 82, 195, 201, - /* 590 */ 120, 195, 246, 250, 252, 245, 135, 133, 263, 195, - /* 600 */ 270, 263, 195, 195, 230, 248, 267, 195, 121, 195, - /* 610 */ 270, 270, 194, 270, 122, 194, 123, 194, 124, 194, - /* 620 */ 194, 125, 247, 194, 129, 249, 270, 130, 251, 131, - /* 630 */ 119, 253, 194, 270, 194, 254, 270, 255, 270, 240, - /* 640 */ 270, 270, 240, 270, 270, 244, 263, 263, 270, 240, - /* 650 */ 270, 270, 270, 270, 270, 270, 194, 267, 270, 232, - /* 660 */ 270, 270, 270, 270, 270, 270, 232, 270, 258, 270, - /* 670 */ 270, 270, 270, 232, 259, 270, 270, 270, 270, 84, - /* 680 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 690 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 700 */ 194, 270, 194, 194, 194, 270, 194, 194, 194, 194, - /* 710 */ 194, 194, 194, 194, 194, 194, 270, 194, 194, 194, - /* 720 */ 270, 194, 194, 194, 194, 194, 194, 194, 194, 270, - /* 730 */ 270, 270, 194, 270, 194, 194, 270, 194, 194, 194, - /* 740 */ 194, 194, 194, 270, 194, 194, 194, 194, 194, 194, - /* 750 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, - /* 760 */ 194, 194, 194, 270, 270, 270, 270, 270, 270, 270, + /* 0 */ 259, 1, 194, 1, 193, 194, 259, 191, 192, 9, + /* 10 */ 1, 9, 259, 13, 14, 238, 16, 17, 9, 242, + /* 20 */ 20, 21, 269, 23, 24, 25, 26, 27, 28, 240, + /* 30 */ 240, 238, 238, 33, 34, 242, 242, 37, 38, 39, + /* 40 */ 13, 14, 194, 16, 17, 256, 256, 20, 21, 1, + /* 50 */ 23, 24, 25, 26, 27, 28, 240, 9, 194, 200, + /* 60 */ 33, 34, 200, 194, 37, 38, 39, 14, 260, 16, + /* 70 */ 17, 5, 256, 20, 21, 200, 23, 24, 25, 26, + /* 80 */ 27, 28, 80, 80, 194, 237, 33, 34, 194, 241, + /* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51, + /* 100 */ 52, 53, 54, 55, 56, 57, 58, 81, 81, 61, + /* 110 */ 201, 111, 13, 14, 194, 16, 17, 114, 259, 20, + /* 120 */ 21, 259, 23, 24, 25, 26, 27, 28, 269, 239, + /* 130 */ 266, 269, 33, 34, 259, 266, 37, 38, 39, 13, + /* 140 */ 14, 115, 16, 17, 269, 236, 20, 21, 0, 23, + /* 150 */ 24, 25, 26, 27, 28, 261, 262, 237, 82, 33, + /* 160 */ 34, 241, 194, 37, 38, 39, 92, 93, 94, 95, + /* 170 */ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + /* 180 */ 106, 215, 216, 217, 218, 219, 220, 221, 222, 223, + /* 190 */ 224, 225, 226, 227, 228, 229, 16, 17, 44, 231, + /* 200 */ 20, 21, 137, 23, 24, 25, 26, 27, 28, 194, + /* 210 */ 259, 146, 147, 33, 34, 61, 84, 37, 38, 39, + /* 220 */ 33, 34, 68, 80, 37, 38, 39, 73, 74, 75, + /* 230 */ 82, 1, 2, 79, 80, 5, 81, 7, 76, 9, + /* 240 */ 259, 1, 2, 199, 194, 5, 84, 7, 204, 9, + /* 250 */ 62, 63, 64, 110, 111, 259, 241, 69, 70, 71, + /* 260 */ 72, 242, 194, 33, 34, 194, 78, 37, 114, 92, + /* 270 */ 115, 94, 95, 33, 34, 68, 99, 259, 101, 102, + /* 280 */ 103, 2, 105, 106, 5, 242, 7, 237, 9, 259, + /* 290 */ 136, 241, 138, 215, 5, 217, 218, 213, 214, 145, + /* 300 */ 222, 68, 224, 225, 226, 237, 228, 229, 194, 241, + /* 310 */ 80, 194, 33, 34, 202, 203, 25, 26, 27, 28, + /* 320 */ 80, 199, 33, 34, 33, 34, 204, 242, 37, 38, + /* 330 */ 39, 62, 63, 64, 201, 264, 259, 266, 69, 70, + /* 340 */ 71, 72, 112, 113, 37, 201, 139, 194, 141, 119, + /* 350 */ 143, 144, 112, 113, 237, 62, 63, 64, 241, 119, + /* 360 */ 194, 194, 69, 70, 71, 72, 233, 234, 235, 236, + /* 370 */ 194, 91, 139, 194, 141, 194, 143, 144, 234, 5, + /* 380 */ 266, 7, 268, 199, 37, 38, 39, 5, 204, 7, + /* 390 */ 237, 112, 113, 91, 241, 65, 66, 67, 62, 63, + /* 400 */ 64, 243, 91, 237, 237, 197, 198, 241, 241, 127, + /* 410 */ 128, 1, 80, 237, 134, 257, 237, 241, 237, 15, + /* 420 */ 241, 81, 241, 81, 117, 81, 81, 81, 259, 118, + /* 430 */ 81, 91, 81, 91, 132, 91, 91, 91, 81, 81, + /* 440 */ 91, 109, 91, 81, 81, 60, 81, 37, 91, 91, + /* 450 */ 140, 80, 142, 91, 91, 140, 91, 142, 140, 5, + /* 460 */ 142, 7, 5, 259, 7, 80, 140, 140, 142, 142, + /* 470 */ 259, 140, 259, 142, 76, 77, 259, 259, 259, 108, + /* 480 */ 259, 259, 259, 259, 259, 232, 232, 232, 232, 232, + /* 490 */ 232, 232, 194, 119, 194, 194, 258, 194, 194, 194, + /* 500 */ 240, 119, 240, 194, 267, 244, 194, 194, 194, 267, + /* 510 */ 240, 194, 60, 194, 194, 194, 112, 194, 194, 194, + /* 520 */ 119, 255, 194, 194, 124, 253, 263, 194, 194, 194, + /* 530 */ 263, 194, 194, 194, 263, 194, 263, 194, 131, 133, + /* 540 */ 254, 130, 194, 125, 194, 129, 194, 194, 194, 194, + /* 550 */ 194, 252, 123, 194, 194, 194, 122, 251, 194, 121, + /* 560 */ 194, 194, 194, 194, 194, 249, 194, 194, 120, 194, + /* 570 */ 194, 194, 194, 194, 194, 194, 135, 194, 194, 107, + /* 580 */ 194, 194, 194, 194, 194, 194, 194, 194, 90, 195, + /* 590 */ 195, 195, 195, 89, 195, 50, 86, 88, 54, 87, + /* 600 */ 85, 82, 5, 5, 195, 5, 148, 148, 195, 195, + /* 610 */ 5, 5, 94, 93, 137, 195, 195, 115, 201, 80, + /* 620 */ 201, 116, 109, 81, 91, 91, 80, 195, 81, 80, + /* 630 */ 195, 206, 196, 210, 212, 211, 209, 207, 205, 208, + /* 640 */ 196, 196, 214, 196, 195, 230, 195, 197, 195, 81, + /* 650 */ 245, 248, 250, 91, 80, 247, 230, 202, 246, 81, + /* 660 */ 80, 1, 80, 91, 81, 80, 126, 91, 80, 126, + /* 670 */ 80, 80, 109, 9, 110, 76, 5, 5, 5, 5, + /* 680 */ 5, 15, 80, 76, 83, 81, 24, 112, 80, 58, + /* 690 */ 142, 5, 16, 142, 91, 16, 142, 142, 5, 81, + /* 700 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 710 */ 5, 5, 5, 5, 5, 5, 5, 91, 83, 60, + /* 720 */ 59, 0, 270, 270, 270, 270, 270, 270, 270, 270, + /* 730 */ 270, 270, 270, 21, 21, 270, 270, 270, 270, 270, + /* 740 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 750 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 760 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, /* 770 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, /* 780 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, /* 790 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 800 */ 270, 232, 232, 232, 232, 270, 270, 270, 270, 270, - /* 810 */ 270, 270, 270, 270, 270, 242, 242, 242, 270, 270, + /* 800 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 810 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, /* 820 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, - /* 830 */ 270, 270, 270, 270, 270, 259, 259, 259, 259, 259, - /* 840 */ 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, - /* 850 */ 259, 259, 259, 259, + /* 830 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 840 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 850 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 860 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 870 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 880 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 890 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 900 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 910 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 920 */ 270, 270, 270, 270, 270, }; -#define YY_SHIFT_USE_DFLT (-111) -#define YY_SHIFT_COUNT (346) -#define YY_SHIFT_MIN (-110) -#define YY_SHIFT_MAX (595) -static const short yy_shift_ofst[] = { - /* 0 */ 198, 122, 122, 204, 204, 505, 228, 337, 337, 316, - /* 10 */ 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - /* 20 */ 167, 167, 167, -1, 87, 337, 324, 324, 324, 173, - /* 30 */ 173, 167, 167, 167, 380, 167, 167, 317, 505, 595, - /* 40 */ 595, 549, -111, -111, -111, 337, 337, 337, 337, 337, - /* 50 */ 337, 337, 337, 337, 337, 337, 337, 337, 337, 337, - /* 60 */ 337, 337, 337, 337, 337, 324, 324, 324, 118, 118, - /* 70 */ 118, 118, 118, 118, 118, 167, 167, 167, 246, 167, - /* 80 */ 167, 167, 173, 173, 167, 167, 167, 167, -110, -110, - /* 90 */ 259, 173, 167, 167, 167, 167, 167, 167, 167, 167, - /* 100 */ 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - /* 110 */ 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - /* 120 */ 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - /* 130 */ 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - /* 140 */ 167, 167, 167, 167, 489, 489, 489, 511, 511, 511, - /* 150 */ 489, 511, 489, 498, 464, 497, 496, 495, 494, 493, - /* 160 */ 492, 487, 470, 461, 489, 489, 489, 460, 505, 505, - /* 170 */ 489, 489, 491, 490, 526, 488, 485, 507, 484, 483, - /* 180 */ 460, 549, 489, 482, 482, 489, 482, 489, 482, 489, - /* 190 */ 489, -111, -111, 26, 53, 53, 88, 53, 133, 157, - /* 200 */ 218, 218, 218, 218, 252, 304, 290, -32, -32, -32, - /* 210 */ -32, 243, 97, -75, -66, 56, 56, 93, 50, -37, - /* 220 */ -53, 348, 270, 98, 347, 344, 341, 184, -35, 340, - /* 230 */ 333, 332, 329, 325, 83, 313, 213, 233, -12, 172, - /* 240 */ -60, 250, 241, 134, 262, 253, 46, -11, -5, -58, - /* 250 */ -73, 542, 398, 539, 537, 395, 536, 535, 458, 455, - /* 260 */ 397, 422, 406, 459, 411, 457, 456, 454, 444, 451, - /* 270 */ 453, 450, 439, 449, 447, 446, 522, 445, 443, 442, - /* 280 */ 430, 394, 428, 386, 437, 406, 436, 405, 431, 400, - /* 290 */ 433, 504, 503, 502, 501, 500, 499, 420, 486, 424, - /* 300 */ 419, 417, 385, 416, 478, 432, 479, 352, 351, 392, - /* 310 */ 392, 392, 392, 476, 349, 345, 392, 392, 392, 481, - /* 320 */ 480, 403, 392, 477, 475, 474, 473, 472, 471, 469, - /* 330 */ 468, 467, 466, 465, 463, 452, 448, 435, 413, 330, - /* 340 */ 278, 156, 279, 229, 102, 96, 41, +#define YY_SHIFT_COUNT (346) +#define YY_SHIFT_MIN (0) +#define YY_SHIFT_MAX (721) +static const unsigned short int yy_shift_ofst[] = { + /* 0 */ 154, 74, 74, 177, 177, 76, 230, 240, 240, 2, + /* 10 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 20 */ 9, 9, 9, 0, 48, 240, 279, 279, 279, 3, + /* 30 */ 3, 9, 9, 9, 148, 9, 9, 162, 76, 132, + /* 40 */ 132, 66, 735, 735, 735, 240, 240, 240, 240, 240, + /* 50 */ 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, + /* 60 */ 240, 240, 240, 240, 240, 279, 279, 279, 289, 289, + /* 70 */ 289, 289, 289, 289, 289, 9, 9, 9, 307, 9, + /* 80 */ 9, 9, 3, 3, 9, 9, 9, 9, 282, 282, + /* 90 */ 311, 3, 9, 9, 9, 9, 9, 9, 9, 9, + /* 100 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 110 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 120 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 130 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 140 */ 9, 9, 9, 9, 452, 452, 452, 401, 401, 401, + /* 150 */ 452, 401, 452, 407, 406, 411, 418, 416, 400, 429, + /* 160 */ 434, 438, 448, 441, 452, 452, 452, 472, 76, 76, + /* 170 */ 452, 452, 498, 504, 545, 510, 509, 544, 512, 515, + /* 180 */ 472, 66, 452, 519, 519, 452, 519, 452, 519, 452, + /* 190 */ 452, 735, 735, 27, 99, 99, 126, 99, 53, 180, + /* 200 */ 291, 291, 291, 291, 188, 269, 293, 187, 187, 187, + /* 210 */ 187, 207, 233, 65, 143, 347, 347, 374, 382, 330, + /* 220 */ 336, 340, 26, 155, 342, 344, 345, 280, 302, 346, + /* 230 */ 349, 351, 357, 358, 332, 362, 363, 410, 385, 404, + /* 240 */ 365, 310, 315, 318, 454, 457, 326, 327, 371, 331, + /* 250 */ 398, 597, 458, 598, 600, 459, 605, 606, 518, 520, + /* 260 */ 477, 502, 513, 539, 505, 542, 546, 533, 534, 547, + /* 270 */ 549, 568, 562, 574, 578, 580, 660, 582, 583, 585, + /* 280 */ 572, 540, 576, 543, 588, 513, 590, 563, 591, 564, + /* 290 */ 599, 664, 671, 672, 673, 674, 675, 601, 666, 607, + /* 300 */ 602, 604, 575, 608, 662, 631, 676, 548, 551, 603, + /* 310 */ 603, 603, 603, 679, 554, 555, 603, 603, 603, 686, + /* 320 */ 693, 618, 603, 695, 696, 697, 698, 699, 700, 701, + /* 330 */ 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, + /* 340 */ 626, 635, 712, 713, 659, 661, 721, }; -#define YY_REDUCE_USE_DFLT (-158) #define YY_REDUCE_COUNT (192) -#define YY_REDUCE_MIN (-157) -#define YY_REDUCE_MAX (594) +#define YY_REDUCE_MIN (-259) +#define YY_REDUCE_MAX (455) static const short yy_reduce_ofst[] = { - /* 0 */ -157, -18, -18, 64, 64, -116, 120, 119, 68, -30, - /* 10 */ 178, -19, -136, 171, 170, 162, 161, 154, 108, 91, - /* 20 */ 60, 54, -48, 258, 273, 206, 222, 217, 216, 207, - /* 30 */ 205, 215, 203, -133, -112, 257, 248, 244, 79, 242, - /* 40 */ 201, 220, 187, 224, 66, 594, 593, 592, 591, 590, - /* 50 */ 589, 588, 587, 586, 585, 584, 583, 582, 581, 580, - /* 60 */ 579, 578, 577, 576, 415, 575, 574, 573, 572, 571, - /* 70 */ 570, 569, 441, 434, 427, 568, 567, 566, 410, 565, - /* 80 */ 564, 563, 409, 402, 562, 561, 560, 559, 390, 339, - /* 90 */ 401, 399, 558, 557, 556, 555, 554, 553, 552, 551, - /* 100 */ 550, 548, 547, 546, 545, 544, 543, 541, 540, 538, - /* 110 */ 534, 533, 532, 531, 530, 529, 528, 527, 525, 524, - /* 120 */ 523, 521, 520, 519, 518, 517, 516, 515, 514, 513, - /* 130 */ 512, 510, 509, 508, 506, 462, 440, 438, 429, 426, - /* 140 */ 425, 423, 421, 418, 414, 412, 408, 384, 383, 338, - /* 150 */ 407, 335, 404, 382, 381, 378, 342, 377, 343, 376, - /* 160 */ 357, 375, 346, 350, 396, 393, 391, 374, 388, 379, - /* 170 */ 389, 387, 373, 372, 360, 371, 369, 368, 364, 361, - /* 180 */ 328, 355, 370, 367, 366, 365, 363, 362, 359, 358, - /* 190 */ 356, 354, 353, + /* 0 */ -184, -34, -34, 78, 78, 133, -141, -138, -125, -106, + /* 10 */ -152, 114, 71, -80, 50, 68, 117, 153, 166, 167, + /* 20 */ 176, 179, 181, -192, -189, -247, -223, -207, -206, -211, + /* 30 */ -210, -136, -131, -110, -91, -32, 15, 44, 144, 122, + /* 40 */ 184, 84, 158, 112, 208, -259, -253, -49, -19, -4, + /* 50 */ 18, 30, 77, 169, 204, 211, 213, 217, 218, 219, + /* 60 */ 221, 222, 223, 224, 225, 19, 43, 85, 253, 254, + /* 70 */ 255, 256, 257, 258, 259, 298, 300, 301, 238, 303, + /* 80 */ 304, 305, 260, 262, 309, 312, 313, 314, 237, 242, + /* 90 */ 261, 270, 317, 319, 320, 321, 323, 324, 325, 328, + /* 100 */ 329, 333, 334, 335, 337, 338, 339, 341, 343, 348, + /* 110 */ 350, 352, 353, 354, 355, 356, 359, 360, 361, 364, + /* 120 */ 366, 367, 368, 369, 370, 372, 373, 375, 376, 377, + /* 130 */ 378, 379, 380, 381, 383, 384, 386, 387, 388, 389, + /* 140 */ 390, 391, 392, 393, 394, 395, 396, 263, 267, 271, + /* 150 */ 397, 273, 399, 266, 286, 272, 299, 306, 402, 316, + /* 160 */ 403, 408, 412, 405, 409, 413, 414, 415, 417, 419, + /* 170 */ 420, 421, 422, 424, 423, 425, 427, 430, 431, 433, + /* 180 */ 426, 428, 432, 436, 444, 435, 445, 449, 447, 451, + /* 190 */ 453, 455, 450, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 834, 663, 606, 675, 593, 603, 812, 812, 812, 834, + /* 0 */ 834, 951, 894, 963, 881, 891, 1100, 1100, 1100, 834, /* 10 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 20 */ 834, 834, 834, 723, 565, 812, 834, 834, 834, 834, - /* 30 */ 834, 834, 834, 834, 603, 834, 834, 609, 603, 609, - /* 40 */ 609, 834, 718, 647, 665, 834, 834, 834, 834, 834, + /* 20 */ 834, 834, 834, 1011, 853, 1100, 834, 834, 834, 834, + /* 30 */ 834, 834, 834, 834, 891, 834, 834, 897, 891, 897, + /* 40 */ 897, 834, 1006, 935, 953, 834, 834, 834, 834, 834, /* 50 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, /* 60 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 70 */ 834, 834, 834, 834, 834, 834, 834, 834, 725, 731, - /* 80 */ 728, 834, 834, 834, 733, 834, 834, 834, 755, 755, - /* 90 */ 716, 834, 834, 834, 834, 834, 834, 834, 834, 834, + /* 70 */ 834, 834, 834, 834, 834, 834, 834, 834, 1013, 1019, + /* 80 */ 1016, 834, 834, 834, 1021, 834, 834, 834, 1043, 1043, + /* 90 */ 1004, 834, 834, 834, 834, 834, 834, 834, 834, 834, /* 100 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, /* 110 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 120 */ 591, 834, 589, 834, 834, 834, 834, 834, 834, 834, - /* 130 */ 834, 834, 834, 834, 834, 834, 834, 576, 834, 834, - /* 140 */ 834, 834, 834, 834, 567, 567, 567, 834, 834, 834, - /* 150 */ 567, 834, 567, 762, 766, 760, 748, 756, 747, 743, - /* 160 */ 741, 739, 738, 770, 567, 567, 567, 607, 603, 603, - /* 170 */ 567, 567, 625, 623, 621, 613, 619, 615, 617, 611, - /* 180 */ 594, 834, 567, 601, 601, 567, 601, 567, 601, 567, - /* 190 */ 567, 647, 665, 834, 771, 761, 834, 811, 801, 800, - /* 200 */ 807, 799, 798, 797, 834, 834, 834, 793, 796, 795, - /* 210 */ 794, 834, 834, 834, 834, 803, 802, 834, 834, 834, - /* 220 */ 834, 834, 834, 834, 834, 834, 834, 767, 763, 834, - /* 230 */ 834, 834, 834, 834, 834, 834, 834, 834, 773, 834, - /* 240 */ 834, 834, 834, 834, 834, 834, 834, 834, 677, 834, + /* 120 */ 879, 834, 877, 834, 834, 834, 834, 834, 834, 834, + /* 130 */ 834, 834, 834, 834, 834, 834, 834, 864, 834, 834, + /* 140 */ 834, 834, 834, 834, 855, 855, 855, 834, 834, 834, + /* 150 */ 855, 834, 855, 1050, 1054, 1048, 1036, 1044, 1035, 1031, + /* 160 */ 1029, 1027, 1026, 1058, 855, 855, 855, 895, 891, 891, + /* 170 */ 855, 855, 913, 911, 909, 901, 907, 903, 905, 899, + /* 180 */ 882, 834, 855, 889, 889, 855, 889, 855, 889, 855, + /* 190 */ 855, 935, 953, 834, 1059, 1049, 834, 1099, 1089, 1088, + /* 200 */ 1095, 1087, 1086, 1085, 834, 834, 834, 1081, 1084, 1083, + /* 210 */ 1082, 834, 834, 834, 834, 1091, 1090, 834, 834, 834, + /* 220 */ 834, 834, 834, 834, 834, 834, 834, 1055, 1051, 834, + /* 230 */ 834, 834, 834, 834, 834, 834, 834, 834, 1061, 834, + /* 240 */ 834, 834, 834, 834, 834, 834, 834, 834, 965, 834, /* 250 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 260 */ 834, 715, 834, 834, 834, 834, 834, 727, 726, 834, + /* 260 */ 834, 1003, 834, 834, 834, 834, 834, 1015, 1014, 834, /* 270 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 280 */ 757, 834, 749, 834, 834, 689, 834, 834, 834, 834, + /* 280 */ 1045, 834, 1037, 834, 834, 977, 834, 834, 834, 834, /* 290 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 300 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 830, - /* 310 */ 825, 826, 823, 834, 834, 834, 822, 817, 818, 834, - /* 320 */ 834, 834, 815, 834, 834, 834, 834, 834, 834, 834, + /* 300 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 1118, + /* 310 */ 1113, 1114, 1111, 834, 834, 834, 1110, 1105, 1106, 834, + /* 320 */ 834, 834, 1103, 834, 834, 834, 834, 834, 834, 834, /* 330 */ 834, 834, 834, 834, 834, 834, 834, 834, 834, 834, - /* 340 */ 631, 834, 574, 572, 834, 563, 834, 833, 832, 831, - /* 350 */ 814, 813, 685, 724, 720, 722, 721, 719, 732, 729, - /* 360 */ 730, 714, 713, 712, 734, 717, 737, 736, 740, 742, - /* 370 */ 745, 744, 746, 735, 759, 758, 751, 752, 754, 753, - /* 380 */ 750, 769, 768, 765, 764, 711, 695, 690, 687, 694, - /* 390 */ 693, 692, 700, 699, 691, 688, 684, 683, 608, 664, - /* 400 */ 662, 661, 660, 659, 658, 657, 656, 655, 654, 653, - /* 410 */ 652, 651, 650, 649, 648, 643, 639, 637, 636, 635, - /* 420 */ 632, 602, 605, 604, 809, 810, 808, 806, 805, 804, - /* 430 */ 790, 789, 788, 787, 784, 783, 782, 779, 785, 781, - /* 440 */ 778, 786, 780, 777, 776, 775, 774, 792, 791, 772, - /* 450 */ 597, 829, 828, 827, 824, 821, 710, 709, 708, 707, - /* 460 */ 706, 705, 704, 703, 702, 701, 820, 819, 816, 697, - /* 470 */ 698, 679, 682, 681, 680, 678, 696, 627, 626, 624, - /* 480 */ 622, 614, 620, 616, 618, 612, 610, 596, 595, 676, - /* 490 */ 646, 674, 673, 672, 671, 670, 669, 668, 667, 666, - /* 500 */ 645, 644, 642, 641, 640, 638, 634, 633, 629, 630, - /* 510 */ 628, 592, 590, 588, 587, 586, 585, 584, 583, 582, - /* 520 */ 581, 580, 579, 600, 578, 577, 575, 573, 571, 570, - /* 530 */ 569, 599, 598, 568, 566, 564, 562, 561, 560, 559, - /* 540 */ 558, 557, 556, 555, 554, 553, 552, 551, 550, + /* 340 */ 919, 834, 862, 860, 834, 851, 834, }; +/********** 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. ** @@ -478,6 +489,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[] = { @@ -685,9 +700,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 @@ -698,17 +717,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; @@ -745,80 +768,282 @@ 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", "TOPICS", "MNODES", - "DNODES", "ACCOUNTS", "USERS", "MODULES", - "QUERIES", "CONNECTIONS", "STREAMS", "VARIABLES", - "SCORES", "GRANTS", "VNODES", "IPTOKEN", - "DOT", "CREATE", "TABLE", "STABLE", - "DATABASE", "TABLES", "STABLES", "VGROUPS", - "DROP", "TOPIC", "DNODE", "USER", - "ACCOUNT", "USE", "DESCRIBE", "ALTER", - "PASS", "PRIVILEGE", "LOCAL", "COMPACT", - "LP", "RP", "IF", "EXISTS", - "PPS", "TSERIES", "DBS", "STORAGE", - "QTIME", "CONNS", "STATE", "COMMA", - "KEEP", "CACHE", "REPLICA", "QUORUM", - "DAYS", "MINROWS", "MAXROWS", "BLOCKS", - "CTIME", "WAL", "FSYNC", "COMP", - "PRECISION", "UPDATE", "CACHELAST", "PARTITIONS", - "UNSIGNED", "TAGS", "USING", "AS", - "NULL", "NOW", "SELECT", "UNION", - "ALL", "DISTINCT", "FROM", "VARIABLE", - "INTERVAL", "SESSION", "STATE_WINDOW", "FILL", - "SLIDING", "ORDER", "BY", "ASC", - "DESC", "GROUP", "HAVING", "LIMIT", - "OFFSET", "SLIMIT", "SOFFSET", "WHERE", - "RESET", "QUERY", "SYNCDB", "ADD", - "COLUMN", "MODIFY", "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", - "SEMI", "NONE", "PREV", "LINEAR", - "IMPORT", "TBNAME", "JOIN", "INSERT", - "INTO", "VALUES", "error", "program", - "cmd", "dbPrefix", "ids", "cpxName", - "ifexists", "alter_db_optr", "alter_topic_optr", "acct_optr", - "exprlist", "ifnotexists", "db_optr", "topic_optr", - "pps", "tseries", "dbs", "streams", - "storage", "qtime", "users", "conns", - "state", "intitemlist", "intitem", "keep", - "cache", "replica", "quorum", "days", - "minrows", "maxrows", "blocks", "ctime", - "wal", "fsync", "comp", "prec", - "update", "cachelast", "partitions", "typename", - "signed", "create_table_args", "create_stable_args", "create_table_list", - "create_from_stable", "columnlist", "tagitemlist", "tagNamelist", - "select", "column", "tagitem", "selcollist", - "from", "where_opt", "interval_opt", "session_option", - "windowstate_option", "fill_opt", "sliding_opt", "groupby_opt", - "orderby_opt", "having_opt", "slimit_opt", "limit_opt", - "union", "sclp", "distinct", "expr", - "as", "tablelist", "sub", "tmvar", - "sortlist", "sortitem", "item", "sortorder", - "grouplist", "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 */ "TOPICS", + /* 47 */ "MNODES", + /* 48 */ "DNODES", + /* 49 */ "ACCOUNTS", + /* 50 */ "USERS", + /* 51 */ "MODULES", + /* 52 */ "QUERIES", + /* 53 */ "CONNECTIONS", + /* 54 */ "STREAMS", + /* 55 */ "VARIABLES", + /* 56 */ "SCORES", + /* 57 */ "GRANTS", + /* 58 */ "VNODES", + /* 59 */ "IPTOKEN", + /* 60 */ "DOT", + /* 61 */ "CREATE", + /* 62 */ "TABLE", + /* 63 */ "STABLE", + /* 64 */ "DATABASE", + /* 65 */ "TABLES", + /* 66 */ "STABLES", + /* 67 */ "VGROUPS", + /* 68 */ "DROP", + /* 69 */ "TOPIC", + /* 70 */ "DNODE", + /* 71 */ "USER", + /* 72 */ "ACCOUNT", + /* 73 */ "USE", + /* 74 */ "DESCRIBE", + /* 75 */ "ALTER", + /* 76 */ "PASS", + /* 77 */ "PRIVILEGE", + /* 78 */ "LOCAL", + /* 79 */ "COMPACT", + /* 80 */ "LP", + /* 81 */ "RP", + /* 82 */ "IF", + /* 83 */ "EXISTS", + /* 84 */ "PPS", + /* 85 */ "TSERIES", + /* 86 */ "DBS", + /* 87 */ "STORAGE", + /* 88 */ "QTIME", + /* 89 */ "CONNS", + /* 90 */ "STATE", + /* 91 */ "COMMA", + /* 92 */ "KEEP", + /* 93 */ "CACHE", + /* 94 */ "REPLICA", + /* 95 */ "QUORUM", + /* 96 */ "DAYS", + /* 97 */ "MINROWS", + /* 98 */ "MAXROWS", + /* 99 */ "BLOCKS", + /* 100 */ "CTIME", + /* 101 */ "WAL", + /* 102 */ "FSYNC", + /* 103 */ "COMP", + /* 104 */ "PRECISION", + /* 105 */ "UPDATE", + /* 106 */ "CACHELAST", + /* 107 */ "PARTITIONS", + /* 108 */ "UNSIGNED", + /* 109 */ "TAGS", + /* 110 */ "USING", + /* 111 */ "AS", + /* 112 */ "NULL", + /* 113 */ "NOW", + /* 114 */ "SELECT", + /* 115 */ "UNION", + /* 116 */ "ALL", + /* 117 */ "DISTINCT", + /* 118 */ "FROM", + /* 119 */ "VARIABLE", + /* 120 */ "INTERVAL", + /* 121 */ "SESSION", + /* 122 */ "STATE_WINDOW", + /* 123 */ "FILL", + /* 124 */ "SLIDING", + /* 125 */ "ORDER", + /* 126 */ "BY", + /* 127 */ "ASC", + /* 128 */ "DESC", + /* 129 */ "GROUP", + /* 130 */ "HAVING", + /* 131 */ "LIMIT", + /* 132 */ "OFFSET", + /* 133 */ "SLIMIT", + /* 134 */ "SOFFSET", + /* 135 */ "WHERE", + /* 136 */ "RESET", + /* 137 */ "QUERY", + /* 138 */ "SYNCDB", + /* 139 */ "ADD", + /* 140 */ "COLUMN", + /* 141 */ "MODIFY", + /* 142 */ "TAG", + /* 143 */ "CHANGE", + /* 144 */ "SET", + /* 145 */ "KILL", + /* 146 */ "CONNECTION", + /* 147 */ "STREAM", + /* 148 */ "COLON", + /* 149 */ "ABORT", + /* 150 */ "AFTER", + /* 151 */ "ATTACH", + /* 152 */ "BEFORE", + /* 153 */ "BEGIN", + /* 154 */ "CASCADE", + /* 155 */ "CLUSTER", + /* 156 */ "CONFLICT", + /* 157 */ "COPY", + /* 158 */ "DEFERRED", + /* 159 */ "DELIMITERS", + /* 160 */ "DETACH", + /* 161 */ "EACH", + /* 162 */ "END", + /* 163 */ "EXPLAIN", + /* 164 */ "FAIL", + /* 165 */ "FOR", + /* 166 */ "IGNORE", + /* 167 */ "IMMEDIATE", + /* 168 */ "INITIALLY", + /* 169 */ "INSTEAD", + /* 170 */ "MATCH", + /* 171 */ "KEY", + /* 172 */ "OF", + /* 173 */ "RAISE", + /* 174 */ "REPLACE", + /* 175 */ "RESTRICT", + /* 176 */ "ROW", + /* 177 */ "STATEMENT", + /* 178 */ "TRIGGER", + /* 179 */ "VIEW", + /* 180 */ "SEMI", + /* 181 */ "NONE", + /* 182 */ "PREV", + /* 183 */ "LINEAR", + /* 184 */ "IMPORT", + /* 185 */ "TBNAME", + /* 186 */ "JOIN", + /* 187 */ "INSERT", + /* 188 */ "INTO", + /* 189 */ "VALUES", + /* 190 */ "error", + /* 191 */ "program", + /* 192 */ "cmd", + /* 193 */ "dbPrefix", + /* 194 */ "ids", + /* 195 */ "cpxName", + /* 196 */ "ifexists", + /* 197 */ "alter_db_optr", + /* 198 */ "alter_topic_optr", + /* 199 */ "acct_optr", + /* 200 */ "exprlist", + /* 201 */ "ifnotexists", + /* 202 */ "db_optr", + /* 203 */ "topic_optr", + /* 204 */ "pps", + /* 205 */ "tseries", + /* 206 */ "dbs", + /* 207 */ "streams", + /* 208 */ "storage", + /* 209 */ "qtime", + /* 210 */ "users", + /* 211 */ "conns", + /* 212 */ "state", + /* 213 */ "intitemlist", + /* 214 */ "intitem", + /* 215 */ "keep", + /* 216 */ "cache", + /* 217 */ "replica", + /* 218 */ "quorum", + /* 219 */ "days", + /* 220 */ "minrows", + /* 221 */ "maxrows", + /* 222 */ "blocks", + /* 223 */ "ctime", + /* 224 */ "wal", + /* 225 */ "fsync", + /* 226 */ "comp", + /* 227 */ "prec", + /* 228 */ "update", + /* 229 */ "cachelast", + /* 230 */ "partitions", + /* 231 */ "typename", + /* 232 */ "signed", + /* 233 */ "create_table_args", + /* 234 */ "create_stable_args", + /* 235 */ "create_table_list", + /* 236 */ "create_from_stable", + /* 237 */ "columnlist", + /* 238 */ "tagitemlist", + /* 239 */ "tagNamelist", + /* 240 */ "select", + /* 241 */ "column", + /* 242 */ "tagitem", + /* 243 */ "selcollist", + /* 244 */ "from", + /* 245 */ "where_opt", + /* 246 */ "interval_opt", + /* 247 */ "session_option", + /* 248 */ "windowstate_option", + /* 249 */ "fill_opt", + /* 250 */ "sliding_opt", + /* 251 */ "groupby_opt", + /* 252 */ "orderby_opt", + /* 253 */ "having_opt", + /* 254 */ "slimit_opt", + /* 255 */ "limit_opt", + /* 256 */ "union", + /* 257 */ "sclp", + /* 258 */ "distinct", + /* 259 */ "expr", + /* 260 */ "as", + /* 261 */ "tablelist", + /* 262 */ "sub", + /* 263 */ "tmvar", + /* 264 */ "sortlist", + /* 265 */ "sortitem", + /* 266 */ "item", + /* 267 */ "sortorder", + /* 268 */ "grouplist", + /* 269 */ "expritem", }; -#endif /* NDEBUG */ +#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ #ifndef NDEBUG /* For tracing reduce actions, the names of all rules are required. @@ -1115,27 +1340,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 @@ -1148,27 +1420,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 */ @@ -1184,9 +1450,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 200: /* exprlist */ case 243: /* selcollist */ case 257: /* sclp */ @@ -1243,6 +1510,7 @@ destroyAllSqlNode((yypminor->yy441)); tVariantDestroy(&(yypminor->yy506)); } break; +/********* End destructor definitions *****************************************/ default: break; /* If no destructor action specified: do nothing */ } } @@ -1252,51 +1520,53 @@ tVariantDestroy(&(yypminor->yy506)); ** ** 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. @@ -1304,33 +1574,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 */ @@ -1394,7 +1700,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 @@ -1411,20 +1716,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. */ @@ -1432,337 +1759,333 @@ 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[] = { - { 191, 1 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 2 }, - { 192, 3 }, - { 193, 0 }, - { 193, 2 }, - { 195, 0 }, - { 195, 2 }, - { 192, 5 }, - { 192, 5 }, - { 192, 4 }, - { 192, 3 }, - { 192, 5 }, - { 192, 3 }, - { 192, 5 }, - { 192, 3 }, - { 192, 4 }, - { 192, 5 }, - { 192, 5 }, - { 192, 4 }, - { 192, 4 }, - { 192, 3 }, - { 192, 3 }, - { 192, 3 }, - { 192, 2 }, - { 192, 3 }, - { 192, 5 }, - { 192, 5 }, - { 192, 4 }, - { 192, 5 }, - { 192, 3 }, - { 192, 4 }, - { 192, 4 }, - { 192, 4 }, - { 192, 4 }, - { 192, 6 }, - { 192, 6 }, - { 194, 1 }, - { 194, 1 }, - { 196, 2 }, - { 196, 0 }, - { 201, 3 }, - { 201, 0 }, - { 192, 3 }, - { 192, 6 }, - { 192, 5 }, - { 192, 5 }, - { 192, 5 }, - { 204, 0 }, - { 204, 2 }, - { 205, 0 }, - { 205, 2 }, - { 206, 0 }, - { 206, 2 }, - { 207, 0 }, - { 207, 2 }, - { 208, 0 }, - { 208, 2 }, - { 209, 0 }, - { 209, 2 }, - { 210, 0 }, - { 210, 2 }, - { 211, 0 }, - { 211, 2 }, - { 212, 0 }, - { 212, 2 }, - { 199, 9 }, - { 213, 3 }, - { 213, 1 }, - { 214, 1 }, - { 215, 2 }, - { 216, 2 }, - { 217, 2 }, - { 218, 2 }, - { 219, 2 }, - { 220, 2 }, - { 221, 2 }, - { 222, 2 }, - { 223, 2 }, - { 224, 2 }, - { 225, 2 }, - { 226, 2 }, - { 227, 2 }, - { 228, 2 }, - { 229, 2 }, - { 230, 2 }, - { 202, 0 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 202, 2 }, - { 203, 1 }, - { 203, 2 }, - { 197, 0 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 197, 2 }, - { 198, 1 }, - { 198, 2 }, - { 231, 1 }, - { 231, 4 }, - { 231, 2 }, - { 232, 1 }, - { 232, 2 }, - { 232, 2 }, - { 192, 3 }, - { 192, 3 }, - { 192, 3 }, - { 192, 3 }, - { 235, 1 }, - { 235, 2 }, - { 233, 6 }, - { 234, 10 }, - { 236, 10 }, - { 236, 13 }, - { 239, 3 }, - { 239, 1 }, - { 233, 5 }, - { 237, 3 }, - { 237, 1 }, - { 241, 2 }, - { 238, 3 }, - { 238, 1 }, - { 242, 1 }, - { 242, 1 }, - { 242, 1 }, - { 242, 1 }, - { 242, 1 }, - { 242, 1 }, - { 242, 2 }, - { 242, 2 }, - { 242, 2 }, - { 242, 2 }, - { 240, 14 }, - { 240, 3 }, - { 256, 1 }, - { 256, 4 }, - { 192, 1 }, - { 240, 2 }, - { 257, 2 }, - { 257, 0 }, - { 243, 4 }, - { 243, 2 }, - { 260, 2 }, - { 260, 1 }, - { 260, 0 }, - { 258, 1 }, - { 258, 0 }, - { 244, 2 }, - { 244, 2 }, - { 262, 3 }, - { 262, 4 }, - { 262, 6 }, - { 261, 2 }, - { 261, 3 }, - { 261, 4 }, - { 261, 5 }, - { 263, 1 }, - { 246, 4 }, - { 246, 6 }, - { 246, 0 }, - { 247, 0 }, - { 247, 7 }, - { 248, 0 }, - { 248, 4 }, - { 249, 0 }, - { 249, 6 }, - { 249, 4 }, - { 250, 4 }, - { 250, 0 }, - { 252, 0 }, - { 252, 3 }, - { 264, 4 }, - { 264, 2 }, - { 266, 2 }, - { 267, 1 }, - { 267, 1 }, - { 267, 0 }, - { 251, 0 }, - { 251, 3 }, - { 268, 3 }, - { 268, 1 }, - { 253, 0 }, - { 253, 2 }, - { 255, 0 }, - { 255, 2 }, - { 255, 4 }, - { 255, 4 }, - { 254, 0 }, - { 254, 2 }, - { 254, 4 }, - { 254, 4 }, - { 245, 0 }, - { 245, 2 }, - { 259, 3 }, - { 259, 1 }, - { 259, 3 }, - { 259, 3 }, - { 259, 1 }, - { 259, 2 }, - { 259, 2 }, - { 259, 1 }, - { 259, 2 }, - { 259, 2 }, - { 259, 1 }, - { 259, 1 }, - { 259, 1 }, - { 259, 2 }, - { 259, 2 }, - { 259, 1 }, - { 259, 1 }, - { 259, 4 }, - { 259, 4 }, - { 259, 3 }, - { 259, 4 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 5 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 3 }, - { 259, 5 }, - { 200, 3 }, - { 200, 1 }, - { 269, 1 }, - { 269, 0 }, - { 192, 3 }, - { 192, 3 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 8 }, - { 192, 9 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 7 }, - { 192, 8 }, - { 192, 9 }, - { 192, 7 }, - { 192, 3 }, - { 192, 5 }, - { 192, 5 }, + { 191, -1 }, /* (0) program ::= cmd */ + { 192, -2 }, /* (1) cmd ::= SHOW DATABASES */ + { 192, -2 }, /* (2) cmd ::= SHOW TOPICS */ + { 192, -2 }, /* (3) cmd ::= SHOW MNODES */ + { 192, -2 }, /* (4) cmd ::= SHOW DNODES */ + { 192, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ + { 192, -2 }, /* (6) cmd ::= SHOW USERS */ + { 192, -2 }, /* (7) cmd ::= SHOW MODULES */ + { 192, -2 }, /* (8) cmd ::= SHOW QUERIES */ + { 192, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ + { 192, -2 }, /* (10) cmd ::= SHOW STREAMS */ + { 192, -2 }, /* (11) cmd ::= SHOW VARIABLES */ + { 192, -2 }, /* (12) cmd ::= SHOW SCORES */ + { 192, -2 }, /* (13) cmd ::= SHOW GRANTS */ + { 192, -2 }, /* (14) cmd ::= SHOW VNODES */ + { 192, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ + { 193, 0 }, /* (16) dbPrefix ::= */ + { 193, -2 }, /* (17) dbPrefix ::= ids DOT */ + { 195, 0 }, /* (18) cpxName ::= */ + { 195, -2 }, /* (19) cpxName ::= DOT ids */ + { 192, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ + { 192, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */ + { 192, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */ + { 192, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */ + { 192, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + { 192, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */ + { 192, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + { 192, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ + { 192, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ + { 192, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ + { 192, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ + { 192, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */ + { 192, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */ + { 192, -3 }, /* (33) cmd ::= DROP DNODE ids */ + { 192, -3 }, /* (34) cmd ::= DROP USER ids */ + { 192, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */ + { 192, -2 }, /* (36) cmd ::= USE ids */ + { 192, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */ + { 192, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */ + { 192, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */ + { 192, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */ + { 192, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */ + { 192, -3 }, /* (42) cmd ::= ALTER LOCAL ids */ + { 192, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */ + { 192, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */ + { 192, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */ + { 192, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */ + { 192, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + { 192, -6 }, /* (48) cmd ::= COMPACT VNODES IN LP exprlist RP */ + { 194, -1 }, /* (49) ids ::= ID */ + { 194, -1 }, /* (50) ids ::= STRING */ + { 196, -2 }, /* (51) ifexists ::= IF EXISTS */ + { 196, 0 }, /* (52) ifexists ::= */ + { 201, -3 }, /* (53) ifnotexists ::= IF NOT EXISTS */ + { 201, 0 }, /* (54) ifnotexists ::= */ + { 192, -3 }, /* (55) cmd ::= CREATE DNODE ids */ + { 192, -6 }, /* (56) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + { 192, -5 }, /* (57) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + { 192, -5 }, /* (58) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ + { 192, -5 }, /* (59) cmd ::= CREATE USER ids PASS ids */ + { 204, 0 }, /* (60) pps ::= */ + { 204, -2 }, /* (61) pps ::= PPS INTEGER */ + { 205, 0 }, /* (62) tseries ::= */ + { 205, -2 }, /* (63) tseries ::= TSERIES INTEGER */ + { 206, 0 }, /* (64) dbs ::= */ + { 206, -2 }, /* (65) dbs ::= DBS INTEGER */ + { 207, 0 }, /* (66) streams ::= */ + { 207, -2 }, /* (67) streams ::= STREAMS INTEGER */ + { 208, 0 }, /* (68) storage ::= */ + { 208, -2 }, /* (69) storage ::= STORAGE INTEGER */ + { 209, 0 }, /* (70) qtime ::= */ + { 209, -2 }, /* (71) qtime ::= QTIME INTEGER */ + { 210, 0 }, /* (72) users ::= */ + { 210, -2 }, /* (73) users ::= USERS INTEGER */ + { 211, 0 }, /* (74) conns ::= */ + { 211, -2 }, /* (75) conns ::= CONNS INTEGER */ + { 212, 0 }, /* (76) state ::= */ + { 212, -2 }, /* (77) state ::= STATE ids */ + { 199, -9 }, /* (78) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + { 213, -3 }, /* (79) intitemlist ::= intitemlist COMMA intitem */ + { 213, -1 }, /* (80) intitemlist ::= intitem */ + { 214, -1 }, /* (81) intitem ::= INTEGER */ + { 215, -2 }, /* (82) keep ::= KEEP intitemlist */ + { 216, -2 }, /* (83) cache ::= CACHE INTEGER */ + { 217, -2 }, /* (84) replica ::= REPLICA INTEGER */ + { 218, -2 }, /* (85) quorum ::= QUORUM INTEGER */ + { 219, -2 }, /* (86) days ::= DAYS INTEGER */ + { 220, -2 }, /* (87) minrows ::= MINROWS INTEGER */ + { 221, -2 }, /* (88) maxrows ::= MAXROWS INTEGER */ + { 222, -2 }, /* (89) blocks ::= BLOCKS INTEGER */ + { 223, -2 }, /* (90) ctime ::= CTIME INTEGER */ + { 224, -2 }, /* (91) wal ::= WAL INTEGER */ + { 225, -2 }, /* (92) fsync ::= FSYNC INTEGER */ + { 226, -2 }, /* (93) comp ::= COMP INTEGER */ + { 227, -2 }, /* (94) prec ::= PRECISION STRING */ + { 228, -2 }, /* (95) update ::= UPDATE INTEGER */ + { 229, -2 }, /* (96) cachelast ::= CACHELAST INTEGER */ + { 230, -2 }, /* (97) partitions ::= PARTITIONS INTEGER */ + { 202, 0 }, /* (98) db_optr ::= */ + { 202, -2 }, /* (99) db_optr ::= db_optr cache */ + { 202, -2 }, /* (100) db_optr ::= db_optr replica */ + { 202, -2 }, /* (101) db_optr ::= db_optr quorum */ + { 202, -2 }, /* (102) db_optr ::= db_optr days */ + { 202, -2 }, /* (103) db_optr ::= db_optr minrows */ + { 202, -2 }, /* (104) db_optr ::= db_optr maxrows */ + { 202, -2 }, /* (105) db_optr ::= db_optr blocks */ + { 202, -2 }, /* (106) db_optr ::= db_optr ctime */ + { 202, -2 }, /* (107) db_optr ::= db_optr wal */ + { 202, -2 }, /* (108) db_optr ::= db_optr fsync */ + { 202, -2 }, /* (109) db_optr ::= db_optr comp */ + { 202, -2 }, /* (110) db_optr ::= db_optr prec */ + { 202, -2 }, /* (111) db_optr ::= db_optr keep */ + { 202, -2 }, /* (112) db_optr ::= db_optr update */ + { 202, -2 }, /* (113) db_optr ::= db_optr cachelast */ + { 203, -1 }, /* (114) topic_optr ::= db_optr */ + { 203, -2 }, /* (115) topic_optr ::= topic_optr partitions */ + { 197, 0 }, /* (116) alter_db_optr ::= */ + { 197, -2 }, /* (117) alter_db_optr ::= alter_db_optr replica */ + { 197, -2 }, /* (118) alter_db_optr ::= alter_db_optr quorum */ + { 197, -2 }, /* (119) alter_db_optr ::= alter_db_optr keep */ + { 197, -2 }, /* (120) alter_db_optr ::= alter_db_optr blocks */ + { 197, -2 }, /* (121) alter_db_optr ::= alter_db_optr comp */ + { 197, -2 }, /* (122) alter_db_optr ::= alter_db_optr wal */ + { 197, -2 }, /* (123) alter_db_optr ::= alter_db_optr fsync */ + { 197, -2 }, /* (124) alter_db_optr ::= alter_db_optr update */ + { 197, -2 }, /* (125) alter_db_optr ::= alter_db_optr cachelast */ + { 198, -1 }, /* (126) alter_topic_optr ::= alter_db_optr */ + { 198, -2 }, /* (127) alter_topic_optr ::= alter_topic_optr partitions */ + { 231, -1 }, /* (128) typename ::= ids */ + { 231, -4 }, /* (129) typename ::= ids LP signed RP */ + { 231, -2 }, /* (130) typename ::= ids UNSIGNED */ + { 232, -1 }, /* (131) signed ::= INTEGER */ + { 232, -2 }, /* (132) signed ::= PLUS INTEGER */ + { 232, -2 }, /* (133) signed ::= MINUS INTEGER */ + { 192, -3 }, /* (134) cmd ::= CREATE TABLE create_table_args */ + { 192, -3 }, /* (135) cmd ::= CREATE TABLE create_stable_args */ + { 192, -3 }, /* (136) cmd ::= CREATE STABLE create_stable_args */ + { 192, -3 }, /* (137) cmd ::= CREATE TABLE create_table_list */ + { 235, -1 }, /* (138) create_table_list ::= create_from_stable */ + { 235, -2 }, /* (139) create_table_list ::= create_table_list create_from_stable */ + { 233, -6 }, /* (140) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 234, -10 }, /* (141) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 236, -10 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + { 236, -13 }, /* (143) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + { 239, -3 }, /* (144) tagNamelist ::= tagNamelist COMMA ids */ + { 239, -1 }, /* (145) tagNamelist ::= ids */ + { 233, -5 }, /* (146) create_table_args ::= ifnotexists ids cpxName AS select */ + { 237, -3 }, /* (147) columnlist ::= columnlist COMMA column */ + { 237, -1 }, /* (148) columnlist ::= column */ + { 241, -2 }, /* (149) column ::= ids typename */ + { 238, -3 }, /* (150) tagitemlist ::= tagitemlist COMMA tagitem */ + { 238, -1 }, /* (151) tagitemlist ::= tagitem */ + { 242, -1 }, /* (152) tagitem ::= INTEGER */ + { 242, -1 }, /* (153) tagitem ::= FLOAT */ + { 242, -1 }, /* (154) tagitem ::= STRING */ + { 242, -1 }, /* (155) tagitem ::= BOOL */ + { 242, -1 }, /* (156) tagitem ::= NULL */ + { 242, -1 }, /* (157) tagitem ::= NOW */ + { 242, -2 }, /* (158) tagitem ::= MINUS INTEGER */ + { 242, -2 }, /* (159) tagitem ::= MINUS FLOAT */ + { 242, -2 }, /* (160) tagitem ::= PLUS INTEGER */ + { 242, -2 }, /* (161) tagitem ::= PLUS FLOAT */ + { 240, -14 }, /* (162) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + { 240, -3 }, /* (163) select ::= LP select RP */ + { 256, -1 }, /* (164) union ::= select */ + { 256, -4 }, /* (165) union ::= union UNION ALL select */ + { 192, -1 }, /* (166) cmd ::= union */ + { 240, -2 }, /* (167) select ::= SELECT selcollist */ + { 257, -2 }, /* (168) sclp ::= selcollist COMMA */ + { 257, 0 }, /* (169) sclp ::= */ + { 243, -4 }, /* (170) selcollist ::= sclp distinct expr as */ + { 243, -2 }, /* (171) selcollist ::= sclp STAR */ + { 260, -2 }, /* (172) as ::= AS ids */ + { 260, -1 }, /* (173) as ::= ids */ + { 260, 0 }, /* (174) as ::= */ + { 258, -1 }, /* (175) distinct ::= DISTINCT */ + { 258, 0 }, /* (176) distinct ::= */ + { 244, -2 }, /* (177) from ::= FROM tablelist */ + { 244, -2 }, /* (178) from ::= FROM sub */ + { 262, -3 }, /* (179) sub ::= LP union RP */ + { 262, -4 }, /* (180) sub ::= LP union RP ids */ + { 262, -6 }, /* (181) sub ::= sub COMMA LP union RP ids */ + { 261, -2 }, /* (182) tablelist ::= ids cpxName */ + { 261, -3 }, /* (183) tablelist ::= ids cpxName ids */ + { 261, -4 }, /* (184) tablelist ::= tablelist COMMA ids cpxName */ + { 261, -5 }, /* (185) tablelist ::= tablelist COMMA ids cpxName ids */ + { 263, -1 }, /* (186) tmvar ::= VARIABLE */ + { 246, -4 }, /* (187) interval_opt ::= INTERVAL LP tmvar RP */ + { 246, -6 }, /* (188) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 246, 0 }, /* (189) interval_opt ::= */ + { 247, 0 }, /* (190) session_option ::= */ + { 247, -7 }, /* (191) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + { 248, 0 }, /* (192) windowstate_option ::= */ + { 248, -4 }, /* (193) windowstate_option ::= STATE_WINDOW LP ids RP */ + { 249, 0 }, /* (194) fill_opt ::= */ + { 249, -6 }, /* (195) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 249, -4 }, /* (196) fill_opt ::= FILL LP ID RP */ + { 250, -4 }, /* (197) sliding_opt ::= SLIDING LP tmvar RP */ + { 250, 0 }, /* (198) sliding_opt ::= */ + { 252, 0 }, /* (199) orderby_opt ::= */ + { 252, -3 }, /* (200) orderby_opt ::= ORDER BY sortlist */ + { 264, -4 }, /* (201) sortlist ::= sortlist COMMA item sortorder */ + { 264, -2 }, /* (202) sortlist ::= item sortorder */ + { 266, -2 }, /* (203) item ::= ids cpxName */ + { 267, -1 }, /* (204) sortorder ::= ASC */ + { 267, -1 }, /* (205) sortorder ::= DESC */ + { 267, 0 }, /* (206) sortorder ::= */ + { 251, 0 }, /* (207) groupby_opt ::= */ + { 251, -3 }, /* (208) groupby_opt ::= GROUP BY grouplist */ + { 268, -3 }, /* (209) grouplist ::= grouplist COMMA item */ + { 268, -1 }, /* (210) grouplist ::= item */ + { 253, 0 }, /* (211) having_opt ::= */ + { 253, -2 }, /* (212) having_opt ::= HAVING expr */ + { 255, 0 }, /* (213) limit_opt ::= */ + { 255, -2 }, /* (214) limit_opt ::= LIMIT signed */ + { 255, -4 }, /* (215) limit_opt ::= LIMIT signed OFFSET signed */ + { 255, -4 }, /* (216) limit_opt ::= LIMIT signed COMMA signed */ + { 254, 0 }, /* (217) slimit_opt ::= */ + { 254, -2 }, /* (218) slimit_opt ::= SLIMIT signed */ + { 254, -4 }, /* (219) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 254, -4 }, /* (220) slimit_opt ::= SLIMIT signed COMMA signed */ + { 245, 0 }, /* (221) where_opt ::= */ + { 245, -2 }, /* (222) where_opt ::= WHERE expr */ + { 259, -3 }, /* (223) expr ::= LP expr RP */ + { 259, -1 }, /* (224) expr ::= ID */ + { 259, -3 }, /* (225) expr ::= ID DOT ID */ + { 259, -3 }, /* (226) expr ::= ID DOT STAR */ + { 259, -1 }, /* (227) expr ::= INTEGER */ + { 259, -2 }, /* (228) expr ::= MINUS INTEGER */ + { 259, -2 }, /* (229) expr ::= PLUS INTEGER */ + { 259, -1 }, /* (230) expr ::= FLOAT */ + { 259, -2 }, /* (231) expr ::= MINUS FLOAT */ + { 259, -2 }, /* (232) expr ::= PLUS FLOAT */ + { 259, -1 }, /* (233) expr ::= STRING */ + { 259, -1 }, /* (234) expr ::= NOW */ + { 259, -1 }, /* (235) expr ::= VARIABLE */ + { 259, -2 }, /* (236) expr ::= PLUS VARIABLE */ + { 259, -2 }, /* (237) expr ::= MINUS VARIABLE */ + { 259, -1 }, /* (238) expr ::= BOOL */ + { 259, -1 }, /* (239) expr ::= NULL */ + { 259, -4 }, /* (240) expr ::= ID LP exprlist RP */ + { 259, -4 }, /* (241) expr ::= ID LP STAR RP */ + { 259, -3 }, /* (242) expr ::= expr IS NULL */ + { 259, -4 }, /* (243) expr ::= expr IS NOT NULL */ + { 259, -3 }, /* (244) expr ::= expr LT expr */ + { 259, -3 }, /* (245) expr ::= expr GT expr */ + { 259, -3 }, /* (246) expr ::= expr LE expr */ + { 259, -3 }, /* (247) expr ::= expr GE expr */ + { 259, -3 }, /* (248) expr ::= expr NE expr */ + { 259, -3 }, /* (249) expr ::= expr EQ expr */ + { 259, -5 }, /* (250) expr ::= expr BETWEEN expr AND expr */ + { 259, -3 }, /* (251) expr ::= expr AND expr */ + { 259, -3 }, /* (252) expr ::= expr OR expr */ + { 259, -3 }, /* (253) expr ::= expr PLUS expr */ + { 259, -3 }, /* (254) expr ::= expr MINUS expr */ + { 259, -3 }, /* (255) expr ::= expr STAR expr */ + { 259, -3 }, /* (256) expr ::= expr SLASH expr */ + { 259, -3 }, /* (257) expr ::= expr REM expr */ + { 259, -3 }, /* (258) expr ::= expr LIKE expr */ + { 259, -5 }, /* (259) expr ::= expr IN LP exprlist RP */ + { 200, -3 }, /* (260) exprlist ::= exprlist COMMA expritem */ + { 200, -1 }, /* (261) exprlist ::= expritem */ + { 269, -1 }, /* (262) expritem ::= expr */ + { 269, 0 }, /* (263) expritem ::= */ + { 192, -3 }, /* (264) cmd ::= RESET QUERY CACHE */ + { 192, -3 }, /* (265) cmd ::= SYNCDB ids REPLICA */ + { 192, -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 192, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 192, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + { 192, -7 }, /* (269) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 192, -7 }, /* (270) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 192, -8 }, /* (271) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 192, -9 }, /* (272) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 192, -7 }, /* (273) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + { 192, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 192, -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 192, -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + { 192, -7 }, /* (277) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 192, -7 }, /* (278) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 192, -8 }, /* (279) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 192, -9 }, /* (280) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + { 192, -7 }, /* (281) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + { 192, -3 }, /* (282) cmd ::= KILL CONNECTION INTEGER */ + { 192, -5 }, /* (283) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 192, -5 }, /* (284) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -1770,43 +2093,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 @@ -1817,7 +2163,12 @@ static void yy_reduce( ** #line ** break; */ +/********** Begin reduce actions **********************************************/ + YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ + case 134: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==134); + case 135: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==135); + case 136: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==136); {} break; case 1: /* cmd ::= SHOW DATABASES */ @@ -1866,16 +2217,17 @@ static void yy_reduce( { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); } break; case 16: /* dbPrefix ::= */ -{yygotominor.yy0.n = 0; yygotominor.yy0.type = 0;} +{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;} break; case 17: /* dbPrefix ::= ids DOT */ -{yygotominor.yy0 = yymsp[-1].minor.yy0; } +{yylhsminor.yy0 = yymsp[-1].minor.yy0; } + yymsp[-1].minor.yy0 = yylhsminor.yy0; break; case 18: /* cpxName ::= */ -{yygotominor.yy0.n = 0; } +{yymsp[1].minor.yy0.n = 0; } break; case 19: /* cpxName ::= DOT ids */ -{yygotominor.yy0 = yymsp[0].minor.yy0; yygotominor.yy0.n += 1; } +{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1; } break; case 20: /* cmd ::= SHOW CREATE TABLE ids cpxName */ { @@ -1999,16 +2351,19 @@ static void yy_reduce( break; case 49: /* ids ::= ID */ case 50: /* ids ::= STRING */ yytestcase(yyruleno==50); -{yygotominor.yy0 = yymsp[0].minor.yy0; } +{yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 51: /* ifexists ::= IF EXISTS */ - case 53: /* ifnotexists ::= IF NOT EXISTS */ yytestcase(yyruleno==53); -{ yygotominor.yy0.n = 1;} +{ yymsp[-1].minor.yy0.n = 1;} break; case 52: /* ifexists ::= */ case 54: /* ifnotexists ::= */ yytestcase(yyruleno==54); case 176: /* distinct ::= */ yytestcase(yyruleno==176); -{ yygotominor.yy0.n = 0;} +{ yymsp[1].minor.yy0.n = 0;} + break; + case 53: /* ifnotexists ::= IF NOT EXISTS */ +{ yymsp[-2].minor.yy0.n = 1;} break; case 55: /* cmd ::= CREATE DNODE ids */ { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} @@ -2032,7 +2387,7 @@ static void yy_reduce( case 72: /* users ::= */ yytestcase(yyruleno==72); case 74: /* conns ::= */ yytestcase(yyruleno==74); case 76: /* state ::= */ yytestcase(yyruleno==76); -{ yygotominor.yy0.n = 0; } +{ yymsp[1].minor.yy0.n = 0; } break; case 61: /* pps ::= PPS INTEGER */ case 63: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==63); @@ -2043,38 +2398,42 @@ static void yy_reduce( case 73: /* users ::= USERS INTEGER */ yytestcase(yyruleno==73); case 75: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==75); case 77: /* state ::= STATE ids */ yytestcase(yyruleno==77); -{ yygotominor.yy0 = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 78: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yygotominor.yy151.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yygotominor.yy151.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yygotominor.yy151.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yygotominor.yy151.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yygotominor.yy151.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yygotominor.yy151.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yygotominor.yy151.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yygotominor.yy151.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yygotominor.yy151.stat = yymsp[0].minor.yy0; + yylhsminor.yy151.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy151.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy151.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy151.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy151.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy151.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy151.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy151.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy151.stat = yymsp[0].minor.yy0; } + yymsp[-8].minor.yy151 = yylhsminor.yy151; break; case 79: /* intitemlist ::= intitemlist COMMA intitem */ case 150: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==150); -{ yygotominor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); } +{ yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; case 80: /* intitemlist ::= intitem */ case 151: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==151); -{ yygotominor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } +{ yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } + yymsp[0].minor.yy441 = yylhsminor.yy441; break; case 81: /* intitem ::= INTEGER */ case 152: /* tagitem ::= INTEGER */ yytestcase(yyruleno==152); case 153: /* tagitem ::= FLOAT */ yytestcase(yyruleno==153); case 154: /* tagitem ::= STRING */ yytestcase(yyruleno==154); case 155: /* tagitem ::= BOOL */ yytestcase(yyruleno==155); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yygotominor.yy506, &yymsp[0].minor.yy0); } +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy506 = yylhsminor.yy506; break; case 82: /* keep ::= KEEP intitemlist */ -{ yygotominor.yy441 = yymsp[0].minor.yy441; } +{ yymsp[-1].minor.yy441 = yymsp[0].minor.yy441; } break; case 83: /* cache ::= CACHE INTEGER */ case 84: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==84); @@ -2091,109 +2450,129 @@ static void yy_reduce( case 95: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==95); case 96: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==96); case 97: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==97); -{ yygotominor.yy0 = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 98: /* db_optr ::= */ -{setDefaultCreateDbOption(&yygotominor.yy382); yygotominor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} +{setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 99: /* db_optr ::= db_optr cache */ -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 100: /* db_optr ::= db_optr replica */ case 117: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==117); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 101: /* db_optr ::= db_optr quorum */ case 118: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==118); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 102: /* db_optr ::= db_optr days */ -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 103: /* db_optr ::= db_optr minrows */ -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 104: /* db_optr ::= db_optr maxrows */ -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 105: /* db_optr ::= db_optr blocks */ case 120: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==120); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 106: /* db_optr ::= db_optr ctime */ -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 107: /* db_optr ::= db_optr wal */ case 122: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==122); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 108: /* db_optr ::= db_optr fsync */ case 123: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==123); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 109: /* db_optr ::= db_optr comp */ case 121: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==121); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 110: /* db_optr ::= db_optr prec */ -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.precision = yymsp[0].minor.yy0; } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 111: /* db_optr ::= db_optr keep */ case 119: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==119); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.keep = yymsp[0].minor.yy441; } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.keep = yymsp[0].minor.yy441; } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 112: /* db_optr ::= db_optr update */ case 124: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==124); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 113: /* db_optr ::= db_optr cachelast */ case 125: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==125); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 114: /* topic_optr ::= db_optr */ case 126: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==126); -{ yygotominor.yy382 = yymsp[0].minor.yy382; yygotominor.yy382.dbType = TSDB_DB_TYPE_TOPIC; } +{ yylhsminor.yy382 = yymsp[0].minor.yy382; yylhsminor.yy382.dbType = TSDB_DB_TYPE_TOPIC; } + yymsp[0].minor.yy382 = yylhsminor.yy382; break; case 115: /* topic_optr ::= topic_optr partitions */ case 127: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==127); -{ yygotominor.yy382 = yymsp[-1].minor.yy382; yygotominor.yy382.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; case 116: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yygotominor.yy382); yygotominor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} +{ setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} break; case 128: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yygotominor.yy343, &yymsp[0].minor.yy0); + tSetColumnType (&yylhsminor.yy343, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy343 = yylhsminor.yy343; break; case 129: /* typename ::= ids LP signed RP */ { if (yymsp[-1].minor.yy369 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yygotominor.yy343, &yymsp[-3].minor.yy0); + tSetColumnType(&yylhsminor.yy343, &yymsp[-3].minor.yy0); } else { yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy369; // negative value of name length - tSetColumnType(&yygotominor.yy343, &yymsp[-3].minor.yy0); + tSetColumnType(&yylhsminor.yy343, &yymsp[-3].minor.yy0); } } + yymsp[-3].minor.yy343 = yylhsminor.yy343; break; case 130: /* typename ::= ids UNSIGNED */ { yymsp[-1].minor.yy0.type = 0; yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z); - tSetColumnType (&yygotominor.yy343, &yymsp[-1].minor.yy0); + tSetColumnType (&yylhsminor.yy343, &yymsp[-1].minor.yy0); } + yymsp[-1].minor.yy343 = yylhsminor.yy343; break; case 131: /* signed ::= INTEGER */ - case 132: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==132); -{ yygotominor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yylhsminor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy369 = yylhsminor.yy369; + break; + case 132: /* signed ::= PLUS INTEGER */ +{ yymsp[-1].minor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 133: /* signed ::= MINUS INTEGER */ - case 134: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==134); - case 135: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==135); - case 136: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==136); -{ yygotominor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} +{ yymsp[-1].minor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 137: /* cmd ::= CREATE TABLE create_table_list */ { pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy182;} @@ -2205,78 +2584,92 @@ static void yy_reduce( taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy456); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yygotominor.yy182 = pCreateTable; + yylhsminor.yy182 = pCreateTable; } + yymsp[0].minor.yy182 = yylhsminor.yy182; break; case 139: /* create_table_list ::= create_table_list create_from_stable */ { taosArrayPush(yymsp[-1].minor.yy182->childTableInfo, &yymsp[0].minor.yy456); - yygotominor.yy182 = yymsp[-1].minor.yy182; + yylhsminor.yy182 = yymsp[-1].minor.yy182; } + yymsp[-1].minor.yy182 = yylhsminor.yy182; break; case 140: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yygotominor.yy182 = tSetCreateTableInfo(yymsp[-1].minor.yy441, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yygotominor.yy182, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy182 = tSetCreateTableInfo(yymsp[-1].minor.yy441, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy182, 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.yy182 = yylhsminor.yy182; break; case 141: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yygotominor.yy182 = tSetCreateTableInfo(yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yygotominor.yy182, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy182 = tSetCreateTableInfo(yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy182, 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.yy182 = yylhsminor.yy182; break; case 142: /* 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; - yygotominor.yy456 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy441, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy456 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy441, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } + yymsp[-9].minor.yy456 = yylhsminor.yy456; break; case 143: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ { yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n; - yygotominor.yy456 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yylhsminor.yy456 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } + yymsp[-12].minor.yy456 = yylhsminor.yy456; break; case 144: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy0); yygotominor.yy441 = yymsp[-2].minor.yy441; } +{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy0); yylhsminor.yy441 = yymsp[-2].minor.yy441; } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; case 145: /* tagNamelist ::= ids */ -{yygotominor.yy441 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yygotominor.yy441, &yymsp[0].minor.yy0);} +{yylhsminor.yy441 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy441 = yylhsminor.yy441; break; case 146: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yygotominor.yy182 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy236, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yygotominor.yy182, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy182 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy236, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy182, 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.yy182 = yylhsminor.yy182; break; case 147: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy343); yygotominor.yy441 = yymsp[-2].minor.yy441; } +{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy343); yylhsminor.yy441 = yymsp[-2].minor.yy441; } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; case 148: /* columnlist ::= column */ -{yygotominor.yy441 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yygotominor.yy441, &yymsp[0].minor.yy343);} +{yylhsminor.yy441 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy343);} + yymsp[0].minor.yy441 = yylhsminor.yy441; break; case 149: /* column ::= ids typename */ { - tSetColumnInfo(&yygotominor.yy343, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy343); + tSetColumnInfo(&yylhsminor.yy343, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy343); } + yymsp[-1].minor.yy343 = yylhsminor.yy343; break; case 156: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yygotominor.yy506, &yymsp[0].minor.yy0); } +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy506 = yylhsminor.yy506; break; case 157: /* tagitem ::= NOW */ -{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yygotominor.yy506, &yymsp[0].minor.yy0);} +{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy506 = yylhsminor.yy506; break; case 158: /* tagitem ::= MINUS INTEGER */ case 159: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==159); @@ -2286,126 +2679,144 @@ 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(&yygotominor.yy506, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy506, &yymsp[-1].minor.yy0); } + yymsp[-1].minor.yy506 = yylhsminor.yy506; break; case 162: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yygotominor.yy236 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy441, yymsp[-11].minor.yy244, yymsp[-10].minor.yy166, yymsp[-4].minor.yy441, yymsp[-3].minor.yy441, &yymsp[-9].minor.yy340, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy348, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-2].minor.yy166); + yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy441, yymsp[-11].minor.yy244, yymsp[-10].minor.yy166, yymsp[-4].minor.yy441, yymsp[-3].minor.yy441, &yymsp[-9].minor.yy340, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy348, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-2].minor.yy166); } + yymsp[-13].minor.yy236 = yylhsminor.yy236; break; case 163: /* select ::= LP select RP */ -{yygotominor.yy236 = yymsp[-1].minor.yy236;} +{yymsp[-2].minor.yy236 = yymsp[-1].minor.yy236;} break; case 164: /* union ::= select */ -{ yygotominor.yy441 = setSubclause(NULL, yymsp[0].minor.yy236); } +{ yylhsminor.yy441 = setSubclause(NULL, yymsp[0].minor.yy236); } + yymsp[0].minor.yy441 = yylhsminor.yy441; break; case 165: /* union ::= union UNION ALL select */ -{ yygotominor.yy441 = appendSelectClause(yymsp[-3].minor.yy441, yymsp[0].minor.yy236); } +{ yylhsminor.yy441 = appendSelectClause(yymsp[-3].minor.yy441, yymsp[0].minor.yy236); } + yymsp[-3].minor.yy441 = yylhsminor.yy441; break; case 166: /* cmd ::= union */ { setSqlInfo(pInfo, yymsp[0].minor.yy441, NULL, TSDB_SQL_SELECT); } break; case 167: /* select ::= SELECT selcollist */ { - yygotominor.yy236 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy441, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy441, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } + yymsp[-1].minor.yy236 = yylhsminor.yy236; break; case 168: /* sclp ::= selcollist COMMA */ -{yygotominor.yy441 = yymsp[-1].minor.yy441;} +{yylhsminor.yy441 = yymsp[-1].minor.yy441;} + yymsp[-1].minor.yy441 = yylhsminor.yy441; break; case 169: /* sclp ::= */ case 199: /* orderby_opt ::= */ yytestcase(yyruleno==199); -{yygotominor.yy441 = 0;} +{yymsp[1].minor.yy441 = 0;} break; case 170: /* selcollist ::= sclp distinct expr as */ { - yygotominor.yy441 = tSqlExprListAppend(yymsp[-3].minor.yy441, yymsp[-1].minor.yy166, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy441 = tSqlExprListAppend(yymsp[-3].minor.yy441, yymsp[-1].minor.yy166, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } + yymsp[-3].minor.yy441 = yylhsminor.yy441; break; case 171: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yygotominor.yy441 = tSqlExprListAppend(yymsp[-1].minor.yy441, pNode, 0, 0); + yylhsminor.yy441 = tSqlExprListAppend(yymsp[-1].minor.yy441, pNode, 0, 0); } + yymsp[-1].minor.yy441 = yylhsminor.yy441; break; case 172: /* as ::= AS ids */ - case 173: /* as ::= ids */ yytestcase(yyruleno==173); -{ yygotominor.yy0 = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } + break; + case 173: /* as ::= ids */ +{ yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 174: /* as ::= */ -{ yygotominor.yy0.n = 0; } +{ yymsp[1].minor.yy0.n = 0; } break; case 175: /* distinct ::= DISTINCT */ -{ yygotominor.yy0 = yymsp[0].minor.yy0; } +{ yylhsminor.yy0 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 177: /* from ::= FROM tablelist */ case 178: /* from ::= FROM sub */ yytestcase(yyruleno==178); -{yygotominor.yy244 = yymsp[0].minor.yy244;} +{yymsp[-1].minor.yy244 = yymsp[0].minor.yy244;} break; case 179: /* sub ::= LP union RP */ -{yygotominor.yy244 = addSubqueryElem(NULL, yymsp[-1].minor.yy441, NULL);} +{yymsp[-2].minor.yy244 = addSubqueryElem(NULL, yymsp[-1].minor.yy441, NULL);} break; case 180: /* sub ::= LP union RP ids */ -{yygotominor.yy244 = addSubqueryElem(NULL, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} +{yymsp[-3].minor.yy244 = addSubqueryElem(NULL, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} break; case 181: /* sub ::= sub COMMA LP union RP ids */ -{yygotominor.yy244 = addSubqueryElem(yymsp[-5].minor.yy244, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} +{yylhsminor.yy244 = addSubqueryElem(yymsp[-5].minor.yy244, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} + yymsp[-5].minor.yy244 = yylhsminor.yy244; break; case 182: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yygotominor.yy244 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy244 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } + yymsp[-1].minor.yy244 = yylhsminor.yy244; break; case 183: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yygotominor.yy244 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy244 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy244 = yylhsminor.yy244; break; case 184: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yygotominor.yy244 = setTableNameList(yymsp[-3].minor.yy244, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy244 = setTableNameList(yymsp[-3].minor.yy244, &yymsp[-1].minor.yy0, NULL); } + yymsp[-3].minor.yy244 = yylhsminor.yy244; break; case 185: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yygotominor.yy244 = setTableNameList(yymsp[-4].minor.yy244, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy244 = setTableNameList(yymsp[-4].minor.yy244, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } + yymsp[-4].minor.yy244 = yylhsminor.yy244; break; case 186: /* tmvar ::= VARIABLE */ -{yygotominor.yy0 = yymsp[0].minor.yy0;} +{yylhsminor.yy0 = yymsp[0].minor.yy0;} + yymsp[0].minor.yy0 = yylhsminor.yy0; break; case 187: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yygotominor.yy340.interval = yymsp[-1].minor.yy0; yygotominor.yy340.offset.n = 0;} +{yymsp[-3].minor.yy340.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy340.offset.n = 0;} break; case 188: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yygotominor.yy340.interval = yymsp[-3].minor.yy0; yygotominor.yy340.offset = yymsp[-1].minor.yy0;} +{yymsp[-5].minor.yy340.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy340.offset = yymsp[-1].minor.yy0;} break; case 189: /* interval_opt ::= */ -{memset(&yygotominor.yy340, 0, sizeof(yygotominor.yy340));} +{memset(&yymsp[1].minor.yy340, 0, sizeof(yymsp[1].minor.yy340));} break; case 190: /* session_option ::= */ -{yygotominor.yy259.col.n = 0; yygotominor.yy259.gap.n = 0;} +{yymsp[1].minor.yy259.col.n = 0; yymsp[1].minor.yy259.gap.n = 0;} break; case 191: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yygotominor.yy259.col = yymsp[-4].minor.yy0; - yygotominor.yy259.gap = yymsp[-1].minor.yy0; + yymsp[-6].minor.yy259.col = yymsp[-4].minor.yy0; + yymsp[-6].minor.yy259.gap = yymsp[-1].minor.yy0; } break; case 192: /* windowstate_option ::= */ -{ yygotominor.yy348.col.n = 0; yygotominor.yy348.col.z = NULL;} +{ yymsp[1].minor.yy348.col.n = 0; yymsp[1].minor.yy348.col.z = NULL;} break; case 193: /* windowstate_option ::= STATE_WINDOW LP ids RP */ -{ yygotominor.yy348.col = yymsp[-1].minor.yy0; } +{ yymsp[-3].minor.yy348.col = yymsp[-1].minor.yy0; } break; case 194: /* fill_opt ::= */ -{ yygotominor.yy441 = 0; } +{ yymsp[1].minor.yy441 = 0; } break; case 195: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { @@ -2414,205 +2825,251 @@ static void yy_reduce( tVariantCreate(&A, &yymsp[-3].minor.yy0); tVariantListInsert(yymsp[-1].minor.yy441, &A, -1, 0); - yygotominor.yy441 = yymsp[-1].minor.yy441; + yymsp[-5].minor.yy441 = yymsp[-1].minor.yy441; } break; case 196: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yygotominor.yy441 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy441 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; case 197: /* sliding_opt ::= SLIDING LP tmvar RP */ -{yygotominor.yy0 = yymsp[-1].minor.yy0; } +{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; case 198: /* sliding_opt ::= */ -{yygotominor.yy0.n = 0; yygotominor.yy0.z = NULL; yygotominor.yy0.type = 0; } +{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; case 200: /* orderby_opt ::= ORDER BY sortlist */ -{yygotominor.yy441 = yymsp[0].minor.yy441;} +{yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;} break; case 201: /* sortlist ::= sortlist COMMA item sortorder */ { - yygotominor.yy441 = tVariantListAppend(yymsp[-3].minor.yy441, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112); + yylhsminor.yy441 = tVariantListAppend(yymsp[-3].minor.yy441, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112); } + yymsp[-3].minor.yy441 = yylhsminor.yy441; break; case 202: /* sortlist ::= item sortorder */ { - yygotominor.yy441 = tVariantListAppend(NULL, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112); + yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112); } + yymsp[-1].minor.yy441 = yylhsminor.yy441; break; case 203: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yygotominor.yy506, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy506, &yymsp[-1].minor.yy0); } + yymsp[-1].minor.yy506 = yylhsminor.yy506; break; case 204: /* sortorder ::= ASC */ - case 206: /* sortorder ::= */ yytestcase(yyruleno==206); -{ yygotominor.yy112 = TSDB_ORDER_ASC; } +{ yymsp[0].minor.yy112 = TSDB_ORDER_ASC; } break; case 205: /* sortorder ::= DESC */ -{ yygotominor.yy112 = TSDB_ORDER_DESC;} +{ yymsp[0].minor.yy112 = TSDB_ORDER_DESC;} + break; + case 206: /* sortorder ::= */ +{ yymsp[1].minor.yy112 = TSDB_ORDER_ASC; } break; case 207: /* groupby_opt ::= */ -{ yygotominor.yy441 = 0;} +{ yymsp[1].minor.yy441 = 0;} break; case 208: /* groupby_opt ::= GROUP BY grouplist */ -{ yygotominor.yy441 = yymsp[0].minor.yy441;} +{ yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;} break; case 209: /* grouplist ::= grouplist COMMA item */ { - yygotominor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); + yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; case 210: /* grouplist ::= item */ { - yygotominor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); + yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } + yymsp[0].minor.yy441 = yylhsminor.yy441; break; case 211: /* having_opt ::= */ case 221: /* where_opt ::= */ yytestcase(yyruleno==221); case 263: /* expritem ::= */ yytestcase(yyruleno==263); -{yygotominor.yy166 = 0;} +{yymsp[1].minor.yy166 = 0;} break; case 212: /* having_opt ::= HAVING expr */ case 222: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==222); - case 262: /* expritem ::= expr */ yytestcase(yyruleno==262); -{yygotominor.yy166 = yymsp[0].minor.yy166;} +{yymsp[-1].minor.yy166 = yymsp[0].minor.yy166;} break; case 213: /* limit_opt ::= */ case 217: /* slimit_opt ::= */ yytestcase(yyruleno==217); -{yygotominor.yy414.limit = -1; yygotominor.yy414.offset = 0;} +{yymsp[1].minor.yy414.limit = -1; yymsp[1].minor.yy414.offset = 0;} break; case 214: /* limit_opt ::= LIMIT signed */ case 218: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==218); -{yygotominor.yy414.limit = yymsp[0].minor.yy369; yygotominor.yy414.offset = 0;} +{yymsp[-1].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-1].minor.yy414.offset = 0;} break; case 215: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yygotominor.yy414.limit = yymsp[-2].minor.yy369; yygotominor.yy414.offset = yymsp[0].minor.yy369;} +{ yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;} break; case 216: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yygotominor.yy414.limit = yymsp[0].minor.yy369; yygotominor.yy414.offset = yymsp[-2].minor.yy369;} +{ yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;} break; case 219: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yygotominor.yy414.limit = yymsp[-2].minor.yy369; yygotominor.yy414.offset = yymsp[0].minor.yy369;} +{yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;} break; case 220: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yygotominor.yy414.limit = yymsp[0].minor.yy369; yygotominor.yy414.offset = yymsp[-2].minor.yy369;} +{yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;} break; case 223: /* expr ::= LP expr RP */ -{yygotominor.yy166 = yymsp[-1].minor.yy166; yygotominor.yy166->token.z = yymsp[-2].minor.yy0.z; yygotominor.yy166->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} +{yylhsminor.yy166 = yymsp[-1].minor.yy166; yylhsminor.yy166->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy166->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 224: /* expr ::= ID */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 225: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 226: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 227: /* expr ::= INTEGER */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 228: /* expr ::= MINUS INTEGER */ case 229: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==229); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy166 = yylhsminor.yy166; break; case 230: /* expr ::= FLOAT */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 231: /* expr ::= MINUS FLOAT */ case 232: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==232); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy166 = yylhsminor.yy166; break; case 233: /* expr ::= STRING */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 234: /* expr ::= NOW */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 235: /* expr ::= VARIABLE */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 236: /* expr ::= PLUS VARIABLE */ case 237: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==237); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} + yymsp[-1].minor.yy166 = yylhsminor.yy166; break; case 238: /* expr ::= BOOL */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 239: /* expr ::= NULL */ -{ yygotominor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 240: /* expr ::= ID LP exprlist RP */ -{ yygotominor.yy166 = tSqlExprCreateFunction(yymsp[-1].minor.yy441, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } +{ yylhsminor.yy166 = tSqlExprCreateFunction(yymsp[-1].minor.yy441, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy166 = yylhsminor.yy166; break; case 241: /* expr ::= ID LP STAR RP */ -{ yygotominor.yy166 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } +{ yylhsminor.yy166 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy166 = yylhsminor.yy166; break; case 242: /* expr ::= expr IS NULL */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, NULL, TK_ISNULL);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, NULL, TK_ISNULL);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 243: /* expr ::= expr IS NOT NULL */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-3].minor.yy166, NULL, TK_NOTNULL);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-3].minor.yy166, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy166 = yylhsminor.yy166; break; case 244: /* expr ::= expr LT expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LT);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LT);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 245: /* expr ::= expr GT expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GT);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GT);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 246: /* expr ::= expr LE expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LE);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 247: /* expr ::= expr GE expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GE);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 248: /* expr ::= expr NE expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_NE);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_NE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 249: /* expr ::= expr EQ expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_EQ);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_EQ);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 250: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy166); yygotominor.yy166 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy166, yymsp[-2].minor.yy166, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy166, TK_LE), TK_AND);} +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy166); yylhsminor.yy166 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy166, yymsp[-2].minor.yy166, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy166, TK_LE), TK_AND);} + yymsp[-4].minor.yy166 = yylhsminor.yy166; break; case 251: /* expr ::= expr AND expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_AND);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_AND);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 252: /* expr ::= expr OR expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_OR); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_OR); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 253: /* expr ::= expr PLUS expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_PLUS); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_PLUS); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 254: /* expr ::= expr MINUS expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_MINUS); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_MINUS); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 255: /* expr ::= expr STAR expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_STAR); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_STAR); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 256: /* expr ::= expr SLASH expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_DIVIDE);} +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_DIVIDE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 257: /* expr ::= expr REM expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_REM); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_REM); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 258: /* expr ::= expr LIKE expr */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LIKE); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LIKE); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; case 259: /* expr ::= expr IN LP exprlist RP */ -{yygotominor.yy166 = tSqlExprCreate(yymsp[-4].minor.yy166, (tSqlExpr*)yymsp[-1].minor.yy441, TK_IN); } +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-4].minor.yy166, (tSqlExpr*)yymsp[-1].minor.yy441, TK_IN); } + yymsp[-4].minor.yy166 = yylhsminor.yy166; break; case 260: /* exprlist ::= exprlist COMMA expritem */ -{yygotominor.yy441 = tSqlExprListAppend(yymsp[-2].minor.yy441,yymsp[0].minor.yy166,0, 0);} +{yylhsminor.yy441 = tSqlExprListAppend(yymsp[-2].minor.yy441,yymsp[0].minor.yy166,0, 0);} + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; case 261: /* exprlist ::= expritem */ -{yygotominor.yy441 = tSqlExprListAppend(0,yymsp[0].minor.yy166,0, 0);} +{yylhsminor.yy441 = tSqlExprListAppend(0,yymsp[0].minor.yy166,0, 0);} + yymsp[0].minor.yy441 = yylhsminor.yy441; + break; + case 262: /* expritem ::= expr */ +{yylhsminor.yy166 = yymsp[0].minor.yy166;} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; case 264: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} @@ -2783,32 +3240,25 @@ static void yy_reduce( 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"); } /* @@ -2824,9 +3274,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 */ @@ -2837,10 +3289,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) +#define TOKEN yyminor +/************ Begin %syntax_error code ****************************************/ pInfo->valid = false; int32_t outputBufLen = tListLen(pInfo->msg); @@ -2863,6 +3316,7 @@ static void yy_syntax_error( } assert(len <= outputBufLen); +/************ End %syntax_error code ******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -2878,10 +3332,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 */ +/*********** Begin %parse_accept code *****************************************/ +/*********** End %parse_accept code *******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -2911,50 +3370,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 @@ -2984,9 +3445,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 ){ @@ -2994,26 +3455,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; @@ -3026,7 +3487,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; @@ -3041,16 +3502,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 bd06b430595bf5a802cae6426904185625a4aa44 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 16 Jun 2021 18:07:03 +0800 Subject: [PATCH 11/37] [TD-3086] tag support timestamp --- src/client/src/tscSQLParser.c | 4 ++-- tests/script/general/parser/create_mt.sim | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 8c14394219..ea1e50e72c 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -8029,7 +8029,7 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS tVariantAssign((*pExpr)->pVal, &pSqlExpr->value); STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta; - if (pCols != NULL) { + if (pCols != NULL && taosArrayGetSize(pCols) > 0) { SColIndex* idx = taosArrayGet(pCols, 0); SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex); // convert time by precision @@ -8094,7 +8094,7 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS } else if (pSqlExpr->tokenId == TK_SET) { int32_t colType = -1; STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta; - if (pCols != NULL) { + if (pCols != NULL && taosArrayGetSize(pCols) > 0) { SColIndex* idx = taosArrayGet(pCols, 0); SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, idx->colIndex); if (pSchema != NULL) { diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index ae1629dce9..c606ba99ec 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -99,7 +99,7 @@ $i_binary2 = varchar(20) # illegal string $i_bool = boolean $nchar = nchar # nchar with unspecified length print ========== create_mt.sim case4: illegal data types in tags test -sql_error create table $mt (ts timestamp, col int) tags (tag1 timestamp ) +##sql_error create table $mt (ts timestamp, col int) tags (tag1 timestamp ) sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_ts ) sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_binary ) sql_error create table $mt (ts timestamp, col int) tags (tag1 $i_bigint ) @@ -253,4 +253,4 @@ if $rows != 0 then return -1 endi -system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT From d5b0ac80c3657330d683925b4b61226b32e06eac Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 16 Jun 2021 22:28:13 +0800 Subject: [PATCH 12/37] [TD-3086] add test case --- src/client/src/tscSQLParser.c | 47 ++++++++++++------- tests/pytest/functions/function_operations.py | 2 +- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index ea1e50e72c..fcb549a66a 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -286,29 +286,33 @@ static int32_t invalidOperationMsg(char* dstBuffer, const char* errMsg) { return tscInvalidOperationMsg(dstBuffer, errMsg, NULL); } -static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tVariant* pVar) { +static int convertTimestampStrToInt64(tVariant *pVar, int32_t precision) { int64_t time = 0; - const char* msg = "invalid timestamp"; - strdequote(pVar->pz); - char* seg = strnchr(pVar->pz, '-', pVar->nLen, false); - STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0); - STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta); - + char* seg = strnchr(pVar->pz, '-', pVar->nLen, false); if (seg != NULL) { - if (taosParseTime(pVar->pz, &time, pVar->nLen, tinfo.precision, tsDaylight) != TSDB_CODE_SUCCESS) { - return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg); + if (taosParseTime(pVar->pz, &time, pVar->nLen, precision, tsDaylight) != TSDB_CODE_SUCCESS) { + return -1; } } else { if (tVariantDump(pVar, (char*)&time, TSDB_DATA_TYPE_BIGINT, true)) { - return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg); + return -1; } } - tVariantDestroy(pVar); tVariantCreateFromBinary(pVar, (char*)&time, 0, TSDB_DATA_TYPE_BIGINT); + return 0; +} +static int setColumnFilterInfoForTimestamp(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tVariant* pVar) { + const char* msg = "invalid timestamp"; + STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0); + + STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta); + if (convertTimestampStrToInt64(pVar, tinfo.precision) < -1) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg); + } return TSDB_CODE_SUCCESS; } @@ -6886,11 +6890,16 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3); } } else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { - pItem->pVar.i64 = - convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); + if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) { + ret = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision); + if (ret != TSDB_CODE_SUCCESS) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4); + } + } else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) { + pItem->pVar.i64 = convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); + } } - ret = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); // check again after the convert since it may be converted from binary to nchar. @@ -6936,8 +6945,14 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3); } } else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { - pItem->pVar.i64 = - convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); + if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) { + ret = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision); + if (ret != TSDB_CODE_SUCCESS) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4); + } + } else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) { + pItem->pVar.i64 = convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); + } } diff --git a/tests/pytest/functions/function_operations.py b/tests/pytest/functions/function_operations.py index 859cd78a3d..3e90d1d3ea 100644 --- a/tests/pytest/functions/function_operations.py +++ b/tests/pytest/functions/function_operations.py @@ -16,7 +16,7 @@ import taos from util.log import * from util.cases import * from util.sql import * -import numpy as np +#import numpy as np class TDTestCase: From 5beba81c40804f9ff6e97707ddf56c59ded2193f Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 16 Jun 2021 22:30:23 +0800 Subject: [PATCH 13/37] [TD-3086] add test case --- tests/pytest/tag_lite/timestamp.py | 102 +++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 tests/pytest/tag_lite/timestamp.py diff --git a/tests/pytest/tag_lite/timestamp.py b/tests/pytest/tag_lite/timestamp.py new file mode 100644 index 0000000000..fa71c2e154 --- /dev/null +++ b/tests/pytest/tag_lite/timestamp.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- + +import sys +from util.log import * +from util.cases import * +from util.sql import * + + +class TDTestCase: + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + tdLog.info('======================== dnode1 start') + tbPrefix = "ta_fl_tb" + mtPrefix = "ta_fl_mt" + tbNum = 10 + rowNum = 20 + totalNum = 200 + tdLog.info('=============== step1') + i = 0 + mt = "%s%d" % (mtPrefix, i) + tdSql.execute( + 'create table %s (ts timestamp, tbcol int) TAGS(tgcol float, tgTs timestamp, tgcol2 int)' %(mt)) + i = 0 + ts = 1605045600000 + tsStr = "2020-11-11 06:00:00" + while (i < 5): + tb = "%s%d" % (tbPrefix, i) + tdLog.info('create table %s using %s tags(%d, %d, %d)' % (tb, mt, i, ts + i, i)) + tdSql.execute('create table %s using %s tags(%d, %d, %d)' % (tb, mt, i, ts + i, i)) + x = 0 + while (x < rowNum): + ms = x * 60000 + #tdLog.info( + # "insert into %s values (%d, %d)" % + # (tb, 1605045600000 + ms, x)) + tdSql.execute( + "insert into %s values (%d, %d)" % + (tb, 1605045600000 + ms, x)) + x = x + 1 + i = i + 1 + tdLog.info('=============== step2') + tdSql.query('select * from %s' % (mt)) + tdSql.checkRows(5 * rowNum) + + tdSql.query('select * from %s where tgTs = %ld and tgcol2 = 0' % (mt, ts)) + tdSql.checkRows(rowNum) + + tdSql.query('select * from %s where tgTs = \"%s\" and tgcol2 = 0' % (mt, tsStr)) + tdSql.checkRows(rowNum) + + tdLog.info('=============== step3') + i = 0 + while (i < 5): + tb = "%s%d" % (tbPrefix, i + 100) + tdLog.info('create table %s using %s tags(%d, \"%s\", %d)' % (tb, mt, i + 100, tsStr, i + 100)) + tdSql.execute('create table %s using %s tags(%d, \"%s\", %d)' % (tb, mt, i + 100, tsStr, i + 100)) + x = 0 + while (x < rowNum): + ms = x * 60000 + #tdLog.info( + # "insert into %s values (%d, %d)" % + # (tb, 1605045600000 + ms, x)) + tdSql.execute( + "insert into %s values (%d, %d)" % + (tb, 1605045600000 + ms, x)) + x = x + 1 + i = i + 1 + + tdSql.query('select * from %s where tgTs = %ld and tgcol2 = 100' % (mt, ts)) + tdSql.checkRows(rowNum) + + tdSql.query('select * from %s where tgTs = \"%s\" and tgcol2 = 100' % (mt, tsStr)) + tdSql.checkRows(rowNum) + + tdLog.info('=============== step4') + + i = 0 + tb = "%s%d"%(tbPrefix, i + 1000) + tdSql.execute('insert into %s using %s tags(%d, \"%s\", %d) values(now, 10)' % (tb, mt, i + 100, tsStr, i + 1000)) + tdSql.execute('insert into %s using %s tags(%d, \"%s\", %d) values(now+2s, 10)' % (tb, mt, i + 100, tsStr, i + 1000)) + tdSql.execute('insert into %s using %s tags(%d, \"%s\", %d) values(now+3s, 10)' % (tb, mt, i + 100, tsStr, i + 1000)) + tdSql.query('select * from %s where tgTs = \"%s\" and tgcol2 = 1000' % (mt, tsStr)) + tdSql.checkRows(3) + + i = 0 + tb = "%s%d"%(tbPrefix, i + 10000) + tdSql.execute('create table %s using %s tags(%d, now, %d)' % (tb, mt, i + 10000,i + 10000)) + tdSql.checkRows(3) + + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) From 100b244326b66b05d1fc33a3154168b16a67fd9d Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 16 Jun 2021 22:31:57 +0800 Subject: [PATCH 14/37] [TD-3086] add test case --- tests/pytest/fulltest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh index b032db8798..7c703bf134 100755 --- a/tests/pytest/fulltest.sh +++ b/tests/pytest/fulltest.sh @@ -71,6 +71,7 @@ python3 ./test.py -f tag_lite/int.py python3 ./test.py -f tag_lite/set.py python3 ./test.py -f tag_lite/smallint.py python3 ./test.py -f tag_lite/tinyint.py +python3 ./test.py -f tag_lite/timestamp.py #python3 ./test.py -f dbmgmt/database-name-boundary.py From 402762bdbcde651c6bec7c22e1cf87c336c5ece7 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 16 Jun 2021 23:48:23 +0800 Subject: [PATCH 15/37] [TD-4737] --- src/client/src/tscSQLParser.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 82a3a1f55b..5646dc2f11 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -956,8 +956,10 @@ int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pS static int32_t validateStateWindowNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlNode, bool isStable) { const char* msg1 = "invalid column name"; + const char* msg2 = "invalid column type"; const char* msg3 = "not support state_window with group by "; const char* msg4 = "function not support for super table query"; + const char* msg5 = "not support state_window on tag column"; SStrToken *col = &(pSqlNode->windowstateVal.col) ; if (col->z == NULL || col->n <= 0) { @@ -985,8 +987,10 @@ static int32_t validateStateWindowNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex); STableMeta* pTableMeta = pTableMetaInfo->pTableMeta; int32_t numOfCols = tscGetNumOfColumns(pTableMeta); - if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX || index.columnIndex >= numOfCols) { + if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3); + } else if (index.columnIndex >= numOfCols) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5); } SGroupbyExpr* pGroupExpr = &pQueryInfo->groupbyExpr; @@ -995,8 +999,10 @@ static int32_t validateStateWindowNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS } SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex); - if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP || pSchema->type == TSDB_DATA_TYPE_FLOAT || pSchema->type == TSDB_DATA_TYPE_DOUBLE) { - return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1); + if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP || pSchema->type == TSDB_DATA_TYPE_FLOAT + || pSchema->type == TSDB_DATA_TYPE_DOUBLE || pSchema->type == TSDB_DATA_TYPE_NCHAR + || pSchema->type == TSDB_DATA_TYPE_BINARY) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2); } tscColumnListInsert(pQueryInfo->colList, index.columnIndex, pTableMeta->id.uid, pSchema); From 7654cb6dd4caf704eb0fcc4f4f7104b1ede799ae Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Jun 2021 05:00:22 +0800 Subject: [PATCH 16/37] [TD-3086]tag support timestamp and in_operator support timestamp --- src/client/src/tscSQLParser.c | 39 +++++++++++++++++++++++++---------- src/common/src/texpr.c | 5 ++++- src/query/src/qFilterfunc.c | 2 +- src/tsdb/src/tsdbRead.c | 2 +- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index fcb549a66a..e9bf4cdb0d 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -63,7 +63,8 @@ static SExprInfo* doAddProjectCol(SQueryInfo* pQueryInfo, int32_t colIndex, int3 static int32_t setShowInfo(SSqlObj* pSql, SSqlInfo* pInfo); static char* getAccountId(SSqlObj* pSql); -static bool serializeExprListToVariant(SArray* pList, tVariant **dest, int16_t colType); +static int convertTimestampStrToInt64(tVariant *pVar, int32_t precision); +static bool serializeExprListToVariant(SArray* pList, tVariant **dest, int16_t colType, uint8_t precision); static int32_t validateParamOfRelationIn(tVariant *pVar, int32_t colType); static bool has(SArray* pFieldList, int32_t startIdx, const char* name); @@ -149,7 +150,7 @@ int16_t getNewResColId(SSqlCmd* pCmd) { // serialize expr in exprlist to binary // formate "type | size | value" -bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType) { +bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType, uint8_t precision) { bool ret = false; if (!pList || pList->size <= 0 || colType < 0) { return ret; @@ -161,9 +162,11 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType) //nchar to binary and toTSDBType(type); - if (type != colType && (type != TSDB_DATA_TYPE_BINARY || colType != TSDB_DATA_TYPE_NCHAR)) { - return false; - } + if (colType != TSDB_DATA_TYPE_TIMESTAMP) { + if (type != colType && (type != TSDB_DATA_TYPE_BINARY || colType != TSDB_DATA_TYPE_NCHAR)) { + return false; + } + } type = colType; SBufferWriter bw = tbufInitWriter( NULL, false ); @@ -185,8 +188,7 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType) tVariant var; tVariantCreate(&var, &pSub->token); - if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT - || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type)) { tbufWriteInt64(&bw, var.i64); } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { tbufWriteDouble(&bw, var.dKey); @@ -201,6 +203,16 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType) } tbufWriteBinary(&bw, buf, twcslen((wchar_t *)buf) * TSDB_NCHAR_SIZE); free(buf); + } else if (type == TSDB_DATA_TYPE_TIMESTAMP) { + if (var.nType == TSDB_DATA_TYPE_BINARY) { + if (convertTimestampStrToInt64(&var, precision) < 0) { + tVariantDestroy(&var); + break; + } + tbufWriteInt64(&bw, var.i64); + } else if (var.nType == TSDB_DATA_TYPE_BIGINT) { + tbufWriteInt64(&bw, var.i64); + } } tVariantDestroy(&var); @@ -3340,7 +3352,8 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, // TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd } else if (pExpr->tokenId == TK_IN) { tVariant *pVal; - if (pRight->tokenId != TK_SET || !serializeExprListToVariant(pRight->pParam, &pVal, colType) || colType == TSDB_DATA_TYPE_TIMESTAMP) { + + if (pRight->tokenId != TK_SET || !serializeExprListToVariant(pRight->pParam, &pVal, colType, timePrecision)) { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg); } if (validateParamOfRelationIn(pVal, colType) != TSDB_CODE_SUCCESS) { @@ -3352,7 +3365,6 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, pColumnFilter->len = pVal->nLen; pColumnFilter->filterstr = 1; memcpy((char *)(pColumnFilter->pz), (char *)(pVal->pz), pVal->nLen); - //retVal = tVariantDump(pVal, (char *)(pColumnFilter->pz), TSDB_DATA_TYPE_BINARY, false); tVariantDestroy(pVal); free(pVal); @@ -3485,6 +3497,7 @@ static int32_t extractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SC const char* msg1 = "non binary column not support like operator"; const char* msg2 = "binary column not support this operator"; const char* msg3 = "bool column not support this operator"; + const char* msg4 = "primary key not support this operator"; SColumn* pColumn = tscColumnListInsert(pQueryInfo->colList, pIndex->columnIndex, pTableMeta->id.uid, pSchema); SColumnFilterInfo* pColFilter = NULL; @@ -3541,6 +3554,9 @@ static int32_t extractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SC pColumn->columnIndex = pIndex->columnIndex; pColumn->tableUid = pTableMeta->id.uid; + if (pColumn->columnIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX && pExpr->tokenId == TK_IN) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4); + } STableComInfo tinfo = tscGetTableInfo(pTableMeta); return doExtractColumnFilterInfo(pCmd, pQueryInfo, tinfo.precision, pColFilter, pSchema->type, pExpr); @@ -8116,14 +8132,15 @@ int32_t exprTreeFromSqlExpr(SSqlCmd* pCmd, tExprNode **pExpr, const tSqlExpr* pS colType = pSchema->type; } } - tVariant *pVal; if (colType >= TSDB_DATA_TYPE_TINYINT && colType <= TSDB_DATA_TYPE_BIGINT) { colType = TSDB_DATA_TYPE_BIGINT; } else if (colType == TSDB_DATA_TYPE_FLOAT || colType == TSDB_DATA_TYPE_DOUBLE) { colType = TSDB_DATA_TYPE_DOUBLE; } - if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, colType) == false) { + STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0); + STableComInfo tinfo = tscGetTableInfo(pTableMetaInfo->pTableMeta); + if (serializeExprListToVariant(pSqlExpr->pParam, &pVal, colType, tinfo.precision) == false) { return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "not support filter expression"); } *pExpr = calloc(1, sizeof(tExprNode)); diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index 0e9ec053cc..0fbbfcd16f 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -476,7 +476,10 @@ void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) { int dummy = -1; int32_t sz = tbufReadInt32(&br); for (int32_t i = 0; i < sz; i++) { - if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { + int64_t val = tbufReadInt64(&br); + taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy)); + } else if (type == TSDB_DATA_TYPE_TIMESTAMP) { int64_t val = tbufReadInt64(&br); taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy)); } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { diff --git a/src/query/src/qFilterfunc.c b/src/query/src/qFilterfunc.c index 7e8dd66ed1..cfc3bfa125 100644 --- a/src/query/src/qFilterfunc.c +++ b/src/query/src/qFilterfunc.c @@ -254,7 +254,7 @@ bool notNullOperator(SColumnFilterElem *pFilter, const char* minval, const char* return true; } bool inOperator(SColumnFilterElem *pFilter, const char* minval, const char* maxval, int16_t type) { - if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { int64_t minv = -1, maxv = -1; GET_TYPED_DATA(minv, int64_t, type, minval); GET_TYPED_DATA(maxv, int64_t, type, maxval); diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index 972c3c4e10..a582e920f2 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -3355,7 +3355,7 @@ static bool tableFilterFp(const void* pNode, void* param) { } } else if (pInfo->optr == TSDB_RELATION_IN) { int type = pInfo->sch.type; - if (type == TSDB_DATA_TYPE_BOOL || type == TSDB_DATA_TYPE_TINYINT || type == TSDB_DATA_TYPE_SMALLINT || type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_INT) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { int64_t v; GET_TYPED_DATA(v, int64_t, pInfo->sch.type, val); return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v)); From 47899717d5d301096a5c979d135949ad0da3f4a3 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Jun 2021 07:20:34 +0800 Subject: [PATCH 17/37] [TD-3086]tag support timestamp and in_operator support timestamp and unsigned type --- src/client/src/tscSQLParser.c | 20 ++++++++++++++------ src/common/src/texpr.c | 8 ++++++-- src/query/src/qFilterfunc.c | 14 +++++++++++--- src/tsdb/src/tsdbRead.c | 9 +++++++-- 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index e9bf4cdb0d..a5c9088ec3 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -160,16 +160,16 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType, int32_t firstTokenType = item->pNode->token.type; int32_t type = firstTokenType; - //nchar to binary and + //nchar to binary and other xxint to bigint toTSDBType(type); - if (colType != TSDB_DATA_TYPE_TIMESTAMP) { + if (colType != TSDB_DATA_TYPE_TIMESTAMP && !IS_UNSIGNED_NUMERIC_TYPE(colType)) { if (type != colType && (type != TSDB_DATA_TYPE_BINARY || colType != TSDB_DATA_TYPE_NCHAR)) { return false; } } type = colType; - SBufferWriter bw = tbufInitWriter( NULL, false ); + SBufferWriter bw = tbufInitWriter( NULL, false); tbufEnsureCapacity(&bw, 512); int32_t size = (int32_t)(pList->size); @@ -183,14 +183,22 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType, if (firstTokenType != pSub->token.type) { break; } - toTSDBType(pSub->token.type); tVariant var; tVariantCreate(&var, &pSub->token); - if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type)) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type)) { tbufWriteInt64(&bw, var.i64); - } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { + } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) { + // ugly code, refactor later + if (IS_UNSIGNED_NUMERIC_TYPE(pSub->token.type) || IS_SIGNED_NUMERIC_TYPE(pSub->token.type)) { + tbufWriteUint64(&bw, var.i64); + } else { + tVariantDestroy(&var); + break; + } + } + else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { tbufWriteDouble(&bw, var.dKey); } else if (type == TSDB_DATA_TYPE_BINARY){ tbufWriteBinary(&bw, var.pz, var.nLen); diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index 0fbbfcd16f..973b88fef9 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -476,10 +476,14 @@ void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) { int dummy = -1; int32_t sz = tbufReadInt32(&br); for (int32_t i = 0; i < sz; i++) { - if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type)) { int64_t val = tbufReadInt64(&br); taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy)); - } else if (type == TSDB_DATA_TYPE_TIMESTAMP) { + } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) { + uint64_t val = tbufReadUint64(&br); + taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy)); + } + else if (type == TSDB_DATA_TYPE_TIMESTAMP) { int64_t val = tbufReadInt64(&br); taosHashPut(pObj, (char *)&val, sizeof(val), &dummy, sizeof(dummy)); } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { diff --git a/src/query/src/qFilterfunc.c b/src/query/src/qFilterfunc.c index cfc3bfa125..1c1ec21d65 100644 --- a/src/query/src/qFilterfunc.c +++ b/src/query/src/qFilterfunc.c @@ -254,15 +254,23 @@ bool notNullOperator(SColumnFilterElem *pFilter, const char* minval, const char* return true; } bool inOperator(SColumnFilterElem *pFilter, const char* minval, const char* maxval, int16_t type) { - if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { int64_t minv = -1, maxv = -1; GET_TYPED_DATA(minv, int64_t, type, minval); GET_TYPED_DATA(maxv, int64_t, type, maxval); if (minv == maxv) { return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&minv, sizeof(minv)); } - return true; - } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { + return false; + } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) { + uint64_t minv = 0, maxv = 0; + GET_TYPED_DATA(minv, uint64_t, type, minval); + GET_TYPED_DATA(maxv, uint64_t, type, maxval); + if (minv == maxv) { + return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&minv, sizeof(minv)); + } + return false; + }else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_FLOAT) { double v; GET_TYPED_DATA(v, double, type, minval); return NULL != taosHashGet((SHashObj *)pFilter->q, (char *)&v, sizeof(v)); diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c index a582e920f2..9ece4e7128 100644 --- a/src/tsdb/src/tsdbRead.c +++ b/src/tsdb/src/tsdbRead.c @@ -3355,11 +3355,16 @@ static bool tableFilterFp(const void* pNode, void* param) { } } else if (pInfo->optr == TSDB_RELATION_IN) { int type = pInfo->sch.type; - if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || IS_UNSIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { + if (type == TSDB_DATA_TYPE_BOOL || IS_SIGNED_NUMERIC_TYPE(type) || type == TSDB_DATA_TYPE_TIMESTAMP) { int64_t v; GET_TYPED_DATA(v, int64_t, pInfo->sch.type, val); return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v)); - } else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_DOUBLE) { + } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) { + uint64_t v; + GET_TYPED_DATA(v, uint64_t, pInfo->sch.type, val); + return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v)); + } + else if (type == TSDB_DATA_TYPE_DOUBLE || type == TSDB_DATA_TYPE_DOUBLE) { double v; GET_TYPED_DATA(v, double, pInfo->sch.type, val); return NULL != taosHashGet((SHashObj *)pInfo->q, (char *)&v, sizeof(v)); From 43e2b37be76e15b06a05f386cabf5434a2eacfe6 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Jun 2021 09:17:17 +0800 Subject: [PATCH 18/37] [TD-4740] --- src/common/src/ttypes.c | 10 +++++++++- tests/script/general/field/bigint.sim | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c index 6fa27a029b..34dda32401 100644 --- a/src/common/src/ttypes.c +++ b/src/common/src/ttypes.c @@ -632,7 +632,15 @@ int32_t tStrToInteger(const char* z, int16_t type, int32_t n, int64_t* value, bo } // the string may be overflow according to errno - *value = issigned? strtoll(z, &endPtr, radix):strtoull(z, &endPtr, radix); + if (!issigned) { + const char *p = z; + while(*p != 0 && *p == ' ') p++; + if (*p != 0 && *p == '-') { return -1;} + + *value = strtoull(z, &endPtr, radix); + } else { + *value = strtoll(z, &endPtr, radix); + } // not a valid integer number, return error if (endPtr - z != n || errno == ERANGE) { diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim index 3bb120c641..9736ac121f 100644 --- a/tests/script/general/field/bigint.sim +++ b/tests/script/general/field/bigint.sim @@ -32,6 +32,9 @@ while $i < 5 $ms = $x . m sql insert into $tb values (now + $ms , 0 ) $x = $x + 1 + sql_error insert into $tb values (now + $ms , -10) + sql_error insert into $tb values (now + $ms , -1000) + sql_error insert into $tb values (now + $ms , -10000000) endw $i = $i + 1 endw @@ -159,4 +162,4 @@ if $rows != 0 then return -1 endi -system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT From 2236360c17d5b728c808caeda847a665f537492b Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Jun 2021 09:35:09 +0800 Subject: [PATCH 19/37] [TD-4740] --- tests/script/general/field/bigint.sim | 3 - .../script/general/field/unsigined_bigint.sim | 165 ++++++++++++++++++ 2 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 tests/script/general/field/unsigined_bigint.sim diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim index 9736ac121f..538f966c49 100644 --- a/tests/script/general/field/bigint.sim +++ b/tests/script/general/field/bigint.sim @@ -32,9 +32,6 @@ while $i < 5 $ms = $x . m sql insert into $tb values (now + $ms , 0 ) $x = $x + 1 - sql_error insert into $tb values (now + $ms , -10) - sql_error insert into $tb values (now + $ms , -1000) - sql_error insert into $tb values (now + $ms , -10000000) endw $i = $i + 1 endw diff --git a/tests/script/general/field/unsigined_bigint.sim b/tests/script/general/field/unsigined_bigint.sim new file mode 100644 index 0000000000..fe81b50ab4 --- /dev/null +++ b/tests/script/general/field/unsigined_bigint.sim @@ -0,0 +1,165 @@ +system sh/stop_dnodes.sh +system sh/deploy.sh -n dnode1 -i 1 +system sh/cfg.sh -n dnode1 -c walLevel -v 1 +system sh/exec.sh -n dnode1 -s start + +sleep 2000 +sql connect +print ======================== dnode1 start + +$dbPrefix = db +$tbPrefix = tb +$mtPrefix = st +$tbNum = 10 +$rowNum = 20 +$totalNum = 200 + +print =============== step1 +$i = 0 +$db = $dbPrefix . $i +$mt = $mtPrefix . $i + +sql create database $db +sql use $db +sql create table $mt (ts timestamp, tbcol bigint unsigned) TAGS(tgcol bigint) + +$i = 0 +while $i < 5 + $tb = $tbPrefix . $i + sql create table $tb using $mt tags( 0 ) + $x = 0 + while $x < $rowNum + $ms = $x . m + sql insert into $tb values (now + $ms , 0 ) + $x = $x + 1 + sql_error insert into $tb values (now + $ms , -10) + sql_error insert into $tb values (now + $ms , -1000) + sql_error insert into $tb values (now + $ms , -10000000) + endw + $i = $i + 1 +endw +while $i < 10 + $tb = $tbPrefix . $i + sql create table $tb using $mt tags( 1 ) + $x = 0 + while $x < $rowNum + $ms = $x . m + sql insert into $tb values (now + $ms , 1 ) + $x = $x + 1 + endw + $i = $i + 1 +endw + +print =============== step2 +sql select * from $mt where tbcol = 0 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol <> 0 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol = 1 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol <> 1 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol = 1 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol <> 1 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol = 0 +if $rows != 100 then + return -1 +endi +sql select * from $mt where tbcol <> 0 +if $rows != 100 then + return -1 +endi + +print =============== step3 +sql select * from $mt where ts > now + 4m and tbcol = 1 +if $rows != 75 then + return -1 +endi +sql select * from $mt where ts > now + 4m and tbcol <> 1 +if $rows != 75 then + return -1 +endi +sql select * from $mt where ts < now + 4m and tbcol = 0 +if $rows != 25 then + return -1 +endi +sql select * from $mt where ts < now + 4m and tbcol <> 0 +if $rows != 25 then + return -1 +endi +sql select * from $mt where ts <= now + 4m and tbcol = 0 +if $rows != 25 then + return -1 +endi +sql select * from $mt where ts <= now + 4m and tbcol <> 0 +if $rows != 25 then + return -1 +endi +sql select * from $mt where ts > now + 4m and ts < now + 5m and tbcol <> 0 +if $rows != 5 then + return -1 +endi +sql select * from $mt where ts > now + 4m and tbcol <> 0 and ts < now + 5m +if $rows != 5 then + return -1 +endi + +print =============== step4 +sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt +print $data00 $data01 $data02 $data03 $data04 $data05 $data06 +if $data00 != 200 then + return -1 +endi + +print =============== step5 +sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 +print $data00 $data01 $data02 $data03 $data04 $data05 $data06 +if $data00 != 100 then + return -1 +endi + +print =============== step6 +sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 group by tgcol +print $data00 $data01 $data02 $data03 $data04 $data05 $data06 +print $data10 $data11 $data12 $data13 $data14 $data15 $data16 +if $data00 != 100 then + print expect 100, actual $data00 + return -1 +endi + +print =============== step7 +sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = 1 group by tgcol +print $data00 $data01 $data02 $data03 $data04 $data05 $data06 +if $data00 != 25 then + return -1 +endi + +print =============== step8 +sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc +print $data00 $data01 $data02 $data03 $data04 $data05 $data06 +if $data01 != 100 then + return -1 +endi + +print =============== clear +sql drop database $db +sql show databases +if $rows != 0 then + return -1 +endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT From 909db89d62ac07556b110365bf9057919b405792 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Jun 2021 09:39:30 +0800 Subject: [PATCH 20/37] [TD-4740] --- tests/script/general/field/unsigined_bigint.sim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/script/general/field/unsigined_bigint.sim b/tests/script/general/field/unsigined_bigint.sim index fe81b50ab4..1cfe8ad15b 100644 --- a/tests/script/general/field/unsigined_bigint.sim +++ b/tests/script/general/field/unsigined_bigint.sim @@ -21,12 +21,13 @@ $mt = $mtPrefix . $i sql create database $db sql use $db -sql create table $mt (ts timestamp, tbcol bigint unsigned) TAGS(tgcol bigint) +sql create table $mt (ts timestamp, tbcol bigint unsigned) TAGS(tgcol bigint unsigned) $i = 0 while $i < 5 $tb = $tbPrefix . $i sql create table $tb using $mt tags( 0 ) + sql create table $tb using $mt tags( -111 ) $x = 0 while $x < $rowNum $ms = $x . m From 2d66f67893b735a55c1346a2bfdae8df18341a50 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Jun 2021 11:53:45 +0800 Subject: [PATCH 21/37] [TD-3086]tag support timestamp and in_operator support timestamp --- tests/script/general/parser/where.sim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim index 6dfea3d2e7..00a22eede6 100644 --- a/tests/script/general/parser/where.sim +++ b/tests/script/general/parser/where.sim @@ -155,8 +155,8 @@ sql_error select last(*) from wh_mt1_tb1 where c6 in ('1') #sql_error select last(*) from wh_mt1_tb1 where c7 in ('binary') #sql_error select last(*) from wh_mt1 where c8 in ('nchar') #sql_error select last(*) from wh_mt1_tb1 where c9 in (true, false) -sql_error select last(*) from wh_mt1 where c10 in ('2019-01-01 00:00:00.000') -sql_error select last(*) from wh_mt1_tb1 where c10 in ('2019-01-01 00:00:00.000') +#sql_error select last(*) from wh_mt1 where c10 in ('2019-01-01 00:00:00.000') +#sql_error select last(*) from wh_mt1_tb1 where c10 in ('2019-01-01 00:00:00.000') sql select last(*) from wh_mt1 where c1 = 1 if $rows != 1 then return -1 From ee74391f9961746f5f9ac361295461a470e4f9ba Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 17 Jun 2021 14:24:21 +0800 Subject: [PATCH 22/37] modify the file, waiting for connector --- tests/pytest/dbmgmt/nanoSecondCheck.py | 69 +++++++++++++++----------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index a55823e639..b88936a3c6 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -1,17 +1,17 @@ -################################################################### +# ################################################################# # Copyright (c) 2016 by TAOS Technologies, Inc. # All rights reserved. -# + # This file is proprietary and confidential to TAOS Technologies. # No part of this file may be reproduced, stored, transmitted, # disclosed or used in any form or by any means other than as # expressly provided by the written permission from Jianhui Tao -# -################################################################### + +# ################################################################# # -*- coding: utf-8 -*- -#TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations +# TODO: after TD-4518 and TD-4510 is resolved, add the exception test case for these situations import sys from util.log import * @@ -42,14 +42,20 @@ class TDTestCase: tdSql.execute('import into tb values(1623254400300000000, 3);') tdSql.execute('import into tb values(1623254400299999999, 4);') tdSql.execute('insert into tb values(1623254400300000001, 5);') - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb values(1623254400999999999, 7);') - ##TODO: after the connector is updated, run the following commented code - ##TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented + #TODO: after the connector is updated, run the following commented code + #TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented # tdSql.query('select * from tb;') + # tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') + # tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') + # tdSql.checkData(2,0,'2021-06-10 0:00:00.299999999') + # tdSql.checkData(3,1,3) + # tdSql.checkData(4,1,5) + # tdSql.checkData(5,1,7) # tdSql.checkRows(6) # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;') # tdSql.checkData(0,0,1) @@ -92,24 +98,24 @@ class TDTestCase: # tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';') # tdSql.checkData(0,0,3) - #tdSql.query('select avg(speed) from tb interval(5000000000b);') + # tdSql.query('select avg(speed) from tb interval(5000000000b);') # tdSql.checkRows(1) - #tdSql.query('select avg(speed) from tb interval(100000000b)') - #tdSql.checkRows(4) + # tdSql.query('select avg(speed) from tb interval(100000000b)') + # tdSql.checkRows(4) - #tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') - #tdSql.checkRows(4) + # tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + # tdSql.checkRows(4) - #tdSql.query('select last(*) from tb') - #tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') - #tdSql.checkData(0,0, 1623254400999999999) + # tdSql.query('select last(*) from tb') + # tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') + # tdSql.checkData(0,0, 1623254400999999999) - #tdSql.query('select first(*) from tb') - #tdSql.checkData(0,0, 1623254400100000001) - #tdSql.checkData(0,0, 2021-06-10 0:00:00.100000001) + # tdSql.query('select first(*) from tb') + # tdSql.checkData(0,0, 1623254400100000001) + # tdSql.checkData(0,0, '2021-06-10 0:00:00.100000001') - #tdSql.execute('insert into tb values(now + 500000000b, 6);') + # tdSql.execute('insert into tb values(now + 500000000b, 6);') # tdSql.query('select * from tb;') # tdSql.checkRows(7) @@ -119,12 +125,17 @@ class TDTestCase: tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);') tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);') tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);') - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') - #tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d)') + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') # tdSql.query('select * from tb2;') + # tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') + # tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') + # tdSql.checkData(2,1,4) + # tdSql.checkData(3,1,3) + # tdSql.checkData(4,2,'2021-06-11 00:00:00.300000001') + # tdSql.checkData(5,2,'2021-06-13 00:00:00.999999999') # tdSql.checkRows(6) # tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;') # tdSql.checkData(0,0,1) @@ -155,7 +166,7 @@ class TDTestCase: # tdSql.checkData(0,0,1) # tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') - # tdSql.checkData(0,0,0) + # tdSql.checkData(0,0,1) # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;') # tdSql.checkData(0,0,5) @@ -179,14 +190,14 @@ class TDTestCase: # tdSql.query('select * from tb2;') # tdSql.checkRows(7) - tdSql.execute('create table tb3 (ts timestamp, speed int);') + # tdSql.execute('create table tb3 (ts timestamp, speed int);') - tdSql.error('insert into tb3 values(16232544001500000, 2);') - tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);') + # tdSql.error('insert into tb3 values(16232544001500000, 2);') + # tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);') # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\';') # tdSql.checkRows(1) - tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);') + # tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);') # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\';') # tdSql.checkRows(1) From 958d2454dffdbc6a1b94f3ef144d80acf4fcdf0b Mon Sep 17 00:00:00 2001 From: Ping Xiao Date: Thu, 17 Jun 2021 17:29:25 +0800 Subject: [PATCH 23/37] [TD-4733]: add test case for derivative function --- tests/pytest/functions/function_derivative.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/pytest/functions/function_derivative.py b/tests/pytest/functions/function_derivative.py index 4ddb9c309b..9d60129672 100644 --- a/tests/pytest/functions/function_derivative.py +++ b/tests/pytest/functions/function_derivative.py @@ -128,7 +128,14 @@ class TDTestCase: def run(self): tdSql.prepare() - self.insertAndCheckData() + self.insertAndCheckData() + + tdSql.execute("create table st(ts timestamp, c1 int, c2 int) tags(id int)") + tdSql.execute("insert into dev1(ts, c1) using st tags(1) values(now, 1)") + + tdSql.error("select derivative(c1, 10s, 0) from (select c1 from st)") + tdSql.query("select diff(c1) from (select derivative(c1, 1s, 0) c1 from dev1)") + tdSql.checkRows(0) def stop(self): tdSql.close() From 23117de9a059caeb017463e8f37be3e089457158 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Fri, 18 Jun 2021 09:59:29 +0800 Subject: [PATCH 24/37] [TD-4652] update nanoSecondCheck.py --- tests/pytest/dbmgmt/nanoSecondCheck.py | 216 ++++++++++++------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index b88936a3c6..54769563c7 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -49,75 +49,75 @@ class TDTestCase: #TODO: after the connector is updated, run the following commented code #TODO: due to the precision limit of double, spread currently cannot be tested since ns timestampe cannot be accurately represented - # tdSql.query('select * from tb;') - # tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') - # tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') - # tdSql.checkData(2,0,'2021-06-10 0:00:00.299999999') - # tdSql.checkData(3,1,3) - # tdSql.checkData(4,1,5) - # tdSql.checkData(5,1,7) - # tdSql.checkRows(6) - # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;') - # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\';') - # tdSql.checkData(0,0,1) + tdSql.query('select * from tb;') + tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') + tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') + tdSql.checkData(2,0,'2021-06-10 0:00:00.299999999') + tdSql.checkData(3,1,3) + tdSql.checkData(4,1,5) + tdSql.checkData(5,1,7) + tdSql.checkRows(6) + tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400100000002;') + tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000001\' and ts < \'2021-06-10 0:00:00.160000000\';') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;') - # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\';') - # tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb where ts > 1623254400100000000 and ts < 1623254400150000000;') + tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb where ts > \'2021-06-10 0:00:00.100000000\' and ts < \'2021-06-10 0:00:00.150000000\';') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts > 1623254400400000000;') - # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb where ts > 1623254400400000000;') + tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';') + tdSql.checkData(0,0,5) - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') - # tdSql.query('select count(*) from tb where ts > now + 400000000b;') - # tdSql.checkData(0,0,0) + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-10') + tdSql.query('select count(*) from tb where ts > now + 400000000b;') + tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\';') - # tdSql.checkData(0,0,6) + tdSql.query('select count(*) from tb where ts >= \'2021-06-10 0:00:00.100000001\';') + tdSql.checkData(0,0,6) - # tdSql.query('select count(*) from tb where ts <= 1623254400300000000;') - # tdSql.checkData(0,0,4) + tdSql.query('select count(*) from tb where ts <= 1623254400300000000;') + tdSql.checkData(0,0,4) - # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';') - # tdSql.checkData(0,0,0) + tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.000000000\';') + tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb where ts = 1623254400150000000;') - # tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb where ts = 1623254400150000000;') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\';') - # tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb where ts = \'2021-06-10 0:00:00.100000001\';') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb where ts between 1623254400000000000 and 1623254400400000000;') + tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';') - # tdSql.checkData(0,0,3) + tdSql.query('select count(*) from tb where ts between \'2021-06-10 0:00:00.299999999\' and \'2021-06-10 0:00:00.300000001\';') + tdSql.checkData(0,0,3) - # tdSql.query('select avg(speed) from tb interval(5000000000b);') - # tdSql.checkRows(1) + tdSql.query('select avg(speed) from tb interval(5000000000b);') + tdSql.checkRows(1) - # tdSql.query('select avg(speed) from tb interval(100000000b)') - # tdSql.checkRows(4) + tdSql.query('select avg(speed) from tb interval(100000000b)') + tdSql.checkRows(4) - # tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') - # tdSql.checkRows(4) + tdSql.query('select avg(speed) from tb interval(100000000b) sliding (100000000b);') + tdSql.checkRows(4) - # tdSql.query('select last(*) from tb') - # tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') - # tdSql.checkData(0,0, 1623254400999999999) + tdSql.query('select last(*) from tb') + tdSql.checkData(0,0, '2021-06-10 0:00:00.999999999') + tdSql.checkData(0,0, 1623254400999999999) - # tdSql.query('select first(*) from tb') - # tdSql.checkData(0,0, 1623254400100000001) - # tdSql.checkData(0,0, '2021-06-10 0:00:00.100000001') + tdSql.query('select first(*) from tb') + tdSql.checkData(0,0, 1623254400100000001) + tdSql.checkData(0,0, '2021-06-10 0:00:00.100000001') - # tdSql.execute('insert into tb values(now + 500000000b, 6);') - # tdSql.query('select * from tb;') - # tdSql.checkRows(7) + tdSql.execute('insert into tb values(now + 500000000b, 6);') + tdSql.query('select * from tb;') + tdSql.checkRows(7) tdSql.execute('create table tb2 (ts timestamp, speed int, ts2 timestamp);') tdSql.execute('insert into tb2 values(\'2021-06-10 0:00:00.100000001\', 1, \'2021-06-11 0:00:00.100000001\');') @@ -125,81 +125,81 @@ class TDTestCase: tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);') tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);') tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);') - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') + # # os.system('sudo timedatectl set-ntp off') + # # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') - # tdSql.query('select * from tb2;') - # tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') - # tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') - # tdSql.checkData(2,1,4) - # tdSql.checkData(3,1,3) - # tdSql.checkData(4,2,'2021-06-11 00:00:00.300000001') - # tdSql.checkData(5,2,'2021-06-13 00:00:00.999999999') - # tdSql.checkRows(6) - # tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;') - # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\';') - # tdSql.checkData(0,0,1) + tdSql.query('select * from tb2;') + tdSql.checkData(0,0,'2021-06-10 0:00:00.100000001') + tdSql.checkData(1,0,'2021-06-10 0:00:00.150000000') + tdSql.checkData(2,1,4) + tdSql.checkData(3,1,3) + tdSql.checkData(4,2,'2021-06-11 00:00:00.300000001') + tdSql.checkData(5,2,'2021-06-13 00:00:00.999999999') + tdSql.checkRows(6) + tdSql.query('select count(*) from tb2 where ts2 > 1623340800000000000 and ts2 < 1623340800150000000;') + tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb2 where ts2 > \'2021-06-11 0:00:00.100000000\' and ts2 < \'2021-06-11 0:00:00.100000002\';') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000;') - # tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 > 1623340800500000000;') + tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';') + tdSql.checkData(0,0,5) - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-11') - # tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') - # tdSql.checkData(0,0,0) + # os.system('sudo timedatectl set-ntp off') + # os.system('sudo timedatectl set-time 2021-06-11') + tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') + tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';') - # tdSql.checkData(0,0,6) + tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';') + tdSql.checkData(0,0,6) - # tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000;') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 <= 1623340800400000000;') + tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\';') - # tdSql.checkData(0,0,0) + tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.000000000\';') + tdSql.checkData(0,0,0) - # tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\';') - # tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb2 where ts2 = \'2021-06-11 0:00:00.300000001\';') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') - # tdSql.checkData(0,0,1) + tdSql.query('select count(*) from tb2 where ts2 = 1623340800300000001;') + tdSql.checkData(0,0,1) - # tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 between 1623340800000000000 and 1623340800450000000;') + tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\';') - # tdSql.checkData(0,0,3) + tdSql.query('select count(*) from tb2 where ts2 between \'2021-06-11 0:00:00.299999999\' and \'2021-06-11 0:00:00.300000001\';') + tdSql.checkData(0,0,3) - # tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999;') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 <> 1623513600999999999;') + tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';') + tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999;') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999;') + tdSql.checkData(0,0,5) - # tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') - # tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') + tdSql.checkData(0,0,5) - # tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') - # tdSql.query('select * from tb2;') - # tdSql.checkRows(7) + tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') + tdSql.query('select * from tb2;') + tdSql.checkRows(7) - # tdSql.execute('create table tb3 (ts timestamp, speed int);') + tdSql.execute('create table tb3 (ts timestamp, speed int);') - # tdSql.error('insert into tb3 values(16232544001500000, 2);') - # tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);') - # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\';') - # tdSql.checkRows(1) + tdSql.error('insert into tb3 values(16232544001500000, 2);') + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456\', 2);') + tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456000\';') + tdSql.checkRows(1) - # tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);') - # tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\';') - # tdSql.checkRows(1) + tdSql.execute('insert into tb3 values(\'2021-06-10 0:00:00.123456789000\', 2);') + tdSql.query('select * from tb3 where ts = \'2021-06-10 0:00:00.123456789\';') + tdSql.checkRows(1) os.system('sudo timedatectl set-ntp on') From dbe8dd40c1a80fbc13375ef267070d72bb250e40 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 18 Jun 2021 05:45:05 +0000 Subject: [PATCH 25/37] [TD-4690]script:check install package --- packaging/check_package.sh | 245 +++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100755 packaging/check_package.sh diff --git a/packaging/check_package.sh b/packaging/check_package.sh new file mode 100755 index 0000000000..e4d783d2f9 --- /dev/null +++ b/packaging/check_package.sh @@ -0,0 +1,245 @@ +#!/bin/bash +# +# This file is used to install database on linux systems. The operating system +# is required to use systemd to manage services at boot + +set -e +#set -x + +verMode=edge +pagMode=full + +iplist="" +serverFqdn="" + +# -----------------------Variables definition--------------------- +script_dir="../release" +# Dynamic directory +data_dir="/var/lib/taos" +log_dir="/var/log/taos" + +data_link_dir="/usr/local/taos/data" +log_link_dir="/usr/local/taos/log" + +cfg_install_dir="/etc/taos" + +bin_link_dir="/usr/bin" +lib_link_dir="/usr/lib" +lib64_link_dir="/usr/lib64" +inc_link_dir="/usr/include" + +#install main path +install_main_dir="/usr/local/taos" + +# old bin dir +sbin_dir="/usr/local/taos/bin" + +temp_version="" +fin_result="" + +service_config_dir="/etc/systemd/system" +nginx_port=6060 +nginx_dir="/usr/local/nginxd" + +# Color setting +RED='\033[0;31m' +GREEN='\033[1;32m' +GREEN_DARK='\033[0;32m' +GREEN_UNDERLINE='\033[4;32m' +NC='\033[0m' + +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + +# ============================= get input parameters ================================================= + +# install.sh -v [server | client] -e [yes | no] -i [systemd | service | ...] + +# set parameters by default value +interactiveFqdn=yes # [yes | no] +verType=server # [server | client] +initType=systemd # [systemd | service | ...] + +while getopts "hv:d:" arg +do + case $arg in + d) + #echo "interactiveFqdn=$OPTARG" + script_dir=$( echo $OPTARG ) + ;; + h) + echo "Usage: `basename $0` -d scripy_path" + exit 0 + ;; + ?) #unknow option + echo "unkonw argument" + exit 1 + ;; + esac +done + +#echo "verType=${verType} interactiveFqdn=${interactiveFqdn}" + +function kill_process() { + pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}') + if [ -n "$pid" ]; then + ${csudo} kill -9 $pid || : + fi +} + +function check_file() { + #check file whether exists + if [ ! -e $1/$2 ];then + echo -e "$1/$2 \033[31mnot exists\033[0m!quit" + fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n" + echo -e $fin_result + exit 8 + fi +} + +function get_package_name() { + var=$1 + if [[ $1 =~ 'aarch' ]];then + echo ${var::-21} + else + echo ${var::-17} + fi +} +function check_link() { + #check Link whether exists or broken + if [ -L $1 ] ; then + if [ ! -e $1 ] ; then + echo -e "$1 \033[31Broken link\033[0m" + fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n" + echo -e $fin_result + exit 8 + fi + else + echo -e "$1 \033[31mnot exists\033[0m!quit" + fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n" + echo -e $fin_result + exit 8 + fi +} + +function check_main_path() { + #check install main dir and all sub dir + main_dir=("" "cfg" "bin" "connector" "driver" "examples" "include" "init.d") + for i in ${main_dir[@]};do + check_file ${install_main_dir} $i + done + if [ "$verMode" == "cluster" ]; then + nginx_main_dir=("admin" "conf" "html" "sbin" "logs") + for i in ${nginx_main_dir[@]};do + check_file ${nginx_dir} $i + done + fi + echo -e "Check main path:\033[32mOK\033[0m!" +} + +function check_bin_path() { + # check install bin dir and all sub dir + bin_dir=("taos" "taosd" "taosdemo" "taosdump" "remove.sh" "tarbitrator" "set_core.sh") + for i in ${bin_dir[@]};do + check_file ${sbin_dir} $i + done + lbin_dir=("taos" "taosd" "taosdemo" "taosdump" "rmtaos" "tarbitrator" "set_core") + for i in ${lbin_dir[@]};do + check_link ${bin_link_dir}/$i + done + if [ "$verMode" == "cluster" ]; then + check_file ${nginx_dir}/sbin nginx + fi + echo -e "Check bin path:\033[32mOK\033[0m!" +} + + +function check_lib_path() { + # check all links + check_link ${lib_link_dir}/libtaos.so + check_link ${lib_link_dir}/libtaos.so.1 + + if [[ -d ${lib64_link_dir} ]]; then + check_link ${lib64_link_dir}/libtaos.so + check_link ${lib64_link_dir}/libtaos.so.1 + fi + echo -e "Check lib path:\033[32mOK\033[0m!" +} + + +function check_header_path() { + # check all header + header_dir=("taos.h" "taoserror.h") + for i in ${header_dir[@]};do + check_link ${inc_link_dir}/$i + done + echo -e "Check bin path:\033[32mOK\033[0m!" +} + + +function check_config_dir() { + # check all config + check_file ${cfg_install_dir} taos.cfg + check_file ${install_main_dir}/cfg taos.cfg.org + echo -e "Check conf path:\033[32mOK\033[0m!" +} + +function check_log_path() { + # check log path + check_file ${log_dir} + echo -e "Check log path:\033[32mOK\033[0m!" +} + +function check_data_path() { + # check data path + check_file ${data_dir} + echo -e "Check data path:\033[32mOK\033[0m!" +} + +function install_TDengine() { + cd ${script_dir} + tar zxf $1 + temp_version=$(get_package_name $1) + cd $(get_package_name $1) + echo -e "\033[32muninstall TDengine && install TDengine...\033[0m" + rmtaos >/dev/null 2>&1 || echo 'taosd not installed' && echo -e '\n\n' |./install.sh >/dev/null 2>&1 + echo -e "\033[32mTDengine has been installed!\033[0m" + echo -e "\033[32mTDengine is starting...\033[0m" + kill_process taos && systemctl start taosd && sleep 10 +} + +function test_TDengine() { + check_main_path + check_bin_path + check_lib_path + check_header_path + check_config_dir + check_log_path + check_data_path + result=`taos -s 'create database test ;create table test.tt(ts timestamp ,i int);insert into test.tt values(now,11);select * from test.tt' 2>&1 ||:` + if [[ $result =~ "Unable to establish" ]];then + echo -e "\033[31mTDengine connect failed\033[0m" + fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n" + echo -e $fin_result + exit 8 + fi + echo -e "Check TDengine connect:\033[32mOK\033[0m!" + fin_result=$fin_result"\033[32m$temp_version\033[0m test OK!\n" +} +# ## ==============================Main program starts from here============================ +TD_package_name=`ls ${script_dir}/*server*gz |awk -F '/' '{print $NF}' ` +temp=`pwd` +for i in $TD_package_name;do + if [[ $i =~ 'enterprise' ]];then + verMode="cluster" + else + verMode="" + fi + cd $temp + install_TDengine $i + test_TDengine +done +echo "============================================================" +echo -e $fin_result \ No newline at end of file From c17db2200846c1fef90e701f0d29c280d1d24a1f Mon Sep 17 00:00:00 2001 From: Elias Soong Date: Fri, 18 Jun 2021 16:08:09 +0800 Subject: [PATCH 26/37] [TD-4394] : can alter BINARY & NCHAR length in columns & tags. --- documentation20/cn/12.taos-sql/docs.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md index abbe7d8a0a..a405ed8d49 100644 --- a/documentation20/cn/12.taos-sql/docs.md +++ b/documentation20/cn/12.taos-sql/docs.md @@ -263,6 +263,14 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传 ``` 如果表是通过超级表创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构。 +- **表修改列宽** + + ```mysql + ALTER TABLE tb_name MODIFY COLUMN field_name data_type(length); + ``` + 如果数据列的类型是可变长格式（BINARY 或 NCHAR），那么可以使用此指令修改其宽度（只能改大，不能改小）。（2.1.3.0 版本新增） + 如果表是通过超级表创建，更改表结构的操作只能对超级表进行。同时针对超级表的结构更改对所有通过该结构创建的表生效。对于不是通过超级表创建的表，可以直接修改表结构。 + ## 超级表STable管理 注意：在 2.0.15.0 及以后的版本中，开始支持 STABLE 保留字。也即，在本节后文的指令说明中，CREATE、DROP、ALTER 三个指令在老版本中保留字需写作 TABLE 而不是 STABLE。 @@ -323,6 +331,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传 ALTER STABLE stb_name DROP COLUMN field_name; ``` +- **超级表修改列宽** + + ```mysql + ALTER STABLE stb_name MODIFY COLUMN field_name data_type(length); + ``` + 如果数据列的类型是可变长格式（BINARY 或 NCHAR），那么可以使用此指令修改其宽度（只能改大，不能改小）。（2.1.3.0 版本新增） + ## 超级表 STable 中 TAG 管理 - **添加标签** @@ -346,6 +361,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传 ``` 修改超级表的标签名，从超级表修改某个标签名后，该超级表下的所有子表也会自动更新该标签名。 +- **修改标签列宽度** + + ```mysql + ALTER STABLE stb_name MODIFY TAG tag_name data_type(length); + ``` + 如果标签的类型是可变长格式（BINARY 或 NCHAR），那么可以使用此指令修改其宽度（只能改大，不能改小）。（2.1.3.0 版本新增） + - **修改子表标签值** ```mysql From 268344dcee977d66f4f5bc7b8731ac53f6ef06af Mon Sep 17 00:00:00 2001 From: Elias Soong Date: Fri, 18 Jun 2021 17:03:13 +0800 Subject: [PATCH 27/37] [TD-4288] : update support version of DATABASE parameters hot modification. --- documentation20/cn/12.taos-sql/docs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md index a405ed8d49..b0268a9ed4 100644 --- a/documentation20/cn/12.taos-sql/docs.md +++ b/documentation20/cn/12.taos-sql/docs.md @@ -144,7 +144,7 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传 ``` UPDATE 参数控制是否允许更新数据。缺省值为 0，取值范围为 [0, 1]。0 表示会直接丢弃后写入的相同时间戳的数据；1 表示会使用后写入的数据覆盖已有的相同时间戳的数据。 - **Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。另外，从 2.1.1.0 版本开始，修改这些参数后无需重启服务器即可生效。 + **Tips**: 以上所有参数修改后都可以用show databases来确认是否修改成功。另外，从 2.1.3.0 版本开始，修改这些参数后无需重启服务器即可生效。 - **显示系统所有数据库** From 945354280cbf386fbb9338a39d0eca3c1a51afb1 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Fri, 18 Jun 2021 18:34:54 +0800 Subject: [PATCH 28/37] Feature/sangshuduo/td 4752 python support ns (#6534) * [TD-4752]: python connector support nanosecond. * [TD-4752]: support nanosecond in test framework. return integer for nanosecond in connector since python does not support nanosecond yet. --- src/connector/python/taos/cinterface.py | 2 +- tests/pytest/util/sql.py | 38 +++++++++++++++---------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py index 61a2a0e9c7..cc7c279458 100644 --- a/src/connector/python/taos/cinterface.py +++ b/src/connector/python/taos/cinterface.py @@ -15,7 +15,7 @@ def _convert_microsecond_to_datetime(micro): def _convert_nanosecond_to_datetime(nanosec): - return datetime.datetime.fromtimestamp(nanosec / 1000000000.0) + return nanosec def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, precision=FieldType.C_TIMESTAMP_UNKNOWN): diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py index 8f62c5932b..913c158d05 100644 --- a/tests/pytest/util/sql.py +++ b/tests/pytest/util/sql.py @@ -18,6 +18,7 @@ import datetime import inspect import psutil import shutil +import pandas as pd from util.log import * @@ -134,25 +135,32 @@ class TDSql: return self.cursor.istype(col, dataType) def checkData(self, row, col, data): - self.checkRowCol(row, col) - if self.queryResult[row][col] != data: - if self.cursor.istype(col, "TIMESTAMP") and self.queryResult[row][col] == datetime.datetime.fromisoformat(data): - tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % + self.checkRowCol(row, col) + if self.queryResult[row][col] != data: + if self.cursor.istype(col, "TIMESTAMP"): + # suppose user want to check nanosecond timestamp if a longer data passed + if (len(data) >= 28): + if pd.to_datetime(self.queryResult[row][col]) == pd.to_datetime(data): + tdLog.info("sql:%s, row:%d col:%d data:%d == expect:%s" % + (self.sql, row, col, self.queryResult[row][col], data)) + else: + if self.queryResult[row][col] == datetime.datetime.fromisoformat(data): + tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (self.sql, row, col, self.queryResult[row][col], data)) return if str(self.queryResult[row][col]) == str(data): tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % - (self.sql, row, col, self.queryResult[row][col], data)) + (self.sql, row, col, self.queryResult[row][col], data)) return - elif isinstance(data, float) and abs(self.queryResult[row][col] - data) <= 0.000001: + elif isinstance(data, float) and abs(self.queryResult[row][col] - data) <= 0.000001: tdLog.info("sql:%s, row:%d col:%d data:%f == expect:%f" % - (self.sql, row, col, self.queryResult[row][col], data)) + (self.sql, row, col, self.queryResult[row][col], data)) return else: caller = inspect.getframeinfo(inspect.stack()[1][0]) args = (caller.filename, caller.lineno, self.sql, row, col, self.queryResult[row][col], data) - tdLog.exit("%s(%d) failed: sql:%s row:%d col:%d data:%s != expect:%s" % args) + tdLog.exit("%s(%d) failed: sql:%s row:%d col:%d data:%s != expect:%s" % args) if data is None: tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % @@ -162,11 +170,11 @@ class TDSql: (self.sql, row, col, self.queryResult[row][col], data)) elif isinstance(data, datetime.date): tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % - (self.sql, row, col, self.queryResult[row][col], data)) + (self.sql, row, col, self.queryResult[row][col], data)) elif isinstance(data, float): tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (self.sql, row, col, self.queryResult[row][col], data)) - else: + else: tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%d" % (self.sql, row, col, self.queryResult[row][col], data)) @@ -200,7 +208,7 @@ class TDSql: tdLog.exit("%s(%d) failed: sql:%s, affectedRows:%d != expect:%d" % args) tdLog.info("sql:%s, affectedRows:%d == expect:%d" % (self.sql, self.affectedRows, expectAffectedRows)) - + def taosdStatus(self, state): tdLog.sleep(5) pstate = 0 @@ -221,7 +229,7 @@ class TDSql: continue pstate = 0 break - + args=(pstate,state) if pstate == state: tdLog.info("taosd state is %d == expect:%d" %args) @@ -236,11 +244,11 @@ class TDSql: tdLog.exit("dir: %s is empty, expect: not empty" %dir) else: tdLog.info("dir: %s is empty, expect: empty" %dir) - else: + else: if state : tdLog.info("dir: %s is not empty, expect: not empty" %dir) else: - tdLog.exit("dir: %s is not empty, expect: empty" %dir) + tdLog.exit("dir: %s is not empty, expect: empty" %dir) else: tdLog.exit("dir: %s doesn't exist" %dir) def createDir(self, dir): @@ -250,5 +258,5 @@ class TDSql: os.makedirs( dir, 755 ) tdLog.info("dir: %s is created" %dir) pass - + tdSql = TDSql() From 79616ad1f73e2ed87153e84e35051ff74ccd976b Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Sat, 19 Jun 2021 02:46:20 +0000 Subject: [PATCH 29/37] [TD-4774]Ignore some errors in valgrind --- tests/pytest/crash_gen/valgrind_taos.supp | 205 ++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/tests/pytest/crash_gen/valgrind_taos.supp b/tests/pytest/crash_gen/valgrind_taos.supp index 5f6604ba77..b42015a053 100644 --- a/tests/pytest/crash_gen/valgrind_taos.supp +++ b/tests/pytest/crash_gen/valgrind_taos.supp @@ -17517,4 +17517,209 @@ fun:taosGetFqdn fun:taosCheckGlobalCfg fun:taos_init_imp +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec_mtrand + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:PyCode_NewWithPosOnlyArgs + fun:PyCode_New + fun:__Pyx_InitCachedConstants + fun:__pyx_pymod_exec__generator + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec_bit_generator + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec__common + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec__bounded_integers + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec__mt19937 + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec__philox + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec__pcg64 + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__pyx_pymod_exec__sfc64 + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + obj:/usr/bin/python3.8 + fun:PyTuple_Pack + fun:__Pyx_InitCachedConstants + fun:__pyx_pymod_exec__generator + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:PyCode_NewWithPosOnlyArgs + fun:PyCode_New + fun:__pyx_pymod_exec_mtrand + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault +} +{ + + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:PyCode_NewWithPosOnlyArgs + fun:PyCode_New + fun:__pyx_pymod_exec_bit_generator + fun:PyModule_ExecDef + obj:/usr/bin/python3.8 + obj:/usr/bin/python3.8 + fun:PyVectorcall_Call + fun:_PyEval_EvalFrameDefault + fun:_PyEval_EvalCodeWithName + fun:_PyFunction_Vectorcall + fun:_PyEval_EvalFrameDefault } \ No newline at end of file From a1d95323c040f67ea30a1edb2618aba5bcfcdf67 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Sat, 19 Jun 2021 13:28:41 +0800 Subject: [PATCH 30/37] [TD-4751] minor modification --- tests/pytest/dbmgmt/nanoSecondCheck.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/pytest/dbmgmt/nanoSecondCheck.py b/tests/pytest/dbmgmt/nanoSecondCheck.py index 47592bdb8c..27050a2213 100644 --- a/tests/pytest/dbmgmt/nanoSecondCheck.py +++ b/tests/pytest/dbmgmt/nanoSecondCheck.py @@ -43,8 +43,6 @@ class TDTestCase: tdSql.execute('import into tb values(1623254400300000000, 3);') tdSql.execute('import into tb values(1623254400299999999, 4);') tdSql.execute('insert into tb values(1623254400300000001, 5);') - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb values(1623254400999999999, 7);') @@ -71,8 +69,6 @@ class TDTestCase: tdSql.query('select count(*) from tb where ts < \'2021-06-10 00:00:00.400000000\';') tdSql.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-10') tdSql.query('select count(*) from tb where ts > now + 400000000b;') tdSql.checkRows(0) @@ -125,8 +121,6 @@ class TDTestCase: tdSql.execute('import into tb2 values(1623254400300000000, 3, 1623340800300000000);') tdSql.execute('import into tb2 values(1623254400299999999, 4, 1623340800299999999);') tdSql.execute('insert into tb2 values(1623254400300000001, 5, 1623340800300000001);') - # # os.system('sudo timedatectl set-ntp off') - # # os.system('sudo timedatectl set-time 2021-06-10') tdSql.execute('insert into tb2 values(1623254400999999999, 7, 1623513600999999999);') tdSql.query('select * from tb2;') @@ -147,12 +141,9 @@ class TDTestCase: tdSql.query('select count(*) from tb2 where ts2 < \'2021-06-11 0:00:00.400000000\';') tdSql.checkData(0,0,5) - # os.system('sudo timedatectl set-ntp off') - # os.system('sudo timedatectl set-time 2021-06-11') tdSql.query('select count(*) from tb2 where ts2 > now + 400000000b;') tdSql.checkRows(0) - tdSql.query('select count(*) from tb2 where ts2 >= \'2021-06-11 0:00:00.100000001\';') tdSql.checkData(0,0,6) @@ -180,12 +171,18 @@ class TDTestCase: tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000001\';') tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 <> \'2021-06-11 0:00:00.100000000\';') + tdSql.checkData(0,0,6) + tdSql.query('select count(*) from tb2 where ts2 != 1623513600999999999;') tdSql.checkData(0,0,5) tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000001\';') tdSql.checkData(0,0,5) + tdSql.query('select count(*) from tb2 where ts2 != \'2021-06-11 0:00:00.100000000\';') + tdSql.checkData(0,0,6) + tdSql.execute('insert into tb2 values(now + 500000000b, 6, now +2d);') tdSql.query('select * from tb2;') tdSql.checkRows(7) From 1226669352934093e421d5d85784ac55513d01e3 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Sat, 19 Jun 2021 13:31:07 +0800 Subject: [PATCH 31/37] [TD-4751] removing comment for understanding the files --- src/connector/python/taos/cinterface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py index e69d980a95..cc7c279458 100644 --- a/src/connector/python/taos/cinterface.py +++ b/src/connector/python/taos/cinterface.py @@ -10,7 +10,7 @@ def _convert_millisecond_to_datetime(milli): return datetime.datetime.fromtimestamp(milli / 1000.0) -def _convert_microsecond_to_datetime(micro): #checkpoint +def _convert_microsecond_to_datetime(micro): return datetime.datetime.fromtimestamp(micro / 1000000.0) From 70aab956b8c36cea72146c88d819f02edc02691e Mon Sep 17 00:00:00 2001 From: Elias Soong Date: Sat, 19 Jun 2021 15:12:46 +0800 Subject: [PATCH 32/37] [TD-4378] : add note about DB name prefix on RESTful. --- documentation20/cn/08.connector/01.java/docs.md | 3 ++- documentation20/cn/08.connector/docs.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md index e6d214c74d..fb47d79268 100644 --- a/documentation20/cn/08.connector/01.java/docs.md +++ b/documentation20/cn/08.connector/01.java/docs.md @@ -49,6 +49,7 @@ TDengine 的 JDBC 驱动实现尽可能与关系型数据库驱动保持一致 +注意：与 JNI 方式不同，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，RESTful 下所有对表名、超级表名的引用都需要指定数据库名前缀。 ## 如何获取 taos-jdbcdriver @@ -551,7 +552,7 @@ TDengine 目前支持时间戳、数字、字符、布尔类型，与 Java 对 | BIGINT | java.lang.Long | | FLOAT | java.lang.Float | | DOUBLE | java.lang.Double | -| SMALLINT | java.lang.Short | +| SMALLINT | java.lang.Short | | TINYINT | java.lang.Byte | | BOOL | java.lang.Boolean | | BINARY | byte array | diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md index c74d1ebc3e..f26928eec7 100644 --- a/documentation20/cn/08.connector/docs.md +++ b/documentation20/cn/08.connector/docs.md @@ -585,7 +585,9 @@ conn.close() ## RESTful Connector -为支持各种不同类型平台的开发，TDengine提供符合REST设计标准的API，即RESTful API。为最大程度降低学习成本，不同于其他数据库RESTful API的设计方法，TDengine直接通过HTTP POST 请求BODY中包含的SQL语句来操作数据库，仅需要一个URL。RESTful连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。 +为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 RESTful API。为最大程度降低学习成本，不同于其他数据库 RESTful API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。RESTful 连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。 + +注意：与标准连接器的一个区别是，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，所有对表名、超级表名的引用都需要指定数据库名前缀。 ### HTTP请求格式 From ebc247399f8b0993320d4d6174fb5325f38b2896 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Sat, 19 Jun 2021 15:46:28 +0800 Subject: [PATCH 33/37] Hotfix/sangshuduo/td 4765 random fail func (#6542) * fix missed function. * add function declaration back for random fail test. --- src/os/inc/osFile.h | 18 +++++++++++++++++- src/os/src/detail/osFail.c | 6 +++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/os/inc/osFile.h b/src/os/inc/osFile.h index 262f19ad22..86c08c0a3a 100644 --- a/src/os/inc/osFile.h +++ b/src/os/inc/osFile.h @@ -53,8 +53,24 @@ int64_t taosFSendFile(FILE *outfile, FILE *infile, int64_t *offset, int64_t size void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath); void taosClose(FileFd fd); +#ifdef TAOS_RANDOM_FILE_FAIL + void taosSetRandomFileFailFactor(int32_t factor); + void taosSetRandomFileFailOutput(const char *path); + #ifdef TAOS_RANDOM_FILE_FAIL_TEST + int64_t taosReadFileRandomFail(int32_t fd, void *buf, int32_t count, const char *file, uint32_t line); + int64_t taosWriteFileRandomFail(int32_t fd, void *buf, int32_t count, const char *file, uint32_t line); + int64_t taosLSeekRandomFail(int32_t fd, int64_t offset, int32_t whence, const char *file, uint32_t line); + #undef taosRead + #undef taosWrite + #undef taosLSeek + #define taosRead(fd, buf, count) taosReadFileRandomFail(fd, buf, count, __FILE__, __LINE__) + #define taosWrite(fd, buf, count) taosWriteFileRandomFail(fd, buf, count, __FILE__, __LINE__) + #define taosLSeek(fd, offset, whence) taosLSeekRandomFail(fd, offset, whence, __FILE__, __LINE__) + #endif +#endif + #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/src/os/src/detail/osFail.c b/src/os/src/detail/osFail.c index a99bcd01db..6ddeefc521 100644 --- a/src/os/src/detail/osFail.c +++ b/src/os/src/detail/osFail.c @@ -113,7 +113,7 @@ int64_t taosReadFileRandomFail(int32_t fd, void *buf, int32_t count, const char } } - return taosReadImp(fd, buf, count); + return taosRead(fd, buf, count); } int64_t taosWriteFileRandomFail(int32_t fd, void *buf, int32_t count, const char *file, uint32_t line) { @@ -124,7 +124,7 @@ int64_t taosWriteFileRandomFail(int32_t fd, void *buf, int32_t count, const char } } - return taosWriteImp(fd, buf, count); + return taosWrite(fd, buf, count); } int64_t taosLSeekRandomFail(int32_t fd, int64_t offset, int32_t whence, const char *file, uint32_t line) { @@ -135,7 +135,7 @@ int64_t taosLSeekRandomFail(int32_t fd, int64_t offset, int32_t whence, const ch } } - return taosLSeekImp(fd, offset, whence); + return taosLSeek(fd, offset, whence); } #endif //TAOS_RANDOM_FILE_FAIL From 1ecdcf8e450972b915c7828c8a0391e55bde3044 Mon Sep 17 00:00:00 2001 From: Linhe Huo Date: Mon, 21 Jun 2021 11:24:52 +0800 Subject: [PATCH 34/37] [TD-4803]: fix repo name in python connector README (#6559) --- src/connector/python/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/connector/python/README.md b/src/connector/python/README.md index 9151e9b8f0..a5dc2b72da 100644 --- a/src/connector/python/README.md +++ b/src/connector/python/README.md @@ -5,12 +5,13 @@ ## Install ```sh -pip install git+https://github.com/taosdata/TDengine-connector-python +git clone --depth 1 https://github.com/taosdata/TDengine.git +pip install ./TDengine/src/connector/python ``` ## Source Code -[TDengine] connector for Python source code is hosted on [GitHub](https://github.com/taosdata/TDengine-connector-python). +[TDengine] connector for Python source code is hosted on [GitHub](https://github.com/taosdata/TDengine/tree/develop/src/connector/python). ## License - AGPL From 129b541bc10ba04ff9c271f3057f0d377ea1aef8 Mon Sep 17 00:00:00 2001 From: xialei_li Date: Mon, 21 Jun 2021 14:17:48 +0800 Subject: [PATCH 35/37] [TD-4437]:update matlab-jdbc doc --- documentation20/cn/09.connections/docs.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation20/cn/09.connections/docs.md b/documentation20/cn/09.connections/docs.md index d1dba5a736..918887e8f3 100644 --- a/documentation20/cn/09.connections/docs.md +++ b/documentation20/cn/09.connections/docs.md @@ -81,16 +81,16 @@ MATLAB可以通过安装包内提供的JDBC Driver直接连接到TDengine获取 ### MATLAB的JDBC接口适配 -MATLAB的适配有下面几个步骤，下面以Windows10上适配MATLAB2017a为例： +MATLAB的适配有下面几个步骤，下面以Windows10上适配MATLAB2021a为例： -- 将TDengine安装包内的驱动程序JDBCDriver-1.0.0-dist.jar拷贝到${matlab_root}\MATLAB\R2017a\java\jar\toolbox -- 将TDengine安装包内的taos.lib文件拷贝至${matlab_ root _dir}\MATLAB\R2017a\lib\win64 -- 将新添加的驱动jar包加入MATLAB的classpath。在${matlab_ root _dir}\MATLAB\R2017a\toolbox\local\classpath.txt文件中添加下面一行 +- 将TDengine客户端安装路径下的\TDengine\connector\jdbc的驱动程序taos-jdbcdriver-2.0.25-dist.jar拷贝到${matlab_root}\MATLAB\R2021a\java\jar\toolbox +- 将TDengine安装包内的taos.lib文件拷贝至${matlab_ root _dir}\MATLAB\R2021\lib\win64 +- 将新添加的驱动jar包加入MATLAB的classpath。在${matlab_ root _dir}\MATLAB\R2021a\toolbox\local\classpath.txt文件中添加下面一行 ​ ``` -$matlabroot/java/jar/toolbox/JDBCDriver-1.0.0-dist.jar +$matlabroot/java/jar/toolbox/taos-jdbcdriver-2.0.25-dist.jar ``` -- 在${user_home}\AppData\Roaming\MathWorks\MATLAB\R2017a\下添加一个文件javalibrarypath.txt, 并在该文件中添加taos.dll的路径，比如您的taos.dll是在安装时拷贝到了C:\Windows\System32下，那么就应该在javalibrarypath.txt中添加如下一行： +- 在${user_home}\AppData\Roaming\MathWorks\MATLAB\R2021a\下添加一个文件javalibrarypath.txt, 并在该文件中添加taos.dll的路径，比如您的taos.dll是在安装时拷贝到了C:\Windows\System32下，那么就应该在javalibrarypath.txt中添加如下一行： ​ ``` C:\Windows\System32 @@ -103,7 +103,7 @@ C:\Windows\System32 - 创建一个连接： ```matlab -conn = database(‘db’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://127.0.0.1:0/’) +conn = database(‘test’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://192.168.1.94:6030/’) ``` - 执行一次查询： From 0edce4c096bd32b6d651fa04ee24c9041b81517b Mon Sep 17 00:00:00 2001 From: Zhiyu Yang <69311263+zyyang-taosdata@users.noreply.github.com> Date: Mon, 21 Jun 2021 16:26:12 +0800 Subject: [PATCH 36/37] [TD-4762]: use maven-assembly-plugins to package multi packages for jdbc demo (#6539) * [TD-4762]: use maven-assembly-plugin package multi package for this demo * change --- tests/examples/JDBC/JDBCDemo/pom.xml | 70 +++++++++++++++---- tests/examples/JDBC/JDBCDemo/readme.md | 4 +- .../example/{JDBCDemo.java => JdbcDemo.java} | 4 +- .../com/taosdata/example/JdbcRestfulDemo.java | 2 +- 4 files changed, 62 insertions(+), 18 deletions(-) rename tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/{JDBCDemo.java => JdbcDemo.java} (98%) diff --git a/tests/examples/JDBC/JDBCDemo/pom.xml b/tests/examples/JDBC/JDBCDemo/pom.xml index 66e866a2d3..ca8cd24030 100644 --- a/tests/examples/JDBC/JDBCDemo/pom.xml +++ b/tests/examples/JDBC/JDBCDemo/pom.xml @@ -9,11 +9,15 @@ SNAPSHOT jar + + src/main/resources/assembly + + com.taosdata.jdbc taos-jdbcdriver - 2.0.22 + 2.0.30 @@ -22,20 +26,60 @@ org.apache.maven.plugins maven-assembly-plugin - 3.1.0 - - - - com.taosdata.example.JDBCDemo - - - - jar-with-dependencies - - + 3.3.0 + - make-assembly + JdbcDemo + + JdbcDemo + + + com.taosdata.example.JdbcDemo + + + + jar-with-dependencies + + + package + + single + + + + + JdbcRestfulDemo + + JdbcRestfulDemo + + + com.taosdata.example.JdbcRestfulDemo + + + + jar-with-dependencies + + + package + + single + + + + + SubscribeDemo + + SubscribeDemo + + + com.taosdata.example.SubscribeDemo + + + + jar-with-dependencies + + package single diff --git a/tests/examples/JDBC/JDBCDemo/readme.md b/tests/examples/JDBC/JDBCDemo/readme.md index 9484442085..da638a0bcc 100644 --- a/tests/examples/JDBC/JDBCDemo/readme.md +++ b/tests/examples/JDBC/JDBCDemo/readme.md @@ -11,12 +11,12 @@ Download the tdengine package on our website: ``https://www.taosdata.com/cn/all- ## Run jdbcDemo using mvn plugin run command: ``` -mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JDBCDemo" +mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JdbcDemo" ``` and run with your customed args ``` -mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JDBCDemo" -Dexec.args="-host [HOSTNAME]" +mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JdbcDemo" -Dexec.args="-host [HOSTNAME]" ``` ## Compile the Demo Code and Run It diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java similarity index 98% rename from tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java rename to tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java index da865b3ffd..f256668dc6 100644 --- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java +++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcDemo.java @@ -3,7 +3,7 @@ package com.taosdata.example; import java.sql.*; import java.util.Properties; -public class JDBCDemo { +public class JdbcDemo { private static String host; private static final String dbName = "test"; private static final String tbName = "weather"; @@ -17,7 +17,7 @@ public class JDBCDemo { if (host == null) { printHelp(); } - JDBCDemo demo = new JDBCDemo(); + JdbcDemo demo = new JdbcDemo(); demo.init(); demo.createDatabase(); demo.useDatabase(); diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java index eedb0ba166..5bf980f6d8 100644 --- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java +++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JdbcRestfulDemo.java @@ -4,7 +4,7 @@ import java.sql.*; import java.util.Properties; public class JdbcRestfulDemo { - private static final String host = "master"; + private static final String host = "127.0.0.1"; public static void main(String[] args) { try { From 2c3376649e771da19f71159e557bb386307ab79a Mon Sep 17 00:00:00 2001 From: Elias Soong Date: Mon, 21 Jun 2021 16:45:13 +0800 Subject: [PATCH 37/37] Made some little format changes. --- documentation20/cn/09.connections/docs.md | 25 +++++++++-------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/documentation20/cn/09.connections/docs.md b/documentation20/cn/09.connections/docs.md index 918887e8f3..b47f297ae0 100644 --- a/documentation20/cn/09.connections/docs.md +++ b/documentation20/cn/09.connections/docs.md @@ -77,48 +77,43 @@ sudo cp -rf /usr/local/taos/connector/grafanaplugin /var/lib/grafana/plugins/tde ## MATLAB -MATLAB可以通过安装包内提供的JDBC Driver直接连接到TDengine获取数据到本地工作空间。 +MATLAB 可以通过安装包内提供的 JDBC Driver 直接连接到 TDengine 获取数据到本地工作空间。 -### MATLAB的JDBC接口适配 +### MATLAB 的 JDBC 接口适配 -MATLAB的适配有下面几个步骤，下面以Windows10上适配MATLAB2021a为例： +MATLAB 的适配有下面几个步骤，下面以 Windows 10 上适配 MATLAB2021a 为例： -- 将TDengine客户端安装路径下的\TDengine\connector\jdbc的驱动程序taos-jdbcdriver-2.0.25-dist.jar拷贝到${matlab_root}\MATLAB\R2021a\java\jar\toolbox -- 将TDengine安装包内的taos.lib文件拷贝至${matlab_ root _dir}\MATLAB\R2021\lib\win64 -- 将新添加的驱动jar包加入MATLAB的classpath。在${matlab_ root _dir}\MATLAB\R2021a\toolbox\local\classpath.txt文件中添加下面一行 -​ +- 将 TDengine 客户端安装路径下的 `\TDengine\connector\jdbc的驱动程序taos-jdbcdriver-2.0.25-dist.jar` 拷贝到 `${matlab_root}\MATLAB\R2021a\java\jar\toolbox`。 +- 将 TDengine 安装包内的 `taos.lib` 文件拷贝至 `${matlab_root_dir}\MATLAB\R2021\lib\win64`。 +- 将新添加的驱动 jar 包加入 MATLAB 的 classpath。在 `${matlab_root_dir}\MATLAB\R2021a\toolbox\local\classpath.txt` 文件中添加下面一行： ``` $matlabroot/java/jar/toolbox/taos-jdbcdriver-2.0.25-dist.jar ``` -- 在${user_home}\AppData\Roaming\MathWorks\MATLAB\R2021a\下添加一个文件javalibrarypath.txt, 并在该文件中添加taos.dll的路径，比如您的taos.dll是在安装时拷贝到了C:\Windows\System32下，那么就应该在javalibrarypath.txt中添加如下一行： -​ +- 在 `${user_home}\AppData\Roaming\MathWorks\MATLAB\R2021a\` 下添加一个文件 `javalibrarypath.txt`，并在该文件中添加 taos.dll 的路径，比如您的 taos.dll 是在安装时拷贝到了 `C:\Windows\System32` 下，那么就应该在 `javalibrarypath.txt` 中添加如下一行： ``` C:\Windows\System32 ``` -### 在MATLAB中连接TDengine获取数据 +### 在 MATLAB 中连接 TDengine 获取数据 -在成功进行了上述配置后，打开MATLAB。 +在成功进行了上述配置后，打开 MATLAB。 - 创建一个连接： - ```matlab conn = database(‘test’, ‘root’, ‘taosdata’, ‘com.taosdata.jdbc.TSDBDriver’, ‘jdbc:TSDB://192.168.1.94:6030/’) ``` - 执行一次查询： - ```matlab sql0 = [‘select * from tb’] data = select(conn, sql0); ``` - 插入一条记录: - ```matlab sql1 = [‘insert into tb values (now, 1)’] exec(conn, sql1) ``` -更多例子细节请参考安装包内examples\Matlab\TDengineDemo.m文件。 +更多例子细节请参考安装包内 `examples\Matlab\TDengineDemo.m` 文件。 ## R