From 665caf144685587caeed1a1c463993faf31cd28f Mon Sep 17 00:00:00 2001 From: tomchon Date: Thu, 7 Jul 2022 18:16:21 +0800 Subject: [PATCH 01/25] test:add teatcase of tsbs quering --- .../1-insert/test_stmt_insert_query_ex.py | 262 ------------------ tests/system-test/2-query/tsbsQuery.py | 74 +++++ 2 files changed, 74 insertions(+), 262 deletions(-) delete mode 100644 tests/system-test/1-insert/test_stmt_insert_query_ex.py create mode 100644 tests/system-test/2-query/tsbsQuery.py diff --git a/tests/system-test/1-insert/test_stmt_insert_query_ex.py b/tests/system-test/1-insert/test_stmt_insert_query_ex.py deleted file mode 100644 index 2a64c09ff4..0000000000 --- a/tests/system-test/1-insert/test_stmt_insert_query_ex.py +++ /dev/null @@ -1,262 +0,0 @@ -################################################################### -# 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 -*- - -import sys -import os -import threading as thd -import multiprocessing as mp -from numpy.lib.function_base import insert -import taos -from taos import * -from util.log import * -from util.cases import * -from util.sql import * -import numpy as np -import datetime as dt -from datetime import datetime -from ctypes import * -import time -# constant define -WAITS = 5 # wait seconds - -class TDTestCase: - # - # --------------- main frame ------------------- - def caseDescription(self): - ''' - limit and offset keyword function test cases; - case1: limit offset base function test - case2: offset return valid - ''' - return - - def getBuildPath(self): - selfPath = os.path.dirname(os.path.realpath(__file__)) - - if ("community" in selfPath): - projPath = selfPath[:selfPath.find("community")] - else: - projPath = selfPath[:selfPath.find("tests")] - - for root, dirs, files in os.walk(projPath): - if ("taosd" in files or "taosd.exe" in files): - rootRealPath = os.path.dirname(os.path.realpath(root)) - if ("packaging" not in rootRealPath): - buildPath = root[:len(root)-len("/build/bin")] - break - return buildPath - - # init - def init(self, conn, logSql): - tdLog.debug("start to execute %s" % __file__) - tdSql.init(conn.cursor()) - # tdSql.prepare() - # self.create_tables(); - self.ts = 1500000000000 - - # stop - def stop(self): - tdSql.close() - tdLog.success("%s successfully executed" % __file__) - - - # --------------- case ------------------- - - - def newcon(self,host,cfg): - user = "root" - password = "taosdata" - port =6030 - con=taos.connect(host=host, user=user, password=password, config=cfg ,port=port) - print(con) - return con - - def test_stmt_set_tbname_tag(self,conn): - dbname = "stmt_tag" - - try: - conn.execute("drop database if exists %s" % dbname) - conn.execute("create database if not exists %s PRECISION 'us' " % dbname) - conn.select_db(dbname) - conn.execute("create table if not exists log(ts timestamp, bo bool, nil tinyint, ti tinyint, si smallint, ii int,\ - bi bigint, tu tinyint unsigned, su smallint unsigned, iu int unsigned, bu bigint unsigned, \ - ff float, dd double, bb binary(100), nn nchar(100), tt timestamp , vc varchar(100)) tags (t1 timestamp, t2 bool,\ - t3 tinyint, t4 tinyint, t5 smallint, t6 int, t7 bigint, t8 tinyint unsigned, t9 smallint unsigned, \ - t10 int unsigned, t11 bigint unsigned, t12 float, t13 double, t14 binary(100), t15 nchar(100), t16 timestamp)") - - stmt = conn.statement("insert into ? using log tags (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) \ - values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)") - tags = new_bind_params(16) - tags[0].timestamp(1626861392589123, PrecisionEnum.Microseconds) - tags[1].bool(True) - tags[2].bool(False) - tags[3].tinyint(2) - tags[4].smallint(3) - tags[5].int(4) - tags[6].bigint(5) - tags[7].tinyint_unsigned(6) - tags[8].smallint_unsigned(7) - tags[9].int_unsigned(8) - tags[10].bigint_unsigned(9) - tags[11].float(10.1) - tags[12].double(10.11) - tags[13].binary("hello") - tags[14].nchar("stmt") - tags[15].timestamp(1626861392589, PrecisionEnum.Milliseconds) - stmt.set_tbname_tags("tb1", tags) - params = new_multi_binds(17) - params[0].timestamp((1626861392589111, 1626861392590111, 1626861392591111)) - params[1].bool((True, None, False)) - params[2].tinyint([-128, -128, None]) # -128 is tinyint null - params[3].tinyint([0, 127, None]) - params[4].smallint([3, None, 2]) - params[5].int([3, 4, None]) - params[6].bigint([3, 4, None]) - params[7].tinyint_unsigned([3, 4, None]) - params[8].smallint_unsigned([3, 4, None]) - params[9].int_unsigned([3, 4, None]) - params[10].bigint_unsigned([3, 4, 5]) - params[11].float([3, None, 1]) - params[12].double([3, None, 1.2]) - params[13].binary(["abc", "dddafadfadfadfadfa", None]) - params[14].nchar(["涛思数据", None, "a long string with 中文字符"]) - params[15].timestamp([None, None, 1626861392591]) - params[16].binary(["涛思数据16", None, "a long string with 中文-字符"]) - - stmt.bind_param_batch(params) - stmt.execute() - - assert stmt.affected_rows == 3 - - #query all - querystmt1=conn.statement("select * from log where bu < ?") - queryparam1=new_bind_params(1) - print(type(queryparam1)) - queryparam1[0].int(10) - querystmt1.bind_param(queryparam1) - querystmt1.execute() - result1=querystmt1.use_result() - rows1=result1.fetch_all() - print(rows1[0]) - print(rows1[1]) - print(rows1[2]) - assert str(rows1[0][0]) == "2021-07-21 17:56:32.589111" - assert rows1[0][10] == 3 - assert rows1[1][10] == 4 - - #query: Numeric Functions - querystmt2=conn.statement("select abs(?) from log where bu < ?") - queryparam2=new_bind_params(2) - print(type(queryparam2)) - queryparam2[0].int(5) - queryparam2[1].int(5) - querystmt2.bind_param(queryparam2) - querystmt2.execute() - result2=querystmt2.use_result() - rows2=result2.fetch_all() - print("2",rows2) - assert rows2[0][0] == 5 - assert rows2[1][0] == 5 - - - #query: Numeric Functions and escapes - - querystmt3=conn.statement("select abs(?) from log where nn= 'a? long string with 中文字符' ") - queryparam3=new_bind_params(1) - print(type(queryparam3)) - queryparam3[0].int(5) - querystmt3.bind_param(queryparam3) - querystmt3.execute() - result3=querystmt3.use_result() - rows3=result3.fetch_all() - print("3",rows3) - assert rows3 == [] - - #query: string Functions - - querystmt9=conn.statement("select CHAR_LENGTH(?) from log ") - queryparam9=new_bind_params(1) - print(type(queryparam9)) - queryparam9[0].binary('中文字符') - querystmt9.bind_param(queryparam9) - querystmt9.execute() - result9=querystmt9.use_result() - rows9=result9.fetch_all() - print("9",rows9) - assert rows9[0][0] == 12, 'fourth case is failed' - assert rows9[1][0] == 12, 'fourth case is failed' - - #query: conversion Functions - - querystmt4=conn.statement("select cast( ? as bigint) from log ") - queryparam4=new_bind_params(1) - print(type(queryparam4)) - queryparam4[0].binary('1232a') - querystmt4.bind_param(queryparam4) - querystmt4.execute() - result4=querystmt4.use_result() - rows4=result4.fetch_all() - print("5",rows4) - assert rows4[0][0] == 1232 - assert rows4[1][0] == 1232 - - querystmt4=conn.statement("select cast( ? as binary(10)) from log ") - queryparam4=new_bind_params(1) - print(type(queryparam4)) - queryparam4[0].int(123) - querystmt4.bind_param(queryparam4) - querystmt4.execute() - result4=querystmt4.use_result() - rows4=result4.fetch_all() - print("6",rows4) - assert rows4[0][0] == '123' - assert rows4[1][0] == '123' - - # #query: datatime Functions - - # querystmt4=conn.statement(" select timediff('2021-07-21 17:56:32.590111',?,1s) from log ") - # queryparam4=new_bind_params(1) - # print(type(queryparam4)) - # queryparam4[0].timestamp(1626861392591111) - # querystmt4.bind_param(queryparam4) - # querystmt4.execute() - # result4=querystmt4.use_result() - # rows4=result4.fetch_all() - # print("7",rows4) - # assert rows4[0][0] == 1, 'seventh case is failed' - # assert rows4[1][0] == 1, 'seventh case is failed' - - - - # conn.execute("drop database if exists %s" % dbname) - conn.close() - - except Exception as err: - # conn.execute("drop database if exists %s" % dbname) - conn.close() - raise err - - def run(self): - buildPath = self.getBuildPath() - config = buildPath+ "../sim/dnode1/cfg/" - host="localhost" - connectstmt=self.newcon(host,config) - self.test_stmt_set_tbname_tag(connectstmt) - - return - - -# add case with filename -# -tdCases.addWindows(__file__, TDTestCase()) -tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/system-test/2-query/tsbsQuery.py b/tests/system-test/2-query/tsbsQuery.py new file mode 100644 index 0000000000..d24e5ea283 --- /dev/null +++ b/tests/system-test/2-query/tsbsQuery.py @@ -0,0 +1,74 @@ +import taos +import sys +import datetime +import inspect + +from util.log import * +from util.sql import * +from util.cases import * + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug(f"start to excute {__file__}") + tdSql.init(conn.cursor(), True) + + def prepareData(self): + database="db_tsbs" + ts=1451606400000 + tdSql.execute(f"create database {database};") + tdSql.execute(f"use {database} ") + tdSql.execute(''' + create table readings (ts timestamp,latitude double,longitude double,elevation double,velocity double,heading double,grade double,fuel_consumption double,load_capacity double,fuel_capacity double,nominal_fuel_consumption double) tags (name binary(30),fleet binary(30),driver binary(30),model binary(30),device_version binary(30)); + ''') + tdSql.execute(''' + create table diagnostics (ts timestamp,fuel_state double,current_load double,status bigint,load_capacity double,fuel_capacity double,nominal_fuel_consumption double) tags (name binary(30),fleet binary(30),driver binary(30),model binary(30),device_version binary(30)) ; + ''') + + for i in range(10): + tdSql.execute(f"create table rct{i} using readings (name,fleet,driver,model,device_version) tags ('truck_{i}','South{i}','Trish{i}','H-{i}','v2.3')") + tdSql.execute(f"create table dct{i} using diagnostics (name,fleet,driver,model,device_version) tags ('truck_{i}','South{i}','Trish{i}','H-{i}','v2.3')") + for j in range(10): + for i in range(10): + tdSql.execute( + f"insert into rct{j} values ( {ts+i*10000}, {80+i}, {90+i}, {85+i}, {30+i*10}, {1.2*i}, {221+i*2}, {20+i*0.2}, {1500+i*20}, {150+i*2},{5+i} )" + ) + tdSql.execute( + f"insert into dct{j} values ( {ts+i*10000}, {1+i*0.1},{1400+i*15}, {1+i},{1500+i*20}, {150+i*2},{5+i} )" + ) + + # def check_avg(self ,origin_query , check_query): + # avg_result = tdSql.getResult(origin_query) + # origin_result = tdSql.getResult(check_query) + + # check_status = True + # for row_index , row in enumerate(avg_result): + # for col_index , elem in enumerate(row): + # if avg_result[row_index][col_index] != origin_result[row_index][col_index]: + # check_status = False + # if not check_status: + # tdLog.notice("avg function value has not as expected , sql is \"%s\" "%origin_query ) + # sys.exit(1) + # else: + # tdLog.info("avg value check pass , it work as expected ,sql is \"%s\" "%check_query ) + + + def tsbsIotQuery(self): + tdSql.execute("use db_tsbs") + tdSql.query(" SELECT avg(velocity) as mean_velocity ,name,driver,fleet FROM readings WHERE ts > 1451606400000 AND ts <= 1451606460000 partition BY name,driver,fleet interval(10m); ") + tdSql.checkRows(1) + + + + def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring + tdLog.printNoPrefix("==========step1:create database and table,insert data ==============") + self.tsbsIotQuery() + self.tsbsIotQuery() + + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) From df06d22cb3eaf9021526994b83f4636780daea2e Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Fri, 8 Jul 2022 17:35:11 +0800 Subject: [PATCH 02/25] fix: some problem of parser and planner --- include/libs/scalar/scalar.h | 2 +- source/common/src/systable.c | 2 +- source/dnode/mnode/impl/src/mndSma.c | 11 +- source/libs/parser/inc/sql.y | 2 +- source/libs/parser/src/parCalcConst.c | 6 +- source/libs/parser/src/parTranslater.c | 147 +---- source/libs/parser/src/sql.c | 834 ++++++++++++------------ source/libs/planner/src/planOptimizer.c | 4 +- source/libs/scalar/src/scalar.c | 149 +++-- 9 files changed, 552 insertions(+), 605 deletions(-) diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h index aaebffa118..2a1a75c431 100644 --- a/include/libs/scalar/scalar.h +++ b/include/libs/scalar/scalar.h @@ -25,7 +25,7 @@ extern "C" { typedef struct SFilterInfo SFilterInfo; -int32_t scalarGetOperatorResultType(SDataType left, SDataType right, EOperatorType op, SDataType* pRes); +int32_t scalarGetOperatorResultType(SOperatorNode* pOp); /* pNode will be freed in API; diff --git a/source/common/src/systable.c b/source/common/src/systable.c index b8844390d2..ba8a8e1220 100644 --- a/source/common/src/systable.c +++ b/source/common/src/systable.c @@ -252,7 +252,7 @@ static const SSysTableMeta infosMeta[] = { {TSDB_INS_TABLE_USER_STABLES, userStbsSchema, tListLen(userStbsSchema)}, {TSDB_PERFS_TABLE_STREAMS, streamSchema, tListLen(streamSchema)}, {TSDB_INS_TABLE_USER_TABLES, userTblsSchema, tListLen(userTblsSchema)}, - {TSDB_INS_TABLE_USER_TABLE_DISTRIBUTED, userTblDistSchema, tListLen(userTblDistSchema)}, + // {TSDB_INS_TABLE_USER_TABLE_DISTRIBUTED, userTblDistSchema, tListLen(userTblDistSchema)}, {TSDB_INS_TABLE_USER_USERS, userUsersSchema, tListLen(userUsersSchema)}, {TSDB_INS_TABLE_LICENCES, grantsSchema, tListLen(grantsSchema)}, {TSDB_INS_TABLE_VGROUPS, vgroupsSchema, tListLen(vgroupsSchema)}, diff --git a/source/dnode/mnode/impl/src/mndSma.c b/source/dnode/mnode/impl/src/mndSma.c index da5b8cb48e..388441b1dc 100644 --- a/source/dnode/mnode/impl/src/mndSma.c +++ b/source/dnode/mnode/impl/src/mndSma.c @@ -1131,14 +1131,17 @@ static int32_t mndRetrieveSma(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc SSmaObj *pSma = NULL; int32_t cols = 0; - SDbObj *pDb = mndAcquireDb(pMnode, pShow->db); - if (pDb == NULL) return 0; + SDbObj *pDb = NULL; + if (strlen(pShow->db) > 0) { + pDb = mndAcquireDb(pMnode, pShow->db); + if (pDb == NULL) return 0; + } while (numOfRows < rows) { pShow->pIter = sdbFetch(pSdb, SDB_SMA, pShow->pIter, (void **)&pSma); if (pShow->pIter == NULL) break; - if (pSma->dbUid != pDb->uid) { + if (NULL != pDb && pSma->dbUid != pDb->uid) { sdbRelease(pSdb, pSma); continue; } @@ -1151,7 +1154,7 @@ static int32_t mndRetrieveSma(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc STR_TO_VARSTR(n1, (char *)tNameGetTableName(&smaName)); char n2[TSDB_DB_FNAME_LEN + VARSTR_HEADER_SIZE] = {0}; - STR_TO_VARSTR(n2, (char *)mndGetDbStr(pDb->name)); + STR_TO_VARSTR(n2, (char *)mndGetDbStr(pSma->db)); SName stbName = {0}; tNameFromString(&stbName, pSma->stb, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE); diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index fd79eaa9b7..4bcfcbf5c0 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -769,7 +769,7 @@ compare_op(A) ::= CONTAINS. in_op(A) ::= IN. { A = OP_TYPE_IN; } in_op(A) ::= NOT IN. { A = OP_TYPE_NOT_IN; } -in_predicate_value(A) ::= NK_LP(C) expression_list(B) NK_RP(D). { A = createRawExprNodeExt(pCxt, &C, &D, createNodeListNode(pCxt, B)); } +in_predicate_value(A) ::= NK_LP(C) literal_list(B) NK_RP(D). { A = createRawExprNodeExt(pCxt, &C, &D, createNodeListNode(pCxt, B)); } /************************************************ boolean_value_expression ********************************************/ boolean_value_expression(A) ::= boolean_primary(B). { A = B; } diff --git a/source/libs/parser/src/parCalcConst.c b/source/libs/parser/src/parCalcConst.c index 6c670b3f01..4dff42592a 100644 --- a/source/libs/parser/src/parCalcConst.c +++ b/source/libs/parser/src/parCalcConst.c @@ -195,8 +195,8 @@ static int32_t calcConstProject(SNode* pProject, SNode** pNew) { return code; } -static bool isUselessCol(bool hasSelectValFunc, SExprNode* pProj) { - if (hasSelectValFunc && QUERY_NODE_FUNCTION == nodeType(pProj) && fmIsSelectFunc(((SFunctionNode*)pProj)->funcId)) { +static bool isUselessCol(SExprNode* pProj) { + if (QUERY_NODE_FUNCTION == nodeType(pProj) && !fmIsScalarFunc(((SFunctionNode*)pProj)->funcId)) { return false; } return NULL == ((SExprNode*)pProj)->pAssociation; @@ -218,7 +218,7 @@ static SNode* createConstantValue() { static int32_t calcConstProjections(SCalcConstContext* pCxt, SSelectStmt* pSelect, bool subquery) { SNode* pProj = NULL; WHERE_EACH(pProj, pSelect->pProjectionList) { - if (subquery && isUselessCol(pSelect->hasSelectValFunc, (SExprNode*)pProj)) { + if (subquery && isUselessCol((SExprNode*)pProj)) { ERASE_NODE(pSelect->pProjectionList); continue; } diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 97a263f86f..4ffcd34d70 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -977,131 +977,11 @@ static bool isMultiResFunc(SNode* pNode) { return (QUERY_NODE_COLUMN == nodeType(pParam) ? 0 == strcmp(((SColumnNode*)pParam)->colName, "*") : false); } -static int32_t rewriteNegativeOperator(SNode** pOp) { - SNode* pRes = NULL; - int32_t code = scalarCalculateConstants(*pOp, &pRes); - if (TSDB_CODE_SUCCESS == code) { - *pOp = pRes; - } - return code; -} - -static EDealRes translateUnaryOperator(STranslateContext* pCxt, SOperatorNode** pOpRef) { - SOperatorNode* pOp = *pOpRef; - if (OP_TYPE_MINUS == pOp->opType) { - if (!IS_MATHABLE_TYPE(((SExprNode*)(pOp->pLeft))->resType.type)) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pLeft))->aliasName); - } - pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE; - pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes; - - pCxt->errCode = rewriteNegativeOperator((SNode**)pOpRef); - } else { - pOp->node.resType.type = TSDB_DATA_TYPE_BOOL; - pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BOOL].bytes; - } - return TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_CONTINUE : DEAL_RES_ERROR; -} - -static EDealRes translateArithmeticOperator(STranslateContext* pCxt, SOperatorNode* pOp) { - SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; - SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; - if (TSDB_DATA_TYPE_BLOB == ldt.type || TSDB_DATA_TYPE_BLOB == rdt.type) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); - } - if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) || - (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && (IS_VAR_DATA_TYPE(rdt.type) || IS_FLOAT_TYPE(rdt.type))) || - (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && (IS_VAR_DATA_TYPE(ldt.type) || IS_FLOAT_TYPE(ldt.type)))) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); - } - - if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && IS_INTEGER_TYPE(rdt.type)) || - (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && IS_INTEGER_TYPE(ldt.type)) || - (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_BOOL == rdt.type) || - (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && TSDB_DATA_TYPE_BOOL == ldt.type)) { - pOp->node.resType.type = TSDB_DATA_TYPE_TIMESTAMP; - pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_TIMESTAMP].bytes; - } else { - pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE; - pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes; - } - return DEAL_RES_CONTINUE; -} - static bool dataTypeEqual(const SDataType* l, const SDataType* r) { return (l->type == r->type && l->bytes == r->bytes && l->precision == r->precision && l->scale == r->scale); } -static EDealRes translateComparisonOperator(STranslateContext* pCxt, SOperatorNode* pOp) { - SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; - SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; - if (TSDB_DATA_TYPE_BLOB == ldt.type || TSDB_DATA_TYPE_BLOB == rdt.type) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); - } - if (OP_TYPE_IN == pOp->opType || OP_TYPE_NOT_IN == pOp->opType) { - SNodeListNode* pRight = (SNodeListNode*)pOp->pRight; - bool first = true; - SDataType targetDt = {0}; - SNode* pNode = NULL; - FOREACH(pNode, pRight->pNodeList) { - SDataType dt = ((SExprNode*)pNode)->resType; - if (first) { - targetDt = dt; - if (targetDt.type != TSDB_DATA_TYPE_NULL) { - first = false; - } - } else if (dt.type != targetDt.type && dt.type != TSDB_DATA_TYPE_NULL) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)pNode)->aliasName); - } else if (dt.bytes > targetDt.bytes) { - targetDt.bytes = dt.bytes; - } - } - pRight->dataType = targetDt; - } - if (nodesIsRegularOp(pOp)) { - if (!IS_VAR_DATA_TYPE(((SExprNode*)(pOp->pLeft))->resType.type)) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pLeft))->aliasName); - } - if (QUERY_NODE_VALUE != nodeType(pOp->pRight) || - ((!IS_STR_DATA_TYPE(((SExprNode*)(pOp->pRight))->resType.type)) && - (((SExprNode*)(pOp->pRight))->resType.type != TSDB_DATA_TYPE_NULL))) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); - } - } - pOp->node.resType.type = TSDB_DATA_TYPE_BOOL; - pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BOOL].bytes; - return DEAL_RES_CONTINUE; -} - -static EDealRes translateJsonOperator(STranslateContext* pCxt, SOperatorNode* pOp) { - SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; - SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; - if (TSDB_DATA_TYPE_JSON != ldt.type || TSDB_DATA_TYPE_BINARY != rdt.type) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); - } - if (pOp->opType == OP_TYPE_JSON_GET_VALUE) { - pOp->node.resType.type = TSDB_DATA_TYPE_JSON; - } else if (pOp->opType == OP_TYPE_JSON_CONTAINS) { - pOp->node.resType.type = TSDB_DATA_TYPE_BOOL; - } - pOp->node.resType.bytes = tDataTypes[pOp->node.resType.type].bytes; - return DEAL_RES_CONTINUE; -} - -static EDealRes translateBitwiseOperator(STranslateContext* pCxt, SOperatorNode* pOp) { - SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; - SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; - if (TSDB_DATA_TYPE_BLOB == ldt.type || TSDB_DATA_TYPE_BLOB == rdt.type) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); - } - pOp->node.resType.type = TSDB_DATA_TYPE_BIGINT; - pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes; - return DEAL_RES_CONTINUE; -} - -static EDealRes translateOperator(STranslateContext* pCxt, SOperatorNode** pOpRef) { - SOperatorNode* pOp = *pOpRef; - +static EDealRes translateOperator(STranslateContext* pCxt, SOperatorNode* pOp) { if (isMultiResFunc(pOp->pLeft)) { return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pLeft))->aliasName); } @@ -1109,17 +989,10 @@ static EDealRes translateOperator(STranslateContext* pCxt, SOperatorNode** pOpRe return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); } - if (nodesIsUnaryOp(pOp)) { - return translateUnaryOperator(pCxt, pOpRef); - } else if (nodesIsArithmeticOp(pOp)) { - return translateArithmeticOperator(pCxt, pOp); - } else if (nodesIsComparisonOp(pOp)) { - return translateComparisonOperator(pCxt, pOp); - } else if (nodesIsJsonOp(pOp)) { - return translateJsonOperator(pCxt, pOp); - } else if (nodesIsBitwiseOp(pOp)) { - return translateBitwiseOperator(pCxt, pOp); + if (TSDB_CODE_SUCCESS != scalarGetOperatorResultType(pOp)) { + return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, pOp->node.aliasName); } + return DEAL_RES_CONTINUE; } @@ -1485,7 +1358,7 @@ static EDealRes doTranslateExpr(SNode** pNode, void* pContext) { case QUERY_NODE_VALUE: return translateValue(pCxt, (SValueNode*)*pNode); case QUERY_NODE_OPERATOR: - return translateOperator(pCxt, (SOperatorNode**)pNode); + return translateOperator(pCxt, (SOperatorNode*)*pNode); case QUERY_NODE_FUNCTION: return translateFunction(pCxt, (SFunctionNode**)pNode); case QUERY_NODE_LOGIC_CONDITION: @@ -3352,7 +3225,7 @@ static int32_t checkTableRollupOption(STranslateContext* pCxt, SNodeList* pFuncs if (NULL == pFuncs) { if (NULL != pDbCfg->pRetensions) { return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_TABLE_OPTION, - "To create a super table in a database with the retensions parameter configured, " + "To create a super table in databases configured with the 'RETENTIONS' option, " "the 'ROLLUP' option must be present"); } return TSDB_CODE_SUCCESS; @@ -3563,10 +3436,12 @@ static int32_t checkTableWatermarkOption(STranslateContext* pCxt, STableOptions* } static int32_t checkCreateTable(STranslateContext* pCxt, SCreateTableStmt* pStmt, bool createStable) { - int32_t code = TSDB_CODE_SUCCESS; SDbCfgInfo dbCfg = {0}; - if (createStable) { - code = getDBCfg(pCxt, pStmt->dbName, &dbCfg); + int32_t code = getDBCfg(pCxt, pStmt->dbName, &dbCfg); + if (TSDB_CODE_SUCCESS == code && !createStable && NULL != dbCfg.pRetensions) { + code = generateSyntaxErrMsgExt( + &pCxt->msgBuf, TSDB_CODE_PAR_INVALID_TABLE_OPTION, + "Only super table creation is supported in databases configured with the 'RETENTIONS' option"); } if (TSDB_CODE_SUCCESS == code) { code = checkTableMaxDelayOption(pCxt, pStmt->pOptions, createStable, &dbCfg); diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 124d1b2270..029dae0311 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -216,244 +216,252 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (2360) +#define YY_ACTTAB_COUNT (2436) static const YYACTIONTYPE yy_action[] = { /* 0 */ 430, 1920, 431, 1491, 438, 71, 431, 1491, 514, 62, - /* 10 */ 1645, 1693, 40, 38, 1919, 550, 323, 325, 1917, 1690, - /* 20 */ 337, 86, 1254, 1457, 34, 33, 1643, 1589, 41, 39, - /* 30 */ 37, 36, 35, 1329, 119, 1252, 1777, 41, 39, 37, - /* 40 */ 36, 35, 1585, 122, 103, 1734, 550, 102, 101, 100, - /* 50 */ 99, 98, 97, 96, 95, 94, 1324, 526, 550, 23, + /* 10 */ 1645, 1693, 39, 37, 1919, 549, 323, 325, 1917, 1690, + /* 20 */ 337, 86, 1254, 1457, 33, 32, 1643, 1589, 40, 38, + /* 30 */ 36, 35, 34, 1329, 119, 1252, 1777, 40, 38, 36, + /* 40 */ 35, 34, 1585, 122, 103, 1734, 549, 102, 101, 100, + /* 50 */ 99, 98, 97, 96, 95, 94, 1324, 526, 549, 22, /* 60 */ 14, 1016, 342, 1015, 1795, 1638, 1640, 1260, 113, 142, - /* 70 */ 1795, 1468, 578, 79, 122, 468, 466, 1747, 543, 577, - /* 80 */ 40, 38, 1392, 120, 1, 1593, 122, 61, 337, 61, - /* 90 */ 1254, 1017, 358, 555, 1586, 555, 379, 552, 155, 1862, + /* 70 */ 1795, 1468, 578, 79, 122, 468, 466, 1747, 542, 577, + /* 80 */ 39, 37, 1392, 120, 1, 1593, 122, 61, 337, 61, + /* 90 */ 1254, 1017, 358, 554, 1586, 554, 379, 551, 155, 1862, /* 100 */ 1863, 1329, 1867, 1252, 1808, 1479, 659, 1521, 89, 1778, - /* 110 */ 580, 1780, 1781, 576, 120, 571, 542, 553, 1854, 553, + /* 110 */ 580, 1780, 1781, 576, 120, 571, 541, 552, 1854, 552, /* 120 */ 1331, 1332, 304, 1850, 1324, 1478, 120, 526, 14, 249, - /* 130 */ 1862, 549, 1456, 548, 1920, 1260, 1920, 1920, 164, 31, + /* 130 */ 1862, 548, 1456, 547, 1920, 1260, 1920, 1920, 164, 30, /* 140 */ 259, 156, 1862, 1863, 1777, 1867, 1747, 161, 447, 161, /* 150 */ 159, 1917, 2, 1917, 1917, 1593, 112, 111, 110, 109, /* 160 */ 108, 107, 106, 105, 104, 1255, 1747, 1253, 1279, 483, /* 170 */ 482, 481, 1795, 1920, 659, 480, 220, 221, 118, 477, - /* 180 */ 578, 44, 476, 475, 474, 1747, 160, 577, 1331, 1332, + /* 180 */ 578, 43, 476, 475, 474, 1747, 160, 577, 1331, 1332, /* 190 */ 1917, 429, 1258, 1259, 433, 1307, 1308, 1310, 1311, 1312, /* 200 */ 1313, 1314, 573, 569, 1322, 1323, 1325, 1326, 1327, 1328, - /* 210 */ 1330, 1333, 1808, 1413, 1278, 539, 90, 1778, 580, 1780, - /* 220 */ 1781, 576, 1279, 571, 162, 1454, 1854, 162, 553, 162, - /* 230 */ 330, 1850, 1933, 1255, 314, 1253, 61, 303, 140, 143, - /* 240 */ 516, 1888, 999, 1549, 34, 33, 1645, 1596, 41, 39, - /* 250 */ 37, 36, 35, 341, 536, 1411, 1412, 1414, 1415, 1477, + /* 210 */ 1330, 1333, 1808, 1413, 1278, 538, 90, 1778, 580, 1780, + /* 220 */ 1781, 576, 1279, 571, 162, 1454, 1854, 162, 552, 162, + /* 230 */ 328, 1850, 1933, 1255, 314, 1253, 61, 303, 140, 143, + /* 240 */ 516, 1888, 999, 1549, 33, 32, 1645, 1596, 40, 38, + /* 250 */ 36, 35, 34, 341, 535, 1411, 1412, 1414, 1415, 1477, /* 260 */ 1258, 1259, 1643, 1307, 1308, 1310, 1311, 1312, 1313, 1314, /* 270 */ 573, 569, 1322, 1323, 1325, 1326, 1327, 1328, 1330, 1333, - /* 280 */ 40, 38, 1003, 1004, 315, 349, 313, 312, 337, 470, - /* 290 */ 1254, 1777, 43, 472, 545, 540, 305, 1353, 11, 10, + /* 280 */ 39, 37, 1003, 1004, 315, 349, 313, 312, 337, 470, + /* 290 */ 1254, 1777, 42, 472, 544, 539, 305, 1353, 11, 10, /* 300 */ 1747, 1329, 103, 1252, 153, 102, 101, 100, 99, 98, /* 310 */ 97, 96, 95, 94, 385, 471, 378, 1632, 377, 1795, - /* 320 */ 1358, 1292, 1151, 1152, 1324, 1278, 1920, 554, 14, 1351, - /* 330 */ 1639, 1640, 1747, 437, 577, 1260, 433, 40, 38, 159, + /* 320 */ 1358, 1292, 1151, 1152, 1324, 1278, 1920, 553, 14, 1351, + /* 330 */ 1639, 1640, 1747, 437, 577, 1260, 433, 39, 37, 159, /* 340 */ 483, 482, 481, 1917, 1920, 337, 480, 1254, 1518, 118, /* 350 */ 477, 301, 2, 476, 475, 474, 605, 1918, 1329, 1808, - /* 360 */ 1252, 1917, 28, 90, 1778, 580, 1780, 1781, 576, 435, - /* 370 */ 571, 71, 370, 1854, 659, 1276, 162, 330, 1850, 154, + /* 360 */ 1252, 1917, 27, 90, 1778, 580, 1780, 1781, 576, 435, + /* 370 */ 571, 71, 370, 1854, 659, 1276, 162, 328, 1850, 154, /* 380 */ 1396, 1324, 1365, 1352, 117, 1016, 1278, 1015, 1331, 1332, - /* 390 */ 1309, 158, 1260, 1588, 372, 368, 544, 34, 33, 1880, - /* 400 */ 1571, 41, 39, 37, 36, 35, 1357, 479, 478, 8, + /* 390 */ 1309, 158, 1260, 1588, 372, 368, 543, 33, 32, 1880, + /* 400 */ 1571, 40, 38, 36, 35, 34, 1357, 479, 478, 8, /* 410 */ 636, 635, 634, 633, 345, 1017, 632, 631, 630, 123, /* 420 */ 625, 624, 623, 622, 621, 620, 619, 618, 133, 614, - /* 430 */ 324, 659, 162, 1255, 562, 1253, 34, 33, 140, 613, - /* 440 */ 41, 39, 37, 36, 35, 1331, 1332, 1595, 30, 335, + /* 430 */ 324, 659, 162, 1255, 561, 1253, 33, 32, 140, 613, + /* 440 */ 40, 38, 36, 35, 34, 1331, 1332, 1595, 29, 335, /* 450 */ 1346, 1347, 1348, 1349, 1350, 1354, 1355, 1356, 1280, 447, /* 460 */ 1258, 1259, 1476, 1307, 1308, 1310, 1311, 1312, 1313, 1314, /* 470 */ 573, 569, 1322, 1323, 1325, 1326, 1327, 1328, 1330, 1333, - /* 480 */ 34, 33, 214, 526, 41, 39, 37, 36, 35, 170, - /* 490 */ 1255, 207, 1253, 219, 165, 1281, 340, 37, 36, 35, - /* 500 */ 59, 34, 33, 1747, 140, 41, 39, 37, 36, 35, + /* 480 */ 33, 32, 214, 526, 40, 38, 36, 35, 34, 170, + /* 490 */ 1255, 207, 1253, 219, 165, 1281, 340, 36, 35, 34, + /* 500 */ 59, 33, 32, 1747, 140, 40, 38, 36, 35, 34, /* 510 */ 61, 1593, 75, 1595, 629, 627, 69, 1258, 1259, 68, /* 520 */ 1307, 1308, 1310, 1311, 1312, 1313, 1314, 573, 569, 1322, - /* 530 */ 1323, 1325, 1326, 1327, 1328, 1330, 1333, 40, 38, 1334, + /* 530 */ 1323, 1325, 1326, 1327, 1328, 1330, 1333, 39, 37, 1334, /* 540 */ 1689, 139, 298, 1475, 343, 337, 1777, 1254, 1277, 162, /* 550 */ 73, 303, 140, 305, 516, 1234, 1235, 1423, 1329, 418, /* 560 */ 1252, 1595, 1309, 1109, 602, 601, 600, 1113, 599, 1115, /* 570 */ 1116, 598, 1118, 595, 1795, 1124, 592, 1126, 1127, 589, /* 580 */ 586, 1324, 578, 488, 1747, 1449, 1351, 1747, 526, 577, - /* 590 */ 251, 472, 1260, 1474, 40, 38, 1683, 1254, 498, 383, - /* 600 */ 45, 4, 337, 555, 1254, 174, 173, 172, 1260, 9, + /* 590 */ 251, 472, 1260, 1474, 39, 37, 1683, 1254, 498, 383, + /* 600 */ 44, 4, 337, 554, 1254, 174, 173, 172, 1260, 9, /* 610 */ 1252, 1071, 206, 471, 1808, 1329, 1593, 1252, 89, 1778, /* 620 */ 580, 1780, 1781, 576, 497, 571, 491, 231, 1854, 1473, - /* 630 */ 485, 659, 304, 1850, 1747, 205, 563, 495, 1324, 493, - /* 640 */ 1352, 27, 1260, 1073, 1920, 1331, 1332, 34, 33, 1260, - /* 650 */ 162, 41, 39, 37, 36, 35, 1569, 159, 1869, 1472, - /* 660 */ 1471, 1917, 56, 1357, 611, 55, 9, 1869, 559, 526, - /* 670 */ 1747, 34, 33, 1645, 1448, 41, 39, 37, 36, 35, + /* 630 */ 485, 659, 304, 1850, 1747, 205, 562, 495, 1324, 493, + /* 640 */ 1352, 26, 1260, 1073, 1920, 1331, 1332, 33, 32, 1260, + /* 650 */ 162, 40, 38, 36, 35, 34, 1569, 159, 1869, 1472, + /* 660 */ 1471, 1917, 56, 1357, 611, 55, 9, 1869, 558, 526, + /* 670 */ 1747, 33, 32, 1645, 1448, 40, 38, 36, 35, 34, /* 680 */ 384, 659, 1866, 131, 130, 608, 607, 606, 659, 1644, /* 690 */ 1255, 1865, 1253, 1003, 1004, 1869, 513, 1593, 1470, 7, - /* 700 */ 1747, 1747, 1331, 1332, 1570, 30, 335, 1346, 1347, 1348, + /* 700 */ 1747, 1747, 1331, 1332, 1570, 29, 335, 1346, 1347, 1348, /* 710 */ 1349, 1350, 1354, 1355, 1356, 613, 1582, 1258, 1259, 1864, /* 720 */ 1307, 1308, 1310, 1311, 1312, 1313, 1314, 573, 569, 1322, - /* 730 */ 1323, 1325, 1326, 1327, 1328, 1330, 1333, 1920, 557, 1747, - /* 740 */ 1255, 1688, 1253, 298, 617, 29, 1565, 1255, 1403, 1253, - /* 750 */ 159, 34, 33, 514, 1917, 41, 39, 37, 36, 35, - /* 760 */ 347, 1874, 1385, 1263, 1691, 34, 33, 1258, 1259, 41, - /* 770 */ 39, 37, 36, 35, 1258, 1259, 213, 1307, 1308, 1310, + /* 730 */ 1323, 1325, 1326, 1327, 1328, 1330, 1333, 1920, 556, 1747, + /* 740 */ 1255, 1688, 1253, 298, 617, 28, 1565, 1255, 1403, 1253, + /* 750 */ 159, 33, 32, 514, 1917, 40, 38, 36, 35, 34, + /* 760 */ 347, 1874, 1385, 616, 1691, 33, 32, 1258, 1259, 40, + /* 770 */ 38, 36, 35, 34, 1258, 1259, 213, 1307, 1308, 1310, /* 780 */ 1311, 1312, 1313, 1314, 573, 569, 1322, 1323, 1325, 1326, - /* 790 */ 1327, 1328, 1330, 1333, 40, 38, 300, 1578, 1276, 1467, + /* 790 */ 1327, 1328, 1330, 1333, 39, 37, 300, 1578, 1276, 1467, /* 800 */ 611, 1920, 337, 1777, 1254, 411, 74, 609, 423, 1466, /* 810 */ 1636, 1508, 1389, 526, 159, 1329, 499, 1252, 1917, 131, /* 820 */ 130, 608, 607, 606, 388, 396, 1465, 424, 1464, 398, /* 830 */ 1339, 1795, 610, 484, 271, 1636, 1278, 1623, 1324, 578, - /* 840 */ 1747, 1593, 1292, 1568, 1747, 526, 577, 34, 33, 1260, - /* 850 */ 1747, 41, 39, 37, 36, 35, 113, 1920, 550, 52, - /* 860 */ 510, 389, 198, 473, 1262, 196, 2, 1747, 560, 1747, - /* 870 */ 159, 1808, 616, 1593, 1917, 90, 1778, 580, 1780, 1781, - /* 880 */ 576, 1463, 571, 1385, 1462, 1854, 122, 1461, 659, 330, - /* 890 */ 1850, 1933, 1460, 1459, 200, 1266, 1497, 199, 567, 1580, + /* 840 */ 1747, 1593, 1292, 1568, 1747, 526, 577, 33, 32, 1260, + /* 850 */ 1747, 40, 38, 36, 35, 34, 113, 1920, 549, 52, + /* 860 */ 510, 389, 198, 473, 1263, 196, 2, 1747, 559, 1747, + /* 870 */ 159, 1808, 1580, 1593, 1917, 90, 1778, 580, 1780, 1781, + /* 880 */ 576, 1463, 571, 1385, 1462, 1854, 122, 1461, 659, 328, + /* 890 */ 1850, 1933, 1460, 1459, 200, 11, 10, 199, 1262, 1576, /* 900 */ 1911, 422, 1331, 1332, 417, 416, 415, 414, 413, 410, /* 910 */ 409, 408, 407, 406, 402, 401, 400, 399, 393, 392, /* 920 */ 391, 390, 1747, 387, 386, 1747, 120, 526, 1747, 526, - /* 930 */ 628, 141, 1576, 1747, 1747, 526, 277, 526, 403, 611, - /* 940 */ 404, 157, 1862, 1863, 654, 1867, 446, 1255, 1590, 1253, - /* 950 */ 275, 58, 11, 10, 57, 1593, 506, 1593, 131, 130, - /* 960 */ 608, 607, 606, 1593, 210, 1593, 1777, 1451, 1452, 572, - /* 970 */ 176, 426, 373, 42, 1258, 1259, 550, 1307, 1308, 1310, + /* 930 */ 628, 141, 1042, 1747, 1747, 526, 277, 526, 403, 611, + /* 940 */ 404, 157, 1862, 1863, 567, 1867, 446, 1255, 1590, 1253, + /* 950 */ 275, 58, 1451, 1452, 57, 1593, 506, 1593, 131, 130, + /* 960 */ 608, 607, 606, 1593, 1043, 1593, 1777, 210, 572, 604, + /* 970 */ 176, 426, 373, 41, 1258, 1259, 549, 1307, 1308, 1310, /* 980 */ 1311, 1312, 1313, 1314, 573, 569, 1322, 1323, 1325, 1326, - /* 990 */ 1327, 1328, 1330, 1333, 1795, 526, 1265, 61, 202, 526, - /* 1000 */ 526, 201, 554, 526, 122, 204, 1722, 1747, 203, 577, - /* 1010 */ 507, 511, 1309, 1584, 524, 1202, 218, 1469, 1764, 604, - /* 1020 */ 1550, 526, 254, 1593, 1761, 555, 465, 1593, 1593, 1761, - /* 1030 */ 1343, 1593, 525, 1388, 1808, 88, 526, 1777, 90, 1778, + /* 990 */ 1327, 1328, 1330, 1333, 1795, 526, 1266, 61, 202, 526, + /* 1000 */ 526, 201, 553, 526, 122, 204, 1722, 1747, 203, 577, + /* 1010 */ 507, 511, 1309, 1584, 524, 1202, 218, 1469, 1764, 1550, + /* 1020 */ 254, 526, 500, 1593, 1761, 554, 465, 1593, 1593, 1761, + /* 1030 */ 1265, 1593, 525, 1388, 1808, 88, 526, 1777, 90, 1778, /* 1040 */ 580, 1780, 1781, 576, 120, 571, 1503, 260, 1854, 1593, - /* 1050 */ 1757, 1763, 330, 1850, 154, 1757, 1763, 326, 222, 249, - /* 1060 */ 1862, 549, 571, 548, 1593, 1795, 1920, 571, 486, 1501, - /* 1070 */ 66, 65, 382, 578, 1881, 169, 537, 243, 1747, 159, - /* 1080 */ 577, 376, 1767, 1917, 125, 328, 327, 526, 128, 1042, - /* 1090 */ 129, 489, 1796, 50, 299, 1268, 235, 366, 344, 364, - /* 1100 */ 360, 356, 166, 351, 348, 1808, 1329, 1765, 1261, 90, - /* 1110 */ 1778, 580, 1780, 1781, 576, 1593, 571, 42, 1761, 1854, - /* 1120 */ 1769, 1043, 42, 330, 1850, 1933, 519, 346, 42, 1324, - /* 1130 */ 228, 584, 1102, 1777, 1873, 1410, 85, 162, 238, 128, - /* 1140 */ 1260, 129, 114, 128, 1757, 1763, 82, 500, 1492, 1633, - /* 1150 */ 551, 1884, 253, 256, 258, 248, 571, 3, 53, 1359, - /* 1160 */ 80, 1795, 5, 350, 1315, 1276, 353, 357, 310, 578, - /* 1170 */ 270, 1071, 1218, 1130, 1747, 311, 577, 405, 267, 535, - /* 1180 */ 1685, 1134, 171, 1141, 1139, 132, 412, 420, 419, 421, - /* 1190 */ 555, 425, 427, 1282, 1777, 1285, 1284, 428, 436, 439, - /* 1200 */ 179, 1808, 440, 181, 441, 284, 1778, 580, 1780, 1781, - /* 1210 */ 576, 1286, 571, 442, 184, 186, 444, 1283, 188, 70, - /* 1220 */ 445, 448, 1795, 191, 467, 469, 1583, 195, 1579, 197, - /* 1230 */ 578, 1920, 134, 135, 93, 1747, 302, 577, 1269, 268, - /* 1240 */ 1264, 208, 1581, 1577, 161, 136, 137, 1777, 1917, 211, - /* 1250 */ 1727, 555, 502, 501, 508, 505, 512, 534, 1281, 215, - /* 1260 */ 515, 1726, 1808, 520, 1695, 1272, 284, 1778, 580, 1780, - /* 1270 */ 1781, 576, 320, 571, 517, 1795, 569, 1322, 1323, 1325, - /* 1280 */ 1326, 1327, 1328, 578, 126, 322, 521, 127, 1747, 224, - /* 1290 */ 577, 522, 1920, 269, 226, 78, 1594, 530, 1885, 1777, - /* 1300 */ 538, 6, 233, 532, 533, 159, 237, 547, 329, 1917, - /* 1310 */ 531, 541, 1385, 528, 1895, 1808, 529, 247, 121, 91, - /* 1320 */ 1778, 580, 1780, 1781, 576, 1894, 571, 1795, 244, 1854, - /* 1330 */ 246, 1876, 148, 1853, 1850, 578, 1280, 564, 1870, 561, - /* 1340 */ 1747, 331, 577, 242, 19, 245, 1835, 582, 272, 1637, - /* 1350 */ 1566, 252, 1777, 655, 1916, 51, 147, 263, 1741, 558, - /* 1360 */ 1936, 656, 658, 285, 63, 255, 1777, 1808, 276, 565, - /* 1370 */ 257, 91, 1778, 580, 1780, 1781, 576, 1740, 571, 274, - /* 1380 */ 1795, 1854, 1739, 295, 294, 566, 1850, 64, 575, 1738, - /* 1390 */ 352, 1735, 354, 1747, 1795, 577, 355, 1246, 1247, 167, - /* 1400 */ 359, 1733, 578, 361, 362, 363, 1732, 1747, 365, 577, - /* 1410 */ 1731, 1730, 369, 367, 1729, 371, 1712, 168, 374, 1777, - /* 1420 */ 1808, 375, 1221, 1220, 292, 1778, 580, 1780, 1781, 576, - /* 1430 */ 574, 571, 568, 1826, 1808, 1706, 1705, 1777, 144, 1778, - /* 1440 */ 580, 1780, 1781, 576, 380, 571, 381, 1795, 1704, 1703, - /* 1450 */ 1190, 1678, 1677, 1676, 67, 578, 1675, 1674, 1673, 1672, - /* 1460 */ 1747, 1671, 577, 394, 395, 1795, 1670, 397, 1669, 1668, - /* 1470 */ 321, 1667, 1666, 578, 1665, 1664, 1663, 1662, 1747, 1661, - /* 1480 */ 577, 1660, 556, 1934, 1659, 1658, 1657, 1808, 1656, 1777, - /* 1490 */ 1655, 91, 1778, 580, 1780, 1781, 576, 124, 571, 1654, - /* 1500 */ 1653, 1854, 1652, 1651, 1650, 1808, 1851, 1649, 1648, 293, - /* 1510 */ 1778, 580, 1780, 1781, 576, 1192, 571, 1795, 1647, 1646, - /* 1520 */ 1522, 175, 527, 1520, 1488, 578, 152, 1006, 115, 177, - /* 1530 */ 1747, 1777, 577, 1487, 178, 1005, 116, 432, 434, 1720, - /* 1540 */ 1714, 1777, 1702, 185, 183, 1701, 1687, 1572, 1519, 1517, - /* 1550 */ 449, 451, 1515, 455, 1513, 459, 1035, 1808, 450, 1795, - /* 1560 */ 453, 293, 1778, 580, 1780, 1781, 576, 578, 571, 1795, - /* 1570 */ 457, 1511, 1747, 454, 577, 458, 461, 578, 462, 1500, - /* 1580 */ 1499, 1484, 1747, 463, 577, 1574, 1145, 1144, 1573, 194, - /* 1590 */ 1070, 1777, 1069, 1068, 49, 1067, 626, 1509, 1064, 1808, - /* 1600 */ 316, 1063, 628, 288, 1778, 580, 1780, 1781, 576, 1808, - /* 1610 */ 571, 662, 1062, 144, 1778, 580, 1780, 1781, 576, 1795, - /* 1620 */ 571, 1061, 1504, 317, 334, 266, 490, 578, 1502, 318, - /* 1630 */ 1483, 487, 1747, 1777, 577, 492, 1482, 494, 1481, 151, - /* 1640 */ 496, 546, 1719, 92, 652, 648, 644, 640, 264, 1713, - /* 1650 */ 1228, 1777, 1700, 138, 503, 1698, 1699, 1697, 1935, 1808, - /* 1660 */ 1696, 1795, 54, 293, 1778, 580, 1780, 1781, 576, 575, - /* 1670 */ 571, 212, 217, 15, 1747, 87, 577, 1694, 229, 1795, - /* 1680 */ 223, 504, 319, 76, 336, 225, 509, 578, 518, 1238, - /* 1690 */ 1686, 227, 1747, 77, 577, 16, 230, 82, 1425, 1437, - /* 1700 */ 24, 1808, 42, 1777, 232, 292, 1778, 580, 1780, 1781, - /* 1710 */ 576, 523, 571, 236, 1827, 1270, 234, 48, 1407, 1808, - /* 1720 */ 1409, 145, 240, 293, 1778, 580, 1780, 1781, 576, 239, - /* 1730 */ 571, 1795, 25, 241, 1767, 193, 338, 26, 1402, 578, - /* 1740 */ 47, 250, 81, 216, 1747, 17, 577, 1382, 1381, 146, - /* 1750 */ 1766, 149, 1442, 1777, 464, 460, 456, 452, 192, 46, - /* 1760 */ 18, 1431, 13, 1777, 1226, 1436, 209, 332, 1441, 1440, - /* 1770 */ 333, 1808, 10, 1811, 20, 293, 1778, 580, 1780, 1781, - /* 1780 */ 576, 1795, 571, 1319, 570, 72, 1344, 32, 190, 578, - /* 1790 */ 150, 1795, 1317, 1316, 1747, 12, 577, 21, 163, 578, - /* 1800 */ 1300, 581, 579, 22, 1747, 1131, 577, 583, 339, 585, - /* 1810 */ 587, 1128, 588, 1108, 1125, 590, 593, 596, 1123, 1777, - /* 1820 */ 591, 1808, 1122, 1119, 594, 278, 1778, 580, 1780, 1781, - /* 1830 */ 576, 1808, 571, 1117, 597, 279, 1778, 580, 1780, 1781, - /* 1840 */ 576, 603, 571, 83, 84, 1140, 60, 1795, 261, 1121, - /* 1850 */ 189, 182, 1136, 187, 1120, 578, 1033, 443, 612, 1058, - /* 1860 */ 1747, 1777, 577, 1077, 262, 615, 1051, 1056, 1055, 1054, - /* 1870 */ 1053, 1777, 1052, 1050, 1049, 1074, 180, 1072, 1046, 1516, - /* 1880 */ 1045, 1044, 1041, 1777, 1040, 1039, 1038, 1808, 637, 1795, - /* 1890 */ 1514, 280, 1778, 580, 1780, 1781, 576, 578, 571, 1795, - /* 1900 */ 639, 638, 1747, 641, 577, 642, 643, 578, 1512, 645, - /* 1910 */ 646, 1795, 1747, 1510, 577, 647, 649, 650, 1498, 578, - /* 1920 */ 653, 651, 996, 1480, 1747, 1777, 577, 265, 657, 1808, - /* 1930 */ 1455, 1256, 273, 287, 1778, 580, 1780, 1781, 576, 1808, - /* 1940 */ 571, 660, 1777, 289, 1778, 580, 1780, 1781, 576, 661, - /* 1950 */ 571, 1808, 1455, 1795, 1455, 281, 1778, 580, 1780, 1781, - /* 1960 */ 576, 578, 571, 1455, 1455, 1455, 1747, 1455, 577, 1455, - /* 1970 */ 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, - /* 1980 */ 1455, 1455, 1455, 1747, 1777, 577, 1455, 1455, 1455, 1455, - /* 1990 */ 1455, 1455, 1455, 1808, 1777, 1455, 1455, 290, 1778, 580, - /* 2000 */ 1780, 1781, 576, 1455, 571, 1455, 1455, 1455, 1455, 1455, - /* 2010 */ 1808, 1455, 1795, 1455, 282, 1778, 580, 1780, 1781, 576, - /* 2020 */ 578, 571, 1795, 1455, 1455, 1747, 1455, 577, 1455, 1455, - /* 2030 */ 578, 1455, 1455, 1455, 1455, 1747, 1777, 577, 1455, 1455, - /* 2040 */ 1455, 1455, 1455, 1455, 1455, 1455, 1777, 1455, 1455, 1455, - /* 2050 */ 1455, 1455, 1808, 1455, 1455, 1455, 291, 1778, 580, 1780, - /* 2060 */ 1781, 576, 1808, 571, 1795, 1455, 283, 1778, 580, 1780, - /* 2070 */ 1781, 576, 578, 571, 1795, 1455, 1455, 1747, 1455, 577, - /* 2080 */ 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1777, 577, - /* 2090 */ 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1777, 1455, - /* 2100 */ 1455, 1455, 1455, 1455, 1808, 1455, 1455, 1455, 296, 1778, - /* 2110 */ 580, 1780, 1781, 576, 1808, 571, 1795, 1455, 297, 1778, - /* 2120 */ 580, 1780, 1781, 576, 578, 571, 1795, 1455, 1455, 1747, - /* 2130 */ 1455, 577, 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, - /* 2140 */ 1455, 577, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, - /* 2150 */ 1777, 1455, 1455, 1455, 1455, 1455, 1808, 1455, 1455, 1455, - /* 2160 */ 1789, 1778, 580, 1780, 1781, 576, 1808, 571, 1455, 1777, - /* 2170 */ 1788, 1778, 580, 1780, 1781, 576, 1455, 571, 1795, 1455, - /* 2180 */ 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, - /* 2190 */ 1455, 1747, 1777, 577, 1455, 1455, 1455, 1795, 1455, 1455, - /* 2200 */ 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, - /* 2210 */ 1747, 1777, 577, 1455, 1455, 1455, 1455, 1455, 1808, 1455, - /* 2220 */ 1795, 1455, 1787, 1778, 580, 1780, 1781, 576, 578, 571, - /* 2230 */ 1455, 1455, 1455, 1747, 1455, 577, 1455, 1808, 1455, 1795, - /* 2240 */ 1455, 308, 1778, 580, 1780, 1781, 576, 578, 571, 1455, - /* 2250 */ 1455, 1455, 1747, 1455, 577, 1455, 1455, 1455, 1455, 1455, - /* 2260 */ 1808, 1455, 1455, 1455, 307, 1778, 580, 1780, 1781, 576, - /* 2270 */ 1777, 571, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1808, - /* 2280 */ 1777, 1455, 1455, 309, 1778, 580, 1780, 1781, 576, 1455, - /* 2290 */ 571, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1795, 1455, - /* 2300 */ 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, 1795, 1455, - /* 2310 */ 1455, 1747, 1455, 577, 1455, 1455, 578, 1455, 1455, 1455, - /* 2320 */ 1455, 1747, 1455, 577, 1455, 1455, 1455, 1455, 1455, 1455, - /* 2330 */ 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1808, 1455, - /* 2340 */ 1455, 1455, 306, 1778, 580, 1780, 1781, 576, 1808, 571, - /* 2350 */ 1455, 1455, 286, 1778, 580, 1780, 1781, 576, 1455, 571, + /* 1050 */ 1757, 1763, 328, 1850, 154, 1757, 1763, 326, 222, 249, + /* 1060 */ 1862, 548, 571, 547, 1593, 1795, 1920, 571, 486, 1501, + /* 1070 */ 66, 65, 382, 578, 1881, 169, 1343, 85, 1747, 159, + /* 1080 */ 577, 376, 536, 1917, 1767, 334, 333, 82, 125, 243, + /* 1090 */ 128, 489, 1796, 129, 299, 1268, 50, 366, 1492, 364, + /* 1100 */ 360, 356, 166, 351, 348, 1808, 1329, 1764, 1261, 90, + /* 1110 */ 1778, 580, 1780, 1781, 576, 1765, 571, 235, 1761, 1854, + /* 1120 */ 526, 1633, 1769, 328, 1850, 1933, 1761, 1497, 41, 1324, + /* 1130 */ 519, 344, 228, 1777, 1873, 1102, 346, 162, 1410, 50, + /* 1140 */ 1260, 41, 1884, 584, 1757, 1763, 332, 128, 1593, 129, + /* 1150 */ 114, 128, 1757, 1763, 550, 248, 571, 253, 256, 238, + /* 1160 */ 258, 1795, 80, 53, 571, 5, 3, 350, 1276, 578, + /* 1170 */ 270, 353, 357, 310, 1747, 654, 577, 1071, 311, 566, + /* 1180 */ 1218, 1359, 267, 1315, 405, 1130, 1685, 171, 412, 1134, + /* 1190 */ 554, 1141, 1139, 132, 1777, 420, 419, 425, 421, 427, + /* 1200 */ 428, 1808, 1282, 436, 1285, 284, 1778, 580, 1780, 1781, + /* 1210 */ 576, 439, 571, 1284, 179, 440, 181, 441, 1286, 184, + /* 1220 */ 442, 444, 1795, 186, 1283, 188, 445, 70, 448, 191, + /* 1230 */ 578, 1920, 268, 467, 469, 1747, 1583, 577, 1269, 302, + /* 1240 */ 1264, 93, 195, 501, 161, 208, 1579, 1777, 1917, 197, + /* 1250 */ 134, 554, 135, 1581, 1577, 136, 137, 1727, 211, 502, + /* 1260 */ 508, 512, 1808, 534, 215, 1272, 284, 1778, 580, 1780, + /* 1270 */ 1781, 576, 505, 571, 226, 1795, 569, 1322, 1323, 1325, + /* 1280 */ 1326, 1327, 1328, 578, 126, 515, 1726, 1695, 1747, 520, + /* 1290 */ 577, 127, 1920, 521, 320, 224, 517, 322, 522, 1777, + /* 1300 */ 269, 78, 1594, 1281, 530, 159, 532, 1885, 537, 1917, + /* 1310 */ 233, 533, 237, 1895, 1894, 1808, 327, 6, 540, 91, + /* 1320 */ 1778, 580, 1780, 1781, 576, 546, 571, 1795, 531, 1854, + /* 1330 */ 1876, 529, 528, 1853, 1850, 578, 1385, 247, 148, 1280, + /* 1340 */ 1747, 563, 577, 246, 244, 121, 242, 48, 1870, 329, + /* 1350 */ 582, 272, 1777, 245, 560, 1637, 1566, 263, 655, 656, + /* 1360 */ 658, 51, 285, 147, 1741, 1835, 1777, 1808, 295, 276, + /* 1370 */ 252, 91, 1778, 580, 1780, 1781, 576, 63, 571, 274, + /* 1380 */ 1795, 1854, 1916, 557, 1740, 565, 1850, 564, 575, 294, + /* 1390 */ 1739, 1936, 255, 1747, 1795, 577, 257, 64, 1738, 352, + /* 1400 */ 1735, 354, 578, 355, 1246, 1247, 167, 1747, 359, 577, + /* 1410 */ 1733, 361, 362, 363, 1732, 365, 1731, 367, 1730, 1777, + /* 1420 */ 1808, 369, 1729, 371, 292, 1778, 580, 1780, 1781, 576, + /* 1430 */ 574, 571, 568, 1826, 1808, 1712, 168, 1777, 144, 1778, + /* 1440 */ 580, 1780, 1781, 576, 375, 571, 374, 1795, 1221, 1706, + /* 1450 */ 1220, 1705, 380, 381, 1704, 578, 1703, 1190, 1678, 1677, + /* 1460 */ 1747, 1676, 577, 1675, 67, 1795, 1674, 1673, 1672, 1671, + /* 1470 */ 321, 394, 395, 578, 1670, 397, 1669, 1668, 1747, 1667, + /* 1480 */ 577, 1666, 555, 1934, 1665, 1664, 1663, 1808, 1662, 1777, + /* 1490 */ 1661, 91, 1778, 580, 1780, 1781, 576, 1660, 571, 1659, + /* 1500 */ 1658, 1854, 1657, 1656, 124, 1808, 1851, 1655, 1654, 293, + /* 1510 */ 1778, 580, 1780, 1781, 576, 1653, 571, 1795, 1192, 1649, + /* 1520 */ 1648, 1647, 527, 1652, 1651, 578, 1650, 1646, 1522, 175, + /* 1530 */ 1747, 1777, 577, 1520, 1488, 177, 1006, 115, 152, 1005, + /* 1540 */ 1487, 1777, 1720, 1714, 1702, 178, 1701, 432, 116, 183, + /* 1550 */ 434, 185, 1687, 1572, 1519, 1517, 451, 1808, 450, 1795, + /* 1560 */ 1515, 293, 1778, 580, 1780, 1781, 576, 578, 571, 1795, + /* 1570 */ 449, 453, 1747, 1035, 577, 1513, 454, 578, 455, 458, + /* 1580 */ 457, 1511, 1747, 461, 577, 462, 459, 1500, 463, 1499, + /* 1590 */ 1484, 1777, 1574, 1145, 1144, 1573, 1070, 1069, 1068, 1808, + /* 1600 */ 1067, 1064, 626, 288, 1778, 580, 1780, 1781, 576, 1808, + /* 1610 */ 571, 628, 1063, 144, 1778, 580, 1780, 1781, 576, 1795, + /* 1620 */ 571, 1062, 194, 49, 1509, 316, 1061, 575, 1504, 317, + /* 1630 */ 1502, 487, 1747, 318, 577, 1483, 490, 492, 1482, 494, + /* 1640 */ 1481, 545, 496, 1777, 1719, 92, 1713, 1228, 503, 138, + /* 1650 */ 1700, 1698, 1699, 1697, 1696, 15, 1694, 223, 1935, 1808, + /* 1660 */ 1777, 217, 212, 292, 1778, 580, 1780, 1781, 576, 1238, + /* 1670 */ 571, 1795, 1827, 1686, 82, 225, 336, 76, 77, 578, + /* 1680 */ 230, 16, 41, 23, 1747, 47, 577, 241, 1795, 54, + /* 1690 */ 1425, 234, 232, 338, 1407, 509, 578, 236, 240, 227, + /* 1700 */ 1409, 1747, 504, 577, 1402, 145, 239, 518, 319, 1767, + /* 1710 */ 25, 1808, 1382, 662, 1381, 293, 1778, 580, 1780, 1781, + /* 1720 */ 576, 24, 571, 250, 46, 1766, 18, 266, 1808, 81, + /* 1730 */ 149, 1437, 293, 1778, 580, 1780, 1781, 576, 45, 571, + /* 1740 */ 1436, 151, 17, 1442, 1431, 193, 652, 648, 644, 640, + /* 1750 */ 264, 1777, 330, 1441, 1440, 331, 10, 1270, 19, 146, + /* 1760 */ 1811, 1300, 1344, 1777, 464, 460, 456, 452, 192, 150, + /* 1770 */ 1319, 570, 163, 1317, 31, 1777, 1316, 87, 579, 1795, + /* 1780 */ 229, 12, 20, 21, 581, 1131, 583, 578, 339, 1128, + /* 1790 */ 585, 1795, 1747, 587, 577, 72, 1125, 13, 190, 578, + /* 1800 */ 588, 590, 593, 1795, 1747, 591, 577, 1119, 594, 596, + /* 1810 */ 1117, 578, 597, 523, 1108, 1123, 1747, 1122, 577, 1808, + /* 1820 */ 1140, 1121, 1120, 278, 1778, 580, 1780, 1781, 576, 83, + /* 1830 */ 571, 1808, 603, 84, 60, 279, 1778, 580, 1780, 1781, + /* 1840 */ 576, 261, 571, 1808, 1136, 216, 612, 280, 1778, 580, + /* 1850 */ 1780, 1781, 576, 1058, 571, 1033, 1077, 1777, 615, 262, + /* 1860 */ 189, 182, 1056, 187, 1055, 1054, 1226, 443, 209, 1053, + /* 1870 */ 1052, 1777, 1051, 1050, 1049, 1074, 1516, 1072, 1046, 1045, + /* 1880 */ 1044, 1041, 1040, 1039, 1038, 1795, 180, 637, 1514, 1512, + /* 1890 */ 639, 641, 643, 578, 645, 1510, 649, 647, 1747, 1795, + /* 1900 */ 577, 638, 642, 651, 646, 1498, 653, 578, 996, 650, + /* 1910 */ 1480, 657, 1747, 265, 577, 1256, 273, 660, 661, 1455, + /* 1920 */ 1455, 1777, 1455, 1455, 1455, 1808, 1455, 1455, 1455, 287, + /* 1930 */ 1778, 580, 1780, 1781, 576, 1455, 571, 1777, 1455, 1808, + /* 1940 */ 1455, 1455, 1455, 289, 1778, 580, 1780, 1781, 576, 1795, + /* 1950 */ 571, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, + /* 1960 */ 1455, 1455, 1747, 1455, 577, 1795, 1455, 1455, 1455, 1455, + /* 1970 */ 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1455, + /* 1980 */ 577, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1808, + /* 1990 */ 1777, 1455, 1455, 281, 1778, 580, 1780, 1781, 576, 1455, + /* 2000 */ 571, 1455, 1455, 1455, 1777, 1808, 1455, 1455, 1455, 290, + /* 2010 */ 1778, 580, 1780, 1781, 576, 1455, 571, 1455, 1795, 1455, + /* 2020 */ 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, + /* 2030 */ 1455, 1747, 1795, 577, 1455, 1455, 1455, 1455, 1455, 1455, + /* 2040 */ 578, 1455, 1455, 1455, 1455, 1747, 1455, 577, 1455, 1455, + /* 2050 */ 1455, 1455, 1455, 1455, 1455, 1455, 1777, 1455, 1808, 1455, + /* 2060 */ 1455, 1455, 282, 1778, 580, 1780, 1781, 576, 1455, 571, + /* 2070 */ 1455, 1455, 1808, 1455, 1777, 1455, 291, 1778, 580, 1780, + /* 2080 */ 1781, 576, 1455, 571, 1795, 1455, 1455, 1455, 1455, 1455, + /* 2090 */ 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1777, 577, + /* 2100 */ 1455, 1455, 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, + /* 2110 */ 578, 1455, 1455, 1455, 1455, 1747, 1455, 577, 1455, 1455, + /* 2120 */ 1455, 1455, 1455, 1455, 1808, 1455, 1795, 1455, 283, 1778, + /* 2130 */ 580, 1780, 1781, 576, 578, 571, 1455, 1455, 1455, 1747, + /* 2140 */ 1455, 577, 1808, 1455, 1455, 1455, 296, 1778, 580, 1780, + /* 2150 */ 1781, 576, 1455, 571, 1455, 1455, 1777, 1455, 1455, 1455, + /* 2160 */ 1455, 1455, 1455, 1455, 1455, 1455, 1808, 1455, 1455, 1455, + /* 2170 */ 297, 1778, 580, 1780, 1781, 576, 1455, 571, 1455, 1777, + /* 2180 */ 1455, 1455, 1455, 1455, 1795, 1455, 1455, 1455, 1455, 1455, + /* 2190 */ 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1455, 577, + /* 2200 */ 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1795, 1455, 1455, + /* 2210 */ 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, + /* 2220 */ 1747, 1455, 577, 1455, 1808, 1455, 1455, 1455, 1789, 1778, + /* 2230 */ 580, 1780, 1781, 576, 1455, 571, 1777, 1455, 1455, 1455, + /* 2240 */ 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1808, 1777, 1455, + /* 2250 */ 1455, 1788, 1778, 580, 1780, 1781, 576, 1455, 571, 1455, + /* 2260 */ 1455, 1455, 1777, 1455, 1795, 1455, 1455, 1455, 1455, 1455, + /* 2270 */ 1455, 1455, 578, 1455, 1455, 1455, 1795, 1747, 1455, 577, + /* 2280 */ 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, + /* 2290 */ 1795, 577, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, + /* 2300 */ 1455, 1455, 1455, 1747, 1808, 577, 1455, 1455, 1787, 1778, + /* 2310 */ 580, 1780, 1781, 576, 1777, 571, 1808, 1455, 1455, 1455, + /* 2320 */ 308, 1778, 580, 1780, 1781, 576, 1455, 571, 1455, 1455, + /* 2330 */ 1808, 1455, 1777, 1455, 307, 1778, 580, 1780, 1781, 576, + /* 2340 */ 1455, 571, 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, + /* 2350 */ 578, 1455, 1455, 1455, 1455, 1747, 1777, 577, 1455, 1455, + /* 2360 */ 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, + /* 2370 */ 1455, 1455, 1455, 1747, 1455, 577, 1455, 1455, 1455, 1455, + /* 2380 */ 1455, 1455, 1808, 1455, 1795, 1455, 309, 1778, 580, 1780, + /* 2390 */ 1781, 576, 578, 571, 1455, 1455, 1455, 1747, 1455, 577, + /* 2400 */ 1808, 1455, 1455, 1455, 306, 1778, 580, 1780, 1781, 576, + /* 2410 */ 1455, 571, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, + /* 2420 */ 1455, 1455, 1455, 1455, 1808, 1455, 1455, 1455, 286, 1778, + /* 2430 */ 580, 1780, 1781, 576, 1455, 571, }; static const YYCODETYPE yy_lookahead[] = { /* 0 */ 261, 355, 263, 264, 261, 269, 263, 264, 300, 4, @@ -532,7 +540,7 @@ static const YYCODETYPE yy_lookahead[] = { /* 730 */ 205, 206, 207, 208, 209, 210, 211, 355, 241, 298, /* 740 */ 165, 310, 167, 312, 273, 2, 275, 165, 85, 167, /* 750 */ 368, 8, 9, 300, 372, 12, 13, 14, 15, 16, - /* 760 */ 314, 222, 223, 35, 311, 8, 9, 192, 193, 12, + /* 760 */ 314, 222, 223, 67, 311, 8, 9, 192, 193, 12, /* 770 */ 13, 14, 15, 16, 192, 193, 56, 195, 196, 197, /* 780 */ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, /* 790 */ 208, 209, 210, 211, 12, 13, 18, 286, 20, 257, @@ -543,165 +551,173 @@ static const YYCODETYPE yy_lookahead[] = { /* 840 */ 298, 293, 85, 0, 298, 265, 300, 8, 9, 67, /* 850 */ 298, 12, 13, 14, 15, 16, 276, 355, 265, 152, /* 860 */ 153, 83, 88, 283, 35, 91, 84, 298, 243, 298, - /* 870 */ 368, 325, 67, 293, 372, 329, 330, 331, 332, 333, + /* 870 */ 368, 325, 286, 293, 372, 329, 330, 331, 332, 333, /* 880 */ 334, 257, 336, 223, 257, 339, 293, 257, 106, 343, - /* 890 */ 344, 345, 257, 257, 88, 167, 0, 91, 60, 286, + /* 890 */ 344, 345, 257, 257, 88, 1, 2, 91, 35, 286, /* 900 */ 354, 123, 120, 121, 126, 127, 128, 129, 130, 131, /* 910 */ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, /* 920 */ 142, 143, 298, 145, 146, 298, 333, 265, 298, 265, - /* 930 */ 43, 18, 286, 298, 298, 265, 23, 265, 276, 96, - /* 940 */ 276, 348, 349, 350, 48, 352, 276, 165, 276, 167, - /* 950 */ 37, 38, 1, 2, 41, 293, 318, 293, 115, 116, - /* 960 */ 117, 118, 119, 293, 286, 293, 257, 120, 121, 286, + /* 930 */ 43, 18, 35, 298, 298, 265, 23, 265, 276, 96, + /* 940 */ 276, 348, 349, 350, 60, 352, 276, 165, 276, 167, + /* 950 */ 37, 38, 120, 121, 41, 293, 318, 293, 115, 116, + /* 960 */ 117, 118, 119, 293, 67, 293, 257, 286, 286, 286, /* 970 */ 57, 58, 85, 43, 192, 193, 265, 195, 196, 197, /* 980 */ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, /* 990 */ 208, 209, 210, 211, 285, 265, 167, 84, 88, 265, /* 1000 */ 265, 91, 293, 265, 293, 88, 276, 298, 91, 300, - /* 1010 */ 276, 276, 196, 287, 276, 85, 43, 258, 287, 286, - /* 1020 */ 274, 265, 375, 293, 298, 314, 266, 293, 293, 298, - /* 1030 */ 192, 293, 276, 225, 325, 122, 265, 257, 329, 330, + /* 1010 */ 276, 276, 196, 287, 276, 85, 43, 258, 287, 274, + /* 1020 */ 375, 265, 321, 293, 298, 314, 266, 293, 293, 298, + /* 1030 */ 167, 293, 276, 225, 325, 122, 265, 257, 329, 330, /* 1040 */ 331, 332, 333, 334, 333, 336, 0, 276, 339, 293, /* 1050 */ 324, 325, 343, 344, 345, 324, 325, 326, 85, 348, /* 1060 */ 349, 350, 336, 352, 293, 285, 355, 336, 22, 0, - /* 1070 */ 157, 158, 159, 293, 365, 162, 366, 362, 298, 368, - /* 1080 */ 300, 168, 46, 372, 43, 12, 13, 265, 43, 35, - /* 1090 */ 43, 22, 285, 43, 181, 22, 43, 184, 276, 186, + /* 1070 */ 157, 158, 159, 293, 365, 162, 192, 84, 298, 368, + /* 1080 */ 300, 168, 366, 372, 46, 12, 13, 94, 43, 362, + /* 1090 */ 43, 22, 285, 43, 181, 22, 43, 184, 264, 186, /* 1100 */ 187, 188, 189, 190, 191, 325, 33, 287, 35, 329, - /* 1110 */ 330, 331, 332, 333, 334, 293, 336, 43, 298, 339, - /* 1120 */ 84, 67, 43, 343, 344, 345, 85, 266, 43, 56, - /* 1130 */ 85, 43, 85, 257, 354, 85, 84, 224, 85, 43, - /* 1140 */ 67, 43, 43, 43, 324, 325, 94, 321, 264, 297, - /* 1150 */ 353, 328, 369, 369, 369, 346, 336, 356, 289, 85, - /* 1160 */ 84, 285, 226, 323, 85, 20, 265, 47, 322, 293, - /* 1170 */ 85, 35, 163, 85, 298, 271, 300, 265, 316, 106, - /* 1180 */ 265, 85, 42, 85, 85, 85, 305, 147, 303, 303, - /* 1190 */ 314, 265, 265, 20, 257, 20, 20, 259, 259, 320, - /* 1200 */ 269, 325, 300, 269, 313, 329, 330, 331, 332, 333, - /* 1210 */ 334, 20, 336, 315, 269, 269, 313, 20, 269, 269, - /* 1220 */ 306, 265, 285, 269, 259, 285, 285, 285, 285, 285, - /* 1230 */ 293, 355, 285, 285, 265, 298, 259, 300, 165, 320, - /* 1240 */ 167, 267, 285, 285, 368, 285, 285, 257, 372, 267, - /* 1250 */ 298, 314, 319, 173, 265, 300, 265, 231, 20, 267, - /* 1260 */ 298, 298, 325, 149, 298, 192, 329, 330, 331, 332, - /* 1270 */ 333, 334, 313, 336, 298, 285, 203, 204, 205, 206, - /* 1280 */ 207, 208, 209, 293, 309, 298, 307, 309, 298, 293, - /* 1290 */ 300, 306, 355, 281, 267, 267, 293, 298, 328, 257, - /* 1300 */ 232, 238, 309, 298, 298, 368, 309, 156, 298, 372, - /* 1310 */ 240, 298, 223, 227, 361, 325, 239, 323, 293, 329, - /* 1320 */ 330, 331, 332, 333, 334, 361, 336, 285, 360, 339, - /* 1330 */ 358, 364, 361, 343, 344, 293, 20, 244, 327, 242, - /* 1340 */ 298, 247, 300, 363, 84, 359, 342, 289, 265, 298, - /* 1350 */ 275, 370, 257, 36, 371, 317, 312, 267, 0, 371, - /* 1360 */ 376, 260, 259, 279, 175, 370, 257, 325, 255, 371, - /* 1370 */ 370, 329, 330, 331, 332, 333, 334, 0, 336, 268, - /* 1380 */ 285, 339, 0, 279, 279, 343, 344, 42, 293, 0, - /* 1390 */ 75, 0, 35, 298, 285, 300, 185, 35, 35, 35, - /* 1400 */ 185, 0, 293, 35, 35, 185, 0, 298, 185, 300, - /* 1410 */ 0, 0, 22, 35, 0, 35, 0, 84, 170, 257, - /* 1420 */ 325, 169, 167, 165, 329, 330, 331, 332, 333, 334, - /* 1430 */ 335, 336, 337, 338, 325, 0, 0, 257, 329, 330, - /* 1440 */ 331, 332, 333, 334, 161, 336, 160, 285, 0, 0, - /* 1450 */ 46, 0, 0, 0, 144, 293, 0, 0, 0, 0, - /* 1460 */ 298, 0, 300, 139, 35, 285, 0, 139, 0, 0, - /* 1470 */ 290, 0, 0, 293, 0, 0, 0, 0, 298, 0, + /* 1110 */ 330, 331, 332, 333, 334, 287, 336, 43, 298, 339, + /* 1120 */ 265, 297, 84, 343, 344, 345, 298, 0, 43, 56, + /* 1130 */ 85, 276, 85, 257, 354, 85, 266, 224, 85, 43, + /* 1140 */ 67, 43, 328, 43, 324, 325, 326, 43, 293, 43, + /* 1150 */ 43, 43, 324, 325, 353, 346, 336, 369, 369, 85, + /* 1160 */ 369, 285, 84, 289, 336, 226, 356, 323, 20, 293, + /* 1170 */ 85, 265, 47, 322, 298, 48, 300, 35, 271, 106, + /* 1180 */ 163, 85, 316, 85, 265, 85, 265, 42, 305, 85, + /* 1190 */ 314, 85, 85, 85, 257, 147, 303, 265, 303, 265, + /* 1200 */ 259, 325, 20, 259, 20, 329, 330, 331, 332, 333, + /* 1210 */ 334, 320, 336, 20, 269, 300, 269, 313, 20, 269, + /* 1220 */ 315, 313, 285, 269, 20, 269, 306, 269, 265, 269, + /* 1230 */ 293, 355, 320, 259, 285, 298, 285, 300, 165, 259, + /* 1240 */ 167, 265, 285, 173, 368, 267, 285, 257, 372, 285, + /* 1250 */ 285, 314, 285, 285, 285, 285, 285, 298, 267, 319, + /* 1260 */ 265, 265, 325, 231, 267, 192, 329, 330, 331, 332, + /* 1270 */ 333, 334, 300, 336, 267, 285, 203, 204, 205, 206, + /* 1280 */ 207, 208, 209, 293, 309, 298, 298, 298, 298, 149, + /* 1290 */ 300, 309, 355, 307, 313, 293, 298, 298, 306, 257, + /* 1300 */ 281, 267, 293, 20, 298, 368, 298, 328, 232, 372, + /* 1310 */ 309, 298, 309, 361, 361, 325, 298, 238, 298, 329, + /* 1320 */ 330, 331, 332, 333, 334, 156, 336, 285, 240, 339, + /* 1330 */ 364, 239, 227, 343, 344, 293, 223, 323, 361, 20, + /* 1340 */ 298, 244, 300, 358, 360, 293, 363, 84, 327, 247, + /* 1350 */ 289, 265, 257, 359, 242, 298, 275, 267, 36, 260, + /* 1360 */ 259, 317, 279, 312, 0, 342, 257, 325, 279, 255, + /* 1370 */ 370, 329, 330, 331, 332, 333, 334, 175, 336, 268, + /* 1380 */ 285, 339, 371, 371, 0, 343, 344, 371, 293, 279, + /* 1390 */ 0, 376, 370, 298, 285, 300, 370, 42, 0, 75, + /* 1400 */ 0, 35, 293, 185, 35, 35, 35, 298, 185, 300, + /* 1410 */ 0, 35, 35, 185, 0, 185, 0, 35, 0, 257, + /* 1420 */ 325, 22, 0, 35, 329, 330, 331, 332, 333, 334, + /* 1430 */ 335, 336, 337, 338, 325, 0, 84, 257, 329, 330, + /* 1440 */ 331, 332, 333, 334, 169, 336, 170, 285, 167, 0, + /* 1450 */ 165, 0, 161, 160, 0, 293, 0, 46, 0, 0, + /* 1460 */ 298, 0, 300, 0, 144, 285, 0, 0, 0, 0, + /* 1470 */ 290, 139, 35, 293, 0, 139, 0, 0, 298, 0, /* 1480 */ 300, 0, 373, 374, 0, 0, 0, 325, 0, 257, - /* 1490 */ 0, 329, 330, 331, 332, 333, 334, 42, 336, 0, - /* 1500 */ 0, 339, 0, 0, 0, 325, 344, 0, 0, 329, - /* 1510 */ 330, 331, 332, 333, 334, 22, 336, 285, 0, 0, - /* 1520 */ 0, 56, 290, 0, 0, 293, 43, 14, 39, 42, - /* 1530 */ 298, 257, 300, 0, 40, 14, 39, 46, 46, 0, - /* 1540 */ 0, 257, 0, 156, 39, 0, 0, 0, 0, 0, - /* 1550 */ 35, 39, 0, 39, 0, 39, 61, 325, 47, 285, - /* 1560 */ 35, 329, 330, 331, 332, 333, 334, 293, 336, 285, - /* 1570 */ 35, 0, 298, 47, 300, 47, 35, 293, 47, 0, - /* 1580 */ 0, 0, 298, 39, 300, 0, 35, 22, 0, 91, - /* 1590 */ 35, 257, 35, 35, 93, 35, 43, 0, 35, 325, - /* 1600 */ 22, 35, 43, 329, 330, 331, 332, 333, 334, 325, - /* 1610 */ 336, 19, 35, 329, 330, 331, 332, 333, 334, 285, - /* 1620 */ 336, 35, 0, 22, 290, 33, 35, 293, 0, 22, - /* 1630 */ 0, 49, 298, 257, 300, 35, 0, 35, 0, 47, - /* 1640 */ 22, 367, 0, 20, 52, 53, 54, 55, 56, 0, - /* 1650 */ 35, 257, 0, 171, 22, 0, 0, 0, 374, 325, - /* 1660 */ 0, 285, 152, 329, 330, 331, 332, 333, 334, 293, - /* 1670 */ 336, 149, 85, 84, 298, 83, 300, 0, 86, 285, - /* 1680 */ 84, 152, 152, 84, 290, 39, 154, 293, 150, 180, - /* 1690 */ 0, 148, 298, 84, 300, 228, 46, 94, 85, 35, - /* 1700 */ 84, 325, 43, 257, 84, 329, 330, 331, 332, 333, - /* 1710 */ 334, 119, 336, 84, 338, 22, 85, 43, 85, 325, - /* 1720 */ 85, 84, 43, 329, 330, 331, 332, 333, 334, 84, - /* 1730 */ 336, 285, 84, 46, 46, 33, 290, 43, 85, 293, - /* 1740 */ 43, 46, 84, 151, 298, 228, 300, 85, 85, 47, - /* 1750 */ 46, 46, 85, 257, 52, 53, 54, 55, 56, 222, - /* 1760 */ 43, 85, 228, 257, 172, 35, 174, 35, 35, 35, - /* 1770 */ 35, 325, 2, 84, 43, 329, 330, 331, 332, 333, - /* 1780 */ 334, 285, 336, 85, 84, 83, 192, 84, 86, 293, - /* 1790 */ 46, 285, 85, 85, 298, 84, 300, 84, 46, 293, - /* 1800 */ 22, 95, 194, 84, 298, 85, 300, 35, 35, 84, - /* 1810 */ 35, 85, 84, 22, 85, 35, 35, 35, 108, 257, - /* 1820 */ 84, 325, 108, 85, 84, 329, 330, 331, 332, 333, - /* 1830 */ 334, 325, 336, 85, 84, 329, 330, 331, 332, 333, - /* 1840 */ 334, 96, 336, 84, 84, 35, 84, 285, 43, 108, - /* 1850 */ 148, 149, 22, 151, 108, 293, 61, 155, 60, 35, - /* 1860 */ 298, 257, 300, 67, 43, 82, 22, 35, 35, 35, - /* 1870 */ 35, 257, 35, 35, 35, 67, 174, 35, 35, 0, - /* 1880 */ 35, 35, 35, 257, 35, 35, 35, 325, 35, 285, - /* 1890 */ 0, 329, 330, 331, 332, 333, 334, 293, 336, 285, - /* 1900 */ 39, 47, 298, 35, 300, 47, 39, 293, 0, 35, - /* 1910 */ 47, 285, 298, 0, 300, 39, 35, 47, 0, 293, - /* 1920 */ 35, 39, 35, 0, 298, 257, 300, 22, 21, 325, - /* 1930 */ 377, 22, 22, 329, 330, 331, 332, 333, 334, 325, - /* 1940 */ 336, 21, 257, 329, 330, 331, 332, 333, 334, 20, - /* 1950 */ 336, 325, 377, 285, 377, 329, 330, 331, 332, 333, - /* 1960 */ 334, 293, 336, 377, 377, 377, 298, 377, 300, 377, - /* 1970 */ 285, 377, 377, 377, 377, 377, 377, 377, 293, 377, - /* 1980 */ 377, 377, 377, 298, 257, 300, 377, 377, 377, 377, - /* 1990 */ 377, 377, 377, 325, 257, 377, 377, 329, 330, 331, - /* 2000 */ 332, 333, 334, 377, 336, 377, 377, 377, 377, 377, - /* 2010 */ 325, 377, 285, 377, 329, 330, 331, 332, 333, 334, - /* 2020 */ 293, 336, 285, 377, 377, 298, 377, 300, 377, 377, - /* 2030 */ 293, 377, 377, 377, 377, 298, 257, 300, 377, 377, - /* 2040 */ 377, 377, 377, 377, 377, 377, 257, 377, 377, 377, - /* 2050 */ 377, 377, 325, 377, 377, 377, 329, 330, 331, 332, - /* 2060 */ 333, 334, 325, 336, 285, 377, 329, 330, 331, 332, - /* 2070 */ 333, 334, 293, 336, 285, 377, 377, 298, 377, 300, - /* 2080 */ 377, 377, 293, 377, 377, 377, 377, 298, 257, 300, - /* 2090 */ 377, 377, 377, 377, 377, 377, 377, 377, 257, 377, - /* 2100 */ 377, 377, 377, 377, 325, 377, 377, 377, 329, 330, - /* 2110 */ 331, 332, 333, 334, 325, 336, 285, 377, 329, 330, - /* 2120 */ 331, 332, 333, 334, 293, 336, 285, 377, 377, 298, - /* 2130 */ 377, 300, 377, 377, 293, 377, 377, 377, 377, 298, - /* 2140 */ 377, 300, 377, 377, 377, 377, 377, 377, 377, 377, - /* 2150 */ 257, 377, 377, 377, 377, 377, 325, 377, 377, 377, - /* 2160 */ 329, 330, 331, 332, 333, 334, 325, 336, 377, 257, - /* 2170 */ 329, 330, 331, 332, 333, 334, 377, 336, 285, 377, - /* 2180 */ 377, 377, 377, 377, 377, 377, 293, 377, 377, 377, - /* 2190 */ 377, 298, 257, 300, 377, 377, 377, 285, 377, 377, - /* 2200 */ 377, 377, 377, 377, 377, 293, 377, 377, 377, 377, - /* 2210 */ 298, 257, 300, 377, 377, 377, 377, 377, 325, 377, - /* 2220 */ 285, 377, 329, 330, 331, 332, 333, 334, 293, 336, - /* 2230 */ 377, 377, 377, 298, 377, 300, 377, 325, 377, 285, - /* 2240 */ 377, 329, 330, 331, 332, 333, 334, 293, 336, 377, - /* 2250 */ 377, 377, 298, 377, 300, 377, 377, 377, 377, 377, - /* 2260 */ 325, 377, 377, 377, 329, 330, 331, 332, 333, 334, - /* 2270 */ 257, 336, 377, 377, 377, 377, 377, 377, 377, 325, - /* 2280 */ 257, 377, 377, 329, 330, 331, 332, 333, 334, 377, - /* 2290 */ 336, 377, 377, 377, 377, 377, 377, 377, 285, 377, - /* 2300 */ 377, 377, 377, 377, 377, 377, 293, 377, 285, 377, - /* 2310 */ 377, 298, 377, 300, 377, 377, 293, 377, 377, 377, - /* 2320 */ 377, 298, 377, 300, 377, 377, 377, 377, 377, 377, - /* 2330 */ 377, 377, 377, 377, 377, 377, 377, 377, 325, 377, - /* 2340 */ 377, 377, 329, 330, 331, 332, 333, 334, 325, 336, - /* 2350 */ 377, 377, 329, 330, 331, 332, 333, 334, 377, 336, + /* 1490 */ 0, 329, 330, 331, 332, 333, 334, 0, 336, 0, + /* 1500 */ 0, 339, 0, 0, 42, 325, 344, 0, 0, 329, + /* 1510 */ 330, 331, 332, 333, 334, 0, 336, 285, 22, 0, + /* 1520 */ 0, 0, 290, 0, 0, 293, 0, 0, 0, 56, + /* 1530 */ 298, 257, 300, 0, 0, 42, 14, 39, 43, 14, + /* 1540 */ 0, 257, 0, 0, 0, 40, 0, 46, 39, 39, + /* 1550 */ 46, 156, 0, 0, 0, 0, 39, 325, 47, 285, + /* 1560 */ 0, 329, 330, 331, 332, 333, 334, 293, 336, 285, + /* 1570 */ 35, 35, 298, 61, 300, 0, 47, 293, 39, 47, + /* 1580 */ 35, 0, 298, 35, 300, 47, 39, 0, 39, 0, + /* 1590 */ 0, 257, 0, 35, 22, 0, 35, 35, 35, 325, + /* 1600 */ 35, 35, 43, 329, 330, 331, 332, 333, 334, 325, + /* 1610 */ 336, 43, 35, 329, 330, 331, 332, 333, 334, 285, + /* 1620 */ 336, 35, 91, 93, 0, 22, 35, 293, 0, 22, + /* 1630 */ 0, 49, 298, 22, 300, 0, 35, 35, 0, 35, + /* 1640 */ 0, 367, 22, 257, 0, 20, 0, 35, 22, 171, + /* 1650 */ 0, 0, 0, 0, 0, 84, 0, 84, 374, 325, + /* 1660 */ 257, 85, 149, 329, 330, 331, 332, 333, 334, 180, + /* 1670 */ 336, 285, 338, 0, 94, 39, 290, 84, 84, 293, + /* 1680 */ 46, 228, 43, 84, 298, 43, 300, 46, 285, 152, + /* 1690 */ 85, 85, 84, 290, 85, 154, 293, 84, 43, 148, + /* 1700 */ 85, 298, 152, 300, 85, 84, 84, 150, 152, 46, + /* 1710 */ 43, 325, 85, 19, 85, 329, 330, 331, 332, 333, + /* 1720 */ 334, 84, 336, 46, 43, 46, 43, 33, 325, 84, + /* 1730 */ 46, 35, 329, 330, 331, 332, 333, 334, 222, 336, + /* 1740 */ 35, 47, 228, 85, 85, 33, 52, 53, 54, 55, + /* 1750 */ 56, 257, 35, 35, 35, 35, 2, 22, 43, 47, + /* 1760 */ 84, 22, 192, 257, 52, 53, 54, 55, 56, 46, + /* 1770 */ 85, 84, 46, 85, 84, 257, 85, 83, 194, 285, + /* 1780 */ 86, 84, 84, 84, 95, 85, 35, 293, 35, 85, + /* 1790 */ 84, 285, 298, 35, 300, 83, 85, 228, 86, 293, + /* 1800 */ 84, 35, 35, 285, 298, 84, 300, 85, 84, 35, + /* 1810 */ 85, 293, 84, 119, 22, 108, 298, 108, 300, 325, + /* 1820 */ 35, 108, 108, 329, 330, 331, 332, 333, 334, 84, + /* 1830 */ 336, 325, 96, 84, 84, 329, 330, 331, 332, 333, + /* 1840 */ 334, 43, 336, 325, 22, 151, 60, 329, 330, 331, + /* 1850 */ 332, 333, 334, 35, 336, 61, 67, 257, 82, 43, + /* 1860 */ 148, 149, 35, 151, 35, 35, 172, 155, 174, 35, + /* 1870 */ 35, 257, 22, 35, 35, 67, 0, 35, 35, 35, + /* 1880 */ 35, 35, 35, 35, 35, 285, 174, 35, 0, 0, + /* 1890 */ 39, 35, 39, 293, 35, 0, 35, 39, 298, 285, + /* 1900 */ 300, 47, 47, 39, 47, 0, 35, 293, 35, 47, + /* 1910 */ 0, 21, 298, 22, 300, 22, 22, 21, 20, 377, + /* 1920 */ 377, 257, 377, 377, 377, 325, 377, 377, 377, 329, + /* 1930 */ 330, 331, 332, 333, 334, 377, 336, 257, 377, 325, + /* 1940 */ 377, 377, 377, 329, 330, 331, 332, 333, 334, 285, + /* 1950 */ 336, 377, 377, 377, 377, 377, 377, 293, 377, 377, + /* 1960 */ 377, 377, 298, 377, 300, 285, 377, 377, 377, 377, + /* 1970 */ 377, 377, 377, 293, 377, 377, 377, 377, 298, 377, + /* 1980 */ 300, 377, 377, 377, 377, 377, 377, 377, 377, 325, + /* 1990 */ 257, 377, 377, 329, 330, 331, 332, 333, 334, 377, + /* 2000 */ 336, 377, 377, 377, 257, 325, 377, 377, 377, 329, + /* 2010 */ 330, 331, 332, 333, 334, 377, 336, 377, 285, 377, + /* 2020 */ 377, 377, 377, 377, 377, 377, 293, 377, 377, 377, + /* 2030 */ 377, 298, 285, 300, 377, 377, 377, 377, 377, 377, + /* 2040 */ 293, 377, 377, 377, 377, 298, 377, 300, 377, 377, + /* 2050 */ 377, 377, 377, 377, 377, 377, 257, 377, 325, 377, + /* 2060 */ 377, 377, 329, 330, 331, 332, 333, 334, 377, 336, + /* 2070 */ 377, 377, 325, 377, 257, 377, 329, 330, 331, 332, + /* 2080 */ 333, 334, 377, 336, 285, 377, 377, 377, 377, 377, + /* 2090 */ 377, 377, 293, 377, 377, 377, 377, 298, 257, 300, + /* 2100 */ 377, 377, 285, 377, 377, 377, 377, 377, 377, 377, + /* 2110 */ 293, 377, 377, 377, 377, 298, 377, 300, 377, 377, + /* 2120 */ 377, 377, 377, 377, 325, 377, 285, 377, 329, 330, + /* 2130 */ 331, 332, 333, 334, 293, 336, 377, 377, 377, 298, + /* 2140 */ 377, 300, 325, 377, 377, 377, 329, 330, 331, 332, + /* 2150 */ 333, 334, 377, 336, 377, 377, 257, 377, 377, 377, + /* 2160 */ 377, 377, 377, 377, 377, 377, 325, 377, 377, 377, + /* 2170 */ 329, 330, 331, 332, 333, 334, 377, 336, 377, 257, + /* 2180 */ 377, 377, 377, 377, 285, 377, 377, 377, 377, 377, + /* 2190 */ 377, 377, 293, 377, 377, 377, 377, 298, 377, 300, + /* 2200 */ 377, 377, 377, 377, 377, 377, 377, 285, 377, 377, + /* 2210 */ 377, 377, 377, 377, 377, 293, 377, 377, 377, 377, + /* 2220 */ 298, 377, 300, 377, 325, 377, 377, 377, 329, 330, + /* 2230 */ 331, 332, 333, 334, 377, 336, 257, 377, 377, 377, + /* 2240 */ 377, 377, 377, 377, 377, 377, 377, 325, 257, 377, + /* 2250 */ 377, 329, 330, 331, 332, 333, 334, 377, 336, 377, + /* 2260 */ 377, 377, 257, 377, 285, 377, 377, 377, 377, 377, + /* 2270 */ 377, 377, 293, 377, 377, 377, 285, 298, 377, 300, + /* 2280 */ 377, 377, 377, 377, 293, 377, 377, 377, 377, 298, + /* 2290 */ 285, 300, 377, 377, 377, 377, 377, 377, 293, 377, + /* 2300 */ 377, 377, 377, 298, 325, 300, 377, 377, 329, 330, + /* 2310 */ 331, 332, 333, 334, 257, 336, 325, 377, 377, 377, + /* 2320 */ 329, 330, 331, 332, 333, 334, 377, 336, 377, 377, + /* 2330 */ 325, 377, 257, 377, 329, 330, 331, 332, 333, 334, + /* 2340 */ 377, 336, 285, 377, 377, 377, 377, 377, 377, 377, + /* 2350 */ 293, 377, 377, 377, 377, 298, 257, 300, 377, 377, + /* 2360 */ 285, 377, 377, 377, 377, 377, 377, 377, 293, 377, + /* 2370 */ 377, 377, 377, 298, 377, 300, 377, 377, 377, 377, + /* 2380 */ 377, 377, 325, 377, 285, 377, 329, 330, 331, 332, + /* 2390 */ 333, 334, 293, 336, 377, 377, 377, 298, 377, 300, + /* 2400 */ 325, 377, 377, 377, 329, 330, 331, 332, 333, 334, + /* 2410 */ 377, 336, 377, 377, 377, 377, 377, 377, 377, 377, + /* 2420 */ 377, 377, 377, 377, 325, 377, 377, 377, 329, 330, + /* 2430 */ 331, 332, 333, 334, 377, 336, }; #define YY_SHIFT_COUNT (662) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (1929) +#define YY_SHIFT_MAX (1910) static const unsigned short int yy_shift_ofst[] = { /* 0 */ 913, 0, 0, 68, 68, 268, 268, 268, 325, 325, /* 10 */ 268, 268, 525, 582, 782, 582, 582, 582, 582, 582, /* 20 */ 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, /* 30 */ 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, - /* 40 */ 582, 582, 582, 208, 208, 97, 97, 97, 1073, 1073, + /* 40 */ 582, 582, 208, 208, 97, 97, 97, 1073, 1073, 1073, /* 50 */ 1073, 152, 426, 3, 3, 99, 99, 238, 238, 5, /* 60 */ 202, 3, 3, 99, 99, 99, 99, 99, 99, 99, /* 70 */ 99, 99, 89, 99, 99, 99, 148, 305, 99, 99, @@ -710,93 +726,93 @@ static const unsigned short int yy_shift_ofst[] = { /* 100 */ 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, /* 110 */ 575, 575, 575, 197, 202, 355, 355, 400, 576, 656, /* 120 */ 438, 438, 438, 576, 528, 148, 11, 11, 305, 305, - /* 130 */ 541, 541, 261, 805, 466, 466, 466, 466, 466, 466, - /* 140 */ 466, 1592, 23, 107, 428, 21, 41, 375, 65, 366, + /* 130 */ 541, 541, 261, 696, 466, 466, 466, 466, 466, 466, + /* 140 */ 466, 1694, 23, 107, 428, 21, 41, 375, 65, 366, /* 150 */ 816, 365, 649, 495, 475, 539, 660, 539, 558, 497, - /* 160 */ 497, 497, 808, 194, 1076, 936, 1145, 1120, 1136, 1009, - /* 170 */ 1145, 1145, 1140, 1040, 1040, 1145, 1145, 1173, 1173, 1175, - /* 180 */ 89, 148, 89, 1176, 1191, 89, 1176, 89, 1197, 89, - /* 190 */ 89, 1145, 89, 1173, 305, 305, 305, 305, 305, 305, - /* 200 */ 305, 305, 305, 305, 305, 1145, 1173, 541, 1175, 380, - /* 210 */ 1080, 148, 380, 1145, 1145, 1176, 380, 1026, 541, 541, - /* 220 */ 541, 541, 1026, 541, 1114, 528, 1197, 380, 261, 380, - /* 230 */ 528, 1238, 541, 1068, 1026, 541, 541, 1068, 1026, 541, - /* 240 */ 541, 305, 1063, 1151, 1068, 1070, 1077, 1086, 936, 1089, - /* 250 */ 528, 1316, 1093, 1097, 1094, 1093, 1097, 1093, 1097, 1260, - /* 260 */ 1076, 541, 805, 1145, 380, 1317, 1173, 2360, 2360, 2360, - /* 270 */ 2360, 2360, 2360, 2360, 348, 1702, 132, 579, 472, 16, + /* 160 */ 497, 497, 808, 194, 1078, 939, 1148, 1125, 1142, 1017, + /* 170 */ 1148, 1148, 1145, 1048, 1048, 1148, 1148, 1182, 1182, 1184, + /* 180 */ 89, 148, 89, 1193, 1198, 89, 1193, 89, 1204, 89, + /* 190 */ 89, 1148, 89, 1182, 305, 305, 305, 305, 305, 305, + /* 200 */ 305, 305, 305, 305, 305, 1148, 1182, 541, 1184, 380, + /* 210 */ 1070, 148, 380, 1148, 1148, 1193, 380, 1032, 541, 541, + /* 220 */ 541, 541, 1032, 541, 1140, 528, 1204, 380, 261, 380, + /* 230 */ 528, 1283, 541, 1076, 1032, 541, 541, 1076, 1032, 541, + /* 240 */ 541, 305, 1079, 1169, 1076, 1088, 1092, 1105, 939, 1113, + /* 250 */ 528, 1319, 1097, 1112, 1102, 1097, 1112, 1097, 1112, 1263, + /* 260 */ 1078, 541, 696, 1148, 380, 1322, 1182, 2436, 2436, 2436, + /* 270 */ 2436, 2436, 2436, 2436, 348, 1712, 132, 579, 472, 16, /* 280 */ 663, 639, 743, 389, 757, 704, 839, 839, 839, 839, /* 290 */ 839, 839, 839, 839, 843, 568, 25, 25, 61, 212, /* 300 */ 433, 481, 603, 378, 297, 150, 483, 483, 483, 483, /* 310 */ 45, 887, 774, 806, 910, 917, 811, 1046, 1069, 720, - /* 320 */ 707, 930, 973, 1041, 1045, 1047, 1050, 728, 829, 1053, - /* 330 */ 951, 847, 625, 391, 1074, 838, 1079, 1036, 1085, 1088, - /* 340 */ 1096, 1098, 1099, 1100, 1052, 1054, 896, 1358, 1189, 1377, - /* 350 */ 1382, 1345, 1389, 1315, 1391, 1357, 1211, 1362, 1363, 1364, - /* 360 */ 1215, 1401, 1368, 1369, 1220, 1406, 1223, 1410, 1378, 1411, - /* 370 */ 1390, 1414, 1380, 1416, 1333, 1248, 1252, 1255, 1258, 1435, - /* 380 */ 1436, 1283, 1286, 1448, 1449, 1404, 1451, 1452, 1453, 1310, - /* 390 */ 1456, 1457, 1458, 1459, 1461, 1324, 1429, 1466, 1328, 1468, - /* 400 */ 1469, 1471, 1472, 1474, 1475, 1476, 1477, 1479, 1481, 1484, - /* 410 */ 1485, 1486, 1488, 1455, 1490, 1499, 1500, 1502, 1503, 1504, - /* 420 */ 1493, 1507, 1508, 1518, 1519, 1520, 1465, 1523, 1524, 1487, - /* 430 */ 1489, 1483, 1513, 1491, 1521, 1492, 1533, 1494, 1497, 1539, - /* 440 */ 1540, 1542, 1505, 1387, 1545, 1546, 1547, 1495, 1548, 1549, - /* 450 */ 1515, 1511, 1512, 1552, 1525, 1526, 1514, 1554, 1535, 1528, - /* 460 */ 1516, 1571, 1541, 1531, 1544, 1579, 1580, 1581, 1585, 1501, - /* 470 */ 1498, 1551, 1565, 1588, 1555, 1557, 1558, 1560, 1553, 1559, - /* 480 */ 1563, 1566, 1577, 1586, 1597, 1578, 1622, 1601, 1582, 1628, - /* 490 */ 1607, 1591, 1630, 1600, 1636, 1602, 1638, 1618, 1623, 1642, - /* 500 */ 1510, 1615, 1649, 1482, 1632, 1529, 1522, 1652, 1655, 1530, - /* 510 */ 1532, 1656, 1657, 1660, 1589, 1587, 1509, 1677, 1596, 1538, - /* 520 */ 1599, 1690, 1646, 1543, 1609, 1603, 1650, 1659, 1467, 1616, - /* 530 */ 1613, 1620, 1631, 1633, 1629, 1693, 1674, 1635, 1637, 1645, - /* 540 */ 1648, 1653, 1679, 1687, 1688, 1658, 1694, 1517, 1662, 1663, - /* 550 */ 1695, 1537, 1697, 1704, 1705, 1667, 1717, 1534, 1676, 1664, - /* 560 */ 1730, 1732, 1733, 1734, 1735, 1676, 1770, 1594, 1731, 1689, - /* 570 */ 1698, 1700, 1707, 1703, 1708, 1744, 1711, 1713, 1752, 1778, - /* 580 */ 1608, 1719, 1706, 1720, 1772, 1773, 1725, 1726, 1775, 1728, - /* 590 */ 1729, 1780, 1736, 1738, 1781, 1740, 1748, 1782, 1750, 1710, - /* 600 */ 1714, 1741, 1746, 1791, 1745, 1759, 1760, 1810, 1762, 1805, - /* 610 */ 1805, 1830, 1795, 1798, 1824, 1796, 1783, 1821, 1832, 1833, - /* 620 */ 1834, 1835, 1837, 1844, 1838, 1839, 1808, 1553, 1842, 1559, - /* 630 */ 1843, 1845, 1846, 1847, 1849, 1850, 1851, 1879, 1853, 1854, - /* 640 */ 1861, 1890, 1868, 1858, 1867, 1908, 1874, 1863, 1876, 1913, - /* 650 */ 1881, 1870, 1882, 1918, 1885, 1887, 1923, 1905, 1907, 1909, - /* 660 */ 1910, 1920, 1929, + /* 320 */ 707, 930, 973, 1045, 1047, 1050, 1053, 1074, 894, 832, + /* 330 */ 625, 391, 1096, 829, 863, 884, 1098, 1038, 1085, 1100, + /* 340 */ 1104, 1106, 1107, 1108, 993, 897, 1127, 1364, 1202, 1384, + /* 350 */ 1390, 1355, 1398, 1324, 1400, 1366, 1218, 1369, 1370, 1371, + /* 360 */ 1223, 1410, 1376, 1377, 1228, 1414, 1230, 1416, 1382, 1418, + /* 370 */ 1399, 1422, 1388, 1435, 1352, 1276, 1275, 1281, 1285, 1449, + /* 380 */ 1451, 1291, 1293, 1454, 1456, 1411, 1458, 1459, 1461, 1320, + /* 390 */ 1463, 1466, 1467, 1468, 1469, 1332, 1437, 1474, 1336, 1476, + /* 400 */ 1477, 1479, 1481, 1484, 1485, 1486, 1488, 1490, 1497, 1499, + /* 410 */ 1500, 1502, 1503, 1462, 1507, 1508, 1515, 1523, 1524, 1526, + /* 420 */ 1496, 1519, 1520, 1521, 1527, 1528, 1473, 1533, 1534, 1493, + /* 430 */ 1498, 1495, 1522, 1501, 1525, 1504, 1540, 1505, 1509, 1542, + /* 440 */ 1543, 1544, 1510, 1395, 1546, 1552, 1553, 1512, 1554, 1555, + /* 450 */ 1535, 1511, 1517, 1560, 1536, 1529, 1539, 1575, 1545, 1532, + /* 460 */ 1547, 1581, 1548, 1538, 1549, 1587, 1589, 1590, 1592, 1530, + /* 470 */ 1531, 1558, 1572, 1595, 1561, 1562, 1563, 1565, 1559, 1568, + /* 480 */ 1566, 1577, 1586, 1591, 1624, 1603, 1628, 1607, 1582, 1630, + /* 490 */ 1611, 1601, 1635, 1602, 1638, 1604, 1640, 1620, 1625, 1644, + /* 500 */ 1537, 1612, 1646, 1478, 1626, 1550, 1513, 1650, 1651, 1556, + /* 510 */ 1541, 1652, 1653, 1654, 1571, 1576, 1489, 1656, 1573, 1557, + /* 520 */ 1593, 1673, 1636, 1551, 1594, 1580, 1634, 1639, 1453, 1599, + /* 530 */ 1605, 1608, 1606, 1609, 1613, 1642, 1615, 1621, 1622, 1637, + /* 540 */ 1619, 1655, 1641, 1663, 1645, 1667, 1514, 1627, 1629, 1677, + /* 550 */ 1516, 1681, 1679, 1684, 1658, 1683, 1569, 1659, 1696, 1705, + /* 560 */ 1717, 1718, 1719, 1720, 1659, 1754, 1735, 1570, 1715, 1676, + /* 570 */ 1685, 1687, 1688, 1690, 1691, 1723, 1697, 1698, 1726, 1739, + /* 580 */ 1584, 1699, 1689, 1700, 1751, 1753, 1706, 1704, 1758, 1716, + /* 590 */ 1711, 1766, 1721, 1722, 1767, 1724, 1725, 1774, 1728, 1707, + /* 600 */ 1709, 1713, 1714, 1792, 1736, 1745, 1749, 1785, 1750, 1798, + /* 610 */ 1798, 1822, 1794, 1786, 1818, 1789, 1776, 1816, 1827, 1829, + /* 620 */ 1830, 1834, 1835, 1850, 1838, 1839, 1808, 1559, 1842, 1568, + /* 630 */ 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1876, 1852, 1854, + /* 640 */ 1851, 1888, 1856, 1855, 1853, 1889, 1859, 1857, 1858, 1895, + /* 650 */ 1861, 1862, 1864, 1905, 1871, 1873, 1910, 1891, 1890, 1893, + /* 660 */ 1894, 1896, 1898, }; #define YY_REDUCE_COUNT (273) #define YY_REDUCE_MIN (-354) -#define YY_REDUCE_MAX (2023) +#define YY_REDUCE_MAX (2099) static const short yy_reduce_ofst[] = { /* 0 */ -29, -221, 289, 34, 709, -113, 546, 780, 876, 937, /* 10 */ 990, 1042, 1095, 1109, 1162, 1180, 1232, 1274, 1284, 1334, - /* 20 */ 1376, 1394, 1446, 1496, 1506, 1562, 1604, 1614, 1626, 1668, - /* 30 */ 1685, 1727, 1737, 1779, 1789, 1831, 1841, 1893, 1912, 1935, - /* 40 */ 1954, 2013, 2023, -219, 711, -250, -207, 593, 731, 726, - /* 50 */ 820, -218, 382, 446, 502, -208, 580, -261, -257, -354, + /* 20 */ 1386, 1403, 1494, 1506, 1518, 1600, 1614, 1664, 1680, 1733, + /* 30 */ 1747, 1799, 1817, 1841, 1899, 1922, 1979, 1991, 2005, 2057, + /* 40 */ 2075, 2099, -219, 711, -250, -207, 593, 731, 820, 726, + /* 50 */ 828, -218, 382, 446, 502, -208, 580, -261, -257, -354, /* 60 */ -234, -182, -11, -138, 218, 323, 404, 548, 662, 664, /* 70 */ 670, 672, 102, 730, 734, 735, -292, 153, 738, 756, - /* 80 */ -275, -215, 771, 219, -39, 267, 822, -246, 49, -201, + /* 80 */ -275, -215, 771, 219, -39, 267, 855, -246, 49, -201, /* 90 */ -201, -201, -187, -31, -152, -132, 2, 205, 286, 336, /* 100 */ 372, 402, 403, 441, 542, 552, 569, 571, 624, 627, /* 110 */ 630, 635, 636, 20, 31, -71, 71, -264, 136, -194, /* 120 */ 331, 340, 368, 243, 303, 453, 230, 431, -47, 388, - /* 130 */ 512, 537, 556, 471, 430, 511, 613, 646, 678, 683, - /* 140 */ 733, 638, 759, 746, 647, 710, 760, 826, 715, 807, - /* 150 */ 807, 861, 884, 852, 823, 797, 797, 797, 809, 783, - /* 160 */ 784, 785, 801, 807, 869, 840, 901, 846, 904, 862, - /* 170 */ 912, 915, 881, 885, 886, 926, 927, 938, 939, 879, - /* 180 */ 931, 902, 934, 891, 898, 945, 903, 946, 914, 949, - /* 190 */ 950, 956, 954, 965, 940, 941, 942, 943, 944, 947, - /* 200 */ 948, 957, 958, 960, 961, 969, 977, 952, 919, 974, - /* 210 */ 933, 955, 982, 989, 991, 959, 992, 975, 962, 963, - /* 220 */ 966, 976, 978, 987, 979, 996, 985, 1027, 1012, 1028, - /* 230 */ 1003, 970, 999, 953, 993, 1005, 1006, 964, 997, 1010, - /* 240 */ 1013, 807, 967, 980, 971, 968, 986, 972, 994, 797, - /* 250 */ 1025, 1011, 983, 981, 984, 988, 995, 998, 1000, 1004, - /* 260 */ 1058, 1051, 1075, 1083, 1090, 1101, 1103, 1038, 1044, 1084, - /* 270 */ 1104, 1105, 1111, 1113, + /* 130 */ 512, 537, 556, 471, 430, 511, 586, 613, 681, 682, + /* 140 */ 683, 638, 759, 745, 645, 716, 760, 701, 727, 807, + /* 150 */ 807, 870, 834, 824, 814, 801, 801, 801, 809, 788, + /* 160 */ 789, 791, 810, 807, 874, 844, 906, 851, 907, 866, + /* 170 */ 919, 921, 883, 893, 895, 932, 934, 941, 944, 891, + /* 180 */ 945, 915, 947, 904, 905, 950, 908, 954, 920, 956, + /* 190 */ 958, 963, 960, 974, 949, 951, 957, 961, 964, 965, + /* 200 */ 967, 968, 969, 970, 971, 976, 980, 959, 912, 978, + /* 210 */ 940, 972, 991, 995, 996, 981, 997, 975, 987, 988, + /* 220 */ 989, 998, 982, 999, 986, 1002, 992, 1007, 1019, 1034, + /* 230 */ 1009, 979, 1006, 952, 1001, 1008, 1013, 953, 1003, 1018, + /* 240 */ 1020, 807, 966, 983, 977, 984, 994, 985, 1014, 801, + /* 250 */ 1052, 1021, 1011, 1000, 1015, 1012, 1022, 1016, 1026, 1023, + /* 260 */ 1061, 1057, 1081, 1086, 1090, 1099, 1101, 1044, 1051, 1083, + /* 270 */ 1089, 1110, 1111, 1114, }; static const YYACTIONTYPE yy_default[] = { /* 0 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, @@ -831,8 +847,8 @@ static const YYACTIONTYPE yy_default[] = { /* 290 */ 1831, 1830, 1828, 1793, 1453, 1587, 1792, 1791, 1453, 1453, /* 300 */ 1453, 1453, 1453, 1453, 1453, 1453, 1785, 1786, 1784, 1783, /* 310 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 320 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 330 */ 1857, 1453, 1925, 1929, 1453, 1453, 1453, 1768, 1453, 1453, + /* 320 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1857, 1453, + /* 330 */ 1925, 1929, 1453, 1453, 1453, 1453, 1453, 1768, 1453, 1453, /* 340 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, /* 350 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, /* 360 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, @@ -853,9 +869,9 @@ static const YYACTIONTYPE yy_default[] = { /* 510 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1727, 1453, 1453, /* 520 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1890, 1453, 1453, /* 530 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 540 */ 1453, 1453, 1453, 1453, 1768, 1453, 1907, 1453, 1867, 1863, - /* 550 */ 1453, 1453, 1859, 1767, 1453, 1453, 1923, 1453, 1453, 1453, - /* 560 */ 1453, 1453, 1453, 1453, 1453, 1453, 1852, 1453, 1825, 1810, + /* 540 */ 1453, 1453, 1453, 1768, 1453, 1907, 1453, 1867, 1863, 1453, + /* 550 */ 1453, 1859, 1767, 1453, 1453, 1923, 1453, 1453, 1453, 1453, + /* 560 */ 1453, 1453, 1453, 1453, 1453, 1852, 1453, 1453, 1825, 1810, /* 570 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, /* 580 */ 1779, 1453, 1453, 1453, 1453, 1453, 1619, 1453, 1453, 1453, /* 590 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1604, @@ -2003,7 +2019,7 @@ static const char *const yyRuleName[] = { /* 390 */ "compare_op ::= CONTAINS", /* 391 */ "in_op ::= IN", /* 392 */ "in_op ::= NOT IN", - /* 393 */ "in_predicate_value ::= NK_LP expression_list NK_RP", + /* 393 */ "in_predicate_value ::= NK_LP literal_list NK_RP", /* 394 */ "boolean_value_expression ::= boolean_primary", /* 395 */ "boolean_value_expression ::= NOT boolean_primary", /* 396 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", @@ -3089,7 +3105,7 @@ static const struct { { 340, -1 }, /* (390) compare_op ::= CONTAINS */ { 341, -1 }, /* (391) in_op ::= IN */ { 341, -2 }, /* (392) in_op ::= NOT IN */ - { 342, -3 }, /* (393) in_predicate_value ::= NK_LP expression_list NK_RP */ + { 342, -3 }, /* (393) in_predicate_value ::= NK_LP literal_list NK_RP */ { 343, -1 }, /* (394) boolean_value_expression ::= boolean_primary */ { 343, -2 }, /* (395) boolean_value_expression ::= NOT boolean_primary */ { 343, -3 }, /* (396) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ @@ -4477,7 +4493,7 @@ static YYACTIONTYPE yy_reduce( case 392: /* in_op ::= NOT IN */ { yymsp[-1].minor.yy428 = OP_TYPE_NOT_IN; } break; - case 393: /* in_predicate_value ::= NK_LP expression_list NK_RP */ + case 393: /* in_predicate_value ::= NK_LP literal_list NK_RP */ { yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy210)); } yymsp[-2].minor.yy652 = yylhsminor.yy652; break; diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index 67b79d5b1c..fb3c420a19 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -896,7 +896,7 @@ static int32_t pushDownCondOptTrivialPushDown(SOptimizeContext* pCxt, SLogicNode return TSDB_CODE_SUCCESS; } SLogicNode* pChild = (SLogicNode*)nodesListGetNode(pLogicNode->pChildren, 0); - int32_t code = pushDownCondOptPushCondToChild(pCxt, pChild, &pLogicNode->pConditions); + int32_t code = pushDownCondOptPushCondToChild(pCxt, pChild, &pLogicNode->pConditions); if (TSDB_CODE_SUCCESS == code) { OPTIMIZE_FLAG_SET_MASK(pLogicNode->optimizedFlag, OPTIMIZE_FLAG_PUSH_DOWN_CONDE); pCxt->optimized = true; @@ -1183,7 +1183,7 @@ static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNo if (smaFuncIndex < 0) { break; } else { - code = nodesListMakeStrictAppend(&pCols, smaIndexOptCreateSmaCol(pFunc, tableId, smaFuncIndex + 2)); + code = nodesListMakeStrictAppend(&pCols, smaIndexOptCreateSmaCol(pFunc, tableId, smaFuncIndex + 1)); if (TSDB_CODE_SUCCESS != code) { break; } diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index cbb1089d61..e1aeaf219b 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -1036,71 +1036,124 @@ _return: return code; } -int32_t scalarGetOperatorResultType(SDataType left, SDataType right, EOperatorType op, SDataType* pRes) { - switch (op) { +static int32_t getMinusOperatorResultType(SOperatorNode* pOp) { + if (!IS_MATHABLE_TYPE(((SExprNode*)(pOp->pLeft))->resType.type)) { + return TSDB_CODE_TSC_INVALID_OPERATION; + } + pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE; + pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes; + return TSDB_CODE_SUCCESS; +} + +static int32_t getArithmeticOperatorResultType(SOperatorNode* pOp) { + SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; + SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; + if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) || + (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && (IS_VAR_DATA_TYPE(rdt.type) || IS_FLOAT_TYPE(rdt.type))) || + (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && (IS_VAR_DATA_TYPE(ldt.type) || IS_FLOAT_TYPE(ldt.type)))) { + return TSDB_CODE_TSC_INVALID_OPERATION; + } + + if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && IS_INTEGER_TYPE(rdt.type)) || + (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && IS_INTEGER_TYPE(ldt.type)) || + (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_BOOL == rdt.type) || + (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && TSDB_DATA_TYPE_BOOL == ldt.type)) { + pOp->node.resType.type = TSDB_DATA_TYPE_TIMESTAMP; + pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_TIMESTAMP].bytes; + } else { + pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE; + pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes; + } + return TSDB_CODE_SUCCESS; +} + +static int32_t getComparisonOperatorResultType(SOperatorNode* pOp) { + SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; + if (NULL != pOp->pRight) { + SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; + if (OP_TYPE_IN == pOp->opType || OP_TYPE_NOT_IN == pOp->opType) { + rdt = ldt; + } else if (nodesIsRegularOp(pOp)) { + if (!IS_VAR_DATA_TYPE(ldt.type) || QUERY_NODE_VALUE != nodeType(pOp->pRight) || + (!IS_STR_DATA_TYPE(rdt.type) && (rdt.type != TSDB_DATA_TYPE_NULL))) { + return TSDB_CODE_TSC_INVALID_OPERATION; + } + } + } + pOp->node.resType.type = TSDB_DATA_TYPE_BOOL; + pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BOOL].bytes; + return TSDB_CODE_SUCCESS; +} + +static int32_t getJsonOperatorResultType(SOperatorNode* pOp) { + SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; + SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; + if (TSDB_DATA_TYPE_JSON != ldt.type || !IS_STR_DATA_TYPE(rdt.type)) { + return TSDB_CODE_TSC_INVALID_OPERATION; + } + if (pOp->opType == OP_TYPE_JSON_GET_VALUE) { + pOp->node.resType.type = TSDB_DATA_TYPE_JSON; + } else if (pOp->opType == OP_TYPE_JSON_CONTAINS) { + pOp->node.resType.type = TSDB_DATA_TYPE_BOOL; + } + pOp->node.resType.bytes = tDataTypes[pOp->node.resType.type].bytes; + return TSDB_CODE_SUCCESS; +} + +static int32_t getBitwiseOperatorResultType(SOperatorNode* pOp) { + pOp->node.resType.type = TSDB_DATA_TYPE_BIGINT; + pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes; + return TSDB_CODE_SUCCESS; +} + +int32_t scalarGetOperatorResultType(SOperatorNode* pOp) { + if (TSDB_DATA_TYPE_BLOB == ((SExprNode*)(pOp->pLeft))->resType.type || + (NULL != pOp->pRight && TSDB_DATA_TYPE_BLOB == ((SExprNode*)(pOp->pRight))->resType.type)) { + return TSDB_CODE_TSC_INVALID_OPERATION; + } + + switch (pOp->opType) { case OP_TYPE_ADD: - if (left.type == TSDB_DATA_TYPE_TIMESTAMP && right.type == TSDB_DATA_TYPE_TIMESTAMP) { - qError("invalid op %d, left type:%d, right type:%d", op, left.type, right.type); - return TSDB_CODE_TSC_INVALID_OPERATION; - } - if ((left.type == TSDB_DATA_TYPE_TIMESTAMP && (IS_INTEGER_TYPE(right.type) || right.type == TSDB_DATA_TYPE_BOOL)) || - (right.type == TSDB_DATA_TYPE_TIMESTAMP && (IS_INTEGER_TYPE(left.type) || left.type == TSDB_DATA_TYPE_BOOL))) { - pRes->type = TSDB_DATA_TYPE_TIMESTAMP; - return TSDB_CODE_SUCCESS; - } - pRes->type = TSDB_DATA_TYPE_DOUBLE; - return TSDB_CODE_SUCCESS; case OP_TYPE_SUB: - if ((left.type == TSDB_DATA_TYPE_TIMESTAMP && right.type == TSDB_DATA_TYPE_BIGINT) || - (right.type == TSDB_DATA_TYPE_TIMESTAMP && left.type == TSDB_DATA_TYPE_BIGINT)) { - pRes->type = TSDB_DATA_TYPE_TIMESTAMP; - return TSDB_CODE_SUCCESS; - } - pRes->type = TSDB_DATA_TYPE_DOUBLE; - return TSDB_CODE_SUCCESS; case OP_TYPE_MULTI: - if (left.type == TSDB_DATA_TYPE_TIMESTAMP && right.type == TSDB_DATA_TYPE_TIMESTAMP) { - qError("invalid op %d, left type:%d, right type:%d", op, left.type, right.type); - return TSDB_CODE_TSC_INVALID_OPERATION; - } case OP_TYPE_DIV: - if (left.type == TSDB_DATA_TYPE_TIMESTAMP && right.type == TSDB_DATA_TYPE_TIMESTAMP) { - qError("invalid op %d, left type:%d, right type:%d", op, left.type, right.type); - return TSDB_CODE_TSC_INVALID_OPERATION; - } case OP_TYPE_REM: + return getArithmeticOperatorResultType(pOp); case OP_TYPE_MINUS: - pRes->type = TSDB_DATA_TYPE_DOUBLE; - return TSDB_CODE_SUCCESS; + return getMinusOperatorResultType(pOp); + case OP_TYPE_ASSIGN: + pOp->node.resType = ((SExprNode*)(pOp->pLeft))->resType; + break; + case OP_TYPE_BIT_AND: + case OP_TYPE_BIT_OR: + return getBitwiseOperatorResultType(pOp); case OP_TYPE_GREATER_THAN: case OP_TYPE_GREATER_EQUAL: case OP_TYPE_LOWER_THAN: case OP_TYPE_LOWER_EQUAL: case OP_TYPE_EQUAL: case OP_TYPE_NOT_EQUAL: - case OP_TYPE_IN: - case OP_TYPE_NOT_IN: + case OP_TYPE_IS_NULL: + case OP_TYPE_IS_NOT_NULL: + case OP_TYPE_IS_TRUE: + case OP_TYPE_IS_FALSE: + case OP_TYPE_IS_UNKNOWN: + case OP_TYPE_IS_NOT_TRUE: + case OP_TYPE_IS_NOT_FALSE: + case OP_TYPE_IS_NOT_UNKNOWN: case OP_TYPE_LIKE: case OP_TYPE_NOT_LIKE: case OP_TYPE_MATCH: case OP_TYPE_NMATCH: - case OP_TYPE_IS_NULL: - case OP_TYPE_IS_NOT_NULL: - case OP_TYPE_IS_TRUE: - case OP_TYPE_JSON_CONTAINS: - pRes->type = TSDB_DATA_TYPE_BOOL; - return TSDB_CODE_SUCCESS; - case OP_TYPE_BIT_AND: - case OP_TYPE_BIT_OR: - pRes->type = TSDB_DATA_TYPE_BIGINT; - return TSDB_CODE_SUCCESS; + case OP_TYPE_IN: + case OP_TYPE_NOT_IN: + return getComparisonOperatorResultType(pOp); case OP_TYPE_JSON_GET_VALUE: - pRes->type = TSDB_DATA_TYPE_JSON; - return TSDB_CODE_SUCCESS; + case OP_TYPE_JSON_CONTAINS: + return getJsonOperatorResultType(pOp); default: - ASSERT(0); - return TSDB_CODE_APP_ERROR; + break; } + + return TSDB_CODE_SUCCESS; } - - From f99a61a4644e3fb08ad6e531400f068db70dff4e Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Fri, 8 Jul 2022 21:05:19 +0800 Subject: [PATCH 03/25] fix: some problem of parser and planner --- include/util/taoserror.h | 1 + source/libs/parser/src/parAstParser.c | 3 + source/libs/parser/src/parTranslater.c | 110 +++++++++++------- source/libs/planner/src/planLogicCreater.c | 7 +- source/libs/planner/test/planIntervalTest.cpp | 2 + source/libs/scalar/src/scalar.c | 14 +-- tests/script/tsim/show/basic.sim | 4 +- .../2-query/query_cols_tags_and_or.py | 20 ++-- 8 files changed, 93 insertions(+), 68 deletions(-) diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 41d5910625..05d1bd8ae3 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -582,6 +582,7 @@ int32_t* taosGetErrno(); #define TSDB_CODE_PAR_INVALID_INTERP_CLAUSE TAOS_DEF_ERROR_CODE(0, 0x265D) #define TSDB_CODE_PAR_NO_VALID_FUNC_IN_WIN TAOS_DEF_ERROR_CODE(0, 0x265E) #define TSDB_CODE_PAR_ONLY_SUPPORT_SINGLE_TABLE TAOS_DEF_ERROR_CODE(0, 0x265F) +#define TSDB_CODE_PAR_INVALID_SMA_INDEX TAOS_DEF_ERROR_CODE(0, 0x265C) //planner #define TSDB_CODE_PLAN_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0x2700) diff --git a/source/libs/parser/src/parAstParser.c b/source/libs/parser/src/parAstParser.c index f38def0b1d..2060c3da4c 100644 --- a/source/libs/parser/src/parAstParser.c +++ b/source/libs/parser/src/parAstParser.c @@ -270,6 +270,9 @@ static int32_t collectMetaKeyFromCreateIndex(SCollectMetaKeyCxt* pCxt, SCreateIn if (TSDB_CODE_SUCCESS == code) { code = reserveDbVgInfoInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->db, pCxt->pMetaCache); } + if (TSDB_CODE_SUCCESS == code) { + code = reserveDbCfgInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->db, pCxt->pMetaCache); + } } return code; } diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 4ffcd34d70..46015e5bb5 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -962,6 +962,10 @@ static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) { return translateValueImpl(pCxt, pVal, dt, false); } +static int32_t doTranslateValue(STranslateContext* pCxt, SValueNode* pVal) { + return DEAL_RES_ERROR == translateValue(pCxt, pVal) ? pCxt->errCode : TSDB_CODE_SUCCESS; +} + static bool isMultiResFunc(SNode* pNode) { if (NULL == pNode) { return false; @@ -1430,6 +1434,24 @@ static EDealRes rewriteColToSelectValFunc(STranslateContext* pCxt, SNode** pNode return TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_IGNORE_CHILD : DEAL_RES_ERROR; } +static EDealRes rewriteExprToGroupKeyFunc(STranslateContext* pCxt, SNode** pNode) { + SFunctionNode* pFunc = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION); + if (NULL == pFunc) { + pCxt->errCode = TSDB_CODE_OUT_OF_MEMORY; + return DEAL_RES_ERROR; + } + + strcpy(pFunc->functionName, "_group_key"); + strcpy(pFunc->node.aliasName, ((SExprNode*)*pNode)->aliasName); + pCxt->errCode = nodesListMakeAppend(&pFunc->pParameterList, *pNode); + if (TSDB_CODE_SUCCESS == pCxt->errCode) { + *pNode = (SNode*)pFunc; + pCxt->errCode = fmGetFuncInfo(pFunc, pCxt->msgBuf.buf, pCxt->msgBuf.len); + } + + return (TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_IGNORE_CHILD : DEAL_RES_ERROR); +} + static EDealRes doCheckExprForGroupBy(SNode** pNode, void* pContext) { SCheckExprForGroupByCxt* pCxt = (SCheckExprForGroupByCxt*)pContext; if (!nodesIsExprNode(*pNode) || isAliasColumn(*pNode)) { @@ -1455,7 +1477,7 @@ static EDealRes doCheckExprForGroupBy(SNode** pNode, void* pContext) { SNode* pPartKey = NULL; FOREACH(pPartKey, ((SSelectStmt*)pCxt->pTranslateCxt->pCurrStmt)->pPartitionByList) { if (nodesEqualNode(pPartKey, *pNode)) { - return DEAL_RES_IGNORE_CHILD; + return rewriteExprToGroupKeyFunc(pCxt->pTranslateCxt, pNode); } } if (isScanPseudoColumnFunc(*pNode) || QUERY_NODE_COLUMN == nodeType(*pNode)) { @@ -1515,35 +1537,30 @@ static int32_t rewriteColsToSelectValFunc(STranslateContext* pCxt, SSelectStmt* typedef struct CheckAggColCoexistCxt { STranslateContext* pTranslateCxt; - bool existAggFunc; + bool existVectorFunc; bool existCol; - bool existIndefiniteRowsFunc; int32_t selectFuncNum; - bool existOtherAggFunc; + bool existOtherVectorFunc; } CheckAggColCoexistCxt; -static EDealRes doCheckAggColCoexist(SNode* pNode, void* pContext) { +static EDealRes doCheckAggColCoexist(SNode** pNode, void* pContext) { CheckAggColCoexistCxt* pCxt = (CheckAggColCoexistCxt*)pContext; - if (isSelectFunc(pNode)) { + if (isSelectFunc(*pNode)) { ++(pCxt->selectFuncNum); - } else if (isAggFunc(pNode)) { - pCxt->existOtherAggFunc = true; + } else if (isAggFunc(*pNode)) { + pCxt->existOtherVectorFunc = true; } - if (isAggFunc(pNode)) { - pCxt->existAggFunc = true; - return DEAL_RES_IGNORE_CHILD; - } - if (isIndefiniteRowsFunc(pNode)) { - pCxt->existIndefiniteRowsFunc = true; + if (isVectorFunc(*pNode)) { + pCxt->existVectorFunc = true; return DEAL_RES_IGNORE_CHILD; } SNode* pPartKey = NULL; FOREACH(pPartKey, ((SSelectStmt*)pCxt->pTranslateCxt->pCurrStmt)->pPartitionByList) { - if (nodesEqualNode(pPartKey, pNode)) { - return DEAL_RES_IGNORE_CHILD; + if (nodesEqualNode(pPartKey, *pNode)) { + return rewriteExprToGroupKeyFunc(pCxt->pTranslateCxt, pNode); } } - if (isScanPseudoColumnFunc(pNode) || QUERY_NODE_COLUMN == nodeType(pNode)) { + if (isScanPseudoColumnFunc(*pNode) || QUERY_NODE_COLUMN == nodeType(*pNode)) { pCxt->existCol = true; } return DEAL_RES_CONTINUE; @@ -1554,24 +1571,20 @@ static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect) return TSDB_CODE_SUCCESS; } CheckAggColCoexistCxt cxt = {.pTranslateCxt = pCxt, - .existAggFunc = false, + .existVectorFunc = false, .existCol = false, - .existIndefiniteRowsFunc = false, .selectFuncNum = 0, - .existOtherAggFunc = false}; - nodesWalkExprs(pSelect->pProjectionList, doCheckAggColCoexist, &cxt); + .existOtherVectorFunc = false}; + nodesRewriteExprs(pSelect->pProjectionList, doCheckAggColCoexist, &cxt); if (!pSelect->isDistinct) { - nodesWalkExprs(pSelect->pOrderByList, doCheckAggColCoexist, &cxt); + nodesRewriteExprs(pSelect->pOrderByList, doCheckAggColCoexist, &cxt); } - if (1 == cxt.selectFuncNum && !cxt.existOtherAggFunc) { + if (1 == cxt.selectFuncNum && !cxt.existOtherVectorFunc) { return rewriteColsToSelectValFunc(pCxt, pSelect); } - if ((cxt.selectFuncNum > 1 || cxt.existAggFunc || NULL != pSelect->pWindow) && cxt.existCol) { + if ((cxt.selectFuncNum > 1 || cxt.existVectorFunc || NULL != pSelect->pWindow) && cxt.existCol) { return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_SINGLE_GROUP); } - if (cxt.existIndefiniteRowsFunc && cxt.existCol) { - return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_ALLOWED_FUNC); - } return TSDB_CODE_SUCCESS; } @@ -4047,29 +4060,42 @@ static int32_t buildCreateSmaReq(STranslateContext* pCxt, SCreateIndexStmt* pStm return code; } -static int32_t translateCreateSmaIndex(STranslateContext* pCxt, SCreateIndexStmt* pStmt) { - if (DEAL_RES_ERROR == translateValue(pCxt, (SValueNode*)pStmt->pOptions->pInterval) || - (NULL != pStmt->pOptions->pOffset && - DEAL_RES_ERROR == translateValue(pCxt, (SValueNode*)pStmt->pOptions->pOffset)) || - (NULL != pStmt->pOptions->pSliding && - DEAL_RES_ERROR == translateValue(pCxt, (SValueNode*)pStmt->pOptions->pSliding))) { - return pCxt->errCode; +static int32_t checkCreateSmaIndex(STranslateContext* pCxt, SCreateIndexStmt* pStmt) { + SDbCfgInfo dbCfg = {0}; + int32_t code = getDBCfg(pCxt, pCxt->pParseCxt->db, &dbCfg); + if (TSDB_CODE_SUCCESS == code && NULL != dbCfg.pRetensions) { + code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_SMA_INDEX, + "Tables configured with the 'ROLLUP' option do not support creating sma index"); + } + if (TSDB_CODE_SUCCESS == code) { + code = doTranslateValue(pCxt, (SValueNode*)pStmt->pOptions->pInterval); + } + if (TSDB_CODE_SUCCESS == code && NULL != pStmt->pOptions->pOffset) { + code = doTranslateValue(pCxt, (SValueNode*)pStmt->pOptions->pOffset); + } + if (TSDB_CODE_SUCCESS == code && NULL != pStmt->pOptions->pSliding) { + code = doTranslateValue(pCxt, (SValueNode*)pStmt->pOptions->pSliding); } - if (NULL != pStmt->pOptions->pStreamOptions) { + if (TSDB_CODE_SUCCESS == code && NULL != pStmt->pOptions->pStreamOptions) { SStreamOptions* pStreamOpt = (SStreamOptions*)pStmt->pOptions->pStreamOptions; - if (NULL != pStreamOpt->pWatermark && - (DEAL_RES_ERROR == translateValue(pCxt, (SValueNode*)pStreamOpt->pWatermark))) { - return pCxt->errCode; + if (NULL != pStreamOpt->pWatermark) { + code = doTranslateValue(pCxt, (SValueNode*)pStreamOpt->pWatermark); } - - if (NULL != pStreamOpt->pDelay && (DEAL_RES_ERROR == translateValue(pCxt, (SValueNode*)pStreamOpt->pDelay))) { - return pCxt->errCode; + if (TSDB_CODE_SUCCESS == code && NULL != pStreamOpt->pDelay) { + code = doTranslateValue(pCxt, (SValueNode*)pStreamOpt->pDelay); } } + return code; +} + +static int32_t translateCreateSmaIndex(STranslateContext* pCxt, SCreateIndexStmt* pStmt) { SMCreateSmaReq createSmaReq = {0}; - int32_t code = buildCreateSmaReq(pCxt, pStmt, &createSmaReq); + int32_t code = checkCreateSmaIndex(pCxt, pStmt); + if (TSDB_CODE_SUCCESS == code) { + code = buildCreateSmaReq(pCxt, pStmt, &createSmaReq); + } if (TSDB_CODE_SUCCESS == code) { code = buildCmdMsg(pCxt, TDMT_MND_CREATE_SMA, (FSerializeFunc)tSerializeSMCreateSmaReq, &createSmaReq); } diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c index 703395b0d5..cb38e1fc18 100644 --- a/source/libs/planner/src/planLogicCreater.c +++ b/source/libs/planner/src/planLogicCreater.c @@ -485,10 +485,6 @@ static int32_t createAggLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, code = rewriteExprsForSelect(pAgg->pAggFuncs, pSelect, SQL_CLAUSE_GROUP_BY); } - if (NULL != pSelect->pPartitionByList) { - code = createGroupKeysFromPartKeys(pSelect->pPartitionByList, &pAgg->pGroupKeys); - } - if (NULL != pSelect->pGroupByList) { if (NULL != pAgg->pGroupKeys) { code = nodesListStrictAppendList(pAgg->pGroupKeys, nodesCloneList(pSelect->pGroupByList)); @@ -845,8 +841,7 @@ static int32_t createProjectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSel } static int32_t createPartitionLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SLogicNode** pLogicNode) { - if (NULL == pSelect->pPartitionByList || (pSelect->hasAggFuncs && NULL == pSelect->pWindow) || - NULL != pSelect->pGroupByList) { + if (NULL == pSelect->pPartitionByList) { return TSDB_CODE_SUCCESS; } diff --git a/source/libs/planner/test/planIntervalTest.cpp b/source/libs/planner/test/planIntervalTest.cpp index 10ef09adb9..73fa898bf8 100644 --- a/source/libs/planner/test/planIntervalTest.cpp +++ b/source/libs/planner/test/planIntervalTest.cpp @@ -62,4 +62,6 @@ TEST_F(PlanIntervalTest, stable) { run("SELECT _WSTARTTS, COUNT(*) FROM st1 INTERVAL(10s)"); run("SELECT _WSTARTTS, COUNT(*) FROM st1 PARTITION BY TBNAME INTERVAL(10s)"); + + run("SELECT TBNAME, COUNT(*) FROM st1 PARTITION BY TBNAME INTERVAL(10s)"); } diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index e1aeaf219b..91a24986aa 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -1069,15 +1069,13 @@ static int32_t getArithmeticOperatorResultType(SOperatorNode* pOp) { static int32_t getComparisonOperatorResultType(SOperatorNode* pOp) { SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType; - if (NULL != pOp->pRight) { + if (OP_TYPE_IN == pOp->opType || OP_TYPE_NOT_IN == pOp->opType) { + ((SExprNode*)(pOp->pRight))->resType = ldt; + } else if (nodesIsRegularOp(pOp)) { SDataType rdt = ((SExprNode*)(pOp->pRight))->resType; - if (OP_TYPE_IN == pOp->opType || OP_TYPE_NOT_IN == pOp->opType) { - rdt = ldt; - } else if (nodesIsRegularOp(pOp)) { - if (!IS_VAR_DATA_TYPE(ldt.type) || QUERY_NODE_VALUE != nodeType(pOp->pRight) || - (!IS_STR_DATA_TYPE(rdt.type) && (rdt.type != TSDB_DATA_TYPE_NULL))) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } + if (!IS_VAR_DATA_TYPE(ldt.type) || QUERY_NODE_VALUE != nodeType(pOp->pRight) || + (!IS_STR_DATA_TYPE(rdt.type) && (rdt.type != TSDB_DATA_TYPE_NULL))) { + return TSDB_CODE_TSC_INVALID_OPERATION; } } pOp->node.resType.type = TSDB_DATA_TYPE_BOOL; diff --git a/tests/script/tsim/show/basic.sim b/tests/script/tsim/show/basic.sim index 4d646f39e3..d0643bc7f2 100644 --- a/tests/script/tsim/show/basic.sim +++ b/tests/script/tsim/show/basic.sim @@ -99,7 +99,7 @@ if $rows != 1 then endi #sql select * from information_schema.`streams` sql select * from information_schema.user_tables -if $rows != 31 then +if $rows != 30 then return -1 endi #sql select * from information_schema.user_table_distributed @@ -197,7 +197,7 @@ if $rows != 1 then endi #sql select * from performance_schema.`streams` sql select * from information_schema.user_tables -if $rows != 31 then +if $rows != 30 then return -1 endi #sql select * from information_schema.user_table_distributed diff --git a/tests/system-test/2-query/query_cols_tags_and_or.py b/tests/system-test/2-query/query_cols_tags_and_or.py index f8a44f735f..c9df6f61bb 100644 --- a/tests/system-test/2-query/query_cols_tags_and_or.py +++ b/tests/system-test/2-query/query_cols_tags_and_or.py @@ -1066,7 +1066,7 @@ class TDTestCase: tdSql.checkEqual(self.queryLastC10(query_sql), 11) if select_elm == "*" else False # in query_sql = f'select {select_elm} from {tb_name} where c5 in (1, 6.6)' - tdSql.error(query_sql) + tdSql.query(query_sql) # not in query_sql = f'select {select_elm} from {tb_name} where c5 not in (2, 3)' tdSql.query(query_sql) @@ -1074,10 +1074,10 @@ class TDTestCase: tdSql.checkEqual(self.queryLastC10(query_sql), 11) if select_elm == "*" else False # and query_sql = f'select {select_elm} from {tb_name} where c5 > 0 and c5 >= 1 and c5 < 7 and c5 <= 6.6 and c5 != 2 and c5 <> 2 and c5 = 6.6 and c5 is not null and c5 between 2 and 6.6 and c5 not between 1 and 2 and c5 in (2,6.6) and c5 not in (1,2)' - tdSql.error(query_sql) + tdSql.query(query_sql) # or query_sql = f'select {select_elm} from {tb_name} where c5 > 6 or c5 >= 6.6 or c5 < 1 or c5 <= 0 or c5 != 1.1 or c5 <> 1.1 or c5 = 5 or c5 is null or c5 between 4 and 5 or c5 not between 1 and 3 or c5 in (4,5) or c5 not in (1.1,3)' - tdSql.error(query_sql) + tdSql.query(query_sql) # and or query_sql = f'select {select_elm} from {tb_name} where c5 > 0 and c5 >= 1 or c5 < 5 and c5 <= 6.6 and c5 != 2 and c5 <> 2 and c5 = 4 or c5 is not null and c5 between 2 and 4 and c5 not between 1 and 2 and c5 in (2,4) and c5 not in (1,2)' tdSql.query(query_sql) @@ -1145,7 +1145,7 @@ class TDTestCase: tdSql.checkEqual(self.queryLastC10(query_sql), 11) if select_elm == "*" else False # in query_sql = f'select {select_elm} from {tb_name} where c6 in (1, 7.7)' - tdSql.error(query_sql) + tdSql.query(query_sql) # not in query_sql = f'select {select_elm} from {tb_name} where c6 not in (2, 3)' tdSql.query(query_sql) @@ -1153,10 +1153,10 @@ class TDTestCase: tdSql.checkEqual(self.queryLastC10(query_sql), 11) if select_elm == "*" else False # and query_sql = f'select {select_elm} from {tb_name} where c6 > 0 and c6 >= 1 and c6 < 8 and c6 <= 7.7 and c6 != 2 and c6 <> 2 and c6 = 7.7 and c6 is not null and c6 between 2 and 7.7 and c6 not between 1 and 2 and c6 in (2,7.7) and c6 not in (1,2)' - tdSql.error(query_sql) + tdSql.query(query_sql) # or query_sql = f'select {select_elm} from {tb_name} where c6 > 7 or c6 >= 7.7 or c6 < 1 or c6 <= 0 or c6 != 1.1 or c6 <> 1.1 or c6 = 5 or c6 is null or c6 between 4 and 5 or c6 not between 1 and 3 or c6 in (4,5) or c6 not in (1.1,3)' - tdSql.error(query_sql) + tdSql.query(query_sql) # and or query_sql = f'select {select_elm} from {tb_name} where c6 > 0 and c6 >= 1 or c6 < 5 and c6 <= 7.7 and c6 != 2 and c6 <> 2 and c6 = 4 or c6 is not null and c6 between 2 and 4 and c6 not between 1 and 2 and c6 in (2,4) and c6 not in (1,2)' tdSql.query(query_sql) @@ -1398,7 +1398,7 @@ class TDTestCase: tdSql.checkEqual(self.queryLastC10(query_sql), 11) if select_elm == "*" else False # in query_sql = f'select {select_elm} from {tb_name} where c9 in ("binar", false)' - tdSql.error(query_sql) + tdSql.query(query_sql) # # not in query_sql = f'select {select_elm} from {tb_name} where c9 not in (true)' tdSql.query(query_sql) @@ -1407,13 +1407,13 @@ class TDTestCase: # # and query_sql = f'select {select_elm} from {tb_name} where c9 = true and c9 != "false" and c9 <> "binary" and c9 is not null and c9 in ("binary", true) and c9 not in ("binary")' - tdSql.error(query_sql) + tdSql.query(query_sql) # # or query_sql = f'select {select_elm} from {tb_name} where c9 = true or c9 != "false" or c9 <> "binary" or c9 = "true" or c9 is not null or c9 in ("binary", true) or c9 not in ("binary")' - tdSql.error(query_sql) + tdSql.query(query_sql) # # and or query_sql = f'select {select_elm} from {tb_name} where c9 = true and c9 != "false" or c9 <> "binary" or c9 = "true" and c9 is not null or c9 in ("binary", true) or c9 not in ("binary")' - tdSql.error(query_sql) + tdSql.query(query_sql) query_sql = f'select c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13 from {tb_name} where c9 > "binary" and c9 >= "binary8" or c9 < "binary9" and c9 <= "binary" and c9 != 2 and c9 <> 2 and c9 = 4 or c9 is not null and c9 between 2 and 4 and c9 not between 1 and 2 and c9 in (2,4) and c9 not in (1,2)' tdSql.query(query_sql) tdSql.checkRows(9) From f52038dbfc0d99b333f28ac9a990d9245542729a Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Sun, 10 Jul 2022 11:35:24 +0800 Subject: [PATCH 04/25] add test case --- source/libs/index/inc/indexFstSparse.h | 13 +++--- source/libs/index/src/indexFstDfa.c | 15 ++++--- source/libs/index/src/indexFstSparse.c | 44 +++++++++++++++------ source/libs/index/test/fstUtilUT.cc | 55 ++++++++++++++++++++++---- 4 files changed, 97 insertions(+), 30 deletions(-) diff --git a/source/libs/index/inc/indexFstSparse.h b/source/libs/index/inc/indexFstSparse.h index 665fb2ba5c..bd704fb427 100644 --- a/source/libs/index/inc/indexFstSparse.h +++ b/source/libs/index/inc/indexFstSparse.h @@ -23,17 +23,18 @@ extern "C" { #endif typedef struct FstSparseSet { - uint32_t *dense; - uint32_t *sparse; - int32_t size; + int32_t *dense; + int32_t *sparse; + int32_t size; + int32_t cap; } FstSparseSet; FstSparseSet *sparSetCreate(int32_t sz); void sparSetDestroy(FstSparseSet *s); uint32_t sparSetLen(FstSparseSet *ss); -uint32_t sparSetAdd(FstSparseSet *ss, uint32_t ip); -uint32_t sparSetGet(FstSparseSet *ss, uint32_t i); -bool sparSetContains(FstSparseSet *ss, uint32_t ip); +bool sparSetAdd(FstSparseSet *ss, int32_t ip, int32_t *val); +bool sparSetGet(FstSparseSet *ss, int32_t i, int32_t *val); +bool sparSetContains(FstSparseSet *ss, int32_t ip); void sparSetClear(FstSparseSet *ss); #ifdef __cplusplus diff --git a/source/libs/index/src/indexFstDfa.c b/source/libs/index/src/indexFstDfa.c index b820f16a2a..275580ebdc 100644 --- a/source/libs/index/src/indexFstDfa.c +++ b/source/libs/index/src/indexFstDfa.c @@ -105,8 +105,9 @@ bool dfaBuilderRunState(FstDfaBuilder *builder, FstSparseSet *cur, FstSparseSet sparSetClear(cur); DfaState *t = taosArrayGet(builder->dfa->states, state); for (int i = 0; i < taosArrayGetSize(t->insts); i++) { - uint32_t ip = *(int32_t *)taosArrayGet(t->insts, i); - sparSetAdd(cur, ip); + int32_t ip = *(int32_t *)taosArrayGet(t->insts, i); + bool succ = sparSetAdd(cur, ip, NULL); + assert(succ == true); } dfaRun(builder->dfa, cur, next, byte); @@ -126,7 +127,9 @@ bool dfaBuilderCachedState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t * bool isMatch = false; for (int i = 0; i < sparSetLen(set); i++) { - uint32_t ip = sparSetGet(set, i); + int32_t ip; + + if (false == sparSetGet(set, i, &ip)) continue; Inst *inst = taosArrayGet(builder->dfa->insts, ip); if (inst->ty == JUMP || inst->ty == SPLIT) { @@ -186,7 +189,8 @@ void dfaAdd(FstDfa *dfa, FstSparseSet *set, uint32_t ip) { if (sparSetContains(set, ip)) { return; } - sparSetAdd(set, ip); + bool succ = sparSetAdd(set, ip, NULL); + assert(succ == true); Inst *inst = taosArrayGet(dfa->insts, ip); if (inst->ty == MATCH || inst->ty == RANGE) { // do nothing @@ -203,7 +207,8 @@ bool dfaRun(FstDfa *dfa, FstSparseSet *from, FstSparseSet *to, uint8_t byte) { bool isMatch = false; sparSetClear(to); for (int i = 0; i < sparSetLen(from); i++) { - uint32_t ip = sparSetGet(from, i); + int32_t ip; + if (false == sparSetGet(from, i, &ip)) continue; Inst *inst = taosArrayGet(dfa->insts, ip); if (inst->ty == JUMP || inst->ty == SPLIT) { diff --git a/source/libs/index/src/indexFstSparse.c b/source/libs/index/src/indexFstSparse.c index 71d8854dcc..99ed5d6429 100644 --- a/source/libs/index/src/indexFstSparse.c +++ b/source/libs/index/src/indexFstSparse.c @@ -21,8 +21,12 @@ FstSparseSet *sparSetCreate(int32_t sz) { return NULL; } - ss->dense = (uint32_t *)taosMemoryCalloc(sz, sizeof(uint32_t)); - ss->sparse = (uint32_t *)taosMemoryCalloc(sz, sizeof(uint32_t)); + ss->dense = (int32_t *)taosMemoryMalloc(sz * sizeof(int32_t)); + memset(ss->dense, -1, sz * sizeof(int32_t)); + ss->sparse = (int32_t *)taosMemoryMalloc(sz * sizeof(int32_t)); + memset(ss->sparse, -1, sz * sizeof(int32_t)); + ss->cap = sz; + ss->size = 0; return ss; } @@ -38,23 +42,39 @@ uint32_t sparSetLen(FstSparseSet *ss) { // Get occupied size return ss == NULL ? 0 : ss->size; } -uint32_t sparSetAdd(FstSparseSet *ss, uint32_t ip) { +bool sparSetAdd(FstSparseSet *ss, int32_t ip, int32_t *idx) { if (ss == NULL) { - return 0; + return false; + } + if (ip >= ss->cap) { + return false; } uint32_t i = ss->size; ss->dense[i] = ip; ss->sparse[ip] = i; ss->size += 1; - return i; + + if (idx != NULL) *idx = i; + + return true; } -uint32_t sparSetGet(FstSparseSet *ss, uint32_t i) { - // check later - return ss->dense[i]; +bool sparSetGet(FstSparseSet *ss, int32_t idx, int32_t *ip) { + if (idx >= ss->cap || idx >= ss->size) { + return false; + } + int32_t val = ss->dense[idx]; + if (ip != NULL) { + *ip = val; + } + return val == -1 ? false : true; } -bool sparSetContains(FstSparseSet *ss, uint32_t ip) { - uint32_t i = ss->sparse[ip]; - if (i < ss->size && ss->dense[i] == ip) { +bool sparSetContains(FstSparseSet *ss, int32_t ip) { + if (ip >= ss->cap) { + return false; + } + int32_t i = ss->sparse[ip]; + + if (i < ss->cap && i < ss->size && ss->dense[i] == ip) { return true; } else { return false; @@ -64,5 +84,7 @@ void sparSetClear(FstSparseSet *ss) { if (ss == NULL) { return; } + memset(ss->dense, -1, ss->cap * sizeof(int32_t)); + memset(ss->sparse, -1, ss->cap * sizeof(int32_t)); ss->size = 0; } diff --git a/source/libs/index/test/fstUtilUT.cc b/source/libs/index/test/fstUtilUT.cc index 2c29758756..22fe1a9150 100644 --- a/source/libs/index/test/fstUtilUT.cc +++ b/source/libs/index/test/fstUtilUT.cc @@ -51,10 +51,18 @@ class FstSparseSetEnv : public ::testing::Test { }; // test FstDfaBuilder -TEST_F(FstUtilEnv, test1) {} -TEST_F(FstUtilEnv, test2) {} -TEST_F(FstUtilEnv, test3) {} -TEST_F(FstUtilEnv, test4) {} +TEST_F(FstUtilEnv, test1) { + // test +} +TEST_F(FstUtilEnv, test2) { + // test +} +TEST_F(FstUtilEnv, test3) { + // test +} +TEST_F(FstUtilEnv, test4) { + // test +} // test FstRegex @@ -64,7 +72,38 @@ TEST_F(FstRegexEnv, test3) {} TEST_F(FstRegexEnv, test4) {} // test FstSparseSet -TEST_F(FstSparseSetEnv, test1) {} -TEST_F(FstSparseSetEnv, test2) {} -TEST_F(FstSparseSetEnv, test3) {} -TEST_F(FstSparseSetEnv, test4) {} +TEST_F(FstSparseSetEnv, test1) { + for (int8_t i = 0; i < 20; i++) { + int32_t val = -1; + bool succ = sparSetAdd(set, 'a' + i, &val); + } + EXPECT_EQ(sparSetLen(set), 20); + for (int8_t i = 0; i < 20; i++) { + int val = -1; + bool find = sparSetGet(set, i, &val); + EXPECT_EQ(find, true); + EXPECT_EQ(val, i + 'a'); + } + for (int8_t i = 'a'; i < 'a' + 20; i++) { + EXPECT_EQ(sparSetContains(set, i), true); + } + + for (int8_t i = 'A'; i < 20; i++) { + EXPECT_EQ(sparSetContains(set, 'A'), false); + } + + for (int i = 512; i < 1000; i++) { + EXPECT_EQ(sparSetAdd(set, i, NULL), false); + + EXPECT_EQ(sparSetGet(set, i, NULL), false); + EXPECT_EQ(sparSetContains(set, i), false); + } + sparSetClear(set); + + for (int i = 'a'; i < 'a' + 20; i++) { + EXPECT_EQ(sparSetGet(set, i, NULL), false); + } + for (int i = 1000; i < 2000; i++) { + EXPECT_EQ(sparSetGet(set, i, NULL), false); + } +} From 4d4ec8e7173cf28cc9ea4cecf13047d46c6a4704 Mon Sep 17 00:00:00 2001 From: tomchon Date: Sun, 10 Jul 2022 14:16:33 +0800 Subject: [PATCH 05/25] test:modify testcase of mnode --- tests/system-test/6-cluster/5dnode1mnode.py | 6 +- .../6-cluster/5dnode3mnodeAdd1Ddnoe.py | 229 ++++++++++++++++++ .../5dnode3mnodeRestartDnodeInsertData.py | 223 +++++++++++++++++ .../5dnode3mnodeSep1VnodeStopDnodeCreateDb.py | 61 ++--- ...5dnode3mnodeSep1VnodeStopDnodeCreateStb.py | 5 +- ...dnode3mnodeSep1VnodeStopDnodeInsertData.py | 221 +++++++++++++++++ .../5dnode3mnodeSep1VnodeStopMnodeCreateDb.py | 3 +- ...5dnode3mnodeSep1VnodeStopVnodeCreateStb.py | 9 +- .../6-cluster/clusterCommonCreate.py | 8 +- tests/system-test/fulltest.sh | 5 +- 10 files changed, 725 insertions(+), 45 deletions(-) create mode 100644 tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py create mode 100644 tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py create mode 100644 tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeInsertData.py diff --git a/tests/system-test/6-cluster/5dnode1mnode.py b/tests/system-test/6-cluster/5dnode1mnode.py index 5f4ab7357b..4611726c14 100644 --- a/tests/system-test/6-cluster/5dnode1mnode.py +++ b/tests/system-test/6-cluster/5dnode1mnode.py @@ -124,9 +124,9 @@ class TDTestCase: tdSql.query('show databases;') tdSql.checkData(2,5,'no_strict') tdSql.error('alter database db strict 0') - tdSql.execute('alter database db strict 1') - tdSql.query('show databases;') - tdSql.checkData(2,5,'strict') + # tdSql.execute('alter database db strict 1') + # tdSql.query('show databases;') + # tdSql.checkData(2,5,'strict') def getConnection(self, dnode): host = dnode.cfgDict["fqdn"] diff --git a/tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py b/tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py new file mode 100644 index 0000000000..d3de31eb04 --- /dev/null +++ b/tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py @@ -0,0 +1,229 @@ +from ssl import ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE +from numpy import row_stack +import taos +import sys +import time +import os + +from util.log import * +from util.sql import * +from util.cases import * +from util.dnodes import TDDnodes +from util.dnodes import TDDnode +from util.cluster import * +sys.path.append("./6-cluster") +from clusterCommonCreate import * +from clusterCommonCheck import clusterComCheck + +import time +import socket +import subprocess +from multiprocessing import Process +import threading +import time +import inspect +import ctypes + +class TDTestCase: + + def init(self,conn ,logSql): + tdLog.debug(f"start to excute {__file__}") + self.TDDnodes = None + tdSql.init(conn.cursor()) + self.host = socket.gethostname() + + + def getBuildPath(self): + selfPath = os.path.dirname(os.path.realpath(__file__)) + + if ("community" in selfPath): + projPath = selfPath[:selfPath.find("community")] + else: + projPath = selfPath[:selfPath.find("tests")] + + for root, dirs, files in os.walk(projPath): + if ("taosd" in files): + rootRealPath = os.path.dirname(os.path.realpath(root)) + if ("packaging" not in rootRealPath): + buildPath = root[:len(root) - len("/build/bin")] + break + return buildPath + + def _async_raise(self, tid, exctype): + """raises the exception, performs cleanup if needed""" + if not inspect.isclass(exctype): + exctype = type(exctype) + res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(exctype)) + if res == 0: + raise ValueError("invalid thread id") + elif res != 1: + # """if it returns a number greater than one, you're in trouble, + # and you should call it again with exc=NULL to revert the effect""" + ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, None) + raise SystemError("PyThreadState_SetAsyncExc failed") + + def stopThread(self,thread): + self._async_raise(thread.ident, SystemExit) + + + def insertData(self,countstart,countstop): + # fisrt add data : db\stable\childtable\general table + + for couti in range(countstart,countstop): + tdLog.debug("drop database if exists db%d" %couti) + tdSql.execute("drop database if exists db%d" %couti) + print("create database if not exists db%d replica 1 duration 300" %couti) + tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti) + tdSql.execute("use db%d" %couti) + tdSql.execute( + '''create table stb1 + (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) + tags (t1 int) + ''' + ) + tdSql.execute( + ''' + create table t1 + (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) + ''' + ) + for i in range(4): + tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )') + + + def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole): + tdLog.printNoPrefix("======== test case 1: ") + paraDict = {'dbName': 'db0_0', + 'dropFlag': 1, + 'event': '', + 'vgroups': 4, + 'replica': 1, + 'stbName': 'stb', + 'stbNumbers': 2, + 'colPrefix': 'c', + 'tagPrefix': 't', + 'colSchema': [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}], + 'tagSchema': [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}], + 'ctbPrefix': 'ctb', + 'ctbNum': 200, + 'startTs': 1640966400000, # 2022-01-01 00:00:00.000 + "rowsPerTbl": 1000, + "batchNum": 5000 + } + hostname = socket.gethostname() + dnodeNumbers=int(dnodeNumbers) + mnodeNums=int(mnodeNums) + vnodeNumbers = int(dnodeNumbers-mnodeNums) + allctbNumbers=(paraDict['stbNumbers']*paraDict["ctbNum"]) + rowsPerStb=paraDict["ctbNum"]*paraDict["rowsPerTbl"] + rowsall=rowsPerStb*paraDict['stbNumbers'] + dbNumbers = 1 + + tdLog.info("first check dnode and mnode") + tdSql.query("show dnodes;") + tdSql.checkData(0,1,'%s:6030'%self.host) + tdSql.checkData(4,1,'%s:6430'%self.host) + clusterComCheck.checkDnodes(dnodeNumbers) + clusterComCheck.checkMnodeStatus(1) + + # fisr add three mnodes; + tdLog.info("fisr add three mnodes and check mnode status") + tdSql.execute("create mnode on dnode 2") + clusterComCheck.checkMnodeStatus(2) + tdSql.execute("create mnode on dnode 3") + clusterComCheck.checkMnodeStatus(3) + + # add some error operations and + tdLog.info("Confirm the status of the dnode again") + tdSql.error("create mnode on dnode 2") + tdSql.query("show dnodes;") + print(tdSql.queryResult) + clusterComCheck.checkDnodes(dnodeNumbers) + + # create database and stable + clusterComCreate.create_database(tdSql, paraDict["dbName"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']) + tdLog.info("Take turns stopping Mnodes ") + + tdDnodes=cluster.dnodes + # dnode6=cluster.addDnode(6) + # tdDnodes.append(dnode6) + # tdDnodes = ClusterDnodes(tdDnodes) + stopcount =0 + threads=[] + + # create stable:stb_0 + stableName= paraDict['stbName'] + newTdSql=tdCom.newTdSql() + clusterComCreate.create_stables(newTdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']) + #create child table:ctb_0 + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + newTdSql=tdCom.newTdSql() + clusterComCreate.create_ctable(newTdSql, paraDict["dbName"],stableName,stableName, paraDict['ctbNum']) + #insert date + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.insert_data, args=(newTdSql, paraDict["dbName"],stableName,paraDict["ctbNum"],paraDict["rowsPerTbl"],paraDict["batchNum"],paraDict["startTs"]))) + for tr in threads: + tr.start() + dnode6Port=int(6030+5*100) + tdSql.execute("create dnode '%s:%d'"%(hostname,dnode6Port)) + clusterComCheck.checkDnodes(dnodeNumbers) + + while stopcount < restartNumbers: + tdLog.info(" restart loop: %d"%stopcount ) + if stopRole == "mnode": + for i in range(mnodeNums): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + elif stopRole == "vnode": + for i in range(vnodeNumbers): + tdDnodes[i+mnodeNums].stoptaosd() + # sleep(10) + tdDnodes[i+mnodeNums].starttaosd() + # sleep(10) + elif stopRole == "dnode": + for i in range(dnodeNumbers): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + + # dnodeNumbers don't include database of schema + if clusterComCheck.checkDnodes(dnodeNumbers): + tdLog.info("123") + else: + print("456") + + self.stopThread(threads) + tdLog.exit("one or more of dnodes failed to start ") + # self.check3mnode() + stopcount+=1 + for tr in threads: + tr.join() + + + clusterComCheck.checkDnodes(dnodeNumbers) + clusterComCheck.checkDbRows(dbNumbers) + # clusterComCheck.checkDb(dbNumbers,1,paraDict["dbName"]) + + tdSql.execute("use %s" %(paraDict["dbName"])) + tdSql.query("show stables") + tdSql.checkRows(paraDict["stbNumbers"]) + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + tdSql.query("select * from %s"%stableName) + tdSql.checkRows(rowsPerStb) + def run(self): + # print(self.master_dnode.cfgDict) + self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='dnode') + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) \ No newline at end of file diff --git a/tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py b/tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py new file mode 100644 index 0000000000..e5946342d2 --- /dev/null +++ b/tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py @@ -0,0 +1,223 @@ +from ssl import ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE +from numpy import row_stack +import taos +import sys +import time +import os + +from util.log import * +from util.sql import * +from util.cases import * +from util.dnodes import TDDnodes +from util.dnodes import TDDnode +from util.cluster import * +sys.path.append("./6-cluster") +from clusterCommonCreate import * +from clusterCommonCheck import clusterComCheck + +import time +import socket +import subprocess +from multiprocessing import Process +import threading +import time +import inspect +import ctypes + +class TDTestCase: + + def init(self,conn ,logSql): + tdLog.debug(f"start to excute {__file__}") + self.TDDnodes = None + tdSql.init(conn.cursor()) + self.host = socket.gethostname() + + + def getBuildPath(self): + selfPath = os.path.dirname(os.path.realpath(__file__)) + + if ("community" in selfPath): + projPath = selfPath[:selfPath.find("community")] + else: + projPath = selfPath[:selfPath.find("tests")] + + for root, dirs, files in os.walk(projPath): + if ("taosd" in files): + rootRealPath = os.path.dirname(os.path.realpath(root)) + if ("packaging" not in rootRealPath): + buildPath = root[:len(root) - len("/build/bin")] + break + return buildPath + + def _async_raise(self, tid, exctype): + """raises the exception, performs cleanup if needed""" + if not inspect.isclass(exctype): + exctype = type(exctype) + res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(exctype)) + if res == 0: + raise ValueError("invalid thread id") + elif res != 1: + # """if it returns a number greater than one, you're in trouble, + # and you should call it again with exc=NULL to revert the effect""" + ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, None) + raise SystemError("PyThreadState_SetAsyncExc failed") + + def stopThread(self,thread): + self._async_raise(thread.ident, SystemExit) + + + def insertData(self,countstart,countstop): + # fisrt add data : db\stable\childtable\general table + + for couti in range(countstart,countstop): + tdLog.debug("drop database if exists db%d" %couti) + tdSql.execute("drop database if exists db%d" %couti) + print("create database if not exists db%d replica 1 duration 300" %couti) + tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti) + tdSql.execute("use db%d" %couti) + tdSql.execute( + '''create table stb1 + (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) + tags (t1 int) + ''' + ) + tdSql.execute( + ''' + create table t1 + (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) + ''' + ) + for i in range(4): + tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )') + + + def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole): + tdLog.printNoPrefix("======== test case 1: ") + paraDict = {'dbName': 'db0_0', + 'dropFlag': 1, + 'event': '', + 'vgroups': 4, + 'replica': 1, + 'stbName': 'stb', + 'stbNumbers': 2, + 'colPrefix': 'c', + 'tagPrefix': 't', + 'colSchema': [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}], + 'tagSchema': [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}], + 'ctbPrefix': 'ctb', + 'ctbNum': 200, + 'startTs': 1640966400000, # 2022-01-01 00:00:00.000 + "rowsPerTbl": 1000, + "batchNum": 5000 + } + + dnodeNumbers=int(dnodeNumbers) + mnodeNums=int(mnodeNums) + vnodeNumbers = int(dnodeNumbers-mnodeNums) + allctbNumbers=(paraDict['stbNumbers']*paraDict["ctbNum"]) + rowsPerStb=paraDict["ctbNum"]*paraDict["rowsPerTbl"] + rowsall=rowsPerStb*paraDict['stbNumbers'] + dbNumbers = 1 + + tdLog.info("first check dnode and mnode") + tdSql.query("show dnodes;") + tdSql.checkData(0,1,'%s:6030'%self.host) + tdSql.checkData(4,1,'%s:6430'%self.host) + clusterComCheck.checkDnodes(dnodeNumbers) + clusterComCheck.checkMnodeStatus(1) + + # fisr add three mnodes; + tdLog.info("fisr add three mnodes and check mnode status") + tdSql.execute("create mnode on dnode 2") + clusterComCheck.checkMnodeStatus(2) + tdSql.execute("create mnode on dnode 3") + clusterComCheck.checkMnodeStatus(3) + + # add some error operations and + tdLog.info("Confirm the status of the dnode again") + tdSql.error("create mnode on dnode 2") + tdSql.query("show dnodes;") + print(tdSql.queryResult) + clusterComCheck.checkDnodes(dnodeNumbers) + + # create database and stable + clusterComCreate.create_database(tdSql, paraDict["dbName"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']) + tdLog.info("Take turns stopping Mnodes ") + + tdDnodes=cluster.dnodes + stopcount =0 + threads=[] + + # create stable:stb_0 + stableName= paraDict['stbName'] + newTdSql=tdCom.newTdSql() + clusterComCreate.create_stables(newTdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']) + #create child table:ctb_0 + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + newTdSql=tdCom.newTdSql() + clusterComCreate.create_ctable(newTdSql, paraDict["dbName"],stableName,stableName, paraDict['ctbNum']) + #insert date + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.insert_data, args=(newTdSql, paraDict["dbName"],stableName,paraDict["ctbNum"],paraDict["rowsPerTbl"],paraDict["batchNum"],paraDict["startTs"]))) + for tr in threads: + tr.start() + for tr in threads: + tr.join() + + while stopcount < restartNumbers: + tdLog.info(" restart loop: %d"%stopcount ) + if stopRole == "mnode": + for i in range(mnodeNums): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + elif stopRole == "vnode": + for i in range(vnodeNumbers): + tdDnodes[i+mnodeNums].stoptaosd() + # sleep(10) + tdDnodes[i+mnodeNums].starttaosd() + # sleep(10) + elif stopRole == "dnode": + for i in range(dnodeNumbers): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + + # dnodeNumbers don't include database of schema + if clusterComCheck.checkDnodes(dnodeNumbers): + tdLog.info("123") + else: + print("456") + + self.stopThread(threads) + tdLog.exit("one or more of dnodes failed to start ") + # self.check3mnode() + stopcount+=1 + + + clusterComCheck.checkDnodes(dnodeNumbers) + clusterComCheck.checkDbRows(dbNumbers) + # clusterComCheck.checkDb(dbNumbers,1,paraDict["dbName"]) + + tdSql.execute("use %s" %(paraDict["dbName"])) + tdSql.query("show stables") + tdSql.checkRows(paraDict["stbNumbers"]) + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + tdSql.query("select * from %s"%stableName) + tdSql.checkRows(rowsPerStb) + def run(self): + # print(self.master_dnode.cfgDict) + self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='dnode') + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) \ No newline at end of file diff --git a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py index 96fad487d1..8971a51ef3 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py +++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py @@ -143,42 +143,43 @@ class TDTestCase: threads=[] for i in range(restartNumbers): dbNameIndex = '%s%d'%(paraDict["dbName"],i) - threads.append(threading.Thread(target=clusterComCreate.create_databases, args=(tdSql, dbNameIndex,paraDict["dbNumbers"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']))) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.create_databases, args=(newTdSql, dbNameIndex,paraDict["dbNumbers"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']))) for tr in threads: tr.start() tdLog.info("Take turns stopping Mnodes ") - # while stopcount < restartNumbers: - # tdLog.info(" restart loop: %d"%stopcount ) - # if stopRole == "mnode": - # for i in range(mnodeNums): - # tdDnodes[i].stoptaosd() - # # sleep(10) - # tdDnodes[i].starttaosd() - # # sleep(10) - # elif stopRole == "vnode": - # for i in range(vnodeNumbers): - # tdDnodes[i+mnodeNums].stoptaosd() - # # sleep(10) - # tdDnodes[i+mnodeNums].starttaosd() - # # sleep(10) - # elif stopRole == "dnode": - # for i in range(dnodeNumbers): - # tdDnodes[i].stoptaosd() - # # sleep(10) - # tdDnodes[i].starttaosd() - # # sleep(10) + while stopcount < restartNumbers: + tdLog.info(" restart loop: %d"%stopcount ) + if stopRole == "mnode": + for i in range(mnodeNums): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + elif stopRole == "vnode": + for i in range(vnodeNumbers): + tdDnodes[i+mnodeNums].stoptaosd() + # sleep(10) + tdDnodes[i+mnodeNums].starttaosd() + # sleep(10) + elif stopRole == "dnode": + for i in range(dnodeNumbers): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) - # # dnodeNumbers don't include database of schema - # if clusterComCheck.checkDnodes(dnodeNumbers): - # tdLog.info("check dnodes status is ready") - # else: - # tdLog.info("check dnodes status is not ready") - # self.stopThread(threads) - # tdLog.exit("one or more of dnodes failed to start ") - # # self.check3mnode() - # stopcount+=1 + # dnodeNumbers don't include database of schema + if clusterComCheck.checkDnodes(dnodeNumbers): + tdLog.info("check dnodes status is ready") + else: + tdLog.info("check dnodes status is not ready") + self.stopThread(threads) + tdLog.exit("one or more of dnodes failed to start ") + # self.check3mnode() + stopcount+=1 for tr in threads: tr.join() diff --git a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py index 4ab9aa64e1..6db1a9fddd 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py +++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py @@ -92,7 +92,7 @@ class TDTestCase: def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole): tdLog.printNoPrefix("======== test case 1: ") - paraDict = {'dbName': 'db0_0', + paraDict = {'dbName': 'db', 'dropFlag': 1, 'event': '', 'vgroups': 4, @@ -143,7 +143,8 @@ class TDTestCase: threads=[] for i in range(restartNumbers): stableName= '%s%d'%(paraDict['stbName'],i) - threads.append(threading.Thread(target=clusterComCreate.create_stables, args=(tdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']))) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.create_stables, args=(newTdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']))) for tr in threads: tr.start() diff --git a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeInsertData.py b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeInsertData.py new file mode 100644 index 0000000000..8f99ef0b5c --- /dev/null +++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeInsertData.py @@ -0,0 +1,221 @@ +from ssl import ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE +from numpy import row_stack +import taos +import sys +import time +import os + +from util.log import * +from util.sql import * +from util.cases import * +from util.dnodes import TDDnodes +from util.dnodes import TDDnode +from util.cluster import * +sys.path.append("./6-cluster") +from clusterCommonCreate import * +from clusterCommonCheck import clusterComCheck + +import time +import socket +import subprocess +from multiprocessing import Process +import threading +import time +import inspect +import ctypes + +class TDTestCase: + + def init(self,conn ,logSql): + tdLog.debug(f"start to excute {__file__}") + self.TDDnodes = None + tdSql.init(conn.cursor()) + self.host = socket.gethostname() + + + def getBuildPath(self): + selfPath = os.path.dirname(os.path.realpath(__file__)) + + if ("community" in selfPath): + projPath = selfPath[:selfPath.find("community")] + else: + projPath = selfPath[:selfPath.find("tests")] + + for root, dirs, files in os.walk(projPath): + if ("taosd" in files): + rootRealPath = os.path.dirname(os.path.realpath(root)) + if ("packaging" not in rootRealPath): + buildPath = root[:len(root) - len("/build/bin")] + break + return buildPath + + def _async_raise(self, tid, exctype): + """raises the exception, performs cleanup if needed""" + if not inspect.isclass(exctype): + exctype = type(exctype) + res = ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, ctypes.py_object(exctype)) + if res == 0: + raise ValueError("invalid thread id") + elif res != 1: + # """if it returns a number greater than one, you're in trouble, + # and you should call it again with exc=NULL to revert the effect""" + ctypes.pythonapi.PyThreadState_SetAsyncExc(tid, None) + raise SystemError("PyThreadState_SetAsyncExc failed") + + def stopThread(self,thread): + self._async_raise(thread.ident, SystemExit) + + + def insertData(self,countstart,countstop): + # fisrt add data : db\stable\childtable\general table + + for couti in range(countstart,countstop): + tdLog.debug("drop database if exists db%d" %couti) + tdSql.execute("drop database if exists db%d" %couti) + print("create database if not exists db%d replica 1 duration 300" %couti) + tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti) + tdSql.execute("use db%d" %couti) + tdSql.execute( + '''create table stb1 + (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) + tags (t1 int) + ''' + ) + tdSql.execute( + ''' + create table t1 + (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) + ''' + ) + for i in range(4): + tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )') + + + def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole): + tdLog.printNoPrefix("======== test case 1: ") + paraDict = {'dbName': 'db0_0', + 'dropFlag': 1, + 'event': '', + 'vgroups': 4, + 'replica': 1, + 'stbName': 'stb', + 'stbNumbers': 2, + 'colPrefix': 'c', + 'tagPrefix': 't', + 'colSchema': [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}], + 'tagSchema': [{'type': 'INT', 'count':1}, {'type': 'binary', 'len':20, 'count':1}], + 'ctbPrefix': 'ctb', + 'ctbNum': 200, + 'startTs': 1640966400000, # 2022-01-01 00:00:00.000 + "rowsPerTbl": 10000, + "batchNum": 5000 + } + + dnodeNumbers=int(dnodeNumbers) + mnodeNums=int(mnodeNums) + vnodeNumbers = int(dnodeNumbers-mnodeNums) + allctbNumbers=(paraDict['stbNumbers']*paraDict["ctbNum"]) + rowsPerStb=paraDict["ctbNum"]*paraDict["rowsPerTbl"] + rowsall=rowsPerStb*paraDict['stbNumbers'] + dbNumbers = 1 + + tdLog.info("first check dnode and mnode") + tdSql.query("show dnodes;") + tdSql.checkData(0,1,'%s:6030'%self.host) + tdSql.checkData(4,1,'%s:6430'%self.host) + clusterComCheck.checkDnodes(dnodeNumbers) + clusterComCheck.checkMnodeStatus(1) + + # fisr add three mnodes; + tdLog.info("fisr add three mnodes and check mnode status") + tdSql.execute("create mnode on dnode 2") + clusterComCheck.checkMnodeStatus(2) + tdSql.execute("create mnode on dnode 3") + clusterComCheck.checkMnodeStatus(3) + + # add some error operations and + tdLog.info("Confirm the status of the dnode again") + tdSql.error("create mnode on dnode 2") + tdSql.query("show dnodes;") + print(tdSql.queryResult) + clusterComCheck.checkDnodes(dnodeNumbers) + + # create database and stable + clusterComCreate.create_database(tdSql, paraDict["dbName"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']) + tdLog.info("Take turns stopping Mnodes ") + + tdDnodes=cluster.dnodes + stopcount =0 + threads=[] + + # create stable:stb_0 + stableName= paraDict['stbName'] + newTdSql=tdCom.newTdSql() + clusterComCreate.create_stables(newTdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']) + #create child table:ctb_0 + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + newTdSql=tdCom.newTdSql() + clusterComCreate.create_ctable(newTdSql, paraDict["dbName"],stableName,stableName, paraDict['ctbNum']) + #insert date + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.insert_data, args=(newTdSql, paraDict["dbName"],stableName,paraDict["ctbNum"],paraDict["rowsPerTbl"],paraDict["batchNum"],paraDict["startTs"]))) + for tr in threads: + tr.start() + while stopcount < restartNumbers: + tdLog.info(" restart loop: %d"%stopcount ) + if stopRole == "mnode": + for i in range(mnodeNums): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + elif stopRole == "vnode": + for i in range(vnodeNumbers): + tdDnodes[i+mnodeNums].stoptaosd() + # sleep(10) + tdDnodes[i+mnodeNums].starttaosd() + # sleep(10) + elif stopRole == "dnode": + for i in range(dnodeNumbers): + tdDnodes[i].stoptaosd() + # sleep(10) + tdDnodes[i].starttaosd() + # sleep(10) + + # dnodeNumbers don't include database of schema + if clusterComCheck.checkDnodes(dnodeNumbers): + tdLog.info("123") + else: + print("456") + + self.stopThread(threads) + tdLog.exit("one or more of dnodes failed to start ") + # self.check3mnode() + stopcount+=1 + + for tr in threads: + tr.join() + clusterComCheck.checkDnodes(dnodeNumbers) + clusterComCheck.checkDbRows(dbNumbers) + # clusterComCheck.checkDb(dbNumbers,1,paraDict["dbName"]) + + tdSql.execute("use %s" %(paraDict["dbName"])) + tdSql.query("show stables") + tdSql.checkRows(paraDict["stbNumbers"]) + for i in range(paraDict['stbNumbers']): + stableName= '%s_%d'%(paraDict['stbName'],i) + tdSql.query("select * from %s"%stableName) + tdSql.checkRows(rowsPerStb) + def run(self): + # print(self.master_dnode.cfgDict) + self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='dnode') + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) \ No newline at end of file diff --git a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py index 17c344e341..f820d812ec 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py +++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py @@ -116,7 +116,8 @@ class TDTestCase: threads=[] for i in range(restartNumbers): dbNameIndex = '%s%d'%(paraDict["dbName"],i) - threads.append(threading.Thread(target=clusterComCreate.create_databases, args=(tdSql, dbNameIndex,paraDict["dbNumbers"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']))) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.create_databases, args=(newTdSql, dbNameIndex,paraDict["dbNumbers"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica']))) for tr in threads: tr.start() diff --git a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py index 2f1c1368d1..128dc10b37 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py +++ b/tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py @@ -30,8 +30,8 @@ class TDTestCase: self.TDDnodes = None tdSql.init(conn.cursor()) self.host = socket.gethostname() - - + print(tdSql) + def getBuildPath(self): selfPath = os.path.dirname(os.path.realpath(__file__)) @@ -113,6 +113,7 @@ class TDTestCase: allStbNumbers=(paraDict['stbNumbers']*restartNumbers) dbNumbers = 1 + print(tdSql) tdLog.info("first check dnode and mnode") tdSql.query("show dnodes;") tdSql.checkData(0,1,'%s:6030'%self.host) @@ -141,9 +142,11 @@ class TDTestCase: tdDnodes=cluster.dnodes stopcount =0 threads=[] + for i in range(restartNumbers): stableName= '%s%d'%(paraDict['stbName'],i) - threads.append(threading.Thread(target=clusterComCreate.create_stables, args=(tdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']))) + newTdSql=tdCom.newTdSql() + threads.append(threading.Thread(target=clusterComCreate.create_stables, args=(newTdSql, paraDict["dbName"],stableName,paraDict['stbNumbers']))) for tr in threads: tr.start() diff --git a/tests/system-test/6-cluster/clusterCommonCreate.py b/tests/system-test/6-cluster/clusterCommonCreate.py index 9d3f74a2e3..851fe3b51c 100644 --- a/tests/system-test/6-cluster/clusterCommonCreate.py +++ b/tests/system-test/6-cluster/clusterCommonCreate.py @@ -152,7 +152,7 @@ class ClusterComCreate: if (i % 2 == 0): tagValue = 'shanghai' - sql += " %s%d using %s tags(%d, '%s')"%(ctbPrefix,i,stbName,i+1, tagValue) + sql += " %s_%d using %s tags(%d, '%s')"%(ctbPrefix,i,stbName,i+1, tagValue) if (i > 0) and (i%100 == 0): tsql.execute(sql) sql = pre_create @@ -173,13 +173,13 @@ class ClusterComCreate: startTs = int(round(t * 1000)) #tdLog.debug("doing insert data into stable:%s rows:%d ..."%(stbName, allRows)) for i in range(ctbNum): - sql += " %s%d values "%(stbName,i) + sql += " %s_%d values "%(stbName,i) for j in range(rowsPerTbl): - sql += "(%d, %d, 'tmqrow_%d') "%(startTs + j, j, j) + sql += "(%d, %d, %d, 'mnode_%d') "%(startTs + j, j, j,j) if (j > 0) and ((j%batchNum == 0) or (j == rowsPerTbl - 1)): tsql.execute(sql) if j < rowsPerTbl - 1: - sql = "insert into %s%d values " %(stbName,i) + sql = "insert into %s_%d values " %(stbName,i) else: sql = "insert into " #end sql diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 1e305f2518..0aa9e395db 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -122,7 +122,7 @@ python3 ./test.py -f 2-query/irate.py python3 ./test.py -f 2-query/function_null.py python3 ./test.py -f 2-query/queryQnode.py -#python3 ./test.py -f 6-cluster/5dnode1mnode.py +python3 ./test.py -f 6-cluster/5dnode1mnode.py #python3 ./test.py -f 6-cluster/5dnode2mnode.py -N 5 -M 3 #python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3 #python3 ./test.py -f 6-cluster/5dnode3mnodeStopLoop.py -N 5 -M 3 @@ -135,7 +135,8 @@ python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py -N 5 - # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeStopInsert.py # python3 ./test.py -f 6-cluster/5dnode3mnodeDrop.py -N 5 # python3 test.py -f 6-cluster/5dnode3mnodeStopConnect.py -N 5 -M 3 - +python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 6 -M 3 -C 5 +python3 ./test.py -f 6-cluster/5dnode3mnodeRestartDnodeInsertData.py -N 5 -M 3 python3 ./test.py -f 7-tmq/basic5.py python3 ./test.py -f 7-tmq/subscribeDb.py From a64a0320a0d9169b5dd5e3ff9a99df3f906f2595 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Sun, 10 Jul 2022 15:21:16 +0800 Subject: [PATCH 06/25] fix: some problem of parser and planner --- include/libs/nodes/querynodes.h | 2 + source/libs/function/src/functionMgt.c | 2 +- source/libs/parser/src/parTranslater.c | 106 +++++++----------- source/libs/parser/test/parSelectTest.cpp | 6 +- source/libs/planner/test/planPartByTest.cpp | 2 + tests/system-test/1-insert/time_range_wise.py | 10 +- 6 files changed, 56 insertions(+), 72 deletions(-) diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h index b9a0b90a9a..bbff34c66f 100644 --- a/include/libs/nodes/querynodes.h +++ b/include/libs/nodes/querynodes.h @@ -250,6 +250,7 @@ typedef struct SSelectStmt { SLimitNode* pSlimit; char stmtName[TSDB_TABLE_NAME_LEN]; uint8_t precision; + int32_t selectFuncNum; bool isEmptyResult; bool isTimeLineResult; bool hasAggFuncs; @@ -257,6 +258,7 @@ typedef struct SSelectStmt { bool hasIndefiniteRowsFunc; bool hasSelectFunc; bool hasSelectValFunc; + bool hasOtherVectorFunc; bool hasUniqueFunc; bool hasTailFunc; bool hasInterpFunc; diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c index 262adc5d6f..1da9d4a70f 100644 --- a/source/libs/function/src/functionMgt.c +++ b/source/libs/function/src/functionMgt.c @@ -139,7 +139,7 @@ bool fmIsAggFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MG bool fmIsScalarFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MGT_SCALAR_FUNC); } -bool fmIsVectorFunc(int32_t funcId) { return !fmIsScalarFunc(funcId); } +bool fmIsVectorFunc(int32_t funcId) { return !fmIsScalarFunc(funcId) && !fmIsScanPseudoColumnFunc(funcId); } bool fmIsSelectFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MGT_SELECT_FUNC); } diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 6beb06bf45..8e6798dcd2 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -1186,6 +1186,12 @@ static void setFuncClassification(SNode* pCurrStmt, SFunctionNode* pFunc) { pSelect->hasAggFuncs = pSelect->hasAggFuncs ? true : fmIsAggFunc(pFunc->funcId); pSelect->hasRepeatScanFuncs = pSelect->hasRepeatScanFuncs ? true : fmIsRepeatScanFunc(pFunc->funcId); pSelect->hasIndefiniteRowsFunc = pSelect->hasIndefiniteRowsFunc ? true : fmIsIndefiniteRowsFunc(pFunc->funcId); + if (fmIsSelectFunc(pFunc->funcId)) { + pSelect->hasSelectFunc = true; + ++(pSelect->selectFuncNum); + } else if (fmIsAggFunc(pFunc->funcId) || fmIsIndefiniteRowsFunc(pFunc->funcId)) { + pSelect->hasOtherVectorFunc = true; + } pSelect->hasUniqueFunc = pSelect->hasUniqueFunc ? true : (FUNCTION_TYPE_UNIQUE == pFunc->funcType); pSelect->hasTailFunc = pSelect->hasTailFunc ? true : (FUNCTION_TYPE_TAIL == pFunc->funcType); pSelect->hasInterpFunc = pSelect->hasInterpFunc ? true : (FUNCTION_TYPE_INTERP == pFunc->funcType); @@ -1395,16 +1401,12 @@ static int32_t getGroupByErrorCode(STranslateContext* pCxt) { if (isDistinctOrderBy(pCxt)) { return TSDB_CODE_PAR_NOT_SELECTED_EXPRESSION; } - return TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION; + if (isSelectStmt(pCxt->pCurrStmt) && NULL != ((SSelectStmt*)pCxt->pCurrStmt)->pGroupByList) { + return TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION; + } + return TSDB_CODE_PAR_NO_VALID_FUNC_IN_WIN; } -typedef struct SCheckExprForGroupByCxt { - STranslateContext* pTranslateCxt; - int32_t selectFuncNum; - bool hasSelectValFunc; - bool hasOtherAggFunc; -} SCheckExprForGroupByCxt; - static EDealRes rewriteColToSelectValFunc(STranslateContext* pCxt, SNode** pNode) { SFunctionNode* pFunc = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION); if (NULL == pFunc) { @@ -1445,67 +1447,49 @@ static EDealRes rewriteExprToGroupKeyFunc(STranslateContext* pCxt, SNode** pNode } static EDealRes doCheckExprForGroupBy(SNode** pNode, void* pContext) { - SCheckExprForGroupByCxt* pCxt = (SCheckExprForGroupByCxt*)pContext; + STranslateContext* pCxt = (STranslateContext*)pContext; + SSelectStmt* pSelect = (SSelectStmt*)pCxt->pCurrStmt; if (!nodesIsExprNode(*pNode) || isAliasColumn(*pNode)) { return DEAL_RES_CONTINUE; } - if (isSelectFunc(*pNode)) { - ++(pCxt->selectFuncNum); - } else if (isAggFunc(*pNode)) { - pCxt->hasOtherAggFunc = true; - } - if ((pCxt->selectFuncNum > 1 && pCxt->hasSelectValFunc) || (pCxt->hasOtherAggFunc && pCxt->hasSelectValFunc)) { - return generateDealNodeErrMsg(pCxt->pTranslateCxt, getGroupByErrorCode(pCxt->pTranslateCxt)); - } - if (isAggFunc(*pNode) && !isDistinctOrderBy(pCxt->pTranslateCxt)) { + if (isVectorFunc(*pNode) && !isDistinctOrderBy(pCxt)) { return DEAL_RES_IGNORE_CHILD; } SNode* pGroupNode = NULL; - FOREACH(pGroupNode, getGroupByList(pCxt->pTranslateCxt)) { + FOREACH(pGroupNode, getGroupByList(pCxt)) { if (nodesEqualNode(getGroupByNode(pGroupNode), *pNode)) { return DEAL_RES_IGNORE_CHILD; } } SNode* pPartKey = NULL; - FOREACH(pPartKey, ((SSelectStmt*)pCxt->pTranslateCxt->pCurrStmt)->pPartitionByList) { + FOREACH(pPartKey, pSelect->pPartitionByList) { if (nodesEqualNode(pPartKey, *pNode)) { - return rewriteExprToGroupKeyFunc(pCxt->pTranslateCxt, pNode); + return rewriteExprToGroupKeyFunc(pCxt, pNode); } } if (isScanPseudoColumnFunc(*pNode) || QUERY_NODE_COLUMN == nodeType(*pNode)) { - if (pCxt->selectFuncNum > 1 || pCxt->hasOtherAggFunc) { - return generateDealNodeErrMsg(pCxt->pTranslateCxt, getGroupByErrorCode(pCxt->pTranslateCxt)); + if (pSelect->selectFuncNum > 1 || pSelect->hasOtherVectorFunc || !pSelect->hasSelectFunc) { + return generateDealNodeErrMsg(pCxt, getGroupByErrorCode(pCxt)); } else { - pCxt->hasSelectValFunc = true; - return rewriteColToSelectValFunc(pCxt->pTranslateCxt, pNode); + return rewriteColToSelectValFunc(pCxt, pNode); } } - if (isAggFunc(*pNode) && isDistinctOrderBy(pCxt->pTranslateCxt)) { - return generateDealNodeErrMsg(pCxt->pTranslateCxt, getGroupByErrorCode(pCxt->pTranslateCxt)); + if (isVectorFunc(*pNode) && isDistinctOrderBy(pCxt)) { + return generateDealNodeErrMsg(pCxt, getGroupByErrorCode(pCxt)); } return DEAL_RES_CONTINUE; } static int32_t checkExprForGroupBy(STranslateContext* pCxt, SNode** pNode) { - SCheckExprForGroupByCxt cxt = { - .pTranslateCxt = pCxt, .selectFuncNum = 0, .hasSelectValFunc = false, .hasOtherAggFunc = false}; - nodesRewriteExpr(pNode, doCheckExprForGroupBy, &cxt); - if (cxt.selectFuncNum != 1 && cxt.hasSelectValFunc) { - return generateSyntaxErrMsg(&pCxt->msgBuf, getGroupByErrorCode(pCxt)); - } + nodesRewriteExpr(pNode, doCheckExprForGroupBy, pCxt); return pCxt->errCode; } -static int32_t checkExprListForGroupBy(STranslateContext* pCxt, SNodeList* pList) { - if (NULL == getGroupByList(pCxt)) { +static int32_t checkExprListForGroupBy(STranslateContext* pCxt, SSelectStmt* pSelect, SNodeList* pList) { + if (NULL == getGroupByList(pCxt) && NULL == pSelect->pWindow) { return TSDB_CODE_SUCCESS; } - SCheckExprForGroupByCxt cxt = { - .pTranslateCxt = pCxt, .selectFuncNum = 0, .hasSelectValFunc = false, .hasOtherAggFunc = false}; - nodesRewriteExprs(pList, doCheckExprForGroupBy, &cxt); - if (cxt.selectFuncNum != 1 && cxt.hasSelectValFunc) { - return generateSyntaxErrMsg(&pCxt->msgBuf, getGroupByErrorCode(pCxt)); - } + nodesRewriteExprs(pList, doCheckExprForGroupBy, pCxt); return pCxt->errCode; } @@ -1529,7 +1513,6 @@ static int32_t rewriteColsToSelectValFunc(STranslateContext* pCxt, SSelectStmt* typedef struct CheckAggColCoexistCxt { STranslateContext* pTranslateCxt; - bool existVectorFunc; bool existCol; int32_t selectFuncNum; bool existOtherVectorFunc; @@ -1537,13 +1520,12 @@ typedef struct CheckAggColCoexistCxt { static EDealRes doCheckAggColCoexist(SNode** pNode, void* pContext) { CheckAggColCoexistCxt* pCxt = (CheckAggColCoexistCxt*)pContext; - if (isSelectFunc(*pNode)) { - ++(pCxt->selectFuncNum); - } else if (isAggFunc(*pNode)) { - pCxt->existOtherVectorFunc = true; - } if (isVectorFunc(*pNode)) { - pCxt->existVectorFunc = true; + if (isSelectFunc(*pNode)) { + ++(pCxt->selectFuncNum); + } else { + pCxt->existOtherVectorFunc = true; + } return DEAL_RES_IGNORE_CHILD; } SNode* pPartKey = NULL; @@ -1559,14 +1541,12 @@ static EDealRes doCheckAggColCoexist(SNode** pNode, void* pContext) { } static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect) { - if (NULL != pSelect->pGroupByList) { + if (NULL != pSelect->pGroupByList || NULL != pSelect->pWindow || + (!pSelect->hasAggFuncs && !pSelect->hasIndefiniteRowsFunc)) { return TSDB_CODE_SUCCESS; } - CheckAggColCoexistCxt cxt = {.pTranslateCxt = pCxt, - .existVectorFunc = false, - .existCol = false, - .selectFuncNum = 0, - .existOtherVectorFunc = false}; + CheckAggColCoexistCxt cxt = { + .pTranslateCxt = pCxt, .existCol = false, .selectFuncNum = 0, .existOtherVectorFunc = false}; nodesRewriteExprs(pSelect->pProjectionList, doCheckAggColCoexist, &cxt); if (!pSelect->isDistinct) { nodesRewriteExprs(pSelect->pOrderByList, doCheckAggColCoexist, &cxt); @@ -1574,7 +1554,7 @@ static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect) if (1 == cxt.selectFuncNum && !cxt.existOtherVectorFunc) { return rewriteColsToSelectValFunc(pCxt, pSelect); } - if ((cxt.selectFuncNum > 1 || cxt.existVectorFunc || NULL != pSelect->pWindow) && cxt.existCol) { + if (cxt.existCol) { return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_SINGLE_GROUP); } return TSDB_CODE_SUCCESS; @@ -2056,7 +2036,7 @@ static int32_t translateOrderBy(STranslateContext* pCxt, SSelectStmt* pSelect) { pCxt->currClause = SQL_CLAUSE_ORDER_BY; code = translateExprList(pCxt, pSelect->pOrderByList); if (TSDB_CODE_SUCCESS == code) { - code = checkExprListForGroupBy(pCxt, pSelect->pOrderByList); + code = checkExprListForGroupBy(pCxt, pSelect, pSelect->pOrderByList); } } return code; @@ -2069,7 +2049,7 @@ static int32_t translateSelectList(STranslateContext* pCxt, SSelectStmt* pSelect code = translateStar(pCxt, pSelect); } if (TSDB_CODE_SUCCESS == code) { - code = checkExprListForGroupBy(pCxt, pSelect->pProjectionList); + code = checkExprListForGroupBy(pCxt, pSelect, pSelect->pProjectionList); } return code; } @@ -5264,8 +5244,8 @@ static int32_t serializeVgroupCreateTableBatch(SVgroupCreateTableBatch* pTbBatch } static void destroyCreateTbReqBatch(void* data) { - SVgroupCreateTableBatch* pTbBatch = (SVgroupCreateTableBatch*) data; - size_t size = taosArrayGetSize(pTbBatch->req.pArray); + SVgroupCreateTableBatch* pTbBatch = (SVgroupCreateTableBatch*)data; + size_t size = taosArrayGetSize(pTbBatch->req.pArray); for (int32_t i = 0; i < size; ++i) { SVCreateTbReq* pTableReq = taosArrayGet(pTbBatch->req.pArray, i); taosMemoryFreeClear(pTableReq->name); @@ -5347,10 +5327,10 @@ static int32_t rewriteCreateTable(STranslateContext* pCxt, SQuery* pQuery) { static void addCreateTbReqIntoVgroup(int32_t acctId, SHashObj* pVgroupHashmap, SCreateSubTableClause* pStmt, const STag* pTag, uint64_t suid, SVgroupInfo* pVgInfo) { -// char dbFName[TSDB_DB_FNAME_LEN] = {0}; -// SName name = {.type = TSDB_DB_NAME_T, .acctId = acctId}; -// strcpy(name.dbname, pStmt->dbName); -// tNameGetFullDbName(&name, dbFName); + // char dbFName[TSDB_DB_FNAME_LEN] = {0}; + // SName name = {.type = TSDB_DB_NAME_T, .acctId = acctId}; + // strcpy(name.dbname, pStmt->dbName); + // tNameGetFullDbName(&name, dbFName); struct SVCreateTbReq req = {0}; req.type = TD_CHILD_TABLE; diff --git a/source/libs/parser/test/parSelectTest.cpp b/source/libs/parser/test/parSelectTest.cpp index 4ca2dec299..c6d74c5305 100644 --- a/source/libs/parser/test/parSelectTest.cpp +++ b/source/libs/parser/test/parSelectTest.cpp @@ -144,9 +144,9 @@ TEST_F(ParserSelectTest, IndefiniteRowsFunc) { TEST_F(ParserSelectTest, IndefiniteRowsFuncSemanticCheck) { useDb("root", "test"); - run("SELECT DIFF(c1), c2 FROM t1", TSDB_CODE_PAR_NOT_ALLOWED_FUNC); + run("SELECT DIFF(c1), c2 FROM t1", TSDB_CODE_PAR_NOT_SINGLE_GROUP); - run("SELECT DIFF(c1), tbname FROM t1", TSDB_CODE_PAR_NOT_ALLOWED_FUNC); + run("SELECT DIFF(c1), tbname FROM t1", TSDB_CODE_PAR_NOT_SINGLE_GROUP); run("SELECT DIFF(c1), count(*) FROM t1", TSDB_CODE_PAR_NOT_ALLOWED_FUNC); @@ -273,7 +273,7 @@ TEST_F(ParserSelectTest, interval) { TEST_F(ParserSelectTest, intervalSemanticCheck) { useDb("root", "test"); - run("SELECT c1 FROM t1 INTERVAL(10s)", TSDB_CODE_PAR_NOT_SINGLE_GROUP); + run("SELECT c1 FROM t1 INTERVAL(10s)", TSDB_CODE_PAR_NO_VALID_FUNC_IN_WIN); run("SELECT DISTINCT c1, c2 FROM t1 WHERE c1 > 3 INTERVAL(1d) FILL(NEXT)", TSDB_CODE_PAR_INVALID_FILL_TIME_RANGE); run("SELECT HISTOGRAM(c1, 'log_bin', '{\"start\": -33,\"factor\": 55,\"count\": 5,\"infinity\": false}', 1) FROM t1 " "WHERE ts > TIMESTAMP '2022-04-01 00:00:00' and ts < TIMESTAMP '2022-04-30 23:59:59' INTERVAL(10s) FILL(NULL)", diff --git a/source/libs/planner/test/planPartByTest.cpp b/source/libs/planner/test/planPartByTest.cpp index 2abcb44dfd..3b71ae3b88 100644 --- a/source/libs/planner/test/planPartByTest.cpp +++ b/source/libs/planner/test/planPartByTest.cpp @@ -35,6 +35,8 @@ TEST_F(PlanPartitionByTest, withAggFunc) { run("select count(*) from t1 partition by c1"); + run("select count(*) from st1 partition by c1"); + run("select count(*), c1 from t1 partition by c1"); } diff --git a/tests/system-test/1-insert/time_range_wise.py b/tests/system-test/1-insert/time_range_wise.py index a620a4b51a..2596f82476 100644 --- a/tests/system-test/1-insert/time_range_wise.py +++ b/tests/system-test/1-insert/time_range_wise.py @@ -614,12 +614,12 @@ class TDTestCase: self.__insert_data() self.all_test() - tdLog.printNoPrefix("==========step2:create table in rollup database") - tdSql.execute("create database db3 retentions 1s:4m,2s:8m,3s:12m") - tdSql.execute("use db3") + #tdLog.printNoPrefix("==========step2:create table in rollup database") + #tdSql.execute("create database db3 retentions 1s:4m,2s:8m,3s:12m") + #tdSql.execute("use db3") # self.__create_tb() - tdSql.execute(f"create stable stb1 ({PRIMARY_COL} timestamp, {INT_COL} int) tags (tag1 int) rollup(first) watermark 5s max_delay 1m sma({INT_COL}) ") - self.all_test() + #tdSql.execute(f"create stable stb1 ({PRIMARY_COL} timestamp, {INT_COL} int) tags (tag1 int) rollup(first) watermark 5s max_delay 1m sma({INT_COL}) ") + #self.all_test() # self.__insert_data() From ee3ceccb0aabb57f08a566d04d04e3bcb8f1c228 Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Sun, 10 Jul 2022 16:05:21 +0800 Subject: [PATCH 07/25] fix(sync): vnode snapshot sender --- source/dnode/vnode/src/vnd/vnodeSync.c | 40 +++++++++++++++++++ source/libs/sync/src/syncAppendEntriesReply.c | 8 ++-- .../tsim/sync/vnodesnapshot-restart.sim | 2 +- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c index d49c307233..1508b67f5e 100644 --- a/source/dnode/vnode/src/vnd/vnodeSync.c +++ b/source/dnode/vnode/src/vnd/vnodeSync.c @@ -450,42 +450,81 @@ static void vnodeSyncRollBackMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta syncUtilState2String(cbMeta.state), pMsg->msgType, TMSG_INFO(pMsg->msgType)); } +#define USE_TSDB_SNAPSHOT + static int32_t vnodeSnapshotStartRead(struct SSyncFSM *pFsm, void *pParam, void **ppReader) { +#ifdef USE_TSDB_SNAPSHOT SVnode *pVnode = pFsm->data; SSnapshotParam *pSnapshotParam = pParam; int32_t code = vnodeSnapReaderOpen(pVnode, pSnapshotParam->start, pSnapshotParam->end, (SVSnapReader **)ppReader); return code; +#else + *ppReader = taosMemoryMalloc(32); + return 0; +#endif } static int32_t vnodeSnapshotStopRead(struct SSyncFSM *pFsm, void *pReader) { +#ifdef USE_TSDB_SNAPSHOT SVnode *pVnode = pFsm->data; int32_t code = vnodeSnapReaderClose(pReader); return code; +#else + taosMemoryFree(pReader); + return 0; +#endif } static int32_t vnodeSnapshotDoRead(struct SSyncFSM *pFsm, void *pReader, void **ppBuf, int32_t *len) { +#ifdef USE_TSDB_SNAPSHOT SVnode *pVnode = pFsm->data; int32_t code = vnodeSnapRead(pReader, (uint8_t **)ppBuf, len); return code; +#else + static int32_t times = 0; + if (times++ < 5) { + *len = 64; + *ppBuf = taosMemoryMalloc(*len); + snprintf(*ppBuf, *len, "snapshot block %d", times); + } else { + *len = 0; + *ppBuf = NULL; + } + return 0; +#endif } static int32_t vnodeSnapshotStartWrite(struct SSyncFSM *pFsm, void *pParam, void **ppWriter) { +#ifdef USE_TSDB_SNAPSHOT SVnode *pVnode = pFsm->data; SSnapshotParam *pSnapshotParam = pParam; int32_t code = vnodeSnapWriterOpen(pVnode, pSnapshotParam->start, pSnapshotParam->end, (SVSnapWriter **)ppWriter); return code; +#else + *ppWriter = taosMemoryMalloc(32); + return 0; +#endif } static int32_t vnodeSnapshotStopWrite(struct SSyncFSM *pFsm, void *pWriter, bool isApply) { +#ifdef USE_TSDB_SNAPSHOT SVnode *pVnode = pFsm->data; int32_t code = vnodeSnapWriterClose(pWriter, !isApply); return code; +#else + taosMemoryFree(pWriter); + return 0; +#endif } static int32_t vnodeSnapshotDoWrite(struct SSyncFSM *pFsm, void *pWriter, void *pBuf, int32_t len) { +#ifdef USE_TSDB_SNAPSHOT SVnode *pVnode = pFsm->data; int32_t code = vnodeSnapWrite(pWriter, pBuf, len); return code; +#else + return 0; +#endif } static SSyncFSM *vnodeSyncMakeFsm(SVnode *pVnode) { @@ -509,6 +548,7 @@ static SSyncFSM *vnodeSyncMakeFsm(SVnode *pVnode) { int32_t vnodeSyncOpen(SVnode *pVnode, char *path) { SSyncInfo syncInfo = { + //.snapshotStrategy = SYNC_STRATEGY_WAL_FIRST, .snapshotStrategy = SYNC_STRATEGY_NO_SNAPSHOT, .batchSize = 10, .vgId = pVnode->config.vgId, diff --git a/source/libs/sync/src/syncAppendEntriesReply.c b/source/libs/sync/src/syncAppendEntriesReply.c index 153f18da86..c18c2b4d38 100644 --- a/source/libs/sync/src/syncAppendEntriesReply.c +++ b/source/libs/sync/src/syncAppendEntriesReply.c @@ -235,10 +235,10 @@ int32_t syncNodeOnAppendEntriesReplySnapshot2Cb(SSyncNode* ths, SyncAppendEntrie // do nothing } else { - SSyncRaftEntry* pEntry; - int32_t code = ths->pLogStore->syncLogGetEntry(ths->pLogStore, nextIndex, &pEntry); - ASSERT(code == 0); - syncNodeStartSnapshotOnce(ths, SYNC_INDEX_BEGIN, nextIndex, pEntry->term, pMsg); + SSnapshot oldSnapshot; + ths->pFsm->FpGetSnapshotInfo(ths->pFsm, &oldSnapshot); + SyncTerm newSnapshotTerm = oldSnapshot.lastApplyTerm; + syncNodeStartSnapshotOnce(ths, SYNC_INDEX_BEGIN, nextIndex, newSnapshotTerm, pMsg); // get sender SSyncSnapshotSender* pSender = syncNodeGetSnapshotSender(ths, &(pMsg->srcId)); diff --git a/tests/script/tsim/sync/vnodesnapshot-restart.sim b/tests/script/tsim/sync/vnodesnapshot-restart.sim index 3ed82fdfe7..b44191071d 100644 --- a/tests/script/tsim/sync/vnodesnapshot-restart.sim +++ b/tests/script/tsim/sync/vnodesnapshot-restart.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/cfg.sh -n dnode1 -c supportVnodes -v 0 +#system sh/cfg.sh -n dnode1 -c supportVnodes -v 0 system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode2 -s start From 4d99188ee84fe8787bbaedd49d35ad44861a190e Mon Sep 17 00:00:00 2001 From: tomchon Date: Sun, 10 Jul 2022 16:12:09 +0800 Subject: [PATCH 08/25] test:modify testcase of qnode --- tests/pytest/util/cluster.py | 5 +++-- tests/system-test/2-query/queryQnode.py | 29 ++++++++++--------------- tests/system-test/fulltest.sh | 6 ++--- tests/system-test/test.py | 24 +++++++++++++++----- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/tests/pytest/util/cluster.py b/tests/pytest/util/cluster.py index efa83323a4..e892e1cc02 100644 --- a/tests/pytest/util/cluster.py +++ b/tests/pytest/util/cluster.py @@ -58,9 +58,10 @@ class ConfigureyCluster: self.dnodes.append(dnode) return self.dnodes - def create_dnode(self,conn): + def create_dnode(self,conn,dnodeNum): tdSql.init(conn.cursor()) - for dnode in self.dnodes[1:]: + dnodeNum=int(dnodeNum) + for dnode in self.dnodes[1:dnodeNum]: # print(dnode.cfgDict) dnode_id = dnode.cfgDict["fqdn"] + ":" +dnode.cfgDict["serverPort"] tdSql.execute(" create dnode '%s';"%dnode_id) diff --git a/tests/system-test/2-query/queryQnode.py b/tests/system-test/2-query/queryQnode.py index d9976d8f3e..8b893a93d7 100644 --- a/tests/system-test/2-query/queryQnode.py +++ b/tests/system-test/2-query/queryQnode.py @@ -278,22 +278,7 @@ class TDTestCase: tdSql.checkData(0,0,rowsPerSTable) return - # test case1 base - def test_case1(self): - #stableCount=threadNumbersCtb - parameterDict = {'vgroups': 1, \ - 'threadNumbersCtb': 5, \ - 'threadNumbersIda': 5, \ - 'stableCount': 5, \ - 'tablesPerStb': 50, \ - 'rowsPerTable': 10, \ - 'dbname': 'db', \ - 'stbname': 'stb', \ - 'host': 'localhost', \ - 'startTs': 1640966400000} # 2022-01-01 00:00:00.000 - - tdLog.debug("-----create database and muti-thread create tables test------- ") - + # test case : Switch back and forth among the three queryPolicy（1\2\3） def test_case1(self): self.taosBenchCreate("127.0.0.1","no","db1", "stb1", 1, 2, 1*10) tdSql.execute("use db1;") @@ -407,6 +392,7 @@ class TDTestCase: tdSql.query("select c0,c1 from stb11_1 where (c0>1000) union all select c0,c1 from stb11_1 where c0>2000;") assert unionallQnode==tdSql.queryResult + # test case : queryPolicy = 2 def test_case2(self): self.taosBenchCreate("127.0.0.1","no","db1", "stb1", 10, 2, 1*10) tdSql.query("show qnodes") @@ -438,8 +424,9 @@ class TDTestCase: tdSql.query("select max(c1) from stb10_0;") tdSql.query("select min(c1) from stb11_0;") - def test_case3(self): + # test case : queryPolicy = 3 + def test_case3(self): tdSql.execute('alter local "queryPolicy" "3"') tdLog.debug("create qnode on dnode 1") tdSql.execute("create qnode on dnode 1") @@ -472,10 +459,16 @@ class TDTestCase: # run case def run(self): # test qnode + tdLog.debug(" test_case1 ............ [start]") self.test_case1() + tdLog.debug(" test_case1 ............ [OK]") + tdLog.debug(" test_case2 ............ [start]") self.test_case2() - + tdLog.debug(" test_case2 ............ [OK]") + tdLog.debug(" test_case3 ............ [start]") self.test_case3() + tdLog.debug(" test_case3 ............ [OK]") + # tdLog.debug(" LIMIT test_case3 ............ [OK]") def stop(self): diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 9f165d6404..f6f902e890 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -120,12 +120,12 @@ python3 ./test.py -f 2-query/irate.py python3 ./test.py -f 2-query/and_or_for_byte.py python3 ./test.py -f 2-query/function_null.py -python3 ./test.py -f 2-query/queryQnode.py +#python3 ./test.py -f 2-query/queryQnode.py python3 ./test.py -f 6-cluster/5dnode1mnode.py -#python3 ./test.py -f 6-cluster/5dnode2mnode.py -N 5 -M 3 +#BUG python3 ./test.py -f 6-cluster/5dnode2mnode.py -N 5 -M 3 #python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3 -#python3 ./test.py -f 6-cluster/5dnode3mnodeStopLoop.py -N 5 -M 3 +python3 ./test.py -f 6-cluster/5dnode3mnodeStopLoop.py -N 5 -M 3 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py -N 5 -M 3 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py -N 5 -M 3 python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py -N 5 -M 3 diff --git a/tests/system-test/test.py b/tests/system-test/test.py index 9596efdfc8..0a891759d0 100644 --- a/tests/system-test/test.py +++ b/tests/system-test/test.py @@ -64,8 +64,9 @@ if __name__ == "__main__": updateCfgDict = {} execCmd = "" queryPolicy = 1 - opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:', [ - 'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd','dnodeNums','mnodeNums','queryPolicy']) + createDnodeNums = 1 + opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:C:', [ + 'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd','dnodeNums','mnodeNums','queryPolicy','createDnodeNums']) for key, value in opts: if key in ['-h', '--help']: tdLog.printNoPrefix( @@ -81,9 +82,11 @@ if __name__ == "__main__": tdLog.printNoPrefix('-d update cfg dict, base64 json str') tdLog.printNoPrefix('-k not kill valgrind processer') tdLog.printNoPrefix('-e eval str to run') - tdLog.printNoPrefix('-N create dnodes numbers in clusters') + tdLog.printNoPrefix('-N start dnodes numbers in clusters') tdLog.printNoPrefix('-M create mnode numbers in clusters') tdLog.printNoPrefix('-Q set queryPolicy in one dnode') + tdLog.printNoPrefix('-C create Dnode Numbers in one cluster') + sys.exit(0) @@ -143,6 +146,9 @@ if __name__ == "__main__": if key in ['-Q', '--queryPolicy']: queryPolicy = value + if key in ['-C', '--createDnodeNums']: + createDnodeNums = value + if not execCmd == "": tdDnodes.init(deployPath) print(execCmd) @@ -239,7 +245,11 @@ if __name__ == "__main__": host, config=tdDnodes.getSimCfgPath()) print(tdDnodes.getSimCfgPath(),host) - cluster.create_dnode(conn) + if createDnodeNums == 1: + createDnodeNums=dnodeNums + else: + createDnodeNums=createDnodeNums + cluster.create_dnode(conn,createDnodeNums) try: if cluster.check_dnode(conn) : print("check dnode ready") @@ -314,7 +324,11 @@ if __name__ == "__main__": host, config=tdDnodes.getSimCfgPath()) print(tdDnodes.getSimCfgPath(),host) - cluster.create_dnode(conn) + if createDnodeNums == 1: + createDnodeNums=dnodeNums + else: + createDnodeNums=createDnodeNums + cluster.create_dnode(conn,createDnodeNums) try: if cluster.check_dnode(conn) : print("check dnode ready") From 06fe7f6a5a853c91c55fa6a8a01c6e7d94e6d73d Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Sun, 10 Jul 2022 16:17:42 +0800 Subject: [PATCH 09/25] update test case --- source/libs/index/inc/indexFstDfa.h | 2 +- source/libs/index/src/indexFstDfa.c | 12 +++++------- source/libs/index/src/indexFstRegex.c | 7 +++++-- source/libs/index/src/indexFstSparse.c | 14 ++++++++++---- source/libs/index/test/fstUtilUT.cc | 5 ++++- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/source/libs/index/inc/indexFstDfa.h b/source/libs/index/inc/indexFstDfa.h index 9ca10897fd..5a5622e280 100644 --- a/source/libs/index/inc/indexFstDfa.h +++ b/source/libs/index/inc/indexFstDfa.h @@ -51,7 +51,7 @@ FstDfa *dfaBuilderBuild(FstDfaBuilder *builder); bool dfaBuilderRunState(FstDfaBuilder *builder, FstSparseSet *cur, FstSparseSet *next, uint32_t state, uint8_t bytes, uint32_t *result); -bool dfaBuilderCachedState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *result); +bool dfaBuilderCacheState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *result); /* * dfa related func diff --git a/source/libs/index/src/indexFstDfa.c b/source/libs/index/src/indexFstDfa.c index 275580ebdc..b8ac3bd3f5 100644 --- a/source/libs/index/src/indexFstDfa.c +++ b/source/libs/index/src/indexFstDfa.c @@ -64,7 +64,7 @@ void dfaBuilderDestroy(FstDfaBuilder *builder) { taosMemoryFree(builder); } -FstDfa *dfaBuilder(FstDfaBuilder *builder) { +FstDfa *dfaBuilderBuild(FstDfaBuilder *builder) { uint32_t sz = taosArrayGetSize(builder->dfa->insts); FstSparseSet *cur = sparSetCreate(sz); FstSparseSet *nxt = sparSetCreate(sz); @@ -73,7 +73,7 @@ FstDfa *dfaBuilder(FstDfaBuilder *builder) { SArray *states = taosArrayInit(0, sizeof(uint32_t)); uint32_t result; - if (dfaBuilderCachedState(builder, cur, &result)) { + if (dfaBuilderCacheState(builder, cur, &result)) { taosArrayPush(states, &result); } SHashObj *seen = taosHashInit(12, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), false, HASH_NO_LOCK); @@ -98,8 +98,6 @@ FstDfa *dfaBuilder(FstDfaBuilder *builder) { return builder->dfa; } -FstDfa *dfaBuilderBuild(FstDfaBuilder *builer) { return NULL; } - bool dfaBuilderRunState(FstDfaBuilder *builder, FstSparseSet *cur, FstSparseSet *next, uint32_t state, uint8_t byte, uint32_t *result) { sparSetClear(cur); @@ -114,7 +112,7 @@ bool dfaBuilderRunState(FstDfaBuilder *builder, FstSparseSet *cur, FstSparseSet t = taosArrayGet(builder->dfa->states, state); uint32_t nxtState; - if (dfaBuilderCachedState(builder, next, &nxtState)) { + if (dfaBuilderCacheState(builder, next, &nxtState)) { t->next[byte] = nxtState; *result = nxtState; return true; @@ -122,7 +120,7 @@ bool dfaBuilderRunState(FstDfaBuilder *builder, FstSparseSet *cur, FstSparseSet return false; } -bool dfaBuilderCachedState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *result) { +bool dfaBuilderCacheState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *result) { SArray *tinsts = taosArrayInit(4, sizeof(uint32_t)); bool isMatch = false; @@ -190,7 +188,7 @@ void dfaAdd(FstDfa *dfa, FstSparseSet *set, uint32_t ip) { return; } bool succ = sparSetAdd(set, ip, NULL); - assert(succ == true); + // assert(succ == true); Inst *inst = taosArrayGet(dfa->insts, ip); if (inst->ty == MATCH || inst->ty == RANGE) { // do nothing diff --git a/source/libs/index/src/indexFstRegex.c b/source/libs/index/src/indexFstRegex.c index 37cb58996f..0189e9fe6e 100644 --- a/source/libs/index/src/indexFstRegex.c +++ b/source/libs/index/src/indexFstRegex.c @@ -29,8 +29,11 @@ FstRegex *regexCreate(const char *str) { regex->orig = orig; // construct insts based on str - SArray *insts = NULL; - + SArray *insts = taosArrayInit(256, sizeof(uint8_t)); + for (int i = 0; i < strlen(str); i++) { + uint8_t v = str[i]; + taosArrayPush(insts, &v); + } FstDfaBuilder *builder = dfaBuilderCreate(insts); regex->dfa = dfaBuilderBuild(builder); return regex; diff --git a/source/libs/index/src/indexFstSparse.c b/source/libs/index/src/indexFstSparse.c index 99ed5d6429..5fdd797aa8 100644 --- a/source/libs/index/src/indexFstSparse.c +++ b/source/libs/index/src/indexFstSparse.c @@ -15,6 +15,11 @@ #include "indexFstSparse.h" +static void sparSetUtil(int32_t *buf, int32_t cap) { + for (int32_t i = 0; i < cap; i++) { + buf[i] = -1; + } +} FstSparseSet *sparSetCreate(int32_t sz) { FstSparseSet *ss = taosMemoryCalloc(1, sizeof(FstSparseSet)); if (ss == NULL) { @@ -22,9 +27,10 @@ FstSparseSet *sparSetCreate(int32_t sz) { } ss->dense = (int32_t *)taosMemoryMalloc(sz * sizeof(int32_t)); - memset(ss->dense, -1, sz * sizeof(int32_t)); ss->sparse = (int32_t *)taosMemoryMalloc(sz * sizeof(int32_t)); - memset(ss->sparse, -1, sz * sizeof(int32_t)); + sparSetUtil(ss->dense, sz); + sparSetUtil(ss->sparse, sz); + ss->cap = sz; ss->size = 0; @@ -84,7 +90,7 @@ void sparSetClear(FstSparseSet *ss) { if (ss == NULL) { return; } - memset(ss->dense, -1, ss->cap * sizeof(int32_t)); - memset(ss->sparse, -1, ss->cap * sizeof(int32_t)); + sparSetUtil(ss->dense, ss->cap); + sparSetUtil(ss->sparse, ss->cap); ss->size = 0; } diff --git a/source/libs/index/test/fstUtilUT.cc b/source/libs/index/test/fstUtilUT.cc index 22fe1a9150..593a312c9e 100644 --- a/source/libs/index/test/fstUtilUT.cc +++ b/source/libs/index/test/fstUtilUT.cc @@ -66,7 +66,10 @@ TEST_F(FstUtilEnv, test4) { // test FstRegex -TEST_F(FstRegexEnv, test1) {} +TEST_F(FstRegexEnv, test1) { + // + EXPECT_EQ(regex != NULL, true); +} TEST_F(FstRegexEnv, test2) {} TEST_F(FstRegexEnv, test3) {} TEST_F(FstRegexEnv, test4) {} From 72738040a9b117475005f4118dd7774e9fda0ae7 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Sun, 10 Jul 2022 16:44:50 +0800 Subject: [PATCH 10/25] fix: some problem of parser and planner --- source/libs/nodes/src/nodesCodeFuncs.c | 53 +++++++++++- source/libs/parser/src/parInsert.c | 84 +------------------- source/libs/parser/src/parser.c | 2 + source/libs/planner/src/planOptimizer.c | 10 ++- source/libs/planner/src/planSpliter.c | 1 + source/libs/planner/test/planOrderByTest.cpp | 6 ++ source/libs/planner/test/planPartByTest.cpp | 2 + 7 files changed, 71 insertions(+), 87 deletions(-) diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c index 5d5e95cd2b..294488a38d 100644 --- a/source/libs/nodes/src/nodesCodeFuncs.c +++ b/source/libs/nodes/src/nodesCodeFuncs.c @@ -543,11 +543,40 @@ static int32_t jsonToLogicPlanNode(const SJson* pJson, void* pObj) { static const char* jkScanLogicPlanScanCols = "ScanCols"; static const char* jkScanLogicPlanScanPseudoCols = "ScanPseudoCols"; -static const char* jkScanLogicPlanTableId = "TableId"; static const char* jkScanLogicPlanTableType = "TableType"; +static const char* jkScanLogicPlanTableId = "TableId"; +static const char* jkScanLogicPlanStableId = "StableId"; +static const char* jkScanLogicPlanScanCount = "ScanCount"; +static const char* jkScanLogicPlanReverseScanCount = "ReverseScanCount"; static const char* jkScanLogicPlanTagCond = "TagCond"; static const char* jkScanLogicPlanGroupTags = "GroupTags"; +// typedef struct SScanLogicNode { +// uint64_t stableId; +// SVgroupsInfo* pVgroupList; +// EScanType scanType; +// uint8_t scanSeq[2]; // first is scan count, and second is reverse scan count +// STimeWindow scanRange; +// SName tableName; +// bool showRewrite; +// double ratio; +// SNodeList* pDynamicScanFuncs; +// int32_t dataRequired; +// int64_t interval; +// int64_t offset; +// int64_t sliding; +// int8_t intervalUnit; +// int8_t slidingUnit; +// SNode* pTagCond; +// SNode* pTagIndexCond; +// int8_t triggerType; +// int64_t watermark; +// int8_t igExpired; +// SArray* pSmaIndexes; +// SNodeList* pGroupTags; +// bool groupSort; +// } SScanLogicNode; + static int32_t logicScanNodeToJson(const void* pObj, SJson* pJson) { const SScanLogicNode* pNode = (const SScanLogicNode*)pObj; @@ -558,11 +587,20 @@ static int32_t logicScanNodeToJson(const void* pObj, SJson* pJson) { if (TSDB_CODE_SUCCESS == code) { code = nodeListToJson(pJson, jkScanLogicPlanScanPseudoCols, pNode->pScanPseudoCols); } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanTableType, pNode->tableType); + } if (TSDB_CODE_SUCCESS == code) { code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanTableId, pNode->tableId); } if (TSDB_CODE_SUCCESS == code) { - code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanTableType, pNode->tableType); + code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanStableId, pNode->stableId); + } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanScanCount, pNode->scanSeq[0]); + } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanReverseScanCount, pNode->scanSeq[1]); } if (TSDB_CODE_SUCCESS == code) { code = tjsonAddObject(pJson, jkScanLogicPlanTagCond, nodeToJson, pNode->pTagCond); @@ -585,11 +623,20 @@ static int32_t jsonToLogicScanNode(const SJson* pJson, void* pObj) { if (TSDB_CODE_SUCCESS == code) { code = jsonToNodeList(pJson, jkScanLogicPlanScanPseudoCols, &pNode->pScanPseudoCols); } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonGetTinyIntValue(pJson, jkScanLogicPlanTableType, &pNode->tableType); + } if (TSDB_CODE_SUCCESS == code) { code = tjsonGetUBigIntValue(pJson, jkScanLogicPlanTableId, &pNode->tableId); } if (TSDB_CODE_SUCCESS == code) { - code = tjsonGetTinyIntValue(pJson, jkScanLogicPlanTableType, &pNode->tableType); + code = tjsonGetUBigIntValue(pJson, jkScanLogicPlanStableId, &pNode->stableId); + } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonGetUTinyIntValue(pJson, jkScanLogicPlanScanCount, &pNode->scanSeq[0]); + } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonGetUTinyIntValue(pJson, jkScanLogicPlanReverseScanCount, &pNode->scanSeq[1]); } if (TSDB_CODE_SUCCESS == code) { code = jsonToNodeObject(pJson, jkScanLogicPlanTagCond, &pNode->pTagCond); diff --git a/source/libs/parser/src/parInsert.c b/source/libs/parser/src/parInsert.c index a5cf755a74..2494c5a8a7 100644 --- a/source/libs/parser/src/parInsert.c +++ b/source/libs/parser/src/parInsert.c @@ -120,86 +120,6 @@ static int32_t skipInsertInto(char** pSql, SMsgBuf* pMsg) { return TSDB_CODE_SUCCESS; } -static int32_t parserValidateIdToken(SToken* pToken) { - if (pToken == NULL || pToken->z == NULL || pToken->type != TK_NK_ID) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } - - // it is a token quoted with escape char '`' - if (pToken->z[0] == TS_ESCAPE_CHAR && pToken->z[pToken->n - 1] == TS_ESCAPE_CHAR) { - return TSDB_CODE_SUCCESS; - } - - char* sep = strnchr(pToken->z, TS_PATH_DELIMITER[0], pToken->n, true); - if (sep == NULL) { // It is a single part token, not a complex type - if (isNumber(pToken)) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } - - strntolower(pToken->z, pToken->z, pToken->n); - } else { // two part - int32_t oldLen = pToken->n; - char* pStr = pToken->z; - - if (pToken->type == TK_NK_SPACE) { - pToken->n = (uint32_t)strtrim(pToken->z); - } - - pToken->n = tGetToken(pToken->z, &pToken->type); - if (pToken->z[pToken->n] != TS_PATH_DELIMITER[0]) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } - - if (pToken->type != TK_NK_ID) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } - - int32_t firstPartLen = pToken->n; - - pToken->z = sep + 1; - pToken->n = (uint32_t)(oldLen - (sep - pStr) - 1); - int32_t len = tGetToken(pToken->z, &pToken->type); - if (len != pToken->n || pToken->type != TK_NK_ID) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } - - // re-build the whole name string - if (pStr[firstPartLen] == TS_PATH_DELIMITER[0]) { - // first part do not have quote do nothing - } else { - pStr[firstPartLen] = TS_PATH_DELIMITER[0]; - memmove(&pStr[firstPartLen + 1], pToken->z, pToken->n); - uint32_t offset = (uint32_t)(pToken->z - (pStr + firstPartLen + 1)); - memset(pToken->z + pToken->n - offset, ' ', offset); - } - - pToken->n += (firstPartLen + sizeof(TS_PATH_DELIMITER[0])); - pToken->z = pStr; - - strntolower(pToken->z, pToken->z, pToken->n); - } - - return TSDB_CODE_SUCCESS; -} - -static int32_t buildName(SInsertParseContext* pCxt, SToken* pStname, char* fullDbName, char* tableName) { - if (parserValidateIdToken(pStname) != TSDB_CODE_SUCCESS) { - return buildSyntaxErrMsg(&pCxt->msg, "invalid table name", pStname->z); - } - - char* p = strnchr(pStname->z, TS_PATH_DELIMITER[0], pStname->n, false); - if (NULL != p) { // db.table - int32_t n = sprintf(fullDbName, "%d.", pCxt->pComCxt->acctId); - strncpy(fullDbName + n, pStname->z, p - pStname->z); - strncpy(tableName, p + 1, pStname->n - (p - pStname->z) - 1); - } else { - snprintf(fullDbName, TSDB_DB_FNAME_LEN, "%d.%s", pCxt->pComCxt->acctId, pCxt->pComCxt->db); - strncpy(tableName, pStname->z, pStname->n); - } - - return TSDB_CODE_SUCCESS; -} - static int32_t createSName(SName* pName, SToken* pTableName, int32_t acctId, const char* dbName, SMsgBuf* pMsgBuf) { const char* msg1 = "name too long"; const char* msg2 = "invalid database name"; @@ -978,11 +898,11 @@ static int32_t parseTagToken(char** end, SToken* pToken, SSchema* pSchema, int16 case TSDB_DATA_TYPE_NCHAR: { int32_t output = 0; - void* p = taosMemoryCalloc(1, pToken->n * TSDB_NCHAR_SIZE); + void* p = taosMemoryCalloc(1, pSchema->bytes - VARSTR_HEADER_SIZE); if (p == NULL) { return TSDB_CODE_OUT_OF_MEMORY; } - if (!taosMbsToUcs4(pToken->z, pToken->n, (TdUcs4*)(p), pToken->n * TSDB_NCHAR_SIZE, &output)) { + if (!taosMbsToUcs4(pToken->z, pToken->n, (TdUcs4*)(p), pSchema->bytes - VARSTR_HEADER_SIZE, &output)) { if (errno == E2BIG) { taosMemoryFree(p); return generateSyntaxErrMsg(pMsgBuf, TSDB_CODE_PAR_VALUE_TOO_LONG, pSchema->name); diff --git a/source/libs/parser/src/parser.c b/source/libs/parser/src/parser.c index b36adbe5d4..218b5d9f4b 100644 --- a/source/libs/parser/src/parser.c +++ b/source/libs/parser/src/parser.c @@ -38,6 +38,8 @@ bool qIsInsertValuesSql(const char* pStr, size_t length) { t = tStrGetToken((char*)pStr, &index, false); if (TK_USING == t.type || TK_VALUES == t.type) { return true; + } else if (TK_SELECT == t.type) { + return false; } if (0 == t.type) { break; diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index fb3c420a19..d4c470be3c 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -1010,8 +1010,13 @@ static int32_t sortPriKeyOptApply(SOptimizeContext* pCxt, SLogicSubplan* pLogicS SNodeList* pScanNodes) { EOrder order = sortPriKeyOptGetPriKeyOrder(pSort); if (ORDER_DESC == order) { - SNode* pScan = NULL; - FOREACH(pScan, pScanNodes) { TSWAP(((SScanLogicNode*)pScan)->scanSeq[0], ((SScanLogicNode*)pScan)->scanSeq[1]); } + SNode* pScanNode = NULL; + FOREACH(pScanNode, pScanNodes) { + SScanLogicNode* pScan = (SScanLogicNode*)pScanNode; + if (pScan->scanSeq[0] > 0) { + TSWAP(pScan->scanSeq[0], pScan->scanSeq[1]); + } + } } int32_t code = @@ -1020,6 +1025,7 @@ static int32_t sortPriKeyOptApply(SOptimizeContext* pCxt, SLogicSubplan* pLogicS NODES_CLEAR_LIST(pSort->node.pChildren); nodesDestroyNode((SNode*)pSort); } + pCxt->optimized = true; return code; } diff --git a/source/libs/planner/src/planSpliter.c b/source/libs/planner/src/planSpliter.c index 2137108386..d7eccf4b8e 100644 --- a/source/libs/planner/src/planSpliter.c +++ b/source/libs/planner/src/planSpliter.c @@ -945,6 +945,7 @@ static int32_t stbSplSplitPartitionNode(SSplitContext* pCxt, SStableSplitInfo* p code = nodesListMakeStrictAppend(&pInfo->pSubplan->pChildren, (SNode*)splCreateScanSubplan(pCxt, pInfo->pSplitNode, SPLIT_FLAG_STABLE_SPLIT)); } + pInfo->pSubplan->subplanType = SUBPLAN_TYPE_MERGE; ++(pCxt->groupId); return code; } diff --git a/source/libs/planner/test/planOrderByTest.cpp b/source/libs/planner/test/planOrderByTest.cpp index e542f4772f..13dfbad78c 100644 --- a/source/libs/planner/test/planOrderByTest.cpp +++ b/source/libs/planner/test/planOrderByTest.cpp @@ -53,6 +53,12 @@ TEST_F(PlanOrderByTest, withGroupBy) { run("SELECT SUM(c1) AS a FROM t1 GROUP BY c2 ORDER BY a"); } +TEST_F(PlanOrderByTest, withSubquery) { + useDb("root", "test"); + + run("SELECT ts FROM (SELECT * FROM t1 ORDER BY ts DESC) ORDER BY ts DESC"); +} + TEST_F(PlanOrderByTest, stable) { useDb("root", "test"); diff --git a/source/libs/planner/test/planPartByTest.cpp b/source/libs/planner/test/planPartByTest.cpp index 3b71ae3b88..48a4c12577 100644 --- a/source/libs/planner/test/planPartByTest.cpp +++ b/source/libs/planner/test/planPartByTest.cpp @@ -37,6 +37,8 @@ TEST_F(PlanPartitionByTest, withAggFunc) { run("select count(*) from st1 partition by c1"); + run("select sample(c1, 2) from st1 partition by c1"); + run("select count(*), c1 from t1 partition by c1"); } From 6cd21fe04b555d55665aacb61d683edee18e68cc Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Sun, 10 Jul 2022 16:52:11 +0800 Subject: [PATCH 11/25] enh: enhance in operator --- include/libs/scalar/scalar.h | 2 +- source/libs/scalar/inc/sclInt.h | 2 +- source/libs/scalar/inc/sclvector.h | 2 +- source/libs/scalar/src/filter.c | 12 +- source/libs/scalar/src/scalar.c | 14 ++- source/libs/scalar/src/sclvector.c | 117 +++++++++++++++--- tests/script/jenkins/basic.txt | 4 + .../insert/insert_select.sim | 0 tests/script/tsim/scalar/in.sim | 83 +++++++++++++ 9 files changed, 206 insertions(+), 30 deletions(-) rename tests/script/{general => tsim}/insert/insert_select.sim (100%) create mode 100644 tests/script/tsim/scalar/in.sim diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h index 2a1a75c431..c81c474366 100644 --- a/include/libs/scalar/scalar.h +++ b/include/libs/scalar/scalar.h @@ -42,7 +42,7 @@ int32_t scalarGetOperatorParamNum(EOperatorType type); int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type); int32_t vectorGetConvertType(int32_t type1, int32_t type2); -int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut); +int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut, int32_t* overflow); /* Math functions */ int32_t absFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput); diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h index 1794d8f5ed..4422da1b81 100644 --- a/source/libs/scalar/inc/sclInt.h +++ b/source/libs/scalar/inc/sclInt.h @@ -56,7 +56,7 @@ typedef struct SScalarCtx { #define SCL_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; } return _code; } while (0) #define SCL_ERR_JRET(c) do { code = c; if (code != TSDB_CODE_SUCCESS) { terrno = code; goto _return; } } while (0) -int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out); +int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow); int32_t sclCreateColumnInfoData(SDataType* pType, int32_t numOfRows, SScalarParam* pParam); int32_t sclConvertToTsValueNode(int8_t precision, SValueNode* valueNode); diff --git a/source/libs/scalar/inc/sclvector.h b/source/libs/scalar/inc/sclvector.h index f80ffc70a2..a1bf1ce1ef 100644 --- a/source/libs/scalar/inc/sclvector.h +++ b/source/libs/scalar/inc/sclvector.h @@ -94,7 +94,7 @@ static FORCE_INLINE _getDoubleValue_fn_t getVectorDoubleValueFn(int32_t srcType) return p; } -typedef void (*_bufConverteFunc)(char *buf, SScalarParam* pOut, int32_t outType); +typedef void (*_bufConverteFunc)(char *buf, SScalarParam* pOut, int32_t outType, int32_t* overflow); typedef void (*_bin_scalar_fn_t)(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *output, int32_t order); _bin_scalar_fn_t getBinScalarOperatorFn(int32_t binOperator); diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 57819db0b8..42121e8813 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -1042,12 +1042,18 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode* tree, SArray *group) { for (int32_t i = 0; i < listNode->pNodeList->length; ++i) { SValueNode *valueNode = (SValueNode *)cell->pNode; - if (valueNode->node.resType.type != type) { - code = doConvertDataType(valueNode, &out); + if (valueNode->node.resType.type != type) { + int32_t overflow = 0; + code = doConvertDataType(valueNode, &out, &overflow); if (code) { // fltError("convert from %d to %d failed", in.type, out.type); FLT_ERR_RET(code); } + + if (overflow) { + cell = cell->pNext; + continue; + } len = tDataTypes[type].bytes; @@ -1835,7 +1841,7 @@ int32_t fltInitValFieldData(SFilterInfo *info) { } // todo refactor the convert - int32_t code = doConvertDataType(var, &out); + int32_t code = doConvertDataType(var, &out, NULL); if (code != TSDB_CODE_SUCCESS) { qError("convert value to type[%d] failed", type); return TSDB_CODE_TSC_INVALID_OPERATION; diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c index 9bd82fb1a4..e99690c556 100644 --- a/source/libs/scalar/src/scalar.c +++ b/source/libs/scalar/src/scalar.c @@ -59,7 +59,7 @@ int32_t sclCreateColumnInfoData(SDataType* pType, int32_t numOfRows, SScalarPara return TSDB_CODE_SUCCESS; } -int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out) { +int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow) { SScalarParam in = {.numOfRows = 1}; int32_t code = sclCreateColumnInfoData(&pValueNode->node.resType, 1, &in); if (code != TSDB_CODE_SUCCESS) { @@ -69,7 +69,7 @@ int32_t doConvertDataType(SValueNode* pValueNode, SScalarParam* out) { colDataAppend(in.columnData, 0, nodesGetValueFromNode(pValueNode), false); colInfoDataEnsureCapacity(out->columnData, 1); - code = vectorConvertImpl(&in, out); + code = vectorConvertImpl(&in, out, overflow); sclFreeParam(&in); return code; @@ -107,15 +107,21 @@ int32_t scalarGenerateSetFromList(void **data, void *pNode, uint32_t type) { out.columnData->info.bytes = tDataTypes[type].bytes; } - code = doConvertDataType(valueNode, &out); + int32_t overflow = 0; + code = doConvertDataType(valueNode, &out, &overflow); if (code != TSDB_CODE_SUCCESS) { // sclError("convert data from %d to %d failed", in.type, out.type); SCL_ERR_JRET(code); } + if (overflow) { + cell = cell->pNext; + continue; + } + if (IS_VAR_DATA_TYPE(type)) { buf = colDataGetVarData(out.columnData, 0); - len = varDataTLen(data); + len = varDataTLen(buf); } else { len = tDataTypes[type].bytes; buf = out.columnData->pData; diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index 98cb923b49..bf457d07eb 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -276,7 +276,7 @@ _getValueAddr_fn_t getVectorValueAddrFn(int32_t srcType) { return p; } -static FORCE_INLINE void varToTimestamp(char *buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void varToTimestamp(char *buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { int64_t value = 0; if (taosParseTime(buf, &value, strlen(buf), pOut->columnData->info.precision, tsDaylight) != TSDB_CODE_SUCCESS) { value = 0; @@ -285,10 +285,26 @@ static FORCE_INLINE void varToTimestamp(char *buf, SScalarParam* pOut, int32_t r colDataAppendInt64(pOut->columnData, rowIndex, &value); } -static FORCE_INLINE void varToSigned(char *buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void varToSigned(char *buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { + if (overflow) { + int64_t minValue = tDataTypes[pOut->columnData->info.type].minValue; + int64_t maxValue = tDataTypes[pOut->columnData->info.type].maxValue; + int64_t value = (int64_t)taosStr2Int64(buf, NULL, 10); + if (value > maxValue) { + *overflow = 1; + return; + } else if (value < minValue) { + *overflow = -1; + return; + } else { + *overflow = 0; + } + } + switch (pOut->columnData->info.type) { case TSDB_DATA_TYPE_TINYINT: { int8_t value = (int8_t)taosStr2Int8(buf, NULL, 10); + colDataAppendInt8(pOut->columnData, rowIndex, (int8_t*)&value); break; } @@ -310,7 +326,22 @@ static FORCE_INLINE void varToSigned(char *buf, SScalarParam* pOut, int32_t rowI } } -static FORCE_INLINE void varToUnsigned(char *buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void varToUnsigned(char *buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { + if (overflow) { + uint64_t minValue = (uint64_t)tDataTypes[pOut->columnData->info.type].minValue; + uint64_t maxValue = (uint64_t)tDataTypes[pOut->columnData->info.type].maxValue; + uint64_t value = (uint64_t)taosStr2UInt64(buf, NULL, 10); + if (value > maxValue) { + *overflow = 1; + return; + } else if (value < minValue) { + *overflow = -1; + return; + } else { + *overflow = 0; + } + } + switch (pOut->columnData->info.type) { case TSDB_DATA_TYPE_UTINYINT: { uint8_t value = (uint8_t)taosStr2UInt8(buf, NULL, 10); @@ -335,18 +366,24 @@ static FORCE_INLINE void varToUnsigned(char *buf, SScalarParam* pOut, int32_t ro } } -static FORCE_INLINE void varToFloat(char *buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void varToFloat(char *buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { + if (TSDB_DATA_TYPE_FLOAT == pOut->columnData->info.type) { + float value = taosStr2Float(buf, NULL); + colDataAppendFloat(pOut->columnData, rowIndex, &value); + return; + } + double value = taosStr2Double(buf, NULL); colDataAppendDouble(pOut->columnData, rowIndex, &value); } -static FORCE_INLINE void varToBool(char *buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void varToBool(char *buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { int64_t value = taosStr2Int64(buf, NULL, 10); bool v = (value != 0)? true:false; colDataAppendInt8(pOut->columnData, rowIndex, (int8_t*) &v); } -static FORCE_INLINE void varToNchar(char* buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void varToNchar(char* buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { int32_t len = 0; int32_t inputLen = varDataLen(buf); int32_t outputMaxLen = (inputLen + 1) * TSDB_NCHAR_SIZE + VARSTR_HEADER_SIZE; @@ -359,7 +396,7 @@ static FORCE_INLINE void varToNchar(char* buf, SScalarParam* pOut, int32_t rowIn taosMemoryFree(t); } -static FORCE_INLINE void ncharToVar(char* buf, SScalarParam* pOut, int32_t rowIndex) { +static FORCE_INLINE void ncharToVar(char* buf, SScalarParam* pOut, int32_t rowIndex, int32_t* overflow) { int32_t inputLen = varDataLen(buf); char* t = taosMemoryCalloc(1, inputLen + VARSTR_HEADER_SIZE); @@ -376,7 +413,7 @@ static FORCE_INLINE void ncharToVar(char* buf, SScalarParam* pOut, int32_t rowIn //TODO opt performance, tmp is not needed. -int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, int32_t inType, int32_t outType) { +int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, int32_t inType, int32_t outType, int32_t* overflow) { bool vton = false; _bufConverteFunc func = NULL; @@ -415,8 +452,7 @@ int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, in if(inType == TSDB_DATA_TYPE_JSON){ if(*data == TSDB_DATA_TYPE_NULL) { ASSERT(0); - } - else if(*data == TSDB_DATA_TYPE_NCHAR) { + } else if(*data == TSDB_DATA_TYPE_NCHAR) { data += CHAR_BYTES; convertType = TSDB_DATA_TYPE_NCHAR; } else if(tTagIsJson(data)){ @@ -453,7 +489,7 @@ int32_t vectorConvertFromVarData(const SScalarParam* pIn, SScalarParam* pOut, in } } - (*func)(tmp, pOut, i); + (*func)(tmp, pOut, i, overflow); taosMemoryFreeClear(tmp); } @@ -606,7 +642,7 @@ int32_t vectorConvertToVarData(const SScalarParam* pIn, SScalarParam* pOut, int1 int32_t len = sprintf(varDataVal(tmp), "%" PRId64, value); varDataLen(tmp) = len; if (outType == TSDB_DATA_TYPE_NCHAR) { - varToNchar(tmp, pOut, i); + varToNchar(tmp, pOut, i, NULL); } else { colDataAppend(pOutputCol, i, (char *)tmp, false); } @@ -623,7 +659,7 @@ int32_t vectorConvertToVarData(const SScalarParam* pIn, SScalarParam* pOut, int1 int32_t len = sprintf(varDataVal(tmp), "%" PRIu64, value); varDataLen(tmp) = len; if (outType == TSDB_DATA_TYPE_NCHAR) { - varToNchar(tmp, pOut, i); + varToNchar(tmp, pOut, i, NULL); } else { colDataAppend(pOutputCol, i, (char *)tmp, false); } @@ -640,7 +676,7 @@ int32_t vectorConvertToVarData(const SScalarParam* pIn, SScalarParam* pOut, int1 int32_t len = sprintf(varDataVal(tmp), "%lf", value); varDataLen(tmp) = len; if (outType == TSDB_DATA_TYPE_NCHAR) { - varToNchar(tmp, pOut, i); + varToNchar(tmp, pOut, i, NULL); } else { colDataAppend(pOutputCol, i, (char *)tmp, false); } @@ -653,9 +689,8 @@ int32_t vectorConvertToVarData(const SScalarParam* pIn, SScalarParam* pOut, int1 return TSDB_CODE_SUCCESS; } - // TODO opt performance -int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) { +int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut, int32_t* overflow) { SColumnInfoData* pInputCol = pIn->columnData; SColumnInfoData* pOutputCol = pOut->columnData; @@ -668,7 +703,47 @@ int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) { int16_t outType = pOutputCol->info.type; if (IS_VAR_DATA_TYPE(inType)) { - return vectorConvertFromVarData(pIn, pOut, inType, outType); + return vectorConvertFromVarData(pIn, pOut, inType, outType, overflow); + } + + if (overflow) { + ASSERT(1 == pIn->numOfRows); + + pOut->numOfRows = 0; + + if (IS_SIGNED_NUMERIC_TYPE(outType)) { + int64_t minValue = tDataTypes[outType].minValue; + int64_t maxValue = tDataTypes[outType].maxValue; + + double value = 0; + GET_TYPED_DATA(value, double, inType, colDataGetData(pInputCol, 0)); + + if (value > maxValue) { + *overflow = 1; + return TSDB_CODE_SUCCESS; + } else if (value < minValue) { + *overflow = -1; + return TSDB_CODE_SUCCESS; + } else { + *overflow = 0; + } + } else if (IS_UNSIGNED_NUMERIC_TYPE(outType)) { + uint64_t minValue = (uint64_t)tDataTypes[outType].minValue; + uint64_t maxValue = (uint64_t)tDataTypes[outType].maxValue; + + double value = 0; + GET_TYPED_DATA(value, double, inType, colDataGetData(pInputCol, 0)); + + if (value > maxValue) { + *overflow = 1; + return TSDB_CODE_SUCCESS; + } else if (value < minValue) { + *overflow = -1; + return TSDB_CODE_SUCCESS; + } else { + *overflow = 0; + } + } } pOut->numOfRows = pIn->numOfRows; @@ -829,6 +904,8 @@ int32_t vectorConvertImpl(const SScalarParam* pIn, SScalarParam* pOut) { return TSDB_CODE_SUCCESS; } + + int8_t gConvertTypes[TSDB_DATA_TYPE_BLOB+1][TSDB_DATA_TYPE_BLOB+1] = { /* NULL BOOL TINY SMAL INT BIG FLOA DOUB VARC TIME NCHA UTIN USMA UINT UBIG JSON VARB DECI BLOB */ /*NULL*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -873,7 +950,7 @@ int32_t vectorConvertScalarParam(SScalarParam *input, SScalarParam *output, int3 return TSDB_CODE_OUT_OF_MEMORY; } - code = vectorConvertImpl(input, output); + code = vectorConvertImpl(input, output, NULL); if (code) { // taosMemoryFreeClear(paramOut1->data); return code; @@ -944,7 +1021,7 @@ static int32_t doConvertHelper(SScalarParam* pDest, int32_t* convert, const SSca return code; } - code = vectorConvertImpl(pParam, pDest); + code = vectorConvertImpl(pParam, pDest, NULL); if (code != TSDB_CODE_SUCCESS) { return code; } @@ -1714,7 +1791,7 @@ void vectorNotNull(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut } void vectorIsTrue(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut, int32_t _ord) { - vectorConvertImpl(pLeft, pOut); + vectorConvertImpl(pLeft, pOut, NULL); for(int32_t i = 0; i < pOut->numOfRows; ++i) { if(colDataIsNull_s(pOut->columnData, i)) { int8_t v = 0; diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 79f0034052..906c2b8792 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -52,6 +52,7 @@ ./test.sh -f tsim/insert/null.sim ./test.sh -f tsim/insert/update0.sim ./test.sh -f tsim/insert/commit-merge0.sim +./test.sh -f tsim/insert/insert_select.sim # ---- parser ./test.sh -f tsim/parser/groupby-basic.sim @@ -193,4 +194,7 @@ # --- catalog ./test.sh -f tsim/catalog/alterInCurrent.sim +# --- scalar +./test.sh -f tsim/scalar/in.sim + #======================b1-end=============== diff --git a/tests/script/general/insert/insert_select.sim b/tests/script/tsim/insert/insert_select.sim similarity index 100% rename from tests/script/general/insert/insert_select.sim rename to tests/script/tsim/insert/insert_select.sim diff --git a/tests/script/tsim/scalar/in.sim b/tests/script/tsim/scalar/in.sim new file mode 100644 index 0000000000..60c12a00c2 --- /dev/null +++ b/tests/script/tsim/scalar/in.sim @@ -0,0 +1,83 @@ +system sh/stop_dnodes.sh +system sh/deploy.sh -n dnode1 -i 1 +system sh/exec.sh -n dnode1 -s start +sql connect + +print ======== step1 +sql drop database if exists db1; +sql create database db1 vgroups 3; +sql use db1; +sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint, fint int, fbig bigint, futiny tinyint unsigned, fusmall smallint unsigned, fuint int unsigned, fubig bigint unsigned, ffloat float, fdouble double, fbin binary(10), fnchar nchar(10)) tags(tts timestamp, tbool bool, ttiny tinyint, tsmall smallint, tint int, tbig bigint, tutiny tinyint unsigned, tusmall smallint unsigned, tuint int unsigned, tubig bigint unsigned, tfloat float, tdouble double, tbin binary(10), tnchar nchar(10)); +sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a'); +sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); +sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c'); + +sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a'); +sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); +sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c'); +sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); +sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); + +sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a'); +sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); +sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c'); +sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); +sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); + +sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a'); +sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); +sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c'); +sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); +sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); + +sql select * from tb1 where fts in ('2022-07-10 16:31:01', '2022-07-10 16:31:03', 1657441865000); +if $rows != 3 then + return -1 +endi + +sql select * from tb1 where fbool in (0, 3); +if $rows != 5 then + return -1 +endi + +sql select * from tb1 where ftiny in (257); +if $rows != 0 then + return -1 +endi + +sql select * from tb1 where ftiny in (2, 257); +if $rows != 1 then + return -1 +endi + +sql select * from tb1 where futiny in (0, 257); +if $rows != 0 then + return -1 +endi + +sql select * from st1 where tts in ('2022-07-10 16:31:00', '2022-07-10 16:33:00', 1657441865000); +if $rows != 10 then + return -1 +endi + +sql select * from st1 where tbool in (0, 3); +if $rows != 15 then + return -1 +endi + +sql select * from st1 where ttiny in (257); +if $rows != 0 then + return -1 +endi + +sql select * from st1 where ttiny in (2, 257); +if $rows != 5 then + return -1 +endi + +sql select * from st1 where tutiny in (0, 257); +if $rows != 0 then + return -1 +endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT From bb760de1cfedd40089cdb5df7b3e9784c3d96788 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Sun, 10 Jul 2022 17:08:33 +0800 Subject: [PATCH 12/25] add test case --- source/libs/index/src/indexFstDfa.c | 1 - source/libs/index/src/indexFstRegex.c | 5 +---- source/libs/index/src/indexFstSparse.c | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/libs/index/src/indexFstDfa.c b/source/libs/index/src/indexFstDfa.c index b8ac3bd3f5..046ed0f4f4 100644 --- a/source/libs/index/src/indexFstDfa.c +++ b/source/libs/index/src/indexFstDfa.c @@ -126,7 +126,6 @@ bool dfaBuilderCacheState(FstDfaBuilder *builder, FstSparseSet *set, uint32_t *r for (int i = 0; i < sparSetLen(set); i++) { int32_t ip; - if (false == sparSetGet(set, i, &ip)) continue; Inst *inst = taosArrayGet(builder->dfa->insts, ip); diff --git a/source/libs/index/src/indexFstRegex.c b/source/libs/index/src/indexFstRegex.c index 0189e9fe6e..e148f211f2 100644 --- a/source/libs/index/src/indexFstRegex.c +++ b/source/libs/index/src/indexFstRegex.c @@ -22,11 +22,8 @@ FstRegex *regexCreate(const char *str) { if (regex == NULL) { return NULL; } - int32_t sz = (int32_t)strlen(str); - char *orig = taosMemoryCalloc(1, sz); - memcpy(orig, str, sz); - regex->orig = orig; + regex->orig = tstrdup(str); // construct insts based on str SArray *insts = taosArrayInit(256, sizeof(uint8_t)); diff --git a/source/libs/index/src/indexFstSparse.c b/source/libs/index/src/indexFstSparse.c index 5fdd797aa8..60eb7afd90 100644 --- a/source/libs/index/src/indexFstSparse.c +++ b/source/libs/index/src/indexFstSparse.c @@ -52,7 +52,7 @@ bool sparSetAdd(FstSparseSet *ss, int32_t ip, int32_t *idx) { if (ss == NULL) { return false; } - if (ip >= ss->cap) { + if (ip >= ss->cap || ip < 0) { return false; } uint32_t i = ss->size; @@ -65,7 +65,7 @@ bool sparSetAdd(FstSparseSet *ss, int32_t ip, int32_t *idx) { return true; } bool sparSetGet(FstSparseSet *ss, int32_t idx, int32_t *ip) { - if (idx >= ss->cap || idx >= ss->size) { + if (idx >= ss->cap || idx >= ss->size || idx < 0) { return false; } int32_t val = ss->dense[idx]; @@ -75,12 +75,12 @@ bool sparSetGet(FstSparseSet *ss, int32_t idx, int32_t *ip) { return val == -1 ? false : true; } bool sparSetContains(FstSparseSet *ss, int32_t ip) { - if (ip >= ss->cap) { + if (ip >= ss->cap || ip < 0) { return false; } int32_t i = ss->sparse[ip]; - if (i < ss->cap && i < ss->size && ss->dense[i] == ip) { + if (i >= 0 && i < ss->cap && i < ss->size && ss->dense[i] == ip) { return true; } else { return false; From b542b8f49a1f00357cd9d47965a98770c21c786e Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Sun, 10 Jul 2022 17:31:15 +0800 Subject: [PATCH 13/25] fix: some problem of parser and planner --- source/libs/executor/inc/executorimpl.h | 11 ++ source/libs/executor/src/executorimpl.c | 7 +- source/libs/executor/src/timewindowoperator.c | 177 ++++++++---------- source/libs/planner/src/planPhysiCreater.c | 5 +- 4 files changed, 100 insertions(+), 100 deletions(-) diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index ae0d0bebbd..41c244f3de 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -473,6 +473,17 @@ typedef struct SIntervalAggOperatorInfo { SNode *pCondition; } SIntervalAggOperatorInfo; +typedef struct SMergeAlignedIntervalAggOperatorInfo { + SIntervalAggOperatorInfo *intervalAggOperatorInfo; + + bool hasGroupId; + uint64_t groupId; + SSDataBlock* prefetchedBlock; + bool inputBlocksFinished; + + SNode* pCondition; +} SMergeAlignedIntervalAggOperatorInfo; + typedef struct SStreamFinalIntervalOperatorInfo { // SOptrBasicInfo should be first, SAggSupporter should be second for stream encode SOptrBasicInfo binfo; // basic info diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index f2f696b21f..58c7caaf8e 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -3994,8 +3994,11 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode* int32_t num = 0; SSDataBlock* pResBlock = createResDataBlock(pPhyFillNode->node.pOutputDataBlockDesc); SExprInfo* pExprInfo = createExprInfo(pPhyFillNode->pTargets, NULL, &num); - SInterval* pInterval = &((SIntervalAggOperatorInfo*)downstream->info)->interval; - int32_t type = convertFillType(pPhyFillNode->mode); + SInterval* pInterval = + QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL == downstream->operatorType + ? &((SMergeAlignedIntervalAggOperatorInfo*)downstream->info)->intervalAggOperatorInfo->interval + : &((SIntervalAggOperatorInfo*)downstream->info)->interval; + int32_t type = convertFillType(pPhyFillNode->mode); SResultInfo* pResultInfo = &pOperator->resultInfo; initResultSizeInfo(pOperator, 4096); diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index f9810913e3..d060a7a888 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -80,11 +80,11 @@ static void getInitialStartTimeWindow(SInterval* pInterval, int32_t precision, T } static STimeWindow getFirstQualifiedTimeWindow(int64_t ts, STimeWindow* pWindow, SInterval* pInterval, int32_t order) { - int32_t factor = (order == TSDB_ORDER_ASC)? -1:1; + int32_t factor = (order == TSDB_ORDER_ASC) ? -1 : 1; STimeWindow win = *pWindow; STimeWindow save = win; - while(win.skey <= ts && win.ekey >= ts) { + while (win.skey <= ts && win.ekey >= ts) { save = win; win.skey = taosTimeAdd(win.skey, factor * pInterval->sliding, pInterval->slidingUnit, pInterval->precision); win.ekey = taosTimeAdd(win.ekey, factor * pInterval->sliding, pInterval->slidingUnit, pInterval->precision); @@ -133,7 +133,7 @@ STimeWindow getActiveTimeWindow(SDiskbasedBuf* pBuf, SResultRowInfo* pResultRowI if (order == TSDB_ORDER_ASC) { if (w.skey <= ts && w.ekey >= ts) { // ts is resident in current time window, but we need to find the first - //qualified time window that cover this timestamp + // qualified time window that cover this timestamp w = getFirstQualifiedTimeWindow(ts, &w, pInterval, order); } else { // todo refactor: @@ -889,7 +889,7 @@ static void removeResults(SArray* pWins, SArray* pUpdated) { } int64_t getWinReskey(void* data, int32_t index) { - SArray* res = (SArray*)data; + SArray* res = (SArray*)data; SWinRes* pos = taosArrayGet(res, index); return pos->ts; } @@ -899,15 +899,14 @@ static void removeDeleteResults(SArray* pUpdated, SArray* pDelWins) { int32_t delSize = taosArrayGetSize(pDelWins); for (int32_t i = 0; i < upSize; i++) { SResKeyPos* pResKey = taosArrayGetP(pUpdated, i); - int64_t key = *(int64_t*)pResKey->key; - int32_t index = binarySearch(pDelWins, delSize, key, TSDB_ORDER_DESC, getWinReskey); + int64_t key = *(int64_t*)pResKey->key; + int32_t index = binarySearch(pDelWins, delSize, key, TSDB_ORDER_DESC, getWinReskey); if (index >= 0 && key == getWinReskey(pDelWins, index)) { taosArrayRemove(pDelWins, index); } } } - bool isOverdue(TSKEY ts, STimeWindowAggSupp* pSup) { ASSERT(pSup->maxTs == INT64_MIN || pSup->maxTs > 0); return pSup->maxTs != INT64_MIN && ts < pSup->maxTs - pSup->waterMark; @@ -1206,7 +1205,7 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator) { SOptrBasicInfo* pBInfo = &pInfo->binfo; if (pOperator->status == OP_RES_TO_RETURN) { - while(1) { + while (1) { doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf); doFilter(pInfo->pCondition, pBInfo->pRes); @@ -1221,7 +1220,7 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator) { } } pOperator->resultInfo.totalRows += pBInfo->pRes->info.rows; - return (pBInfo->pRes->info.rows == 0)? NULL:pBInfo->pRes; + return (pBInfo->pRes->info.rows == 0) ? NULL : pBInfo->pRes; } int32_t order = TSDB_ORDER_ASC; @@ -1247,7 +1246,7 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator) { initGroupedResultInfo(&pInfo->groupResInfo, pInfo->aggSup.pResultRowHashTable, TSDB_ORDER_ASC); blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity); - while(1) { + while (1) { doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf); doFilter(pInfo->pCondition, pBInfo->pRes); @@ -1262,7 +1261,7 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator) { } } pOperator->resultInfo.totalRows += pBInfo->pRes->info.rows; - return (pBInfo->pRes->info.rows == 0)? NULL:pBInfo->pRes; + return (pBInfo->pRes->info.rows == 0) ? NULL : pBInfo->pRes; } static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator) { @@ -1384,13 +1383,14 @@ bool doDeleteIntervalWindow(SAggSupporter* pAggSup, TSKEY ts, uint64_t groupId) void doDeleteSpecifyIntervalWindow(SAggSupporter* pAggSup, SSDataBlock* pBlock, SArray* pUpWins, SInterval* pInterval) { SColumnInfoData* pStartCol = taosArrayGet(pBlock->pDataBlock, START_TS_COLUMN_INDEX); - TSKEY* tsStarts = (TSKEY*)pStartCol->pData; + TSKEY* tsStarts = (TSKEY*)pStartCol->pData; SColumnInfoData* pGroupCol = taosArrayGet(pBlock->pDataBlock, GROUPID_COLUMN_INDEX); - uint64_t* groupIds = (uint64_t*)pGroupCol->pData; + uint64_t* groupIds = (uint64_t*)pGroupCol->pData; for (int32_t i = 0; i < pBlock->info.rows; i++) { SResultRowInfo dumyInfo; dumyInfo.cur.pageId = -1; - STimeWindow win = getActiveTimeWindow(NULL, &dumyInfo, tsStarts[i], pInterval, pInterval->precision, TSDB_ORDER_ASC); + STimeWindow win = + getActiveTimeWindow(NULL, &dumyInfo, tsStarts[i], pInterval, pInterval->precision, TSDB_ORDER_ASC); doDeleteIntervalWindow(pAggSup, win.skey, groupIds[i]); if (pUpWins) { SWinRes winRes = {.ts = win.skey, .groupId = groupIds[i]}; @@ -1399,8 +1399,8 @@ void doDeleteSpecifyIntervalWindow(SAggSupporter* pAggSup, SSDataBlock* pBlock, } } -static void doClearWindows(SAggSupporter* pAggSup, SExprSupp* pSup1, SInterval* pInterval, - int32_t numOfOutput, SSDataBlock* pBlock, SArray* pUpWins) { +static void doClearWindows(SAggSupporter* pAggSup, SExprSupp* pSup1, SInterval* pInterval, int32_t numOfOutput, + SSDataBlock* pBlock, SArray* pUpWins) { SColumnInfoData* pTsCol = taosArrayGet(pBlock->pDataBlock, START_TS_COLUMN_INDEX); TSKEY* tsCols = (TSKEY*)pTsCol->pData; uint64_t* pGpDatas = NULL; @@ -1415,7 +1415,7 @@ static void doClearWindows(SAggSupporter* pAggSup, SExprSupp* pSup1, SInterval* STimeWindow win = getActiveTimeWindow(NULL, &dumyInfo, tsCols[i], pInterval, pInterval->precision, TSDB_ORDER_ASC); step = getNumOfRowsInTimeWindow(&pBlock->info, tsCols, i, win.ekey, binarySearchForKey, NULL, TSDB_ORDER_ASC); uint64_t winGpId = pGpDatas ? pGpDatas[i] : pBlock->info.groupId; - bool res = doClearWindow(pAggSup, pSup1, (char*)&win.skey, sizeof(TKEY), winGpId, numOfOutput); + bool res = doClearWindow(pAggSup, pSup1, (char*)&win.skey, sizeof(TKEY), winGpId, numOfOutput); if (pUpWins && res) { SWinRes winRes = {.ts = win.skey, .groupId = winGpId}; taosArrayPush(pUpWins, &winRes); @@ -1440,9 +1440,9 @@ static int32_t getAllIntervalWindow(SHashObj* pHashMap, SArray* resWins) { return TSDB_CODE_SUCCESS; } -static int32_t closeIntervalWindow(SHashObj* pHashMap, STimeWindowAggSupp* pSup, - SInterval* pInterval, SHashObj* pPullDataMap, SArray* closeWins, - SArray* pRecyPages, SDiskbasedBuf* pDiscBuf) { +static int32_t closeIntervalWindow(SHashObj* pHashMap, STimeWindowAggSupp* pSup, SInterval* pInterval, + SHashObj* pPullDataMap, SArray* closeWins, SArray* pRecyPages, + SDiskbasedBuf* pDiscBuf) { void* pIte = NULL; size_t keyLen = 0; while ((pIte = taosHashIterate(pHashMap, pIte)) != NULL) { @@ -1497,8 +1497,8 @@ static void closeChildIntervalWindow(SArray* pChildren, TSKEY maxTs) { SStreamFinalIntervalOperatorInfo* pChInfo = pChildOp->info; ASSERT(pChInfo->twAggSup.calTrigger == STREAM_TRIGGER_AT_ONCE); pChInfo->twAggSup.maxTs = TMAX(pChInfo->twAggSup.maxTs, maxTs); - closeIntervalWindow(pChInfo->aggSup.pResultRowHashTable, &pChInfo->twAggSup, - &pChInfo->interval, NULL, NULL, NULL, pChInfo->aggSup.pResultBuf); + closeIntervalWindow(pChInfo->aggSup.pResultRowHashTable, &pChInfo->twAggSup, &pChInfo->interval, NULL, NULL, NULL, + pChInfo->aggSup.pResultBuf); } } @@ -1544,7 +1544,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) { } if (pOperator->status == OP_RES_TO_RETURN) { - doBuildDeleteResult(pInfo->pDelWins, &pInfo->delIndex ,pInfo->pDelRes); + doBuildDeleteResult(pInfo->pDelWins, &pInfo->delIndex, pInfo->pDelRes); if (pInfo->pDelRes->info.rows > 0) { return pInfo->pDelRes; } @@ -1559,7 +1559,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) { SOperatorInfo* downstream = pOperator->pDownstream[0]; - SArray* pUpdated = taosArrayInit(4, POINTER_BYTES); // SResKeyPos + SArray* pUpdated = taosArrayInit(4, POINTER_BYTES); // SResKeyPos while (1) { SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream); if (pBlock == NULL) { @@ -1568,11 +1568,12 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) { printDataBlock(pBlock, "single interval recv"); if (pBlock->info.type == STREAM_CLEAR) { - doClearWindows(&pInfo->aggSup, &pOperator->exprSupp, &pInfo->interval, - pOperator->exprSupp.numOfExprs, pBlock, NULL); + doClearWindows(&pInfo->aggSup, &pOperator->exprSupp, &pInfo->interval, pOperator->exprSupp.numOfExprs, pBlock, + NULL); qDebug("%s clear existed time window results for updates checked", GET_TASKID(pTaskInfo)); continue; - } if (pBlock->info.type == STREAM_DELETE_DATA) { + } + if (pBlock->info.type == STREAM_DELETE_DATA) { doDeleteSpecifyIntervalWindow(&pInfo->aggSup, pBlock, pInfo->pDelWins, &pInfo->interval); continue; } else if (pBlock->info.type == STREAM_GET_ALL) { @@ -1597,8 +1598,8 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo* pOperator) { hashIntervalAgg(pOperator, &pInfo->binfo.resultRowInfo, pBlock, MAIN_SCAN, pUpdated); } pOperator->status = OP_RES_TO_RETURN; - closeIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, - &pInfo->interval, NULL, pUpdated, pInfo->pRecycledPages, pInfo->aggSup.pResultBuf); + closeIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, &pInfo->interval, NULL, pUpdated, + pInfo->pRecycledPages, pInfo->aggSup.pResultBuf); finalizeUpdatedResult(pOperator->exprSupp.numOfExprs, pInfo->aggSup.pResultBuf, pUpdated, pSup->rowEntryInfoOffset); initMultiResInfoFromArrayList(&pInfo->groupResInfo, pUpdated); @@ -1617,7 +1618,7 @@ static void destroyStateWindowOperatorInfo(void* param, int32_t numOfOutput) { SStateWindowOperatorInfo* pInfo = (SStateWindowOperatorInfo*)param; cleanupBasicInfo(&pInfo->binfo); taosMemoryFreeClear(pInfo->stateKey.pData); - + taosMemoryFreeClear(param); } @@ -1626,7 +1627,7 @@ void destroyIntervalOperatorInfo(void* param, int32_t numOfOutput) { cleanupBasicInfo(&pInfo->binfo); cleanupAggSup(&pInfo->aggSup); taosArrayDestroy(pInfo->pRecycledPages); - + taosMemoryFreeClear(param); } @@ -1650,7 +1651,7 @@ void destroyStreamFinalIntervalOperatorInfo(void* param, int32_t numOfOutput) { } } nodesDestroyNode((SNode*)pInfo->pPhyNode); - + taosMemoryFreeClear(param); } @@ -1793,8 +1794,8 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo* pInfo->pDelWins = taosArrayInit(4, sizeof(SWinRes)); pInfo->delIndex = 0; // pInfo->pDelRes = createPullDataBlock(); todo(liuyao) for delete - pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false);// todo(liuyao) for delete - pInfo->pDelRes->info.type = STREAM_DELETE_RESULT;// todo(liuyao) for delete + pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false); // todo(liuyao) for delete + pInfo->pDelRes->info.type = STREAM_DELETE_RESULT; // todo(liuyao) for delete initResultRowInfo(&pInfo->binfo.resultRowInfo); @@ -1962,7 +1963,7 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) { SExprSupp* pSup = &pOperator->exprSupp; if (pOperator->status == OP_RES_TO_RETURN) { - while(1) { + while (1) { doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf); doFilter(pInfo->pCondition, pBInfo->pRes); @@ -1977,7 +1978,7 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) { } } pOperator->resultInfo.totalRows += pBInfo->pRes->info.rows; - return (pBInfo->pRes->info.rows == 0)? NULL:pBInfo->pRes; + return (pBInfo->pRes->info.rows == 0) ? NULL : pBInfo->pRes; } int64_t st = taosGetTimestampUs(); @@ -2006,7 +2007,7 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) { initGroupedResultInfo(&pInfo->groupResInfo, pInfo->aggSup.pResultRowHashTable, TSDB_ORDER_ASC); blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity); - while(1) { + while (1) { doBuildResultDatablock(pOperator, &pInfo->binfo, &pInfo->groupResInfo, pInfo->aggSup.pResultBuf); doFilter(pInfo->pCondition, pBInfo->pRes); @@ -2021,7 +2022,7 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) { } } pOperator->resultInfo.totalRows += pBInfo->pRes->info.rows; - return (pBInfo->pRes->info.rows == 0)? NULL:pBInfo->pRes; + return (pBInfo->pRes->info.rows == 0) ? NULL : pBInfo->pRes; } static void doKeepPrevRows(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlock* pBlock, int32_t rowIndex) { @@ -2385,13 +2386,14 @@ _error: void destroySWindowOperatorInfo(void* param, int32_t numOfOutput) { SSessionAggOperatorInfo* pInfo = (SSessionAggOperatorInfo*)param; cleanupBasicInfo(&pInfo->binfo); - + taosMemoryFreeClear(param); } SOperatorInfo* createSessionAggOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, int64_t gap, int32_t tsSlotId, - STimeWindowAggSupp* pTwAggSupp, SNode* pCondition, SExecTaskInfo* pTaskInfo) { + STimeWindowAggSupp* pTwAggSupp, SNode* pCondition, + SExecTaskInfo* pTaskInfo) { SSessionAggOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SSessionAggOperatorInfo)); SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo)); if (pInfo == NULL || pOperator == NULL) { @@ -2470,20 +2472,20 @@ bool hasIntervalWindow(SAggSupporter* pSup, TSKEY ts, uint64_t groupId) { return p1 != NULL; } -static void rebuildIntervalWindow(SStreamFinalIntervalOperatorInfo* pInfo, SExprSupp* pSup, - SArray* pWinArray, int32_t groupId, int32_t numOfOutput, SExecTaskInfo* pTaskInfo, SArray* pUpdated) { +static void rebuildIntervalWindow(SStreamFinalIntervalOperatorInfo* pInfo, SExprSupp* pSup, SArray* pWinArray, + int32_t groupId, int32_t numOfOutput, SExecTaskInfo* pTaskInfo, SArray* pUpdated) { int32_t size = taosArrayGetSize(pWinArray); if (!pInfo->pChildren) { return; } for (int32_t i = 0; i < size; i++) { - SWinRes* pWinRes = taosArrayGet(pWinArray, i); - SResultRow* pCurResult = NULL; - STimeWindow ParentWin = {.skey = pWinRes->ts, .ekey = pWinRes->ts+1}; - setTimeWindowOutputBuf(&pInfo->binfo.resultRowInfo, &ParentWin, true, &pCurResult, pWinRes->groupId, pSup->pCtx, numOfOutput, - pSup->rowEntryInfoOffset, &pInfo->aggSup, pTaskInfo); + SWinRes* pWinRes = taosArrayGet(pWinArray, i); + SResultRow* pCurResult = NULL; + STimeWindow ParentWin = {.skey = pWinRes->ts, .ekey = pWinRes->ts + 1}; + setTimeWindowOutputBuf(&pInfo->binfo.resultRowInfo, &ParentWin, true, &pCurResult, pWinRes->groupId, pSup->pCtx, + numOfOutput, pSup->rowEntryInfoOffset, &pInfo->aggSup, pTaskInfo); int32_t numOfChildren = taosArrayGetSize(pInfo->pChildren); - bool find = true; + bool find = true; for (int32_t j = 0; j < numOfChildren; j++) { SOperatorInfo* pChildOp = taosArrayGetP(pInfo->pChildren, j); SIntervalAggOperatorInfo* pChInfo = pChildOp->info; @@ -2493,8 +2495,9 @@ static void rebuildIntervalWindow(SStreamFinalIntervalOperatorInfo* pInfo, SExpr } find = true; SResultRow* pChResult = NULL; - setTimeWindowOutputBuf(&pChInfo->binfo.resultRowInfo, &ParentWin, true, &pChResult, pWinRes->groupId, pChildSup->pCtx, - pChildSup->numOfExprs, pChildSup->rowEntryInfoOffset, &pChInfo->aggSup, pTaskInfo); + setTimeWindowOutputBuf(&pChInfo->binfo.resultRowInfo, &ParentWin, true, &pChResult, pWinRes->groupId, + pChildSup->pCtx, pChildSup->numOfExprs, pChildSup->rowEntryInfoOffset, &pChInfo->aggSup, + pTaskInfo); compactFunctions(pSup->pCtx, pChildSup->pCtx, numOfOutput, pTaskInfo); } if (find && pUpdated) { @@ -2783,18 +2786,16 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { pInfo->binfo.pRes->info.type = pBlock->info.type; } else if (pBlock->info.type == STREAM_CLEAR) { SArray* pUpWins = taosArrayInit(8, sizeof(SWinRes)); - doClearWindows(&pInfo->aggSup, pSup, &pInfo->interval, pOperator->exprSupp.numOfExprs, - pBlock, pUpWins); + doClearWindows(&pInfo->aggSup, pSup, &pInfo->interval, pOperator->exprSupp.numOfExprs, pBlock, pUpWins); if (IS_FINAL_OP(pInfo)) { int32_t childIndex = getChildIndex(pBlock); SOperatorInfo* pChildOp = taosArrayGetP(pInfo->pChildren, childIndex); SStreamFinalIntervalOperatorInfo* pChildInfo = pChildOp->info; SExprSupp* pChildSup = &pChildOp->exprSupp; - doClearWindows(&pChildInfo->aggSup, pChildSup, &pChildInfo->interval, - pChildSup->numOfExprs, pBlock, NULL); - rebuildIntervalWindow(pInfo, pSup, pUpWins, pInfo->binfo.pRes->info.groupId, - pOperator->exprSupp.numOfExprs, pOperator->pTaskInfo, NULL); + doClearWindows(&pChildInfo->aggSup, pChildSup, &pChildInfo->interval, pChildSup->numOfExprs, pBlock, NULL); + rebuildIntervalWindow(pInfo, pSup, pUpWins, pInfo->binfo.pRes->info.groupId, pOperator->exprSupp.numOfExprs, + pOperator->pTaskInfo, NULL); taosArrayDestroy(pUpWins); continue; } @@ -2812,7 +2813,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { SExprSupp* pChildSup = &pChildOp->exprSupp; doDeleteSpecifyIntervalWindow(&pChildInfo->aggSup, pBlock, NULL, &pChildInfo->interval); rebuildIntervalWindow(pInfo, pSup, pInfo->pDelWins, pInfo->binfo.pRes->info.groupId, - pOperator->exprSupp.numOfExprs, pOperator->pTaskInfo, pUpdated); + pOperator->exprSupp.numOfExprs, pOperator->pTaskInfo, pUpdated); continue; } removeResults(pInfo->pDelWins, pUpdated); @@ -2862,8 +2863,8 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs); if (IS_FINAL_OP(pInfo)) { - closeIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, - &pInfo->interval, pInfo->pPullDataMap, pUpdated, pInfo->pRecycledPages, pInfo->aggSup.pResultBuf); + closeIntervalWindow(pInfo->aggSup.pResultRowHashTable, &pInfo->twAggSup, &pInfo->interval, pInfo->pPullDataMap, + pUpdated, pInfo->pRecycledPages, pInfo->aggSup.pResultBuf); closeChildIntervalWindow(pInfo->pChildren, pInfo->twAggSup.maxTs); } @@ -3005,8 +3006,8 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, pInfo->pPullDataRes = createPullDataBlock(); pInfo->ignoreExpiredData = pIntervalPhyNode->window.igExpired; // pInfo->pDelRes = createPullDataBlock(); // todo(liuyao) for delete - pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false);// todo(liuyao) for delete - pInfo->pDelRes->info.type = STREAM_DELETE_RESULT;// todo(liuyao) for delete + pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false); // todo(liuyao) for delete + pInfo->pDelRes->info.type = STREAM_DELETE_RESULT; // todo(liuyao) for delete pInfo->delIndex = 0; pInfo->pDelWins = taosArrayInit(4, sizeof(SWinRes)); @@ -3063,7 +3064,7 @@ void destroyStreamSessionAggOperatorInfo(void* param, int32_t numOfOutput) { taosMemoryFreeClear(pChInfo); } } - + taosMemoryFreeClear(param); } @@ -3152,8 +3153,8 @@ SOperatorInfo* createStreamSessionAggOperatorInfo(SOperatorInfo* downstream, SPh pInfo->pStDeleted = taosHashInit(64, hashFn, true, HASH_NO_LOCK); pInfo->pDelIterator = NULL; // pInfo->pDelRes = createPullDataBlock(); - pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false);// todo(liuyao) for delete - pInfo->pDelRes->info.type = STREAM_DELETE_RESULT;// todo(liuyao) for delete + pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false); // todo(liuyao) for delete + pInfo->pDelRes->info.type = STREAM_DELETE_RESULT; // todo(liuyao) for delete pInfo->pChildren = NULL; pInfo->isFinal = false; pInfo->pPhyNode = pPhyNode; @@ -3206,9 +3207,7 @@ bool isInTimeWindow(STimeWindow* pWin, TSKEY ts, int64_t gap) { return false; } -bool isInWindow(SResultWindowInfo* pWinInfo, TSKEY ts, int64_t gap) { - return isInTimeWindow(&pWinInfo->win, ts, gap); -} +bool isInWindow(SResultWindowInfo* pWinInfo, TSKEY ts, int64_t gap) { return isInTimeWindow(&pWinInfo->win, ts, gap); } static SResultWindowInfo* insertNewSessionWindow(SArray* pWinInfos, TSKEY ts, int32_t index) { SResultWindowInfo win = {.pos.offset = -1, .pos.pageId = -1, .win.skey = ts, .win.ekey = ts, .isOutput = false}; @@ -3234,7 +3233,7 @@ SArray* getWinInfos(SStreamAggSupporter* pAggSup, uint64_t groupId) { // don't add new window SResultWindowInfo* getCurSessionWindow(SStreamAggSupporter* pAggSup, TSKEY startTs, TSKEY endTs, uint64_t groupId, - int64_t gap, int32_t* pIndex) { + int64_t gap, int32_t* pIndex) { SArray* pWinInfos = getWinInfos(pAggSup, groupId); pAggSup->pCurWins = pWinInfos; @@ -3243,7 +3242,7 @@ SResultWindowInfo* getCurSessionWindow(SStreamAggSupporter* pAggSup, TSKEY start return NULL; } // find the first position which is smaller than the key - int32_t index = binarySearch(pWinInfos, size, startTs, TSDB_ORDER_DESC, getSessionWindowEndkey); + int32_t index = binarySearch(pWinInfos, size, startTs, TSDB_ORDER_DESC, getSessionWindowEndkey); SResultWindowInfo* pWin = NULL; if (index >= 0) { pWin = taosArrayGet(pWinInfos, index); @@ -3514,16 +3513,15 @@ void deleteWindow(SArray* pWinInfos, int32_t index) { static void doDeleteTimeWindows(SStreamAggSupporter* pAggSup, SSDataBlock* pBlock, int64_t gap, SArray* result) { SColumnInfoData* pStartTsCol = taosArrayGet(pBlock->pDataBlock, START_TS_COLUMN_INDEX); - TSKEY* startDatas = (TSKEY*)pStartTsCol->pData; + TSKEY* startDatas = (TSKEY*)pStartTsCol->pData; SColumnInfoData* pEndTsCol = taosArrayGet(pBlock->pDataBlock, END_TS_COLUMN_INDEX); - TSKEY* endDatas = (TSKEY*)pEndTsCol->pData; + TSKEY* endDatas = (TSKEY*)pEndTsCol->pData; SColumnInfoData* pGroupCol = taosArrayGet(pBlock->pDataBlock, UID_COLUMN_INDEX); - uint64_t* gpDatas = (uint64_t*)pGroupCol->pData; + uint64_t* gpDatas = (uint64_t*)pGroupCol->pData; for (int32_t i = 0; i < pBlock->info.rows; i++) { int32_t winIndex = 0; - while(1) { - SResultWindowInfo* pCurWin = - getCurSessionWindow(pAggSup, startDatas[i], endDatas[i], gpDatas[i], gap, &winIndex); + while (1) { + SResultWindowInfo* pCurWin = getCurSessionWindow(pAggSup, startDatas[i], endDatas[i], gpDatas[i], gap, &winIndex); if (!pCurWin) { break; } @@ -3755,8 +3753,8 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) { if (pBlock->info.type == STREAM_CLEAR) { SArray* pWins = taosArrayInit(16, sizeof(SResultWindowInfo)); - doClearSessionWindows(&pInfo->streamAggSup, &pOperator->exprSupp, pBlock, 0, pOperator->exprSupp.numOfExprs, - 0, pWins); + doClearSessionWindows(&pInfo->streamAggSup, &pOperator->exprSupp, pBlock, 0, pOperator->exprSupp.numOfExprs, 0, + pWins); if (IS_FINAL_OP(pInfo)) { int32_t childIndex = getChildIndex(pBlock); SOperatorInfo* pChildOp = taosArrayGetP(pInfo->pChildren, childIndex); @@ -3910,7 +3908,7 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) { break; } else if (pBlock->info.type == STREAM_DELETE_DATA || pBlock->info.type == STREAM_DELETE_RESULT) { // gap must be 0 - doDeleteTimeWindows(&pInfo->streamAggSup, pBlock, 0, NULL); + doDeleteTimeWindows(&pInfo->streamAggSup, pBlock, 0, NULL); copyDataBlock(pInfo->pDelRes, pBlock); pInfo->pDelRes->info.type = STREAM_DELETE_RESULT; break; @@ -4398,8 +4396,8 @@ SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhys pInfo->pSeDeleted = taosHashInit(64, hashFn, true, HASH_NO_LOCK); pInfo->pDelIterator = NULL; // pInfo->pDelRes = createPullDataBlock(); // todo(liuyao) for delete - pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false);// todo(liuyao) for delete - pInfo->pDelRes->info.type = STREAM_DELETE_RESULT;// todo(liuyao) for delete + pInfo->pDelRes = createOneDataBlock(pInfo->binfo.pRes, false); // todo(liuyao) for delete + pInfo->pDelRes->info.type = STREAM_DELETE_RESULT; // todo(liuyao) for delete pInfo->pChildren = NULL; pInfo->ignoreExpiredData = pStateNode->window.igExpired; @@ -4428,17 +4426,6 @@ _error: return NULL; } -typedef struct SMergeAlignedIntervalAggOperatorInfo { - SIntervalAggOperatorInfo *intervalAggOperatorInfo; - - bool hasGroupId; - uint64_t groupId; - SSDataBlock* prefetchedBlock; - bool inputBlocksFinished; - - SNode* pCondition; -} SMergeAlignedIntervalAggOperatorInfo; - void destroyMergeAlignedIntervalOperatorInfo(void* param, int32_t numOfOutput) { SMergeAlignedIntervalAggOperatorInfo* miaInfo = (SMergeAlignedIntervalAggOperatorInfo*)param; destroyIntervalOperatorInfo(miaInfo->intervalAggOperatorInfo, numOfOutput); @@ -4514,7 +4501,8 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR currTs = tsCols[currPos]; currWin.skey = currTs; currWin.ekey = taosTimeAdd(currWin.skey, iaInfo->interval.interval, iaInfo->interval.intervalUnit, - iaInfo->interval.precision) - 1; + iaInfo->interval.precision) - + 1; startPos = currPos; ret = setTimeWindowOutputBuf(pResultRowInfo, &currWin, (scanFlag == MAIN_SCAN), &pResult, tableGroupId, pSup->pCtx, numOfOutput, pSup->rowEntryInfoOffset, &iaInfo->aggSup, pTaskInfo); @@ -4593,7 +4581,8 @@ static SSDataBlock* doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) { SOperatorInfo* createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SInterval* pInterval, - int32_t primaryTsSlotId, SNode* pCondition, SExecTaskInfo* pTaskInfo) { + int32_t primaryTsSlotId, SNode* pCondition, + SExecTaskInfo* pTaskInfo) { SMergeAlignedIntervalAggOperatorInfo* miaInfo = taosMemoryCalloc(1, sizeof(SMergeAlignedIntervalAggOperatorInfo)); SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo)); if (miaInfo == NULL || pOperator == NULL) { @@ -4683,7 +4672,7 @@ void destroyMergeIntervalOperatorInfo(void* param, int32_t numOfOutput) { SMergeIntervalAggOperatorInfo* miaInfo = (SMergeIntervalAggOperatorInfo*)param; tdListFree(miaInfo->groupIntervals); destroyIntervalOperatorInfo(&miaInfo->intervalAggOperatorInfo, numOfOutput); - + taosMemoryFreeClear(param); } diff --git a/source/libs/planner/src/planPhysiCreater.c b/source/libs/planner/src/planPhysiCreater.c index 18d69d21d8..d10fe1ce0c 100644 --- a/source/libs/planner/src/planPhysiCreater.c +++ b/source/libs/planner/src/planPhysiCreater.c @@ -1317,10 +1317,7 @@ static int32_t createFillPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChildren } if (TSDB_CODE_SUCCESS == code) { - pFill->pWStartTs = nodesCloneNode(pFillNode->pWStartTs); - if (NULL == pFill->pWStartTs) { - code = TSDB_CODE_OUT_OF_MEMORY; - } + code = setNodeSlotId(pCxt, pChildTupe->dataBlockId, -1, pFillNode->pWStartTs, &pFill->pWStartTs); } if (TSDB_CODE_SUCCESS == code && NULL != pFillNode->pValues) { From 75ed474f0968b90d0ca2d8178f822b7b970cad03 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Fri, 8 Jul 2022 19:55:06 +0800 Subject: [PATCH 14/25] ci(stream): add session test --- source/libs/executor/inc/executil.h | 2 ++ source/libs/executor/src/executil.c | 2 +- source/libs/executor/src/timewindowoperator.c | 1 + tests/script/jenkins/basic.txt | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h index 2c8fbe9206..f9aba30a46 100644 --- a/source/libs/executor/inc/executil.h +++ b/source/libs/executor/inc/executil.h @@ -126,4 +126,6 @@ void cleanupQueryTableDataCond(SQueryTableDataCond* pCond); int32_t convertFillType(int32_t mode); +int32_t resultrowComparAsc(const void* p1, const void* p2); + #endif // TDENGINE_QUERYUTIL_H diff --git a/source/libs/executor/src/executil.c b/source/libs/executor/src/executil.c index e3579f9dcb..adbfa2c4ba 100644 --- a/source/libs/executor/src/executil.c +++ b/source/libs/executor/src/executil.c @@ -77,7 +77,7 @@ void cleanupGroupResInfo(SGroupResInfo* pGroupResInfo) { pGroupResInfo->index = 0; } -static int32_t resultrowComparAsc(const void* p1, const void* p2) { +int32_t resultrowComparAsc(const void* p1, const void* p2) { SResKeyPos* pp1 = *(SResKeyPos**)p1; SResKeyPos* pp2 = *(SResKeyPos**)p2; diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index 64c27fdb28..ed8ea56329 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -3441,6 +3441,7 @@ static int32_t copyUpdateResult(SHashObj* pStUpdated, SArray* pUpdated) { *(int64_t*)pos->key = ((SWinRes*)pData)->ts; taosArrayPush(pUpdated, &pos); } + taosArraySort(pUpdated, resultrowComparAsc); return TSDB_CODE_SUCCESS; } diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 906c2b8792..94414edbf2 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -98,7 +98,7 @@ ./test.sh -f tsim/stream/distributeInterval0.sim # ./test.sh -f tsim/stream/distributeIntervalRetrive0.sim # ./test.sh -f tsim/stream/distributesession0.sim -# ./test.sh -f tsim/stream/session0.sim +./test.sh -f tsim/stream/session0.sim ./test.sh -f tsim/stream/session1.sim # ./test.sh -f tsim/stream/state0.sim ./test.sh -f tsim/stream/triggerInterval0.sim From 246562024590f03e0dbaaa22cb5c34647a5cc31e Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Sun, 10 Jul 2022 16:09:54 +0800 Subject: [PATCH 15/25] feat(stream): support expressions --- source/common/src/tdatablock.c | 2 +- source/libs/executor/inc/executorimpl.h | 6 +- source/libs/executor/src/timewindowoperator.c | 64 +++++++++++++++++-- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 4e17a9aea0..3bb829f77a 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -1746,7 +1746,7 @@ char* dumpBlockData(SSDataBlock* pDataBlock, const char* flag, char** pDataBuf) for (int32_t k = 0; k < colNum; k++) { SColumnInfoData* pColInfoData = taosArrayGet(pDataBlock->pDataBlock, k); void* var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes); - if (colDataIsNull(pColInfoData, rows, j, NULL)) { + if (colDataIsNull(pColInfoData, rows, j, NULL) || !var) { len += snprintf(dumpBuf + len, size - len, " %15s |", "NULL"); if (len >= size -1) return dumpBuf; continue; diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index 5f13c83eda..3c674e8d10 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -481,7 +481,7 @@ typedef struct SStreamFinalIntervalOperatorInfo { // SOptrBasicInfo should be first, SAggSupporter should be second for stream encode SOptrBasicInfo binfo; // basic info SAggSupporter aggSup; // aggregate supporter - + SExprSupp scalarSupp; // supporter for perform scalar function SGroupResInfo groupResInfo; // multiple results build supporter SInterval interval; // interval info int32_t primaryTsIndex; // primary time stamp slot id from result of downstream operator. @@ -629,6 +629,7 @@ typedef struct SStateWindowInfo { typedef struct SStreamSessionAggOperatorInfo { SOptrBasicInfo binfo; SStreamAggSupporter streamAggSup; + SExprSupp scalarSupp; // supporter for perform scalar function SGroupResInfo groupResInfo; int64_t gap; // session window gap int32_t primaryTsIndex; // primary timestamp slot id @@ -679,11 +680,12 @@ typedef struct SStateWindowOperatorInfo { typedef struct SStreamStateAggOperatorInfo { SOptrBasicInfo binfo; SStreamAggSupporter streamAggSup; + SExprSupp scalarSupp; // supporter for perform scalar function SGroupResInfo groupResInfo; int32_t primaryTsIndex; // primary timestamp slot id int32_t order; // current SSDataBlock scan order STimeWindowAggSupp twAggSup; - SColumn stateCol; // start row index + SColumn stateCol; SqlFunctionCtx* pDummyCtx; // for combine SSDataBlock* pDelRes; SHashObj* pSeDeleted; diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index ed8ea56329..78775073a4 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -2401,6 +2401,12 @@ void addPullWindow(SHashObj* pMap, SWinRes* pWinRes, int32_t size) { static int32_t getChildIndex(SSDataBlock* pBlock) { return pBlock->info.childId; } +STimeWindow getFinalTimeWindow(int64_t ts, SInterval* pInterval) { + STimeWindow w = {.skey = ts, .ekey = INT64_MAX}; + w.ekey = taosTimeAdd(w.skey, pInterval->interval, pInterval->intervalUnit, pInterval->precision) - 1; + return w; +} + static void doHashInterval(SOperatorInfo* pOperatorInfo, SSDataBlock* pSDataBlock, uint64_t tableGroupId, SArray* pUpdated) { SStreamFinalIntervalOperatorInfo* pInfo = (SStreamFinalIntervalOperatorInfo*)pOperatorInfo->info; @@ -2420,8 +2426,12 @@ static void doHashInterval(SOperatorInfo* pOperatorInfo, SSDataBlock* pSDataBloc int32_t startPos = ascScan ? 0 : (pSDataBlock->info.rows - 1); TSKEY ts = getStartTsKey(&pSDataBlock->info.window, tsCols); - STimeWindow nextWin = - getActiveTimeWindow(pInfo->aggSup.pResultBuf, pResultRowInfo, ts, &pInfo->interval, pInfo->order); + STimeWindow nextWin = {0}; + if (IS_FINAL_OP(pInfo)) { + nextWin = getFinalTimeWindow(ts, &pInfo->interval); + } else { + nextWin = getActiveTimeWindow(pInfo->aggSup.pResultBuf, pResultRowInfo, ts, &pInfo->interval, pInfo->order); + } while (1) { bool isClosed = isCloseWindow(&nextWin, &pInfo->twAggSup); if (pInfo->ignoreExpiredData && isClosed) { @@ -2478,8 +2488,12 @@ static void doHashInterval(SOperatorInfo* pOperatorInfo, SSDataBlock* pSDataBloc longjmp(pTaskInfo->env, TSDB_CODE_QRY_OUT_OF_MEMORY); } - forwardRows = getNumOfRowsInTimeWindow(&pSDataBlock->info, tsCols, startPos, nextWin.ekey, binarySearchForKey, NULL, + if (IS_FINAL_OP(pInfo)) { + forwardRows = 1; + } else { + forwardRows = getNumOfRowsInTimeWindow(&pSDataBlock->info, tsCols, startPos, nextWin.ekey, binarySearchForKey, NULL, TSDB_ORDER_ASC); + } if (pInfo->twAggSup.calTrigger == STREAM_TRIGGER_AT_ONCE && pUpdated) { saveResultRow(pResult, tableGroupId, pUpdated); } @@ -2645,7 +2659,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { clearSpecialDataBlock(pInfo->pUpdateRes); removeDeleteResults(pUpdated, pInfo->pDelWins); pOperator->status = OP_RES_TO_RETURN; - qInfo("Stream Final Interval return data"); + qInfo("%s return data", IS_FINAL_OP(pInfo) ? "interval Final" : "interval Semi"); break; } printDataBlock(pBlock, IS_FINAL_OP(pInfo) ? "interval Final recv" : "interval Semi recv"); @@ -2705,6 +2719,10 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { continue; } + if (pInfo->scalarSupp.pExprInfo != NULL) { + SExprSupp* pExprSup = &pInfo->scalarSupp; + projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL); + } setInputDataBlock(pOperator, pSup->pCtx, pBlock, pInfo->order, MAIN_SCAN, true); doHashInterval(pOperator, pBlock, pBlock->info.groupId, pUpdated); if (IS_FINAL_OP(pInfo)) { @@ -2822,6 +2840,15 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, pInfo->primaryTsIndex = ((SColumnNode*)pIntervalPhyNode->window.pTspk)->slotId; size_t keyBufSize = sizeof(int64_t) + sizeof(int64_t) + POINTER_BYTES; initResultSizeInfo(pOperator, 4096); + if (pIntervalPhyNode->window.pExprs != NULL) { + int32_t numOfScalar = 0; + SExprInfo* pScalarExprInfo = createExprInfo(pIntervalPhyNode->window.pExprs, NULL, &numOfScalar); + int32_t code = initExprSupp(&pInfo->scalarSupp, pScalarExprInfo, numOfScalar); + if (code != TSDB_CODE_SUCCESS) { + goto _error; + } + } + int32_t numOfCols = 0; SExprInfo* pExprInfo = createExprInfo(pIntervalPhyNode->window.pFuncs, NULL, &numOfCols); SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc); @@ -2988,6 +3015,14 @@ SOperatorInfo* createStreamSessionAggOperatorInfo(SOperatorInfo* downstream, SPh } initResultSizeInfo(pOperator, 4096); + if (pSessionNode->window.pExprs != NULL) { + int32_t numOfScalar = 0; + SExprInfo* pScalarExprInfo = createExprInfo(pSessionNode->window.pExprs, NULL, &numOfScalar); + int32_t code = initExprSupp(&pInfo->scalarSupp, pScalarExprInfo, numOfScalar); + if (code != TSDB_CODE_SUCCESS) { + goto _error; + } + } SExprSupp* pSup = &pOperator->exprSupp; code = initBasicInfoEx(&pInfo->binfo, pSup, pExprInfo, numOfCols, pResBlock); @@ -3656,6 +3691,10 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) { continue; } + if (pInfo->scalarSupp.pExprInfo != NULL) { + SExprSupp* pExprSup = &pInfo->scalarSupp; + projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL); + } // the pDataBlock are always the same one, no need to call this again setInputDataBlock(pOperator, pSup->pCtx, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true); doStreamSessionAggImpl(pOperator, pBlock, pStUpdated, pInfo->pStDeleted, IS_FINAL_OP(pInfo)); @@ -3788,6 +3827,10 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) { continue; } + if (pInfo->scalarSupp.pExprInfo != NULL) { + SExprSupp* pExprSup = &pInfo->scalarSupp; + projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL); + } // the pDataBlock are always the same one, no need to call this again setInputDataBlock(pOperator, pSup->pCtx, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true); doStreamSessionAggImpl(pOperator, pBlock, pStUpdated, pInfo->pStDeleted, false); @@ -4184,6 +4227,10 @@ static SSDataBlock* doStreamStateAgg(SOperatorInfo* pOperator) { continue; } + if (pInfo->scalarSupp.pExprInfo != NULL) { + SExprSupp* pExprSup = &pInfo->scalarSupp; + projectApplyFunctions(pExprSup->pExprInfo, pBlock, pBlock, pExprSup->pCtx, pExprSup->numOfExprs, NULL); + } // the pDataBlock are always the same one, no need to call this again setInputDataBlock(pOperator, pSup->pCtx, pBlock, TSDB_ORDER_ASC, MAIN_SCAN, true); doStreamStateAggImpl(pOperator, pBlock, pSeUpdated, pInfo->pSeDeleted); @@ -4237,6 +4284,15 @@ SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhys pInfo->stateCol = extractColumnFromColumnNode(pColNode); initResultSizeInfo(pOperator, 4096); + if (pStateNode->window.pExprs != NULL) { + int32_t numOfScalar = 0; + SExprInfo* pScalarExprInfo = createExprInfo(pStateNode->window.pExprs, NULL, &numOfScalar); + int32_t code = initExprSupp(&pInfo->scalarSupp, pScalarExprInfo, numOfScalar); + if (code != TSDB_CODE_SUCCESS) { + goto _error; + } + } + initResultRowInfo(&pInfo->binfo.resultRowInfo); pInfo->twAggSup = (STimeWindowAggSupp){ .waterMark = pStateNode->window.watermark, From 9fe73acc86ecab132c322d29cd889a05a0d6024d Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 10 Jul 2022 18:53:52 +0800 Subject: [PATCH 16/25] refactor: adjust logs --- source/common/src/tglobal.c | 22 +++++++++------------ source/libs/qworker/src/qworker.c | 2 +- source/util/src/tlog.c | 11 +++++------ tests/script/sh/deploy.sh | 33 ++++++++++++++++--------------- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index ab5ce3742a..98cd6e861e 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -292,15 +292,14 @@ int32_t taosAddClientLogCfg(SConfig *pCfg) { if (cfgAddInt32(pCfg, "numOfLogLines", tsNumOfLogLines, 1000, 2000000000, 1) != 0) return -1; if (cfgAddBool(pCfg, "asyncLog", tsAsyncLog, 1) != 0) return -1; if (cfgAddInt32(pCfg, "logKeepDays", 0, -365000, 365000, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "cDebugFlag", cDebugFlag, 0, 255, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "debugFlag", 0, 0, 255, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "simDebugFlag", 143, 0, 255, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "tmrDebugFlag", tmrDebugFlag, 0, 255, 1) != 0) return -1; if (cfgAddInt32(pCfg, "uDebugFlag", uDebugFlag, 0, 255, 1) != 0) return -1; if (cfgAddInt32(pCfg, "rpcDebugFlag", rpcDebugFlag, 0, 255, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "qDebugFlag", qDebugFlag, 0, 255, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "tmrDebugFlag", tmrDebugFlag, 0, 255, 1) != 0) return -1; if (cfgAddInt32(pCfg, "jniDebugFlag", jniDebugFlag, 0, 255, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "simDebugFlag", 143, 0, 255, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "debugFlag", 0, 0, 255, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "idxDebugFlag", idxDebugFlag, 0, 255, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "qDebugFlag", qDebugFlag, 0, 255, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "cDebugFlag", cDebugFlag, 0, 255, 1) != 0) return -1; return 0; } @@ -308,7 +307,6 @@ static int32_t taosAddServerLogCfg(SConfig *pCfg) { if (cfgAddInt32(pCfg, "dDebugFlag", dDebugFlag, 0, 255, 0) != 0) return -1; if (cfgAddInt32(pCfg, "vDebugFlag", vDebugFlag, 0, 255, 0) != 0) return -1; if (cfgAddInt32(pCfg, "mDebugFlag", mDebugFlag, 0, 255, 0) != 0) return -1; - if (cfgAddInt32(pCfg, "qDebugFlag", qDebugFlag, 0, 255, 0) != 0) return -1; if (cfgAddInt32(pCfg, "wDebugFlag", wDebugFlag, 0, 255, 0) != 0) return -1; if (cfgAddInt32(pCfg, "sDebugFlag", sDebugFlag, 0, 255, 0) != 0) return -1; if (cfgAddInt32(pCfg, "tsdbDebugFlag", tsdbDebugFlag, 0, 255, 0) != 0) return -1; @@ -485,20 +483,18 @@ static void taosSetClientLogCfg(SConfig *pCfg) { tsNumOfLogLines = cfgGetItem(pCfg, "numOfLogLines")->i32; tsAsyncLog = cfgGetItem(pCfg, "asyncLog")->bval; tsLogKeepDays = cfgGetItem(pCfg, "logKeepDays")->i32; - cDebugFlag = cfgGetItem(pCfg, "cDebugFlag")->i32; - uDebugFlag = cfgGetItem(pCfg, "uDebugFlag")->i32; - qDebugFlag = cfgGetItem(pCfg, "qDebugFlag")->i32; - rpcDebugFlag = cfgGetItem(pCfg, "rpcDebugFlag")->i32; tmrDebugFlag = cfgGetItem(pCfg, "tmrDebugFlag")->i32; + uDebugFlag = cfgGetItem(pCfg, "uDebugFlag")->i32; jniDebugFlag = cfgGetItem(pCfg, "jniDebugFlag")->i32; - idxDebugFlag = cfgGetItem(pCfg, "idxDebugFlag")->i32; + rpcDebugFlag = cfgGetItem(pCfg, "rpcDebugFlag")->i32; + qDebugFlag = cfgGetItem(pCfg, "qDebugFlag")->i32; + cDebugFlag = cfgGetItem(pCfg, "cDebugFlag")->i32; } static void taosSetServerLogCfg(SConfig *pCfg) { dDebugFlag = cfgGetItem(pCfg, "dDebugFlag")->i32; vDebugFlag = cfgGetItem(pCfg, "vDebugFlag")->i32; mDebugFlag = cfgGetItem(pCfg, "mDebugFlag")->i32; - qDebugFlag = cfgGetItem(pCfg, "qDebugFlag")->i32; wDebugFlag = cfgGetItem(pCfg, "wDebugFlag")->i32; sDebugFlag = cfgGetItem(pCfg, "sDebugFlag")->i32; tsdbDebugFlag = cfgGetItem(pCfg, "tsdbDebugFlag")->i32; diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c index 757279269a..3e8ced318c 100644 --- a/source/libs/qworker/src/qworker.c +++ b/source/libs/qworker/src/qworker.c @@ -1041,7 +1041,7 @@ int32_t qWorkerInit(int8_t nodeType, int32_t nodeId, SQWorkerCfg *cfg, void **qW *qWorkerMgmt = mgmt; - qDebug("qworker initialized for node, type:%d, id:%d, handle:%p", mgmt->nodeType, mgmt->nodeId, mgmt); + qDebug("qworker initialized, type:%d, id:%d, handle:%p", mgmt->nodeType, mgmt->nodeId, mgmt); return TSDB_CODE_SUCCESS; diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index 9d7656de35..490c6f29bf 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -745,14 +745,14 @@ cmp_end: void taosSetAllDebugFlag(int32_t flag) { if (flag <= 0) return; + uDebugFlag = flag; + rpcDebugFlag = flag; + jniDebugFlag = flag; + qDebugFlag = flag; + cDebugFlag = flag; dDebugFlag = flag; vDebugFlag = flag; mDebugFlag = flag; - cDebugFlag = flag; - jniDebugFlag = flag; - uDebugFlag = flag; - rpcDebugFlag = flag; - qDebugFlag = flag; wDebugFlag = flag; sDebugFlag = flag; tsdbDebugFlag = flag; @@ -761,6 +761,5 @@ void taosSetAllDebugFlag(int32_t flag) { udfDebugFlag = flag; smaDebugFlag = flag; idxDebugFlag = flag; - uInfo("all debug flag are set to %d", flag); } diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 4d93878a98..de7b8ecfbf 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -122,28 +122,29 @@ echo "secondEp ${HOSTNAME}:7200" >> $TAOS_CFG echo "fqdn ${HOSTNAME}" >> $TAOS_CFG echo "serverPort ${NODE}" >> $TAOS_CFG echo "supportVnodes 1024" >> $TAOS_CFG +echo "statusInterval 1" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG echo "debugFlag 0" >> $TAOS_CFG -echo "mDebugFlag 143" >> $TAOS_CFG -echo "dDebugFlag 143" >> $TAOS_CFG -echo "vDebugFlag 143" >> $TAOS_CFG -echo "tqDebugFlag 143" >> $TAOS_CFG -echo "tsdbDebugFlag 143" >> $TAOS_CFG -echo "cDebugFlag 143" >> $TAOS_CFG -echo "jniDebugFlag 143" >> $TAOS_CFG -echo "qDebugFlag 143" >> $TAOS_CFG -echo "rpcDebugFlag 143" >> $TAOS_CFG -echo "sDebugFlag 143" >> $TAOS_CFG -echo "wDebugFlag 143" >> $TAOS_CFG -echo "idxDebugFlag 143" >> $TAOS_CFG -echo "fsDebugFlag 143" >> $TAOS_CFG -echo "udfDebugFlag 143" >> $TAOS_CFG -echo "smaDebugFlag 143" >> $TAOS_CFG echo "tmrDebugFlag 131" >> $TAOS_CFG echo "uDebugFlag 131" >> $TAOS_CFG +echo "rpcDebugFlag 131" >> $TAOS_CFG +echo "jniDebugFlag 143" >> $TAOS_CFG +echo "qDebugFlag 143" >> $TAOS_CFG +echo "cDebugFlag 143" >> $TAOS_CFG +echo "dDebugFlag 143" >> $TAOS_CFG +echo "vDebugFlag 143" >> $TAOS_CFG +echo "mDebugFlag 143" >> $TAOS_CFG +echo "wDebugFlag 143" >> $TAOS_CFG +echo "sDebugFlag 143" >> $TAOS_CFG +echo "tsdbDebugFlag 143" >> $TAOS_CFG +echo "tqDebugFlag 143" >> $TAOS_CFG +echo "fsDebugFlag 143" >> $TAOS_CFG +echo "idxDebugFlag 143" >> $TAOS_CFG +echo "udfDebugFlag 143" >> $TAOS_CFG +echo "smaDebugFlag 143" >> $TAOS_CFG +echo "idxDebugFlag 143" >> $TAOS_CFG echo "numOfLogLines 20000000" >> $TAOS_CFG -echo "statusInterval 1" >> $TAOS_CFG echo "asyncLog 0" >> $TAOS_CFG echo "locale en_US.UTF-8" >> $TAOS_CFG echo "telemetryReporting 0" >> $TAOS_CFG From 9e4c4c50a0212fdb2275b6f1b5de0109a19df855 Mon Sep 17 00:00:00 2001 From: Minghao Li Date: Sun, 10 Jul 2022 19:10:06 +0800 Subject: [PATCH 17/25] refactor(sync): update to SYNC_STRATEGY_WAL_FIRST --- source/dnode/vnode/src/vnd/vnodeSync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c index 1508b67f5e..97ce8eaab7 100644 --- a/source/dnode/vnode/src/vnd/vnodeSync.c +++ b/source/dnode/vnode/src/vnd/vnodeSync.c @@ -548,8 +548,8 @@ static SSyncFSM *vnodeSyncMakeFsm(SVnode *pVnode) { int32_t vnodeSyncOpen(SVnode *pVnode, char *path) { SSyncInfo syncInfo = { - //.snapshotStrategy = SYNC_STRATEGY_WAL_FIRST, - .snapshotStrategy = SYNC_STRATEGY_NO_SNAPSHOT, + .snapshotStrategy = SYNC_STRATEGY_WAL_FIRST, + //.snapshotStrategy = SYNC_STRATEGY_NO_SNAPSHOT, .batchSize = 10, .vgId = pVnode->config.vgId, .isStandBy = pVnode->config.standby, From e13dd96782c6a4504add74e13600aabf4083b669 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 10 Jul 2022 19:02:53 +0800 Subject: [PATCH 18/25] test: valgrind case --- tests/script/tsim/valgrind/basic2.sim | 2 +- tests/script/tsim/valgrind/checkError2.sim | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/script/tsim/valgrind/basic2.sim b/tests/script/tsim/valgrind/basic2.sim index eb61f85444..154617bc18 100644 --- a/tests/script/tsim/valgrind/basic2.sim +++ b/tests/script/tsim/valgrind/basic2.sim @@ -48,7 +48,7 @@ sql insert into ct1 values(now+1s, 11, 2.1, 3.1)(now+2s, -12, -2.2, -3.2)(now+3s print =============== step6: select data sql select * from ct1 -#sql select * from stb +sql select * from stb _OVER: system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/tsim/valgrind/checkError2.sim b/tests/script/tsim/valgrind/checkError2.sim index f98cd0df1d..3a2819776d 100644 --- a/tests/script/tsim/valgrind/checkError2.sim +++ b/tests/script/tsim/valgrind/checkError2.sim @@ -47,7 +47,7 @@ sql insert into ct1 values(now+0s, 10, 2.0, 3.0) sql insert into ct1 values(now+1s, 11, 2.1, 3.1)(now+2s, -12, -2.2, -3.2)(now+3s, -13, -2.3, -3.3) print =============== step6: select data -#sql select * from ct1 +sql select * from ct1 #sql select * from stb _OVER: @@ -58,7 +58,7 @@ print ----> start to check if there are ERRORS in vagrind log file for each dnod system_content sh/checkValgrind.sh -n dnode1 print cmd return result ----> [ $system_content ] -if $system_content <= 0 then +if $system_content <= 2 then return 0 endi From bcacc1d6b53ff97e4cdda6e613747fca9f28324f Mon Sep 17 00:00:00 2001 From: tomchon Date: Sun, 10 Jul 2022 19:15:36 +0800 Subject: [PATCH 19/25] test:comment mnode case --- tests/system-test/fulltest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index f6f902e890..3b0dd76a30 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -135,8 +135,8 @@ python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py -N 5 - # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeStopInsert.py # python3 ./test.py -f 6-cluster/5dnode3mnodeDrop.py -N 5 # python3 test.py -f 6-cluster/5dnode3mnodeStopConnect.py -N 5 -M 3 -python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 6 -M 3 -C 5 -python3 ./test.py -f 6-cluster/5dnode3mnodeRestartDnodeInsertData.py -N 5 -M 3 +# BUG Redict python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 6 -M 3 -C 5 +# python3 ./test.py -f 6-cluster/5dnode3mnodeRestartDnodeInsertData.py -N 5 -M 3 python3 ./test.py -f 7-tmq/basic5.py python3 ./test.py -f 7-tmq/subscribeDb.py From 5c3c418c7f718256541e1c017a2658bb23a07947 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sun, 10 Jul 2022 20:59:56 +0800 Subject: [PATCH 20/25] fix(query): set correct the fill column value for in case of no primary timestamp column exists. --- source/dnode/vnode/src/tsdb/tsdbRead.c | 5 +++++ source/libs/executor/inc/executorimpl.h | 1 + source/libs/executor/src/executorimpl.c | 26 +++++++++++++++---------- source/libs/executor/src/sortoperator.c | 4 ++-- source/libs/executor/src/tfill.c | 5 ++++- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index f650480ff2..52846d8e12 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -297,6 +297,11 @@ static bool filesetIteratorNext(SFilesetIter* pIter, STsdbReader* pReader) { if ((asc && (win.ekey < pReader->window.skey)) || ((!asc) && (win.skey > pReader->window.ekey))) { pIter->index += step; + + if ((asc && pIter->index >= pIter->numOfFiles) || ((!asc) && pIter->index < 0)) { + return false; + } + continue; } diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index 5f13c83eda..8511a88e1c 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -551,6 +551,7 @@ typedef struct SFillOperatorInfo { bool multigroupResult; STimeWindow win; SNode* pCondition; + SArray* pColMatchColInfo; } SFillOperatorInfo; typedef struct SGroupbyOperatorInfo { diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index e9b0141ecc..1e40dfbde3 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -4000,28 +4000,34 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode* QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL == downstream->operatorType ? &((SMergeAlignedIntervalAggOperatorInfo*)downstream->info)->intervalAggOperatorInfo->interval : &((SIntervalAggOperatorInfo*)downstream->info)->interval; + int32_t type = convertFillType(pPhyFillNode->mode); SResultInfo* pResultInfo = &pOperator->resultInfo; initResultSizeInfo(pOperator, 4096); + int32_t numOfOutputCols = 0; + SArray* pColMatchColInfo = + extractColMatchInfo(pPhyFillNode->pTargets, pPhyFillNode->node.pOutputDataBlockDesc, &numOfOutputCols, COL_MATCH_FROM_SLOT_ID); + int32_t code = initFillInfo(pInfo, pExprInfo, num, (SNodeListNode*)pPhyFillNode->pValues, pPhyFillNode->timeRange, pResultInfo->capacity, pTaskInfo->id.str, pInterval, type); if (code != TSDB_CODE_SUCCESS) { goto _error; } - pInfo->pRes = pResBlock; - pInfo->multigroupResult = multigroupResult; - pInfo->pCondition = pPhyFillNode->node.pConditions; - pOperator->name = "FillOperator"; - pOperator->blocking = false; - pOperator->status = OP_NOT_OPENED; - pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_FILL; - pOperator->exprSupp.pExprInfo = pExprInfo; + pInfo->pRes = pResBlock; + pInfo->multigroupResult = multigroupResult; + pInfo->pCondition = pPhyFillNode->node.pConditions; + pInfo->pColMatchColInfo = pColMatchColInfo; + pOperator->name = "FillOperator"; + pOperator->blocking = false; + pOperator->status = OP_NOT_OPENED; + pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_FILL; + pOperator->exprSupp.pExprInfo = pExprInfo; pOperator->exprSupp.numOfExprs = num; - pOperator->info = pInfo; - pOperator->pTaskInfo = pTaskInfo; + pOperator->info = pInfo; + pOperator->pTaskInfo = pTaskInfo; pOperator->fpSet = createOperatorFpSet(operatorDummyOpenFn, doFill, NULL, NULL, destroySFillOperatorInfo, NULL, NULL, NULL); diff --git a/source/libs/executor/src/sortoperator.c b/source/libs/executor/src/sortoperator.c index d106d3e749..8d9cac3614 100644 --- a/source/libs/executor/src/sortoperator.c +++ b/source/libs/executor/src/sortoperator.c @@ -217,6 +217,7 @@ SSDataBlock* doSort(SOperatorInfo* pOperator) { doSetOperatorCompleted(pOperator); break; } + if (blockDataGetNumOfRows(pBlock) > 0) { break; } @@ -601,8 +602,7 @@ SSDataBlock* getMultiwaySortedBlockData(SSortHandle* pHandle, SSDataBlock* pData break; } - if (pInfo->groupSort) - { + if (pInfo->groupSort) { uint64_t tupleGroupId = tsortGetGroupId(pTupleHandle); if (!pInfo->hasGroupId) { pInfo->groupId = tupleGroupId; diff --git a/source/libs/executor/src/tfill.c b/source/libs/executor/src/tfill.c index 1d82d6a644..b0e2166baf 100644 --- a/source/libs/executor/src/tfill.c +++ b/source/libs/executor/src/tfill.c @@ -50,8 +50,11 @@ static void setTagsValue(SFillInfo* pFillInfo, void** data, int32_t genRows) { static void setNullRow(SSDataBlock* pBlock, int32_t numOfCol, int32_t rowIndex) { // the first are always the timestamp column, so start from the second column. - for (int32_t i = 1; i < taosArrayGetSize(pBlock->pDataBlock); ++i) { + for (int32_t i = 0; i < taosArrayGetSize(pBlock->pDataBlock); ++i) { SColumnInfoData* p = taosArrayGet(pBlock->pDataBlock, i); + if (p->info.type == TSDB_DATA_TYPE_TIMESTAMP && i == 0) { + continue; + } colDataAppendNULL(p, rowIndex); } } From 219d966b252d14e2c1b1ff1a788c5b2f24fb551a Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Sun, 10 Jul 2022 20:48:02 +0800 Subject: [PATCH 21/25] fix(wal): read after rolling --- include/common/tcommon.h | 2 +- include/libs/wal/wal.h | 1 + source/client/src/tmq.c | 6 + source/common/src/tglobal.c | 28 ++--- source/dnode/mnode/impl/src/mndConsumer.c | 20 +--- source/dnode/vnode/src/tq/tq.c | 4 +- source/dnode/vnode/src/tq/tqExec.c | 25 +--- source/libs/executor/src/executor.c | 7 +- source/libs/executor/src/executorMain.c | 2 +- source/libs/executor/src/scanoperator.c | 45 +++++-- source/libs/wal/src/walRead.c | 137 ++++++++++++++-------- 11 files changed, 154 insertions(+), 123 deletions(-) diff --git a/include/common/tcommon.h b/include/common/tcommon.h index 28d771bbbd..c16d669a7f 100644 --- a/include/common/tcommon.h +++ b/include/common/tcommon.h @@ -55,7 +55,7 @@ enum { enum { STREAM_INPUT__DATA_SUBMIT = 1, STREAM_INPUT__DATA_BLOCK, - STREAM_INPUT__TABLE_SCAN, + // STREAM_INPUT__TABLE_SCAN, STREAM_INPUT__TQ_SCAN, STREAM_INPUT__DATA_RETRIEVE, STREAM_INPUT__TRIGGER, diff --git a/include/libs/wal/wal.h b/include/libs/wal/wal.h index 9b94864a05..0a8e55bb4f 100644 --- a/include/libs/wal/wal.h +++ b/include/libs/wal/wal.h @@ -124,6 +124,7 @@ typedef struct SWal { typedef struct { int8_t scanUncommited; int8_t scanMeta; + int8_t enableRef; } SWalFilterCond; typedef struct { diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c index c9d949300b..52e757c05c 100644 --- a/source/client/src/tmq.c +++ b/source/client/src/tmq.c @@ -901,6 +901,8 @@ tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) { tmq_t* pTmq = taosMemoryCalloc(1, sizeof(tmq_t)); if (pTmq == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + tscError("consumer %ld setup failed since %s, consumer group %s", pTmq->consumerId, terrstr(), pTmq->groupId); return NULL; } @@ -917,6 +919,8 @@ tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) { pTmq->delayedTask = taosOpenQueue(); if (pTmq->clientTopics == NULL || pTmq->mqueue == NULL || pTmq->qall == NULL || pTmq->delayedTask == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + tscError("consumer %ld setup failed since %s, consumer group %s", pTmq->consumerId, terrstr(), pTmq->groupId); goto FAIL; } @@ -943,12 +947,14 @@ tmq_t* tmq_consumer_new(tmq_conf_t* conf, char* errstr, int32_t errstrLen) { // init semaphore if (tsem_init(&pTmq->rspSem, 0, 0) != 0) { + tscError("consumer %ld setup failed since %s, consumer group %s", pTmq->consumerId, terrstr(), pTmq->groupId); goto FAIL; } // init connection pTmq->pTscObj = taos_connect_internal(conf->ip, user, pass, NULL, NULL, conf->port, CONN_TYPE__TMQ); if (pTmq->pTscObj == NULL) { + tscError("consumer %ld setup failed since %s, consumer group %s", pTmq->consumerId, terrstr(), pTmq->groupId); tsem_destroy(&pTmq->rspSem); goto FAIL; } diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 5b3993dd40..6fe65c9030 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -55,7 +55,7 @@ int32_t tsNumOfMnodeQueryThreads = 2; int32_t tsNumOfMnodeFetchThreads = 1; int32_t tsNumOfMnodeReadThreads = 1; int32_t tsNumOfVnodeQueryThreads = 2; -int32_t tsNumOfVnodeFetchThreads = 1; +int32_t tsNumOfVnodeFetchThreads = 4; int32_t tsNumOfVnodeWriteThreads = 2; int32_t tsNumOfVnodeSyncThreads = 2; int32_t tsNumOfVnodeMergeThreads = 2; @@ -190,7 +190,6 @@ int32_t tsMqRebalanceInterval = 2; int32_t tsTtlUnit = 86400; int32_t tsTtlPushInterval = 60; - void taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t primary) { tstrncpy(tsDiskCfg[index].dir, v1, TSDB_FILENAME_LEN); tsDiskCfg[index].level = level; @@ -470,7 +469,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddInt32(pCfg, "transPullupInterval", tsTransPullupInterval, 1, 10000, 1) != 0) return -1; if (cfgAddInt32(pCfg, "mqRebalanceInterval", tsMqRebalanceInterval, 1, 10000, 1) != 0) return -1; - if (cfgAddInt32(pCfg, "ttlUnit", tsTtlUnit, 1, 86400*365, 1) != 0) return -1; + if (cfgAddInt32(pCfg, "ttlUnit", tsTtlUnit, 1, 86400 * 365, 1) != 0) return -1; if (cfgAddInt32(pCfg, "ttlPushInterval", tsTtlPushInterval, 1, 10000, 1) != 0) return -1; if (cfgAddBool(pCfg, "udf", tsStartUdfd, 0) != 0) return -1; @@ -636,7 +635,7 @@ static int32_t taosSetServerCfg(SConfig *pCfg) { return 0; } -int32_t taosSetCfg(SConfig *pCfg, char* name) { +int32_t taosSetCfg(SConfig *pCfg, char *name) { int32_t len = strlen(name); char lowcaseName[CFG_NAME_MAX_LEN + 1] = {0}; strntolower(lowcaseName, name, TMIN(CFG_NAME_MAX_LEN, len)); @@ -666,7 +665,7 @@ int32_t taosSetCfg(SConfig *pCfg, char* name) { tsCompressColData = cfgGetItem(pCfg, "compressColData")->i32; } else if (strcasecmp("countAlwaysReturnValue", name) == 0) { tsCountAlwaysReturnValue = cfgGetItem(pCfg, "countAlwaysReturnValue")->i32; - } else if (strcasecmp("cDebugFlag", name) == 0) { + } else if (strcasecmp("cDebugFlag", name) == 0) { cDebugFlag = cfgGetItem(pCfg, "cDebugFlag")->i32; } break; @@ -691,10 +690,10 @@ int32_t taosSetCfg(SConfig *pCfg, char* name) { tstrncpy(tsLocalFqdn, cfgGetItem(pCfg, "fqdn")->str, TSDB_FQDN_LEN); tsServerPort = (uint16_t)cfgGetItem(pCfg, "serverPort")->i32; snprintf(tsLocalEp, sizeof(tsLocalEp), "%s:%u", tsLocalFqdn, tsServerPort); - + char defaultFirstEp[TSDB_EP_LEN] = {0}; snprintf(defaultFirstEp, TSDB_EP_LEN, "%s:%u", tsLocalFqdn, tsServerPort); - + SConfigItem *pFirstEpItem = cfgGetItem(pCfg, "firstEp"); SEp firstEp = {0}; taosGetFqdnPortFromEp(strlen(pFirstEpItem->str) == 0 ? defaultFirstEp : pFirstEpItem->str, &firstEp); @@ -704,10 +703,10 @@ int32_t taosSetCfg(SConfig *pCfg, char* name) { tstrncpy(tsLocalFqdn, cfgGetItem(pCfg, "fqdn")->str, TSDB_FQDN_LEN); tsServerPort = (uint16_t)cfgGetItem(pCfg, "serverPort")->i32; snprintf(tsLocalEp, sizeof(tsLocalEp), "%s:%u", tsLocalFqdn, tsServerPort); - + char defaultFirstEp[TSDB_EP_LEN] = {0}; snprintf(defaultFirstEp, TSDB_EP_LEN, "%s:%u", tsLocalFqdn, tsServerPort); - + SConfigItem *pFirstEpItem = cfgGetItem(pCfg, "firstEp"); SEp firstEp = {0}; taosGetFqdnPortFromEp(strlen(pFirstEpItem->str) == 0 ? defaultFirstEp : pFirstEpItem->str, &firstEp); @@ -778,7 +777,7 @@ int32_t taosSetCfg(SConfig *pCfg, char* name) { } else if (strcasecmp("minSlidingTime", name) == 0) { tsMinSlidingTime = cfgGetItem(pCfg, "minSlidingTime")->i32; } else if (strcasecmp("minIntervalTime", name) == 0) { - tsMinIntervalTime = cfgGetItem(pCfg, "minIntervalTime")->i32; + tsMinIntervalTime = cfgGetItem(pCfg, "minIntervalTime")->i32; } else if (strcasecmp("minimalLogDirGB", name) == 0) { tsLogSpace.reserved = cfgGetItem(pCfg, "minimalLogDirGB")->fval; } @@ -924,10 +923,10 @@ int32_t taosSetCfg(SConfig *pCfg, char* name) { tstrncpy(tsLocalFqdn, cfgGetItem(pCfg, "fqdn")->str, TSDB_FQDN_LEN); tsServerPort = (uint16_t)cfgGetItem(pCfg, "serverPort")->i32; snprintf(tsLocalEp, sizeof(tsLocalEp), "%s:%u", tsLocalFqdn, tsServerPort); - + char defaultFirstEp[TSDB_EP_LEN] = {0}; snprintf(defaultFirstEp, TSDB_EP_LEN, "%s:%u", tsLocalFqdn, tsServerPort); - + SConfigItem *pFirstEpItem = cfgGetItem(pCfg, "firstEp"); SEp firstEp = {0}; taosGetFqdnPortFromEp(strlen(pFirstEpItem->str) == 0 ? defaultFirstEp : pFirstEpItem->str, &firstEp); @@ -999,14 +998,13 @@ int32_t taosSetCfg(SConfig *pCfg, char* name) { break; } default: - terrno = TSDB_CODE_CFG_NOT_FOUND; + terrno = TSDB_CODE_CFG_NOT_FOUND; return -1; } - + return 0; } - int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDir, const char **envCmd, const char *envFile, char *apolloUrl, SArray *pArgs, bool tsc) { if (tsCfg == NULL) osDefaultInit(); diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c index 5e7c19ce6a..27b785f4d2 100644 --- a/source/dnode/mnode/impl/src/mndConsumer.c +++ b/source/dnode/mnode/impl/src/mndConsumer.c @@ -15,11 +15,11 @@ #define _DEFAULT_SOURCE #include "mndConsumer.h" -#include "mndPrivilege.h" #include "mndDb.h" #include "mndDnode.h" #include "mndMnode.h" #include "mndOffset.h" +#include "mndPrivilege.h" #include "mndShow.h" #include "mndStb.h" #include "mndSubscribe.h" @@ -435,17 +435,6 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) { goto SUBSCRIBE_OVER; } -#if 0 - // ref topic to prevent drop - // TODO make topic complete - SMqTopicObj topicObj = {0}; - memcpy(&topicObj, pTopic, sizeof(SMqTopicObj)); - topicObj.refConsumerCnt = pTopic->refConsumerCnt + 1; - mInfo("subscribe topic %s by consumer:%" PRId64 ",cgroup %s, refcnt %d", pTopic->name, consumerId, cgroup, - topicObj.refConsumerCnt); - if (mndSetTopicCommitLogs(pMnode, pTrans, &topicObj) != 0) goto SUBSCRIBE_OVER; -#endif - mndReleaseTopic(pMnode, pTopic); } @@ -472,8 +461,8 @@ static int32_t mndProcessSubscribeReq(SRpcMsg *pMsg) { int32_t status = atomic_load_32(&pConsumerOld->status); - mInfo("receive subscribe request from old consumer:%" PRId64 ", current status: %s", consumerId, - mndConsumerStatusName(status)); + mInfo("receive subscribe request from existing consumer:%" PRId64 ", current status: %s, subscribe topic num: %d", + consumerId, mndConsumerStatusName(status), newTopicNum); if (status != MQ_CONSUMER_STATUS__READY) { terrno = TSDB_CODE_MND_CONSUMER_NOT_READY; @@ -849,12 +838,15 @@ static int32_t mndRetrieveConsumer(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock * pShow->pIter = sdbFetch(pSdb, SDB_CONSUMER, pShow->pIter, (void **)&pConsumer); if (pShow->pIter == NULL) break; if (taosArrayGetSize(pConsumer->assignedTopics) == 0) { + mDebug("showing consumer %ld no assigned topic, skip", pConsumer->consumerId); sdbRelease(pSdb, pConsumer); continue; } taosRLockLatch(&pConsumer->lock); + mDebug("showing consumer %ld", pConsumer->consumerId); + int32_t topicSz = taosArrayGetSize(pConsumer->assignedTopics); bool hasTopic = true; if (topicSz == 0) { diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c index ae0f7f56a2..3873073f03 100644 --- a/source/dnode/vnode/src/tq/tq.c +++ b/source/dnode/vnode/src/tq/tq.c @@ -512,9 +512,6 @@ int32_t tqProcessVgChangeReq(STQ* pTq, char* msg, int32_t msgLen) { pHandle->execHandle.execDb.pFilterOutTbUid = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK); } else if (pHandle->execHandle.subType == TOPIC_SUB_TYPE__TABLE) { - for (int32_t i = 0; i < 5; i++) { - pHandle->execHandle.pExecReader[i] = tqOpenReader(pTq->pVnode); - } pHandle->execHandle.execTb.suid = req.suid; SArray* tbUidList = taosArrayInit(0, sizeof(int64_t)); vnodeGetCtbIdList(pTq->pVnode, req.suid, tbUidList); @@ -524,6 +521,7 @@ int32_t tqProcessVgChangeReq(STQ* pTq, char* msg, int32_t msgLen) { tqDebug("vgId:%d, idx %d, uid:%" PRId64, TD_VID(pTq->pVnode), i, tbUid); } for (int32_t i = 0; i < 5; i++) { + pHandle->execHandle.pExecReader[i] = tqOpenReader(pTq->pVnode); tqReaderSetTbUidList(pHandle->execHandle.pExecReader[i], tbUidList); } taosArrayDestroy(tbUidList); diff --git a/source/dnode/vnode/src/tq/tqExec.c b/source/dnode/vnode/src/tq/tqExec.c index 3ee274ced1..54e46e7b9a 100644 --- a/source/dnode/vnode/src/tq/tqExec.c +++ b/source/dnode/vnode/src/tq/tqExec.c @@ -174,28 +174,9 @@ int32_t tqScanSnapshot(STQ* pTq, const STqExecHandle* pExec, SMqDataRsp* pRsp, S #endif int32_t tqLogScanExec(STQ* pTq, STqExecHandle* pExec, SSubmitReq* pReq, SMqDataRsp* pRsp, int32_t workerId) { - if (pExec->subType == TOPIC_SUB_TYPE__COLUMN) { - qTaskInfo_t task = pExec->execCol.task[workerId]; - ASSERT(task); - qSetStreamInput(task, pReq, STREAM_INPUT__DATA_SUBMIT, false); - while (1) { - SSDataBlock* pDataBlock = NULL; - uint64_t ts = 0; - if (qExecTask(task, &pDataBlock, &ts) < 0) { - ASSERT(0); - } - if (pDataBlock == NULL) break; + ASSERT(pExec->subType != TOPIC_SUB_TYPE__COLUMN); - ASSERT(pDataBlock->info.rows != 0); - - tqAddBlockDataToRsp(pDataBlock, pRsp); - if (pRsp->withTbName) { - int64_t uid = pExec->pExecReader[workerId]->msgIter.uid; - tqAddTbNameToRsp(pTq, uid, pRsp); - } - pRsp->blockNum++; - } - } else if (pExec->subType == TOPIC_SUB_TYPE__TABLE) { + if (pExec->subType == TOPIC_SUB_TYPE__TABLE) { pRsp->withSchema = 1; STqReader* pReader = pExec->pExecReader[workerId]; tqReaderSetDataMsg(pReader, pReq, 0); @@ -232,9 +213,11 @@ int32_t tqLogScanExec(STQ* pTq, STqExecHandle* pExec, SSubmitReq* pReq, SMqDataR pRsp->blockNum++; } } + if (pRsp->blockNum == 0) { pRsp->skipLogNum++; return -1; } + return 0; } diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c index fc35fba935..93f797680f 100644 --- a/source/libs/executor/src/executor.c +++ b/source/libs/executor/src/executor.c @@ -60,9 +60,8 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, size_t nu taosArrayAddAll(p->pDataBlock, pDataBlock->pDataBlock); taosArrayPush(pInfo->pBlockLists, &p); } - } else if (type == STREAM_INPUT__TABLE_SCAN) { - // do nothing - ASSERT(pInfo->blockType == STREAM_INPUT__TABLE_SCAN); + /*} else if (type == STREAM_INPUT__TABLE_SCAN) {*/ + /*ASSERT(pInfo->blockType == STREAM_INPUT__TABLE_SCAN);*/ } else { ASSERT(0); } @@ -71,6 +70,7 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, size_t nu } } +#if 0 int32_t qStreamScanSnapshot(qTaskInfo_t tinfo) { if (tinfo == NULL) { return TSDB_CODE_QRY_APP_ERROR; @@ -78,6 +78,7 @@ int32_t qStreamScanSnapshot(qTaskInfo_t tinfo) { SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)tinfo; return doSetStreamBlock(pTaskInfo->pRoot, NULL, 0, STREAM_INPUT__TABLE_SCAN, 0, NULL); } +#endif int32_t qSetStreamInput(qTaskInfo_t tinfo, const void* input, int32_t type, bool assignUid) { return qSetMultiStreamInput(tinfo, input, 1, type, assignUid); diff --git a/source/libs/executor/src/executorMain.c b/source/libs/executor/src/executorMain.c index 53ebc322a8..b2f5630e34 100644 --- a/source/libs/executor/src/executorMain.c +++ b/source/libs/executor/src/executorMain.c @@ -299,7 +299,7 @@ int32_t qStreamPrepareScan(qTaskInfo_t tinfo, const STqOffsetVal* pOffset) { } ASSERT(pInfo->tqReader->pWalReader->curVersion == pOffset->version); } else if (pOffset->type == TMQ_OFFSET__SNAPSHOT_DATA) { - pInfo->blockType = STREAM_INPUT__TABLE_SCAN; + /*pInfo->blockType = STREAM_INPUT__TABLE_SCAN;*/ int64_t uid = pOffset->uid; int64_t ts = pOffset->ts; diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index f7155b2431..95563463d2 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -1163,6 +1163,7 @@ static void setBlockGroupId(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32 uidCol[i] = getGroupId(pOperator, uidCol[i]); } } + static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock) { SDataBlockInfo* pBlockInfo = &pInfo->pRes->info; SOperatorInfo* pOperator = pInfo->pStreamScanOp; @@ -1256,13 +1257,9 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) { if (setBlockIntoRes(pInfo, &ret.data) < 0) { ASSERT(0); } - /*pTaskInfo->streamInfo.lastStatus = ret.offset;*/ + // TODO clean data block if (pInfo->pRes->info.rows > 0) { return pInfo->pRes; - } else { - // data is filtered out, do clean - - /*tDeleteSSDataBlock(&ret.data);*/ } } else if (ret.fetchType == FETCH_TYPE__META) { ASSERT(0); @@ -1280,6 +1277,10 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) { } else if (pTaskInfo->streamInfo.prepareStatus.type == TMQ_OFFSET__SNAPSHOT_DATA) { SSDataBlock* pResult = doTableScan(pInfo->pTableScanOp); return pResult && pResult->info.rows > 0 ? pResult : NULL; + } else if (pTaskInfo->streamInfo.prepareStatus.type == TMQ_OFFSET__SNAPSHOT_META) { + // TODO scan meta + ASSERT(0); + return NULL; } size_t total = taosArrayGetSize(pInfo->pBlockLists); @@ -1437,6 +1438,11 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) { } } +static SSDataBlock* doRawScan(SOperatorInfo* pInfo) { + // + return NULL; +} + static SArray* extractTableIdList(const STableListInfo* pTableGroupInfo) { SArray* tableIdList = taosArrayInit(4, sizeof(uint64_t)); @@ -1449,6 +1455,19 @@ static SArray* extractTableIdList(const STableListInfo* pTableGroupInfo) { return tableIdList; } +// for subscribing db or stb (not including column), +// if this scan is used, meta data can be return +// and schemas are decided when scanning +SOperatorInfo* createRawScanOperatorInfo(SReadHandle* pHandle, STableScanPhysiNode* pTableScanNode, + SExecTaskInfo* pTaskInfo, STimeWindowAggSupp* pTwSup) { + // create operator + // create tb reader + // create meta reader + // create tq reader + + return NULL; +} + SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhysiNode* pTableScanNode, SExecTaskInfo* pTaskInfo, STimeWindowAggSupp* pTwSup, uint64_t queryId, uint64_t taskId) { @@ -1492,16 +1511,16 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys if (pHandle) { SOperatorInfo* pTableScanOp = createTableScanOperatorInfo(pTableScanNode, pHandle, pTaskInfo); - STableScanInfo* pSTInfo = (STableScanInfo*)pTableScanOp->info; + STableScanInfo* pTSInfo = (STableScanInfo*)pTableScanOp->info; if (pHandle->version > 0) { - pSTInfo->cond.endVersion = pHandle->version; + pTSInfo->cond.endVersion = pHandle->version; } SArray* tableList = taosArrayGetP(pTaskInfo->tableqinfoList.pGroupList, 0); if (pHandle->initTableReader) { - pSTInfo->scanMode = TABLE_SCAN__TABLE_ORDER; - pSTInfo->dataReader = NULL; - if (tsdbReaderOpen(pHandle->vnode, &pSTInfo->cond, tableList, &pSTInfo->dataReader, NULL) < 0) { + pTSInfo->scanMode = TABLE_SCAN__TABLE_ORDER; + pTSInfo->dataReader = NULL; + if (tsdbReaderOpen(pHandle->vnode, &pTSInfo->cond, tableList, &pTSInfo->dataReader, NULL) < 0) { ASSERT(0); } } @@ -1515,14 +1534,14 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys pInfo->tqReader = pHandle->tqReader; } - if (pSTInfo->interval.interval > 0) { - pInfo->pUpdateInfo = updateInfoInitP(&pSTInfo->interval, pTwSup->waterMark); + if (pTSInfo->interval.interval > 0) { + pInfo->pUpdateInfo = updateInfoInitP(&pTSInfo->interval, pTwSup->waterMark); } else { pInfo->pUpdateInfo = NULL; } pInfo->pTableScanOp = pTableScanOp; - pInfo->interval = pSTInfo->interval; + pInfo->interval = pTSInfo->interval; pInfo->readHandle = *pHandle; pInfo->tableUid = pScanPhyNode->uid; diff --git a/source/libs/wal/src/walRead.c b/source/libs/wal/src/walRead.c index 2d910a85b8..eb0c7f56bd 100644 --- a/source/libs/wal/src/walRead.c +++ b/source/libs/wal/src/walRead.c @@ -30,19 +30,24 @@ SWalReader *walOpenReader(SWal *pWal, SWalFilterCond *cond) { pRead->pWal = pWal; pRead->pIdxFile = NULL; pRead->pLogFile = NULL; - pRead->curVersion = -5; + pRead->curVersion = -1; pRead->curFileFirstVer = -1; pRead->curInvalid = 1; pRead->capacity = 0; - if (cond) + if (cond) { pRead->cond = *cond; - else { + } else { pRead->cond.scanMeta = 0; pRead->cond.scanUncommited = 0; + pRead->cond.enableRef = 0; } taosThreadMutexInit(&pRead->mutex, NULL); + /*if (pRead->cond.enableRef) {*/ + /*walOpenRef(pWal);*/ + /*}*/ + pRead->pHead = taosMemoryMalloc(sizeof(SWalCkHead)); if (pRead->pHead == NULL) { terrno = TSDB_CODE_WAL_OUT_OF_MEMORY; @@ -151,24 +156,8 @@ static int32_t walReadChangeFile(SWalReader *pRead, int64_t fileFirstVer) { return 0; } -int32_t walReadSeekVer(SWalReader *pRead, int64_t ver) { +int32_t walReadSeekVerImpl(SWalReader *pRead, int64_t ver) { SWal *pWal = pRead->pWal; - if (!pRead->curInvalid && ver == pRead->curVersion) { - wDebug("wal version %ld match, no need to reset", ver); - return 0; - } - - pRead->curInvalid = 1; - pRead->curVersion = ver; - - if (ver > pWal->vers.lastVer || ver < pWal->vers.firstVer) { - wDebug("vgId:%d, invalid index:%" PRId64 ", first index:%" PRId64 ", last index:%" PRId64, pRead->pWal->cfg.vgId, - ver, pWal->vers.firstVer, pWal->vers.lastVer); - terrno = TSDB_CODE_WAL_LOG_NOT_EXIST; - return -1; - } - if (ver < pWal->vers.snapshotVer) { - } SWalFileInfo tmpInfo; tmpInfo.firstVer = ver; @@ -190,6 +179,31 @@ int32_t walReadSeekVer(SWalReader *pRead, int64_t ver) { wDebug("wal version reset from %ld to %ld", pRead->curVersion, ver); pRead->curVersion = ver; + return 0; +} + +int32_t walReadSeekVer(SWalReader *pRead, int64_t ver) { + SWal *pWal = pRead->pWal; + if (!pRead->curInvalid && ver == pRead->curVersion) { + wDebug("wal version %ld match, no need to reset", ver); + return 0; + } + + pRead->curInvalid = 1; + pRead->curVersion = ver; + + if (ver > pWal->vers.lastVer || ver < pWal->vers.firstVer) { + wDebug("vgId:%d, invalid index:%" PRId64 ", first index:%" PRId64 ", last index:%" PRId64, pRead->pWal->cfg.vgId, + ver, pWal->vers.firstVer, pWal->vers.lastVer); + terrno = TSDB_CODE_WAL_LOG_NOT_EXIST; + return -1; + } + if (ver < pWal->vers.snapshotVer) { + } + + if (walReadSeekVerImpl(pRead, ver) < 0) { + return -1; + } return 0; } @@ -198,6 +212,8 @@ void walSetReaderCapacity(SWalReader *pRead, int32_t capacity) { pRead->capacity static int32_t walFetchHeadNew(SWalReader *pRead, int64_t fetchVer) { int64_t contLen; + bool seeked = false; + if (pRead->curInvalid || pRead->curVersion != fetchVer) { if (walReadSeekVer(pRead, fetchVer) < 0) { ASSERT(0); @@ -205,17 +221,26 @@ static int32_t walFetchHeadNew(SWalReader *pRead, int64_t fetchVer) { pRead->curInvalid = 1; return -1; } + seeked = true; } - contLen = taosReadFile(pRead->pLogFile, pRead->pHead, sizeof(SWalCkHead)); - if (contLen != sizeof(SWalCkHead)) { - if (contLen < 0) { - terrno = TAOS_SYSTEM_ERROR(errno); + while (1) { + contLen = taosReadFile(pRead->pLogFile, pRead->pHead, sizeof(SWalCkHead)); + if (contLen == sizeof(SWalCkHead)) { + break; + } else if (contLen == 0 && !seeked) { + walReadSeekVerImpl(pRead, fetchVer); + seeked = true; + continue; } else { - terrno = TSDB_CODE_WAL_FILE_CORRUPTED; + if (contLen < 0) { + terrno = TAOS_SYSTEM_ERROR(errno); + } else { + terrno = TSDB_CODE_WAL_FILE_CORRUPTED; + } + ASSERT(0); + pRead->curInvalid = 1; + return -1; } - ASSERT(0); - pRead->curInvalid = 1; - return -1; } return 0; } @@ -379,20 +404,14 @@ int32_t walFetchBody(SWalReader *pRead, SWalCkHead **ppHead) { } int32_t walReadVer(SWalReader *pRead, int64_t ver) { - int64_t code; + int64_t contLen; + bool seeked = false; if (pRead->pWal->vers.firstVer == -1) { terrno = TSDB_CODE_WAL_LOG_NOT_EXIST; return -1; } - if (pRead->curInvalid || pRead->curVersion != ver) { - if (walReadSeekVer(pRead, ver) < 0) { - wError("vgId:%d, unexpected wal log index:%" PRId64 ", since %s", pRead->pWal->cfg.vgId, ver, terrstr()); - return -1; - } - } - if (ver > pRead->pWal->vers.lastVer || ver < pRead->pWal->vers.firstVer) { wError("vgId:%d, invalid index:%" PRId64 ", first index:%" PRId64 ", last index:%" PRId64, pRead->pWal->cfg.vgId, ver, pRead->pWal->vers.firstVer, pRead->pWal->vers.lastVer); @@ -400,21 +419,35 @@ int32_t walReadVer(SWalReader *pRead, int64_t ver) { return -1; } - ASSERT(taosValidFile(pRead->pLogFile) == true); - - code = taosReadFile(pRead->pLogFile, pRead->pHead, sizeof(SWalCkHead)); - if (code != sizeof(SWalCkHead)) { - if (code < 0) - terrno = TAOS_SYSTEM_ERROR(errno); - else { - terrno = TSDB_CODE_WAL_FILE_CORRUPTED; - ASSERT(0); + if (pRead->curInvalid || pRead->curVersion != ver) { + if (walReadSeekVer(pRead, ver) < 0) { + wError("vgId:%d, unexpected wal log index:%" PRId64 ", since %s", pRead->pWal->cfg.vgId, ver, terrstr()); + return -1; } - return -1; + seeked = true; } - code = walValidHeadCksum(pRead->pHead); - if (code != 0) { + while (1) { + contLen = taosReadFile(pRead->pLogFile, pRead->pHead, sizeof(SWalCkHead)); + if (contLen == sizeof(SWalCkHead)) { + break; + } else if (contLen == 0 && !seeked) { + walReadSeekVerImpl(pRead, ver); + seeked = true; + continue; + } else { + if (contLen < 0) { + terrno = TAOS_SYSTEM_ERROR(errno); + } else { + terrno = TSDB_CODE_WAL_FILE_CORRUPTED; + } + ASSERT(0); + return -1; + } + } + + contLen = walValidHeadCksum(pRead->pHead); + if (contLen != 0) { wError("vgId:%d, unexpected wal log index:%" PRId64 ", since head checksum not passed", pRead->pWal->cfg.vgId, ver); terrno = TSDB_CODE_WAL_FILE_CORRUPTED; return -1; @@ -430,9 +463,9 @@ int32_t walReadVer(SWalReader *pRead, int64_t ver) { pRead->capacity = pRead->pHead->head.bodyLen; } - if ((code = taosReadFile(pRead->pLogFile, pRead->pHead->head.body, pRead->pHead->head.bodyLen)) != + if ((contLen = taosReadFile(pRead->pLogFile, pRead->pHead->head.body, pRead->pHead->head.bodyLen)) != pRead->pHead->head.bodyLen) { - if (code < 0) + if (contLen < 0) terrno = TAOS_SYSTEM_ERROR(errno); else { terrno = TSDB_CODE_WAL_FILE_CORRUPTED; @@ -449,8 +482,8 @@ int32_t walReadVer(SWalReader *pRead, int64_t ver) { return -1; } - code = walValidBodyCksum(pRead->pHead); - if (code != 0) { + contLen = walValidBodyCksum(pRead->pHead); + if (contLen != 0) { wError("vgId:%d, unexpected wal log index:%" PRId64 ", since body checksum not passed", pRead->pWal->cfg.vgId, ver); pRead->curInvalid = 1; terrno = TSDB_CODE_WAL_FILE_CORRUPTED; From 77a17728d935239b92b6ac1b38468ccc169a6df3 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Sun, 10 Jul 2022 22:30:58 +0800 Subject: [PATCH 22/25] chore: update libtaos ws submodule for3.0 (#14729) * chore: add libtaos-ws for 3.0 * chore: update taosws-rs * chore: add libtaosws to install/remove script * chore: update taosws-rs * chore: update taosws-rs * chore: update taos-tools, taosws-rs for 3.0 * fix: packaging/tools/make_install.sh for 3.0 --- packaging/tools/make_install.sh | 35 ++++++++++-------- tools/CMakeLists.txt | 63 ++++++++++++++++++++++----------- tools/taos-tools | 2 +- tools/taosws-rs | 2 +- 4 files changed, 64 insertions(+), 38 deletions(-) diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index 8ad42811d4..680fa6736b 100755 --- a/packaging/tools/make_install.sh +++ b/packaging/tools/make_install.sh @@ -305,18 +305,23 @@ function install_lib() { ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/libtaos.so.${verNumber} - ${csudo}cp ${binary_dir}/build/lib/libtaosws.so \ - ${install_main_dir}/driver && - ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.so - ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo}ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so - ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || : - if [ -d "${lib64_link_dir}" ]; then - ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 - ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so - ${csudo}ln -sf ${lib64_link_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || : + ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 + ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so + fi + + if [ -f ${binary_dir}/build/lib/libtaosws.so ]; then + ${csudo}cp ${binary_dir}/build/lib/libtaosws.so \ + ${install_main_dir}/driver && + ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.so ||: + + ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || : + + if [ -d "${lib64_link_dir}" ]; then + ${csudo}ln -sf ${lib64_link_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || : + fi fi else ${csudo}cp -Rf ${binary_dir}/build/lib/libtaos.${verNumber}.dylib \ @@ -357,26 +362,26 @@ function install_header() { if [ "$osType" != "Darwin" ]; then ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || : + ${csudo}rm -f ${inc_link_dir}/taosws.h ||: ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \ - ${csudo}rm -f ${inc_link_dir}/taosws.h || : - - ${csudo}cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taosdef.h ${source_dir}/src/inc/taoserror.h \ ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/* - ${csudo}cp -f ${binary_dir}/build/include/taosws.h ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/taosws.h + if [ -f ${binary_dir}/build/include/taosws.h ]; then + ${csudo}cp -f ${binary_dir}/build/include/taosws.h ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/taosws.h ||: + ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h ||: + fi ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h ${csudo}ln -s ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h - ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h || : else ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \ ${install_main_dir}/include || ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \ ${install_main_2_dir}/include && - ${csudo}chmod 644 ${install_main_dir}/include/* || + ${csudo}chmod 644 ${install_main_dir}/include/* ||: ${csudo}chmod 644 ${install_main_2_dir}/include/* fi } diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 59908cca8a..5d463e1de9 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,25 +1,46 @@ IF (TD_WEBSOCKET) - MESSAGE("${Green} use libtaos-ws${ColourReset}") - IF (TD_LINUX) - include(ExternalProject) - ExternalProject_Add(taosws-rs - PREFIX "taosws-rs" - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs - BUILD_ALWAYS off - DEPENDS taos - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" - PATCH_COMMAND - COMMAND git clean -f -d - BUILD_COMMAND - COMMAND cargo build --release -p taos-ws-sys - COMMAND ./taos-ws-sys/ci/package.sh - INSTALL_COMMAND - COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib - COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include - COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include - ) - ENDIF() + MESSAGE("${Green} use libtaos-ws${ColourReset}") + IF (TD_LINUX) + IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" OR "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" IS_NEWER_THAN "${CMAKE_SOURCE_DIR}/.git/modules/tools/taosws-rs/FETCH_HEAD") + include(ExternalProject) + ExternalProject_Add(taosws-rs + PREFIX "taosws-rs" + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs + BUILD_ALWAYS off + DEPENDS taos + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" + PATCH_COMMAND + COMMAND git clean -f -d + BUILD_COMMAND + COMMAND cargo build --release -p taos-ws-sys + COMMAND ./taos-ws-sys/ci/package.sh + INSTALL_COMMAND + COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib + COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include + COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include + ) + ELSE() + include(ExternalProject) + ExternalProject_Add(taosws-rs + PREFIX "taosws-rs" + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs + BUILD_ALWAYS on + DEPENDS taos + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" + PATCH_COMMAND + COMMAND git clean -f -d + BUILD_COMMAND + COMMAND cargo build --release -p taos-ws-sys + COMMAND ./taos-ws-sys/ci/package.sh + INSTALL_COMMAND + COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib + COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include + COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include + ) + ENDIF () + ENDIF() ENDIF () IF (TD_TAOS_TOOLS) diff --git a/tools/taos-tools b/tools/taos-tools index 9cb71e3c4c..d69d9feaf0 160000 --- a/tools/taos-tools +++ b/tools/taos-tools @@ -1 +1 @@ -Subproject commit 9cb71e3c4c0474553aa961cbe19795541c29b5c7 +Subproject commit d69d9feaf067db6af7c49b651f67ba0b0e11a861 diff --git a/tools/taosws-rs b/tools/taosws-rs index 430982a0c2..7a94ffab45 160000 --- a/tools/taosws-rs +++ b/tools/taosws-rs @@ -1 +1 @@ -Subproject commit 430982a0c2c29a819ffc414d11f49f2d424ca3fe +Subproject commit 7a94ffab45f08e16f09b3f430fe75d717054adb6 From 08d1965f7c5fe6a1205da06def03d54d548d4ca5 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 11 Jul 2022 09:59:02 +0800 Subject: [PATCH 23/25] chore: update taos-tools for3.0 (#14740) * chore: add libtaos-ws for 3.0 * chore: update taosws-rs * chore: add libtaosws to install/remove script * chore: update taosws-rs * chore: update taosws-rs * chore: update taos-tools, taosws-rs for 3.0 * fix: packaging/tools/make_install.sh for 3.0 * chore: update taos-tools --- tools/taos-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/taos-tools b/tools/taos-tools index d69d9feaf0..3f42d428eb 160000 --- a/tools/taos-tools +++ b/tools/taos-tools @@ -1 +1 @@ -Subproject commit d69d9feaf067db6af7c49b651f67ba0b0e11a861 +Subproject commit 3f42d428eb6b90dea2651f4ccea66e44705c831b From 5708d497ce204dc6b64b0a350eca99669fe8979c Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Mon, 11 Jul 2022 10:07:11 +0800 Subject: [PATCH 24/25] fix: syntax issue with '(select ... limit) statement' --- source/libs/function/src/functionMgt.c | 2 +- source/libs/parser/inc/sql.y | 6 +++++- source/libs/parser/src/parAstCreater.c | 9 +++++++++ source/libs/parser/src/parTranslater.c | 16 ++++------------ source/libs/parser/src/sql.c | 9 +++++---- source/libs/parser/test/parSelectTest.cpp | 16 ++++++++++++---- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c index 1da9d4a70f..ed82654f77 100644 --- a/source/libs/function/src/functionMgt.c +++ b/source/libs/function/src/functionMgt.c @@ -139,7 +139,7 @@ bool fmIsAggFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MG bool fmIsScalarFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MGT_SCALAR_FUNC); } -bool fmIsVectorFunc(int32_t funcId) { return !fmIsScalarFunc(funcId) && !fmIsScanPseudoColumnFunc(funcId); } +bool fmIsVectorFunc(int32_t funcId) { return !fmIsScalarFunc(funcId) && !fmIsPseudoColumnFunc(funcId); } bool fmIsSelectFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MGT_SELECT_FUNC); } diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 4bcfcbf5c0..4758f3ae31 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -934,7 +934,11 @@ query_expression_body(A) ::= query_primary(A) ::= query_specification(B). { A = B; } query_primary(A) ::= NK_LP query_expression_body(B) - order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP. { A = B; } + order_by_clause_opt(C) slimit_clause_opt(D) limit_clause_opt(E) NK_RP. { + A = addOrderByClause(pCxt, B, C); + A = addSlimitClause(pCxt, A, D); + A = addLimitClause(pCxt, A, E); + } %type order_by_clause_opt { SNodeList* } %destructor order_by_clause_opt { nodesDestroyList($$); } diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c index ab73204fb7..5521d1c382 100644 --- a/source/libs/parser/src/parAstCreater.c +++ b/source/libs/parser/src/parAstCreater.c @@ -665,6 +665,9 @@ SNode* addHavingClause(SAstCreateContext* pCxt, SNode* pStmt, SNode* pHaving) { SNode* addOrderByClause(SAstCreateContext* pCxt, SNode* pStmt, SNodeList* pOrderByList) { CHECK_PARSER_STATUS(pCxt); + if (NULL == pOrderByList) { + return pStmt; + } if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) { ((SSelectStmt*)pStmt)->pOrderByList = pOrderByList; } else { @@ -675,6 +678,9 @@ SNode* addOrderByClause(SAstCreateContext* pCxt, SNode* pStmt, SNodeList* pOrder SNode* addSlimitClause(SAstCreateContext* pCxt, SNode* pStmt, SNode* pSlimit) { CHECK_PARSER_STATUS(pCxt); + if (NULL == pSlimit) { + return pStmt; + } if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) { ((SSelectStmt*)pStmt)->pSlimit = (SLimitNode*)pSlimit; } @@ -683,6 +689,9 @@ SNode* addSlimitClause(SAstCreateContext* pCxt, SNode* pStmt, SNode* pSlimit) { SNode* addLimitClause(SAstCreateContext* pCxt, SNode* pStmt, SNode* pLimit) { CHECK_PARSER_STATUS(pCxt); + if (NULL == pLimit) { + return pStmt; + } if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) { ((SSelectStmt*)pStmt)->pLimit = (SLimitNode*)pLimit; } else { diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 8e6798dcd2..e682f1abfd 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -1189,7 +1189,7 @@ static void setFuncClassification(SNode* pCurrStmt, SFunctionNode* pFunc) { if (fmIsSelectFunc(pFunc->funcId)) { pSelect->hasSelectFunc = true; ++(pSelect->selectFuncNum); - } else if (fmIsAggFunc(pFunc->funcId) || fmIsIndefiniteRowsFunc(pFunc->funcId)) { + } else if (fmIsVectorFunc(pFunc->funcId)) { pSelect->hasOtherVectorFunc = true; } pSelect->hasUniqueFunc = pSelect->hasUniqueFunc ? true : (FUNCTION_TYPE_UNIQUE == pFunc->funcType); @@ -1514,18 +1514,11 @@ static int32_t rewriteColsToSelectValFunc(STranslateContext* pCxt, SSelectStmt* typedef struct CheckAggColCoexistCxt { STranslateContext* pTranslateCxt; bool existCol; - int32_t selectFuncNum; - bool existOtherVectorFunc; } CheckAggColCoexistCxt; static EDealRes doCheckAggColCoexist(SNode** pNode, void* pContext) { CheckAggColCoexistCxt* pCxt = (CheckAggColCoexistCxt*)pContext; if (isVectorFunc(*pNode)) { - if (isSelectFunc(*pNode)) { - ++(pCxt->selectFuncNum); - } else { - pCxt->existOtherVectorFunc = true; - } return DEAL_RES_IGNORE_CHILD; } SNode* pPartKey = NULL; @@ -1542,16 +1535,15 @@ static EDealRes doCheckAggColCoexist(SNode** pNode, void* pContext) { static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect) { if (NULL != pSelect->pGroupByList || NULL != pSelect->pWindow || - (!pSelect->hasAggFuncs && !pSelect->hasIndefiniteRowsFunc)) { + (!pSelect->hasAggFuncs && !pSelect->hasIndefiniteRowsFunc && !pSelect->hasInterpFunc)) { return TSDB_CODE_SUCCESS; } - CheckAggColCoexistCxt cxt = { - .pTranslateCxt = pCxt, .existCol = false, .selectFuncNum = 0, .existOtherVectorFunc = false}; + CheckAggColCoexistCxt cxt = {.pTranslateCxt = pCxt, .existCol = false}; nodesRewriteExprs(pSelect->pProjectionList, doCheckAggColCoexist, &cxt); if (!pSelect->isDistinct) { nodesRewriteExprs(pSelect->pOrderByList, doCheckAggColCoexist, &cxt); } - if (1 == cxt.selectFuncNum && !cxt.existOtherVectorFunc) { + if (1 == pSelect->selectFuncNum && !pSelect->hasOtherVectorFunc) { return rewriteColsToSelectValFunc(pCxt, pSelect); } if (cxt.existCol) { diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 029dae0311..ec67ad9efd 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -4658,10 +4658,11 @@ static YYACTIONTYPE yy_reduce( yymsp[-2].minor.yy652 = yylhsminor.yy652; break; case 465: /* query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */ -{ yymsp[-5].minor.yy652 = yymsp[-4].minor.yy652; } - yy_destructor(yypParser,369,&yymsp[-3].minor); - yy_destructor(yypParser,370,&yymsp[-2].minor); - yy_destructor(yypParser,371,&yymsp[-1].minor); +{ + yymsp[-5].minor.yy652 = addOrderByClause(pCxt, yymsp[-4].minor.yy652, yymsp[-3].minor.yy210); + yymsp[-5].minor.yy652 = addSlimitClause(pCxt, yymsp[-5].minor.yy652, yymsp[-2].minor.yy652); + yymsp[-5].minor.yy652 = addLimitClause(pCxt, yymsp[-5].minor.yy652, yymsp[-1].minor.yy652); + } break; case 469: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ case 473: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==473); diff --git a/source/libs/parser/test/parSelectTest.cpp b/source/libs/parser/test/parSelectTest.cpp index c6d74c5305..8ad9feb536 100644 --- a/source/libs/parser/test/parSelectTest.cpp +++ b/source/libs/parser/test/parSelectTest.cpp @@ -245,13 +245,21 @@ TEST_F(ParserSelectTest, orderBy) { TEST_F(ParserSelectTest, distinct) { useDb("root", "test"); - // run("SELECT distinct c1, c2 FROM t1 WHERE c1 > 0 order by c1"); + run("SELECT distinct c1, c2 FROM t1 WHERE c1 > 0 order by c1"); - // run("SELECT distinct c1 + 10, c2 FROM t1 WHERE c1 > 0 order by c1 + 10, c2"); + run("SELECT distinct c1 + 10, c2 FROM t1 WHERE c1 > 0 order by c1 + 10, c2"); - // run("SELECT distinct c1 + 10 cc1, c2 cc2 FROM t1 WHERE c1 > 0 order by cc1, c2"); + run("SELECT distinct c1 + 10 cc1, c2 cc2 FROM t1 WHERE c1 > 0 order by cc1, c2"); - // run("SELECT distinct COUNT(c2) FROM t1 WHERE c1 > 0 GROUP BY c1 order by COUNT(c2)"); + run("SELECT distinct COUNT(c2) FROM t1 WHERE c1 > 0 GROUP BY c1 order by COUNT(c2)"); +} + +TEST_F(ParserSelectTest, limit) { + useDb("root", "test"); + + run("SELECT c1, c2 FROM t1 LIMIT 10"); + + run("(SELECT c1, c2 FROM t1 LIMIT 10)"); } // INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [FILL(fill_mod_and_val)] From 0bc700eb82736021f2e4f7eaeec709e0352cc339 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Mon, 11 Jul 2022 10:53:06 +0800 Subject: [PATCH 25/25] feat: sql command 'trim database' --- include/common/tmsg.h | 17 +- include/common/tmsgdef.h | 1 + include/common/ttokendef.h | 391 +- include/libs/nodes/cmdnodes.h | 5 + include/libs/nodes/nodes.h | 1 + source/common/src/tmsg.c | 25 + source/libs/nodes/src/nodesUtilFuncs.c | 3 + source/libs/parser/inc/parAst.h | 1 + source/libs/parser/inc/sql.y | 1 + source/libs/parser/src/parAstCreater.c | 13 +- source/libs/parser/src/parTokenizer.c | 1 + source/libs/parser/src/parTranslater.c | 11 + source/libs/parser/src/sql.c | 5963 +++++++++++----------- source/libs/parser/test/parShowToUse.cpp | 19 + 14 files changed, 3281 insertions(+), 3171 deletions(-) diff --git a/include/common/tmsg.h b/include/common/tmsg.h index 03b456b212..e09de1e23e 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -55,11 +55,11 @@ extern int32_t tMsgDict[]; #define TMSG_SEG_CODE(TYPE) (((TYPE)&0xff00) >> 8) #define TMSG_SEG_SEQ(TYPE) ((TYPE)&0xff) -#define TMSG_INFO(TYPE) \ - ((TYPE) >= 0 && \ - ((TYPE) < TDMT_DND_MAX_MSG || (TYPE) < TDMT_MND_MAX_MSG || (TYPE) < TDMT_VND_MAX_MSG || (TYPE) < TDMT_SCH_MAX_MSG || \ - (TYPE) < TDMT_STREAM_MAX_MSG || (TYPE) < TDMT_MON_MAX_MSG || (TYPE) < TDMT_SYNC_MAX_MSG)) \ - ? tMsgInfo[tMsgDict[TMSG_SEG_CODE(TYPE)] + TMSG_SEG_SEQ(TYPE)] \ +#define TMSG_INFO(TYPE) \ + ((TYPE) >= 0 && ((TYPE) < TDMT_DND_MAX_MSG || (TYPE) < TDMT_MND_MAX_MSG || (TYPE) < TDMT_VND_MAX_MSG || \ + (TYPE) < TDMT_SCH_MAX_MSG || (TYPE) < TDMT_STREAM_MAX_MSG || (TYPE) < TDMT_MON_MAX_MSG || \ + (TYPE) < TDMT_SYNC_MAX_MSG)) \ + ? tMsgInfo[tMsgDict[TMSG_SEG_CODE(TYPE)] + TMSG_SEG_SEQ(TYPE)] \ : 0 #define TMSG_INDEX(TYPE) (tMsgDict[TMSG_SEG_CODE(TYPE)] + TMSG_SEG_SEQ(TYPE)) @@ -815,6 +815,13 @@ typedef struct { int32_t tSerializeSDbCfgReq(void* buf, int32_t bufLen, SDbCfgReq* pReq); int32_t tDeserializeSDbCfgReq(void* buf, int32_t bufLen, SDbCfgReq* pReq); +typedef struct { + char db[TSDB_DB_FNAME_LEN]; +} STrimDbReq; + +int32_t tSerializeSTrimDbReq(void* buf, int32_t bufLen, STrimDbReq* pReq); +int32_t tDeserializeSTrimDbReq(void* buf, int32_t bufLen, STrimDbReq* pReq); + typedef struct { int32_t numOfVgroups; int32_t numOfStables; diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h index 8b39530e84..1dbfbfb2b9 100644 --- a/include/common/tmsgdef.h +++ b/include/common/tmsgdef.h @@ -116,6 +116,7 @@ enum { TD_DEF_MSG_TYPE(TDMT_MND_ALTER_DB, "alter-db", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_SYNC_DB, "sync-db", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_COMPACT_DB, "compact-db", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_MND_TRIM_DB, "trim-db", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_GET_DB_CFG, "get-db-cfg", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_VGROUP_LIST, "vgroup-list", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_CREATE_FUNC, "create-func", NULL, NULL) diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h index 5deec2d5f6..29dd4daa25 100644 --- a/include/common/ttokendef.h +++ b/include/common/ttokendef.h @@ -74,201 +74,202 @@ #define TK_DATABASE 56 #define TK_USE 57 #define TK_FLUSH 58 -#define TK_IF 59 -#define TK_NOT 60 -#define TK_EXISTS 61 -#define TK_BUFFER 62 -#define TK_CACHELAST 63 -#define TK_CACHELASTSIZE 64 -#define TK_COMP 65 -#define TK_DURATION 66 -#define TK_NK_VARIABLE 67 -#define TK_FSYNC 68 -#define TK_MAXROWS 69 -#define TK_MINROWS 70 -#define TK_KEEP 71 -#define TK_PAGES 72 -#define TK_PAGESIZE 73 -#define TK_PRECISION 74 -#define TK_REPLICA 75 -#define TK_STRICT 76 -#define TK_WAL 77 -#define TK_VGROUPS 78 -#define TK_SINGLE_STABLE 79 -#define TK_RETENTIONS 80 -#define TK_SCHEMALESS 81 -#define TK_NK_COLON 82 -#define TK_TABLE 83 -#define TK_NK_LP 84 -#define TK_NK_RP 85 -#define TK_STABLE 86 -#define TK_ADD 87 -#define TK_COLUMN 88 -#define TK_MODIFY 89 -#define TK_RENAME 90 -#define TK_TAG 91 -#define TK_SET 92 -#define TK_NK_EQ 93 -#define TK_USING 94 -#define TK_TAGS 95 -#define TK_COMMENT 96 -#define TK_BOOL 97 -#define TK_TINYINT 98 -#define TK_SMALLINT 99 -#define TK_INT 100 -#define TK_INTEGER 101 -#define TK_BIGINT 102 -#define TK_FLOAT 103 -#define TK_DOUBLE 104 -#define TK_BINARY 105 -#define TK_TIMESTAMP 106 -#define TK_NCHAR 107 -#define TK_UNSIGNED 108 -#define TK_JSON 109 -#define TK_VARCHAR 110 -#define TK_MEDIUMBLOB 111 -#define TK_BLOB 112 -#define TK_VARBINARY 113 -#define TK_DECIMAL 114 -#define TK_MAX_DELAY 115 -#define TK_WATERMARK 116 -#define TK_ROLLUP 117 -#define TK_TTL 118 -#define TK_SMA 119 -#define TK_FIRST 120 -#define TK_LAST 121 -#define TK_SHOW 122 -#define TK_DATABASES 123 -#define TK_TABLES 124 -#define TK_STABLES 125 -#define TK_MNODES 126 -#define TK_MODULES 127 -#define TK_QNODES 128 -#define TK_FUNCTIONS 129 -#define TK_INDEXES 130 -#define TK_ACCOUNTS 131 -#define TK_APPS 132 -#define TK_CONNECTIONS 133 -#define TK_LICENCE 134 -#define TK_GRANTS 135 -#define TK_QUERIES 136 -#define TK_SCORES 137 -#define TK_TOPICS 138 -#define TK_VARIABLES 139 -#define TK_BNODES 140 -#define TK_SNODES 141 -#define TK_CLUSTER 142 -#define TK_TRANSACTIONS 143 -#define TK_DISTRIBUTED 144 -#define TK_CONSUMERS 145 -#define TK_SUBSCRIPTIONS 146 -#define TK_LIKE 147 -#define TK_INDEX 148 -#define TK_FUNCTION 149 -#define TK_INTERVAL 150 -#define TK_TOPIC 151 -#define TK_AS 152 -#define TK_WITH 153 -#define TK_META 154 -#define TK_CONSUMER 155 -#define TK_GROUP 156 -#define TK_DESC 157 -#define TK_DESCRIBE 158 -#define TK_RESET 159 -#define TK_QUERY 160 -#define TK_CACHE 161 -#define TK_EXPLAIN 162 -#define TK_ANALYZE 163 -#define TK_VERBOSE 164 -#define TK_NK_BOOL 165 -#define TK_RATIO 166 -#define TK_NK_FLOAT 167 -#define TK_COMPACT 168 -#define TK_VNODES 169 -#define TK_IN 170 -#define TK_OUTPUTTYPE 171 -#define TK_AGGREGATE 172 -#define TK_BUFSIZE 173 -#define TK_STREAM 174 -#define TK_INTO 175 -#define TK_TRIGGER 176 -#define TK_AT_ONCE 177 -#define TK_WINDOW_CLOSE 178 -#define TK_IGNORE 179 -#define TK_EXPIRED 180 -#define TK_KILL 181 -#define TK_CONNECTION 182 -#define TK_TRANSACTION 183 -#define TK_BALANCE 184 -#define TK_VGROUP 185 -#define TK_MERGE 186 -#define TK_REDISTRIBUTE 187 -#define TK_SPLIT 188 -#define TK_SYNCDB 189 -#define TK_DELETE 190 -#define TK_INSERT 191 -#define TK_NULL 192 -#define TK_NK_QUESTION 193 -#define TK_NK_ARROW 194 -#define TK_ROWTS 195 -#define TK_TBNAME 196 -#define TK_QSTARTTS 197 -#define TK_QENDTS 198 -#define TK_WSTARTTS 199 -#define TK_WENDTS 200 -#define TK_WDURATION 201 -#define TK_CAST 202 -#define TK_NOW 203 -#define TK_TODAY 204 -#define TK_TIMEZONE 205 -#define TK_CLIENT_VERSION 206 -#define TK_SERVER_VERSION 207 -#define TK_SERVER_STATUS 208 -#define TK_CURRENT_USER 209 -#define TK_COUNT 210 -#define TK_LAST_ROW 211 -#define TK_BETWEEN 212 -#define TK_IS 213 -#define TK_NK_LT 214 -#define TK_NK_GT 215 -#define TK_NK_LE 216 -#define TK_NK_GE 217 -#define TK_NK_NE 218 -#define TK_MATCH 219 -#define TK_NMATCH 220 -#define TK_CONTAINS 221 -#define TK_JOIN 222 -#define TK_INNER 223 -#define TK_SELECT 224 -#define TK_DISTINCT 225 -#define TK_WHERE 226 -#define TK_PARTITION 227 -#define TK_BY 228 -#define TK_SESSION 229 -#define TK_STATE_WINDOW 230 -#define TK_SLIDING 231 -#define TK_FILL 232 -#define TK_VALUE 233 -#define TK_NONE 234 -#define TK_PREV 235 -#define TK_LINEAR 236 -#define TK_NEXT 237 -#define TK_HAVING 238 -#define TK_RANGE 239 -#define TK_EVERY 240 -#define TK_ORDER 241 -#define TK_SLIMIT 242 -#define TK_SOFFSET 243 -#define TK_LIMIT 244 -#define TK_OFFSET 245 -#define TK_ASC 246 -#define TK_NULLS 247 -#define TK_ID 248 -#define TK_NK_BITNOT 249 -#define TK_VALUES 250 -#define TK_IMPORT 251 -#define TK_NK_SEMI 252 -#define TK_FILE 253 +#define TK_TRIM 59 +#define TK_IF 60 +#define TK_NOT 61 +#define TK_EXISTS 62 +#define TK_BUFFER 63 +#define TK_CACHELAST 64 +#define TK_CACHELASTSIZE 65 +#define TK_COMP 66 +#define TK_DURATION 67 +#define TK_NK_VARIABLE 68 +#define TK_FSYNC 69 +#define TK_MAXROWS 70 +#define TK_MINROWS 71 +#define TK_KEEP 72 +#define TK_PAGES 73 +#define TK_PAGESIZE 74 +#define TK_PRECISION 75 +#define TK_REPLICA 76 +#define TK_STRICT 77 +#define TK_WAL 78 +#define TK_VGROUPS 79 +#define TK_SINGLE_STABLE 80 +#define TK_RETENTIONS 81 +#define TK_SCHEMALESS 82 +#define TK_NK_COLON 83 +#define TK_TABLE 84 +#define TK_NK_LP 85 +#define TK_NK_RP 86 +#define TK_STABLE 87 +#define TK_ADD 88 +#define TK_COLUMN 89 +#define TK_MODIFY 90 +#define TK_RENAME 91 +#define TK_TAG 92 +#define TK_SET 93 +#define TK_NK_EQ 94 +#define TK_USING 95 +#define TK_TAGS 96 +#define TK_COMMENT 97 +#define TK_BOOL 98 +#define TK_TINYINT 99 +#define TK_SMALLINT 100 +#define TK_INT 101 +#define TK_INTEGER 102 +#define TK_BIGINT 103 +#define TK_FLOAT 104 +#define TK_DOUBLE 105 +#define TK_BINARY 106 +#define TK_TIMESTAMP 107 +#define TK_NCHAR 108 +#define TK_UNSIGNED 109 +#define TK_JSON 110 +#define TK_VARCHAR 111 +#define TK_MEDIUMBLOB 112 +#define TK_BLOB 113 +#define TK_VARBINARY 114 +#define TK_DECIMAL 115 +#define TK_MAX_DELAY 116 +#define TK_WATERMARK 117 +#define TK_ROLLUP 118 +#define TK_TTL 119 +#define TK_SMA 120 +#define TK_FIRST 121 +#define TK_LAST 122 +#define TK_SHOW 123 +#define TK_DATABASES 124 +#define TK_TABLES 125 +#define TK_STABLES 126 +#define TK_MNODES 127 +#define TK_MODULES 128 +#define TK_QNODES 129 +#define TK_FUNCTIONS 130 +#define TK_INDEXES 131 +#define TK_ACCOUNTS 132 +#define TK_APPS 133 +#define TK_CONNECTIONS 134 +#define TK_LICENCE 135 +#define TK_GRANTS 136 +#define TK_QUERIES 137 +#define TK_SCORES 138 +#define TK_TOPICS 139 +#define TK_VARIABLES 140 +#define TK_BNODES 141 +#define TK_SNODES 142 +#define TK_CLUSTER 143 +#define TK_TRANSACTIONS 144 +#define TK_DISTRIBUTED 145 +#define TK_CONSUMERS 146 +#define TK_SUBSCRIPTIONS 147 +#define TK_LIKE 148 +#define TK_INDEX 149 +#define TK_FUNCTION 150 +#define TK_INTERVAL 151 +#define TK_TOPIC 152 +#define TK_AS 153 +#define TK_WITH 154 +#define TK_META 155 +#define TK_CONSUMER 156 +#define TK_GROUP 157 +#define TK_DESC 158 +#define TK_DESCRIBE 159 +#define TK_RESET 160 +#define TK_QUERY 161 +#define TK_CACHE 162 +#define TK_EXPLAIN 163 +#define TK_ANALYZE 164 +#define TK_VERBOSE 165 +#define TK_NK_BOOL 166 +#define TK_RATIO 167 +#define TK_NK_FLOAT 168 +#define TK_COMPACT 169 +#define TK_VNODES 170 +#define TK_IN 171 +#define TK_OUTPUTTYPE 172 +#define TK_AGGREGATE 173 +#define TK_BUFSIZE 174 +#define TK_STREAM 175 +#define TK_INTO 176 +#define TK_TRIGGER 177 +#define TK_AT_ONCE 178 +#define TK_WINDOW_CLOSE 179 +#define TK_IGNORE 180 +#define TK_EXPIRED 181 +#define TK_KILL 182 +#define TK_CONNECTION 183 +#define TK_TRANSACTION 184 +#define TK_BALANCE 185 +#define TK_VGROUP 186 +#define TK_MERGE 187 +#define TK_REDISTRIBUTE 188 +#define TK_SPLIT 189 +#define TK_SYNCDB 190 +#define TK_DELETE 191 +#define TK_INSERT 192 +#define TK_NULL 193 +#define TK_NK_QUESTION 194 +#define TK_NK_ARROW 195 +#define TK_ROWTS 196 +#define TK_TBNAME 197 +#define TK_QSTARTTS 198 +#define TK_QENDTS 199 +#define TK_WSTARTTS 200 +#define TK_WENDTS 201 +#define TK_WDURATION 202 +#define TK_CAST 203 +#define TK_NOW 204 +#define TK_TODAY 205 +#define TK_TIMEZONE 206 +#define TK_CLIENT_VERSION 207 +#define TK_SERVER_VERSION 208 +#define TK_SERVER_STATUS 209 +#define TK_CURRENT_USER 210 +#define TK_COUNT 211 +#define TK_LAST_ROW 212 +#define TK_BETWEEN 213 +#define TK_IS 214 +#define TK_NK_LT 215 +#define TK_NK_GT 216 +#define TK_NK_LE 217 +#define TK_NK_GE 218 +#define TK_NK_NE 219 +#define TK_MATCH 220 +#define TK_NMATCH 221 +#define TK_CONTAINS 222 +#define TK_JOIN 223 +#define TK_INNER 224 +#define TK_SELECT 225 +#define TK_DISTINCT 226 +#define TK_WHERE 227 +#define TK_PARTITION 228 +#define TK_BY 229 +#define TK_SESSION 230 +#define TK_STATE_WINDOW 231 +#define TK_SLIDING 232 +#define TK_FILL 233 +#define TK_VALUE 234 +#define TK_NONE 235 +#define TK_PREV 236 +#define TK_LINEAR 237 +#define TK_NEXT 238 +#define TK_HAVING 239 +#define TK_RANGE 240 +#define TK_EVERY 241 +#define TK_ORDER 242 +#define TK_SLIMIT 243 +#define TK_SOFFSET 244 +#define TK_LIMIT 245 +#define TK_OFFSET 246 +#define TK_ASC 247 +#define TK_NULLS 248 +#define TK_ID 249 +#define TK_NK_BITNOT 250 +#define TK_VALUES 251 +#define TK_IMPORT 252 +#define TK_NK_SEMI 253 +#define TK_FILE 254 #define TK_NK_SPACE 300 #define TK_NK_COMMENT 301 diff --git a/include/libs/nodes/cmdnodes.h b/include/libs/nodes/cmdnodes.h index 2187a7b03a..5311915612 100644 --- a/include/libs/nodes/cmdnodes.h +++ b/include/libs/nodes/cmdnodes.h @@ -103,6 +103,11 @@ typedef struct SFlushDatabaseStmt { char dbName[TSDB_DB_NAME_LEN]; } SFlushDatabaseStmt; +typedef struct STrimDatabaseStmt { + ENodeType type; + char dbName[TSDB_DB_NAME_LEN]; +} STrimDatabaseStmt; + typedef struct STableOptions { ENodeType type; bool commentNull; diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h index 30bcf22989..c453ce98f8 100644 --- a/include/libs/nodes/nodes.h +++ b/include/libs/nodes/nodes.h @@ -112,6 +112,7 @@ typedef enum ENodeType { QUERY_NODE_DROP_DATABASE_STMT, QUERY_NODE_ALTER_DATABASE_STMT, QUERY_NODE_FLUSH_DATABASE_STMT, + QUERY_NODE_TRIM_DATABASE_STMT, QUERY_NODE_CREATE_TABLE_STMT, QUERY_NODE_CREATE_SUBTABLE_CLAUSE, QUERY_NODE_CREATE_MULTI_TABLE_STMT, diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index c80960b8ce..9d8f49bdd5 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -2647,6 +2647,31 @@ int32_t tDeserializeSDbCfgReq(void *buf, int32_t bufLen, SDbCfgReq *pReq) { return 0; } +int32_t tSerializeSTrimDbReq(void *buf, int32_t bufLen, STrimDbReq *pReq) { + SEncoder encoder = {0}; + tEncoderInit(&encoder, buf, bufLen); + + if (tStartEncode(&encoder) < 0) return -1; + if (tEncodeCStr(&encoder, pReq->db) < 0) return -1; + tEndEncode(&encoder); + + int32_t tlen = encoder.pos; + tEncoderClear(&encoder); + return tlen; +} + +int32_t tDeserializeSTrimDbReq(void *buf, int32_t bufLen, STrimDbReq *pReq) { + SDecoder decoder = {0}; + tDecoderInit(&decoder, buf, bufLen); + + if (tStartDecode(&decoder) < 0) return -1; + if (tDecodeCStrTo(&decoder, pReq->db) < 0) return -1; + tEndDecode(&decoder); + + tDecoderClear(&decoder); + return 0; +} + int32_t tSerializeSDbCfgRsp(void *buf, int32_t bufLen, const SDbCfgRsp *pRsp) { SEncoder encoder = {0}; tEncoderInit(&encoder, buf, bufLen); diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c index e15375e6ef..cc442d1103 100644 --- a/source/libs/nodes/src/nodesUtilFuncs.c +++ b/source/libs/nodes/src/nodesUtilFuncs.c @@ -105,6 +105,8 @@ SNode* nodesMakeNode(ENodeType type) { return makeNode(type, sizeof(SAlterDatabaseStmt)); case QUERY_NODE_FLUSH_DATABASE_STMT: return makeNode(type, sizeof(SFlushDatabaseStmt)); + case QUERY_NODE_TRIM_DATABASE_STMT: + return makeNode(type, sizeof(STrimDatabaseStmt)); case QUERY_NODE_CREATE_TABLE_STMT: return makeNode(type, sizeof(SCreateTableStmt)); case QUERY_NODE_CREATE_SUBTABLE_CLAUSE: @@ -548,6 +550,7 @@ void nodesDestroyNode(SNode* pNode) { nodesDestroyNode((SNode*)((SAlterDatabaseStmt*)pNode)->pOptions); break; case QUERY_NODE_FLUSH_DATABASE_STMT: // no pointer field + case QUERY_NODE_TRIM_DATABASE_STMT: // no pointer field break; case QUERY_NODE_CREATE_TABLE_STMT: { SCreateTableStmt* pStmt = (SCreateTableStmt*)pNode; diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h index ee60a14da9..59fc69f768 100644 --- a/source/libs/parser/inc/parAst.h +++ b/source/libs/parser/inc/parAst.h @@ -137,6 +137,7 @@ SNode* createCreateDatabaseStmt(SAstCreateContext* pCxt, bool ignoreExists, STok SNode* createDropDatabaseStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken* pDbName); SNode* createAlterDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pOptions); SNode* createFlushDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName); +SNode* createTrimDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName); SNode* createDefaultTableOptions(SAstCreateContext* pCxt); SNode* createAlterTableOptions(SAstCreateContext* pCxt); SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType type, void* pVal); diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 4758f3ae31..cd0b5c1d6c 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -158,6 +158,7 @@ cmd ::= DROP DATABASE exists_opt(A) db_name(B). cmd ::= USE db_name(A). { pCxt->pRootNode = createUseDatabaseStmt(pCxt, &A); } cmd ::= ALTER DATABASE db_name(A) alter_db_options(B). { pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &A, B); } cmd ::= FLUSH DATABASE db_name(A). { pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &A); } +cmd ::= TRIM DATABASE db_name(A). { pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &A); } %type not_exists_opt { bool } %destructor not_exists_opt { } diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c index 5521d1c382..c451e52540 100644 --- a/source/libs/parser/src/parAstCreater.c +++ b/source/libs/parser/src/parAstCreater.c @@ -931,7 +931,18 @@ SNode* createFlushDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName) { if (!checkDbName(pCxt, pDbName, false)) { return NULL; } - SAlterDatabaseStmt* pStmt = (SAlterDatabaseStmt*)nodesMakeNode(QUERY_NODE_FLUSH_DATABASE_STMT); + SFlushDatabaseStmt* pStmt = (SFlushDatabaseStmt*)nodesMakeNode(QUERY_NODE_FLUSH_DATABASE_STMT); + CHECK_OUT_OF_MEM(pStmt); + COPY_STRING_FORM_ID_TOKEN(pStmt->dbName, pDbName); + return (SNode*)pStmt; +} + +SNode* createTrimDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName) { + CHECK_PARSER_STATUS(pCxt); + if (!checkDbName(pCxt, pDbName, false)) { + return NULL; + } + STrimDatabaseStmt* pStmt = (STrimDatabaseStmt*)nodesMakeNode(QUERY_NODE_TRIM_DATABASE_STMT); CHECK_OUT_OF_MEM(pStmt); COPY_STRING_FORM_ID_TOKEN(pStmt->dbName, pDbName); return (SNode*)pStmt; diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c index 920921a3b3..58f6354402 100644 --- a/source/libs/parser/src/parTokenizer.c +++ b/source/libs/parser/src/parTokenizer.c @@ -216,6 +216,7 @@ static SKeyword keywordTable[] = { {"TRANSACTION", TK_TRANSACTION}, {"TRANSACTIONS", TK_TRANSACTIONS}, {"TRIGGER", TK_TRIGGER}, + {"TRIM", TK_TRIM}, {"TSERIES", TK_TSERIES}, {"TTL", TK_TTL}, {"UNION", TK_UNION}, diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index e682f1abfd..f92713565b 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -3144,6 +3144,14 @@ static int32_t translateAlterDatabase(STranslateContext* pCxt, SAlterDatabaseStm return buildCmdMsg(pCxt, TDMT_MND_ALTER_DB, (FSerializeFunc)tSerializeSAlterDbReq, &alterReq); } +static int32_t translateTrimDatabase(STranslateContext* pCxt, STrimDatabaseStmt* pStmt) { + STrimDbReq req = {0}; + SName name = {0}; + tNameSetDbName(&name, pCxt->pParseCxt->acctId, pStmt->dbName, strlen(pStmt->dbName)); + tNameGetFullDbName(&name, req.db); + return buildCmdMsg(pCxt, TDMT_MND_TRIM_DB, (FSerializeFunc)tSerializeSTrimDbReq, &req); +} + static int32_t columnDefNodeToField(SNodeList* pList, SArray** pArray) { *pArray = taosArrayInit(LIST_LENGTH(pList), sizeof(SField)); SNode* pNode; @@ -4576,6 +4584,9 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) { case QUERY_NODE_ALTER_DATABASE_STMT: code = translateAlterDatabase(pCxt, (SAlterDatabaseStmt*)pNode); break; + case QUERY_NODE_TRIM_DATABASE_STMT: + code = translateTrimDatabase(pCxt, (STrimDatabaseStmt*)pNode); + break; case QUERY_NODE_CREATE_TABLE_STMT: code = translateCreateSuperTable(pCxt, (SCreateTableStmt*)pNode); break; diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index ec67ad9efd..cb09860758 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -104,26 +104,26 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 377 +#define YYNOCODE 378 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SToken yy5; - EJoinType yy74; - SNodeList* yy210; - EFillMode yy270; - int64_t yy311; - SAlterOption yy351; - bool yy403; - EOperatorType yy428; - int32_t yy462; - ENullOrder yy477; - int8_t yy535; - SDataType yy552; - EOrder yy553; - SNode* yy652; + EFillMode yy18; + EJoinType yy36; + ENullOrder yy109; + EOperatorType yy128; + bool yy173; + SDataType yy196; + EOrder yy218; + SAlterOption yy389; + int32_t yy424; + SToken yy533; + SNode* yy560; + int64_t yy585; + SNodeList* yy712; + int8_t yy719; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -139,17 +139,17 @@ typedef union { #define ParseCTX_FETCH #define ParseCTX_STORE #define YYFALLBACK 1 -#define YYNSTATE 663 -#define YYNRULE 487 -#define YYNTOKEN 254 -#define YY_MAX_SHIFT 662 -#define YY_MIN_SHIFTREDUCE 966 -#define YY_MAX_SHIFTREDUCE 1452 -#define YY_ERROR_ACTION 1453 -#define YY_ACCEPT_ACTION 1454 -#define YY_NO_ACTION 1455 -#define YY_MIN_REDUCE 1456 -#define YY_MAX_REDUCE 1942 +#define YYNSTATE 666 +#define YYNRULE 488 +#define YYNTOKEN 255 +#define YY_MAX_SHIFT 665 +#define YY_MIN_SHIFTREDUCE 969 +#define YY_MAX_SHIFTREDUCE 1456 +#define YY_ERROR_ACTION 1457 +#define YY_ACCEPT_ACTION 1458 +#define YY_NO_ACTION 1459 +#define YY_MIN_REDUCE 1460 +#define YY_MAX_REDUCE 1947 /************* End control #defines *******************************************/ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) @@ -216,672 +216,688 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (2436) +#define YY_ACTTAB_COUNT (2520) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 430, 1920, 431, 1491, 438, 71, 431, 1491, 514, 62, - /* 10 */ 1645, 1693, 39, 37, 1919, 549, 323, 325, 1917, 1690, - /* 20 */ 337, 86, 1254, 1457, 33, 32, 1643, 1589, 40, 38, - /* 30 */ 36, 35, 34, 1329, 119, 1252, 1777, 40, 38, 36, - /* 40 */ 35, 34, 1585, 122, 103, 1734, 549, 102, 101, 100, - /* 50 */ 99, 98, 97, 96, 95, 94, 1324, 526, 549, 22, - /* 60 */ 14, 1016, 342, 1015, 1795, 1638, 1640, 1260, 113, 142, - /* 70 */ 1795, 1468, 578, 79, 122, 468, 466, 1747, 542, 577, - /* 80 */ 39, 37, 1392, 120, 1, 1593, 122, 61, 337, 61, - /* 90 */ 1254, 1017, 358, 554, 1586, 554, 379, 551, 155, 1862, - /* 100 */ 1863, 1329, 1867, 1252, 1808, 1479, 659, 1521, 89, 1778, - /* 110 */ 580, 1780, 1781, 576, 120, 571, 541, 552, 1854, 552, - /* 120 */ 1331, 1332, 304, 1850, 1324, 1478, 120, 526, 14, 249, - /* 130 */ 1862, 548, 1456, 547, 1920, 1260, 1920, 1920, 164, 30, - /* 140 */ 259, 156, 1862, 1863, 1777, 1867, 1747, 161, 447, 161, - /* 150 */ 159, 1917, 2, 1917, 1917, 1593, 112, 111, 110, 109, - /* 160 */ 108, 107, 106, 105, 104, 1255, 1747, 1253, 1279, 483, - /* 170 */ 482, 481, 1795, 1920, 659, 480, 220, 221, 118, 477, - /* 180 */ 578, 43, 476, 475, 474, 1747, 160, 577, 1331, 1332, - /* 190 */ 1917, 429, 1258, 1259, 433, 1307, 1308, 1310, 1311, 1312, - /* 200 */ 1313, 1314, 573, 569, 1322, 1323, 1325, 1326, 1327, 1328, - /* 210 */ 1330, 1333, 1808, 1413, 1278, 538, 90, 1778, 580, 1780, - /* 220 */ 1781, 576, 1279, 571, 162, 1454, 1854, 162, 552, 162, - /* 230 */ 328, 1850, 1933, 1255, 314, 1253, 61, 303, 140, 143, - /* 240 */ 516, 1888, 999, 1549, 33, 32, 1645, 1596, 40, 38, - /* 250 */ 36, 35, 34, 341, 535, 1411, 1412, 1414, 1415, 1477, - /* 260 */ 1258, 1259, 1643, 1307, 1308, 1310, 1311, 1312, 1313, 1314, - /* 270 */ 573, 569, 1322, 1323, 1325, 1326, 1327, 1328, 1330, 1333, - /* 280 */ 39, 37, 1003, 1004, 315, 349, 313, 312, 337, 470, - /* 290 */ 1254, 1777, 42, 472, 544, 539, 305, 1353, 11, 10, - /* 300 */ 1747, 1329, 103, 1252, 153, 102, 101, 100, 99, 98, - /* 310 */ 97, 96, 95, 94, 385, 471, 378, 1632, 377, 1795, - /* 320 */ 1358, 1292, 1151, 1152, 1324, 1278, 1920, 553, 14, 1351, - /* 330 */ 1639, 1640, 1747, 437, 577, 1260, 433, 39, 37, 159, - /* 340 */ 483, 482, 481, 1917, 1920, 337, 480, 1254, 1518, 118, - /* 350 */ 477, 301, 2, 476, 475, 474, 605, 1918, 1329, 1808, - /* 360 */ 1252, 1917, 27, 90, 1778, 580, 1780, 1781, 576, 435, - /* 370 */ 571, 71, 370, 1854, 659, 1276, 162, 328, 1850, 154, - /* 380 */ 1396, 1324, 1365, 1352, 117, 1016, 1278, 1015, 1331, 1332, - /* 390 */ 1309, 158, 1260, 1588, 372, 368, 543, 33, 32, 1880, - /* 400 */ 1571, 40, 38, 36, 35, 34, 1357, 479, 478, 8, - /* 410 */ 636, 635, 634, 633, 345, 1017, 632, 631, 630, 123, - /* 420 */ 625, 624, 623, 622, 621, 620, 619, 618, 133, 614, - /* 430 */ 324, 659, 162, 1255, 561, 1253, 33, 32, 140, 613, - /* 440 */ 40, 38, 36, 35, 34, 1331, 1332, 1595, 29, 335, - /* 450 */ 1346, 1347, 1348, 1349, 1350, 1354, 1355, 1356, 1280, 447, - /* 460 */ 1258, 1259, 1476, 1307, 1308, 1310, 1311, 1312, 1313, 1314, - /* 470 */ 573, 569, 1322, 1323, 1325, 1326, 1327, 1328, 1330, 1333, - /* 480 */ 33, 32, 214, 526, 40, 38, 36, 35, 34, 170, - /* 490 */ 1255, 207, 1253, 219, 165, 1281, 340, 36, 35, 34, - /* 500 */ 59, 33, 32, 1747, 140, 40, 38, 36, 35, 34, - /* 510 */ 61, 1593, 75, 1595, 629, 627, 69, 1258, 1259, 68, - /* 520 */ 1307, 1308, 1310, 1311, 1312, 1313, 1314, 573, 569, 1322, - /* 530 */ 1323, 1325, 1326, 1327, 1328, 1330, 1333, 39, 37, 1334, - /* 540 */ 1689, 139, 298, 1475, 343, 337, 1777, 1254, 1277, 162, - /* 550 */ 73, 303, 140, 305, 516, 1234, 1235, 1423, 1329, 418, - /* 560 */ 1252, 1595, 1309, 1109, 602, 601, 600, 1113, 599, 1115, - /* 570 */ 1116, 598, 1118, 595, 1795, 1124, 592, 1126, 1127, 589, - /* 580 */ 586, 1324, 578, 488, 1747, 1449, 1351, 1747, 526, 577, - /* 590 */ 251, 472, 1260, 1474, 39, 37, 1683, 1254, 498, 383, - /* 600 */ 44, 4, 337, 554, 1254, 174, 173, 172, 1260, 9, - /* 610 */ 1252, 1071, 206, 471, 1808, 1329, 1593, 1252, 89, 1778, - /* 620 */ 580, 1780, 1781, 576, 497, 571, 491, 231, 1854, 1473, - /* 630 */ 485, 659, 304, 1850, 1747, 205, 562, 495, 1324, 493, - /* 640 */ 1352, 26, 1260, 1073, 1920, 1331, 1332, 33, 32, 1260, - /* 650 */ 162, 40, 38, 36, 35, 34, 1569, 159, 1869, 1472, - /* 660 */ 1471, 1917, 56, 1357, 611, 55, 9, 1869, 558, 526, - /* 670 */ 1747, 33, 32, 1645, 1448, 40, 38, 36, 35, 34, - /* 680 */ 384, 659, 1866, 131, 130, 608, 607, 606, 659, 1644, - /* 690 */ 1255, 1865, 1253, 1003, 1004, 1869, 513, 1593, 1470, 7, - /* 700 */ 1747, 1747, 1331, 1332, 1570, 29, 335, 1346, 1347, 1348, - /* 710 */ 1349, 1350, 1354, 1355, 1356, 613, 1582, 1258, 1259, 1864, - /* 720 */ 1307, 1308, 1310, 1311, 1312, 1313, 1314, 573, 569, 1322, - /* 730 */ 1323, 1325, 1326, 1327, 1328, 1330, 1333, 1920, 556, 1747, - /* 740 */ 1255, 1688, 1253, 298, 617, 28, 1565, 1255, 1403, 1253, - /* 750 */ 159, 33, 32, 514, 1917, 40, 38, 36, 35, 34, - /* 760 */ 347, 1874, 1385, 616, 1691, 33, 32, 1258, 1259, 40, - /* 770 */ 38, 36, 35, 34, 1258, 1259, 213, 1307, 1308, 1310, - /* 780 */ 1311, 1312, 1313, 1314, 573, 569, 1322, 1323, 1325, 1326, - /* 790 */ 1327, 1328, 1330, 1333, 39, 37, 300, 1578, 1276, 1467, - /* 800 */ 611, 1920, 337, 1777, 1254, 411, 74, 609, 423, 1466, - /* 810 */ 1636, 1508, 1389, 526, 159, 1329, 499, 1252, 1917, 131, - /* 820 */ 130, 608, 607, 606, 388, 396, 1465, 424, 1464, 398, - /* 830 */ 1339, 1795, 610, 484, 271, 1636, 1278, 1623, 1324, 578, - /* 840 */ 1747, 1593, 1292, 1568, 1747, 526, 577, 33, 32, 1260, - /* 850 */ 1747, 40, 38, 36, 35, 34, 113, 1920, 549, 52, - /* 860 */ 510, 389, 198, 473, 1263, 196, 2, 1747, 559, 1747, - /* 870 */ 159, 1808, 1580, 1593, 1917, 90, 1778, 580, 1780, 1781, - /* 880 */ 576, 1463, 571, 1385, 1462, 1854, 122, 1461, 659, 328, - /* 890 */ 1850, 1933, 1460, 1459, 200, 11, 10, 199, 1262, 1576, - /* 900 */ 1911, 422, 1331, 1332, 417, 416, 415, 414, 413, 410, - /* 910 */ 409, 408, 407, 406, 402, 401, 400, 399, 393, 392, - /* 920 */ 391, 390, 1747, 387, 386, 1747, 120, 526, 1747, 526, - /* 930 */ 628, 141, 1042, 1747, 1747, 526, 277, 526, 403, 611, - /* 940 */ 404, 157, 1862, 1863, 567, 1867, 446, 1255, 1590, 1253, - /* 950 */ 275, 58, 1451, 1452, 57, 1593, 506, 1593, 131, 130, - /* 960 */ 608, 607, 606, 1593, 1043, 1593, 1777, 210, 572, 604, - /* 970 */ 176, 426, 373, 41, 1258, 1259, 549, 1307, 1308, 1310, - /* 980 */ 1311, 1312, 1313, 1314, 573, 569, 1322, 1323, 1325, 1326, - /* 990 */ 1327, 1328, 1330, 1333, 1795, 526, 1266, 61, 202, 526, - /* 1000 */ 526, 201, 553, 526, 122, 204, 1722, 1747, 203, 577, - /* 1010 */ 507, 511, 1309, 1584, 524, 1202, 218, 1469, 1764, 1550, - /* 1020 */ 254, 526, 500, 1593, 1761, 554, 465, 1593, 1593, 1761, - /* 1030 */ 1265, 1593, 525, 1388, 1808, 88, 526, 1777, 90, 1778, - /* 1040 */ 580, 1780, 1781, 576, 120, 571, 1503, 260, 1854, 1593, - /* 1050 */ 1757, 1763, 328, 1850, 154, 1757, 1763, 326, 222, 249, - /* 1060 */ 1862, 548, 571, 547, 1593, 1795, 1920, 571, 486, 1501, - /* 1070 */ 66, 65, 382, 578, 1881, 169, 1343, 85, 1747, 159, - /* 1080 */ 577, 376, 536, 1917, 1767, 334, 333, 82, 125, 243, - /* 1090 */ 128, 489, 1796, 129, 299, 1268, 50, 366, 1492, 364, - /* 1100 */ 360, 356, 166, 351, 348, 1808, 1329, 1764, 1261, 90, - /* 1110 */ 1778, 580, 1780, 1781, 576, 1765, 571, 235, 1761, 1854, - /* 1120 */ 526, 1633, 1769, 328, 1850, 1933, 1761, 1497, 41, 1324, - /* 1130 */ 519, 344, 228, 1777, 1873, 1102, 346, 162, 1410, 50, - /* 1140 */ 1260, 41, 1884, 584, 1757, 1763, 332, 128, 1593, 129, - /* 1150 */ 114, 128, 1757, 1763, 550, 248, 571, 253, 256, 238, - /* 1160 */ 258, 1795, 80, 53, 571, 5, 3, 350, 1276, 578, - /* 1170 */ 270, 353, 357, 310, 1747, 654, 577, 1071, 311, 566, - /* 1180 */ 1218, 1359, 267, 1315, 405, 1130, 1685, 171, 412, 1134, - /* 1190 */ 554, 1141, 1139, 132, 1777, 420, 419, 425, 421, 427, - /* 1200 */ 428, 1808, 1282, 436, 1285, 284, 1778, 580, 1780, 1781, - /* 1210 */ 576, 439, 571, 1284, 179, 440, 181, 441, 1286, 184, - /* 1220 */ 442, 444, 1795, 186, 1283, 188, 445, 70, 448, 191, - /* 1230 */ 578, 1920, 268, 467, 469, 1747, 1583, 577, 1269, 302, - /* 1240 */ 1264, 93, 195, 501, 161, 208, 1579, 1777, 1917, 197, - /* 1250 */ 134, 554, 135, 1581, 1577, 136, 137, 1727, 211, 502, - /* 1260 */ 508, 512, 1808, 534, 215, 1272, 284, 1778, 580, 1780, - /* 1270 */ 1781, 576, 505, 571, 226, 1795, 569, 1322, 1323, 1325, - /* 1280 */ 1326, 1327, 1328, 578, 126, 515, 1726, 1695, 1747, 520, - /* 1290 */ 577, 127, 1920, 521, 320, 224, 517, 322, 522, 1777, - /* 1300 */ 269, 78, 1594, 1281, 530, 159, 532, 1885, 537, 1917, - /* 1310 */ 233, 533, 237, 1895, 1894, 1808, 327, 6, 540, 91, - /* 1320 */ 1778, 580, 1780, 1781, 576, 546, 571, 1795, 531, 1854, - /* 1330 */ 1876, 529, 528, 1853, 1850, 578, 1385, 247, 148, 1280, - /* 1340 */ 1747, 563, 577, 246, 244, 121, 242, 48, 1870, 329, - /* 1350 */ 582, 272, 1777, 245, 560, 1637, 1566, 263, 655, 656, - /* 1360 */ 658, 51, 285, 147, 1741, 1835, 1777, 1808, 295, 276, - /* 1370 */ 252, 91, 1778, 580, 1780, 1781, 576, 63, 571, 274, - /* 1380 */ 1795, 1854, 1916, 557, 1740, 565, 1850, 564, 575, 294, - /* 1390 */ 1739, 1936, 255, 1747, 1795, 577, 257, 64, 1738, 352, - /* 1400 */ 1735, 354, 578, 355, 1246, 1247, 167, 1747, 359, 577, - /* 1410 */ 1733, 361, 362, 363, 1732, 365, 1731, 367, 1730, 1777, - /* 1420 */ 1808, 369, 1729, 371, 292, 1778, 580, 1780, 1781, 576, - /* 1430 */ 574, 571, 568, 1826, 1808, 1712, 168, 1777, 144, 1778, - /* 1440 */ 580, 1780, 1781, 576, 375, 571, 374, 1795, 1221, 1706, - /* 1450 */ 1220, 1705, 380, 381, 1704, 578, 1703, 1190, 1678, 1677, - /* 1460 */ 1747, 1676, 577, 1675, 67, 1795, 1674, 1673, 1672, 1671, - /* 1470 */ 321, 394, 395, 578, 1670, 397, 1669, 1668, 1747, 1667, - /* 1480 */ 577, 1666, 555, 1934, 1665, 1664, 1663, 1808, 1662, 1777, - /* 1490 */ 1661, 91, 1778, 580, 1780, 1781, 576, 1660, 571, 1659, - /* 1500 */ 1658, 1854, 1657, 1656, 124, 1808, 1851, 1655, 1654, 293, - /* 1510 */ 1778, 580, 1780, 1781, 576, 1653, 571, 1795, 1192, 1649, - /* 1520 */ 1648, 1647, 527, 1652, 1651, 578, 1650, 1646, 1522, 175, - /* 1530 */ 1747, 1777, 577, 1520, 1488, 177, 1006, 115, 152, 1005, - /* 1540 */ 1487, 1777, 1720, 1714, 1702, 178, 1701, 432, 116, 183, - /* 1550 */ 434, 185, 1687, 1572, 1519, 1517, 451, 1808, 450, 1795, - /* 1560 */ 1515, 293, 1778, 580, 1780, 1781, 576, 578, 571, 1795, - /* 1570 */ 449, 453, 1747, 1035, 577, 1513, 454, 578, 455, 458, - /* 1580 */ 457, 1511, 1747, 461, 577, 462, 459, 1500, 463, 1499, - /* 1590 */ 1484, 1777, 1574, 1145, 1144, 1573, 1070, 1069, 1068, 1808, - /* 1600 */ 1067, 1064, 626, 288, 1778, 580, 1780, 1781, 576, 1808, - /* 1610 */ 571, 628, 1063, 144, 1778, 580, 1780, 1781, 576, 1795, - /* 1620 */ 571, 1062, 194, 49, 1509, 316, 1061, 575, 1504, 317, - /* 1630 */ 1502, 487, 1747, 318, 577, 1483, 490, 492, 1482, 494, - /* 1640 */ 1481, 545, 496, 1777, 1719, 92, 1713, 1228, 503, 138, - /* 1650 */ 1700, 1698, 1699, 1697, 1696, 15, 1694, 223, 1935, 1808, - /* 1660 */ 1777, 217, 212, 292, 1778, 580, 1780, 1781, 576, 1238, - /* 1670 */ 571, 1795, 1827, 1686, 82, 225, 336, 76, 77, 578, - /* 1680 */ 230, 16, 41, 23, 1747, 47, 577, 241, 1795, 54, - /* 1690 */ 1425, 234, 232, 338, 1407, 509, 578, 236, 240, 227, - /* 1700 */ 1409, 1747, 504, 577, 1402, 145, 239, 518, 319, 1767, - /* 1710 */ 25, 1808, 1382, 662, 1381, 293, 1778, 580, 1780, 1781, - /* 1720 */ 576, 24, 571, 250, 46, 1766, 18, 266, 1808, 81, - /* 1730 */ 149, 1437, 293, 1778, 580, 1780, 1781, 576, 45, 571, - /* 1740 */ 1436, 151, 17, 1442, 1431, 193, 652, 648, 644, 640, - /* 1750 */ 264, 1777, 330, 1441, 1440, 331, 10, 1270, 19, 146, - /* 1760 */ 1811, 1300, 1344, 1777, 464, 460, 456, 452, 192, 150, - /* 1770 */ 1319, 570, 163, 1317, 31, 1777, 1316, 87, 579, 1795, - /* 1780 */ 229, 12, 20, 21, 581, 1131, 583, 578, 339, 1128, - /* 1790 */ 585, 1795, 1747, 587, 577, 72, 1125, 13, 190, 578, - /* 1800 */ 588, 590, 593, 1795, 1747, 591, 577, 1119, 594, 596, - /* 1810 */ 1117, 578, 597, 523, 1108, 1123, 1747, 1122, 577, 1808, - /* 1820 */ 1140, 1121, 1120, 278, 1778, 580, 1780, 1781, 576, 83, - /* 1830 */ 571, 1808, 603, 84, 60, 279, 1778, 580, 1780, 1781, - /* 1840 */ 576, 261, 571, 1808, 1136, 216, 612, 280, 1778, 580, - /* 1850 */ 1780, 1781, 576, 1058, 571, 1033, 1077, 1777, 615, 262, - /* 1860 */ 189, 182, 1056, 187, 1055, 1054, 1226, 443, 209, 1053, - /* 1870 */ 1052, 1777, 1051, 1050, 1049, 1074, 1516, 1072, 1046, 1045, - /* 1880 */ 1044, 1041, 1040, 1039, 1038, 1795, 180, 637, 1514, 1512, - /* 1890 */ 639, 641, 643, 578, 645, 1510, 649, 647, 1747, 1795, - /* 1900 */ 577, 638, 642, 651, 646, 1498, 653, 578, 996, 650, - /* 1910 */ 1480, 657, 1747, 265, 577, 1256, 273, 660, 661, 1455, - /* 1920 */ 1455, 1777, 1455, 1455, 1455, 1808, 1455, 1455, 1455, 287, - /* 1930 */ 1778, 580, 1780, 1781, 576, 1455, 571, 1777, 1455, 1808, - /* 1940 */ 1455, 1455, 1455, 289, 1778, 580, 1780, 1781, 576, 1795, - /* 1950 */ 571, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, - /* 1960 */ 1455, 1455, 1747, 1455, 577, 1795, 1455, 1455, 1455, 1455, - /* 1970 */ 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1455, - /* 1980 */ 577, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1808, - /* 1990 */ 1777, 1455, 1455, 281, 1778, 580, 1780, 1781, 576, 1455, - /* 2000 */ 571, 1455, 1455, 1455, 1777, 1808, 1455, 1455, 1455, 290, - /* 2010 */ 1778, 580, 1780, 1781, 576, 1455, 571, 1455, 1795, 1455, - /* 2020 */ 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, - /* 2030 */ 1455, 1747, 1795, 577, 1455, 1455, 1455, 1455, 1455, 1455, - /* 2040 */ 578, 1455, 1455, 1455, 1455, 1747, 1455, 577, 1455, 1455, - /* 2050 */ 1455, 1455, 1455, 1455, 1455, 1455, 1777, 1455, 1808, 1455, - /* 2060 */ 1455, 1455, 282, 1778, 580, 1780, 1781, 576, 1455, 571, - /* 2070 */ 1455, 1455, 1808, 1455, 1777, 1455, 291, 1778, 580, 1780, - /* 2080 */ 1781, 576, 1455, 571, 1795, 1455, 1455, 1455, 1455, 1455, - /* 2090 */ 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1777, 577, - /* 2100 */ 1455, 1455, 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, - /* 2110 */ 578, 1455, 1455, 1455, 1455, 1747, 1455, 577, 1455, 1455, - /* 2120 */ 1455, 1455, 1455, 1455, 1808, 1455, 1795, 1455, 283, 1778, - /* 2130 */ 580, 1780, 1781, 576, 578, 571, 1455, 1455, 1455, 1747, - /* 2140 */ 1455, 577, 1808, 1455, 1455, 1455, 296, 1778, 580, 1780, - /* 2150 */ 1781, 576, 1455, 571, 1455, 1455, 1777, 1455, 1455, 1455, - /* 2160 */ 1455, 1455, 1455, 1455, 1455, 1455, 1808, 1455, 1455, 1455, - /* 2170 */ 297, 1778, 580, 1780, 1781, 576, 1455, 571, 1455, 1777, - /* 2180 */ 1455, 1455, 1455, 1455, 1795, 1455, 1455, 1455, 1455, 1455, - /* 2190 */ 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, 1455, 577, - /* 2200 */ 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1795, 1455, 1455, - /* 2210 */ 1455, 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, - /* 2220 */ 1747, 1455, 577, 1455, 1808, 1455, 1455, 1455, 1789, 1778, - /* 2230 */ 580, 1780, 1781, 576, 1455, 571, 1777, 1455, 1455, 1455, - /* 2240 */ 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1808, 1777, 1455, - /* 2250 */ 1455, 1788, 1778, 580, 1780, 1781, 576, 1455, 571, 1455, - /* 2260 */ 1455, 1455, 1777, 1455, 1795, 1455, 1455, 1455, 1455, 1455, - /* 2270 */ 1455, 1455, 578, 1455, 1455, 1455, 1795, 1747, 1455, 577, - /* 2280 */ 1455, 1455, 1455, 1455, 578, 1455, 1455, 1455, 1455, 1747, - /* 2290 */ 1795, 577, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, - /* 2300 */ 1455, 1455, 1455, 1747, 1808, 577, 1455, 1455, 1787, 1778, - /* 2310 */ 580, 1780, 1781, 576, 1777, 571, 1808, 1455, 1455, 1455, - /* 2320 */ 308, 1778, 580, 1780, 1781, 576, 1455, 571, 1455, 1455, - /* 2330 */ 1808, 1455, 1777, 1455, 307, 1778, 580, 1780, 1781, 576, - /* 2340 */ 1455, 571, 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, - /* 2350 */ 578, 1455, 1455, 1455, 1455, 1747, 1777, 577, 1455, 1455, - /* 2360 */ 1795, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 578, 1455, - /* 2370 */ 1455, 1455, 1455, 1747, 1455, 577, 1455, 1455, 1455, 1455, - /* 2380 */ 1455, 1455, 1808, 1455, 1795, 1455, 309, 1778, 580, 1780, - /* 2390 */ 1781, 576, 578, 571, 1455, 1455, 1455, 1747, 1455, 577, - /* 2400 */ 1808, 1455, 1455, 1455, 306, 1778, 580, 1780, 1781, 576, - /* 2410 */ 1455, 571, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, - /* 2420 */ 1455, 1455, 1455, 1455, 1808, 1455, 1455, 1455, 286, 1778, - /* 2430 */ 580, 1780, 1781, 576, 1455, 571, + /* 0 */ 529, 1698, 433, 552, 434, 1495, 441, 1587, 434, 1495, + /* 10 */ 1769, 113, 39, 37, 386, 62, 517, 1583, 471, 380, + /* 20 */ 338, 1766, 1258, 1002, 324, 79, 1782, 1695, 1598, 30, + /* 30 */ 260, 122, 143, 1333, 103, 1256, 1554, 102, 101, 100, + /* 40 */ 99, 98, 97, 96, 95, 94, 1591, 1762, 1768, 327, + /* 50 */ 71, 302, 557, 1925, 1800, 555, 1328, 1512, 1283, 574, + /* 60 */ 1925, 14, 581, 1006, 1007, 500, 1924, 1752, 1264, 580, + /* 70 */ 1922, 120, 1594, 159, 39, 37, 1396, 1922, 498, 487, + /* 80 */ 496, 529, 338, 557, 1258, 1, 250, 1867, 551, 1019, + /* 90 */ 550, 1018, 164, 1925, 1813, 1333, 61, 1256, 89, 1783, + /* 100 */ 583, 1785, 1786, 579, 469, 574, 161, 662, 1859, 1598, + /* 110 */ 1922, 343, 305, 1855, 1643, 1645, 71, 61, 1328, 1020, + /* 120 */ 43, 1335, 1336, 14, 1925, 1461, 1925, 33, 32, 117, + /* 130 */ 1264, 40, 38, 36, 35, 34, 475, 161, 1593, 160, + /* 140 */ 142, 1922, 1472, 1922, 1483, 1782, 103, 2, 214, 102, + /* 150 */ 101, 100, 99, 98, 97, 96, 95, 94, 474, 1155, + /* 160 */ 1156, 486, 485, 484, 170, 1925, 1259, 483, 1257, 662, + /* 170 */ 118, 480, 325, 1800, 479, 478, 477, 1458, 1923, 74, + /* 180 */ 140, 556, 1922, 1335, 1336, 1752, 1752, 555, 580, 1600, + /* 190 */ 1644, 1645, 69, 1262, 1263, 68, 1311, 1312, 1314, 1315, + /* 200 */ 1316, 1317, 1318, 576, 572, 1326, 1327, 1329, 1330, 1331, + /* 210 */ 1332, 1334, 1337, 1813, 36, 35, 34, 90, 1783, 583, + /* 220 */ 1785, 1786, 579, 529, 574, 162, 371, 1859, 1259, 555, + /* 230 */ 1257, 329, 1855, 154, 113, 419, 162, 350, 1482, 33, + /* 240 */ 32, 476, 450, 40, 38, 36, 35, 34, 373, 369, + /* 250 */ 1283, 1598, 552, 1886, 1393, 1262, 1263, 162, 1311, 1312, + /* 260 */ 1314, 1315, 1316, 1317, 1318, 576, 572, 1326, 1327, 1329, + /* 270 */ 1330, 1331, 1332, 1334, 1337, 39, 37, 1453, 1925, 1752, + /* 280 */ 122, 174, 173, 338, 220, 1258, 40, 38, 36, 35, + /* 290 */ 34, 159, 306, 61, 42, 1922, 1333, 1739, 1256, 1113, + /* 300 */ 605, 604, 603, 1117, 602, 1119, 1120, 601, 1122, 598, + /* 310 */ 1800, 1128, 595, 1130, 1131, 592, 589, 1296, 545, 1328, + /* 320 */ 120, 1782, 33, 32, 14, 1355, 40, 38, 36, 35, + /* 330 */ 34, 1264, 39, 37, 554, 155, 1867, 1868, 86, 1872, + /* 340 */ 338, 552, 1258, 1769, 359, 1650, 1238, 1239, 2, 1800, + /* 350 */ 341, 119, 326, 1333, 1766, 1256, 544, 581, 140, 1590, + /* 360 */ 344, 1648, 1752, 529, 580, 1400, 1452, 1600, 140, 122, + /* 370 */ 662, 1282, 1282, 379, 165, 378, 1328, 1600, 557, 1356, + /* 380 */ 1762, 1768, 333, 1576, 1335, 1336, 1460, 432, 1264, 1813, + /* 390 */ 436, 1598, 574, 89, 1783, 583, 1785, 1786, 579, 1481, + /* 400 */ 574, 440, 1361, 1859, 436, 8, 215, 305, 1855, 120, + /* 410 */ 112, 111, 110, 109, 108, 107, 106, 105, 104, 1925, + /* 420 */ 482, 481, 632, 630, 156, 1867, 1868, 662, 1872, 1259, + /* 430 */ 208, 1257, 159, 162, 162, 61, 1922, 75, 516, 1480, + /* 440 */ 1752, 1335, 1336, 450, 29, 336, 1350, 1351, 1352, 1353, + /* 450 */ 1354, 1358, 1359, 1360, 1479, 315, 1262, 1263, 546, 1311, + /* 460 */ 1312, 1314, 1315, 1316, 1317, 1318, 576, 572, 1326, 1327, + /* 470 */ 1329, 1330, 1331, 1332, 1334, 1337, 1392, 33, 32, 1925, + /* 480 */ 1752, 40, 38, 36, 35, 34, 1259, 1357, 1257, 73, + /* 490 */ 304, 1650, 159, 519, 541, 1752, 1922, 33, 32, 348, + /* 500 */ 1284, 40, 38, 36, 35, 34, 316, 1649, 314, 313, + /* 510 */ 1362, 473, 616, 1262, 1263, 475, 1311, 1312, 1314, 1315, + /* 520 */ 1316, 1317, 1318, 576, 572, 1326, 1327, 1329, 1330, 1331, + /* 530 */ 1332, 1334, 1337, 39, 37, 1338, 438, 474, 1006, 1007, + /* 540 */ 1925, 338, 1280, 1258, 1782, 162, 1874, 1478, 1313, 1019, + /* 550 */ 306, 1018, 27, 159, 1333, 1427, 1256, 1922, 1589, 33, + /* 560 */ 32, 221, 222, 40, 38, 36, 35, 34, 1285, 1766, + /* 570 */ 1871, 552, 1800, 547, 542, 162, 1574, 1328, 1281, 1020, + /* 580 */ 556, 529, 529, 1355, 153, 1752, 1477, 580, 1752, 1264, + /* 590 */ 39, 37, 384, 385, 22, 1762, 1768, 1637, 338, 122, + /* 600 */ 1258, 1522, 1075, 11, 10, 140, 9, 574, 1650, 1598, + /* 610 */ 1598, 1333, 1813, 1256, 1601, 342, 90, 1783, 583, 1785, + /* 620 */ 1786, 579, 304, 574, 1648, 519, 1859, 1752, 662, 529, + /* 630 */ 329, 1855, 154, 252, 1328, 1077, 616, 1356, 1874, 120, + /* 640 */ 389, 1473, 1335, 1336, 158, 1343, 1264, 1694, 1688, 299, + /* 650 */ 517, 1282, 1885, 1264, 157, 1867, 1868, 1598, 1872, 172, + /* 660 */ 1361, 1696, 1870, 9, 639, 638, 637, 636, 346, 561, + /* 670 */ 635, 634, 633, 123, 628, 627, 626, 625, 624, 623, + /* 680 */ 622, 621, 133, 617, 1525, 662, 1282, 1259, 1369, 1257, + /* 690 */ 33, 32, 1874, 1476, 40, 38, 36, 35, 34, 1335, + /* 700 */ 1336, 232, 29, 336, 1350, 1351, 1352, 1353, 1354, 1358, + /* 710 */ 1359, 1360, 7, 1475, 1262, 1263, 1869, 1311, 1312, 1314, + /* 720 */ 1315, 1316, 1317, 1318, 576, 572, 1326, 1327, 1329, 1330, + /* 730 */ 1331, 1332, 1334, 1337, 1752, 33, 32, 1879, 1389, 40, + /* 740 */ 38, 36, 35, 34, 1259, 608, 1257, 486, 485, 484, + /* 750 */ 44, 4, 1258, 483, 1752, 272, 118, 480, 1628, 619, + /* 760 */ 479, 478, 477, 1474, 1585, 1256, 1417, 1693, 1407, 299, + /* 770 */ 612, 1262, 1263, 1641, 1311, 1312, 1314, 1315, 1316, 1317, + /* 780 */ 1318, 576, 572, 1326, 1327, 1329, 1330, 1331, 1332, 1334, + /* 790 */ 1337, 39, 37, 301, 613, 1280, 614, 1641, 1264, 338, + /* 800 */ 1581, 1258, 412, 1782, 1752, 424, 211, 538, 1415, 1416, + /* 810 */ 1418, 1419, 1333, 1296, 1256, 131, 130, 611, 610, 609, + /* 820 */ 11, 10, 397, 1575, 425, 575, 399, 59, 1313, 529, + /* 830 */ 529, 1800, 529, 1471, 620, 1328, 1570, 662, 1573, 581, + /* 840 */ 404, 405, 26, 449, 1752, 509, 580, 1264, 33, 32, + /* 850 */ 1507, 1505, 40, 38, 36, 35, 34, 1598, 1598, 390, + /* 860 */ 1598, 33, 32, 1313, 2, 40, 38, 36, 35, 34, + /* 870 */ 562, 1813, 489, 492, 1752, 91, 1783, 583, 1785, 1786, + /* 880 */ 579, 28, 574, 607, 631, 1859, 662, 33, 32, 1858, + /* 890 */ 1855, 40, 38, 36, 35, 34, 1259, 1389, 1257, 423, + /* 900 */ 1335, 1336, 418, 417, 416, 415, 414, 411, 410, 409, + /* 910 */ 408, 407, 403, 402, 401, 400, 394, 393, 392, 391, + /* 920 */ 614, 388, 387, 1262, 1263, 529, 1470, 374, 199, 141, + /* 930 */ 1555, 197, 564, 529, 278, 614, 1595, 52, 513, 131, + /* 940 */ 130, 611, 610, 609, 1727, 1259, 255, 1257, 276, 58, + /* 950 */ 41, 219, 57, 1598, 131, 130, 611, 610, 609, 1267, + /* 960 */ 1770, 1598, 502, 1469, 1782, 1455, 1456, 1752, 177, 429, + /* 970 */ 427, 1766, 1262, 1263, 1468, 1311, 1312, 1314, 1315, 1316, + /* 980 */ 1317, 1318, 576, 572, 1326, 1327, 1329, 1330, 1331, 1332, + /* 990 */ 1334, 1337, 1800, 1206, 223, 539, 61, 1762, 1768, 529, + /* 1000 */ 581, 468, 529, 1925, 1752, 1752, 139, 580, 1467, 574, + /* 1010 */ 510, 1266, 1466, 514, 529, 1752, 159, 1772, 201, 1465, + /* 1020 */ 1922, 200, 1464, 203, 1463, 527, 202, 1598, 570, 503, + /* 1030 */ 1598, 1801, 1813, 244, 88, 125, 90, 1783, 583, 1785, + /* 1040 */ 1786, 579, 1598, 574, 529, 1782, 1859, 529, 529, 1752, + /* 1050 */ 329, 1855, 1938, 1752, 205, 528, 1774, 204, 261, 345, + /* 1060 */ 1752, 1893, 552, 1752, 1046, 1752, 559, 128, 1501, 66, + /* 1070 */ 65, 383, 1598, 1800, 169, 1598, 1598, 347, 522, 85, + /* 1080 */ 377, 581, 129, 50, 335, 334, 1752, 1496, 580, 82, + /* 1090 */ 122, 236, 1270, 300, 1272, 1638, 367, 1047, 365, 361, + /* 1100 */ 357, 166, 352, 349, 249, 1333, 1889, 1265, 254, 553, + /* 1110 */ 229, 557, 257, 1813, 50, 3, 657, 90, 1783, 583, + /* 1120 */ 1785, 1786, 579, 1782, 574, 1106, 1414, 1859, 1328, 41, + /* 1130 */ 120, 329, 1855, 1938, 239, 565, 162, 41, 491, 259, + /* 1140 */ 1264, 80, 1916, 587, 1269, 250, 1867, 551, 53, 550, + /* 1150 */ 5, 1800, 1925, 501, 351, 1280, 354, 1363, 128, 581, + /* 1160 */ 1347, 358, 1222, 129, 1752, 159, 580, 207, 311, 1922, + /* 1170 */ 114, 128, 1319, 1075, 312, 406, 1782, 268, 1690, 569, + /* 1180 */ 271, 494, 171, 413, 421, 488, 1134, 420, 422, 1286, + /* 1190 */ 206, 1813, 426, 428, 430, 90, 1783, 583, 1785, 1786, + /* 1200 */ 579, 1138, 574, 431, 1800, 1859, 1145, 439, 1289, 329, + /* 1210 */ 1855, 1938, 581, 1143, 132, 442, 180, 1752, 56, 580, + /* 1220 */ 1878, 55, 443, 182, 1288, 1290, 445, 444, 1782, 185, + /* 1230 */ 447, 187, 1287, 557, 189, 451, 70, 448, 1273, 470, + /* 1240 */ 1268, 472, 192, 1588, 1813, 303, 196, 1732, 285, 1783, + /* 1250 */ 583, 1785, 1786, 579, 1584, 574, 1800, 93, 269, 198, + /* 1260 */ 134, 135, 504, 1586, 581, 1276, 1582, 136, 137, 1752, + /* 1270 */ 209, 580, 505, 212, 1925, 511, 572, 1326, 1327, 1329, + /* 1280 */ 1330, 1331, 1332, 515, 508, 557, 216, 161, 518, 537, + /* 1290 */ 227, 1922, 321, 1782, 126, 1731, 1813, 127, 1700, 520, + /* 1300 */ 285, 1783, 583, 1785, 1786, 579, 323, 574, 523, 1782, + /* 1310 */ 225, 524, 270, 525, 78, 1599, 1285, 1890, 533, 535, + /* 1320 */ 540, 1800, 234, 238, 1900, 536, 1925, 328, 6, 581, + /* 1330 */ 543, 549, 534, 532, 1752, 531, 580, 1800, 248, 159, + /* 1340 */ 1389, 121, 1284, 1922, 566, 578, 563, 48, 1899, 330, + /* 1350 */ 1752, 1875, 580, 1840, 585, 1881, 245, 243, 1642, 148, + /* 1360 */ 247, 1813, 273, 264, 1782, 91, 1783, 583, 1785, 1786, + /* 1370 */ 579, 246, 574, 1571, 658, 1859, 1782, 1813, 659, 568, + /* 1380 */ 1855, 293, 1783, 583, 1785, 1786, 579, 577, 574, 571, + /* 1390 */ 1831, 661, 1800, 51, 147, 275, 1746, 1921, 253, 286, + /* 1400 */ 581, 296, 295, 277, 1800, 1752, 560, 580, 256, 1941, + /* 1410 */ 567, 63, 581, 258, 1745, 1744, 64, 1752, 1743, 580, + /* 1420 */ 353, 1740, 355, 356, 1250, 1251, 167, 360, 1738, 362, + /* 1430 */ 363, 364, 1813, 1737, 366, 1736, 144, 1783, 583, 1785, + /* 1440 */ 1786, 579, 368, 574, 1813, 1735, 370, 1734, 91, 1783, + /* 1450 */ 583, 1785, 1786, 579, 1782, 574, 1717, 372, 1859, 375, + /* 1460 */ 168, 376, 1225, 1856, 1224, 1711, 1710, 381, 1782, 382, + /* 1470 */ 1709, 1708, 1194, 1683, 1682, 1681, 67, 1680, 1782, 1679, + /* 1480 */ 558, 1939, 1800, 1678, 1677, 1676, 395, 322, 396, 1675, + /* 1490 */ 581, 398, 1674, 1673, 1672, 1752, 1800, 580, 1671, 1670, + /* 1500 */ 1669, 530, 1668, 1667, 581, 1666, 1800, 1665, 1664, 1752, + /* 1510 */ 1663, 580, 1662, 1661, 581, 1660, 1659, 1658, 124, 1752, + /* 1520 */ 1657, 580, 1813, 1656, 1655, 1654, 294, 1783, 583, 1785, + /* 1530 */ 1786, 579, 1653, 574, 1652, 1782, 1813, 1651, 1527, 1526, + /* 1540 */ 294, 1783, 583, 1785, 1786, 579, 1813, 574, 1524, 1196, + /* 1550 */ 289, 1783, 583, 1785, 1786, 579, 1492, 574, 1491, 1782, + /* 1560 */ 175, 178, 176, 1800, 152, 115, 1009, 1008, 435, 179, + /* 1570 */ 116, 581, 1725, 1719, 437, 1707, 1752, 186, 580, 184, + /* 1580 */ 1706, 1692, 1577, 1523, 1521, 1782, 452, 1800, 548, 453, + /* 1590 */ 1519, 1517, 1039, 454, 456, 578, 457, 460, 1515, 458, + /* 1600 */ 1752, 1504, 580, 1813, 461, 462, 464, 144, 1783, 583, + /* 1610 */ 1785, 1786, 579, 1800, 574, 465, 466, 1503, 337, 1488, + /* 1620 */ 1579, 581, 1149, 1578, 1148, 195, 1752, 1813, 580, 49, + /* 1630 */ 1074, 293, 1783, 583, 1785, 1786, 579, 629, 574, 1782, + /* 1640 */ 1832, 1073, 1072, 631, 1071, 1068, 1067, 1066, 1065, 1513, + /* 1650 */ 317, 1508, 1940, 1813, 318, 665, 1506, 294, 1783, 583, + /* 1660 */ 1785, 1786, 579, 490, 574, 319, 493, 1800, 1487, 267, + /* 1670 */ 495, 1486, 339, 497, 1485, 581, 499, 92, 1724, 1232, + /* 1680 */ 1752, 1718, 580, 151, 506, 1705, 138, 1703, 655, 651, + /* 1690 */ 647, 643, 265, 1704, 54, 213, 507, 1702, 1701, 320, + /* 1700 */ 15, 1699, 512, 1691, 218, 226, 224, 1813, 41, 76, + /* 1710 */ 77, 294, 1783, 583, 1785, 1786, 579, 194, 574, 231, + /* 1720 */ 87, 521, 1782, 230, 82, 228, 16, 23, 242, 47, + /* 1730 */ 233, 146, 1429, 235, 1411, 237, 467, 463, 459, 455, + /* 1740 */ 193, 1413, 1242, 145, 240, 24, 1782, 1406, 241, 81, + /* 1750 */ 1800, 10, 1772, 25, 1441, 1386, 526, 251, 581, 45, + /* 1760 */ 46, 1385, 1771, 1752, 149, 580, 1446, 18, 72, 1435, + /* 1770 */ 1440, 191, 331, 1445, 1800, 1444, 332, 1274, 1348, 17, + /* 1780 */ 1816, 573, 581, 1304, 13, 19, 1323, 1752, 217, 580, + /* 1790 */ 1813, 150, 163, 1321, 279, 1783, 583, 1785, 1786, 579, + /* 1800 */ 31, 574, 1782, 586, 1112, 584, 1320, 12, 20, 1230, + /* 1810 */ 21, 210, 1135, 340, 1813, 588, 590, 582, 280, 1783, + /* 1820 */ 583, 1785, 1786, 579, 591, 574, 593, 596, 599, 1132, + /* 1830 */ 1800, 606, 594, 190, 183, 597, 188, 1129, 581, 1123, + /* 1840 */ 446, 1127, 1121, 1752, 1782, 580, 1144, 600, 83, 84, + /* 1850 */ 60, 262, 1140, 1126, 1782, 1062, 1037, 1125, 615, 181, + /* 1860 */ 618, 1124, 263, 1081, 1060, 1055, 1782, 1059, 1058, 1057, + /* 1870 */ 1813, 1056, 1800, 1054, 281, 1783, 583, 1785, 1786, 579, + /* 1880 */ 581, 574, 1800, 1053, 1078, 1752, 1076, 580, 1050, 1049, + /* 1890 */ 581, 1048, 1045, 1044, 1800, 1752, 1043, 580, 1042, 1520, + /* 1900 */ 640, 642, 581, 1518, 644, 646, 641, 1752, 1516, 580, + /* 1910 */ 648, 645, 1813, 650, 649, 1514, 288, 1783, 583, 1785, + /* 1920 */ 1786, 579, 1813, 574, 652, 653, 290, 1783, 583, 1785, + /* 1930 */ 1786, 579, 654, 574, 1813, 656, 999, 1484, 282, 1783, + /* 1940 */ 583, 1785, 1786, 579, 1502, 574, 266, 1782, 660, 1459, + /* 1950 */ 1260, 274, 663, 664, 1459, 1459, 1459, 1459, 1459, 1459, + /* 1960 */ 1459, 1459, 1459, 1459, 1459, 1459, 1782, 1459, 1459, 1459, + /* 1970 */ 1459, 1459, 1459, 1459, 1459, 1800, 1459, 1459, 1459, 1459, + /* 1980 */ 1459, 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, + /* 1990 */ 580, 1459, 1459, 1459, 1800, 1459, 1459, 1459, 1459, 1459, + /* 2000 */ 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, 580, + /* 2010 */ 1459, 1459, 1459, 1459, 1459, 1813, 1459, 1459, 1459, 291, + /* 2020 */ 1783, 583, 1785, 1786, 579, 1459, 574, 1782, 1459, 1459, + /* 2030 */ 1459, 1459, 1459, 1459, 1813, 1459, 1459, 1459, 283, 1783, + /* 2040 */ 583, 1785, 1786, 579, 1459, 574, 1782, 1459, 1459, 1459, + /* 2050 */ 1459, 1459, 1459, 1459, 1459, 1800, 1459, 1459, 1459, 1459, + /* 2060 */ 1459, 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, + /* 2070 */ 580, 1459, 1459, 1459, 1800, 1459, 1459, 1459, 1459, 1459, + /* 2080 */ 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, 580, + /* 2090 */ 1459, 1459, 1459, 1459, 1459, 1813, 1459, 1459, 1459, 292, + /* 2100 */ 1783, 583, 1785, 1786, 579, 1459, 574, 1459, 1459, 1459, + /* 2110 */ 1459, 1459, 1459, 1782, 1813, 1459, 1459, 1459, 284, 1783, + /* 2120 */ 583, 1785, 1786, 579, 1459, 574, 1459, 1459, 1459, 1782, + /* 2130 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1782, + /* 2140 */ 1459, 1800, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 581, + /* 2150 */ 1459, 1459, 1459, 1459, 1752, 1459, 580, 1800, 1459, 1459, + /* 2160 */ 1459, 1459, 1459, 1459, 1459, 581, 1459, 1800, 1459, 1459, + /* 2170 */ 1752, 1459, 580, 1459, 1459, 581, 1459, 1459, 1459, 1459, + /* 2180 */ 1752, 1813, 580, 1459, 1459, 297, 1783, 583, 1785, 1786, + /* 2190 */ 579, 1459, 574, 1782, 1459, 1459, 1459, 1813, 1459, 1459, + /* 2200 */ 1459, 298, 1783, 583, 1785, 1786, 579, 1813, 574, 1459, + /* 2210 */ 1459, 1794, 1783, 583, 1785, 1786, 579, 1459, 574, 1459, + /* 2220 */ 1459, 1800, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 581, + /* 2230 */ 1459, 1459, 1459, 1459, 1752, 1459, 580, 1459, 1459, 1459, + /* 2240 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1782, 1459, 1459, + /* 2250 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, + /* 2260 */ 1459, 1813, 1459, 1459, 1459, 1793, 1783, 583, 1785, 1786, + /* 2270 */ 579, 1459, 574, 1459, 1459, 1800, 1459, 1459, 1459, 1459, + /* 2280 */ 1459, 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, + /* 2290 */ 580, 1459, 1459, 1459, 1459, 1459, 1459, 1782, 1459, 1459, + /* 2300 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, + /* 2310 */ 1459, 1459, 1459, 1459, 1782, 1813, 1459, 1459, 1459, 1792, + /* 2320 */ 1783, 583, 1785, 1786, 579, 1800, 574, 1459, 1459, 1459, + /* 2330 */ 1459, 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, + /* 2340 */ 580, 1459, 1800, 1459, 1459, 1459, 1459, 1459, 1459, 1459, + /* 2350 */ 581, 1459, 1459, 1459, 1459, 1752, 1459, 580, 1459, 1459, + /* 2360 */ 1459, 1459, 1459, 1459, 1459, 1813, 1459, 1459, 1459, 309, + /* 2370 */ 1783, 583, 1785, 1786, 579, 1459, 574, 1782, 1459, 1459, + /* 2380 */ 1459, 1459, 1813, 1459, 1459, 1459, 308, 1783, 583, 1785, + /* 2390 */ 1786, 579, 1459, 574, 1459, 1459, 1459, 1459, 1782, 1459, + /* 2400 */ 1459, 1459, 1459, 1459, 1459, 1800, 1459, 1459, 1459, 1459, + /* 2410 */ 1459, 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, 1459, + /* 2420 */ 580, 1459, 1459, 1459, 1459, 1459, 1800, 1459, 1459, 1459, + /* 2430 */ 1459, 1459, 1459, 1459, 581, 1459, 1459, 1459, 1459, 1752, + /* 2440 */ 1782, 580, 1459, 1459, 1459, 1813, 1459, 1459, 1459, 310, + /* 2450 */ 1783, 583, 1785, 1786, 579, 1459, 574, 1459, 1459, 1459, + /* 2460 */ 1459, 1459, 1459, 1459, 1459, 1459, 1813, 1459, 1800, 1459, + /* 2470 */ 307, 1783, 583, 1785, 1786, 579, 581, 574, 1459, 1459, + /* 2480 */ 1459, 1752, 1459, 580, 1459, 1459, 1459, 1459, 1459, 1459, + /* 2490 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, + /* 2500 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1813, 1459, + /* 2510 */ 1459, 1459, 287, 1783, 583, 1785, 1786, 579, 1459, 574, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 261, 355, 263, 264, 261, 269, 263, 264, 300, 4, - /* 10 */ 285, 0, 12, 13, 368, 265, 308, 292, 372, 311, - /* 20 */ 20, 267, 22, 0, 8, 9, 301, 291, 12, 13, - /* 30 */ 14, 15, 16, 33, 280, 35, 257, 12, 13, 14, - /* 40 */ 15, 16, 288, 293, 21, 0, 265, 24, 25, 26, - /* 50 */ 27, 28, 29, 30, 31, 32, 56, 265, 265, 43, - /* 60 */ 60, 20, 296, 22, 285, 299, 300, 67, 276, 256, - /* 70 */ 285, 258, 293, 267, 293, 283, 35, 298, 293, 300, - /* 80 */ 12, 13, 14, 333, 84, 293, 293, 84, 20, 84, - /* 90 */ 22, 50, 47, 314, 288, 314, 314, 347, 348, 349, - /* 100 */ 350, 33, 352, 35, 325, 257, 106, 0, 329, 330, - /* 110 */ 331, 332, 333, 334, 333, 336, 331, 20, 339, 20, - /* 120 */ 120, 121, 343, 344, 56, 257, 333, 265, 60, 348, - /* 130 */ 349, 350, 0, 352, 355, 67, 355, 355, 276, 340, - /* 140 */ 341, 348, 349, 350, 257, 352, 298, 368, 59, 368, - /* 150 */ 368, 372, 84, 372, 372, 293, 24, 25, 26, 27, - /* 160 */ 28, 29, 30, 31, 32, 165, 298, 167, 20, 62, - /* 170 */ 63, 64, 285, 355, 106, 68, 115, 116, 71, 72, - /* 180 */ 293, 84, 75, 76, 77, 298, 368, 300, 120, 121, - /* 190 */ 372, 262, 192, 193, 265, 195, 196, 197, 198, 199, + /* 0 */ 266, 0, 262, 266, 264, 265, 262, 287, 264, 265, + /* 10 */ 288, 277, 12, 13, 266, 4, 301, 287, 284, 315, + /* 20 */ 20, 299, 22, 4, 309, 268, 258, 312, 294, 341, + /* 30 */ 342, 294, 271, 33, 21, 35, 275, 24, 25, 26, + /* 40 */ 27, 28, 29, 30, 31, 32, 289, 325, 326, 327, + /* 50 */ 270, 303, 315, 356, 286, 20, 56, 0, 20, 337, + /* 60 */ 356, 61, 294, 44, 45, 21, 369, 299, 68, 301, + /* 70 */ 373, 334, 292, 369, 12, 13, 14, 373, 34, 22, + /* 80 */ 36, 266, 20, 315, 22, 85, 349, 350, 351, 20, + /* 90 */ 353, 22, 277, 356, 326, 33, 85, 35, 330, 331, + /* 100 */ 332, 333, 334, 335, 35, 337, 369, 107, 340, 294, + /* 110 */ 373, 297, 344, 345, 300, 301, 270, 85, 56, 50, + /* 120 */ 85, 121, 122, 61, 356, 0, 356, 8, 9, 283, + /* 130 */ 68, 12, 13, 14, 15, 16, 97, 369, 292, 369, + /* 140 */ 257, 373, 259, 373, 258, 258, 21, 85, 56, 24, + /* 150 */ 25, 26, 27, 28, 29, 30, 31, 32, 119, 121, + /* 160 */ 122, 63, 64, 65, 56, 356, 166, 69, 168, 107, + /* 170 */ 72, 73, 278, 286, 76, 77, 78, 255, 369, 87, + /* 180 */ 286, 294, 373, 121, 122, 299, 299, 20, 301, 295, + /* 190 */ 300, 301, 84, 193, 194, 87, 196, 197, 198, 199, /* 200 */ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, - /* 210 */ 210, 211, 325, 192, 20, 150, 329, 330, 331, 332, - /* 220 */ 333, 334, 20, 336, 224, 254, 339, 224, 20, 224, - /* 230 */ 343, 344, 345, 165, 37, 167, 84, 176, 285, 270, - /* 240 */ 179, 354, 4, 274, 8, 9, 285, 294, 12, 13, - /* 250 */ 14, 15, 16, 292, 233, 234, 235, 236, 237, 257, - /* 260 */ 192, 193, 301, 195, 196, 197, 198, 199, 200, 201, - /* 270 */ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - /* 280 */ 12, 13, 44, 45, 87, 314, 89, 90, 20, 92, - /* 290 */ 22, 257, 84, 96, 229, 230, 60, 147, 1, 2, - /* 300 */ 298, 33, 21, 35, 284, 24, 25, 26, 27, 28, - /* 310 */ 29, 30, 31, 32, 265, 118, 164, 297, 166, 285, - /* 320 */ 170, 85, 120, 121, 56, 20, 355, 293, 60, 93, - /* 330 */ 299, 300, 298, 262, 300, 67, 265, 12, 13, 368, - /* 340 */ 62, 63, 64, 372, 355, 20, 68, 22, 0, 71, - /* 350 */ 72, 302, 84, 75, 76, 77, 95, 368, 33, 325, - /* 360 */ 35, 372, 212, 329, 330, 331, 332, 333, 334, 14, - /* 370 */ 336, 269, 160, 339, 106, 20, 224, 343, 344, 345, - /* 380 */ 14, 56, 85, 147, 282, 20, 20, 22, 120, 121, - /* 390 */ 196, 357, 67, 291, 182, 183, 20, 8, 9, 365, - /* 400 */ 0, 12, 13, 14, 15, 16, 170, 271, 272, 84, - /* 410 */ 62, 63, 64, 65, 66, 50, 68, 69, 70, 71, - /* 420 */ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - /* 430 */ 277, 106, 224, 165, 43, 167, 8, 9, 285, 59, - /* 440 */ 12, 13, 14, 15, 16, 120, 121, 294, 212, 213, - /* 450 */ 214, 215, 216, 217, 218, 219, 220, 221, 20, 59, - /* 460 */ 192, 193, 257, 195, 196, 197, 198, 199, 200, 201, - /* 470 */ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - /* 480 */ 8, 9, 56, 265, 12, 13, 14, 15, 16, 56, - /* 490 */ 165, 116, 167, 115, 276, 20, 277, 14, 15, 16, - /* 500 */ 3, 8, 9, 298, 285, 12, 13, 14, 15, 16, - /* 510 */ 84, 293, 86, 294, 271, 272, 83, 192, 193, 86, - /* 520 */ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - /* 530 */ 205, 206, 207, 208, 209, 210, 211, 12, 13, 14, - /* 540 */ 310, 152, 312, 257, 277, 20, 257, 22, 20, 224, - /* 550 */ 175, 176, 285, 60, 179, 177, 178, 85, 33, 78, - /* 560 */ 35, 294, 196, 97, 98, 99, 100, 101, 102, 103, - /* 570 */ 104, 105, 106, 107, 285, 109, 110, 111, 112, 113, - /* 580 */ 114, 56, 293, 4, 298, 157, 93, 298, 265, 300, - /* 590 */ 152, 96, 67, 257, 12, 13, 293, 22, 19, 276, - /* 600 */ 42, 43, 20, 314, 22, 124, 125, 304, 67, 84, - /* 610 */ 35, 35, 33, 118, 325, 33, 293, 35, 329, 330, - /* 620 */ 331, 332, 333, 334, 21, 336, 47, 152, 339, 257, - /* 630 */ 51, 106, 343, 344, 298, 56, 245, 34, 56, 36, - /* 640 */ 147, 2, 67, 67, 355, 120, 121, 8, 9, 67, - /* 650 */ 224, 12, 13, 14, 15, 16, 0, 368, 327, 257, - /* 660 */ 257, 372, 83, 170, 96, 86, 84, 327, 43, 265, - /* 670 */ 298, 8, 9, 285, 246, 12, 13, 14, 15, 16, - /* 680 */ 276, 106, 351, 115, 116, 117, 118, 119, 106, 301, - /* 690 */ 165, 351, 167, 44, 45, 327, 314, 293, 257, 39, - /* 700 */ 298, 298, 120, 121, 0, 212, 213, 214, 215, 216, - /* 710 */ 217, 218, 219, 220, 221, 59, 286, 192, 193, 351, - /* 720 */ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - /* 730 */ 205, 206, 207, 208, 209, 210, 211, 355, 241, 298, - /* 740 */ 165, 310, 167, 312, 273, 2, 275, 165, 85, 167, - /* 750 */ 368, 8, 9, 300, 372, 12, 13, 14, 15, 16, - /* 760 */ 314, 222, 223, 67, 311, 8, 9, 192, 193, 12, - /* 770 */ 13, 14, 15, 16, 192, 193, 56, 195, 196, 197, - /* 780 */ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - /* 790 */ 208, 209, 210, 211, 12, 13, 18, 286, 20, 257, - /* 800 */ 96, 355, 20, 257, 22, 27, 86, 295, 30, 257, - /* 810 */ 298, 0, 4, 265, 368, 33, 314, 35, 372, 115, - /* 820 */ 116, 117, 118, 119, 276, 47, 257, 49, 257, 51, - /* 830 */ 14, 285, 295, 22, 278, 298, 20, 281, 56, 293, - /* 840 */ 298, 293, 85, 0, 298, 265, 300, 8, 9, 67, - /* 850 */ 298, 12, 13, 14, 15, 16, 276, 355, 265, 152, - /* 860 */ 153, 83, 88, 283, 35, 91, 84, 298, 243, 298, - /* 870 */ 368, 325, 286, 293, 372, 329, 330, 331, 332, 333, - /* 880 */ 334, 257, 336, 223, 257, 339, 293, 257, 106, 343, - /* 890 */ 344, 345, 257, 257, 88, 1, 2, 91, 35, 286, - /* 900 */ 354, 123, 120, 121, 126, 127, 128, 129, 130, 131, - /* 910 */ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, - /* 920 */ 142, 143, 298, 145, 146, 298, 333, 265, 298, 265, - /* 930 */ 43, 18, 35, 298, 298, 265, 23, 265, 276, 96, - /* 940 */ 276, 348, 349, 350, 60, 352, 276, 165, 276, 167, - /* 950 */ 37, 38, 120, 121, 41, 293, 318, 293, 115, 116, - /* 960 */ 117, 118, 119, 293, 67, 293, 257, 286, 286, 286, - /* 970 */ 57, 58, 85, 43, 192, 193, 265, 195, 196, 197, - /* 980 */ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - /* 990 */ 208, 209, 210, 211, 285, 265, 167, 84, 88, 265, - /* 1000 */ 265, 91, 293, 265, 293, 88, 276, 298, 91, 300, - /* 1010 */ 276, 276, 196, 287, 276, 85, 43, 258, 287, 274, - /* 1020 */ 375, 265, 321, 293, 298, 314, 266, 293, 293, 298, - /* 1030 */ 167, 293, 276, 225, 325, 122, 265, 257, 329, 330, - /* 1040 */ 331, 332, 333, 334, 333, 336, 0, 276, 339, 293, - /* 1050 */ 324, 325, 343, 344, 345, 324, 325, 326, 85, 348, - /* 1060 */ 349, 350, 336, 352, 293, 285, 355, 336, 22, 0, - /* 1070 */ 157, 158, 159, 293, 365, 162, 192, 84, 298, 368, - /* 1080 */ 300, 168, 366, 372, 46, 12, 13, 94, 43, 362, - /* 1090 */ 43, 22, 285, 43, 181, 22, 43, 184, 264, 186, - /* 1100 */ 187, 188, 189, 190, 191, 325, 33, 287, 35, 329, - /* 1110 */ 330, 331, 332, 333, 334, 287, 336, 43, 298, 339, - /* 1120 */ 265, 297, 84, 343, 344, 345, 298, 0, 43, 56, - /* 1130 */ 85, 276, 85, 257, 354, 85, 266, 224, 85, 43, - /* 1140 */ 67, 43, 328, 43, 324, 325, 326, 43, 293, 43, - /* 1150 */ 43, 43, 324, 325, 353, 346, 336, 369, 369, 85, - /* 1160 */ 369, 285, 84, 289, 336, 226, 356, 323, 20, 293, - /* 1170 */ 85, 265, 47, 322, 298, 48, 300, 35, 271, 106, - /* 1180 */ 163, 85, 316, 85, 265, 85, 265, 42, 305, 85, - /* 1190 */ 314, 85, 85, 85, 257, 147, 303, 265, 303, 265, - /* 1200 */ 259, 325, 20, 259, 20, 329, 330, 331, 332, 333, - /* 1210 */ 334, 320, 336, 20, 269, 300, 269, 313, 20, 269, - /* 1220 */ 315, 313, 285, 269, 20, 269, 306, 269, 265, 269, - /* 1230 */ 293, 355, 320, 259, 285, 298, 285, 300, 165, 259, - /* 1240 */ 167, 265, 285, 173, 368, 267, 285, 257, 372, 285, - /* 1250 */ 285, 314, 285, 285, 285, 285, 285, 298, 267, 319, - /* 1260 */ 265, 265, 325, 231, 267, 192, 329, 330, 331, 332, - /* 1270 */ 333, 334, 300, 336, 267, 285, 203, 204, 205, 206, - /* 1280 */ 207, 208, 209, 293, 309, 298, 298, 298, 298, 149, - /* 1290 */ 300, 309, 355, 307, 313, 293, 298, 298, 306, 257, - /* 1300 */ 281, 267, 293, 20, 298, 368, 298, 328, 232, 372, - /* 1310 */ 309, 298, 309, 361, 361, 325, 298, 238, 298, 329, - /* 1320 */ 330, 331, 332, 333, 334, 156, 336, 285, 240, 339, - /* 1330 */ 364, 239, 227, 343, 344, 293, 223, 323, 361, 20, - /* 1340 */ 298, 244, 300, 358, 360, 293, 363, 84, 327, 247, - /* 1350 */ 289, 265, 257, 359, 242, 298, 275, 267, 36, 260, - /* 1360 */ 259, 317, 279, 312, 0, 342, 257, 325, 279, 255, - /* 1370 */ 370, 329, 330, 331, 332, 333, 334, 175, 336, 268, - /* 1380 */ 285, 339, 371, 371, 0, 343, 344, 371, 293, 279, - /* 1390 */ 0, 376, 370, 298, 285, 300, 370, 42, 0, 75, - /* 1400 */ 0, 35, 293, 185, 35, 35, 35, 298, 185, 300, - /* 1410 */ 0, 35, 35, 185, 0, 185, 0, 35, 0, 257, - /* 1420 */ 325, 22, 0, 35, 329, 330, 331, 332, 333, 334, - /* 1430 */ 335, 336, 337, 338, 325, 0, 84, 257, 329, 330, - /* 1440 */ 331, 332, 333, 334, 169, 336, 170, 285, 167, 0, - /* 1450 */ 165, 0, 161, 160, 0, 293, 0, 46, 0, 0, - /* 1460 */ 298, 0, 300, 0, 144, 285, 0, 0, 0, 0, - /* 1470 */ 290, 139, 35, 293, 0, 139, 0, 0, 298, 0, - /* 1480 */ 300, 0, 373, 374, 0, 0, 0, 325, 0, 257, - /* 1490 */ 0, 329, 330, 331, 332, 333, 334, 0, 336, 0, - /* 1500 */ 0, 339, 0, 0, 42, 325, 344, 0, 0, 329, - /* 1510 */ 330, 331, 332, 333, 334, 0, 336, 285, 22, 0, - /* 1520 */ 0, 0, 290, 0, 0, 293, 0, 0, 0, 56, - /* 1530 */ 298, 257, 300, 0, 0, 42, 14, 39, 43, 14, - /* 1540 */ 0, 257, 0, 0, 0, 40, 0, 46, 39, 39, - /* 1550 */ 46, 156, 0, 0, 0, 0, 39, 325, 47, 285, - /* 1560 */ 0, 329, 330, 331, 332, 333, 334, 293, 336, 285, - /* 1570 */ 35, 35, 298, 61, 300, 0, 47, 293, 39, 47, - /* 1580 */ 35, 0, 298, 35, 300, 47, 39, 0, 39, 0, - /* 1590 */ 0, 257, 0, 35, 22, 0, 35, 35, 35, 325, - /* 1600 */ 35, 35, 43, 329, 330, 331, 332, 333, 334, 325, - /* 1610 */ 336, 43, 35, 329, 330, 331, 332, 333, 334, 285, - /* 1620 */ 336, 35, 91, 93, 0, 22, 35, 293, 0, 22, - /* 1630 */ 0, 49, 298, 22, 300, 0, 35, 35, 0, 35, - /* 1640 */ 0, 367, 22, 257, 0, 20, 0, 35, 22, 171, - /* 1650 */ 0, 0, 0, 0, 0, 84, 0, 84, 374, 325, - /* 1660 */ 257, 85, 149, 329, 330, 331, 332, 333, 334, 180, - /* 1670 */ 336, 285, 338, 0, 94, 39, 290, 84, 84, 293, - /* 1680 */ 46, 228, 43, 84, 298, 43, 300, 46, 285, 152, - /* 1690 */ 85, 85, 84, 290, 85, 154, 293, 84, 43, 148, - /* 1700 */ 85, 298, 152, 300, 85, 84, 84, 150, 152, 46, - /* 1710 */ 43, 325, 85, 19, 85, 329, 330, 331, 332, 333, - /* 1720 */ 334, 84, 336, 46, 43, 46, 43, 33, 325, 84, - /* 1730 */ 46, 35, 329, 330, 331, 332, 333, 334, 222, 336, - /* 1740 */ 35, 47, 228, 85, 85, 33, 52, 53, 54, 55, - /* 1750 */ 56, 257, 35, 35, 35, 35, 2, 22, 43, 47, - /* 1760 */ 84, 22, 192, 257, 52, 53, 54, 55, 56, 46, - /* 1770 */ 85, 84, 46, 85, 84, 257, 85, 83, 194, 285, - /* 1780 */ 86, 84, 84, 84, 95, 85, 35, 293, 35, 85, - /* 1790 */ 84, 285, 298, 35, 300, 83, 85, 228, 86, 293, - /* 1800 */ 84, 35, 35, 285, 298, 84, 300, 85, 84, 35, - /* 1810 */ 85, 293, 84, 119, 22, 108, 298, 108, 300, 325, - /* 1820 */ 35, 108, 108, 329, 330, 331, 332, 333, 334, 84, - /* 1830 */ 336, 325, 96, 84, 84, 329, 330, 331, 332, 333, - /* 1840 */ 334, 43, 336, 325, 22, 151, 60, 329, 330, 331, - /* 1850 */ 332, 333, 334, 35, 336, 61, 67, 257, 82, 43, - /* 1860 */ 148, 149, 35, 151, 35, 35, 172, 155, 174, 35, - /* 1870 */ 35, 257, 22, 35, 35, 67, 0, 35, 35, 35, - /* 1880 */ 35, 35, 35, 35, 35, 285, 174, 35, 0, 0, - /* 1890 */ 39, 35, 39, 293, 35, 0, 35, 39, 298, 285, - /* 1900 */ 300, 47, 47, 39, 47, 0, 35, 293, 35, 47, - /* 1910 */ 0, 21, 298, 22, 300, 22, 22, 21, 20, 377, - /* 1920 */ 377, 257, 377, 377, 377, 325, 377, 377, 377, 329, - /* 1930 */ 330, 331, 332, 333, 334, 377, 336, 257, 377, 325, - /* 1940 */ 377, 377, 377, 329, 330, 331, 332, 333, 334, 285, - /* 1950 */ 336, 377, 377, 377, 377, 377, 377, 293, 377, 377, - /* 1960 */ 377, 377, 298, 377, 300, 285, 377, 377, 377, 377, - /* 1970 */ 377, 377, 377, 293, 377, 377, 377, 377, 298, 377, - /* 1980 */ 300, 377, 377, 377, 377, 377, 377, 377, 377, 325, - /* 1990 */ 257, 377, 377, 329, 330, 331, 332, 333, 334, 377, - /* 2000 */ 336, 377, 377, 377, 257, 325, 377, 377, 377, 329, - /* 2010 */ 330, 331, 332, 333, 334, 377, 336, 377, 285, 377, - /* 2020 */ 377, 377, 377, 377, 377, 377, 293, 377, 377, 377, - /* 2030 */ 377, 298, 285, 300, 377, 377, 377, 377, 377, 377, - /* 2040 */ 293, 377, 377, 377, 377, 298, 377, 300, 377, 377, - /* 2050 */ 377, 377, 377, 377, 377, 377, 257, 377, 325, 377, - /* 2060 */ 377, 377, 329, 330, 331, 332, 333, 334, 377, 336, - /* 2070 */ 377, 377, 325, 377, 257, 377, 329, 330, 331, 332, - /* 2080 */ 333, 334, 377, 336, 285, 377, 377, 377, 377, 377, - /* 2090 */ 377, 377, 293, 377, 377, 377, 377, 298, 257, 300, - /* 2100 */ 377, 377, 285, 377, 377, 377, 377, 377, 377, 377, - /* 2110 */ 293, 377, 377, 377, 377, 298, 377, 300, 377, 377, - /* 2120 */ 377, 377, 377, 377, 325, 377, 285, 377, 329, 330, - /* 2130 */ 331, 332, 333, 334, 293, 336, 377, 377, 377, 298, - /* 2140 */ 377, 300, 325, 377, 377, 377, 329, 330, 331, 332, - /* 2150 */ 333, 334, 377, 336, 377, 377, 257, 377, 377, 377, - /* 2160 */ 377, 377, 377, 377, 377, 377, 325, 377, 377, 377, - /* 2170 */ 329, 330, 331, 332, 333, 334, 377, 336, 377, 257, - /* 2180 */ 377, 377, 377, 377, 285, 377, 377, 377, 377, 377, - /* 2190 */ 377, 377, 293, 377, 377, 377, 377, 298, 377, 300, - /* 2200 */ 377, 377, 377, 377, 377, 377, 377, 285, 377, 377, - /* 2210 */ 377, 377, 377, 377, 377, 293, 377, 377, 377, 377, - /* 2220 */ 298, 377, 300, 377, 325, 377, 377, 377, 329, 330, - /* 2230 */ 331, 332, 333, 334, 377, 336, 257, 377, 377, 377, - /* 2240 */ 377, 377, 377, 377, 377, 377, 377, 325, 257, 377, - /* 2250 */ 377, 329, 330, 331, 332, 333, 334, 377, 336, 377, - /* 2260 */ 377, 377, 257, 377, 285, 377, 377, 377, 377, 377, - /* 2270 */ 377, 377, 293, 377, 377, 377, 285, 298, 377, 300, - /* 2280 */ 377, 377, 377, 377, 293, 377, 377, 377, 377, 298, - /* 2290 */ 285, 300, 377, 377, 377, 377, 377, 377, 293, 377, - /* 2300 */ 377, 377, 377, 298, 325, 300, 377, 377, 329, 330, - /* 2310 */ 331, 332, 333, 334, 257, 336, 325, 377, 377, 377, - /* 2320 */ 329, 330, 331, 332, 333, 334, 377, 336, 377, 377, - /* 2330 */ 325, 377, 257, 377, 329, 330, 331, 332, 333, 334, - /* 2340 */ 377, 336, 285, 377, 377, 377, 377, 377, 377, 377, - /* 2350 */ 293, 377, 377, 377, 377, 298, 257, 300, 377, 377, - /* 2360 */ 285, 377, 377, 377, 377, 377, 377, 377, 293, 377, - /* 2370 */ 377, 377, 377, 298, 377, 300, 377, 377, 377, 377, - /* 2380 */ 377, 377, 325, 377, 285, 377, 329, 330, 331, 332, - /* 2390 */ 333, 334, 293, 336, 377, 377, 377, 298, 377, 300, - /* 2400 */ 325, 377, 377, 377, 329, 330, 331, 332, 333, 334, - /* 2410 */ 377, 336, 377, 377, 377, 377, 377, 377, 377, 377, - /* 2420 */ 377, 377, 377, 377, 325, 377, 377, 377, 329, 330, - /* 2430 */ 331, 332, 333, 334, 377, 336, + /* 210 */ 210, 211, 212, 326, 14, 15, 16, 330, 331, 332, + /* 220 */ 333, 334, 335, 266, 337, 225, 161, 340, 166, 20, + /* 230 */ 168, 344, 345, 346, 277, 79, 225, 315, 258, 8, + /* 240 */ 9, 284, 60, 12, 13, 14, 15, 16, 183, 184, + /* 250 */ 20, 294, 266, 366, 4, 193, 194, 225, 196, 197, + /* 260 */ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + /* 270 */ 208, 209, 210, 211, 212, 12, 13, 158, 356, 299, + /* 280 */ 294, 125, 126, 20, 116, 22, 12, 13, 14, 15, + /* 290 */ 16, 369, 61, 85, 85, 373, 33, 0, 35, 98, + /* 300 */ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, + /* 310 */ 286, 110, 111, 112, 113, 114, 115, 86, 294, 56, + /* 320 */ 334, 258, 8, 9, 61, 94, 12, 13, 14, 15, + /* 330 */ 16, 68, 12, 13, 348, 349, 350, 351, 268, 353, + /* 340 */ 20, 266, 22, 288, 47, 286, 178, 179, 85, 286, + /* 350 */ 278, 281, 293, 33, 299, 35, 332, 294, 286, 289, + /* 360 */ 278, 302, 299, 266, 301, 14, 247, 295, 286, 294, + /* 370 */ 107, 20, 20, 165, 277, 167, 56, 295, 315, 148, + /* 380 */ 325, 326, 327, 0, 121, 122, 0, 263, 68, 326, + /* 390 */ 266, 294, 337, 330, 331, 332, 333, 334, 335, 258, + /* 400 */ 337, 263, 171, 340, 266, 85, 56, 344, 345, 334, + /* 410 */ 24, 25, 26, 27, 28, 29, 30, 31, 32, 356, + /* 420 */ 272, 273, 272, 273, 349, 350, 351, 107, 353, 166, + /* 430 */ 117, 168, 369, 225, 225, 85, 373, 87, 315, 258, + /* 440 */ 299, 121, 122, 60, 213, 214, 215, 216, 217, 218, + /* 450 */ 219, 220, 221, 222, 258, 37, 193, 194, 20, 196, + /* 460 */ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + /* 470 */ 207, 208, 209, 210, 211, 212, 226, 8, 9, 356, + /* 480 */ 299, 12, 13, 14, 15, 16, 166, 148, 168, 176, + /* 490 */ 177, 286, 369, 180, 151, 299, 373, 8, 9, 315, + /* 500 */ 20, 12, 13, 14, 15, 16, 88, 302, 90, 91, + /* 510 */ 171, 93, 60, 193, 194, 97, 196, 197, 198, 199, + /* 520 */ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + /* 530 */ 210, 211, 212, 12, 13, 14, 14, 119, 44, 45, + /* 540 */ 356, 20, 20, 22, 258, 225, 328, 258, 197, 20, + /* 550 */ 61, 22, 213, 369, 33, 86, 35, 373, 288, 8, + /* 560 */ 9, 116, 117, 12, 13, 14, 15, 16, 20, 299, + /* 570 */ 352, 266, 286, 230, 231, 225, 0, 56, 20, 50, + /* 580 */ 294, 266, 266, 94, 285, 299, 258, 301, 299, 68, + /* 590 */ 12, 13, 277, 277, 43, 325, 326, 298, 20, 294, + /* 600 */ 22, 0, 35, 1, 2, 286, 85, 337, 286, 294, + /* 610 */ 294, 33, 326, 35, 295, 293, 330, 331, 332, 333, + /* 620 */ 334, 335, 177, 337, 302, 180, 340, 299, 107, 266, + /* 630 */ 344, 345, 346, 153, 56, 68, 60, 148, 328, 334, + /* 640 */ 277, 259, 121, 122, 358, 14, 68, 311, 294, 313, + /* 650 */ 301, 20, 366, 68, 349, 350, 351, 294, 353, 305, + /* 660 */ 171, 312, 352, 85, 63, 64, 65, 66, 67, 43, + /* 670 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + /* 680 */ 79, 80, 81, 82, 0, 107, 20, 166, 86, 168, + /* 690 */ 8, 9, 328, 258, 12, 13, 14, 15, 16, 121, + /* 700 */ 122, 153, 213, 214, 215, 216, 217, 218, 219, 220, + /* 710 */ 221, 222, 39, 258, 193, 194, 352, 196, 197, 198, + /* 720 */ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, + /* 730 */ 209, 210, 211, 212, 299, 8, 9, 223, 224, 12, + /* 740 */ 13, 14, 15, 16, 166, 96, 168, 63, 64, 65, + /* 750 */ 42, 43, 22, 69, 299, 279, 72, 73, 282, 68, + /* 760 */ 76, 77, 78, 258, 287, 35, 193, 311, 86, 313, + /* 770 */ 296, 193, 194, 299, 196, 197, 198, 199, 200, 201, + /* 780 */ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, + /* 790 */ 212, 12, 13, 18, 296, 20, 97, 299, 68, 20, + /* 800 */ 287, 22, 27, 258, 299, 30, 287, 234, 235, 236, + /* 810 */ 237, 238, 33, 86, 35, 116, 117, 118, 119, 120, + /* 820 */ 1, 2, 47, 0, 49, 287, 51, 3, 197, 266, + /* 830 */ 266, 286, 266, 258, 274, 56, 276, 107, 0, 294, + /* 840 */ 277, 277, 2, 277, 299, 319, 301, 68, 8, 9, + /* 850 */ 0, 0, 12, 13, 14, 15, 16, 294, 294, 84, + /* 860 */ 294, 8, 9, 197, 85, 12, 13, 14, 15, 16, + /* 870 */ 244, 326, 22, 22, 299, 330, 331, 332, 333, 334, + /* 880 */ 335, 2, 337, 287, 43, 340, 107, 8, 9, 344, + /* 890 */ 345, 12, 13, 14, 15, 16, 166, 224, 168, 124, + /* 900 */ 121, 122, 127, 128, 129, 130, 131, 132, 133, 134, + /* 910 */ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + /* 920 */ 97, 146, 147, 193, 194, 266, 258, 86, 89, 18, + /* 930 */ 275, 92, 43, 266, 23, 97, 277, 153, 154, 116, + /* 940 */ 117, 118, 119, 120, 277, 166, 376, 168, 37, 38, + /* 950 */ 43, 43, 41, 294, 116, 117, 118, 119, 120, 35, + /* 960 */ 288, 294, 315, 258, 258, 121, 122, 299, 57, 58, + /* 970 */ 59, 299, 193, 194, 258, 196, 197, 198, 199, 200, + /* 980 */ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + /* 990 */ 211, 212, 286, 86, 86, 367, 85, 325, 326, 266, + /* 1000 */ 294, 267, 266, 356, 299, 299, 153, 301, 258, 337, + /* 1010 */ 277, 35, 258, 277, 266, 299, 369, 46, 89, 258, + /* 1020 */ 373, 92, 258, 89, 258, 277, 92, 294, 61, 322, + /* 1030 */ 294, 286, 326, 363, 123, 43, 330, 331, 332, 333, + /* 1040 */ 334, 335, 294, 337, 266, 258, 340, 266, 266, 299, + /* 1050 */ 344, 345, 346, 299, 89, 277, 85, 92, 277, 277, + /* 1060 */ 299, 355, 266, 299, 35, 299, 242, 43, 0, 158, + /* 1070 */ 159, 160, 294, 286, 163, 294, 294, 267, 86, 85, + /* 1080 */ 169, 294, 43, 43, 12, 13, 299, 265, 301, 95, + /* 1090 */ 294, 43, 168, 182, 22, 298, 185, 68, 187, 188, + /* 1100 */ 189, 190, 191, 192, 347, 33, 329, 35, 370, 354, + /* 1110 */ 86, 315, 370, 326, 43, 357, 48, 330, 331, 332, + /* 1120 */ 333, 334, 335, 258, 337, 86, 86, 340, 56, 43, + /* 1130 */ 334, 344, 345, 346, 86, 246, 225, 43, 4, 370, + /* 1140 */ 68, 85, 355, 43, 168, 349, 350, 351, 290, 353, + /* 1150 */ 227, 286, 356, 19, 324, 20, 266, 86, 43, 294, + /* 1160 */ 193, 47, 164, 43, 299, 369, 301, 33, 323, 373, + /* 1170 */ 43, 43, 86, 35, 272, 266, 258, 317, 266, 107, + /* 1180 */ 86, 47, 42, 306, 148, 51, 86, 304, 304, 20, + /* 1190 */ 56, 326, 266, 266, 266, 330, 331, 332, 333, 334, + /* 1200 */ 335, 86, 337, 260, 286, 340, 86, 260, 20, 344, + /* 1210 */ 345, 346, 294, 86, 86, 321, 270, 299, 84, 301, + /* 1220 */ 355, 87, 301, 270, 20, 20, 316, 314, 258, 270, + /* 1230 */ 314, 270, 20, 315, 270, 266, 270, 307, 166, 260, + /* 1240 */ 168, 286, 270, 286, 326, 260, 286, 299, 330, 331, + /* 1250 */ 332, 333, 334, 335, 286, 337, 286, 266, 321, 286, + /* 1260 */ 286, 286, 174, 286, 294, 193, 286, 286, 286, 299, + /* 1270 */ 268, 301, 320, 268, 356, 266, 204, 205, 206, 207, + /* 1280 */ 208, 209, 210, 266, 301, 315, 268, 369, 299, 232, + /* 1290 */ 268, 373, 314, 258, 310, 299, 326, 310, 299, 299, + /* 1300 */ 330, 331, 332, 333, 334, 335, 299, 337, 150, 258, + /* 1310 */ 294, 308, 282, 307, 268, 294, 20, 329, 299, 299, + /* 1320 */ 233, 286, 310, 310, 362, 299, 356, 299, 239, 294, + /* 1330 */ 299, 157, 241, 240, 299, 228, 301, 286, 324, 369, + /* 1340 */ 224, 294, 20, 373, 245, 294, 243, 85, 362, 248, + /* 1350 */ 299, 328, 301, 343, 290, 365, 361, 364, 299, 362, + /* 1360 */ 359, 326, 266, 268, 258, 330, 331, 332, 333, 334, + /* 1370 */ 335, 360, 337, 276, 36, 340, 258, 326, 261, 344, + /* 1380 */ 345, 330, 331, 332, 333, 334, 335, 336, 337, 338, + /* 1390 */ 339, 260, 286, 318, 313, 269, 0, 372, 371, 280, + /* 1400 */ 294, 280, 280, 256, 286, 299, 372, 301, 371, 377, + /* 1410 */ 372, 176, 294, 371, 0, 0, 42, 299, 0, 301, + /* 1420 */ 76, 0, 35, 186, 35, 35, 35, 186, 0, 35, + /* 1430 */ 35, 186, 326, 0, 186, 0, 330, 331, 332, 333, + /* 1440 */ 334, 335, 35, 337, 326, 0, 22, 0, 330, 331, + /* 1450 */ 332, 333, 334, 335, 258, 337, 0, 35, 340, 171, + /* 1460 */ 85, 170, 168, 345, 166, 0, 0, 162, 258, 161, + /* 1470 */ 0, 0, 46, 0, 0, 0, 145, 0, 258, 0, + /* 1480 */ 374, 375, 286, 0, 0, 0, 140, 291, 35, 0, + /* 1490 */ 294, 140, 0, 0, 0, 299, 286, 301, 0, 0, + /* 1500 */ 0, 291, 0, 0, 294, 0, 286, 0, 0, 299, + /* 1510 */ 0, 301, 0, 0, 294, 0, 0, 0, 42, 299, + /* 1520 */ 0, 301, 326, 0, 0, 0, 330, 331, 332, 333, + /* 1530 */ 334, 335, 0, 337, 0, 258, 326, 0, 0, 0, + /* 1540 */ 330, 331, 332, 333, 334, 335, 326, 337, 0, 22, + /* 1550 */ 330, 331, 332, 333, 334, 335, 0, 337, 0, 258, + /* 1560 */ 56, 42, 56, 286, 43, 39, 14, 14, 46, 40, + /* 1570 */ 39, 294, 0, 0, 46, 0, 299, 157, 301, 39, + /* 1580 */ 0, 0, 0, 0, 0, 258, 35, 286, 368, 47, + /* 1590 */ 0, 0, 62, 39, 35, 294, 47, 35, 0, 39, + /* 1600 */ 299, 0, 301, 326, 47, 39, 35, 330, 331, 332, + /* 1610 */ 333, 334, 335, 286, 337, 47, 39, 0, 291, 0, + /* 1620 */ 0, 294, 35, 0, 22, 92, 299, 326, 301, 94, + /* 1630 */ 35, 330, 331, 332, 333, 334, 335, 43, 337, 258, + /* 1640 */ 339, 35, 35, 43, 35, 35, 35, 35, 35, 0, + /* 1650 */ 22, 0, 375, 326, 22, 19, 0, 330, 331, 332, + /* 1660 */ 333, 334, 335, 49, 337, 22, 35, 286, 0, 33, + /* 1670 */ 35, 0, 291, 35, 0, 294, 22, 20, 0, 35, + /* 1680 */ 299, 0, 301, 47, 22, 0, 172, 0, 52, 53, + /* 1690 */ 54, 55, 56, 0, 153, 150, 153, 0, 0, 153, + /* 1700 */ 85, 0, 155, 0, 86, 39, 85, 326, 43, 85, + /* 1710 */ 85, 330, 331, 332, 333, 334, 335, 33, 337, 46, + /* 1720 */ 84, 151, 258, 87, 95, 149, 229, 85, 46, 43, + /* 1730 */ 85, 47, 86, 86, 86, 85, 52, 53, 54, 55, + /* 1740 */ 56, 86, 181, 85, 85, 85, 258, 86, 43, 85, + /* 1750 */ 286, 2, 46, 43, 35, 86, 120, 46, 294, 223, + /* 1760 */ 43, 86, 46, 299, 46, 301, 86, 43, 84, 86, + /* 1770 */ 35, 87, 35, 35, 286, 35, 35, 22, 193, 229, + /* 1780 */ 85, 85, 294, 22, 229, 43, 86, 299, 152, 301, + /* 1790 */ 326, 46, 46, 86, 330, 331, 332, 333, 334, 335, + /* 1800 */ 85, 337, 258, 35, 22, 96, 86, 85, 85, 173, + /* 1810 */ 85, 175, 86, 35, 326, 85, 35, 195, 330, 331, + /* 1820 */ 332, 333, 334, 335, 85, 337, 35, 35, 35, 86, + /* 1830 */ 286, 97, 85, 149, 150, 85, 152, 86, 294, 86, + /* 1840 */ 156, 109, 86, 299, 258, 301, 35, 85, 85, 85, + /* 1850 */ 85, 43, 22, 109, 258, 35, 62, 109, 61, 175, + /* 1860 */ 83, 109, 43, 68, 35, 22, 258, 35, 35, 35, + /* 1870 */ 326, 35, 286, 35, 330, 331, 332, 333, 334, 335, + /* 1880 */ 294, 337, 286, 35, 68, 299, 35, 301, 35, 35, + /* 1890 */ 294, 35, 35, 35, 286, 299, 35, 301, 35, 0, + /* 1900 */ 35, 39, 294, 0, 35, 39, 47, 299, 0, 301, + /* 1910 */ 35, 47, 326, 39, 47, 0, 330, 331, 332, 333, + /* 1920 */ 334, 335, 326, 337, 35, 47, 330, 331, 332, 333, + /* 1930 */ 334, 335, 39, 337, 326, 35, 35, 0, 330, 331, + /* 1940 */ 332, 333, 334, 335, 0, 337, 22, 258, 21, 378, + /* 1950 */ 22, 22, 21, 20, 378, 378, 378, 378, 378, 378, + /* 1960 */ 378, 378, 378, 378, 378, 378, 258, 378, 378, 378, + /* 1970 */ 378, 378, 378, 378, 378, 286, 378, 378, 378, 378, + /* 1980 */ 378, 378, 378, 294, 378, 378, 378, 378, 299, 378, + /* 1990 */ 301, 378, 378, 378, 286, 378, 378, 378, 378, 378, + /* 2000 */ 378, 378, 294, 378, 378, 378, 378, 299, 378, 301, + /* 2010 */ 378, 378, 378, 378, 378, 326, 378, 378, 378, 330, + /* 2020 */ 331, 332, 333, 334, 335, 378, 337, 258, 378, 378, + /* 2030 */ 378, 378, 378, 378, 326, 378, 378, 378, 330, 331, + /* 2040 */ 332, 333, 334, 335, 378, 337, 258, 378, 378, 378, + /* 2050 */ 378, 378, 378, 378, 378, 286, 378, 378, 378, 378, + /* 2060 */ 378, 378, 378, 294, 378, 378, 378, 378, 299, 378, + /* 2070 */ 301, 378, 378, 378, 286, 378, 378, 378, 378, 378, + /* 2080 */ 378, 378, 294, 378, 378, 378, 378, 299, 378, 301, + /* 2090 */ 378, 378, 378, 378, 378, 326, 378, 378, 378, 330, + /* 2100 */ 331, 332, 333, 334, 335, 378, 337, 378, 378, 378, + /* 2110 */ 378, 378, 378, 258, 326, 378, 378, 378, 330, 331, + /* 2120 */ 332, 333, 334, 335, 378, 337, 378, 378, 378, 258, + /* 2130 */ 378, 378, 378, 378, 378, 378, 378, 378, 378, 258, + /* 2140 */ 378, 286, 378, 378, 378, 378, 378, 378, 378, 294, + /* 2150 */ 378, 378, 378, 378, 299, 378, 301, 286, 378, 378, + /* 2160 */ 378, 378, 378, 378, 378, 294, 378, 286, 378, 378, + /* 2170 */ 299, 378, 301, 378, 378, 294, 378, 378, 378, 378, + /* 2180 */ 299, 326, 301, 378, 378, 330, 331, 332, 333, 334, + /* 2190 */ 335, 378, 337, 258, 378, 378, 378, 326, 378, 378, + /* 2200 */ 378, 330, 331, 332, 333, 334, 335, 326, 337, 378, + /* 2210 */ 378, 330, 331, 332, 333, 334, 335, 378, 337, 378, + /* 2220 */ 378, 286, 378, 378, 378, 378, 378, 378, 378, 294, + /* 2230 */ 378, 378, 378, 378, 299, 378, 301, 378, 378, 378, + /* 2240 */ 378, 378, 378, 378, 378, 378, 378, 258, 378, 378, + /* 2250 */ 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + /* 2260 */ 378, 326, 378, 378, 378, 330, 331, 332, 333, 334, + /* 2270 */ 335, 378, 337, 378, 378, 286, 378, 378, 378, 378, + /* 2280 */ 378, 378, 378, 294, 378, 378, 378, 378, 299, 378, + /* 2290 */ 301, 378, 378, 378, 378, 378, 378, 258, 378, 378, + /* 2300 */ 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + /* 2310 */ 378, 378, 378, 378, 258, 326, 378, 378, 378, 330, + /* 2320 */ 331, 332, 333, 334, 335, 286, 337, 378, 378, 378, + /* 2330 */ 378, 378, 378, 294, 378, 378, 378, 378, 299, 378, + /* 2340 */ 301, 378, 286, 378, 378, 378, 378, 378, 378, 378, + /* 2350 */ 294, 378, 378, 378, 378, 299, 378, 301, 378, 378, + /* 2360 */ 378, 378, 378, 378, 378, 326, 378, 378, 378, 330, + /* 2370 */ 331, 332, 333, 334, 335, 378, 337, 258, 378, 378, + /* 2380 */ 378, 378, 326, 378, 378, 378, 330, 331, 332, 333, + /* 2390 */ 334, 335, 378, 337, 378, 378, 378, 378, 258, 378, + /* 2400 */ 378, 378, 378, 378, 378, 286, 378, 378, 378, 378, + /* 2410 */ 378, 378, 378, 294, 378, 378, 378, 378, 299, 378, + /* 2420 */ 301, 378, 378, 378, 378, 378, 286, 378, 378, 378, + /* 2430 */ 378, 378, 378, 378, 294, 378, 378, 378, 378, 299, + /* 2440 */ 258, 301, 378, 378, 378, 326, 378, 378, 378, 330, + /* 2450 */ 331, 332, 333, 334, 335, 378, 337, 378, 378, 378, + /* 2460 */ 378, 378, 378, 378, 378, 378, 326, 378, 286, 378, + /* 2470 */ 330, 331, 332, 333, 334, 335, 294, 337, 378, 378, + /* 2480 */ 378, 299, 378, 301, 378, 378, 378, 378, 378, 378, + /* 2490 */ 378, 378, 378, 378, 378, 378, 378, 378, 378, 378, + /* 2500 */ 378, 378, 378, 378, 378, 378, 378, 378, 326, 378, + /* 2510 */ 378, 378, 330, 331, 332, 333, 334, 335, 378, 337, }; -#define YY_SHIFT_COUNT (662) +#define YY_SHIFT_COUNT (665) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (1910) +#define YY_SHIFT_MAX (1944) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 913, 0, 0, 68, 68, 268, 268, 268, 325, 325, - /* 10 */ 268, 268, 525, 582, 782, 582, 582, 582, 582, 582, - /* 20 */ 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, - /* 30 */ 582, 582, 582, 582, 582, 582, 582, 582, 582, 582, - /* 40 */ 582, 582, 208, 208, 97, 97, 97, 1073, 1073, 1073, - /* 50 */ 1073, 152, 426, 3, 3, 99, 99, 238, 238, 5, - /* 60 */ 202, 3, 3, 99, 99, 99, 99, 99, 99, 99, - /* 70 */ 99, 99, 89, 99, 99, 99, 148, 305, 99, 99, - /* 80 */ 305, 376, 99, 305, 305, 305, 99, 380, 778, 236, - /* 90 */ 493, 493, 281, 278, 575, 575, 575, 575, 575, 575, - /* 100 */ 575, 575, 575, 575, 575, 575, 575, 575, 575, 575, - /* 110 */ 575, 575, 575, 197, 202, 355, 355, 400, 576, 656, - /* 120 */ 438, 438, 438, 576, 528, 148, 11, 11, 305, 305, - /* 130 */ 541, 541, 261, 696, 466, 466, 466, 466, 466, 466, - /* 140 */ 466, 1694, 23, 107, 428, 21, 41, 375, 65, 366, - /* 150 */ 816, 365, 649, 495, 475, 539, 660, 539, 558, 497, - /* 160 */ 497, 497, 808, 194, 1078, 939, 1148, 1125, 1142, 1017, - /* 170 */ 1148, 1148, 1145, 1048, 1048, 1148, 1148, 1182, 1182, 1184, - /* 180 */ 89, 148, 89, 1193, 1198, 89, 1193, 89, 1204, 89, - /* 190 */ 89, 1148, 89, 1182, 305, 305, 305, 305, 305, 305, - /* 200 */ 305, 305, 305, 305, 305, 1148, 1182, 541, 1184, 380, - /* 210 */ 1070, 148, 380, 1148, 1148, 1193, 380, 1032, 541, 541, - /* 220 */ 541, 541, 1032, 541, 1140, 528, 1204, 380, 261, 380, - /* 230 */ 528, 1283, 541, 1076, 1032, 541, 541, 1076, 1032, 541, - /* 240 */ 541, 305, 1079, 1169, 1076, 1088, 1092, 1105, 939, 1113, - /* 250 */ 528, 1319, 1097, 1112, 1102, 1097, 1112, 1097, 1112, 1263, - /* 260 */ 1078, 541, 696, 1148, 380, 1322, 1182, 2436, 2436, 2436, - /* 270 */ 2436, 2436, 2436, 2436, 348, 1712, 132, 579, 472, 16, - /* 280 */ 663, 639, 743, 389, 757, 704, 839, 839, 839, 839, - /* 290 */ 839, 839, 839, 839, 843, 568, 25, 25, 61, 212, - /* 300 */ 433, 481, 603, 378, 297, 150, 483, 483, 483, 483, - /* 310 */ 45, 887, 774, 806, 910, 917, 811, 1046, 1069, 720, - /* 320 */ 707, 930, 973, 1045, 1047, 1050, 1053, 1074, 894, 832, - /* 330 */ 625, 391, 1096, 829, 863, 884, 1098, 1038, 1085, 1100, - /* 340 */ 1104, 1106, 1107, 1108, 993, 897, 1127, 1364, 1202, 1384, - /* 350 */ 1390, 1355, 1398, 1324, 1400, 1366, 1218, 1369, 1370, 1371, - /* 360 */ 1223, 1410, 1376, 1377, 1228, 1414, 1230, 1416, 1382, 1418, - /* 370 */ 1399, 1422, 1388, 1435, 1352, 1276, 1275, 1281, 1285, 1449, - /* 380 */ 1451, 1291, 1293, 1454, 1456, 1411, 1458, 1459, 1461, 1320, - /* 390 */ 1463, 1466, 1467, 1468, 1469, 1332, 1437, 1474, 1336, 1476, - /* 400 */ 1477, 1479, 1481, 1484, 1485, 1486, 1488, 1490, 1497, 1499, - /* 410 */ 1500, 1502, 1503, 1462, 1507, 1508, 1515, 1523, 1524, 1526, - /* 420 */ 1496, 1519, 1520, 1521, 1527, 1528, 1473, 1533, 1534, 1493, - /* 430 */ 1498, 1495, 1522, 1501, 1525, 1504, 1540, 1505, 1509, 1542, - /* 440 */ 1543, 1544, 1510, 1395, 1546, 1552, 1553, 1512, 1554, 1555, - /* 450 */ 1535, 1511, 1517, 1560, 1536, 1529, 1539, 1575, 1545, 1532, - /* 460 */ 1547, 1581, 1548, 1538, 1549, 1587, 1589, 1590, 1592, 1530, - /* 470 */ 1531, 1558, 1572, 1595, 1561, 1562, 1563, 1565, 1559, 1568, - /* 480 */ 1566, 1577, 1586, 1591, 1624, 1603, 1628, 1607, 1582, 1630, - /* 490 */ 1611, 1601, 1635, 1602, 1638, 1604, 1640, 1620, 1625, 1644, - /* 500 */ 1537, 1612, 1646, 1478, 1626, 1550, 1513, 1650, 1651, 1556, - /* 510 */ 1541, 1652, 1653, 1654, 1571, 1576, 1489, 1656, 1573, 1557, - /* 520 */ 1593, 1673, 1636, 1551, 1594, 1580, 1634, 1639, 1453, 1599, - /* 530 */ 1605, 1608, 1606, 1609, 1613, 1642, 1615, 1621, 1622, 1637, - /* 540 */ 1619, 1655, 1641, 1663, 1645, 1667, 1514, 1627, 1629, 1677, - /* 550 */ 1516, 1681, 1679, 1684, 1658, 1683, 1569, 1659, 1696, 1705, - /* 560 */ 1717, 1718, 1719, 1720, 1659, 1754, 1735, 1570, 1715, 1676, - /* 570 */ 1685, 1687, 1688, 1690, 1691, 1723, 1697, 1698, 1726, 1739, - /* 580 */ 1584, 1699, 1689, 1700, 1751, 1753, 1706, 1704, 1758, 1716, - /* 590 */ 1711, 1766, 1721, 1722, 1767, 1724, 1725, 1774, 1728, 1707, - /* 600 */ 1709, 1713, 1714, 1792, 1736, 1745, 1749, 1785, 1750, 1798, - /* 610 */ 1798, 1822, 1794, 1786, 1818, 1789, 1776, 1816, 1827, 1829, - /* 620 */ 1830, 1834, 1835, 1850, 1838, 1839, 1808, 1559, 1842, 1568, - /* 630 */ 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1876, 1852, 1854, - /* 640 */ 1851, 1888, 1856, 1855, 1853, 1889, 1859, 1857, 1858, 1895, - /* 650 */ 1861, 1862, 1864, 1905, 1871, 1873, 1910, 1891, 1890, 1893, - /* 660 */ 1894, 1896, 1898, + /* 0 */ 911, 0, 0, 62, 62, 263, 263, 263, 320, 320, + /* 10 */ 263, 263, 521, 578, 779, 578, 578, 578, 578, 578, + /* 20 */ 578, 578, 578, 578, 578, 578, 578, 578, 578, 578, + /* 30 */ 578, 578, 578, 578, 578, 578, 578, 578, 578, 578, + /* 40 */ 578, 578, 209, 209, 35, 35, 35, 1072, 1072, 1072, + /* 50 */ 1072, 208, 350, 32, 32, 167, 167, 19, 19, 11, + /* 60 */ 38, 32, 32, 167, 167, 167, 167, 167, 167, 167, + /* 70 */ 167, 167, 182, 167, 167, 167, 230, 352, 167, 167, + /* 80 */ 352, 438, 167, 352, 352, 352, 167, 452, 775, 231, + /* 90 */ 489, 489, 13, 98, 730, 730, 730, 730, 730, 730, + /* 100 */ 730, 730, 730, 730, 730, 730, 730, 730, 730, 730, + /* 110 */ 730, 730, 730, 418, 38, 522, 522, 383, 567, 576, + /* 120 */ 480, 480, 480, 567, 558, 230, 1, 1, 352, 352, + /* 130 */ 585, 585, 649, 691, 201, 201, 201, 201, 201, 201, + /* 140 */ 201, 1636, 125, 684, 119, 573, 69, 313, 343, 351, + /* 150 */ 631, 529, 494, 39, 548, 514, 673, 514, 708, 824, + /* 160 */ 824, 824, 250, 666, 1056, 923, 1135, 1114, 1138, 998, + /* 170 */ 1135, 1135, 1140, 1036, 1036, 1135, 1135, 1135, 1169, 1169, + /* 180 */ 1188, 182, 230, 182, 1204, 1205, 182, 1204, 182, 1212, + /* 190 */ 182, 182, 1135, 182, 1169, 352, 352, 352, 352, 352, + /* 200 */ 352, 352, 352, 352, 352, 352, 1135, 1169, 585, 1188, + /* 210 */ 452, 1088, 230, 452, 1135, 1135, 1204, 452, 1057, 585, + /* 220 */ 585, 585, 585, 1057, 585, 1158, 558, 1212, 452, 649, + /* 230 */ 452, 558, 1296, 585, 1087, 1057, 585, 585, 1087, 1057, + /* 240 */ 585, 585, 352, 1089, 1174, 1087, 1091, 1093, 1107, 923, + /* 250 */ 1116, 558, 1322, 1099, 1103, 1101, 1099, 1103, 1099, 1103, + /* 260 */ 1262, 1056, 585, 691, 1135, 452, 1338, 1169, 2520, 2520, + /* 270 */ 2520, 2520, 2520, 2520, 2520, 601, 1684, 386, 1134, 469, + /* 280 */ 551, 682, 840, 879, 853, 727, 823, 314, 314, 314, + /* 290 */ 314, 314, 314, 314, 314, 838, 699, 274, 274, 445, + /* 300 */ 65, 108, 156, 44, 168, 602, 339, 200, 200, 200, + /* 310 */ 200, 297, 841, 839, 929, 934, 965, 57, 850, 851, + /* 320 */ 92, 784, 907, 908, 992, 1024, 1039, 1040, 1048, 819, + /* 330 */ 844, 626, 889, 1071, 924, 976, 967, 1086, 971, 1094, + /* 340 */ 1100, 1115, 1120, 1127, 1128, 994, 1029, 1068, 1396, 1235, + /* 350 */ 1414, 1415, 1374, 1418, 1344, 1421, 1387, 1237, 1389, 1390, + /* 360 */ 1391, 1241, 1428, 1394, 1395, 1245, 1433, 1248, 1435, 1407, + /* 370 */ 1445, 1424, 1447, 1422, 1456, 1375, 1288, 1291, 1294, 1298, + /* 380 */ 1465, 1466, 1305, 1308, 1470, 1471, 1426, 1473, 1474, 1475, + /* 390 */ 1331, 1477, 1479, 1483, 1484, 1485, 1346, 1453, 1489, 1351, + /* 400 */ 1492, 1493, 1494, 1498, 1499, 1500, 1502, 1503, 1505, 1507, + /* 410 */ 1508, 1510, 1512, 1513, 1476, 1515, 1516, 1517, 1520, 1523, + /* 420 */ 1524, 1527, 1525, 1532, 1534, 1537, 1538, 1504, 1539, 1506, + /* 430 */ 1548, 1556, 1519, 1526, 1521, 1552, 1522, 1553, 1528, 1558, + /* 440 */ 1529, 1531, 1572, 1573, 1575, 1540, 1420, 1580, 1581, 1582, + /* 450 */ 1530, 1583, 1584, 1551, 1542, 1554, 1590, 1559, 1549, 1560, + /* 460 */ 1591, 1562, 1557, 1566, 1598, 1571, 1568, 1577, 1601, 1617, + /* 470 */ 1619, 1620, 1535, 1533, 1587, 1602, 1623, 1595, 1606, 1607, + /* 480 */ 1609, 1594, 1600, 1610, 1611, 1612, 1613, 1649, 1628, 1651, + /* 490 */ 1632, 1614, 1656, 1643, 1631, 1668, 1635, 1671, 1638, 1674, + /* 500 */ 1654, 1657, 1678, 1541, 1644, 1681, 1514, 1662, 1543, 1545, + /* 510 */ 1685, 1687, 1546, 1547, 1693, 1697, 1698, 1615, 1618, 1561, + /* 520 */ 1701, 1621, 1570, 1624, 1703, 1666, 1576, 1625, 1629, 1673, + /* 530 */ 1665, 1497, 1642, 1646, 1645, 1647, 1648, 1650, 1686, 1655, + /* 540 */ 1658, 1659, 1660, 1661, 1705, 1682, 1706, 1664, 1710, 1550, + /* 550 */ 1669, 1675, 1711, 1536, 1717, 1716, 1718, 1680, 1724, 1555, + /* 560 */ 1683, 1719, 1735, 1737, 1738, 1740, 1741, 1683, 1749, 1755, + /* 570 */ 1585, 1742, 1695, 1700, 1696, 1707, 1715, 1720, 1745, 1722, + /* 580 */ 1723, 1746, 1761, 1622, 1725, 1709, 1726, 1768, 1778, 1730, + /* 590 */ 1743, 1781, 1739, 1751, 1791, 1747, 1753, 1792, 1750, 1756, + /* 600 */ 1793, 1762, 1732, 1744, 1748, 1752, 1782, 1734, 1763, 1764, + /* 610 */ 1811, 1765, 1808, 1808, 1830, 1794, 1797, 1820, 1795, 1777, + /* 620 */ 1819, 1829, 1832, 1833, 1834, 1836, 1843, 1838, 1848, 1816, + /* 630 */ 1594, 1851, 1600, 1853, 1854, 1856, 1857, 1858, 1861, 1863, + /* 640 */ 1899, 1865, 1859, 1862, 1903, 1869, 1864, 1866, 1908, 1875, + /* 650 */ 1867, 1874, 1915, 1889, 1878, 1893, 1944, 1900, 1901, 1937, + /* 660 */ 1924, 1927, 1928, 1929, 1931, 1933, }; -#define YY_REDUCE_COUNT (273) -#define YY_REDUCE_MIN (-354) -#define YY_REDUCE_MAX (2099) +#define YY_REDUCE_COUNT (274) +#define YY_REDUCE_MIN (-312) +#define YY_REDUCE_MAX (2182) static const short yy_reduce_ofst[] = { - /* 0 */ -29, -221, 289, 34, 709, -113, 546, 780, 876, 937, - /* 10 */ 990, 1042, 1095, 1109, 1162, 1180, 1232, 1274, 1284, 1334, - /* 20 */ 1386, 1403, 1494, 1506, 1518, 1600, 1614, 1664, 1680, 1733, - /* 30 */ 1747, 1799, 1817, 1841, 1899, 1922, 1979, 1991, 2005, 2057, - /* 40 */ 2075, 2099, -219, 711, -250, -207, 593, 731, 820, 726, - /* 50 */ 828, -218, 382, 446, 502, -208, 580, -261, -257, -354, - /* 60 */ -234, -182, -11, -138, 218, 323, 404, 548, 662, 664, - /* 70 */ 670, 672, 102, 730, 734, 735, -292, 153, 738, 756, - /* 80 */ -275, -215, 771, 219, -39, 267, 855, -246, 49, -201, - /* 90 */ -201, -201, -187, -31, -152, -132, 2, 205, 286, 336, - /* 100 */ 372, 402, 403, 441, 542, 552, 569, 571, 624, 627, - /* 110 */ 630, 635, 636, 20, 31, -71, 71, -264, 136, -194, - /* 120 */ 331, 340, 368, 243, 303, 453, 230, 431, -47, 388, - /* 130 */ 512, 537, 556, 471, 430, 511, 586, 613, 681, 682, - /* 140 */ 683, 638, 759, 745, 645, 716, 760, 701, 727, 807, - /* 150 */ 807, 870, 834, 824, 814, 801, 801, 801, 809, 788, - /* 160 */ 789, 791, 810, 807, 874, 844, 906, 851, 907, 866, - /* 170 */ 919, 921, 883, 893, 895, 932, 934, 941, 944, 891, - /* 180 */ 945, 915, 947, 904, 905, 950, 908, 954, 920, 956, - /* 190 */ 958, 963, 960, 974, 949, 951, 957, 961, 964, 965, - /* 200 */ 967, 968, 969, 970, 971, 976, 980, 959, 912, 978, - /* 210 */ 940, 972, 991, 995, 996, 981, 997, 975, 987, 988, - /* 220 */ 989, 998, 982, 999, 986, 1002, 992, 1007, 1019, 1034, - /* 230 */ 1009, 979, 1006, 952, 1001, 1008, 1013, 953, 1003, 1018, - /* 240 */ 1020, 807, 966, 983, 977, 984, 994, 985, 1014, 801, - /* 250 */ 1052, 1021, 1011, 1000, 1015, 1012, 1022, 1016, 1026, 1023, - /* 260 */ 1061, 1057, 1081, 1086, 1090, 1099, 1101, 1044, 1051, 1083, - /* 270 */ 1089, 1110, 1111, 1114, + /* 0 */ -78, -232, 63, 286, -113, 706, 787, 865, 918, 970, + /* 10 */ 545, 1035, 1051, 1106, 1118, 1196, 1210, 1220, 1277, 1301, + /* 20 */ 1327, 1381, 1464, 1488, 1544, 1586, 1596, 1608, 1689, 1708, + /* 30 */ 1769, 1788, 1855, 1871, 1881, 1935, 1989, 2039, 2056, 2119, + /* 40 */ 2140, 2182, -263, 796, -14, 75, 305, -278, 55, 270, + /* 50 */ 672, -296, 123, 184, 647, -266, -43, -260, -256, -303, + /* 60 */ -186, -230, -191, -185, 97, 315, 316, 363, 563, 564, + /* 70 */ 566, 659, -154, 667, 733, 736, -285, -106, 748, 778, + /* 80 */ 59, 24, 781, 72, 322, 82, 782, 70, -252, -312, + /* 90 */ -312, -312, -117, -239, -114, -20, 141, 181, 196, 289, + /* 100 */ 328, 435, 455, 505, 575, 668, 705, 716, 750, 754, + /* 110 */ 761, 764, 766, 299, -110, 124, 138, -220, 148, -243, + /* 120 */ 218, 310, 364, 150, 354, 349, 336, 456, 319, 205, + /* 130 */ 474, 498, 476, 560, -280, -270, 477, 513, 519, 538, + /* 140 */ 596, 526, 382, 655, 570, 628, 734, 707, 670, 745, + /* 150 */ 745, 810, 822, 797, 777, 755, 755, 755, 757, 738, + /* 160 */ 742, 769, 758, 745, 858, 830, 890, 845, 902, 860, + /* 170 */ 909, 912, 877, 883, 884, 926, 927, 928, 943, 947, + /* 180 */ 894, 946, 921, 953, 913, 910, 959, 916, 961, 930, + /* 190 */ 964, 966, 969, 972, 979, 955, 957, 960, 968, 973, + /* 200 */ 974, 975, 977, 980, 981, 982, 991, 985, 948, 937, + /* 210 */ 1002, 952, 983, 1005, 1009, 1017, 978, 1018, 984, 989, + /* 220 */ 996, 999, 1000, 987, 1007, 1003, 1016, 1006, 1022, 1030, + /* 230 */ 1046, 1021, 988, 1019, 962, 1012, 1020, 1026, 986, 1013, + /* 240 */ 1028, 1031, 745, 990, 993, 997, 995, 1011, 1001, 1014, + /* 250 */ 755, 1047, 1023, 1025, 1027, 1032, 1034, 1037, 1038, 1042, + /* 260 */ 1010, 1064, 1059, 1097, 1096, 1095, 1117, 1131, 1075, 1081, + /* 270 */ 1119, 1121, 1122, 1126, 1147, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 10 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 20 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 30 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 40 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 50 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 60 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 70 */ 1453, 1453, 1526, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 80 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1524, 1679, 1453, - /* 90 */ 1856, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 100 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 110 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1526, 1453, 1524, - /* 120 */ 1868, 1868, 1868, 1453, 1453, 1453, 1723, 1723, 1453, 1453, - /* 130 */ 1453, 1453, 1622, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 140 */ 1453, 1715, 1453, 1453, 1937, 1453, 1453, 1721, 1891, 1453, - /* 150 */ 1453, 1453, 1453, 1575, 1883, 1860, 1874, 1861, 1858, 1922, - /* 160 */ 1922, 1922, 1877, 1453, 1591, 1887, 1453, 1453, 1453, 1707, - /* 170 */ 1453, 1453, 1684, 1681, 1681, 1453, 1453, 1453, 1453, 1453, - /* 180 */ 1526, 1453, 1526, 1453, 1453, 1526, 1453, 1526, 1453, 1526, - /* 190 */ 1526, 1453, 1526, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 200 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1524, - /* 210 */ 1717, 1453, 1524, 1453, 1453, 1453, 1524, 1896, 1453, 1453, - /* 220 */ 1453, 1453, 1896, 1453, 1453, 1453, 1453, 1524, 1453, 1524, - /* 230 */ 1453, 1453, 1453, 1898, 1896, 1453, 1453, 1898, 1896, 1453, - /* 240 */ 1453, 1453, 1910, 1906, 1898, 1914, 1912, 1889, 1887, 1874, - /* 250 */ 1453, 1453, 1928, 1924, 1940, 1928, 1924, 1928, 1924, 1453, - /* 260 */ 1591, 1453, 1453, 1453, 1524, 1485, 1453, 1709, 1723, 1625, - /* 270 */ 1625, 1625, 1527, 1458, 1453, 1453, 1453, 1453, 1453, 1453, - /* 280 */ 1453, 1453, 1453, 1453, 1453, 1453, 1794, 1909, 1908, 1832, - /* 290 */ 1831, 1830, 1828, 1793, 1453, 1587, 1792, 1791, 1453, 1453, - /* 300 */ 1453, 1453, 1453, 1453, 1453, 1453, 1785, 1786, 1784, 1783, - /* 310 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 320 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1857, 1453, - /* 330 */ 1925, 1929, 1453, 1453, 1453, 1453, 1453, 1768, 1453, 1453, - /* 340 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 350 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 360 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 370 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 380 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 390 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 400 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 410 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 420 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 430 */ 1453, 1490, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 440 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 450 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 460 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 470 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1556, 1555, - /* 480 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 490 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 500 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 510 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1727, 1453, 1453, - /* 520 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1890, 1453, 1453, - /* 530 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 540 */ 1453, 1453, 1453, 1768, 1453, 1907, 1453, 1867, 1863, 1453, - /* 550 */ 1453, 1859, 1767, 1453, 1453, 1923, 1453, 1453, 1453, 1453, - /* 560 */ 1453, 1453, 1453, 1453, 1453, 1852, 1453, 1453, 1825, 1810, - /* 570 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 580 */ 1779, 1453, 1453, 1453, 1453, 1453, 1619, 1453, 1453, 1453, - /* 590 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1604, - /* 600 */ 1602, 1601, 1600, 1453, 1597, 1453, 1453, 1453, 1453, 1628, - /* 610 */ 1627, 1453, 1453, 1453, 1453, 1453, 1453, 1547, 1453, 1453, - /* 620 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1538, 1453, 1537, - /* 630 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 640 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 650 */ 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - /* 660 */ 1453, 1453, 1453, + /* 0 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 10 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 20 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 30 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 40 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 50 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 60 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 70 */ 1457, 1457, 1531, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 80 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1529, 1684, 1457, + /* 90 */ 1861, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 100 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 110 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1531, 1457, 1529, + /* 120 */ 1873, 1873, 1873, 1457, 1457, 1457, 1728, 1728, 1457, 1457, + /* 130 */ 1457, 1457, 1627, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 140 */ 1457, 1720, 1457, 1457, 1942, 1457, 1457, 1726, 1896, 1457, + /* 150 */ 1457, 1457, 1457, 1580, 1888, 1865, 1879, 1866, 1863, 1927, + /* 160 */ 1927, 1927, 1882, 1457, 1596, 1892, 1457, 1457, 1457, 1712, + /* 170 */ 1457, 1457, 1689, 1686, 1686, 1457, 1457, 1457, 1457, 1457, + /* 180 */ 1457, 1531, 1457, 1531, 1457, 1457, 1531, 1457, 1531, 1457, + /* 190 */ 1531, 1531, 1457, 1531, 1457, 1457, 1457, 1457, 1457, 1457, + /* 200 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 210 */ 1529, 1722, 1457, 1529, 1457, 1457, 1457, 1529, 1901, 1457, + /* 220 */ 1457, 1457, 1457, 1901, 1457, 1457, 1457, 1457, 1529, 1457, + /* 230 */ 1529, 1457, 1457, 1457, 1903, 1901, 1457, 1457, 1903, 1901, + /* 240 */ 1457, 1457, 1457, 1915, 1911, 1903, 1919, 1917, 1894, 1892, + /* 250 */ 1879, 1457, 1457, 1933, 1929, 1945, 1933, 1929, 1933, 1929, + /* 260 */ 1457, 1596, 1457, 1457, 1457, 1529, 1489, 1457, 1714, 1728, + /* 270 */ 1630, 1630, 1630, 1532, 1462, 1457, 1457, 1457, 1457, 1457, + /* 280 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1799, 1914, 1913, + /* 290 */ 1837, 1836, 1835, 1833, 1798, 1457, 1592, 1797, 1796, 1457, + /* 300 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1790, 1791, 1789, + /* 310 */ 1788, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 320 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1862, + /* 330 */ 1457, 1930, 1934, 1457, 1457, 1457, 1457, 1457, 1773, 1457, + /* 340 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 350 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 360 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 370 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 380 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 390 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 400 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 410 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 420 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 430 */ 1457, 1457, 1457, 1457, 1494, 1457, 1457, 1457, 1457, 1457, + /* 440 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 450 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 460 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 470 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 480 */ 1457, 1561, 1560, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 490 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 500 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 510 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 520 */ 1732, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 530 */ 1895, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 540 */ 1457, 1457, 1457, 1457, 1457, 1457, 1773, 1457, 1912, 1457, + /* 550 */ 1872, 1868, 1457, 1457, 1864, 1772, 1457, 1457, 1928, 1457, + /* 560 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1857, 1457, + /* 570 */ 1457, 1830, 1815, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 580 */ 1457, 1457, 1457, 1784, 1457, 1457, 1457, 1457, 1457, 1624, + /* 590 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 600 */ 1457, 1457, 1609, 1607, 1606, 1605, 1457, 1602, 1457, 1457, + /* 610 */ 1457, 1457, 1633, 1632, 1457, 1457, 1457, 1457, 1457, 1457, + /* 620 */ 1552, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 630 */ 1543, 1457, 1542, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 640 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 650 */ 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + /* 660 */ 1457, 1457, 1457, 1457, 1457, 1457, }; /********** End of lemon-generated parsing tables *****************************/ @@ -960,6 +976,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* DATABASE => nothing */ 0, /* USE => nothing */ 0, /* FLUSH => nothing */ + 0, /* TRIM => nothing */ 0, /* IF => nothing */ 0, /* NOT => nothing */ 0, /* EXISTS => nothing */ @@ -1150,11 +1167,11 @@ static const YYCODETYPE yyFallback[] = { 0, /* ASC => nothing */ 0, /* NULLS => nothing */ 0, /* ID => nothing */ - 248, /* NK_BITNOT => ID */ - 248, /* VALUES => ID */ - 248, /* IMPORT => ID */ - 248, /* NK_SEMI => ID */ - 248, /* FILE => ID */ + 249, /* NK_BITNOT => ID */ + 249, /* VALUES => ID */ + 249, /* IMPORT => ID */ + 249, /* NK_SEMI => ID */ + 249, /* FILE => ID */ }; #endif /* YYFALLBACK */ @@ -1301,324 +1318,325 @@ static const char *const yyTokenName[] = { /* 56 */ "DATABASE", /* 57 */ "USE", /* 58 */ "FLUSH", - /* 59 */ "IF", - /* 60 */ "NOT", - /* 61 */ "EXISTS", - /* 62 */ "BUFFER", - /* 63 */ "CACHELAST", - /* 64 */ "CACHELASTSIZE", - /* 65 */ "COMP", - /* 66 */ "DURATION", - /* 67 */ "NK_VARIABLE", - /* 68 */ "FSYNC", - /* 69 */ "MAXROWS", - /* 70 */ "MINROWS", - /* 71 */ "KEEP", - /* 72 */ "PAGES", - /* 73 */ "PAGESIZE", - /* 74 */ "PRECISION", - /* 75 */ "REPLICA", - /* 76 */ "STRICT", - /* 77 */ "WAL", - /* 78 */ "VGROUPS", - /* 79 */ "SINGLE_STABLE", - /* 80 */ "RETENTIONS", - /* 81 */ "SCHEMALESS", - /* 82 */ "NK_COLON", - /* 83 */ "TABLE", - /* 84 */ "NK_LP", - /* 85 */ "NK_RP", - /* 86 */ "STABLE", - /* 87 */ "ADD", - /* 88 */ "COLUMN", - /* 89 */ "MODIFY", - /* 90 */ "RENAME", - /* 91 */ "TAG", - /* 92 */ "SET", - /* 93 */ "NK_EQ", - /* 94 */ "USING", - /* 95 */ "TAGS", - /* 96 */ "COMMENT", - /* 97 */ "BOOL", - /* 98 */ "TINYINT", - /* 99 */ "SMALLINT", - /* 100 */ "INT", - /* 101 */ "INTEGER", - /* 102 */ "BIGINT", - /* 103 */ "FLOAT", - /* 104 */ "DOUBLE", - /* 105 */ "BINARY", - /* 106 */ "TIMESTAMP", - /* 107 */ "NCHAR", - /* 108 */ "UNSIGNED", - /* 109 */ "JSON", - /* 110 */ "VARCHAR", - /* 111 */ "MEDIUMBLOB", - /* 112 */ "BLOB", - /* 113 */ "VARBINARY", - /* 114 */ "DECIMAL", - /* 115 */ "MAX_DELAY", - /* 116 */ "WATERMARK", - /* 117 */ "ROLLUP", - /* 118 */ "TTL", - /* 119 */ "SMA", - /* 120 */ "FIRST", - /* 121 */ "LAST", - /* 122 */ "SHOW", - /* 123 */ "DATABASES", - /* 124 */ "TABLES", - /* 125 */ "STABLES", - /* 126 */ "MNODES", - /* 127 */ "MODULES", - /* 128 */ "QNODES", - /* 129 */ "FUNCTIONS", - /* 130 */ "INDEXES", - /* 131 */ "ACCOUNTS", - /* 132 */ "APPS", - /* 133 */ "CONNECTIONS", - /* 134 */ "LICENCE", - /* 135 */ "GRANTS", - /* 136 */ "QUERIES", - /* 137 */ "SCORES", - /* 138 */ "TOPICS", - /* 139 */ "VARIABLES", - /* 140 */ "BNODES", - /* 141 */ "SNODES", - /* 142 */ "CLUSTER", - /* 143 */ "TRANSACTIONS", - /* 144 */ "DISTRIBUTED", - /* 145 */ "CONSUMERS", - /* 146 */ "SUBSCRIPTIONS", - /* 147 */ "LIKE", - /* 148 */ "INDEX", - /* 149 */ "FUNCTION", - /* 150 */ "INTERVAL", - /* 151 */ "TOPIC", - /* 152 */ "AS", - /* 153 */ "WITH", - /* 154 */ "META", - /* 155 */ "CONSUMER", - /* 156 */ "GROUP", - /* 157 */ "DESC", - /* 158 */ "DESCRIBE", - /* 159 */ "RESET", - /* 160 */ "QUERY", - /* 161 */ "CACHE", - /* 162 */ "EXPLAIN", - /* 163 */ "ANALYZE", - /* 164 */ "VERBOSE", - /* 165 */ "NK_BOOL", - /* 166 */ "RATIO", - /* 167 */ "NK_FLOAT", - /* 168 */ "COMPACT", - /* 169 */ "VNODES", - /* 170 */ "IN", - /* 171 */ "OUTPUTTYPE", - /* 172 */ "AGGREGATE", - /* 173 */ "BUFSIZE", - /* 174 */ "STREAM", - /* 175 */ "INTO", - /* 176 */ "TRIGGER", - /* 177 */ "AT_ONCE", - /* 178 */ "WINDOW_CLOSE", - /* 179 */ "IGNORE", - /* 180 */ "EXPIRED", - /* 181 */ "KILL", - /* 182 */ "CONNECTION", - /* 183 */ "TRANSACTION", - /* 184 */ "BALANCE", - /* 185 */ "VGROUP", - /* 186 */ "MERGE", - /* 187 */ "REDISTRIBUTE", - /* 188 */ "SPLIT", - /* 189 */ "SYNCDB", - /* 190 */ "DELETE", - /* 191 */ "INSERT", - /* 192 */ "NULL", - /* 193 */ "NK_QUESTION", - /* 194 */ "NK_ARROW", - /* 195 */ "ROWTS", - /* 196 */ "TBNAME", - /* 197 */ "QSTARTTS", - /* 198 */ "QENDTS", - /* 199 */ "WSTARTTS", - /* 200 */ "WENDTS", - /* 201 */ "WDURATION", - /* 202 */ "CAST", - /* 203 */ "NOW", - /* 204 */ "TODAY", - /* 205 */ "TIMEZONE", - /* 206 */ "CLIENT_VERSION", - /* 207 */ "SERVER_VERSION", - /* 208 */ "SERVER_STATUS", - /* 209 */ "CURRENT_USER", - /* 210 */ "COUNT", - /* 211 */ "LAST_ROW", - /* 212 */ "BETWEEN", - /* 213 */ "IS", - /* 214 */ "NK_LT", - /* 215 */ "NK_GT", - /* 216 */ "NK_LE", - /* 217 */ "NK_GE", - /* 218 */ "NK_NE", - /* 219 */ "MATCH", - /* 220 */ "NMATCH", - /* 221 */ "CONTAINS", - /* 222 */ "JOIN", - /* 223 */ "INNER", - /* 224 */ "SELECT", - /* 225 */ "DISTINCT", - /* 226 */ "WHERE", - /* 227 */ "PARTITION", - /* 228 */ "BY", - /* 229 */ "SESSION", - /* 230 */ "STATE_WINDOW", - /* 231 */ "SLIDING", - /* 232 */ "FILL", - /* 233 */ "VALUE", - /* 234 */ "NONE", - /* 235 */ "PREV", - /* 236 */ "LINEAR", - /* 237 */ "NEXT", - /* 238 */ "HAVING", - /* 239 */ "RANGE", - /* 240 */ "EVERY", - /* 241 */ "ORDER", - /* 242 */ "SLIMIT", - /* 243 */ "SOFFSET", - /* 244 */ "LIMIT", - /* 245 */ "OFFSET", - /* 246 */ "ASC", - /* 247 */ "NULLS", - /* 248 */ "ID", - /* 249 */ "NK_BITNOT", - /* 250 */ "VALUES", - /* 251 */ "IMPORT", - /* 252 */ "NK_SEMI", - /* 253 */ "FILE", - /* 254 */ "cmd", - /* 255 */ "account_options", - /* 256 */ "alter_account_options", - /* 257 */ "literal", - /* 258 */ "alter_account_option", - /* 259 */ "user_name", - /* 260 */ "sysinfo_opt", - /* 261 */ "privileges", - /* 262 */ "priv_level", - /* 263 */ "priv_type_list", - /* 264 */ "priv_type", - /* 265 */ "db_name", - /* 266 */ "dnode_endpoint", - /* 267 */ "not_exists_opt", - /* 268 */ "db_options", - /* 269 */ "exists_opt", - /* 270 */ "alter_db_options", - /* 271 */ "integer_list", - /* 272 */ "variable_list", - /* 273 */ "retention_list", - /* 274 */ "alter_db_option", - /* 275 */ "retention", - /* 276 */ "full_table_name", - /* 277 */ "column_def_list", - /* 278 */ "tags_def_opt", - /* 279 */ "table_options", - /* 280 */ "multi_create_clause", - /* 281 */ "tags_def", - /* 282 */ "multi_drop_clause", - /* 283 */ "alter_table_clause", - /* 284 */ "alter_table_options", - /* 285 */ "column_name", - /* 286 */ "type_name", - /* 287 */ "signed_literal", - /* 288 */ "create_subtable_clause", - /* 289 */ "specific_cols_opt", - /* 290 */ "expression_list", - /* 291 */ "drop_table_clause", - /* 292 */ "col_name_list", - /* 293 */ "table_name", - /* 294 */ "column_def", - /* 295 */ "duration_list", - /* 296 */ "rollup_func_list", - /* 297 */ "alter_table_option", - /* 298 */ "duration_literal", - /* 299 */ "rollup_func_name", - /* 300 */ "function_name", - /* 301 */ "col_name", - /* 302 */ "db_name_cond_opt", - /* 303 */ "like_pattern_opt", - /* 304 */ "table_name_cond", - /* 305 */ "from_db_opt", - /* 306 */ "index_name", - /* 307 */ "index_options", - /* 308 */ "func_list", - /* 309 */ "sliding_opt", - /* 310 */ "sma_stream_opt", - /* 311 */ "func", - /* 312 */ "stream_options", - /* 313 */ "topic_name", - /* 314 */ "query_expression", - /* 315 */ "cgroup_name", - /* 316 */ "analyze_opt", - /* 317 */ "explain_options", - /* 318 */ "agg_func_opt", - /* 319 */ "bufsize_opt", - /* 320 */ "stream_name", - /* 321 */ "into_opt", - /* 322 */ "dnode_list", - /* 323 */ "where_clause_opt", - /* 324 */ "signed", - /* 325 */ "literal_func", - /* 326 */ "literal_list", - /* 327 */ "table_alias", - /* 328 */ "column_alias", - /* 329 */ "expression", - /* 330 */ "pseudo_column", - /* 331 */ "column_reference", - /* 332 */ "function_expression", - /* 333 */ "subquery", - /* 334 */ "star_func", - /* 335 */ "star_func_para_list", - /* 336 */ "noarg_func", - /* 337 */ "other_para_list", - /* 338 */ "star_func_para", - /* 339 */ "predicate", - /* 340 */ "compare_op", - /* 341 */ "in_op", - /* 342 */ "in_predicate_value", - /* 343 */ "boolean_value_expression", - /* 344 */ "boolean_primary", - /* 345 */ "common_expression", - /* 346 */ "from_clause_opt", - /* 347 */ "table_reference_list", - /* 348 */ "table_reference", - /* 349 */ "table_primary", - /* 350 */ "joined_table", - /* 351 */ "alias_opt", - /* 352 */ "parenthesized_joined_table", - /* 353 */ "join_type", - /* 354 */ "search_condition", - /* 355 */ "query_specification", - /* 356 */ "set_quantifier_opt", - /* 357 */ "select_list", - /* 358 */ "partition_by_clause_opt", - /* 359 */ "range_opt", - /* 360 */ "every_opt", - /* 361 */ "fill_opt", - /* 362 */ "twindow_clause_opt", - /* 363 */ "group_by_clause_opt", - /* 364 */ "having_clause_opt", - /* 365 */ "select_item", - /* 366 */ "fill_mode", - /* 367 */ "group_by_list", - /* 368 */ "query_expression_body", - /* 369 */ "order_by_clause_opt", - /* 370 */ "slimit_clause_opt", - /* 371 */ "limit_clause_opt", - /* 372 */ "query_primary", - /* 373 */ "sort_specification_list", - /* 374 */ "sort_specification", - /* 375 */ "ordering_specification_opt", - /* 376 */ "null_ordering_opt", + /* 59 */ "TRIM", + /* 60 */ "IF", + /* 61 */ "NOT", + /* 62 */ "EXISTS", + /* 63 */ "BUFFER", + /* 64 */ "CACHELAST", + /* 65 */ "CACHELASTSIZE", + /* 66 */ "COMP", + /* 67 */ "DURATION", + /* 68 */ "NK_VARIABLE", + /* 69 */ "FSYNC", + /* 70 */ "MAXROWS", + /* 71 */ "MINROWS", + /* 72 */ "KEEP", + /* 73 */ "PAGES", + /* 74 */ "PAGESIZE", + /* 75 */ "PRECISION", + /* 76 */ "REPLICA", + /* 77 */ "STRICT", + /* 78 */ "WAL", + /* 79 */ "VGROUPS", + /* 80 */ "SINGLE_STABLE", + /* 81 */ "RETENTIONS", + /* 82 */ "SCHEMALESS", + /* 83 */ "NK_COLON", + /* 84 */ "TABLE", + /* 85 */ "NK_LP", + /* 86 */ "NK_RP", + /* 87 */ "STABLE", + /* 88 */ "ADD", + /* 89 */ "COLUMN", + /* 90 */ "MODIFY", + /* 91 */ "RENAME", + /* 92 */ "TAG", + /* 93 */ "SET", + /* 94 */ "NK_EQ", + /* 95 */ "USING", + /* 96 */ "TAGS", + /* 97 */ "COMMENT", + /* 98 */ "BOOL", + /* 99 */ "TINYINT", + /* 100 */ "SMALLINT", + /* 101 */ "INT", + /* 102 */ "INTEGER", + /* 103 */ "BIGINT", + /* 104 */ "FLOAT", + /* 105 */ "DOUBLE", + /* 106 */ "BINARY", + /* 107 */ "TIMESTAMP", + /* 108 */ "NCHAR", + /* 109 */ "UNSIGNED", + /* 110 */ "JSON", + /* 111 */ "VARCHAR", + /* 112 */ "MEDIUMBLOB", + /* 113 */ "BLOB", + /* 114 */ "VARBINARY", + /* 115 */ "DECIMAL", + /* 116 */ "MAX_DELAY", + /* 117 */ "WATERMARK", + /* 118 */ "ROLLUP", + /* 119 */ "TTL", + /* 120 */ "SMA", + /* 121 */ "FIRST", + /* 122 */ "LAST", + /* 123 */ "SHOW", + /* 124 */ "DATABASES", + /* 125 */ "TABLES", + /* 126 */ "STABLES", + /* 127 */ "MNODES", + /* 128 */ "MODULES", + /* 129 */ "QNODES", + /* 130 */ "FUNCTIONS", + /* 131 */ "INDEXES", + /* 132 */ "ACCOUNTS", + /* 133 */ "APPS", + /* 134 */ "CONNECTIONS", + /* 135 */ "LICENCE", + /* 136 */ "GRANTS", + /* 137 */ "QUERIES", + /* 138 */ "SCORES", + /* 139 */ "TOPICS", + /* 140 */ "VARIABLES", + /* 141 */ "BNODES", + /* 142 */ "SNODES", + /* 143 */ "CLUSTER", + /* 144 */ "TRANSACTIONS", + /* 145 */ "DISTRIBUTED", + /* 146 */ "CONSUMERS", + /* 147 */ "SUBSCRIPTIONS", + /* 148 */ "LIKE", + /* 149 */ "INDEX", + /* 150 */ "FUNCTION", + /* 151 */ "INTERVAL", + /* 152 */ "TOPIC", + /* 153 */ "AS", + /* 154 */ "WITH", + /* 155 */ "META", + /* 156 */ "CONSUMER", + /* 157 */ "GROUP", + /* 158 */ "DESC", + /* 159 */ "DESCRIBE", + /* 160 */ "RESET", + /* 161 */ "QUERY", + /* 162 */ "CACHE", + /* 163 */ "EXPLAIN", + /* 164 */ "ANALYZE", + /* 165 */ "VERBOSE", + /* 166 */ "NK_BOOL", + /* 167 */ "RATIO", + /* 168 */ "NK_FLOAT", + /* 169 */ "COMPACT", + /* 170 */ "VNODES", + /* 171 */ "IN", + /* 172 */ "OUTPUTTYPE", + /* 173 */ "AGGREGATE", + /* 174 */ "BUFSIZE", + /* 175 */ "STREAM", + /* 176 */ "INTO", + /* 177 */ "TRIGGER", + /* 178 */ "AT_ONCE", + /* 179 */ "WINDOW_CLOSE", + /* 180 */ "IGNORE", + /* 181 */ "EXPIRED", + /* 182 */ "KILL", + /* 183 */ "CONNECTION", + /* 184 */ "TRANSACTION", + /* 185 */ "BALANCE", + /* 186 */ "VGROUP", + /* 187 */ "MERGE", + /* 188 */ "REDISTRIBUTE", + /* 189 */ "SPLIT", + /* 190 */ "SYNCDB", + /* 191 */ "DELETE", + /* 192 */ "INSERT", + /* 193 */ "NULL", + /* 194 */ "NK_QUESTION", + /* 195 */ "NK_ARROW", + /* 196 */ "ROWTS", + /* 197 */ "TBNAME", + /* 198 */ "QSTARTTS", + /* 199 */ "QENDTS", + /* 200 */ "WSTARTTS", + /* 201 */ "WENDTS", + /* 202 */ "WDURATION", + /* 203 */ "CAST", + /* 204 */ "NOW", + /* 205 */ "TODAY", + /* 206 */ "TIMEZONE", + /* 207 */ "CLIENT_VERSION", + /* 208 */ "SERVER_VERSION", + /* 209 */ "SERVER_STATUS", + /* 210 */ "CURRENT_USER", + /* 211 */ "COUNT", + /* 212 */ "LAST_ROW", + /* 213 */ "BETWEEN", + /* 214 */ "IS", + /* 215 */ "NK_LT", + /* 216 */ "NK_GT", + /* 217 */ "NK_LE", + /* 218 */ "NK_GE", + /* 219 */ "NK_NE", + /* 220 */ "MATCH", + /* 221 */ "NMATCH", + /* 222 */ "CONTAINS", + /* 223 */ "JOIN", + /* 224 */ "INNER", + /* 225 */ "SELECT", + /* 226 */ "DISTINCT", + /* 227 */ "WHERE", + /* 228 */ "PARTITION", + /* 229 */ "BY", + /* 230 */ "SESSION", + /* 231 */ "STATE_WINDOW", + /* 232 */ "SLIDING", + /* 233 */ "FILL", + /* 234 */ "VALUE", + /* 235 */ "NONE", + /* 236 */ "PREV", + /* 237 */ "LINEAR", + /* 238 */ "NEXT", + /* 239 */ "HAVING", + /* 240 */ "RANGE", + /* 241 */ "EVERY", + /* 242 */ "ORDER", + /* 243 */ "SLIMIT", + /* 244 */ "SOFFSET", + /* 245 */ "LIMIT", + /* 246 */ "OFFSET", + /* 247 */ "ASC", + /* 248 */ "NULLS", + /* 249 */ "ID", + /* 250 */ "NK_BITNOT", + /* 251 */ "VALUES", + /* 252 */ "IMPORT", + /* 253 */ "NK_SEMI", + /* 254 */ "FILE", + /* 255 */ "cmd", + /* 256 */ "account_options", + /* 257 */ "alter_account_options", + /* 258 */ "literal", + /* 259 */ "alter_account_option", + /* 260 */ "user_name", + /* 261 */ "sysinfo_opt", + /* 262 */ "privileges", + /* 263 */ "priv_level", + /* 264 */ "priv_type_list", + /* 265 */ "priv_type", + /* 266 */ "db_name", + /* 267 */ "dnode_endpoint", + /* 268 */ "not_exists_opt", + /* 269 */ "db_options", + /* 270 */ "exists_opt", + /* 271 */ "alter_db_options", + /* 272 */ "integer_list", + /* 273 */ "variable_list", + /* 274 */ "retention_list", + /* 275 */ "alter_db_option", + /* 276 */ "retention", + /* 277 */ "full_table_name", + /* 278 */ "column_def_list", + /* 279 */ "tags_def_opt", + /* 280 */ "table_options", + /* 281 */ "multi_create_clause", + /* 282 */ "tags_def", + /* 283 */ "multi_drop_clause", + /* 284 */ "alter_table_clause", + /* 285 */ "alter_table_options", + /* 286 */ "column_name", + /* 287 */ "type_name", + /* 288 */ "signed_literal", + /* 289 */ "create_subtable_clause", + /* 290 */ "specific_cols_opt", + /* 291 */ "expression_list", + /* 292 */ "drop_table_clause", + /* 293 */ "col_name_list", + /* 294 */ "table_name", + /* 295 */ "column_def", + /* 296 */ "duration_list", + /* 297 */ "rollup_func_list", + /* 298 */ "alter_table_option", + /* 299 */ "duration_literal", + /* 300 */ "rollup_func_name", + /* 301 */ "function_name", + /* 302 */ "col_name", + /* 303 */ "db_name_cond_opt", + /* 304 */ "like_pattern_opt", + /* 305 */ "table_name_cond", + /* 306 */ "from_db_opt", + /* 307 */ "index_name", + /* 308 */ "index_options", + /* 309 */ "func_list", + /* 310 */ "sliding_opt", + /* 311 */ "sma_stream_opt", + /* 312 */ "func", + /* 313 */ "stream_options", + /* 314 */ "topic_name", + /* 315 */ "query_expression", + /* 316 */ "cgroup_name", + /* 317 */ "analyze_opt", + /* 318 */ "explain_options", + /* 319 */ "agg_func_opt", + /* 320 */ "bufsize_opt", + /* 321 */ "stream_name", + /* 322 */ "into_opt", + /* 323 */ "dnode_list", + /* 324 */ "where_clause_opt", + /* 325 */ "signed", + /* 326 */ "literal_func", + /* 327 */ "literal_list", + /* 328 */ "table_alias", + /* 329 */ "column_alias", + /* 330 */ "expression", + /* 331 */ "pseudo_column", + /* 332 */ "column_reference", + /* 333 */ "function_expression", + /* 334 */ "subquery", + /* 335 */ "star_func", + /* 336 */ "star_func_para_list", + /* 337 */ "noarg_func", + /* 338 */ "other_para_list", + /* 339 */ "star_func_para", + /* 340 */ "predicate", + /* 341 */ "compare_op", + /* 342 */ "in_op", + /* 343 */ "in_predicate_value", + /* 344 */ "boolean_value_expression", + /* 345 */ "boolean_primary", + /* 346 */ "common_expression", + /* 347 */ "from_clause_opt", + /* 348 */ "table_reference_list", + /* 349 */ "table_reference", + /* 350 */ "table_primary", + /* 351 */ "joined_table", + /* 352 */ "alias_opt", + /* 353 */ "parenthesized_joined_table", + /* 354 */ "join_type", + /* 355 */ "search_condition", + /* 356 */ "query_specification", + /* 357 */ "set_quantifier_opt", + /* 358 */ "select_list", + /* 359 */ "partition_by_clause_opt", + /* 360 */ "range_opt", + /* 361 */ "every_opt", + /* 362 */ "fill_opt", + /* 363 */ "twindow_clause_opt", + /* 364 */ "group_by_clause_opt", + /* 365 */ "having_clause_opt", + /* 366 */ "select_item", + /* 367 */ "fill_mode", + /* 368 */ "group_by_list", + /* 369 */ "query_expression_body", + /* 370 */ "order_by_clause_opt", + /* 371 */ "slimit_clause_opt", + /* 372 */ "limit_clause_opt", + /* 373 */ "query_primary", + /* 374 */ "sort_specification_list", + /* 375 */ "sort_specification", + /* 376 */ "ordering_specification_opt", + /* 377 */ "null_ordering_opt", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1693,426 +1711,427 @@ static const char *const yyRuleName[] = { /* 64 */ "cmd ::= USE db_name", /* 65 */ "cmd ::= ALTER DATABASE db_name alter_db_options", /* 66 */ "cmd ::= FLUSH DATABASE db_name", - /* 67 */ "not_exists_opt ::= IF NOT EXISTS", - /* 68 */ "not_exists_opt ::=", - /* 69 */ "exists_opt ::= IF EXISTS", - /* 70 */ "exists_opt ::=", - /* 71 */ "db_options ::=", - /* 72 */ "db_options ::= db_options BUFFER NK_INTEGER", - /* 73 */ "db_options ::= db_options CACHELAST NK_INTEGER", - /* 74 */ "db_options ::= db_options CACHELASTSIZE NK_INTEGER", - /* 75 */ "db_options ::= db_options COMP NK_INTEGER", - /* 76 */ "db_options ::= db_options DURATION NK_INTEGER", - /* 77 */ "db_options ::= db_options DURATION NK_VARIABLE", - /* 78 */ "db_options ::= db_options FSYNC NK_INTEGER", - /* 79 */ "db_options ::= db_options MAXROWS NK_INTEGER", - /* 80 */ "db_options ::= db_options MINROWS NK_INTEGER", - /* 81 */ "db_options ::= db_options KEEP integer_list", - /* 82 */ "db_options ::= db_options KEEP variable_list", - /* 83 */ "db_options ::= db_options PAGES NK_INTEGER", - /* 84 */ "db_options ::= db_options PAGESIZE NK_INTEGER", - /* 85 */ "db_options ::= db_options PRECISION NK_STRING", - /* 86 */ "db_options ::= db_options REPLICA NK_INTEGER", - /* 87 */ "db_options ::= db_options STRICT NK_INTEGER", - /* 88 */ "db_options ::= db_options WAL NK_INTEGER", - /* 89 */ "db_options ::= db_options VGROUPS NK_INTEGER", - /* 90 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER", - /* 91 */ "db_options ::= db_options RETENTIONS retention_list", - /* 92 */ "db_options ::= db_options SCHEMALESS NK_INTEGER", - /* 93 */ "alter_db_options ::= alter_db_option", - /* 94 */ "alter_db_options ::= alter_db_options alter_db_option", - /* 95 */ "alter_db_option ::= BUFFER NK_INTEGER", - /* 96 */ "alter_db_option ::= CACHELAST NK_INTEGER", - /* 97 */ "alter_db_option ::= CACHELASTSIZE NK_INTEGER", - /* 98 */ "alter_db_option ::= FSYNC NK_INTEGER", - /* 99 */ "alter_db_option ::= KEEP integer_list", - /* 100 */ "alter_db_option ::= KEEP variable_list", - /* 101 */ "alter_db_option ::= PAGES NK_INTEGER", - /* 102 */ "alter_db_option ::= REPLICA NK_INTEGER", - /* 103 */ "alter_db_option ::= STRICT NK_INTEGER", - /* 104 */ "alter_db_option ::= WAL NK_INTEGER", - /* 105 */ "integer_list ::= NK_INTEGER", - /* 106 */ "integer_list ::= integer_list NK_COMMA NK_INTEGER", - /* 107 */ "variable_list ::= NK_VARIABLE", - /* 108 */ "variable_list ::= variable_list NK_COMMA NK_VARIABLE", - /* 109 */ "retention_list ::= retention", - /* 110 */ "retention_list ::= retention_list NK_COMMA retention", - /* 111 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE", - /* 112 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options", - /* 113 */ "cmd ::= CREATE TABLE multi_create_clause", - /* 114 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options", - /* 115 */ "cmd ::= DROP TABLE multi_drop_clause", - /* 116 */ "cmd ::= DROP STABLE exists_opt full_table_name", - /* 117 */ "cmd ::= ALTER TABLE alter_table_clause", - /* 118 */ "cmd ::= ALTER STABLE alter_table_clause", - /* 119 */ "alter_table_clause ::= full_table_name alter_table_options", - /* 120 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name", - /* 121 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name", - /* 122 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name", - /* 123 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name", - /* 124 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name", - /* 125 */ "alter_table_clause ::= full_table_name DROP TAG column_name", - /* 126 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name", - /* 127 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name", - /* 128 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal", - /* 129 */ "multi_create_clause ::= create_subtable_clause", - /* 130 */ "multi_create_clause ::= multi_create_clause create_subtable_clause", - /* 131 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options", - /* 132 */ "multi_drop_clause ::= drop_table_clause", - /* 133 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause", - /* 134 */ "drop_table_clause ::= exists_opt full_table_name", - /* 135 */ "specific_cols_opt ::=", - /* 136 */ "specific_cols_opt ::= NK_LP col_name_list NK_RP", - /* 137 */ "full_table_name ::= table_name", - /* 138 */ "full_table_name ::= db_name NK_DOT table_name", - /* 139 */ "column_def_list ::= column_def", - /* 140 */ "column_def_list ::= column_def_list NK_COMMA column_def", - /* 141 */ "column_def ::= column_name type_name", - /* 142 */ "column_def ::= column_name type_name COMMENT NK_STRING", - /* 143 */ "type_name ::= BOOL", - /* 144 */ "type_name ::= TINYINT", - /* 145 */ "type_name ::= SMALLINT", - /* 146 */ "type_name ::= INT", - /* 147 */ "type_name ::= INTEGER", - /* 148 */ "type_name ::= BIGINT", - /* 149 */ "type_name ::= FLOAT", - /* 150 */ "type_name ::= DOUBLE", - /* 151 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP", - /* 152 */ "type_name ::= TIMESTAMP", - /* 153 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP", - /* 154 */ "type_name ::= TINYINT UNSIGNED", - /* 155 */ "type_name ::= SMALLINT UNSIGNED", - /* 156 */ "type_name ::= INT UNSIGNED", - /* 157 */ "type_name ::= BIGINT UNSIGNED", - /* 158 */ "type_name ::= JSON", - /* 159 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP", - /* 160 */ "type_name ::= MEDIUMBLOB", - /* 161 */ "type_name ::= BLOB", - /* 162 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP", - /* 163 */ "type_name ::= DECIMAL", - /* 164 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP", - /* 165 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP", - /* 166 */ "tags_def_opt ::=", - /* 167 */ "tags_def_opt ::= tags_def", - /* 168 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP", - /* 169 */ "table_options ::=", - /* 170 */ "table_options ::= table_options COMMENT NK_STRING", - /* 171 */ "table_options ::= table_options MAX_DELAY duration_list", - /* 172 */ "table_options ::= table_options WATERMARK duration_list", - /* 173 */ "table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP", - /* 174 */ "table_options ::= table_options TTL NK_INTEGER", - /* 175 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP", - /* 176 */ "alter_table_options ::= alter_table_option", - /* 177 */ "alter_table_options ::= alter_table_options alter_table_option", - /* 178 */ "alter_table_option ::= COMMENT NK_STRING", - /* 179 */ "alter_table_option ::= TTL NK_INTEGER", - /* 180 */ "duration_list ::= duration_literal", - /* 181 */ "duration_list ::= duration_list NK_COMMA duration_literal", - /* 182 */ "rollup_func_list ::= rollup_func_name", - /* 183 */ "rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name", - /* 184 */ "rollup_func_name ::= function_name", - /* 185 */ "rollup_func_name ::= FIRST", - /* 186 */ "rollup_func_name ::= LAST", - /* 187 */ "col_name_list ::= col_name", - /* 188 */ "col_name_list ::= col_name_list NK_COMMA col_name", - /* 189 */ "col_name ::= column_name", - /* 190 */ "cmd ::= SHOW DNODES", - /* 191 */ "cmd ::= SHOW USERS", - /* 192 */ "cmd ::= SHOW DATABASES", - /* 193 */ "cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt", - /* 194 */ "cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt", - /* 195 */ "cmd ::= SHOW db_name_cond_opt VGROUPS", - /* 196 */ "cmd ::= SHOW MNODES", - /* 197 */ "cmd ::= SHOW MODULES", - /* 198 */ "cmd ::= SHOW QNODES", - /* 199 */ "cmd ::= SHOW FUNCTIONS", - /* 200 */ "cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt", - /* 201 */ "cmd ::= SHOW STREAMS", - /* 202 */ "cmd ::= SHOW ACCOUNTS", - /* 203 */ "cmd ::= SHOW APPS", - /* 204 */ "cmd ::= SHOW CONNECTIONS", - /* 205 */ "cmd ::= SHOW LICENCE", - /* 206 */ "cmd ::= SHOW GRANTS", - /* 207 */ "cmd ::= SHOW CREATE DATABASE db_name", - /* 208 */ "cmd ::= SHOW CREATE TABLE full_table_name", - /* 209 */ "cmd ::= SHOW CREATE STABLE full_table_name", - /* 210 */ "cmd ::= SHOW QUERIES", - /* 211 */ "cmd ::= SHOW SCORES", - /* 212 */ "cmd ::= SHOW TOPICS", - /* 213 */ "cmd ::= SHOW VARIABLES", - /* 214 */ "cmd ::= SHOW LOCAL VARIABLES", - /* 215 */ "cmd ::= SHOW DNODE NK_INTEGER VARIABLES", - /* 216 */ "cmd ::= SHOW BNODES", - /* 217 */ "cmd ::= SHOW SNODES", - /* 218 */ "cmd ::= SHOW CLUSTER", - /* 219 */ "cmd ::= SHOW TRANSACTIONS", - /* 220 */ "cmd ::= SHOW TABLE DISTRIBUTED full_table_name", - /* 221 */ "cmd ::= SHOW CONSUMERS", - /* 222 */ "cmd ::= SHOW SUBSCRIPTIONS", - /* 223 */ "db_name_cond_opt ::=", - /* 224 */ "db_name_cond_opt ::= db_name NK_DOT", - /* 225 */ "like_pattern_opt ::=", - /* 226 */ "like_pattern_opt ::= LIKE NK_STRING", - /* 227 */ "table_name_cond ::= table_name", - /* 228 */ "from_db_opt ::=", - /* 229 */ "from_db_opt ::= FROM db_name", - /* 230 */ "cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options", - /* 231 */ "cmd ::= DROP INDEX exists_opt index_name", - /* 232 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt", - /* 233 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt", - /* 234 */ "func_list ::= func", - /* 235 */ "func_list ::= func_list NK_COMMA func", - /* 236 */ "func ::= function_name NK_LP expression_list NK_RP", - /* 237 */ "sma_stream_opt ::=", - /* 238 */ "sma_stream_opt ::= stream_options WATERMARK duration_literal", - /* 239 */ "sma_stream_opt ::= stream_options MAX_DELAY duration_literal", - /* 240 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression", - /* 241 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name", - /* 242 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name", - /* 243 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name", - /* 244 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name", - /* 245 */ "cmd ::= DROP TOPIC exists_opt topic_name", - /* 246 */ "cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name", - /* 247 */ "cmd ::= DESC full_table_name", - /* 248 */ "cmd ::= DESCRIBE full_table_name", - /* 249 */ "cmd ::= RESET QUERY CACHE", - /* 250 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression", - /* 251 */ "analyze_opt ::=", - /* 252 */ "analyze_opt ::= ANALYZE", - /* 253 */ "explain_options ::=", - /* 254 */ "explain_options ::= explain_options VERBOSE NK_BOOL", - /* 255 */ "explain_options ::= explain_options RATIO NK_FLOAT", - /* 256 */ "cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP", - /* 257 */ "cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt", - /* 258 */ "cmd ::= DROP FUNCTION exists_opt function_name", - /* 259 */ "agg_func_opt ::=", - /* 260 */ "agg_func_opt ::= AGGREGATE", - /* 261 */ "bufsize_opt ::=", - /* 262 */ "bufsize_opt ::= BUFSIZE NK_INTEGER", - /* 263 */ "cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression", - /* 264 */ "cmd ::= DROP STREAM exists_opt stream_name", - /* 265 */ "into_opt ::=", - /* 266 */ "into_opt ::= INTO full_table_name", - /* 267 */ "stream_options ::=", - /* 268 */ "stream_options ::= stream_options TRIGGER AT_ONCE", - /* 269 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE", - /* 270 */ "stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal", - /* 271 */ "stream_options ::= stream_options WATERMARK duration_literal", - /* 272 */ "stream_options ::= stream_options IGNORE EXPIRED", - /* 273 */ "cmd ::= KILL CONNECTION NK_INTEGER", - /* 274 */ "cmd ::= KILL QUERY NK_STRING", - /* 275 */ "cmd ::= KILL TRANSACTION NK_INTEGER", - /* 276 */ "cmd ::= BALANCE VGROUP", - /* 277 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER", - /* 278 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list", - /* 279 */ "cmd ::= SPLIT VGROUP NK_INTEGER", - /* 280 */ "dnode_list ::= DNODE NK_INTEGER", - /* 281 */ "dnode_list ::= dnode_list DNODE NK_INTEGER", - /* 282 */ "cmd ::= SYNCDB db_name REPLICA", - /* 283 */ "cmd ::= DELETE FROM full_table_name where_clause_opt", - /* 284 */ "cmd ::= query_expression", - /* 285 */ "cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression", - /* 286 */ "literal ::= NK_INTEGER", - /* 287 */ "literal ::= NK_FLOAT", - /* 288 */ "literal ::= NK_STRING", - /* 289 */ "literal ::= NK_BOOL", - /* 290 */ "literal ::= TIMESTAMP NK_STRING", - /* 291 */ "literal ::= duration_literal", - /* 292 */ "literal ::= NULL", - /* 293 */ "literal ::= NK_QUESTION", - /* 294 */ "duration_literal ::= NK_VARIABLE", - /* 295 */ "signed ::= NK_INTEGER", - /* 296 */ "signed ::= NK_PLUS NK_INTEGER", - /* 297 */ "signed ::= NK_MINUS NK_INTEGER", - /* 298 */ "signed ::= NK_FLOAT", - /* 299 */ "signed ::= NK_PLUS NK_FLOAT", - /* 300 */ "signed ::= NK_MINUS NK_FLOAT", - /* 301 */ "signed_literal ::= signed", - /* 302 */ "signed_literal ::= NK_STRING", - /* 303 */ "signed_literal ::= NK_BOOL", - /* 304 */ "signed_literal ::= TIMESTAMP NK_STRING", - /* 305 */ "signed_literal ::= duration_literal", - /* 306 */ "signed_literal ::= NULL", - /* 307 */ "signed_literal ::= literal_func", - /* 308 */ "literal_list ::= signed_literal", - /* 309 */ "literal_list ::= literal_list NK_COMMA signed_literal", - /* 310 */ "db_name ::= NK_ID", - /* 311 */ "table_name ::= NK_ID", - /* 312 */ "column_name ::= NK_ID", - /* 313 */ "function_name ::= NK_ID", - /* 314 */ "table_alias ::= NK_ID", - /* 315 */ "column_alias ::= NK_ID", - /* 316 */ "user_name ::= NK_ID", - /* 317 */ "index_name ::= NK_ID", - /* 318 */ "topic_name ::= NK_ID", - /* 319 */ "stream_name ::= NK_ID", - /* 320 */ "cgroup_name ::= NK_ID", - /* 321 */ "expression ::= literal", - /* 322 */ "expression ::= pseudo_column", - /* 323 */ "expression ::= column_reference", - /* 324 */ "expression ::= function_expression", - /* 325 */ "expression ::= subquery", - /* 326 */ "expression ::= NK_LP expression NK_RP", - /* 327 */ "expression ::= NK_PLUS expression", - /* 328 */ "expression ::= NK_MINUS expression", - /* 329 */ "expression ::= expression NK_PLUS expression", - /* 330 */ "expression ::= expression NK_MINUS expression", - /* 331 */ "expression ::= expression NK_STAR expression", - /* 332 */ "expression ::= expression NK_SLASH expression", - /* 333 */ "expression ::= expression NK_REM expression", - /* 334 */ "expression ::= column_reference NK_ARROW NK_STRING", - /* 335 */ "expression ::= expression NK_BITAND expression", - /* 336 */ "expression ::= expression NK_BITOR expression", - /* 337 */ "expression_list ::= expression", - /* 338 */ "expression_list ::= expression_list NK_COMMA expression", - /* 339 */ "column_reference ::= column_name", - /* 340 */ "column_reference ::= table_name NK_DOT column_name", - /* 341 */ "pseudo_column ::= ROWTS", - /* 342 */ "pseudo_column ::= TBNAME", - /* 343 */ "pseudo_column ::= table_name NK_DOT TBNAME", - /* 344 */ "pseudo_column ::= QSTARTTS", - /* 345 */ "pseudo_column ::= QENDTS", - /* 346 */ "pseudo_column ::= WSTARTTS", - /* 347 */ "pseudo_column ::= WENDTS", - /* 348 */ "pseudo_column ::= WDURATION", - /* 349 */ "function_expression ::= function_name NK_LP expression_list NK_RP", - /* 350 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP", - /* 351 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP", - /* 352 */ "function_expression ::= literal_func", - /* 353 */ "literal_func ::= noarg_func NK_LP NK_RP", - /* 354 */ "literal_func ::= NOW", - /* 355 */ "noarg_func ::= NOW", - /* 356 */ "noarg_func ::= TODAY", - /* 357 */ "noarg_func ::= TIMEZONE", - /* 358 */ "noarg_func ::= DATABASE", - /* 359 */ "noarg_func ::= CLIENT_VERSION", - /* 360 */ "noarg_func ::= SERVER_VERSION", - /* 361 */ "noarg_func ::= SERVER_STATUS", - /* 362 */ "noarg_func ::= CURRENT_USER", - /* 363 */ "noarg_func ::= USER", - /* 364 */ "star_func ::= COUNT", - /* 365 */ "star_func ::= FIRST", - /* 366 */ "star_func ::= LAST", - /* 367 */ "star_func ::= LAST_ROW", - /* 368 */ "star_func_para_list ::= NK_STAR", - /* 369 */ "star_func_para_list ::= other_para_list", - /* 370 */ "other_para_list ::= star_func_para", - /* 371 */ "other_para_list ::= other_para_list NK_COMMA star_func_para", - /* 372 */ "star_func_para ::= expression", - /* 373 */ "star_func_para ::= table_name NK_DOT NK_STAR", - /* 374 */ "predicate ::= expression compare_op expression", - /* 375 */ "predicate ::= expression BETWEEN expression AND expression", - /* 376 */ "predicate ::= expression NOT BETWEEN expression AND expression", - /* 377 */ "predicate ::= expression IS NULL", - /* 378 */ "predicate ::= expression IS NOT NULL", - /* 379 */ "predicate ::= expression in_op in_predicate_value", - /* 380 */ "compare_op ::= NK_LT", - /* 381 */ "compare_op ::= NK_GT", - /* 382 */ "compare_op ::= NK_LE", - /* 383 */ "compare_op ::= NK_GE", - /* 384 */ "compare_op ::= NK_NE", - /* 385 */ "compare_op ::= NK_EQ", - /* 386 */ "compare_op ::= LIKE", - /* 387 */ "compare_op ::= NOT LIKE", - /* 388 */ "compare_op ::= MATCH", - /* 389 */ "compare_op ::= NMATCH", - /* 390 */ "compare_op ::= CONTAINS", - /* 391 */ "in_op ::= IN", - /* 392 */ "in_op ::= NOT IN", - /* 393 */ "in_predicate_value ::= NK_LP literal_list NK_RP", - /* 394 */ "boolean_value_expression ::= boolean_primary", - /* 395 */ "boolean_value_expression ::= NOT boolean_primary", - /* 396 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", - /* 397 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression", - /* 398 */ "boolean_primary ::= predicate", - /* 399 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP", - /* 400 */ "common_expression ::= expression", - /* 401 */ "common_expression ::= boolean_value_expression", - /* 402 */ "from_clause_opt ::=", - /* 403 */ "from_clause_opt ::= FROM table_reference_list", - /* 404 */ "table_reference_list ::= table_reference", - /* 405 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference", - /* 406 */ "table_reference ::= table_primary", - /* 407 */ "table_reference ::= joined_table", - /* 408 */ "table_primary ::= table_name alias_opt", - /* 409 */ "table_primary ::= db_name NK_DOT table_name alias_opt", - /* 410 */ "table_primary ::= subquery alias_opt", - /* 411 */ "table_primary ::= parenthesized_joined_table", - /* 412 */ "alias_opt ::=", - /* 413 */ "alias_opt ::= table_alias", - /* 414 */ "alias_opt ::= AS table_alias", - /* 415 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP", - /* 416 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP", - /* 417 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition", - /* 418 */ "join_type ::=", - /* 419 */ "join_type ::= INNER", - /* 420 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt", - /* 421 */ "set_quantifier_opt ::=", - /* 422 */ "set_quantifier_opt ::= DISTINCT", - /* 423 */ "set_quantifier_opt ::= ALL", - /* 424 */ "select_list ::= select_item", - /* 425 */ "select_list ::= select_list NK_COMMA select_item", - /* 426 */ "select_item ::= NK_STAR", - /* 427 */ "select_item ::= common_expression", - /* 428 */ "select_item ::= common_expression column_alias", - /* 429 */ "select_item ::= common_expression AS column_alias", - /* 430 */ "select_item ::= table_name NK_DOT NK_STAR", - /* 431 */ "where_clause_opt ::=", - /* 432 */ "where_clause_opt ::= WHERE search_condition", - /* 433 */ "partition_by_clause_opt ::=", - /* 434 */ "partition_by_clause_opt ::= PARTITION BY expression_list", - /* 435 */ "twindow_clause_opt ::=", - /* 436 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP", - /* 437 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP", - /* 438 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt", - /* 439 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt", - /* 440 */ "sliding_opt ::=", - /* 441 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP", - /* 442 */ "fill_opt ::=", - /* 443 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP", - /* 444 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP", - /* 445 */ "fill_mode ::= NONE", - /* 446 */ "fill_mode ::= PREV", - /* 447 */ "fill_mode ::= NULL", - /* 448 */ "fill_mode ::= LINEAR", - /* 449 */ "fill_mode ::= NEXT", - /* 450 */ "group_by_clause_opt ::=", - /* 451 */ "group_by_clause_opt ::= GROUP BY group_by_list", - /* 452 */ "group_by_list ::= expression", - /* 453 */ "group_by_list ::= group_by_list NK_COMMA expression", - /* 454 */ "having_clause_opt ::=", - /* 455 */ "having_clause_opt ::= HAVING search_condition", - /* 456 */ "range_opt ::=", - /* 457 */ "range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP", - /* 458 */ "every_opt ::=", - /* 459 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP", - /* 460 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt", - /* 461 */ "query_expression_body ::= query_primary", - /* 462 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body", - /* 463 */ "query_expression_body ::= query_expression_body UNION query_expression_body", - /* 464 */ "query_primary ::= query_specification", - /* 465 */ "query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP", - /* 466 */ "order_by_clause_opt ::=", - /* 467 */ "order_by_clause_opt ::= ORDER BY sort_specification_list", - /* 468 */ "slimit_clause_opt ::=", - /* 469 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER", - /* 470 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER", - /* 471 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER", - /* 472 */ "limit_clause_opt ::=", - /* 473 */ "limit_clause_opt ::= LIMIT NK_INTEGER", - /* 474 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER", - /* 475 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER", - /* 476 */ "subquery ::= NK_LP query_expression NK_RP", - /* 477 */ "search_condition ::= common_expression", - /* 478 */ "sort_specification_list ::= sort_specification", - /* 479 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification", - /* 480 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt", - /* 481 */ "ordering_specification_opt ::=", - /* 482 */ "ordering_specification_opt ::= ASC", - /* 483 */ "ordering_specification_opt ::= DESC", - /* 484 */ "null_ordering_opt ::=", - /* 485 */ "null_ordering_opt ::= NULLS FIRST", - /* 486 */ "null_ordering_opt ::= NULLS LAST", + /* 67 */ "cmd ::= TRIM DATABASE db_name", + /* 68 */ "not_exists_opt ::= IF NOT EXISTS", + /* 69 */ "not_exists_opt ::=", + /* 70 */ "exists_opt ::= IF EXISTS", + /* 71 */ "exists_opt ::=", + /* 72 */ "db_options ::=", + /* 73 */ "db_options ::= db_options BUFFER NK_INTEGER", + /* 74 */ "db_options ::= db_options CACHELAST NK_INTEGER", + /* 75 */ "db_options ::= db_options CACHELASTSIZE NK_INTEGER", + /* 76 */ "db_options ::= db_options COMP NK_INTEGER", + /* 77 */ "db_options ::= db_options DURATION NK_INTEGER", + /* 78 */ "db_options ::= db_options DURATION NK_VARIABLE", + /* 79 */ "db_options ::= db_options FSYNC NK_INTEGER", + /* 80 */ "db_options ::= db_options MAXROWS NK_INTEGER", + /* 81 */ "db_options ::= db_options MINROWS NK_INTEGER", + /* 82 */ "db_options ::= db_options KEEP integer_list", + /* 83 */ "db_options ::= db_options KEEP variable_list", + /* 84 */ "db_options ::= db_options PAGES NK_INTEGER", + /* 85 */ "db_options ::= db_options PAGESIZE NK_INTEGER", + /* 86 */ "db_options ::= db_options PRECISION NK_STRING", + /* 87 */ "db_options ::= db_options REPLICA NK_INTEGER", + /* 88 */ "db_options ::= db_options STRICT NK_INTEGER", + /* 89 */ "db_options ::= db_options WAL NK_INTEGER", + /* 90 */ "db_options ::= db_options VGROUPS NK_INTEGER", + /* 91 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER", + /* 92 */ "db_options ::= db_options RETENTIONS retention_list", + /* 93 */ "db_options ::= db_options SCHEMALESS NK_INTEGER", + /* 94 */ "alter_db_options ::= alter_db_option", + /* 95 */ "alter_db_options ::= alter_db_options alter_db_option", + /* 96 */ "alter_db_option ::= BUFFER NK_INTEGER", + /* 97 */ "alter_db_option ::= CACHELAST NK_INTEGER", + /* 98 */ "alter_db_option ::= CACHELASTSIZE NK_INTEGER", + /* 99 */ "alter_db_option ::= FSYNC NK_INTEGER", + /* 100 */ "alter_db_option ::= KEEP integer_list", + /* 101 */ "alter_db_option ::= KEEP variable_list", + /* 102 */ "alter_db_option ::= PAGES NK_INTEGER", + /* 103 */ "alter_db_option ::= REPLICA NK_INTEGER", + /* 104 */ "alter_db_option ::= STRICT NK_INTEGER", + /* 105 */ "alter_db_option ::= WAL NK_INTEGER", + /* 106 */ "integer_list ::= NK_INTEGER", + /* 107 */ "integer_list ::= integer_list NK_COMMA NK_INTEGER", + /* 108 */ "variable_list ::= NK_VARIABLE", + /* 109 */ "variable_list ::= variable_list NK_COMMA NK_VARIABLE", + /* 110 */ "retention_list ::= retention", + /* 111 */ "retention_list ::= retention_list NK_COMMA retention", + /* 112 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE", + /* 113 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options", + /* 114 */ "cmd ::= CREATE TABLE multi_create_clause", + /* 115 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options", + /* 116 */ "cmd ::= DROP TABLE multi_drop_clause", + /* 117 */ "cmd ::= DROP STABLE exists_opt full_table_name", + /* 118 */ "cmd ::= ALTER TABLE alter_table_clause", + /* 119 */ "cmd ::= ALTER STABLE alter_table_clause", + /* 120 */ "alter_table_clause ::= full_table_name alter_table_options", + /* 121 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name", + /* 122 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name", + /* 123 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name", + /* 124 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name", + /* 125 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name", + /* 126 */ "alter_table_clause ::= full_table_name DROP TAG column_name", + /* 127 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name", + /* 128 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name", + /* 129 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal", + /* 130 */ "multi_create_clause ::= create_subtable_clause", + /* 131 */ "multi_create_clause ::= multi_create_clause create_subtable_clause", + /* 132 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options", + /* 133 */ "multi_drop_clause ::= drop_table_clause", + /* 134 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause", + /* 135 */ "drop_table_clause ::= exists_opt full_table_name", + /* 136 */ "specific_cols_opt ::=", + /* 137 */ "specific_cols_opt ::= NK_LP col_name_list NK_RP", + /* 138 */ "full_table_name ::= table_name", + /* 139 */ "full_table_name ::= db_name NK_DOT table_name", + /* 140 */ "column_def_list ::= column_def", + /* 141 */ "column_def_list ::= column_def_list NK_COMMA column_def", + /* 142 */ "column_def ::= column_name type_name", + /* 143 */ "column_def ::= column_name type_name COMMENT NK_STRING", + /* 144 */ "type_name ::= BOOL", + /* 145 */ "type_name ::= TINYINT", + /* 146 */ "type_name ::= SMALLINT", + /* 147 */ "type_name ::= INT", + /* 148 */ "type_name ::= INTEGER", + /* 149 */ "type_name ::= BIGINT", + /* 150 */ "type_name ::= FLOAT", + /* 151 */ "type_name ::= DOUBLE", + /* 152 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP", + /* 153 */ "type_name ::= TIMESTAMP", + /* 154 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP", + /* 155 */ "type_name ::= TINYINT UNSIGNED", + /* 156 */ "type_name ::= SMALLINT UNSIGNED", + /* 157 */ "type_name ::= INT UNSIGNED", + /* 158 */ "type_name ::= BIGINT UNSIGNED", + /* 159 */ "type_name ::= JSON", + /* 160 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP", + /* 161 */ "type_name ::= MEDIUMBLOB", + /* 162 */ "type_name ::= BLOB", + /* 163 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP", + /* 164 */ "type_name ::= DECIMAL", + /* 165 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP", + /* 166 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP", + /* 167 */ "tags_def_opt ::=", + /* 168 */ "tags_def_opt ::= tags_def", + /* 169 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP", + /* 170 */ "table_options ::=", + /* 171 */ "table_options ::= table_options COMMENT NK_STRING", + /* 172 */ "table_options ::= table_options MAX_DELAY duration_list", + /* 173 */ "table_options ::= table_options WATERMARK duration_list", + /* 174 */ "table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP", + /* 175 */ "table_options ::= table_options TTL NK_INTEGER", + /* 176 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP", + /* 177 */ "alter_table_options ::= alter_table_option", + /* 178 */ "alter_table_options ::= alter_table_options alter_table_option", + /* 179 */ "alter_table_option ::= COMMENT NK_STRING", + /* 180 */ "alter_table_option ::= TTL NK_INTEGER", + /* 181 */ "duration_list ::= duration_literal", + /* 182 */ "duration_list ::= duration_list NK_COMMA duration_literal", + /* 183 */ "rollup_func_list ::= rollup_func_name", + /* 184 */ "rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name", + /* 185 */ "rollup_func_name ::= function_name", + /* 186 */ "rollup_func_name ::= FIRST", + /* 187 */ "rollup_func_name ::= LAST", + /* 188 */ "col_name_list ::= col_name", + /* 189 */ "col_name_list ::= col_name_list NK_COMMA col_name", + /* 190 */ "col_name ::= column_name", + /* 191 */ "cmd ::= SHOW DNODES", + /* 192 */ "cmd ::= SHOW USERS", + /* 193 */ "cmd ::= SHOW DATABASES", + /* 194 */ "cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt", + /* 195 */ "cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt", + /* 196 */ "cmd ::= SHOW db_name_cond_opt VGROUPS", + /* 197 */ "cmd ::= SHOW MNODES", + /* 198 */ "cmd ::= SHOW MODULES", + /* 199 */ "cmd ::= SHOW QNODES", + /* 200 */ "cmd ::= SHOW FUNCTIONS", + /* 201 */ "cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt", + /* 202 */ "cmd ::= SHOW STREAMS", + /* 203 */ "cmd ::= SHOW ACCOUNTS", + /* 204 */ "cmd ::= SHOW APPS", + /* 205 */ "cmd ::= SHOW CONNECTIONS", + /* 206 */ "cmd ::= SHOW LICENCE", + /* 207 */ "cmd ::= SHOW GRANTS", + /* 208 */ "cmd ::= SHOW CREATE DATABASE db_name", + /* 209 */ "cmd ::= SHOW CREATE TABLE full_table_name", + /* 210 */ "cmd ::= SHOW CREATE STABLE full_table_name", + /* 211 */ "cmd ::= SHOW QUERIES", + /* 212 */ "cmd ::= SHOW SCORES", + /* 213 */ "cmd ::= SHOW TOPICS", + /* 214 */ "cmd ::= SHOW VARIABLES", + /* 215 */ "cmd ::= SHOW LOCAL VARIABLES", + /* 216 */ "cmd ::= SHOW DNODE NK_INTEGER VARIABLES", + /* 217 */ "cmd ::= SHOW BNODES", + /* 218 */ "cmd ::= SHOW SNODES", + /* 219 */ "cmd ::= SHOW CLUSTER", + /* 220 */ "cmd ::= SHOW TRANSACTIONS", + /* 221 */ "cmd ::= SHOW TABLE DISTRIBUTED full_table_name", + /* 222 */ "cmd ::= SHOW CONSUMERS", + /* 223 */ "cmd ::= SHOW SUBSCRIPTIONS", + /* 224 */ "db_name_cond_opt ::=", + /* 225 */ "db_name_cond_opt ::= db_name NK_DOT", + /* 226 */ "like_pattern_opt ::=", + /* 227 */ "like_pattern_opt ::= LIKE NK_STRING", + /* 228 */ "table_name_cond ::= table_name", + /* 229 */ "from_db_opt ::=", + /* 230 */ "from_db_opt ::= FROM db_name", + /* 231 */ "cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options", + /* 232 */ "cmd ::= DROP INDEX exists_opt index_name", + /* 233 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt", + /* 234 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt", + /* 235 */ "func_list ::= func", + /* 236 */ "func_list ::= func_list NK_COMMA func", + /* 237 */ "func ::= function_name NK_LP expression_list NK_RP", + /* 238 */ "sma_stream_opt ::=", + /* 239 */ "sma_stream_opt ::= stream_options WATERMARK duration_literal", + /* 240 */ "sma_stream_opt ::= stream_options MAX_DELAY duration_literal", + /* 241 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression", + /* 242 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name", + /* 243 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name", + /* 244 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name", + /* 245 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name", + /* 246 */ "cmd ::= DROP TOPIC exists_opt topic_name", + /* 247 */ "cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name", + /* 248 */ "cmd ::= DESC full_table_name", + /* 249 */ "cmd ::= DESCRIBE full_table_name", + /* 250 */ "cmd ::= RESET QUERY CACHE", + /* 251 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression", + /* 252 */ "analyze_opt ::=", + /* 253 */ "analyze_opt ::= ANALYZE", + /* 254 */ "explain_options ::=", + /* 255 */ "explain_options ::= explain_options VERBOSE NK_BOOL", + /* 256 */ "explain_options ::= explain_options RATIO NK_FLOAT", + /* 257 */ "cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP", + /* 258 */ "cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt", + /* 259 */ "cmd ::= DROP FUNCTION exists_opt function_name", + /* 260 */ "agg_func_opt ::=", + /* 261 */ "agg_func_opt ::= AGGREGATE", + /* 262 */ "bufsize_opt ::=", + /* 263 */ "bufsize_opt ::= BUFSIZE NK_INTEGER", + /* 264 */ "cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression", + /* 265 */ "cmd ::= DROP STREAM exists_opt stream_name", + /* 266 */ "into_opt ::=", + /* 267 */ "into_opt ::= INTO full_table_name", + /* 268 */ "stream_options ::=", + /* 269 */ "stream_options ::= stream_options TRIGGER AT_ONCE", + /* 270 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE", + /* 271 */ "stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal", + /* 272 */ "stream_options ::= stream_options WATERMARK duration_literal", + /* 273 */ "stream_options ::= stream_options IGNORE EXPIRED", + /* 274 */ "cmd ::= KILL CONNECTION NK_INTEGER", + /* 275 */ "cmd ::= KILL QUERY NK_STRING", + /* 276 */ "cmd ::= KILL TRANSACTION NK_INTEGER", + /* 277 */ "cmd ::= BALANCE VGROUP", + /* 278 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER", + /* 279 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list", + /* 280 */ "cmd ::= SPLIT VGROUP NK_INTEGER", + /* 281 */ "dnode_list ::= DNODE NK_INTEGER", + /* 282 */ "dnode_list ::= dnode_list DNODE NK_INTEGER", + /* 283 */ "cmd ::= SYNCDB db_name REPLICA", + /* 284 */ "cmd ::= DELETE FROM full_table_name where_clause_opt", + /* 285 */ "cmd ::= query_expression", + /* 286 */ "cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression", + /* 287 */ "literal ::= NK_INTEGER", + /* 288 */ "literal ::= NK_FLOAT", + /* 289 */ "literal ::= NK_STRING", + /* 290 */ "literal ::= NK_BOOL", + /* 291 */ "literal ::= TIMESTAMP NK_STRING", + /* 292 */ "literal ::= duration_literal", + /* 293 */ "literal ::= NULL", + /* 294 */ "literal ::= NK_QUESTION", + /* 295 */ "duration_literal ::= NK_VARIABLE", + /* 296 */ "signed ::= NK_INTEGER", + /* 297 */ "signed ::= NK_PLUS NK_INTEGER", + /* 298 */ "signed ::= NK_MINUS NK_INTEGER", + /* 299 */ "signed ::= NK_FLOAT", + /* 300 */ "signed ::= NK_PLUS NK_FLOAT", + /* 301 */ "signed ::= NK_MINUS NK_FLOAT", + /* 302 */ "signed_literal ::= signed", + /* 303 */ "signed_literal ::= NK_STRING", + /* 304 */ "signed_literal ::= NK_BOOL", + /* 305 */ "signed_literal ::= TIMESTAMP NK_STRING", + /* 306 */ "signed_literal ::= duration_literal", + /* 307 */ "signed_literal ::= NULL", + /* 308 */ "signed_literal ::= literal_func", + /* 309 */ "literal_list ::= signed_literal", + /* 310 */ "literal_list ::= literal_list NK_COMMA signed_literal", + /* 311 */ "db_name ::= NK_ID", + /* 312 */ "table_name ::= NK_ID", + /* 313 */ "column_name ::= NK_ID", + /* 314 */ "function_name ::= NK_ID", + /* 315 */ "table_alias ::= NK_ID", + /* 316 */ "column_alias ::= NK_ID", + /* 317 */ "user_name ::= NK_ID", + /* 318 */ "index_name ::= NK_ID", + /* 319 */ "topic_name ::= NK_ID", + /* 320 */ "stream_name ::= NK_ID", + /* 321 */ "cgroup_name ::= NK_ID", + /* 322 */ "expression ::= literal", + /* 323 */ "expression ::= pseudo_column", + /* 324 */ "expression ::= column_reference", + /* 325 */ "expression ::= function_expression", + /* 326 */ "expression ::= subquery", + /* 327 */ "expression ::= NK_LP expression NK_RP", + /* 328 */ "expression ::= NK_PLUS expression", + /* 329 */ "expression ::= NK_MINUS expression", + /* 330 */ "expression ::= expression NK_PLUS expression", + /* 331 */ "expression ::= expression NK_MINUS expression", + /* 332 */ "expression ::= expression NK_STAR expression", + /* 333 */ "expression ::= expression NK_SLASH expression", + /* 334 */ "expression ::= expression NK_REM expression", + /* 335 */ "expression ::= column_reference NK_ARROW NK_STRING", + /* 336 */ "expression ::= expression NK_BITAND expression", + /* 337 */ "expression ::= expression NK_BITOR expression", + /* 338 */ "expression_list ::= expression", + /* 339 */ "expression_list ::= expression_list NK_COMMA expression", + /* 340 */ "column_reference ::= column_name", + /* 341 */ "column_reference ::= table_name NK_DOT column_name", + /* 342 */ "pseudo_column ::= ROWTS", + /* 343 */ "pseudo_column ::= TBNAME", + /* 344 */ "pseudo_column ::= table_name NK_DOT TBNAME", + /* 345 */ "pseudo_column ::= QSTARTTS", + /* 346 */ "pseudo_column ::= QENDTS", + /* 347 */ "pseudo_column ::= WSTARTTS", + /* 348 */ "pseudo_column ::= WENDTS", + /* 349 */ "pseudo_column ::= WDURATION", + /* 350 */ "function_expression ::= function_name NK_LP expression_list NK_RP", + /* 351 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP", + /* 352 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP", + /* 353 */ "function_expression ::= literal_func", + /* 354 */ "literal_func ::= noarg_func NK_LP NK_RP", + /* 355 */ "literal_func ::= NOW", + /* 356 */ "noarg_func ::= NOW", + /* 357 */ "noarg_func ::= TODAY", + /* 358 */ "noarg_func ::= TIMEZONE", + /* 359 */ "noarg_func ::= DATABASE", + /* 360 */ "noarg_func ::= CLIENT_VERSION", + /* 361 */ "noarg_func ::= SERVER_VERSION", + /* 362 */ "noarg_func ::= SERVER_STATUS", + /* 363 */ "noarg_func ::= CURRENT_USER", + /* 364 */ "noarg_func ::= USER", + /* 365 */ "star_func ::= COUNT", + /* 366 */ "star_func ::= FIRST", + /* 367 */ "star_func ::= LAST", + /* 368 */ "star_func ::= LAST_ROW", + /* 369 */ "star_func_para_list ::= NK_STAR", + /* 370 */ "star_func_para_list ::= other_para_list", + /* 371 */ "other_para_list ::= star_func_para", + /* 372 */ "other_para_list ::= other_para_list NK_COMMA star_func_para", + /* 373 */ "star_func_para ::= expression", + /* 374 */ "star_func_para ::= table_name NK_DOT NK_STAR", + /* 375 */ "predicate ::= expression compare_op expression", + /* 376 */ "predicate ::= expression BETWEEN expression AND expression", + /* 377 */ "predicate ::= expression NOT BETWEEN expression AND expression", + /* 378 */ "predicate ::= expression IS NULL", + /* 379 */ "predicate ::= expression IS NOT NULL", + /* 380 */ "predicate ::= expression in_op in_predicate_value", + /* 381 */ "compare_op ::= NK_LT", + /* 382 */ "compare_op ::= NK_GT", + /* 383 */ "compare_op ::= NK_LE", + /* 384 */ "compare_op ::= NK_GE", + /* 385 */ "compare_op ::= NK_NE", + /* 386 */ "compare_op ::= NK_EQ", + /* 387 */ "compare_op ::= LIKE", + /* 388 */ "compare_op ::= NOT LIKE", + /* 389 */ "compare_op ::= MATCH", + /* 390 */ "compare_op ::= NMATCH", + /* 391 */ "compare_op ::= CONTAINS", + /* 392 */ "in_op ::= IN", + /* 393 */ "in_op ::= NOT IN", + /* 394 */ "in_predicate_value ::= NK_LP literal_list NK_RP", + /* 395 */ "boolean_value_expression ::= boolean_primary", + /* 396 */ "boolean_value_expression ::= NOT boolean_primary", + /* 397 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", + /* 398 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression", + /* 399 */ "boolean_primary ::= predicate", + /* 400 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP", + /* 401 */ "common_expression ::= expression", + /* 402 */ "common_expression ::= boolean_value_expression", + /* 403 */ "from_clause_opt ::=", + /* 404 */ "from_clause_opt ::= FROM table_reference_list", + /* 405 */ "table_reference_list ::= table_reference", + /* 406 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference", + /* 407 */ "table_reference ::= table_primary", + /* 408 */ "table_reference ::= joined_table", + /* 409 */ "table_primary ::= table_name alias_opt", + /* 410 */ "table_primary ::= db_name NK_DOT table_name alias_opt", + /* 411 */ "table_primary ::= subquery alias_opt", + /* 412 */ "table_primary ::= parenthesized_joined_table", + /* 413 */ "alias_opt ::=", + /* 414 */ "alias_opt ::= table_alias", + /* 415 */ "alias_opt ::= AS table_alias", + /* 416 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP", + /* 417 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP", + /* 418 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition", + /* 419 */ "join_type ::=", + /* 420 */ "join_type ::= INNER", + /* 421 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt", + /* 422 */ "set_quantifier_opt ::=", + /* 423 */ "set_quantifier_opt ::= DISTINCT", + /* 424 */ "set_quantifier_opt ::= ALL", + /* 425 */ "select_list ::= select_item", + /* 426 */ "select_list ::= select_list NK_COMMA select_item", + /* 427 */ "select_item ::= NK_STAR", + /* 428 */ "select_item ::= common_expression", + /* 429 */ "select_item ::= common_expression column_alias", + /* 430 */ "select_item ::= common_expression AS column_alias", + /* 431 */ "select_item ::= table_name NK_DOT NK_STAR", + /* 432 */ "where_clause_opt ::=", + /* 433 */ "where_clause_opt ::= WHERE search_condition", + /* 434 */ "partition_by_clause_opt ::=", + /* 435 */ "partition_by_clause_opt ::= PARTITION BY expression_list", + /* 436 */ "twindow_clause_opt ::=", + /* 437 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP", + /* 438 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP", + /* 439 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt", + /* 440 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt", + /* 441 */ "sliding_opt ::=", + /* 442 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP", + /* 443 */ "fill_opt ::=", + /* 444 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP", + /* 445 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP", + /* 446 */ "fill_mode ::= NONE", + /* 447 */ "fill_mode ::= PREV", + /* 448 */ "fill_mode ::= NULL", + /* 449 */ "fill_mode ::= LINEAR", + /* 450 */ "fill_mode ::= NEXT", + /* 451 */ "group_by_clause_opt ::=", + /* 452 */ "group_by_clause_opt ::= GROUP BY group_by_list", + /* 453 */ "group_by_list ::= expression", + /* 454 */ "group_by_list ::= group_by_list NK_COMMA expression", + /* 455 */ "having_clause_opt ::=", + /* 456 */ "having_clause_opt ::= HAVING search_condition", + /* 457 */ "range_opt ::=", + /* 458 */ "range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP", + /* 459 */ "every_opt ::=", + /* 460 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP", + /* 461 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt", + /* 462 */ "query_expression_body ::= query_primary", + /* 463 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body", + /* 464 */ "query_expression_body ::= query_expression_body UNION query_expression_body", + /* 465 */ "query_primary ::= query_specification", + /* 466 */ "query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP", + /* 467 */ "order_by_clause_opt ::=", + /* 468 */ "order_by_clause_opt ::= ORDER BY sort_specification_list", + /* 469 */ "slimit_clause_opt ::=", + /* 470 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER", + /* 471 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER", + /* 472 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER", + /* 473 */ "limit_clause_opt ::=", + /* 474 */ "limit_clause_opt ::= LIMIT NK_INTEGER", + /* 475 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER", + /* 476 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER", + /* 477 */ "subquery ::= NK_LP query_expression NK_RP", + /* 478 */ "search_condition ::= common_expression", + /* 479 */ "sort_specification_list ::= sort_specification", + /* 480 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification", + /* 481 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt", + /* 482 */ "ordering_specification_opt ::=", + /* 483 */ "ordering_specification_opt ::= ASC", + /* 484 */ "ordering_specification_opt ::= DESC", + /* 485 */ "null_ordering_opt ::=", + /* 486 */ "null_ordering_opt ::= NULLS FIRST", + /* 487 */ "null_ordering_opt ::= NULLS LAST", }; #endif /* NDEBUG */ @@ -2239,181 +2258,181 @@ static void yy_destructor( */ /********* Begin destructor definitions ***************************************/ /* Default NON-TERMINAL Destructor */ - case 254: /* cmd */ - case 257: /* literal */ - case 268: /* db_options */ - case 270: /* alter_db_options */ - case 275: /* retention */ - case 276: /* full_table_name */ - case 279: /* table_options */ - case 283: /* alter_table_clause */ - case 284: /* alter_table_options */ - case 287: /* signed_literal */ - case 288: /* create_subtable_clause */ - case 291: /* drop_table_clause */ - case 294: /* column_def */ - case 298: /* duration_literal */ - case 299: /* rollup_func_name */ - case 301: /* col_name */ - case 302: /* db_name_cond_opt */ - case 303: /* like_pattern_opt */ - case 304: /* table_name_cond */ - case 305: /* from_db_opt */ - case 307: /* index_options */ - case 309: /* sliding_opt */ - case 310: /* sma_stream_opt */ - case 311: /* func */ - case 312: /* stream_options */ - case 314: /* query_expression */ - case 317: /* explain_options */ - case 321: /* into_opt */ - case 323: /* where_clause_opt */ - case 324: /* signed */ - case 325: /* literal_func */ - case 329: /* expression */ - case 330: /* pseudo_column */ - case 331: /* column_reference */ - case 332: /* function_expression */ - case 333: /* subquery */ - case 338: /* star_func_para */ - case 339: /* predicate */ - case 342: /* in_predicate_value */ - case 343: /* boolean_value_expression */ - case 344: /* boolean_primary */ - case 345: /* common_expression */ - case 346: /* from_clause_opt */ - case 347: /* table_reference_list */ - case 348: /* table_reference */ - case 349: /* table_primary */ - case 350: /* joined_table */ - case 352: /* parenthesized_joined_table */ - case 354: /* search_condition */ - case 355: /* query_specification */ - case 359: /* range_opt */ - case 360: /* every_opt */ - case 361: /* fill_opt */ - case 362: /* twindow_clause_opt */ - case 364: /* having_clause_opt */ - case 365: /* select_item */ - case 368: /* query_expression_body */ - case 370: /* slimit_clause_opt */ - case 371: /* limit_clause_opt */ - case 372: /* query_primary */ - case 374: /* sort_specification */ + case 255: /* cmd */ + case 258: /* literal */ + case 269: /* db_options */ + case 271: /* alter_db_options */ + case 276: /* retention */ + case 277: /* full_table_name */ + case 280: /* table_options */ + case 284: /* alter_table_clause */ + case 285: /* alter_table_options */ + case 288: /* signed_literal */ + case 289: /* create_subtable_clause */ + case 292: /* drop_table_clause */ + case 295: /* column_def */ + case 299: /* duration_literal */ + case 300: /* rollup_func_name */ + case 302: /* col_name */ + case 303: /* db_name_cond_opt */ + case 304: /* like_pattern_opt */ + case 305: /* table_name_cond */ + case 306: /* from_db_opt */ + case 308: /* index_options */ + case 310: /* sliding_opt */ + case 311: /* sma_stream_opt */ + case 312: /* func */ + case 313: /* stream_options */ + case 315: /* query_expression */ + case 318: /* explain_options */ + case 322: /* into_opt */ + case 324: /* where_clause_opt */ + case 325: /* signed */ + case 326: /* literal_func */ + case 330: /* expression */ + case 331: /* pseudo_column */ + case 332: /* column_reference */ + case 333: /* function_expression */ + case 334: /* subquery */ + case 339: /* star_func_para */ + case 340: /* predicate */ + case 343: /* in_predicate_value */ + case 344: /* boolean_value_expression */ + case 345: /* boolean_primary */ + case 346: /* common_expression */ + case 347: /* from_clause_opt */ + case 348: /* table_reference_list */ + case 349: /* table_reference */ + case 350: /* table_primary */ + case 351: /* joined_table */ + case 353: /* parenthesized_joined_table */ + case 355: /* search_condition */ + case 356: /* query_specification */ + case 360: /* range_opt */ + case 361: /* every_opt */ + case 362: /* fill_opt */ + case 363: /* twindow_clause_opt */ + case 365: /* having_clause_opt */ + case 366: /* select_item */ + case 369: /* query_expression_body */ + case 371: /* slimit_clause_opt */ + case 372: /* limit_clause_opt */ + case 373: /* query_primary */ + case 375: /* sort_specification */ { - nodesDestroyNode((yypminor->yy652)); + nodesDestroyNode((yypminor->yy560)); } break; - case 255: /* account_options */ - case 256: /* alter_account_options */ - case 258: /* alter_account_option */ - case 319: /* bufsize_opt */ + case 256: /* account_options */ + case 257: /* alter_account_options */ + case 259: /* alter_account_option */ + case 320: /* bufsize_opt */ { } break; - case 259: /* user_name */ - case 262: /* priv_level */ - case 265: /* db_name */ - case 266: /* dnode_endpoint */ - case 285: /* column_name */ - case 293: /* table_name */ - case 300: /* function_name */ - case 306: /* index_name */ - case 313: /* topic_name */ - case 315: /* cgroup_name */ - case 320: /* stream_name */ - case 327: /* table_alias */ - case 328: /* column_alias */ - case 334: /* star_func */ - case 336: /* noarg_func */ - case 351: /* alias_opt */ + case 260: /* user_name */ + case 263: /* priv_level */ + case 266: /* db_name */ + case 267: /* dnode_endpoint */ + case 286: /* column_name */ + case 294: /* table_name */ + case 301: /* function_name */ + case 307: /* index_name */ + case 314: /* topic_name */ + case 316: /* cgroup_name */ + case 321: /* stream_name */ + case 328: /* table_alias */ + case 329: /* column_alias */ + case 335: /* star_func */ + case 337: /* noarg_func */ + case 352: /* alias_opt */ { } break; - case 260: /* sysinfo_opt */ + case 261: /* sysinfo_opt */ { } break; - case 261: /* privileges */ - case 263: /* priv_type_list */ - case 264: /* priv_type */ + case 262: /* privileges */ + case 264: /* priv_type_list */ + case 265: /* priv_type */ { } break; - case 267: /* not_exists_opt */ - case 269: /* exists_opt */ - case 316: /* analyze_opt */ - case 318: /* agg_func_opt */ - case 356: /* set_quantifier_opt */ + case 268: /* not_exists_opt */ + case 270: /* exists_opt */ + case 317: /* analyze_opt */ + case 319: /* agg_func_opt */ + case 357: /* set_quantifier_opt */ { } break; - case 271: /* integer_list */ - case 272: /* variable_list */ - case 273: /* retention_list */ - case 277: /* column_def_list */ - case 278: /* tags_def_opt */ - case 280: /* multi_create_clause */ - case 281: /* tags_def */ - case 282: /* multi_drop_clause */ - case 289: /* specific_cols_opt */ - case 290: /* expression_list */ - case 292: /* col_name_list */ - case 295: /* duration_list */ - case 296: /* rollup_func_list */ - case 308: /* func_list */ - case 322: /* dnode_list */ - case 326: /* literal_list */ - case 335: /* star_func_para_list */ - case 337: /* other_para_list */ - case 357: /* select_list */ - case 358: /* partition_by_clause_opt */ - case 363: /* group_by_clause_opt */ - case 367: /* group_by_list */ - case 369: /* order_by_clause_opt */ - case 373: /* sort_specification_list */ + case 272: /* integer_list */ + case 273: /* variable_list */ + case 274: /* retention_list */ + case 278: /* column_def_list */ + case 279: /* tags_def_opt */ + case 281: /* multi_create_clause */ + case 282: /* tags_def */ + case 283: /* multi_drop_clause */ + case 290: /* specific_cols_opt */ + case 291: /* expression_list */ + case 293: /* col_name_list */ + case 296: /* duration_list */ + case 297: /* rollup_func_list */ + case 309: /* func_list */ + case 323: /* dnode_list */ + case 327: /* literal_list */ + case 336: /* star_func_para_list */ + case 338: /* other_para_list */ + case 358: /* select_list */ + case 359: /* partition_by_clause_opt */ + case 364: /* group_by_clause_opt */ + case 368: /* group_by_list */ + case 370: /* order_by_clause_opt */ + case 374: /* sort_specification_list */ { - nodesDestroyList((yypminor->yy210)); + nodesDestroyList((yypminor->yy712)); } break; - case 274: /* alter_db_option */ - case 297: /* alter_table_option */ + case 275: /* alter_db_option */ + case 298: /* alter_table_option */ { } break; - case 286: /* type_name */ + case 287: /* type_name */ { } break; - case 340: /* compare_op */ - case 341: /* in_op */ + case 341: /* compare_op */ + case 342: /* in_op */ { } break; - case 353: /* join_type */ + case 354: /* join_type */ { } break; - case 366: /* fill_mode */ + case 367: /* fill_mode */ { } break; - case 375: /* ordering_specification_opt */ + case 376: /* ordering_specification_opt */ { } break; - case 376: /* null_ordering_opt */ + case 377: /* null_ordering_opt */ { } @@ -2712,493 +2731,494 @@ static const struct { YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ signed char nrhs; /* Negative of the number of RHS symbols in the rule */ } yyRuleInfo[] = { - { 254, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */ - { 254, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */ - { 255, 0 }, /* (2) account_options ::= */ - { 255, -3 }, /* (3) account_options ::= account_options PPS literal */ - { 255, -3 }, /* (4) account_options ::= account_options TSERIES literal */ - { 255, -3 }, /* (5) account_options ::= account_options STORAGE literal */ - { 255, -3 }, /* (6) account_options ::= account_options STREAMS literal */ - { 255, -3 }, /* (7) account_options ::= account_options QTIME literal */ - { 255, -3 }, /* (8) account_options ::= account_options DBS literal */ - { 255, -3 }, /* (9) account_options ::= account_options USERS literal */ - { 255, -3 }, /* (10) account_options ::= account_options CONNS literal */ - { 255, -3 }, /* (11) account_options ::= account_options STATE literal */ - { 256, -1 }, /* (12) alter_account_options ::= alter_account_option */ - { 256, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */ - { 258, -2 }, /* (14) alter_account_option ::= PASS literal */ - { 258, -2 }, /* (15) alter_account_option ::= PPS literal */ - { 258, -2 }, /* (16) alter_account_option ::= TSERIES literal */ - { 258, -2 }, /* (17) alter_account_option ::= STORAGE literal */ - { 258, -2 }, /* (18) alter_account_option ::= STREAMS literal */ - { 258, -2 }, /* (19) alter_account_option ::= QTIME literal */ - { 258, -2 }, /* (20) alter_account_option ::= DBS literal */ - { 258, -2 }, /* (21) alter_account_option ::= USERS literal */ - { 258, -2 }, /* (22) alter_account_option ::= CONNS literal */ - { 258, -2 }, /* (23) alter_account_option ::= STATE literal */ - { 254, -6 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */ - { 254, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */ - { 254, -5 }, /* (26) cmd ::= ALTER USER user_name ENABLE NK_INTEGER */ - { 254, -5 }, /* (27) cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */ - { 254, -3 }, /* (28) cmd ::= DROP USER user_name */ - { 260, 0 }, /* (29) sysinfo_opt ::= */ - { 260, -2 }, /* (30) sysinfo_opt ::= SYSINFO NK_INTEGER */ - { 254, -6 }, /* (31) cmd ::= GRANT privileges ON priv_level TO user_name */ - { 254, -6 }, /* (32) cmd ::= REVOKE privileges ON priv_level FROM user_name */ - { 261, -1 }, /* (33) privileges ::= ALL */ - { 261, -1 }, /* (34) privileges ::= priv_type_list */ - { 263, -1 }, /* (35) priv_type_list ::= priv_type */ - { 263, -3 }, /* (36) priv_type_list ::= priv_type_list NK_COMMA priv_type */ - { 264, -1 }, /* (37) priv_type ::= READ */ - { 264, -1 }, /* (38) priv_type ::= WRITE */ - { 262, -3 }, /* (39) priv_level ::= NK_STAR NK_DOT NK_STAR */ - { 262, -3 }, /* (40) priv_level ::= db_name NK_DOT NK_STAR */ - { 254, -3 }, /* (41) cmd ::= CREATE DNODE dnode_endpoint */ - { 254, -5 }, /* (42) cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */ - { 254, -3 }, /* (43) cmd ::= DROP DNODE NK_INTEGER */ - { 254, -3 }, /* (44) cmd ::= DROP DNODE dnode_endpoint */ - { 254, -4 }, /* (45) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ - { 254, -5 }, /* (46) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */ - { 254, -4 }, /* (47) cmd ::= ALTER ALL DNODES NK_STRING */ - { 254, -5 }, /* (48) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */ - { 266, -1 }, /* (49) dnode_endpoint ::= NK_STRING */ - { 266, -1 }, /* (50) dnode_endpoint ::= NK_ID */ - { 266, -1 }, /* (51) dnode_endpoint ::= NK_IPTOKEN */ - { 254, -3 }, /* (52) cmd ::= ALTER LOCAL NK_STRING */ - { 254, -4 }, /* (53) cmd ::= ALTER LOCAL NK_STRING NK_STRING */ - { 254, -5 }, /* (54) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (55) cmd ::= DROP QNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (56) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (57) cmd ::= DROP BNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (58) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (59) cmd ::= DROP SNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (60) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (61) cmd ::= DROP MNODE ON DNODE NK_INTEGER */ - { 254, -5 }, /* (62) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ - { 254, -4 }, /* (63) cmd ::= DROP DATABASE exists_opt db_name */ - { 254, -2 }, /* (64) cmd ::= USE db_name */ - { 254, -4 }, /* (65) cmd ::= ALTER DATABASE db_name alter_db_options */ - { 254, -3 }, /* (66) cmd ::= FLUSH DATABASE db_name */ - { 267, -3 }, /* (67) not_exists_opt ::= IF NOT EXISTS */ - { 267, 0 }, /* (68) not_exists_opt ::= */ - { 269, -2 }, /* (69) exists_opt ::= IF EXISTS */ - { 269, 0 }, /* (70) exists_opt ::= */ - { 268, 0 }, /* (71) db_options ::= */ - { 268, -3 }, /* (72) db_options ::= db_options BUFFER NK_INTEGER */ - { 268, -3 }, /* (73) db_options ::= db_options CACHELAST NK_INTEGER */ - { 268, -3 }, /* (74) db_options ::= db_options CACHELASTSIZE NK_INTEGER */ - { 268, -3 }, /* (75) db_options ::= db_options COMP NK_INTEGER */ - { 268, -3 }, /* (76) db_options ::= db_options DURATION NK_INTEGER */ - { 268, -3 }, /* (77) db_options ::= db_options DURATION NK_VARIABLE */ - { 268, -3 }, /* (78) db_options ::= db_options FSYNC NK_INTEGER */ - { 268, -3 }, /* (79) db_options ::= db_options MAXROWS NK_INTEGER */ - { 268, -3 }, /* (80) db_options ::= db_options MINROWS NK_INTEGER */ - { 268, -3 }, /* (81) db_options ::= db_options KEEP integer_list */ - { 268, -3 }, /* (82) db_options ::= db_options KEEP variable_list */ - { 268, -3 }, /* (83) db_options ::= db_options PAGES NK_INTEGER */ - { 268, -3 }, /* (84) db_options ::= db_options PAGESIZE NK_INTEGER */ - { 268, -3 }, /* (85) db_options ::= db_options PRECISION NK_STRING */ - { 268, -3 }, /* (86) db_options ::= db_options REPLICA NK_INTEGER */ - { 268, -3 }, /* (87) db_options ::= db_options STRICT NK_INTEGER */ - { 268, -3 }, /* (88) db_options ::= db_options WAL NK_INTEGER */ - { 268, -3 }, /* (89) db_options ::= db_options VGROUPS NK_INTEGER */ - { 268, -3 }, /* (90) db_options ::= db_options SINGLE_STABLE NK_INTEGER */ - { 268, -3 }, /* (91) db_options ::= db_options RETENTIONS retention_list */ - { 268, -3 }, /* (92) db_options ::= db_options SCHEMALESS NK_INTEGER */ - { 270, -1 }, /* (93) alter_db_options ::= alter_db_option */ - { 270, -2 }, /* (94) alter_db_options ::= alter_db_options alter_db_option */ - { 274, -2 }, /* (95) alter_db_option ::= BUFFER NK_INTEGER */ - { 274, -2 }, /* (96) alter_db_option ::= CACHELAST NK_INTEGER */ - { 274, -2 }, /* (97) alter_db_option ::= CACHELASTSIZE NK_INTEGER */ - { 274, -2 }, /* (98) alter_db_option ::= FSYNC NK_INTEGER */ - { 274, -2 }, /* (99) alter_db_option ::= KEEP integer_list */ - { 274, -2 }, /* (100) alter_db_option ::= KEEP variable_list */ - { 274, -2 }, /* (101) alter_db_option ::= PAGES NK_INTEGER */ - { 274, -2 }, /* (102) alter_db_option ::= REPLICA NK_INTEGER */ - { 274, -2 }, /* (103) alter_db_option ::= STRICT NK_INTEGER */ - { 274, -2 }, /* (104) alter_db_option ::= WAL NK_INTEGER */ - { 271, -1 }, /* (105) integer_list ::= NK_INTEGER */ - { 271, -3 }, /* (106) integer_list ::= integer_list NK_COMMA NK_INTEGER */ - { 272, -1 }, /* (107) variable_list ::= NK_VARIABLE */ - { 272, -3 }, /* (108) variable_list ::= variable_list NK_COMMA NK_VARIABLE */ - { 273, -1 }, /* (109) retention_list ::= retention */ - { 273, -3 }, /* (110) retention_list ::= retention_list NK_COMMA retention */ - { 275, -3 }, /* (111) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ - { 254, -9 }, /* (112) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ - { 254, -3 }, /* (113) cmd ::= CREATE TABLE multi_create_clause */ - { 254, -9 }, /* (114) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ - { 254, -3 }, /* (115) cmd ::= DROP TABLE multi_drop_clause */ - { 254, -4 }, /* (116) cmd ::= DROP STABLE exists_opt full_table_name */ - { 254, -3 }, /* (117) cmd ::= ALTER TABLE alter_table_clause */ - { 254, -3 }, /* (118) cmd ::= ALTER STABLE alter_table_clause */ - { 283, -2 }, /* (119) alter_table_clause ::= full_table_name alter_table_options */ - { 283, -5 }, /* (120) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ - { 283, -4 }, /* (121) alter_table_clause ::= full_table_name DROP COLUMN column_name */ - { 283, -5 }, /* (122) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ - { 283, -5 }, /* (123) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ - { 283, -5 }, /* (124) alter_table_clause ::= full_table_name ADD TAG column_name type_name */ - { 283, -4 }, /* (125) alter_table_clause ::= full_table_name DROP TAG column_name */ - { 283, -5 }, /* (126) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ - { 283, -5 }, /* (127) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ - { 283, -6 }, /* (128) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */ - { 280, -1 }, /* (129) multi_create_clause ::= create_subtable_clause */ - { 280, -2 }, /* (130) multi_create_clause ::= multi_create_clause create_subtable_clause */ - { 288, -10 }, /* (131) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */ - { 282, -1 }, /* (132) multi_drop_clause ::= drop_table_clause */ - { 282, -2 }, /* (133) multi_drop_clause ::= multi_drop_clause drop_table_clause */ - { 291, -2 }, /* (134) drop_table_clause ::= exists_opt full_table_name */ - { 289, 0 }, /* (135) specific_cols_opt ::= */ - { 289, -3 }, /* (136) specific_cols_opt ::= NK_LP col_name_list NK_RP */ - { 276, -1 }, /* (137) full_table_name ::= table_name */ - { 276, -3 }, /* (138) full_table_name ::= db_name NK_DOT table_name */ - { 277, -1 }, /* (139) column_def_list ::= column_def */ - { 277, -3 }, /* (140) column_def_list ::= column_def_list NK_COMMA column_def */ - { 294, -2 }, /* (141) column_def ::= column_name type_name */ - { 294, -4 }, /* (142) column_def ::= column_name type_name COMMENT NK_STRING */ - { 286, -1 }, /* (143) type_name ::= BOOL */ - { 286, -1 }, /* (144) type_name ::= TINYINT */ - { 286, -1 }, /* (145) type_name ::= SMALLINT */ - { 286, -1 }, /* (146) type_name ::= INT */ - { 286, -1 }, /* (147) type_name ::= INTEGER */ - { 286, -1 }, /* (148) type_name ::= BIGINT */ - { 286, -1 }, /* (149) type_name ::= FLOAT */ - { 286, -1 }, /* (150) type_name ::= DOUBLE */ - { 286, -4 }, /* (151) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ - { 286, -1 }, /* (152) type_name ::= TIMESTAMP */ - { 286, -4 }, /* (153) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ - { 286, -2 }, /* (154) type_name ::= TINYINT UNSIGNED */ - { 286, -2 }, /* (155) type_name ::= SMALLINT UNSIGNED */ - { 286, -2 }, /* (156) type_name ::= INT UNSIGNED */ - { 286, -2 }, /* (157) type_name ::= BIGINT UNSIGNED */ - { 286, -1 }, /* (158) type_name ::= JSON */ - { 286, -4 }, /* (159) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ - { 286, -1 }, /* (160) type_name ::= MEDIUMBLOB */ - { 286, -1 }, /* (161) type_name ::= BLOB */ - { 286, -4 }, /* (162) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ - { 286, -1 }, /* (163) type_name ::= DECIMAL */ - { 286, -4 }, /* (164) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ - { 286, -6 }, /* (165) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ - { 278, 0 }, /* (166) tags_def_opt ::= */ - { 278, -1 }, /* (167) tags_def_opt ::= tags_def */ - { 281, -4 }, /* (168) tags_def ::= TAGS NK_LP column_def_list NK_RP */ - { 279, 0 }, /* (169) table_options ::= */ - { 279, -3 }, /* (170) table_options ::= table_options COMMENT NK_STRING */ - { 279, -3 }, /* (171) table_options ::= table_options MAX_DELAY duration_list */ - { 279, -3 }, /* (172) table_options ::= table_options WATERMARK duration_list */ - { 279, -5 }, /* (173) table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */ - { 279, -3 }, /* (174) table_options ::= table_options TTL NK_INTEGER */ - { 279, -5 }, /* (175) table_options ::= table_options SMA NK_LP col_name_list NK_RP */ - { 284, -1 }, /* (176) alter_table_options ::= alter_table_option */ - { 284, -2 }, /* (177) alter_table_options ::= alter_table_options alter_table_option */ - { 297, -2 }, /* (178) alter_table_option ::= COMMENT NK_STRING */ - { 297, -2 }, /* (179) alter_table_option ::= TTL NK_INTEGER */ - { 295, -1 }, /* (180) duration_list ::= duration_literal */ - { 295, -3 }, /* (181) duration_list ::= duration_list NK_COMMA duration_literal */ - { 296, -1 }, /* (182) rollup_func_list ::= rollup_func_name */ - { 296, -3 }, /* (183) rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ - { 299, -1 }, /* (184) rollup_func_name ::= function_name */ - { 299, -1 }, /* (185) rollup_func_name ::= FIRST */ - { 299, -1 }, /* (186) rollup_func_name ::= LAST */ - { 292, -1 }, /* (187) col_name_list ::= col_name */ - { 292, -3 }, /* (188) col_name_list ::= col_name_list NK_COMMA col_name */ - { 301, -1 }, /* (189) col_name ::= column_name */ - { 254, -2 }, /* (190) cmd ::= SHOW DNODES */ - { 254, -2 }, /* (191) cmd ::= SHOW USERS */ - { 254, -2 }, /* (192) cmd ::= SHOW DATABASES */ - { 254, -4 }, /* (193) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ - { 254, -4 }, /* (194) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ - { 254, -3 }, /* (195) cmd ::= SHOW db_name_cond_opt VGROUPS */ - { 254, -2 }, /* (196) cmd ::= SHOW MNODES */ - { 254, -2 }, /* (197) cmd ::= SHOW MODULES */ - { 254, -2 }, /* (198) cmd ::= SHOW QNODES */ - { 254, -2 }, /* (199) cmd ::= SHOW FUNCTIONS */ - { 254, -5 }, /* (200) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ - { 254, -2 }, /* (201) cmd ::= SHOW STREAMS */ - { 254, -2 }, /* (202) cmd ::= SHOW ACCOUNTS */ - { 254, -2 }, /* (203) cmd ::= SHOW APPS */ - { 254, -2 }, /* (204) cmd ::= SHOW CONNECTIONS */ - { 254, -2 }, /* (205) cmd ::= SHOW LICENCE */ - { 254, -2 }, /* (206) cmd ::= SHOW GRANTS */ - { 254, -4 }, /* (207) cmd ::= SHOW CREATE DATABASE db_name */ - { 254, -4 }, /* (208) cmd ::= SHOW CREATE TABLE full_table_name */ - { 254, -4 }, /* (209) cmd ::= SHOW CREATE STABLE full_table_name */ - { 254, -2 }, /* (210) cmd ::= SHOW QUERIES */ - { 254, -2 }, /* (211) cmd ::= SHOW SCORES */ - { 254, -2 }, /* (212) cmd ::= SHOW TOPICS */ - { 254, -2 }, /* (213) cmd ::= SHOW VARIABLES */ - { 254, -3 }, /* (214) cmd ::= SHOW LOCAL VARIABLES */ - { 254, -4 }, /* (215) cmd ::= SHOW DNODE NK_INTEGER VARIABLES */ - { 254, -2 }, /* (216) cmd ::= SHOW BNODES */ - { 254, -2 }, /* (217) cmd ::= SHOW SNODES */ - { 254, -2 }, /* (218) cmd ::= SHOW CLUSTER */ - { 254, -2 }, /* (219) cmd ::= SHOW TRANSACTIONS */ - { 254, -4 }, /* (220) cmd ::= SHOW TABLE DISTRIBUTED full_table_name */ - { 254, -2 }, /* (221) cmd ::= SHOW CONSUMERS */ - { 254, -2 }, /* (222) cmd ::= SHOW SUBSCRIPTIONS */ - { 302, 0 }, /* (223) db_name_cond_opt ::= */ - { 302, -2 }, /* (224) db_name_cond_opt ::= db_name NK_DOT */ - { 303, 0 }, /* (225) like_pattern_opt ::= */ - { 303, -2 }, /* (226) like_pattern_opt ::= LIKE NK_STRING */ - { 304, -1 }, /* (227) table_name_cond ::= table_name */ - { 305, 0 }, /* (228) from_db_opt ::= */ - { 305, -2 }, /* (229) from_db_opt ::= FROM db_name */ - { 254, -8 }, /* (230) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ - { 254, -4 }, /* (231) cmd ::= DROP INDEX exists_opt index_name */ - { 307, -10 }, /* (232) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ - { 307, -12 }, /* (233) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ - { 308, -1 }, /* (234) func_list ::= func */ - { 308, -3 }, /* (235) func_list ::= func_list NK_COMMA func */ - { 311, -4 }, /* (236) func ::= function_name NK_LP expression_list NK_RP */ - { 310, 0 }, /* (237) sma_stream_opt ::= */ - { 310, -3 }, /* (238) sma_stream_opt ::= stream_options WATERMARK duration_literal */ - { 310, -3 }, /* (239) sma_stream_opt ::= stream_options MAX_DELAY duration_literal */ - { 254, -6 }, /* (240) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ - { 254, -7 }, /* (241) cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ - { 254, -9 }, /* (242) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ - { 254, -7 }, /* (243) cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ - { 254, -9 }, /* (244) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ - { 254, -4 }, /* (245) cmd ::= DROP TOPIC exists_opt topic_name */ - { 254, -7 }, /* (246) cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ - { 254, -2 }, /* (247) cmd ::= DESC full_table_name */ - { 254, -2 }, /* (248) cmd ::= DESCRIBE full_table_name */ - { 254, -3 }, /* (249) cmd ::= RESET QUERY CACHE */ - { 254, -4 }, /* (250) cmd ::= EXPLAIN analyze_opt explain_options query_expression */ - { 316, 0 }, /* (251) analyze_opt ::= */ - { 316, -1 }, /* (252) analyze_opt ::= ANALYZE */ - { 317, 0 }, /* (253) explain_options ::= */ - { 317, -3 }, /* (254) explain_options ::= explain_options VERBOSE NK_BOOL */ - { 317, -3 }, /* (255) explain_options ::= explain_options RATIO NK_FLOAT */ - { 254, -6 }, /* (256) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ - { 254, -10 }, /* (257) cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ - { 254, -4 }, /* (258) cmd ::= DROP FUNCTION exists_opt function_name */ - { 318, 0 }, /* (259) agg_func_opt ::= */ - { 318, -1 }, /* (260) agg_func_opt ::= AGGREGATE */ - { 319, 0 }, /* (261) bufsize_opt ::= */ - { 319, -2 }, /* (262) bufsize_opt ::= BUFSIZE NK_INTEGER */ - { 254, -8 }, /* (263) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ - { 254, -4 }, /* (264) cmd ::= DROP STREAM exists_opt stream_name */ - { 321, 0 }, /* (265) into_opt ::= */ - { 321, -2 }, /* (266) into_opt ::= INTO full_table_name */ - { 312, 0 }, /* (267) stream_options ::= */ - { 312, -3 }, /* (268) stream_options ::= stream_options TRIGGER AT_ONCE */ - { 312, -3 }, /* (269) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ - { 312, -4 }, /* (270) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ - { 312, -3 }, /* (271) stream_options ::= stream_options WATERMARK duration_literal */ - { 312, -3 }, /* (272) stream_options ::= stream_options IGNORE EXPIRED */ - { 254, -3 }, /* (273) cmd ::= KILL CONNECTION NK_INTEGER */ - { 254, -3 }, /* (274) cmd ::= KILL QUERY NK_STRING */ - { 254, -3 }, /* (275) cmd ::= KILL TRANSACTION NK_INTEGER */ - { 254, -2 }, /* (276) cmd ::= BALANCE VGROUP */ - { 254, -4 }, /* (277) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ - { 254, -4 }, /* (278) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ - { 254, -3 }, /* (279) cmd ::= SPLIT VGROUP NK_INTEGER */ - { 322, -2 }, /* (280) dnode_list ::= DNODE NK_INTEGER */ - { 322, -3 }, /* (281) dnode_list ::= dnode_list DNODE NK_INTEGER */ - { 254, -3 }, /* (282) cmd ::= SYNCDB db_name REPLICA */ - { 254, -4 }, /* (283) cmd ::= DELETE FROM full_table_name where_clause_opt */ - { 254, -1 }, /* (284) cmd ::= query_expression */ - { 254, -5 }, /* (285) cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression */ - { 257, -1 }, /* (286) literal ::= NK_INTEGER */ - { 257, -1 }, /* (287) literal ::= NK_FLOAT */ - { 257, -1 }, /* (288) literal ::= NK_STRING */ - { 257, -1 }, /* (289) literal ::= NK_BOOL */ - { 257, -2 }, /* (290) literal ::= TIMESTAMP NK_STRING */ - { 257, -1 }, /* (291) literal ::= duration_literal */ - { 257, -1 }, /* (292) literal ::= NULL */ - { 257, -1 }, /* (293) literal ::= NK_QUESTION */ - { 298, -1 }, /* (294) duration_literal ::= NK_VARIABLE */ - { 324, -1 }, /* (295) signed ::= NK_INTEGER */ - { 324, -2 }, /* (296) signed ::= NK_PLUS NK_INTEGER */ - { 324, -2 }, /* (297) signed ::= NK_MINUS NK_INTEGER */ - { 324, -1 }, /* (298) signed ::= NK_FLOAT */ - { 324, -2 }, /* (299) signed ::= NK_PLUS NK_FLOAT */ - { 324, -2 }, /* (300) signed ::= NK_MINUS NK_FLOAT */ - { 287, -1 }, /* (301) signed_literal ::= signed */ - { 287, -1 }, /* (302) signed_literal ::= NK_STRING */ - { 287, -1 }, /* (303) signed_literal ::= NK_BOOL */ - { 287, -2 }, /* (304) signed_literal ::= TIMESTAMP NK_STRING */ - { 287, -1 }, /* (305) signed_literal ::= duration_literal */ - { 287, -1 }, /* (306) signed_literal ::= NULL */ - { 287, -1 }, /* (307) signed_literal ::= literal_func */ - { 326, -1 }, /* (308) literal_list ::= signed_literal */ - { 326, -3 }, /* (309) literal_list ::= literal_list NK_COMMA signed_literal */ - { 265, -1 }, /* (310) db_name ::= NK_ID */ - { 293, -1 }, /* (311) table_name ::= NK_ID */ - { 285, -1 }, /* (312) column_name ::= NK_ID */ - { 300, -1 }, /* (313) function_name ::= NK_ID */ - { 327, -1 }, /* (314) table_alias ::= NK_ID */ - { 328, -1 }, /* (315) column_alias ::= NK_ID */ - { 259, -1 }, /* (316) user_name ::= NK_ID */ - { 306, -1 }, /* (317) index_name ::= NK_ID */ - { 313, -1 }, /* (318) topic_name ::= NK_ID */ - { 320, -1 }, /* (319) stream_name ::= NK_ID */ - { 315, -1 }, /* (320) cgroup_name ::= NK_ID */ - { 329, -1 }, /* (321) expression ::= literal */ - { 329, -1 }, /* (322) expression ::= pseudo_column */ - { 329, -1 }, /* (323) expression ::= column_reference */ - { 329, -1 }, /* (324) expression ::= function_expression */ - { 329, -1 }, /* (325) expression ::= subquery */ - { 329, -3 }, /* (326) expression ::= NK_LP expression NK_RP */ - { 329, -2 }, /* (327) expression ::= NK_PLUS expression */ - { 329, -2 }, /* (328) expression ::= NK_MINUS expression */ - { 329, -3 }, /* (329) expression ::= expression NK_PLUS expression */ - { 329, -3 }, /* (330) expression ::= expression NK_MINUS expression */ - { 329, -3 }, /* (331) expression ::= expression NK_STAR expression */ - { 329, -3 }, /* (332) expression ::= expression NK_SLASH expression */ - { 329, -3 }, /* (333) expression ::= expression NK_REM expression */ - { 329, -3 }, /* (334) expression ::= column_reference NK_ARROW NK_STRING */ - { 329, -3 }, /* (335) expression ::= expression NK_BITAND expression */ - { 329, -3 }, /* (336) expression ::= expression NK_BITOR expression */ - { 290, -1 }, /* (337) expression_list ::= expression */ - { 290, -3 }, /* (338) expression_list ::= expression_list NK_COMMA expression */ - { 331, -1 }, /* (339) column_reference ::= column_name */ - { 331, -3 }, /* (340) column_reference ::= table_name NK_DOT column_name */ - { 330, -1 }, /* (341) pseudo_column ::= ROWTS */ - { 330, -1 }, /* (342) pseudo_column ::= TBNAME */ - { 330, -3 }, /* (343) pseudo_column ::= table_name NK_DOT TBNAME */ - { 330, -1 }, /* (344) pseudo_column ::= QSTARTTS */ - { 330, -1 }, /* (345) pseudo_column ::= QENDTS */ - { 330, -1 }, /* (346) pseudo_column ::= WSTARTTS */ - { 330, -1 }, /* (347) pseudo_column ::= WENDTS */ - { 330, -1 }, /* (348) pseudo_column ::= WDURATION */ - { 332, -4 }, /* (349) function_expression ::= function_name NK_LP expression_list NK_RP */ - { 332, -4 }, /* (350) function_expression ::= star_func NK_LP star_func_para_list NK_RP */ - { 332, -6 }, /* (351) function_expression ::= CAST NK_LP expression AS type_name NK_RP */ - { 332, -1 }, /* (352) function_expression ::= literal_func */ - { 325, -3 }, /* (353) literal_func ::= noarg_func NK_LP NK_RP */ - { 325, -1 }, /* (354) literal_func ::= NOW */ - { 336, -1 }, /* (355) noarg_func ::= NOW */ - { 336, -1 }, /* (356) noarg_func ::= TODAY */ - { 336, -1 }, /* (357) noarg_func ::= TIMEZONE */ - { 336, -1 }, /* (358) noarg_func ::= DATABASE */ - { 336, -1 }, /* (359) noarg_func ::= CLIENT_VERSION */ - { 336, -1 }, /* (360) noarg_func ::= SERVER_VERSION */ - { 336, -1 }, /* (361) noarg_func ::= SERVER_STATUS */ - { 336, -1 }, /* (362) noarg_func ::= CURRENT_USER */ - { 336, -1 }, /* (363) noarg_func ::= USER */ - { 334, -1 }, /* (364) star_func ::= COUNT */ - { 334, -1 }, /* (365) star_func ::= FIRST */ - { 334, -1 }, /* (366) star_func ::= LAST */ - { 334, -1 }, /* (367) star_func ::= LAST_ROW */ - { 335, -1 }, /* (368) star_func_para_list ::= NK_STAR */ - { 335, -1 }, /* (369) star_func_para_list ::= other_para_list */ - { 337, -1 }, /* (370) other_para_list ::= star_func_para */ - { 337, -3 }, /* (371) other_para_list ::= other_para_list NK_COMMA star_func_para */ - { 338, -1 }, /* (372) star_func_para ::= expression */ - { 338, -3 }, /* (373) star_func_para ::= table_name NK_DOT NK_STAR */ - { 339, -3 }, /* (374) predicate ::= expression compare_op expression */ - { 339, -5 }, /* (375) predicate ::= expression BETWEEN expression AND expression */ - { 339, -6 }, /* (376) predicate ::= expression NOT BETWEEN expression AND expression */ - { 339, -3 }, /* (377) predicate ::= expression IS NULL */ - { 339, -4 }, /* (378) predicate ::= expression IS NOT NULL */ - { 339, -3 }, /* (379) predicate ::= expression in_op in_predicate_value */ - { 340, -1 }, /* (380) compare_op ::= NK_LT */ - { 340, -1 }, /* (381) compare_op ::= NK_GT */ - { 340, -1 }, /* (382) compare_op ::= NK_LE */ - { 340, -1 }, /* (383) compare_op ::= NK_GE */ - { 340, -1 }, /* (384) compare_op ::= NK_NE */ - { 340, -1 }, /* (385) compare_op ::= NK_EQ */ - { 340, -1 }, /* (386) compare_op ::= LIKE */ - { 340, -2 }, /* (387) compare_op ::= NOT LIKE */ - { 340, -1 }, /* (388) compare_op ::= MATCH */ - { 340, -1 }, /* (389) compare_op ::= NMATCH */ - { 340, -1 }, /* (390) compare_op ::= CONTAINS */ - { 341, -1 }, /* (391) in_op ::= IN */ - { 341, -2 }, /* (392) in_op ::= NOT IN */ - { 342, -3 }, /* (393) in_predicate_value ::= NK_LP literal_list NK_RP */ - { 343, -1 }, /* (394) boolean_value_expression ::= boolean_primary */ - { 343, -2 }, /* (395) boolean_value_expression ::= NOT boolean_primary */ - { 343, -3 }, /* (396) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ - { 343, -3 }, /* (397) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ - { 344, -1 }, /* (398) boolean_primary ::= predicate */ - { 344, -3 }, /* (399) boolean_primary ::= NK_LP boolean_value_expression NK_RP */ - { 345, -1 }, /* (400) common_expression ::= expression */ - { 345, -1 }, /* (401) common_expression ::= boolean_value_expression */ - { 346, 0 }, /* (402) from_clause_opt ::= */ - { 346, -2 }, /* (403) from_clause_opt ::= FROM table_reference_list */ - { 347, -1 }, /* (404) table_reference_list ::= table_reference */ - { 347, -3 }, /* (405) table_reference_list ::= table_reference_list NK_COMMA table_reference */ - { 348, -1 }, /* (406) table_reference ::= table_primary */ - { 348, -1 }, /* (407) table_reference ::= joined_table */ - { 349, -2 }, /* (408) table_primary ::= table_name alias_opt */ - { 349, -4 }, /* (409) table_primary ::= db_name NK_DOT table_name alias_opt */ - { 349, -2 }, /* (410) table_primary ::= subquery alias_opt */ - { 349, -1 }, /* (411) table_primary ::= parenthesized_joined_table */ - { 351, 0 }, /* (412) alias_opt ::= */ - { 351, -1 }, /* (413) alias_opt ::= table_alias */ - { 351, -2 }, /* (414) alias_opt ::= AS table_alias */ - { 352, -3 }, /* (415) parenthesized_joined_table ::= NK_LP joined_table NK_RP */ - { 352, -3 }, /* (416) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ - { 350, -6 }, /* (417) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ - { 353, 0 }, /* (418) join_type ::= */ - { 353, -1 }, /* (419) join_type ::= INNER */ - { 355, -12 }, /* (420) query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ - { 356, 0 }, /* (421) set_quantifier_opt ::= */ - { 356, -1 }, /* (422) set_quantifier_opt ::= DISTINCT */ - { 356, -1 }, /* (423) set_quantifier_opt ::= ALL */ - { 357, -1 }, /* (424) select_list ::= select_item */ - { 357, -3 }, /* (425) select_list ::= select_list NK_COMMA select_item */ - { 365, -1 }, /* (426) select_item ::= NK_STAR */ - { 365, -1 }, /* (427) select_item ::= common_expression */ - { 365, -2 }, /* (428) select_item ::= common_expression column_alias */ - { 365, -3 }, /* (429) select_item ::= common_expression AS column_alias */ - { 365, -3 }, /* (430) select_item ::= table_name NK_DOT NK_STAR */ - { 323, 0 }, /* (431) where_clause_opt ::= */ - { 323, -2 }, /* (432) where_clause_opt ::= WHERE search_condition */ - { 358, 0 }, /* (433) partition_by_clause_opt ::= */ - { 358, -3 }, /* (434) partition_by_clause_opt ::= PARTITION BY expression_list */ - { 362, 0 }, /* (435) twindow_clause_opt ::= */ - { 362, -6 }, /* (436) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ - { 362, -4 }, /* (437) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ - { 362, -6 }, /* (438) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ - { 362, -8 }, /* (439) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ - { 309, 0 }, /* (440) sliding_opt ::= */ - { 309, -4 }, /* (441) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ - { 361, 0 }, /* (442) fill_opt ::= */ - { 361, -4 }, /* (443) fill_opt ::= FILL NK_LP fill_mode NK_RP */ - { 361, -6 }, /* (444) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ - { 366, -1 }, /* (445) fill_mode ::= NONE */ - { 366, -1 }, /* (446) fill_mode ::= PREV */ - { 366, -1 }, /* (447) fill_mode ::= NULL */ - { 366, -1 }, /* (448) fill_mode ::= LINEAR */ - { 366, -1 }, /* (449) fill_mode ::= NEXT */ - { 363, 0 }, /* (450) group_by_clause_opt ::= */ - { 363, -3 }, /* (451) group_by_clause_opt ::= GROUP BY group_by_list */ - { 367, -1 }, /* (452) group_by_list ::= expression */ - { 367, -3 }, /* (453) group_by_list ::= group_by_list NK_COMMA expression */ - { 364, 0 }, /* (454) having_clause_opt ::= */ - { 364, -2 }, /* (455) having_clause_opt ::= HAVING search_condition */ - { 359, 0 }, /* (456) range_opt ::= */ - { 359, -6 }, /* (457) range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */ - { 360, 0 }, /* (458) every_opt ::= */ - { 360, -4 }, /* (459) every_opt ::= EVERY NK_LP duration_literal NK_RP */ - { 314, -4 }, /* (460) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ - { 368, -1 }, /* (461) query_expression_body ::= query_primary */ - { 368, -4 }, /* (462) query_expression_body ::= query_expression_body UNION ALL query_expression_body */ - { 368, -3 }, /* (463) query_expression_body ::= query_expression_body UNION query_expression_body */ - { 372, -1 }, /* (464) query_primary ::= query_specification */ - { 372, -6 }, /* (465) query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */ - { 369, 0 }, /* (466) order_by_clause_opt ::= */ - { 369, -3 }, /* (467) order_by_clause_opt ::= ORDER BY sort_specification_list */ - { 370, 0 }, /* (468) slimit_clause_opt ::= */ - { 370, -2 }, /* (469) slimit_clause_opt ::= SLIMIT NK_INTEGER */ - { 370, -4 }, /* (470) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ - { 370, -4 }, /* (471) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - { 371, 0 }, /* (472) limit_clause_opt ::= */ - { 371, -2 }, /* (473) limit_clause_opt ::= LIMIT NK_INTEGER */ - { 371, -4 }, /* (474) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ - { 371, -4 }, /* (475) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - { 333, -3 }, /* (476) subquery ::= NK_LP query_expression NK_RP */ - { 354, -1 }, /* (477) search_condition ::= common_expression */ - { 373, -1 }, /* (478) sort_specification_list ::= sort_specification */ - { 373, -3 }, /* (479) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ - { 374, -3 }, /* (480) sort_specification ::= expression ordering_specification_opt null_ordering_opt */ - { 375, 0 }, /* (481) ordering_specification_opt ::= */ - { 375, -1 }, /* (482) ordering_specification_opt ::= ASC */ - { 375, -1 }, /* (483) ordering_specification_opt ::= DESC */ - { 376, 0 }, /* (484) null_ordering_opt ::= */ - { 376, -2 }, /* (485) null_ordering_opt ::= NULLS FIRST */ - { 376, -2 }, /* (486) null_ordering_opt ::= NULLS LAST */ + { 255, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */ + { 255, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */ + { 256, 0 }, /* (2) account_options ::= */ + { 256, -3 }, /* (3) account_options ::= account_options PPS literal */ + { 256, -3 }, /* (4) account_options ::= account_options TSERIES literal */ + { 256, -3 }, /* (5) account_options ::= account_options STORAGE literal */ + { 256, -3 }, /* (6) account_options ::= account_options STREAMS literal */ + { 256, -3 }, /* (7) account_options ::= account_options QTIME literal */ + { 256, -3 }, /* (8) account_options ::= account_options DBS literal */ + { 256, -3 }, /* (9) account_options ::= account_options USERS literal */ + { 256, -3 }, /* (10) account_options ::= account_options CONNS literal */ + { 256, -3 }, /* (11) account_options ::= account_options STATE literal */ + { 257, -1 }, /* (12) alter_account_options ::= alter_account_option */ + { 257, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */ + { 259, -2 }, /* (14) alter_account_option ::= PASS literal */ + { 259, -2 }, /* (15) alter_account_option ::= PPS literal */ + { 259, -2 }, /* (16) alter_account_option ::= TSERIES literal */ + { 259, -2 }, /* (17) alter_account_option ::= STORAGE literal */ + { 259, -2 }, /* (18) alter_account_option ::= STREAMS literal */ + { 259, -2 }, /* (19) alter_account_option ::= QTIME literal */ + { 259, -2 }, /* (20) alter_account_option ::= DBS literal */ + { 259, -2 }, /* (21) alter_account_option ::= USERS literal */ + { 259, -2 }, /* (22) alter_account_option ::= CONNS literal */ + { 259, -2 }, /* (23) alter_account_option ::= STATE literal */ + { 255, -6 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */ + { 255, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */ + { 255, -5 }, /* (26) cmd ::= ALTER USER user_name ENABLE NK_INTEGER */ + { 255, -5 }, /* (27) cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */ + { 255, -3 }, /* (28) cmd ::= DROP USER user_name */ + { 261, 0 }, /* (29) sysinfo_opt ::= */ + { 261, -2 }, /* (30) sysinfo_opt ::= SYSINFO NK_INTEGER */ + { 255, -6 }, /* (31) cmd ::= GRANT privileges ON priv_level TO user_name */ + { 255, -6 }, /* (32) cmd ::= REVOKE privileges ON priv_level FROM user_name */ + { 262, -1 }, /* (33) privileges ::= ALL */ + { 262, -1 }, /* (34) privileges ::= priv_type_list */ + { 264, -1 }, /* (35) priv_type_list ::= priv_type */ + { 264, -3 }, /* (36) priv_type_list ::= priv_type_list NK_COMMA priv_type */ + { 265, -1 }, /* (37) priv_type ::= READ */ + { 265, -1 }, /* (38) priv_type ::= WRITE */ + { 263, -3 }, /* (39) priv_level ::= NK_STAR NK_DOT NK_STAR */ + { 263, -3 }, /* (40) priv_level ::= db_name NK_DOT NK_STAR */ + { 255, -3 }, /* (41) cmd ::= CREATE DNODE dnode_endpoint */ + { 255, -5 }, /* (42) cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */ + { 255, -3 }, /* (43) cmd ::= DROP DNODE NK_INTEGER */ + { 255, -3 }, /* (44) cmd ::= DROP DNODE dnode_endpoint */ + { 255, -4 }, /* (45) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ + { 255, -5 }, /* (46) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */ + { 255, -4 }, /* (47) cmd ::= ALTER ALL DNODES NK_STRING */ + { 255, -5 }, /* (48) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */ + { 267, -1 }, /* (49) dnode_endpoint ::= NK_STRING */ + { 267, -1 }, /* (50) dnode_endpoint ::= NK_ID */ + { 267, -1 }, /* (51) dnode_endpoint ::= NK_IPTOKEN */ + { 255, -3 }, /* (52) cmd ::= ALTER LOCAL NK_STRING */ + { 255, -4 }, /* (53) cmd ::= ALTER LOCAL NK_STRING NK_STRING */ + { 255, -5 }, /* (54) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (55) cmd ::= DROP QNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (56) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (57) cmd ::= DROP BNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (58) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (59) cmd ::= DROP SNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (60) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (61) cmd ::= DROP MNODE ON DNODE NK_INTEGER */ + { 255, -5 }, /* (62) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ + { 255, -4 }, /* (63) cmd ::= DROP DATABASE exists_opt db_name */ + { 255, -2 }, /* (64) cmd ::= USE db_name */ + { 255, -4 }, /* (65) cmd ::= ALTER DATABASE db_name alter_db_options */ + { 255, -3 }, /* (66) cmd ::= FLUSH DATABASE db_name */ + { 255, -3 }, /* (67) cmd ::= TRIM DATABASE db_name */ + { 268, -3 }, /* (68) not_exists_opt ::= IF NOT EXISTS */ + { 268, 0 }, /* (69) not_exists_opt ::= */ + { 270, -2 }, /* (70) exists_opt ::= IF EXISTS */ + { 270, 0 }, /* (71) exists_opt ::= */ + { 269, 0 }, /* (72) db_options ::= */ + { 269, -3 }, /* (73) db_options ::= db_options BUFFER NK_INTEGER */ + { 269, -3 }, /* (74) db_options ::= db_options CACHELAST NK_INTEGER */ + { 269, -3 }, /* (75) db_options ::= db_options CACHELASTSIZE NK_INTEGER */ + { 269, -3 }, /* (76) db_options ::= db_options COMP NK_INTEGER */ + { 269, -3 }, /* (77) db_options ::= db_options DURATION NK_INTEGER */ + { 269, -3 }, /* (78) db_options ::= db_options DURATION NK_VARIABLE */ + { 269, -3 }, /* (79) db_options ::= db_options FSYNC NK_INTEGER */ + { 269, -3 }, /* (80) db_options ::= db_options MAXROWS NK_INTEGER */ + { 269, -3 }, /* (81) db_options ::= db_options MINROWS NK_INTEGER */ + { 269, -3 }, /* (82) db_options ::= db_options KEEP integer_list */ + { 269, -3 }, /* (83) db_options ::= db_options KEEP variable_list */ + { 269, -3 }, /* (84) db_options ::= db_options PAGES NK_INTEGER */ + { 269, -3 }, /* (85) db_options ::= db_options PAGESIZE NK_INTEGER */ + { 269, -3 }, /* (86) db_options ::= db_options PRECISION NK_STRING */ + { 269, -3 }, /* (87) db_options ::= db_options REPLICA NK_INTEGER */ + { 269, -3 }, /* (88) db_options ::= db_options STRICT NK_INTEGER */ + { 269, -3 }, /* (89) db_options ::= db_options WAL NK_INTEGER */ + { 269, -3 }, /* (90) db_options ::= db_options VGROUPS NK_INTEGER */ + { 269, -3 }, /* (91) db_options ::= db_options SINGLE_STABLE NK_INTEGER */ + { 269, -3 }, /* (92) db_options ::= db_options RETENTIONS retention_list */ + { 269, -3 }, /* (93) db_options ::= db_options SCHEMALESS NK_INTEGER */ + { 271, -1 }, /* (94) alter_db_options ::= alter_db_option */ + { 271, -2 }, /* (95) alter_db_options ::= alter_db_options alter_db_option */ + { 275, -2 }, /* (96) alter_db_option ::= BUFFER NK_INTEGER */ + { 275, -2 }, /* (97) alter_db_option ::= CACHELAST NK_INTEGER */ + { 275, -2 }, /* (98) alter_db_option ::= CACHELASTSIZE NK_INTEGER */ + { 275, -2 }, /* (99) alter_db_option ::= FSYNC NK_INTEGER */ + { 275, -2 }, /* (100) alter_db_option ::= KEEP integer_list */ + { 275, -2 }, /* (101) alter_db_option ::= KEEP variable_list */ + { 275, -2 }, /* (102) alter_db_option ::= PAGES NK_INTEGER */ + { 275, -2 }, /* (103) alter_db_option ::= REPLICA NK_INTEGER */ + { 275, -2 }, /* (104) alter_db_option ::= STRICT NK_INTEGER */ + { 275, -2 }, /* (105) alter_db_option ::= WAL NK_INTEGER */ + { 272, -1 }, /* (106) integer_list ::= NK_INTEGER */ + { 272, -3 }, /* (107) integer_list ::= integer_list NK_COMMA NK_INTEGER */ + { 273, -1 }, /* (108) variable_list ::= NK_VARIABLE */ + { 273, -3 }, /* (109) variable_list ::= variable_list NK_COMMA NK_VARIABLE */ + { 274, -1 }, /* (110) retention_list ::= retention */ + { 274, -3 }, /* (111) retention_list ::= retention_list NK_COMMA retention */ + { 276, -3 }, /* (112) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ + { 255, -9 }, /* (113) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ + { 255, -3 }, /* (114) cmd ::= CREATE TABLE multi_create_clause */ + { 255, -9 }, /* (115) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ + { 255, -3 }, /* (116) cmd ::= DROP TABLE multi_drop_clause */ + { 255, -4 }, /* (117) cmd ::= DROP STABLE exists_opt full_table_name */ + { 255, -3 }, /* (118) cmd ::= ALTER TABLE alter_table_clause */ + { 255, -3 }, /* (119) cmd ::= ALTER STABLE alter_table_clause */ + { 284, -2 }, /* (120) alter_table_clause ::= full_table_name alter_table_options */ + { 284, -5 }, /* (121) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ + { 284, -4 }, /* (122) alter_table_clause ::= full_table_name DROP COLUMN column_name */ + { 284, -5 }, /* (123) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ + { 284, -5 }, /* (124) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ + { 284, -5 }, /* (125) alter_table_clause ::= full_table_name ADD TAG column_name type_name */ + { 284, -4 }, /* (126) alter_table_clause ::= full_table_name DROP TAG column_name */ + { 284, -5 }, /* (127) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ + { 284, -5 }, /* (128) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ + { 284, -6 }, /* (129) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */ + { 281, -1 }, /* (130) multi_create_clause ::= create_subtable_clause */ + { 281, -2 }, /* (131) multi_create_clause ::= multi_create_clause create_subtable_clause */ + { 289, -10 }, /* (132) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */ + { 283, -1 }, /* (133) multi_drop_clause ::= drop_table_clause */ + { 283, -2 }, /* (134) multi_drop_clause ::= multi_drop_clause drop_table_clause */ + { 292, -2 }, /* (135) drop_table_clause ::= exists_opt full_table_name */ + { 290, 0 }, /* (136) specific_cols_opt ::= */ + { 290, -3 }, /* (137) specific_cols_opt ::= NK_LP col_name_list NK_RP */ + { 277, -1 }, /* (138) full_table_name ::= table_name */ + { 277, -3 }, /* (139) full_table_name ::= db_name NK_DOT table_name */ + { 278, -1 }, /* (140) column_def_list ::= column_def */ + { 278, -3 }, /* (141) column_def_list ::= column_def_list NK_COMMA column_def */ + { 295, -2 }, /* (142) column_def ::= column_name type_name */ + { 295, -4 }, /* (143) column_def ::= column_name type_name COMMENT NK_STRING */ + { 287, -1 }, /* (144) type_name ::= BOOL */ + { 287, -1 }, /* (145) type_name ::= TINYINT */ + { 287, -1 }, /* (146) type_name ::= SMALLINT */ + { 287, -1 }, /* (147) type_name ::= INT */ + { 287, -1 }, /* (148) type_name ::= INTEGER */ + { 287, -1 }, /* (149) type_name ::= BIGINT */ + { 287, -1 }, /* (150) type_name ::= FLOAT */ + { 287, -1 }, /* (151) type_name ::= DOUBLE */ + { 287, -4 }, /* (152) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ + { 287, -1 }, /* (153) type_name ::= TIMESTAMP */ + { 287, -4 }, /* (154) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ + { 287, -2 }, /* (155) type_name ::= TINYINT UNSIGNED */ + { 287, -2 }, /* (156) type_name ::= SMALLINT UNSIGNED */ + { 287, -2 }, /* (157) type_name ::= INT UNSIGNED */ + { 287, -2 }, /* (158) type_name ::= BIGINT UNSIGNED */ + { 287, -1 }, /* (159) type_name ::= JSON */ + { 287, -4 }, /* (160) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ + { 287, -1 }, /* (161) type_name ::= MEDIUMBLOB */ + { 287, -1 }, /* (162) type_name ::= BLOB */ + { 287, -4 }, /* (163) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ + { 287, -1 }, /* (164) type_name ::= DECIMAL */ + { 287, -4 }, /* (165) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ + { 287, -6 }, /* (166) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ + { 279, 0 }, /* (167) tags_def_opt ::= */ + { 279, -1 }, /* (168) tags_def_opt ::= tags_def */ + { 282, -4 }, /* (169) tags_def ::= TAGS NK_LP column_def_list NK_RP */ + { 280, 0 }, /* (170) table_options ::= */ + { 280, -3 }, /* (171) table_options ::= table_options COMMENT NK_STRING */ + { 280, -3 }, /* (172) table_options ::= table_options MAX_DELAY duration_list */ + { 280, -3 }, /* (173) table_options ::= table_options WATERMARK duration_list */ + { 280, -5 }, /* (174) table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */ + { 280, -3 }, /* (175) table_options ::= table_options TTL NK_INTEGER */ + { 280, -5 }, /* (176) table_options ::= table_options SMA NK_LP col_name_list NK_RP */ + { 285, -1 }, /* (177) alter_table_options ::= alter_table_option */ + { 285, -2 }, /* (178) alter_table_options ::= alter_table_options alter_table_option */ + { 298, -2 }, /* (179) alter_table_option ::= COMMENT NK_STRING */ + { 298, -2 }, /* (180) alter_table_option ::= TTL NK_INTEGER */ + { 296, -1 }, /* (181) duration_list ::= duration_literal */ + { 296, -3 }, /* (182) duration_list ::= duration_list NK_COMMA duration_literal */ + { 297, -1 }, /* (183) rollup_func_list ::= rollup_func_name */ + { 297, -3 }, /* (184) rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ + { 300, -1 }, /* (185) rollup_func_name ::= function_name */ + { 300, -1 }, /* (186) rollup_func_name ::= FIRST */ + { 300, -1 }, /* (187) rollup_func_name ::= LAST */ + { 293, -1 }, /* (188) col_name_list ::= col_name */ + { 293, -3 }, /* (189) col_name_list ::= col_name_list NK_COMMA col_name */ + { 302, -1 }, /* (190) col_name ::= column_name */ + { 255, -2 }, /* (191) cmd ::= SHOW DNODES */ + { 255, -2 }, /* (192) cmd ::= SHOW USERS */ + { 255, -2 }, /* (193) cmd ::= SHOW DATABASES */ + { 255, -4 }, /* (194) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ + { 255, -4 }, /* (195) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ + { 255, -3 }, /* (196) cmd ::= SHOW db_name_cond_opt VGROUPS */ + { 255, -2 }, /* (197) cmd ::= SHOW MNODES */ + { 255, -2 }, /* (198) cmd ::= SHOW MODULES */ + { 255, -2 }, /* (199) cmd ::= SHOW QNODES */ + { 255, -2 }, /* (200) cmd ::= SHOW FUNCTIONS */ + { 255, -5 }, /* (201) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ + { 255, -2 }, /* (202) cmd ::= SHOW STREAMS */ + { 255, -2 }, /* (203) cmd ::= SHOW ACCOUNTS */ + { 255, -2 }, /* (204) cmd ::= SHOW APPS */ + { 255, -2 }, /* (205) cmd ::= SHOW CONNECTIONS */ + { 255, -2 }, /* (206) cmd ::= SHOW LICENCE */ + { 255, -2 }, /* (207) cmd ::= SHOW GRANTS */ + { 255, -4 }, /* (208) cmd ::= SHOW CREATE DATABASE db_name */ + { 255, -4 }, /* (209) cmd ::= SHOW CREATE TABLE full_table_name */ + { 255, -4 }, /* (210) cmd ::= SHOW CREATE STABLE full_table_name */ + { 255, -2 }, /* (211) cmd ::= SHOW QUERIES */ + { 255, -2 }, /* (212) cmd ::= SHOW SCORES */ + { 255, -2 }, /* (213) cmd ::= SHOW TOPICS */ + { 255, -2 }, /* (214) cmd ::= SHOW VARIABLES */ + { 255, -3 }, /* (215) cmd ::= SHOW LOCAL VARIABLES */ + { 255, -4 }, /* (216) cmd ::= SHOW DNODE NK_INTEGER VARIABLES */ + { 255, -2 }, /* (217) cmd ::= SHOW BNODES */ + { 255, -2 }, /* (218) cmd ::= SHOW SNODES */ + { 255, -2 }, /* (219) cmd ::= SHOW CLUSTER */ + { 255, -2 }, /* (220) cmd ::= SHOW TRANSACTIONS */ + { 255, -4 }, /* (221) cmd ::= SHOW TABLE DISTRIBUTED full_table_name */ + { 255, -2 }, /* (222) cmd ::= SHOW CONSUMERS */ + { 255, -2 }, /* (223) cmd ::= SHOW SUBSCRIPTIONS */ + { 303, 0 }, /* (224) db_name_cond_opt ::= */ + { 303, -2 }, /* (225) db_name_cond_opt ::= db_name NK_DOT */ + { 304, 0 }, /* (226) like_pattern_opt ::= */ + { 304, -2 }, /* (227) like_pattern_opt ::= LIKE NK_STRING */ + { 305, -1 }, /* (228) table_name_cond ::= table_name */ + { 306, 0 }, /* (229) from_db_opt ::= */ + { 306, -2 }, /* (230) from_db_opt ::= FROM db_name */ + { 255, -8 }, /* (231) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ + { 255, -4 }, /* (232) cmd ::= DROP INDEX exists_opt index_name */ + { 308, -10 }, /* (233) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ + { 308, -12 }, /* (234) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ + { 309, -1 }, /* (235) func_list ::= func */ + { 309, -3 }, /* (236) func_list ::= func_list NK_COMMA func */ + { 312, -4 }, /* (237) func ::= function_name NK_LP expression_list NK_RP */ + { 311, 0 }, /* (238) sma_stream_opt ::= */ + { 311, -3 }, /* (239) sma_stream_opt ::= stream_options WATERMARK duration_literal */ + { 311, -3 }, /* (240) sma_stream_opt ::= stream_options MAX_DELAY duration_literal */ + { 255, -6 }, /* (241) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ + { 255, -7 }, /* (242) cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ + { 255, -9 }, /* (243) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ + { 255, -7 }, /* (244) cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ + { 255, -9 }, /* (245) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ + { 255, -4 }, /* (246) cmd ::= DROP TOPIC exists_opt topic_name */ + { 255, -7 }, /* (247) cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ + { 255, -2 }, /* (248) cmd ::= DESC full_table_name */ + { 255, -2 }, /* (249) cmd ::= DESCRIBE full_table_name */ + { 255, -3 }, /* (250) cmd ::= RESET QUERY CACHE */ + { 255, -4 }, /* (251) cmd ::= EXPLAIN analyze_opt explain_options query_expression */ + { 317, 0 }, /* (252) analyze_opt ::= */ + { 317, -1 }, /* (253) analyze_opt ::= ANALYZE */ + { 318, 0 }, /* (254) explain_options ::= */ + { 318, -3 }, /* (255) explain_options ::= explain_options VERBOSE NK_BOOL */ + { 318, -3 }, /* (256) explain_options ::= explain_options RATIO NK_FLOAT */ + { 255, -6 }, /* (257) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ + { 255, -10 }, /* (258) cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ + { 255, -4 }, /* (259) cmd ::= DROP FUNCTION exists_opt function_name */ + { 319, 0 }, /* (260) agg_func_opt ::= */ + { 319, -1 }, /* (261) agg_func_opt ::= AGGREGATE */ + { 320, 0 }, /* (262) bufsize_opt ::= */ + { 320, -2 }, /* (263) bufsize_opt ::= BUFSIZE NK_INTEGER */ + { 255, -8 }, /* (264) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ + { 255, -4 }, /* (265) cmd ::= DROP STREAM exists_opt stream_name */ + { 322, 0 }, /* (266) into_opt ::= */ + { 322, -2 }, /* (267) into_opt ::= INTO full_table_name */ + { 313, 0 }, /* (268) stream_options ::= */ + { 313, -3 }, /* (269) stream_options ::= stream_options TRIGGER AT_ONCE */ + { 313, -3 }, /* (270) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ + { 313, -4 }, /* (271) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ + { 313, -3 }, /* (272) stream_options ::= stream_options WATERMARK duration_literal */ + { 313, -3 }, /* (273) stream_options ::= stream_options IGNORE EXPIRED */ + { 255, -3 }, /* (274) cmd ::= KILL CONNECTION NK_INTEGER */ + { 255, -3 }, /* (275) cmd ::= KILL QUERY NK_STRING */ + { 255, -3 }, /* (276) cmd ::= KILL TRANSACTION NK_INTEGER */ + { 255, -2 }, /* (277) cmd ::= BALANCE VGROUP */ + { 255, -4 }, /* (278) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ + { 255, -4 }, /* (279) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ + { 255, -3 }, /* (280) cmd ::= SPLIT VGROUP NK_INTEGER */ + { 323, -2 }, /* (281) dnode_list ::= DNODE NK_INTEGER */ + { 323, -3 }, /* (282) dnode_list ::= dnode_list DNODE NK_INTEGER */ + { 255, -3 }, /* (283) cmd ::= SYNCDB db_name REPLICA */ + { 255, -4 }, /* (284) cmd ::= DELETE FROM full_table_name where_clause_opt */ + { 255, -1 }, /* (285) cmd ::= query_expression */ + { 255, -5 }, /* (286) cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression */ + { 258, -1 }, /* (287) literal ::= NK_INTEGER */ + { 258, -1 }, /* (288) literal ::= NK_FLOAT */ + { 258, -1 }, /* (289) literal ::= NK_STRING */ + { 258, -1 }, /* (290) literal ::= NK_BOOL */ + { 258, -2 }, /* (291) literal ::= TIMESTAMP NK_STRING */ + { 258, -1 }, /* (292) literal ::= duration_literal */ + { 258, -1 }, /* (293) literal ::= NULL */ + { 258, -1 }, /* (294) literal ::= NK_QUESTION */ + { 299, -1 }, /* (295) duration_literal ::= NK_VARIABLE */ + { 325, -1 }, /* (296) signed ::= NK_INTEGER */ + { 325, -2 }, /* (297) signed ::= NK_PLUS NK_INTEGER */ + { 325, -2 }, /* (298) signed ::= NK_MINUS NK_INTEGER */ + { 325, -1 }, /* (299) signed ::= NK_FLOAT */ + { 325, -2 }, /* (300) signed ::= NK_PLUS NK_FLOAT */ + { 325, -2 }, /* (301) signed ::= NK_MINUS NK_FLOAT */ + { 288, -1 }, /* (302) signed_literal ::= signed */ + { 288, -1 }, /* (303) signed_literal ::= NK_STRING */ + { 288, -1 }, /* (304) signed_literal ::= NK_BOOL */ + { 288, -2 }, /* (305) signed_literal ::= TIMESTAMP NK_STRING */ + { 288, -1 }, /* (306) signed_literal ::= duration_literal */ + { 288, -1 }, /* (307) signed_literal ::= NULL */ + { 288, -1 }, /* (308) signed_literal ::= literal_func */ + { 327, -1 }, /* (309) literal_list ::= signed_literal */ + { 327, -3 }, /* (310) literal_list ::= literal_list NK_COMMA signed_literal */ + { 266, -1 }, /* (311) db_name ::= NK_ID */ + { 294, -1 }, /* (312) table_name ::= NK_ID */ + { 286, -1 }, /* (313) column_name ::= NK_ID */ + { 301, -1 }, /* (314) function_name ::= NK_ID */ + { 328, -1 }, /* (315) table_alias ::= NK_ID */ + { 329, -1 }, /* (316) column_alias ::= NK_ID */ + { 260, -1 }, /* (317) user_name ::= NK_ID */ + { 307, -1 }, /* (318) index_name ::= NK_ID */ + { 314, -1 }, /* (319) topic_name ::= NK_ID */ + { 321, -1 }, /* (320) stream_name ::= NK_ID */ + { 316, -1 }, /* (321) cgroup_name ::= NK_ID */ + { 330, -1 }, /* (322) expression ::= literal */ + { 330, -1 }, /* (323) expression ::= pseudo_column */ + { 330, -1 }, /* (324) expression ::= column_reference */ + { 330, -1 }, /* (325) expression ::= function_expression */ + { 330, -1 }, /* (326) expression ::= subquery */ + { 330, -3 }, /* (327) expression ::= NK_LP expression NK_RP */ + { 330, -2 }, /* (328) expression ::= NK_PLUS expression */ + { 330, -2 }, /* (329) expression ::= NK_MINUS expression */ + { 330, -3 }, /* (330) expression ::= expression NK_PLUS expression */ + { 330, -3 }, /* (331) expression ::= expression NK_MINUS expression */ + { 330, -3 }, /* (332) expression ::= expression NK_STAR expression */ + { 330, -3 }, /* (333) expression ::= expression NK_SLASH expression */ + { 330, -3 }, /* (334) expression ::= expression NK_REM expression */ + { 330, -3 }, /* (335) expression ::= column_reference NK_ARROW NK_STRING */ + { 330, -3 }, /* (336) expression ::= expression NK_BITAND expression */ + { 330, -3 }, /* (337) expression ::= expression NK_BITOR expression */ + { 291, -1 }, /* (338) expression_list ::= expression */ + { 291, -3 }, /* (339) expression_list ::= expression_list NK_COMMA expression */ + { 332, -1 }, /* (340) column_reference ::= column_name */ + { 332, -3 }, /* (341) column_reference ::= table_name NK_DOT column_name */ + { 331, -1 }, /* (342) pseudo_column ::= ROWTS */ + { 331, -1 }, /* (343) pseudo_column ::= TBNAME */ + { 331, -3 }, /* (344) pseudo_column ::= table_name NK_DOT TBNAME */ + { 331, -1 }, /* (345) pseudo_column ::= QSTARTTS */ + { 331, -1 }, /* (346) pseudo_column ::= QENDTS */ + { 331, -1 }, /* (347) pseudo_column ::= WSTARTTS */ + { 331, -1 }, /* (348) pseudo_column ::= WENDTS */ + { 331, -1 }, /* (349) pseudo_column ::= WDURATION */ + { 333, -4 }, /* (350) function_expression ::= function_name NK_LP expression_list NK_RP */ + { 333, -4 }, /* (351) function_expression ::= star_func NK_LP star_func_para_list NK_RP */ + { 333, -6 }, /* (352) function_expression ::= CAST NK_LP expression AS type_name NK_RP */ + { 333, -1 }, /* (353) function_expression ::= literal_func */ + { 326, -3 }, /* (354) literal_func ::= noarg_func NK_LP NK_RP */ + { 326, -1 }, /* (355) literal_func ::= NOW */ + { 337, -1 }, /* (356) noarg_func ::= NOW */ + { 337, -1 }, /* (357) noarg_func ::= TODAY */ + { 337, -1 }, /* (358) noarg_func ::= TIMEZONE */ + { 337, -1 }, /* (359) noarg_func ::= DATABASE */ + { 337, -1 }, /* (360) noarg_func ::= CLIENT_VERSION */ + { 337, -1 }, /* (361) noarg_func ::= SERVER_VERSION */ + { 337, -1 }, /* (362) noarg_func ::= SERVER_STATUS */ + { 337, -1 }, /* (363) noarg_func ::= CURRENT_USER */ + { 337, -1 }, /* (364) noarg_func ::= USER */ + { 335, -1 }, /* (365) star_func ::= COUNT */ + { 335, -1 }, /* (366) star_func ::= FIRST */ + { 335, -1 }, /* (367) star_func ::= LAST */ + { 335, -1 }, /* (368) star_func ::= LAST_ROW */ + { 336, -1 }, /* (369) star_func_para_list ::= NK_STAR */ + { 336, -1 }, /* (370) star_func_para_list ::= other_para_list */ + { 338, -1 }, /* (371) other_para_list ::= star_func_para */ + { 338, -3 }, /* (372) other_para_list ::= other_para_list NK_COMMA star_func_para */ + { 339, -1 }, /* (373) star_func_para ::= expression */ + { 339, -3 }, /* (374) star_func_para ::= table_name NK_DOT NK_STAR */ + { 340, -3 }, /* (375) predicate ::= expression compare_op expression */ + { 340, -5 }, /* (376) predicate ::= expression BETWEEN expression AND expression */ + { 340, -6 }, /* (377) predicate ::= expression NOT BETWEEN expression AND expression */ + { 340, -3 }, /* (378) predicate ::= expression IS NULL */ + { 340, -4 }, /* (379) predicate ::= expression IS NOT NULL */ + { 340, -3 }, /* (380) predicate ::= expression in_op in_predicate_value */ + { 341, -1 }, /* (381) compare_op ::= NK_LT */ + { 341, -1 }, /* (382) compare_op ::= NK_GT */ + { 341, -1 }, /* (383) compare_op ::= NK_LE */ + { 341, -1 }, /* (384) compare_op ::= NK_GE */ + { 341, -1 }, /* (385) compare_op ::= NK_NE */ + { 341, -1 }, /* (386) compare_op ::= NK_EQ */ + { 341, -1 }, /* (387) compare_op ::= LIKE */ + { 341, -2 }, /* (388) compare_op ::= NOT LIKE */ + { 341, -1 }, /* (389) compare_op ::= MATCH */ + { 341, -1 }, /* (390) compare_op ::= NMATCH */ + { 341, -1 }, /* (391) compare_op ::= CONTAINS */ + { 342, -1 }, /* (392) in_op ::= IN */ + { 342, -2 }, /* (393) in_op ::= NOT IN */ + { 343, -3 }, /* (394) in_predicate_value ::= NK_LP literal_list NK_RP */ + { 344, -1 }, /* (395) boolean_value_expression ::= boolean_primary */ + { 344, -2 }, /* (396) boolean_value_expression ::= NOT boolean_primary */ + { 344, -3 }, /* (397) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ + { 344, -3 }, /* (398) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ + { 345, -1 }, /* (399) boolean_primary ::= predicate */ + { 345, -3 }, /* (400) boolean_primary ::= NK_LP boolean_value_expression NK_RP */ + { 346, -1 }, /* (401) common_expression ::= expression */ + { 346, -1 }, /* (402) common_expression ::= boolean_value_expression */ + { 347, 0 }, /* (403) from_clause_opt ::= */ + { 347, -2 }, /* (404) from_clause_opt ::= FROM table_reference_list */ + { 348, -1 }, /* (405) table_reference_list ::= table_reference */ + { 348, -3 }, /* (406) table_reference_list ::= table_reference_list NK_COMMA table_reference */ + { 349, -1 }, /* (407) table_reference ::= table_primary */ + { 349, -1 }, /* (408) table_reference ::= joined_table */ + { 350, -2 }, /* (409) table_primary ::= table_name alias_opt */ + { 350, -4 }, /* (410) table_primary ::= db_name NK_DOT table_name alias_opt */ + { 350, -2 }, /* (411) table_primary ::= subquery alias_opt */ + { 350, -1 }, /* (412) table_primary ::= parenthesized_joined_table */ + { 352, 0 }, /* (413) alias_opt ::= */ + { 352, -1 }, /* (414) alias_opt ::= table_alias */ + { 352, -2 }, /* (415) alias_opt ::= AS table_alias */ + { 353, -3 }, /* (416) parenthesized_joined_table ::= NK_LP joined_table NK_RP */ + { 353, -3 }, /* (417) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ + { 351, -6 }, /* (418) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ + { 354, 0 }, /* (419) join_type ::= */ + { 354, -1 }, /* (420) join_type ::= INNER */ + { 356, -12 }, /* (421) query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ + { 357, 0 }, /* (422) set_quantifier_opt ::= */ + { 357, -1 }, /* (423) set_quantifier_opt ::= DISTINCT */ + { 357, -1 }, /* (424) set_quantifier_opt ::= ALL */ + { 358, -1 }, /* (425) select_list ::= select_item */ + { 358, -3 }, /* (426) select_list ::= select_list NK_COMMA select_item */ + { 366, -1 }, /* (427) select_item ::= NK_STAR */ + { 366, -1 }, /* (428) select_item ::= common_expression */ + { 366, -2 }, /* (429) select_item ::= common_expression column_alias */ + { 366, -3 }, /* (430) select_item ::= common_expression AS column_alias */ + { 366, -3 }, /* (431) select_item ::= table_name NK_DOT NK_STAR */ + { 324, 0 }, /* (432) where_clause_opt ::= */ + { 324, -2 }, /* (433) where_clause_opt ::= WHERE search_condition */ + { 359, 0 }, /* (434) partition_by_clause_opt ::= */ + { 359, -3 }, /* (435) partition_by_clause_opt ::= PARTITION BY expression_list */ + { 363, 0 }, /* (436) twindow_clause_opt ::= */ + { 363, -6 }, /* (437) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ + { 363, -4 }, /* (438) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ + { 363, -6 }, /* (439) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ + { 363, -8 }, /* (440) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ + { 310, 0 }, /* (441) sliding_opt ::= */ + { 310, -4 }, /* (442) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ + { 362, 0 }, /* (443) fill_opt ::= */ + { 362, -4 }, /* (444) fill_opt ::= FILL NK_LP fill_mode NK_RP */ + { 362, -6 }, /* (445) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ + { 367, -1 }, /* (446) fill_mode ::= NONE */ + { 367, -1 }, /* (447) fill_mode ::= PREV */ + { 367, -1 }, /* (448) fill_mode ::= NULL */ + { 367, -1 }, /* (449) fill_mode ::= LINEAR */ + { 367, -1 }, /* (450) fill_mode ::= NEXT */ + { 364, 0 }, /* (451) group_by_clause_opt ::= */ + { 364, -3 }, /* (452) group_by_clause_opt ::= GROUP BY group_by_list */ + { 368, -1 }, /* (453) group_by_list ::= expression */ + { 368, -3 }, /* (454) group_by_list ::= group_by_list NK_COMMA expression */ + { 365, 0 }, /* (455) having_clause_opt ::= */ + { 365, -2 }, /* (456) having_clause_opt ::= HAVING search_condition */ + { 360, 0 }, /* (457) range_opt ::= */ + { 360, -6 }, /* (458) range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */ + { 361, 0 }, /* (459) every_opt ::= */ + { 361, -4 }, /* (460) every_opt ::= EVERY NK_LP duration_literal NK_RP */ + { 315, -4 }, /* (461) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ + { 369, -1 }, /* (462) query_expression_body ::= query_primary */ + { 369, -4 }, /* (463) query_expression_body ::= query_expression_body UNION ALL query_expression_body */ + { 369, -3 }, /* (464) query_expression_body ::= query_expression_body UNION query_expression_body */ + { 373, -1 }, /* (465) query_primary ::= query_specification */ + { 373, -6 }, /* (466) query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */ + { 370, 0 }, /* (467) order_by_clause_opt ::= */ + { 370, -3 }, /* (468) order_by_clause_opt ::= ORDER BY sort_specification_list */ + { 371, 0 }, /* (469) slimit_clause_opt ::= */ + { 371, -2 }, /* (470) slimit_clause_opt ::= SLIMIT NK_INTEGER */ + { 371, -4 }, /* (471) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ + { 371, -4 }, /* (472) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + { 372, 0 }, /* (473) limit_clause_opt ::= */ + { 372, -2 }, /* (474) limit_clause_opt ::= LIMIT NK_INTEGER */ + { 372, -4 }, /* (475) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ + { 372, -4 }, /* (476) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + { 334, -3 }, /* (477) subquery ::= NK_LP query_expression NK_RP */ + { 355, -1 }, /* (478) search_condition ::= common_expression */ + { 374, -1 }, /* (479) sort_specification_list ::= sort_specification */ + { 374, -3 }, /* (480) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ + { 375, -3 }, /* (481) sort_specification ::= expression ordering_specification_opt null_ordering_opt */ + { 376, 0 }, /* (482) ordering_specification_opt ::= */ + { 376, -1 }, /* (483) ordering_specification_opt ::= ASC */ + { 376, -1 }, /* (484) ordering_specification_opt ::= DESC */ + { 377, 0 }, /* (485) null_ordering_opt ::= */ + { 377, -2 }, /* (486) null_ordering_opt ::= NULLS FIRST */ + { 377, -2 }, /* (487) null_ordering_opt ::= NULLS LAST */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -3287,11 +3307,11 @@ static YYACTIONTYPE yy_reduce( YYMINORTYPE yylhsminor; case 0: /* cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */ { pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } - yy_destructor(yypParser,255,&yymsp[0].minor); + yy_destructor(yypParser,256,&yymsp[0].minor); break; case 1: /* cmd ::= ALTER ACCOUNT NK_ID alter_account_options */ { pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } - yy_destructor(yypParser,256,&yymsp[0].minor); + yy_destructor(yypParser,257,&yymsp[0].minor); break; case 2: /* account_options ::= */ { } @@ -3305,20 +3325,20 @@ static YYACTIONTYPE yy_reduce( case 9: /* account_options ::= account_options USERS literal */ yytestcase(yyruleno==9); case 10: /* account_options ::= account_options CONNS literal */ yytestcase(yyruleno==10); case 11: /* account_options ::= account_options STATE literal */ yytestcase(yyruleno==11); -{ yy_destructor(yypParser,255,&yymsp[-2].minor); +{ yy_destructor(yypParser,256,&yymsp[-2].minor); { } - yy_destructor(yypParser,257,&yymsp[0].minor); + yy_destructor(yypParser,258,&yymsp[0].minor); } break; case 12: /* alter_account_options ::= alter_account_option */ -{ yy_destructor(yypParser,258,&yymsp[0].minor); +{ yy_destructor(yypParser,259,&yymsp[0].minor); { } } break; case 13: /* alter_account_options ::= alter_account_options alter_account_option */ -{ yy_destructor(yypParser,256,&yymsp[-1].minor); +{ yy_destructor(yypParser,257,&yymsp[-1].minor); { } - yy_destructor(yypParser,258,&yymsp[0].minor); + yy_destructor(yypParser,259,&yymsp[0].minor); } break; case 14: /* alter_account_option ::= PASS literal */ @@ -3332,72 +3352,72 @@ static YYACTIONTYPE yy_reduce( case 22: /* alter_account_option ::= CONNS literal */ yytestcase(yyruleno==22); case 23: /* alter_account_option ::= STATE literal */ yytestcase(yyruleno==23); { } - yy_destructor(yypParser,257,&yymsp[0].minor); + yy_destructor(yypParser,258,&yymsp[0].minor); break; case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */ -{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-3].minor.yy5, &yymsp[-1].minor.yy0, yymsp[0].minor.yy535); } +{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-3].minor.yy533, &yymsp[-1].minor.yy0, yymsp[0].minor.yy719); } break; case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy5, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy533, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); } break; case 26: /* cmd ::= ALTER USER user_name ENABLE NK_INTEGER */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy5, TSDB_ALTER_USER_ENABLE, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy533, TSDB_ALTER_USER_ENABLE, &yymsp[0].minor.yy0); } break; case 27: /* cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy5, TSDB_ALTER_USER_SYSINFO, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy533, TSDB_ALTER_USER_SYSINFO, &yymsp[0].minor.yy0); } break; case 28: /* cmd ::= DROP USER user_name */ -{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy533); } break; case 29: /* sysinfo_opt ::= */ -{ yymsp[1].minor.yy535 = 1; } +{ yymsp[1].minor.yy719 = 1; } break; case 30: /* sysinfo_opt ::= SYSINFO NK_INTEGER */ -{ yymsp[-1].minor.yy535 = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); } +{ yymsp[-1].minor.yy719 = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); } break; case 31: /* cmd ::= GRANT privileges ON priv_level TO user_name */ -{ pCxt->pRootNode = createGrantStmt(pCxt, yymsp[-4].minor.yy311, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createGrantStmt(pCxt, yymsp[-4].minor.yy585, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533); } break; case 32: /* cmd ::= REVOKE privileges ON priv_level FROM user_name */ -{ pCxt->pRootNode = createRevokeStmt(pCxt, yymsp[-4].minor.yy311, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createRevokeStmt(pCxt, yymsp[-4].minor.yy585, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533); } break; case 33: /* privileges ::= ALL */ -{ yymsp[0].minor.yy311 = PRIVILEGE_TYPE_ALL; } +{ yymsp[0].minor.yy585 = PRIVILEGE_TYPE_ALL; } break; case 34: /* privileges ::= priv_type_list */ case 35: /* priv_type_list ::= priv_type */ yytestcase(yyruleno==35); -{ yylhsminor.yy311 = yymsp[0].minor.yy311; } - yymsp[0].minor.yy311 = yylhsminor.yy311; +{ yylhsminor.yy585 = yymsp[0].minor.yy585; } + yymsp[0].minor.yy585 = yylhsminor.yy585; break; case 36: /* priv_type_list ::= priv_type_list NK_COMMA priv_type */ -{ yylhsminor.yy311 = yymsp[-2].minor.yy311 | yymsp[0].minor.yy311; } - yymsp[-2].minor.yy311 = yylhsminor.yy311; +{ yylhsminor.yy585 = yymsp[-2].minor.yy585 | yymsp[0].minor.yy585; } + yymsp[-2].minor.yy585 = yylhsminor.yy585; break; case 37: /* priv_type ::= READ */ -{ yymsp[0].minor.yy311 = PRIVILEGE_TYPE_READ; } +{ yymsp[0].minor.yy585 = PRIVILEGE_TYPE_READ; } break; case 38: /* priv_type ::= WRITE */ -{ yymsp[0].minor.yy311 = PRIVILEGE_TYPE_WRITE; } +{ yymsp[0].minor.yy585 = PRIVILEGE_TYPE_WRITE; } break; case 39: /* priv_level ::= NK_STAR NK_DOT NK_STAR */ -{ yylhsminor.yy5 = yymsp[-2].minor.yy0; } - yymsp[-2].minor.yy5 = yylhsminor.yy5; +{ yylhsminor.yy533 = yymsp[-2].minor.yy0; } + yymsp[-2].minor.yy533 = yylhsminor.yy533; break; case 40: /* priv_level ::= db_name NK_DOT NK_STAR */ -{ yylhsminor.yy5 = yymsp[-2].minor.yy5; } - yymsp[-2].minor.yy5 = yylhsminor.yy5; +{ yylhsminor.yy533 = yymsp[-2].minor.yy533; } + yymsp[-2].minor.yy533 = yylhsminor.yy533; break; case 41: /* cmd ::= CREATE DNODE dnode_endpoint */ -{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy5, NULL); } +{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy533, NULL); } break; case 42: /* cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */ -{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0); } break; case 43: /* cmd ::= DROP DNODE NK_INTEGER */ { pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); } break; case 44: /* cmd ::= DROP DNODE dnode_endpoint */ -{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy533); } break; case 45: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); } @@ -3414,32 +3434,32 @@ static YYACTIONTYPE yy_reduce( case 49: /* dnode_endpoint ::= NK_STRING */ case 50: /* dnode_endpoint ::= NK_ID */ yytestcase(yyruleno==50); case 51: /* dnode_endpoint ::= NK_IPTOKEN */ yytestcase(yyruleno==51); - case 310: /* db_name ::= NK_ID */ yytestcase(yyruleno==310); - case 311: /* table_name ::= NK_ID */ yytestcase(yyruleno==311); - case 312: /* column_name ::= NK_ID */ yytestcase(yyruleno==312); - case 313: /* function_name ::= NK_ID */ yytestcase(yyruleno==313); - case 314: /* table_alias ::= NK_ID */ yytestcase(yyruleno==314); - case 315: /* column_alias ::= NK_ID */ yytestcase(yyruleno==315); - case 316: /* user_name ::= NK_ID */ yytestcase(yyruleno==316); - case 317: /* index_name ::= NK_ID */ yytestcase(yyruleno==317); - case 318: /* topic_name ::= NK_ID */ yytestcase(yyruleno==318); - case 319: /* stream_name ::= NK_ID */ yytestcase(yyruleno==319); - case 320: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==320); - case 355: /* noarg_func ::= NOW */ yytestcase(yyruleno==355); - case 356: /* noarg_func ::= TODAY */ yytestcase(yyruleno==356); - case 357: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==357); - case 358: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==358); - case 359: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==359); - case 360: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==360); - case 361: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==361); - case 362: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==362); - case 363: /* noarg_func ::= USER */ yytestcase(yyruleno==363); - case 364: /* star_func ::= COUNT */ yytestcase(yyruleno==364); - case 365: /* star_func ::= FIRST */ yytestcase(yyruleno==365); - case 366: /* star_func ::= LAST */ yytestcase(yyruleno==366); - case 367: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==367); -{ yylhsminor.yy5 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy5 = yylhsminor.yy5; + case 311: /* db_name ::= NK_ID */ yytestcase(yyruleno==311); + case 312: /* table_name ::= NK_ID */ yytestcase(yyruleno==312); + case 313: /* column_name ::= NK_ID */ yytestcase(yyruleno==313); + case 314: /* function_name ::= NK_ID */ yytestcase(yyruleno==314); + case 315: /* table_alias ::= NK_ID */ yytestcase(yyruleno==315); + case 316: /* column_alias ::= NK_ID */ yytestcase(yyruleno==316); + case 317: /* user_name ::= NK_ID */ yytestcase(yyruleno==317); + case 318: /* index_name ::= NK_ID */ yytestcase(yyruleno==318); + case 319: /* topic_name ::= NK_ID */ yytestcase(yyruleno==319); + case 320: /* stream_name ::= NK_ID */ yytestcase(yyruleno==320); + case 321: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==321); + case 356: /* noarg_func ::= NOW */ yytestcase(yyruleno==356); + case 357: /* noarg_func ::= TODAY */ yytestcase(yyruleno==357); + case 358: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==358); + case 359: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==359); + case 360: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==360); + case 361: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==361); + case 362: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==362); + case 363: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==363); + case 364: /* noarg_func ::= USER */ yytestcase(yyruleno==364); + case 365: /* star_func ::= COUNT */ yytestcase(yyruleno==365); + case 366: /* star_func ::= FIRST */ yytestcase(yyruleno==366); + case 367: /* star_func ::= LAST */ yytestcase(yyruleno==367); + case 368: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==368); +{ yylhsminor.yy533 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy533 = yylhsminor.yy533; break; case 52: /* cmd ::= ALTER LOCAL NK_STRING */ { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); } @@ -3472,1235 +3492,1238 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &yymsp[0].minor.yy0); } break; case 62: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ -{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy403, &yymsp[-1].minor.yy5, yymsp[0].minor.yy652); } +{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy173, &yymsp[-1].minor.yy533, yymsp[0].minor.yy560); } break; case 63: /* cmd ::= DROP DATABASE exists_opt db_name */ -{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy403, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); } break; case 64: /* cmd ::= USE db_name */ -{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy533); } break; case 65: /* cmd ::= ALTER DATABASE db_name alter_db_options */ -{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy5, yymsp[0].minor.yy652); } +{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy533, yymsp[0].minor.yy560); } break; case 66: /* cmd ::= FLUSH DATABASE db_name */ -{ pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &yymsp[0].minor.yy5); } +{ pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &yymsp[0].minor.yy533); } break; - case 67: /* not_exists_opt ::= IF NOT EXISTS */ -{ yymsp[-2].minor.yy403 = true; } + case 67: /* cmd ::= TRIM DATABASE db_name */ +{ pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &yymsp[0].minor.yy533); } break; - case 68: /* not_exists_opt ::= */ - case 70: /* exists_opt ::= */ yytestcase(yyruleno==70); - case 251: /* analyze_opt ::= */ yytestcase(yyruleno==251); - case 259: /* agg_func_opt ::= */ yytestcase(yyruleno==259); - case 421: /* set_quantifier_opt ::= */ yytestcase(yyruleno==421); -{ yymsp[1].minor.yy403 = false; } + case 68: /* not_exists_opt ::= IF NOT EXISTS */ +{ yymsp[-2].minor.yy173 = true; } break; - case 69: /* exists_opt ::= IF EXISTS */ -{ yymsp[-1].minor.yy403 = true; } + case 69: /* not_exists_opt ::= */ + case 71: /* exists_opt ::= */ yytestcase(yyruleno==71); + case 252: /* analyze_opt ::= */ yytestcase(yyruleno==252); + case 260: /* agg_func_opt ::= */ yytestcase(yyruleno==260); + case 422: /* set_quantifier_opt ::= */ yytestcase(yyruleno==422); +{ yymsp[1].minor.yy173 = false; } break; - case 71: /* db_options ::= */ -{ yymsp[1].minor.yy652 = createDefaultDatabaseOptions(pCxt); } + case 70: /* exists_opt ::= IF EXISTS */ +{ yymsp[-1].minor.yy173 = true; } break; - case 72: /* db_options ::= db_options BUFFER NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_BUFFER, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 72: /* db_options ::= */ +{ yymsp[1].minor.yy560 = createDefaultDatabaseOptions(pCxt); } break; - case 73: /* db_options ::= db_options CACHELAST NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 73: /* db_options ::= db_options BUFFER NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_BUFFER, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 74: /* db_options ::= db_options CACHELASTSIZE NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_CACHELASTSIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 74: /* db_options ::= db_options CACHELAST NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 75: /* db_options ::= db_options COMP NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_COMP, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 75: /* db_options ::= db_options CACHELASTSIZE NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_CACHELASTSIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 76: /* db_options ::= db_options DURATION NK_INTEGER */ - case 77: /* db_options ::= db_options DURATION NK_VARIABLE */ yytestcase(yyruleno==77); -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_DAYS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 76: /* db_options ::= db_options COMP NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_COMP, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 78: /* db_options ::= db_options FSYNC NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 77: /* db_options ::= db_options DURATION NK_INTEGER */ + case 78: /* db_options ::= db_options DURATION NK_VARIABLE */ yytestcase(yyruleno==78); +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_DAYS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 79: /* db_options ::= db_options MAXROWS NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 79: /* db_options ::= db_options FSYNC NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 80: /* db_options ::= db_options MINROWS NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 80: /* db_options ::= db_options MAXROWS NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 81: /* db_options ::= db_options KEEP integer_list */ - case 82: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==82); -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_KEEP, yymsp[0].minor.yy210); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 81: /* db_options ::= db_options MINROWS NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 83: /* db_options ::= db_options PAGES NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_PAGES, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 84: /* db_options ::= db_options PAGESIZE NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_PAGESIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 85: /* db_options ::= db_options PRECISION NK_STRING */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 86: /* db_options ::= db_options REPLICA NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 87: /* db_options ::= db_options STRICT NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_STRICT, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 88: /* db_options ::= db_options WAL NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_WAL, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 89: /* db_options ::= db_options VGROUPS NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 90: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 91: /* db_options ::= db_options RETENTIONS retention_list */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_RETENTIONS, yymsp[0].minor.yy210); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 92: /* db_options ::= db_options SCHEMALESS NK_INTEGER */ -{ yylhsminor.yy652 = setDatabaseOption(pCxt, yymsp[-2].minor.yy652, DB_OPTION_SCHEMALESS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 93: /* alter_db_options ::= alter_db_option */ -{ yylhsminor.yy652 = createAlterDatabaseOptions(pCxt); yylhsminor.yy652 = setAlterDatabaseOption(pCxt, yylhsminor.yy652, &yymsp[0].minor.yy351); } - yymsp[0].minor.yy652 = yylhsminor.yy652; - break; - case 94: /* alter_db_options ::= alter_db_options alter_db_option */ -{ yylhsminor.yy652 = setAlterDatabaseOption(pCxt, yymsp[-1].minor.yy652, &yymsp[0].minor.yy351); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; - break; - case 95: /* alter_db_option ::= BUFFER NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_BUFFER; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 96: /* alter_db_option ::= CACHELAST NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 97: /* alter_db_option ::= CACHELASTSIZE NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_CACHELASTSIZE; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 98: /* alter_db_option ::= FSYNC NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 99: /* alter_db_option ::= KEEP integer_list */ - case 100: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==100); -{ yymsp[-1].minor.yy351.type = DB_OPTION_KEEP; yymsp[-1].minor.yy351.pList = yymsp[0].minor.yy210; } - break; - case 101: /* alter_db_option ::= PAGES NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_PAGES; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 102: /* alter_db_option ::= REPLICA NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 103: /* alter_db_option ::= STRICT NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_STRICT; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 104: /* alter_db_option ::= WAL NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = DB_OPTION_WAL; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } - break; - case 105: /* integer_list ::= NK_INTEGER */ -{ yylhsminor.yy210 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy210 = yylhsminor.yy210; - break; - case 106: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */ - case 281: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==281); -{ yylhsminor.yy210 = addNodeToList(pCxt, yymsp[-2].minor.yy210, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy210 = yylhsminor.yy210; - break; - case 107: /* variable_list ::= NK_VARIABLE */ -{ yylhsminor.yy210 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy210 = yylhsminor.yy210; - break; - case 108: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */ -{ yylhsminor.yy210 = addNodeToList(pCxt, yymsp[-2].minor.yy210, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy210 = yylhsminor.yy210; - break; - case 109: /* retention_list ::= retention */ - case 129: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==129); - case 132: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==132); - case 139: /* column_def_list ::= column_def */ yytestcase(yyruleno==139); - case 182: /* rollup_func_list ::= rollup_func_name */ yytestcase(yyruleno==182); - case 187: /* col_name_list ::= col_name */ yytestcase(yyruleno==187); - case 234: /* func_list ::= func */ yytestcase(yyruleno==234); - case 308: /* literal_list ::= signed_literal */ yytestcase(yyruleno==308); - case 370: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==370); - case 424: /* select_list ::= select_item */ yytestcase(yyruleno==424); - case 478: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==478); -{ yylhsminor.yy210 = createNodeList(pCxt, yymsp[0].minor.yy652); } - yymsp[0].minor.yy210 = yylhsminor.yy210; - break; - case 110: /* retention_list ::= retention_list NK_COMMA retention */ - case 140: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==140); - case 183: /* rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ yytestcase(yyruleno==183); - case 188: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==188); - case 235: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==235); - case 309: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==309); - case 371: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==371); - case 425: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==425); - case 479: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==479); -{ yylhsminor.yy210 = addNodeToList(pCxt, yymsp[-2].minor.yy210, yymsp[0].minor.yy652); } - yymsp[-2].minor.yy210 = yylhsminor.yy210; - break; - case 111: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ -{ yylhsminor.yy652 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; - break; - case 112: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ - case 114: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==114); -{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy403, yymsp[-5].minor.yy652, yymsp[-3].minor.yy210, yymsp[-1].minor.yy210, yymsp[0].minor.yy652); } - break; - case 113: /* cmd ::= CREATE TABLE multi_create_clause */ -{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy210); } - break; - case 115: /* cmd ::= DROP TABLE multi_drop_clause */ -{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy210); } - break; - case 116: /* cmd ::= DROP STABLE exists_opt full_table_name */ -{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy403, yymsp[0].minor.yy652); } - break; - case 117: /* cmd ::= ALTER TABLE alter_table_clause */ - case 284: /* cmd ::= query_expression */ yytestcase(yyruleno==284); -{ pCxt->pRootNode = yymsp[0].minor.yy652; } - break; - case 118: /* cmd ::= ALTER STABLE alter_table_clause */ -{ pCxt->pRootNode = setAlterSuperTableType(yymsp[0].minor.yy652); } - break; - case 119: /* alter_table_clause ::= full_table_name alter_table_options */ -{ yylhsminor.yy652 = createAlterTableModifyOptions(pCxt, yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 82: /* db_options ::= db_options KEEP integer_list */ + case 83: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==83); +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_KEEP, yymsp[0].minor.yy712); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 120: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ -{ yylhsminor.yy652 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy652, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy5, yymsp[0].minor.yy552); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 84: /* db_options ::= db_options PAGES NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_PAGES, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 121: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */ -{ yylhsminor.yy652 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy652, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy5); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; - break; - case 122: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ -{ yylhsminor.yy652 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy652, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy5, yymsp[0].minor.yy552); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 85: /* db_options ::= db_options PAGESIZE NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_PAGESIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 123: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ -{ yylhsminor.yy652 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy652, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy5, &yymsp[0].minor.yy5); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 86: /* db_options ::= db_options PRECISION NK_STRING */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 87: /* db_options ::= db_options REPLICA NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 88: /* db_options ::= db_options STRICT NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_STRICT, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 89: /* db_options ::= db_options WAL NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_WAL, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 90: /* db_options ::= db_options VGROUPS NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 91: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 92: /* db_options ::= db_options RETENTIONS retention_list */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_RETENTIONS, yymsp[0].minor.yy712); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 93: /* db_options ::= db_options SCHEMALESS NK_INTEGER */ +{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_SCHEMALESS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 94: /* alter_db_options ::= alter_db_option */ +{ yylhsminor.yy560 = createAlterDatabaseOptions(pCxt); yylhsminor.yy560 = setAlterDatabaseOption(pCxt, yylhsminor.yy560, &yymsp[0].minor.yy389); } + yymsp[0].minor.yy560 = yylhsminor.yy560; + break; + case 95: /* alter_db_options ::= alter_db_options alter_db_option */ +{ yylhsminor.yy560 = setAlterDatabaseOption(pCxt, yymsp[-1].minor.yy560, &yymsp[0].minor.yy389); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; + break; + case 96: /* alter_db_option ::= BUFFER NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_BUFFER; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 97: /* alter_db_option ::= CACHELAST NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 98: /* alter_db_option ::= CACHELASTSIZE NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_CACHELASTSIZE; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 99: /* alter_db_option ::= FSYNC NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 100: /* alter_db_option ::= KEEP integer_list */ + case 101: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==101); +{ yymsp[-1].minor.yy389.type = DB_OPTION_KEEP; yymsp[-1].minor.yy389.pList = yymsp[0].minor.yy712; } + break; + case 102: /* alter_db_option ::= PAGES NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_PAGES; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 103: /* alter_db_option ::= REPLICA NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 104: /* alter_db_option ::= STRICT NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_STRICT; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 105: /* alter_db_option ::= WAL NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = DB_OPTION_WAL; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } + break; + case 106: /* integer_list ::= NK_INTEGER */ +{ yylhsminor.yy712 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy712 = yylhsminor.yy712; + break; + case 107: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */ + case 282: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==282); +{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy712 = yylhsminor.yy712; + break; + case 108: /* variable_list ::= NK_VARIABLE */ +{ yylhsminor.yy712 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy712 = yylhsminor.yy712; + break; + case 109: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */ +{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy712 = yylhsminor.yy712; + break; + case 110: /* retention_list ::= retention */ + case 130: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==130); + case 133: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==133); + case 140: /* column_def_list ::= column_def */ yytestcase(yyruleno==140); + case 183: /* rollup_func_list ::= rollup_func_name */ yytestcase(yyruleno==183); + case 188: /* col_name_list ::= col_name */ yytestcase(yyruleno==188); + case 235: /* func_list ::= func */ yytestcase(yyruleno==235); + case 309: /* literal_list ::= signed_literal */ yytestcase(yyruleno==309); + case 371: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==371); + case 425: /* select_list ::= select_item */ yytestcase(yyruleno==425); + case 479: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==479); +{ yylhsminor.yy712 = createNodeList(pCxt, yymsp[0].minor.yy560); } + yymsp[0].minor.yy712 = yylhsminor.yy712; + break; + case 111: /* retention_list ::= retention_list NK_COMMA retention */ + case 141: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==141); + case 184: /* rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ yytestcase(yyruleno==184); + case 189: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==189); + case 236: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==236); + case 310: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==310); + case 372: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==372); + case 426: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==426); + case 480: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==480); +{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, yymsp[0].minor.yy560); } + yymsp[-2].minor.yy712 = yylhsminor.yy712; + break; + case 112: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ +{ yylhsminor.yy560 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; + break; + case 113: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ + case 115: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==115); +{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy173, yymsp[-5].minor.yy560, yymsp[-3].minor.yy712, yymsp[-1].minor.yy712, yymsp[0].minor.yy560); } + break; + case 114: /* cmd ::= CREATE TABLE multi_create_clause */ +{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy712); } + break; + case 116: /* cmd ::= DROP TABLE multi_drop_clause */ +{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy712); } + break; + case 117: /* cmd ::= DROP STABLE exists_opt full_table_name */ +{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy173, yymsp[0].minor.yy560); } + break; + case 118: /* cmd ::= ALTER TABLE alter_table_clause */ + case 285: /* cmd ::= query_expression */ yytestcase(yyruleno==285); +{ pCxt->pRootNode = yymsp[0].minor.yy560; } + break; + case 119: /* cmd ::= ALTER STABLE alter_table_clause */ +{ pCxt->pRootNode = setAlterSuperTableType(yymsp[0].minor.yy560); } + break; + case 120: /* alter_table_clause ::= full_table_name alter_table_options */ +{ yylhsminor.yy560 = createAlterTableModifyOptions(pCxt, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 124: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */ -{ yylhsminor.yy652 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy652, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy5, yymsp[0].minor.yy552); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 121: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ +{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 125: /* alter_table_clause ::= full_table_name DROP TAG column_name */ -{ yylhsminor.yy652 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy652, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy5); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 122: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */ +{ yylhsminor.yy560 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy560, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy533); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; + break; + case 123: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ +{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 126: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ -{ yylhsminor.yy652 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy652, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy5, yymsp[0].minor.yy552); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 124: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ +{ yylhsminor.yy560 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 127: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ -{ yylhsminor.yy652 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy652, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy5, &yymsp[0].minor.yy5); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 125: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */ +{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 128: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */ -{ yylhsminor.yy652 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy652, &yymsp[-2].minor.yy5, yymsp[0].minor.yy652); } - yymsp[-5].minor.yy652 = yylhsminor.yy652; + case 126: /* alter_table_clause ::= full_table_name DROP TAG column_name */ +{ yylhsminor.yy560 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy560, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy533); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 130: /* multi_create_clause ::= multi_create_clause create_subtable_clause */ - case 133: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==133); -{ yylhsminor.yy210 = addNodeToList(pCxt, yymsp[-1].minor.yy210, yymsp[0].minor.yy652); } - yymsp[-1].minor.yy210 = yylhsminor.yy210; + case 127: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ +{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 131: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */ -{ yylhsminor.yy652 = createCreateSubTableClause(pCxt, yymsp[-9].minor.yy403, yymsp[-8].minor.yy652, yymsp[-6].minor.yy652, yymsp[-5].minor.yy210, yymsp[-2].minor.yy210, yymsp[0].minor.yy652); } - yymsp[-9].minor.yy652 = yylhsminor.yy652; + case 128: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ +{ yylhsminor.yy560 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 134: /* drop_table_clause ::= exists_opt full_table_name */ -{ yylhsminor.yy652 = createDropTableClause(pCxt, yymsp[-1].minor.yy403, yymsp[0].minor.yy652); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 129: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */ +{ yylhsminor.yy560 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy560, &yymsp[-2].minor.yy533, yymsp[0].minor.yy560); } + yymsp[-5].minor.yy560 = yylhsminor.yy560; break; - case 135: /* specific_cols_opt ::= */ - case 166: /* tags_def_opt ::= */ yytestcase(yyruleno==166); - case 433: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==433); - case 450: /* group_by_clause_opt ::= */ yytestcase(yyruleno==450); - case 466: /* order_by_clause_opt ::= */ yytestcase(yyruleno==466); -{ yymsp[1].minor.yy210 = NULL; } + case 131: /* multi_create_clause ::= multi_create_clause create_subtable_clause */ + case 134: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==134); +{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-1].minor.yy712, yymsp[0].minor.yy560); } + yymsp[-1].minor.yy712 = yylhsminor.yy712; break; - case 136: /* specific_cols_opt ::= NK_LP col_name_list NK_RP */ -{ yymsp[-2].minor.yy210 = yymsp[-1].minor.yy210; } + case 132: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */ +{ yylhsminor.yy560 = createCreateSubTableClause(pCxt, yymsp[-9].minor.yy173, yymsp[-8].minor.yy560, yymsp[-6].minor.yy560, yymsp[-5].minor.yy712, yymsp[-2].minor.yy712, yymsp[0].minor.yy560); } + yymsp[-9].minor.yy560 = yylhsminor.yy560; break; - case 137: /* full_table_name ::= table_name */ -{ yylhsminor.yy652 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy5, NULL); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 135: /* drop_table_clause ::= exists_opt full_table_name */ +{ yylhsminor.yy560 = createDropTableClause(pCxt, yymsp[-1].minor.yy173, yymsp[0].minor.yy560); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 138: /* full_table_name ::= db_name NK_DOT table_name */ -{ yylhsminor.yy652 = createRealTableNode(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy5, NULL); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 136: /* specific_cols_opt ::= */ + case 167: /* tags_def_opt ::= */ yytestcase(yyruleno==167); + case 434: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==434); + case 451: /* group_by_clause_opt ::= */ yytestcase(yyruleno==451); + case 467: /* order_by_clause_opt ::= */ yytestcase(yyruleno==467); +{ yymsp[1].minor.yy712 = NULL; } break; - case 141: /* column_def ::= column_name type_name */ -{ yylhsminor.yy652 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy5, yymsp[0].minor.yy552, NULL); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 137: /* specific_cols_opt ::= NK_LP col_name_list NK_RP */ +{ yymsp[-2].minor.yy712 = yymsp[-1].minor.yy712; } break; - case 142: /* column_def ::= column_name type_name COMMENT NK_STRING */ -{ yylhsminor.yy652 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy5, yymsp[-2].minor.yy552, &yymsp[0].minor.yy0); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 138: /* full_table_name ::= table_name */ +{ yylhsminor.yy560 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy533, NULL); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 143: /* type_name ::= BOOL */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_BOOL); } + case 139: /* full_table_name ::= db_name NK_DOT table_name */ +{ yylhsminor.yy560 = createRealTableNode(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533, NULL); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 144: /* type_name ::= TINYINT */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_TINYINT); } + case 142: /* column_def ::= column_name type_name */ +{ yylhsminor.yy560 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196, NULL); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 145: /* type_name ::= SMALLINT */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_SMALLINT); } + case 143: /* column_def ::= column_name type_name COMMENT NK_STRING */ +{ yylhsminor.yy560 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy533, yymsp[-2].minor.yy196, &yymsp[0].minor.yy0); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 146: /* type_name ::= INT */ - case 147: /* type_name ::= INTEGER */ yytestcase(yyruleno==147); -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_INT); } + case 144: /* type_name ::= BOOL */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_BOOL); } break; - case 148: /* type_name ::= BIGINT */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_BIGINT); } + case 145: /* type_name ::= TINYINT */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_TINYINT); } break; - case 149: /* type_name ::= FLOAT */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_FLOAT); } + case 146: /* type_name ::= SMALLINT */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_SMALLINT); } break; - case 150: /* type_name ::= DOUBLE */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_DOUBLE); } + case 147: /* type_name ::= INT */ + case 148: /* type_name ::= INTEGER */ yytestcase(yyruleno==148); +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_INT); } break; - case 151: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy552 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); } + case 149: /* type_name ::= BIGINT */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_BIGINT); } break; - case 152: /* type_name ::= TIMESTAMP */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); } + case 150: /* type_name ::= FLOAT */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_FLOAT); } break; - case 153: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy552 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); } + case 151: /* type_name ::= DOUBLE */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_DOUBLE); } break; - case 154: /* type_name ::= TINYINT UNSIGNED */ -{ yymsp[-1].minor.yy552 = createDataType(TSDB_DATA_TYPE_UTINYINT); } + case 152: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); } break; - case 155: /* type_name ::= SMALLINT UNSIGNED */ -{ yymsp[-1].minor.yy552 = createDataType(TSDB_DATA_TYPE_USMALLINT); } + case 153: /* type_name ::= TIMESTAMP */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); } break; - case 156: /* type_name ::= INT UNSIGNED */ -{ yymsp[-1].minor.yy552 = createDataType(TSDB_DATA_TYPE_UINT); } + case 154: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); } break; - case 157: /* type_name ::= BIGINT UNSIGNED */ -{ yymsp[-1].minor.yy552 = createDataType(TSDB_DATA_TYPE_UBIGINT); } + case 155: /* type_name ::= TINYINT UNSIGNED */ +{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_UTINYINT); } break; - case 158: /* type_name ::= JSON */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_JSON); } + case 156: /* type_name ::= SMALLINT UNSIGNED */ +{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_USMALLINT); } break; - case 159: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy552 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); } + case 157: /* type_name ::= INT UNSIGNED */ +{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_UINT); } break; - case 160: /* type_name ::= MEDIUMBLOB */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); } + case 158: /* type_name ::= BIGINT UNSIGNED */ +{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_UBIGINT); } break; - case 161: /* type_name ::= BLOB */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_BLOB); } + case 159: /* type_name ::= JSON */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_JSON); } break; - case 162: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy552 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); } + case 160: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); } break; - case 163: /* type_name ::= DECIMAL */ -{ yymsp[0].minor.yy552 = createDataType(TSDB_DATA_TYPE_DECIMAL); } + case 161: /* type_name ::= MEDIUMBLOB */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); } break; - case 164: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy552 = createDataType(TSDB_DATA_TYPE_DECIMAL); } + case 162: /* type_name ::= BLOB */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_BLOB); } break; - case 165: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ -{ yymsp[-5].minor.yy552 = createDataType(TSDB_DATA_TYPE_DECIMAL); } + case 163: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); } break; - case 167: /* tags_def_opt ::= tags_def */ - case 369: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==369); -{ yylhsminor.yy210 = yymsp[0].minor.yy210; } - yymsp[0].minor.yy210 = yylhsminor.yy210; + case 164: /* type_name ::= DECIMAL */ +{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; - case 168: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */ -{ yymsp[-3].minor.yy210 = yymsp[-1].minor.yy210; } + case 165: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy196 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; - case 169: /* table_options ::= */ -{ yymsp[1].minor.yy652 = createDefaultTableOptions(pCxt); } + case 166: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ +{ yymsp[-5].minor.yy196 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; - case 170: /* table_options ::= table_options COMMENT NK_STRING */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-2].minor.yy652, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 168: /* tags_def_opt ::= tags_def */ + case 370: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==370); +{ yylhsminor.yy712 = yymsp[0].minor.yy712; } + yymsp[0].minor.yy712 = yylhsminor.yy712; break; - case 171: /* table_options ::= table_options MAX_DELAY duration_list */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-2].minor.yy652, TABLE_OPTION_MAXDELAY, yymsp[0].minor.yy210); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 169: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */ +{ yymsp[-3].minor.yy712 = yymsp[-1].minor.yy712; } break; - case 172: /* table_options ::= table_options WATERMARK duration_list */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-2].minor.yy652, TABLE_OPTION_WATERMARK, yymsp[0].minor.yy210); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 170: /* table_options ::= */ +{ yymsp[1].minor.yy560 = createDefaultTableOptions(pCxt); } break; - case 173: /* table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-4].minor.yy652, TABLE_OPTION_ROLLUP, yymsp[-1].minor.yy210); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 171: /* table_options ::= table_options COMMENT NK_STRING */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 174: /* table_options ::= table_options TTL NK_INTEGER */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-2].minor.yy652, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 172: /* table_options ::= table_options MAX_DELAY duration_list */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_MAXDELAY, yymsp[0].minor.yy712); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 175: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-4].minor.yy652, TABLE_OPTION_SMA, yymsp[-1].minor.yy210); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + case 173: /* table_options ::= table_options WATERMARK duration_list */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_WATERMARK, yymsp[0].minor.yy712); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 176: /* alter_table_options ::= alter_table_option */ -{ yylhsminor.yy652 = createAlterTableOptions(pCxt); yylhsminor.yy652 = setTableOption(pCxt, yylhsminor.yy652, yymsp[0].minor.yy351.type, &yymsp[0].minor.yy351.val); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 174: /* table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-4].minor.yy560, TABLE_OPTION_ROLLUP, yymsp[-1].minor.yy712); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 177: /* alter_table_options ::= alter_table_options alter_table_option */ -{ yylhsminor.yy652 = setTableOption(pCxt, yymsp[-1].minor.yy652, yymsp[0].minor.yy351.type, &yymsp[0].minor.yy351.val); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 175: /* table_options ::= table_options TTL NK_INTEGER */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 178: /* alter_table_option ::= COMMENT NK_STRING */ -{ yymsp[-1].minor.yy351.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } + case 176: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-4].minor.yy560, TABLE_OPTION_SMA, yymsp[-1].minor.yy712); } + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 179: /* alter_table_option ::= TTL NK_INTEGER */ -{ yymsp[-1].minor.yy351.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy351.val = yymsp[0].minor.yy0; } + case 177: /* alter_table_options ::= alter_table_option */ +{ yylhsminor.yy560 = createAlterTableOptions(pCxt); yylhsminor.yy560 = setTableOption(pCxt, yylhsminor.yy560, yymsp[0].minor.yy389.type, &yymsp[0].minor.yy389.val); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 180: /* duration_list ::= duration_literal */ - case 337: /* expression_list ::= expression */ yytestcase(yyruleno==337); -{ yylhsminor.yy210 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy652)); } - yymsp[0].minor.yy210 = yylhsminor.yy210; + case 178: /* alter_table_options ::= alter_table_options alter_table_option */ +{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-1].minor.yy560, yymsp[0].minor.yy389.type, &yymsp[0].minor.yy389.val); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 181: /* duration_list ::= duration_list NK_COMMA duration_literal */ - case 338: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==338); -{ yylhsminor.yy210 = addNodeToList(pCxt, yymsp[-2].minor.yy210, releaseRawExprNode(pCxt, yymsp[0].minor.yy652)); } - yymsp[-2].minor.yy210 = yylhsminor.yy210; + case 179: /* alter_table_option ::= COMMENT NK_STRING */ +{ yymsp[-1].minor.yy389.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } break; - case 184: /* rollup_func_name ::= function_name */ -{ yylhsminor.yy652 = createFunctionNode(pCxt, &yymsp[0].minor.yy5, NULL); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 180: /* alter_table_option ::= TTL NK_INTEGER */ +{ yymsp[-1].minor.yy389.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; } break; - case 185: /* rollup_func_name ::= FIRST */ - case 186: /* rollup_func_name ::= LAST */ yytestcase(yyruleno==186); -{ yylhsminor.yy652 = createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 181: /* duration_list ::= duration_literal */ + case 338: /* expression_list ::= expression */ yytestcase(yyruleno==338); +{ yylhsminor.yy712 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy560)); } + yymsp[0].minor.yy712 = yylhsminor.yy712; break; - case 189: /* col_name ::= column_name */ -{ yylhsminor.yy652 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy5); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 182: /* duration_list ::= duration_list NK_COMMA duration_literal */ + case 339: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==339); +{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, releaseRawExprNode(pCxt, yymsp[0].minor.yy560)); } + yymsp[-2].minor.yy712 = yylhsminor.yy712; break; - case 190: /* cmd ::= SHOW DNODES */ + case 185: /* rollup_func_name ::= function_name */ +{ yylhsminor.yy560 = createFunctionNode(pCxt, &yymsp[0].minor.yy533, NULL); } + yymsp[0].minor.yy560 = yylhsminor.yy560; + break; + case 186: /* rollup_func_name ::= FIRST */ + case 187: /* rollup_func_name ::= LAST */ yytestcase(yyruleno==187); +{ yylhsminor.yy560 = createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL); } + yymsp[0].minor.yy560 = yylhsminor.yy560; + break; + case 190: /* col_name ::= column_name */ +{ yylhsminor.yy560 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy533); } + yymsp[0].minor.yy560 = yylhsminor.yy560; + break; + case 191: /* cmd ::= SHOW DNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT); } break; - case 191: /* cmd ::= SHOW USERS */ + case 192: /* cmd ::= SHOW USERS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_USERS_STMT); } break; - case 192: /* cmd ::= SHOW DATABASES */ + case 193: /* cmd ::= SHOW DATABASES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT); } break; - case 193: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy652, yymsp[0].minor.yy652, OP_TYPE_LIKE); } + case 194: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy560, yymsp[0].minor.yy560, OP_TYPE_LIKE); } break; - case 194: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy652, yymsp[0].minor.yy652, OP_TYPE_LIKE); } + case 195: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy560, yymsp[0].minor.yy560, OP_TYPE_LIKE); } break; - case 195: /* cmd ::= SHOW db_name_cond_opt VGROUPS */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy652, NULL, OP_TYPE_LIKE); } + case 196: /* cmd ::= SHOW db_name_cond_opt VGROUPS */ +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy560, NULL, OP_TYPE_LIKE); } break; - case 196: /* cmd ::= SHOW MNODES */ + case 197: /* cmd ::= SHOW MNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT); } break; - case 197: /* cmd ::= SHOW MODULES */ + case 198: /* cmd ::= SHOW MODULES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MODULES_STMT); } break; - case 198: /* cmd ::= SHOW QNODES */ + case 199: /* cmd ::= SHOW QNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT); } break; - case 199: /* cmd ::= SHOW FUNCTIONS */ + case 200: /* cmd ::= SHOW FUNCTIONS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT); } break; - case 200: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[0].minor.yy652, yymsp[-1].minor.yy652, OP_TYPE_EQUAL); } + case 201: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[0].minor.yy560, yymsp[-1].minor.yy560, OP_TYPE_EQUAL); } break; - case 201: /* cmd ::= SHOW STREAMS */ + case 202: /* cmd ::= SHOW STREAMS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT); } break; - case 202: /* cmd ::= SHOW ACCOUNTS */ + case 203: /* cmd ::= SHOW ACCOUNTS */ { pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } break; - case 203: /* cmd ::= SHOW APPS */ + case 204: /* cmd ::= SHOW APPS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT); } break; - case 204: /* cmd ::= SHOW CONNECTIONS */ + case 205: /* cmd ::= SHOW CONNECTIONS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT); } break; - case 205: /* cmd ::= SHOW LICENCE */ - case 206: /* cmd ::= SHOW GRANTS */ yytestcase(yyruleno==206); + case 206: /* cmd ::= SHOW LICENCE */ + case 207: /* cmd ::= SHOW GRANTS */ yytestcase(yyruleno==207); { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT); } break; - case 207: /* cmd ::= SHOW CREATE DATABASE db_name */ -{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy5); } + case 208: /* cmd ::= SHOW CREATE DATABASE db_name */ +{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy533); } break; - case 208: /* cmd ::= SHOW CREATE TABLE full_table_name */ -{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy652); } + case 209: /* cmd ::= SHOW CREATE TABLE full_table_name */ +{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy560); } break; - case 209: /* cmd ::= SHOW CREATE STABLE full_table_name */ -{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy652); } + case 210: /* cmd ::= SHOW CREATE STABLE full_table_name */ +{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy560); } break; - case 210: /* cmd ::= SHOW QUERIES */ + case 211: /* cmd ::= SHOW QUERIES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT); } break; - case 211: /* cmd ::= SHOW SCORES */ + case 212: /* cmd ::= SHOW SCORES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SCORES_STMT); } break; - case 212: /* cmd ::= SHOW TOPICS */ + case 213: /* cmd ::= SHOW TOPICS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TOPICS_STMT); } break; - case 213: /* cmd ::= SHOW VARIABLES */ + case 214: /* cmd ::= SHOW VARIABLES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VARIABLES_STMT); } break; - case 214: /* cmd ::= SHOW LOCAL VARIABLES */ + case 215: /* cmd ::= SHOW LOCAL VARIABLES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LOCAL_VARIABLES_STMT); } break; - case 215: /* cmd ::= SHOW DNODE NK_INTEGER VARIABLES */ + case 216: /* cmd ::= SHOW DNODE NK_INTEGER VARIABLES */ { pCxt->pRootNode = createShowDnodeVariablesStmt(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[-1].minor.yy0)); } break; - case 216: /* cmd ::= SHOW BNODES */ + case 217: /* cmd ::= SHOW BNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_BNODES_STMT); } break; - case 217: /* cmd ::= SHOW SNODES */ + case 218: /* cmd ::= SHOW SNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SNODES_STMT); } break; - case 218: /* cmd ::= SHOW CLUSTER */ + case 219: /* cmd ::= SHOW CLUSTER */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CLUSTER_STMT); } break; - case 219: /* cmd ::= SHOW TRANSACTIONS */ + case 220: /* cmd ::= SHOW TRANSACTIONS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TRANSACTIONS_STMT); } break; - case 220: /* cmd ::= SHOW TABLE DISTRIBUTED full_table_name */ -{ pCxt->pRootNode = createShowTableDistributedStmt(pCxt, yymsp[0].minor.yy652); } + case 221: /* cmd ::= SHOW TABLE DISTRIBUTED full_table_name */ +{ pCxt->pRootNode = createShowTableDistributedStmt(pCxt, yymsp[0].minor.yy560); } break; - case 221: /* cmd ::= SHOW CONSUMERS */ + case 222: /* cmd ::= SHOW CONSUMERS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONSUMERS_STMT); } break; - case 222: /* cmd ::= SHOW SUBSCRIPTIONS */ + case 223: /* cmd ::= SHOW SUBSCRIPTIONS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT); } break; - case 223: /* db_name_cond_opt ::= */ - case 228: /* from_db_opt ::= */ yytestcase(yyruleno==228); -{ yymsp[1].minor.yy652 = createDefaultDatabaseCondValue(pCxt); } + case 224: /* db_name_cond_opt ::= */ + case 229: /* from_db_opt ::= */ yytestcase(yyruleno==229); +{ yymsp[1].minor.yy560 = createDefaultDatabaseCondValue(pCxt); } break; - case 224: /* db_name_cond_opt ::= db_name NK_DOT */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy5); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 225: /* db_name_cond_opt ::= db_name NK_DOT */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy533); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 225: /* like_pattern_opt ::= */ - case 265: /* into_opt ::= */ yytestcase(yyruleno==265); - case 402: /* from_clause_opt ::= */ yytestcase(yyruleno==402); - case 431: /* where_clause_opt ::= */ yytestcase(yyruleno==431); - case 435: /* twindow_clause_opt ::= */ yytestcase(yyruleno==435); - case 440: /* sliding_opt ::= */ yytestcase(yyruleno==440); - case 442: /* fill_opt ::= */ yytestcase(yyruleno==442); - case 454: /* having_clause_opt ::= */ yytestcase(yyruleno==454); - case 456: /* range_opt ::= */ yytestcase(yyruleno==456); - case 458: /* every_opt ::= */ yytestcase(yyruleno==458); - case 468: /* slimit_clause_opt ::= */ yytestcase(yyruleno==468); - case 472: /* limit_clause_opt ::= */ yytestcase(yyruleno==472); -{ yymsp[1].minor.yy652 = NULL; } + case 226: /* like_pattern_opt ::= */ + case 266: /* into_opt ::= */ yytestcase(yyruleno==266); + case 403: /* from_clause_opt ::= */ yytestcase(yyruleno==403); + case 432: /* where_clause_opt ::= */ yytestcase(yyruleno==432); + case 436: /* twindow_clause_opt ::= */ yytestcase(yyruleno==436); + case 441: /* sliding_opt ::= */ yytestcase(yyruleno==441); + case 443: /* fill_opt ::= */ yytestcase(yyruleno==443); + case 455: /* having_clause_opt ::= */ yytestcase(yyruleno==455); + case 457: /* range_opt ::= */ yytestcase(yyruleno==457); + case 459: /* every_opt ::= */ yytestcase(yyruleno==459); + case 469: /* slimit_clause_opt ::= */ yytestcase(yyruleno==469); + case 473: /* limit_clause_opt ::= */ yytestcase(yyruleno==473); +{ yymsp[1].minor.yy560 = NULL; } break; - case 226: /* like_pattern_opt ::= LIKE NK_STRING */ -{ yymsp[-1].minor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } + case 227: /* like_pattern_opt ::= LIKE NK_STRING */ +{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } break; - case 227: /* table_name_cond ::= table_name */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy5); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 228: /* table_name_cond ::= table_name */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy533); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 229: /* from_db_opt ::= FROM db_name */ -{ yymsp[-1].minor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy5); } + case 230: /* from_db_opt ::= FROM db_name */ +{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy533); } break; - case 230: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ -{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy403, &yymsp[-3].minor.yy5, &yymsp[-1].minor.yy5, NULL, yymsp[0].minor.yy652); } + case 231: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ +{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy533, &yymsp[-1].minor.yy533, NULL, yymsp[0].minor.yy560); } break; - case 231: /* cmd ::= DROP INDEX exists_opt index_name */ -{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-1].minor.yy403, &yymsp[0].minor.yy5); } + case 232: /* cmd ::= DROP INDEX exists_opt index_name */ +{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); } break; - case 232: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ -{ yymsp[-9].minor.yy652 = createIndexOption(pCxt, yymsp[-7].minor.yy210, releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), NULL, yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } + case 233: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ +{ yymsp[-9].minor.yy560 = createIndexOption(pCxt, yymsp[-7].minor.yy712, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), NULL, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } break; - case 233: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ -{ yymsp[-11].minor.yy652 = createIndexOption(pCxt, yymsp[-9].minor.yy210, releaseRawExprNode(pCxt, yymsp[-5].minor.yy652), releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } + case 234: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ +{ yymsp[-11].minor.yy560 = createIndexOption(pCxt, yymsp[-9].minor.yy712, releaseRawExprNode(pCxt, yymsp[-5].minor.yy560), releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } break; - case 236: /* func ::= function_name NK_LP expression_list NK_RP */ -{ yylhsminor.yy652 = createFunctionNode(pCxt, &yymsp[-3].minor.yy5, yymsp[-1].minor.yy210); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 237: /* func ::= function_name NK_LP expression_list NK_RP */ +{ yylhsminor.yy560 = createFunctionNode(pCxt, &yymsp[-3].minor.yy533, yymsp[-1].minor.yy712); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 237: /* sma_stream_opt ::= */ - case 267: /* stream_options ::= */ yytestcase(yyruleno==267); -{ yymsp[1].minor.yy652 = createStreamOptions(pCxt); } + case 238: /* sma_stream_opt ::= */ + case 268: /* stream_options ::= */ yytestcase(yyruleno==268); +{ yymsp[1].minor.yy560 = createStreamOptions(pCxt); } break; - case 238: /* sma_stream_opt ::= stream_options WATERMARK duration_literal */ - case 271: /* stream_options ::= stream_options WATERMARK duration_literal */ yytestcase(yyruleno==271); -{ ((SStreamOptions*)yymsp[-2].minor.yy652)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy652); yylhsminor.yy652 = yymsp[-2].minor.yy652; } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 239: /* sma_stream_opt ::= stream_options WATERMARK duration_literal */ + case 272: /* stream_options ::= stream_options WATERMARK duration_literal */ yytestcase(yyruleno==272); +{ ((SStreamOptions*)yymsp[-2].minor.yy560)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); yylhsminor.yy560 = yymsp[-2].minor.yy560; } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 239: /* sma_stream_opt ::= stream_options MAX_DELAY duration_literal */ -{ ((SStreamOptions*)yymsp[-2].minor.yy652)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy652); yylhsminor.yy652 = yymsp[-2].minor.yy652; } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 240: /* sma_stream_opt ::= stream_options MAX_DELAY duration_literal */ +{ ((SStreamOptions*)yymsp[-2].minor.yy560)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); yylhsminor.yy560 = yymsp[-2].minor.yy560; } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 240: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ -{ pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, yymsp[-3].minor.yy403, &yymsp[-2].minor.yy5, yymsp[0].minor.yy652); } + case 241: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ +{ pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy533, yymsp[0].minor.yy560); } break; - case 241: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-4].minor.yy403, &yymsp[-3].minor.yy5, &yymsp[0].minor.yy5, false); } + case 242: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy533, &yymsp[0].minor.yy533, false); } break; - case 242: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-6].minor.yy403, &yymsp[-5].minor.yy5, &yymsp[0].minor.yy5, true); } + case 243: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-6].minor.yy173, &yymsp[-5].minor.yy533, &yymsp[0].minor.yy533, true); } break; - case 243: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-4].minor.yy403, &yymsp[-3].minor.yy5, yymsp[0].minor.yy652, false); } + case 244: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy533, yymsp[0].minor.yy560, false); } break; - case 244: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-6].minor.yy403, &yymsp[-5].minor.yy5, yymsp[0].minor.yy652, true); } + case 245: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-6].minor.yy173, &yymsp[-5].minor.yy533, yymsp[0].minor.yy560, true); } break; - case 245: /* cmd ::= DROP TOPIC exists_opt topic_name */ -{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy403, &yymsp[0].minor.yy5); } + case 246: /* cmd ::= DROP TOPIC exists_opt topic_name */ +{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); } break; - case 246: /* cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ -{ pCxt->pRootNode = createDropCGroupStmt(pCxt, yymsp[-3].minor.yy403, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy5); } + case 247: /* cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ +{ pCxt->pRootNode = createDropCGroupStmt(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533); } break; - case 247: /* cmd ::= DESC full_table_name */ - case 248: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==248); -{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy652); } + case 248: /* cmd ::= DESC full_table_name */ + case 249: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==249); +{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy560); } break; - case 249: /* cmd ::= RESET QUERY CACHE */ + case 250: /* cmd ::= RESET QUERY CACHE */ { pCxt->pRootNode = createResetQueryCacheStmt(pCxt); } break; - case 250: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */ -{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy403, yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } + case 251: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */ +{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy173, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } break; - case 252: /* analyze_opt ::= ANALYZE */ - case 260: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==260); - case 422: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==422); -{ yymsp[0].minor.yy403 = true; } + case 253: /* analyze_opt ::= ANALYZE */ + case 261: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==261); + case 423: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==423); +{ yymsp[0].minor.yy173 = true; } break; - case 253: /* explain_options ::= */ -{ yymsp[1].minor.yy652 = createDefaultExplainOptions(pCxt); } + case 254: /* explain_options ::= */ +{ yymsp[1].minor.yy560 = createDefaultExplainOptions(pCxt); } break; - case 254: /* explain_options ::= explain_options VERBOSE NK_BOOL */ -{ yylhsminor.yy652 = setExplainVerbose(pCxt, yymsp[-2].minor.yy652, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 255: /* explain_options ::= explain_options VERBOSE NK_BOOL */ +{ yylhsminor.yy560 = setExplainVerbose(pCxt, yymsp[-2].minor.yy560, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 255: /* explain_options ::= explain_options RATIO NK_FLOAT */ -{ yylhsminor.yy652 = setExplainRatio(pCxt, yymsp[-2].minor.yy652, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 256: /* explain_options ::= explain_options RATIO NK_FLOAT */ +{ yylhsminor.yy560 = setExplainRatio(pCxt, yymsp[-2].minor.yy560, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 256: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ -{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy210); } + case 257: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ +{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy712); } break; - case 257: /* cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ -{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-6].minor.yy403, yymsp[-8].minor.yy403, &yymsp[-5].minor.yy5, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy552, yymsp[0].minor.yy462); } + case 258: /* cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ +{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-6].minor.yy173, yymsp[-8].minor.yy173, &yymsp[-5].minor.yy533, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy196, yymsp[0].minor.yy424); } break; - case 258: /* cmd ::= DROP FUNCTION exists_opt function_name */ -{ pCxt->pRootNode = createDropFunctionStmt(pCxt, yymsp[-1].minor.yy403, &yymsp[0].minor.yy5); } + case 259: /* cmd ::= DROP FUNCTION exists_opt function_name */ +{ pCxt->pRootNode = createDropFunctionStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); } break; - case 261: /* bufsize_opt ::= */ -{ yymsp[1].minor.yy462 = 0; } + case 262: /* bufsize_opt ::= */ +{ yymsp[1].minor.yy424 = 0; } break; - case 262: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ -{ yymsp[-1].minor.yy462 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); } + case 263: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ +{ yymsp[-1].minor.yy424 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); } break; - case 263: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ -{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy403, &yymsp[-4].minor.yy5, yymsp[-2].minor.yy652, yymsp[-3].minor.yy652, yymsp[0].minor.yy652); } + case 264: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ +{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy173, &yymsp[-4].minor.yy533, yymsp[-2].minor.yy560, yymsp[-3].minor.yy560, yymsp[0].minor.yy560); } break; - case 264: /* cmd ::= DROP STREAM exists_opt stream_name */ -{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy403, &yymsp[0].minor.yy5); } + case 265: /* cmd ::= DROP STREAM exists_opt stream_name */ +{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); } break; - case 266: /* into_opt ::= INTO full_table_name */ - case 403: /* from_clause_opt ::= FROM table_reference_list */ yytestcase(yyruleno==403); - case 432: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==432); - case 455: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==455); -{ yymsp[-1].minor.yy652 = yymsp[0].minor.yy652; } + case 267: /* into_opt ::= INTO full_table_name */ + case 404: /* from_clause_opt ::= FROM table_reference_list */ yytestcase(yyruleno==404); + case 433: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==433); + case 456: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==456); +{ yymsp[-1].minor.yy560 = yymsp[0].minor.yy560; } break; - case 268: /* stream_options ::= stream_options TRIGGER AT_ONCE */ -{ ((SStreamOptions*)yymsp[-2].minor.yy652)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy652 = yymsp[-2].minor.yy652; } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 269: /* stream_options ::= stream_options TRIGGER AT_ONCE */ +{ ((SStreamOptions*)yymsp[-2].minor.yy560)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy560 = yymsp[-2].minor.yy560; } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 269: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ -{ ((SStreamOptions*)yymsp[-2].minor.yy652)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy652 = yymsp[-2].minor.yy652; } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 270: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ +{ ((SStreamOptions*)yymsp[-2].minor.yy560)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy560 = yymsp[-2].minor.yy560; } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 270: /* stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ -{ ((SStreamOptions*)yymsp[-3].minor.yy652)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy652)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy652); yylhsminor.yy652 = yymsp[-3].minor.yy652; } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 271: /* stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ +{ ((SStreamOptions*)yymsp[-3].minor.yy560)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy560)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); yylhsminor.yy560 = yymsp[-3].minor.yy560; } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 272: /* stream_options ::= stream_options IGNORE EXPIRED */ -{ ((SStreamOptions*)yymsp[-2].minor.yy652)->ignoreExpired = true; yylhsminor.yy652 = yymsp[-2].minor.yy652; } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 273: /* stream_options ::= stream_options IGNORE EXPIRED */ +{ ((SStreamOptions*)yymsp[-2].minor.yy560)->ignoreExpired = true; yylhsminor.yy560 = yymsp[-2].minor.yy560; } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 273: /* cmd ::= KILL CONNECTION NK_INTEGER */ + case 274: /* cmd ::= KILL CONNECTION NK_INTEGER */ { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); } break; - case 274: /* cmd ::= KILL QUERY NK_STRING */ + case 275: /* cmd ::= KILL QUERY NK_STRING */ { pCxt->pRootNode = createKillQueryStmt(pCxt, &yymsp[0].minor.yy0); } break; - case 275: /* cmd ::= KILL TRANSACTION NK_INTEGER */ + case 276: /* cmd ::= KILL TRANSACTION NK_INTEGER */ { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_TRANSACTION_STMT, &yymsp[0].minor.yy0); } break; - case 276: /* cmd ::= BALANCE VGROUP */ + case 277: /* cmd ::= BALANCE VGROUP */ { pCxt->pRootNode = createBalanceVgroupStmt(pCxt); } break; - case 277: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ + case 278: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; - case 278: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ -{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy210); } + case 279: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ +{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy712); } break; - case 279: /* cmd ::= SPLIT VGROUP NK_INTEGER */ + case 280: /* cmd ::= SPLIT VGROUP NK_INTEGER */ { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); } break; - case 280: /* dnode_list ::= DNODE NK_INTEGER */ -{ yymsp[-1].minor.yy210 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + case 281: /* dnode_list ::= DNODE NK_INTEGER */ +{ yymsp[-1].minor.yy712 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } break; - case 282: /* cmd ::= SYNCDB db_name REPLICA */ -{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy5); } + case 283: /* cmd ::= SYNCDB db_name REPLICA */ +{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy533); } break; - case 283: /* cmd ::= DELETE FROM full_table_name where_clause_opt */ -{ pCxt->pRootNode = createDeleteStmt(pCxt, yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } + case 284: /* cmd ::= DELETE FROM full_table_name where_clause_opt */ +{ pCxt->pRootNode = createDeleteStmt(pCxt, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } break; - case 285: /* cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression */ -{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-2].minor.yy652, yymsp[-1].minor.yy210, yymsp[0].minor.yy652); } + case 286: /* cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression */ +{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-2].minor.yy560, yymsp[-1].minor.yy712, yymsp[0].minor.yy560); } break; - case 286: /* literal ::= NK_INTEGER */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 287: /* literal ::= NK_INTEGER */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 287: /* literal ::= NK_FLOAT */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 288: /* literal ::= NK_FLOAT */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 288: /* literal ::= NK_STRING */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 289: /* literal ::= NK_STRING */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 289: /* literal ::= NK_BOOL */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 290: /* literal ::= NK_BOOL */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 290: /* literal ::= TIMESTAMP NK_STRING */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 291: /* literal ::= TIMESTAMP NK_STRING */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 291: /* literal ::= duration_literal */ - case 301: /* signed_literal ::= signed */ yytestcase(yyruleno==301); - case 321: /* expression ::= literal */ yytestcase(yyruleno==321); - case 322: /* expression ::= pseudo_column */ yytestcase(yyruleno==322); - case 323: /* expression ::= column_reference */ yytestcase(yyruleno==323); - case 324: /* expression ::= function_expression */ yytestcase(yyruleno==324); - case 325: /* expression ::= subquery */ yytestcase(yyruleno==325); - case 352: /* function_expression ::= literal_func */ yytestcase(yyruleno==352); - case 394: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==394); - case 398: /* boolean_primary ::= predicate */ yytestcase(yyruleno==398); - case 400: /* common_expression ::= expression */ yytestcase(yyruleno==400); - case 401: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==401); - case 404: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==404); - case 406: /* table_reference ::= table_primary */ yytestcase(yyruleno==406); - case 407: /* table_reference ::= joined_table */ yytestcase(yyruleno==407); - case 411: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==411); - case 461: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==461); - case 464: /* query_primary ::= query_specification */ yytestcase(yyruleno==464); -{ yylhsminor.yy652 = yymsp[0].minor.yy652; } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 292: /* literal ::= duration_literal */ + case 302: /* signed_literal ::= signed */ yytestcase(yyruleno==302); + case 322: /* expression ::= literal */ yytestcase(yyruleno==322); + case 323: /* expression ::= pseudo_column */ yytestcase(yyruleno==323); + case 324: /* expression ::= column_reference */ yytestcase(yyruleno==324); + case 325: /* expression ::= function_expression */ yytestcase(yyruleno==325); + case 326: /* expression ::= subquery */ yytestcase(yyruleno==326); + case 353: /* function_expression ::= literal_func */ yytestcase(yyruleno==353); + case 395: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==395); + case 399: /* boolean_primary ::= predicate */ yytestcase(yyruleno==399); + case 401: /* common_expression ::= expression */ yytestcase(yyruleno==401); + case 402: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==402); + case 405: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==405); + case 407: /* table_reference ::= table_primary */ yytestcase(yyruleno==407); + case 408: /* table_reference ::= joined_table */ yytestcase(yyruleno==408); + case 412: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==412); + case 462: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==462); + case 465: /* query_primary ::= query_specification */ yytestcase(yyruleno==465); +{ yylhsminor.yy560 = yymsp[0].minor.yy560; } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 292: /* literal ::= NULL */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 293: /* literal ::= NULL */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 293: /* literal ::= NK_QUESTION */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 294: /* literal ::= NK_QUESTION */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 294: /* duration_literal ::= NK_VARIABLE */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 295: /* duration_literal ::= NK_VARIABLE */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 295: /* signed ::= NK_INTEGER */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 296: /* signed ::= NK_INTEGER */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 296: /* signed ::= NK_PLUS NK_INTEGER */ -{ yymsp[-1].minor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + case 297: /* signed ::= NK_PLUS NK_INTEGER */ +{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } break; - case 297: /* signed ::= NK_MINUS NK_INTEGER */ + case 298: /* signed ::= NK_MINUS NK_INTEGER */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t); + yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 298: /* signed ::= NK_FLOAT */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 299: /* signed ::= NK_FLOAT */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 299: /* signed ::= NK_PLUS NK_FLOAT */ -{ yymsp[-1].minor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } + case 300: /* signed ::= NK_PLUS NK_FLOAT */ +{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } break; - case 300: /* signed ::= NK_MINUS NK_FLOAT */ + case 301: /* signed ::= NK_MINUS NK_FLOAT */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t); + yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 302: /* signed_literal ::= NK_STRING */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 303: /* signed_literal ::= NK_STRING */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 303: /* signed_literal ::= NK_BOOL */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 304: /* signed_literal ::= NK_BOOL */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 304: /* signed_literal ::= TIMESTAMP NK_STRING */ -{ yymsp[-1].minor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); } + case 305: /* signed_literal ::= TIMESTAMP NK_STRING */ +{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); } break; - case 305: /* signed_literal ::= duration_literal */ - case 307: /* signed_literal ::= literal_func */ yytestcase(yyruleno==307); - case 372: /* star_func_para ::= expression */ yytestcase(yyruleno==372); - case 427: /* select_item ::= common_expression */ yytestcase(yyruleno==427); - case 477: /* search_condition ::= common_expression */ yytestcase(yyruleno==477); -{ yylhsminor.yy652 = releaseRawExprNode(pCxt, yymsp[0].minor.yy652); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 306: /* signed_literal ::= duration_literal */ + case 308: /* signed_literal ::= literal_func */ yytestcase(yyruleno==308); + case 373: /* star_func_para ::= expression */ yytestcase(yyruleno==373); + case 428: /* select_item ::= common_expression */ yytestcase(yyruleno==428); + case 478: /* search_condition ::= common_expression */ yytestcase(yyruleno==478); +{ yylhsminor.yy560 = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 306: /* signed_literal ::= NULL */ -{ yylhsminor.yy652 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 307: /* signed_literal ::= NULL */ +{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 326: /* expression ::= NK_LP expression NK_RP */ - case 399: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==399); -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy652)); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 327: /* expression ::= NK_LP expression NK_RP */ + case 400: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==400); +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 327: /* expression ::= NK_PLUS expression */ + case 328: /* expression ::= NK_PLUS expression */ { - SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy652)); + SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy560)); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 328: /* expression ::= NK_MINUS expression */ + case 329: /* expression ::= NK_MINUS expression */ { - SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy652), NULL)); + SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy560), NULL)); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 329: /* expression ::= expression NK_PLUS expression */ + case 330: /* expression ::= expression NK_PLUS expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 330: /* expression ::= expression NK_MINUS expression */ + case 331: /* expression ::= expression NK_MINUS expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 331: /* expression ::= expression NK_STAR expression */ + case 332: /* expression ::= expression NK_STAR expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 332: /* expression ::= expression NK_SLASH expression */ + case 333: /* expression ::= expression NK_SLASH expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 333: /* expression ::= expression NK_REM expression */ + case 334: /* expression ::= expression NK_REM expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_REM, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_REM, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 334: /* expression ::= column_reference NK_ARROW NK_STRING */ + case 335: /* expression ::= column_reference NK_ARROW NK_STRING */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 335: /* expression ::= expression NK_BITAND expression */ + case 336: /* expression ::= expression NK_BITAND expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 336: /* expression ::= expression NK_BITOR expression */ + case 337: /* expression ::= expression NK_BITOR expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 339: /* column_reference ::= column_name */ -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy5, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy5)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 340: /* column_reference ::= column_name */ +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy533, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy533)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 340: /* column_reference ::= table_name NK_DOT column_name */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy5, createColumnNode(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy5)); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 341: /* column_reference ::= table_name NK_DOT column_name */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533, createColumnNode(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533)); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 341: /* pseudo_column ::= ROWTS */ - case 342: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==342); - case 344: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==344); - case 345: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==345); - case 346: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==346); - case 347: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==347); - case 348: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==348); - case 354: /* literal_func ::= NOW */ yytestcase(yyruleno==354); -{ yylhsminor.yy652 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 342: /* pseudo_column ::= ROWTS */ + case 343: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==343); + case 345: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==345); + case 346: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==346); + case 347: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==347); + case 348: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==348); + case 349: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==349); + case 355: /* literal_func ::= NOW */ yytestcase(yyruleno==355); +{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 343: /* pseudo_column ::= table_name NK_DOT TBNAME */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy5)))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 344: /* pseudo_column ::= table_name NK_DOT TBNAME */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy533)))); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 349: /* function_expression ::= function_name NK_LP expression_list NK_RP */ - case 350: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==350); -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy5, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy5, yymsp[-1].minor.yy210)); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 350: /* function_expression ::= function_name NK_LP expression_list NK_RP */ + case 351: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==351); +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy533, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy533, yymsp[-1].minor.yy712)); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 351: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), yymsp[-1].minor.yy552)); } - yymsp[-5].minor.yy652 = yylhsminor.yy652; + case 352: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), yymsp[-1].minor.yy196)); } + yymsp[-5].minor.yy560 = yylhsminor.yy560; break; - case 353: /* literal_func ::= noarg_func NK_LP NK_RP */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy5, NULL)); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 354: /* literal_func ::= noarg_func NK_LP NK_RP */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy533, NULL)); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 368: /* star_func_para_list ::= NK_STAR */ -{ yylhsminor.yy210 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy210 = yylhsminor.yy210; + case 369: /* star_func_para_list ::= NK_STAR */ +{ yylhsminor.yy712 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy712 = yylhsminor.yy712; break; - case 373: /* star_func_para ::= table_name NK_DOT NK_STAR */ - case 430: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==430); -{ yylhsminor.yy652 = createColumnNode(pCxt, &yymsp[-2].minor.yy5, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 374: /* star_func_para ::= table_name NK_DOT NK_STAR */ + case 431: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==431); +{ yylhsminor.yy560 = createColumnNode(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 374: /* predicate ::= expression compare_op expression */ - case 379: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==379); + case 375: /* predicate ::= expression compare_op expression */ + case 380: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==380); { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy428, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy128, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 375: /* predicate ::= expression BETWEEN expression AND expression */ + case 376: /* predicate ::= expression BETWEEN expression AND expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy652), releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy560), releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-4].minor.yy652 = yylhsminor.yy652; + yymsp[-4].minor.yy560 = yylhsminor.yy560; break; - case 376: /* predicate ::= expression NOT BETWEEN expression AND expression */ + case 377: /* predicate ::= expression NOT BETWEEN expression AND expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy652), releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy560), releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-5].minor.yy652 = yylhsminor.yy652; + yymsp[-5].minor.yy560 = yylhsminor.yy560; break; - case 377: /* predicate ::= expression IS NULL */ + case 378: /* predicate ::= expression IS NULL */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), NULL)); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), NULL)); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 378: /* predicate ::= expression IS NOT NULL */ + case 379: /* predicate ::= expression IS NOT NULL */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), NULL)); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), NULL)); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 380: /* compare_op ::= NK_LT */ -{ yymsp[0].minor.yy428 = OP_TYPE_LOWER_THAN; } + case 381: /* compare_op ::= NK_LT */ +{ yymsp[0].minor.yy128 = OP_TYPE_LOWER_THAN; } break; - case 381: /* compare_op ::= NK_GT */ -{ yymsp[0].minor.yy428 = OP_TYPE_GREATER_THAN; } + case 382: /* compare_op ::= NK_GT */ +{ yymsp[0].minor.yy128 = OP_TYPE_GREATER_THAN; } break; - case 382: /* compare_op ::= NK_LE */ -{ yymsp[0].minor.yy428 = OP_TYPE_LOWER_EQUAL; } + case 383: /* compare_op ::= NK_LE */ +{ yymsp[0].minor.yy128 = OP_TYPE_LOWER_EQUAL; } break; - case 383: /* compare_op ::= NK_GE */ -{ yymsp[0].minor.yy428 = OP_TYPE_GREATER_EQUAL; } + case 384: /* compare_op ::= NK_GE */ +{ yymsp[0].minor.yy128 = OP_TYPE_GREATER_EQUAL; } break; - case 384: /* compare_op ::= NK_NE */ -{ yymsp[0].minor.yy428 = OP_TYPE_NOT_EQUAL; } + case 385: /* compare_op ::= NK_NE */ +{ yymsp[0].minor.yy128 = OP_TYPE_NOT_EQUAL; } break; - case 385: /* compare_op ::= NK_EQ */ -{ yymsp[0].minor.yy428 = OP_TYPE_EQUAL; } + case 386: /* compare_op ::= NK_EQ */ +{ yymsp[0].minor.yy128 = OP_TYPE_EQUAL; } break; - case 386: /* compare_op ::= LIKE */ -{ yymsp[0].minor.yy428 = OP_TYPE_LIKE; } + case 387: /* compare_op ::= LIKE */ +{ yymsp[0].minor.yy128 = OP_TYPE_LIKE; } break; - case 387: /* compare_op ::= NOT LIKE */ -{ yymsp[-1].minor.yy428 = OP_TYPE_NOT_LIKE; } + case 388: /* compare_op ::= NOT LIKE */ +{ yymsp[-1].minor.yy128 = OP_TYPE_NOT_LIKE; } break; - case 388: /* compare_op ::= MATCH */ -{ yymsp[0].minor.yy428 = OP_TYPE_MATCH; } + case 389: /* compare_op ::= MATCH */ +{ yymsp[0].minor.yy128 = OP_TYPE_MATCH; } break; - case 389: /* compare_op ::= NMATCH */ -{ yymsp[0].minor.yy428 = OP_TYPE_NMATCH; } + case 390: /* compare_op ::= NMATCH */ +{ yymsp[0].minor.yy128 = OP_TYPE_NMATCH; } break; - case 390: /* compare_op ::= CONTAINS */ -{ yymsp[0].minor.yy428 = OP_TYPE_JSON_CONTAINS; } + case 391: /* compare_op ::= CONTAINS */ +{ yymsp[0].minor.yy128 = OP_TYPE_JSON_CONTAINS; } break; - case 391: /* in_op ::= IN */ -{ yymsp[0].minor.yy428 = OP_TYPE_IN; } + case 392: /* in_op ::= IN */ +{ yymsp[0].minor.yy128 = OP_TYPE_IN; } break; - case 392: /* in_op ::= NOT IN */ -{ yymsp[-1].minor.yy428 = OP_TYPE_NOT_IN; } + case 393: /* in_op ::= NOT IN */ +{ yymsp[-1].minor.yy128 = OP_TYPE_NOT_IN; } break; - case 393: /* in_predicate_value ::= NK_LP literal_list NK_RP */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy210)); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 394: /* in_predicate_value ::= NK_LP literal_list NK_RP */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy712)); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 395: /* boolean_value_expression ::= NOT boolean_primary */ + case 396: /* boolean_value_expression ::= NOT boolean_primary */ { - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy652), NULL)); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy560), NULL)); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 396: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ + case 397: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 397: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ + case 398: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy652); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy652); - yylhsminor.yy652 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560); + yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 405: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */ -{ yylhsminor.yy652 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy652, yymsp[0].minor.yy652, NULL); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 406: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */ +{ yylhsminor.yy560 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy560, yymsp[0].minor.yy560, NULL); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 408: /* table_primary ::= table_name alias_opt */ -{ yylhsminor.yy652 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy5, &yymsp[0].minor.yy5); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 409: /* table_primary ::= table_name alias_opt */ +{ yylhsminor.yy560 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 409: /* table_primary ::= db_name NK_DOT table_name alias_opt */ -{ yylhsminor.yy652 = createRealTableNode(pCxt, &yymsp[-3].minor.yy5, &yymsp[-1].minor.yy5, &yymsp[0].minor.yy5); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 410: /* table_primary ::= db_name NK_DOT table_name alias_opt */ +{ yylhsminor.yy560 = createRealTableNode(pCxt, &yymsp[-3].minor.yy533, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 410: /* table_primary ::= subquery alias_opt */ -{ yylhsminor.yy652 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy652), &yymsp[0].minor.yy5); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 411: /* table_primary ::= subquery alias_opt */ +{ yylhsminor.yy560 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560), &yymsp[0].minor.yy533); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 412: /* alias_opt ::= */ -{ yymsp[1].minor.yy5 = nil_token; } + case 413: /* alias_opt ::= */ +{ yymsp[1].minor.yy533 = nil_token; } break; - case 413: /* alias_opt ::= table_alias */ -{ yylhsminor.yy5 = yymsp[0].minor.yy5; } - yymsp[0].minor.yy5 = yylhsminor.yy5; + case 414: /* alias_opt ::= table_alias */ +{ yylhsminor.yy533 = yymsp[0].minor.yy533; } + yymsp[0].minor.yy533 = yylhsminor.yy533; break; - case 414: /* alias_opt ::= AS table_alias */ -{ yymsp[-1].minor.yy5 = yymsp[0].minor.yy5; } + case 415: /* alias_opt ::= AS table_alias */ +{ yymsp[-1].minor.yy533 = yymsp[0].minor.yy533; } break; - case 415: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */ - case 416: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==416); -{ yymsp[-2].minor.yy652 = yymsp[-1].minor.yy652; } + case 416: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */ + case 417: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==417); +{ yymsp[-2].minor.yy560 = yymsp[-1].minor.yy560; } break; - case 417: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ -{ yylhsminor.yy652 = createJoinTableNode(pCxt, yymsp[-4].minor.yy74, yymsp[-5].minor.yy652, yymsp[-2].minor.yy652, yymsp[0].minor.yy652); } - yymsp[-5].minor.yy652 = yylhsminor.yy652; + case 418: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ +{ yylhsminor.yy560 = createJoinTableNode(pCxt, yymsp[-4].minor.yy36, yymsp[-5].minor.yy560, yymsp[-2].minor.yy560, yymsp[0].minor.yy560); } + yymsp[-5].minor.yy560 = yylhsminor.yy560; break; - case 418: /* join_type ::= */ -{ yymsp[1].minor.yy74 = JOIN_TYPE_INNER; } + case 419: /* join_type ::= */ +{ yymsp[1].minor.yy36 = JOIN_TYPE_INNER; } break; - case 419: /* join_type ::= INNER */ -{ yymsp[0].minor.yy74 = JOIN_TYPE_INNER; } + case 420: /* join_type ::= INNER */ +{ yymsp[0].minor.yy36 = JOIN_TYPE_INNER; } break; - case 420: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ + case 421: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ { - yymsp[-11].minor.yy652 = createSelectStmt(pCxt, yymsp[-10].minor.yy403, yymsp[-9].minor.yy210, yymsp[-8].minor.yy652); - yymsp[-11].minor.yy652 = addWhereClause(pCxt, yymsp[-11].minor.yy652, yymsp[-7].minor.yy652); - yymsp[-11].minor.yy652 = addPartitionByClause(pCxt, yymsp[-11].minor.yy652, yymsp[-6].minor.yy210); - yymsp[-11].minor.yy652 = addWindowClauseClause(pCxt, yymsp[-11].minor.yy652, yymsp[-2].minor.yy652); - yymsp[-11].minor.yy652 = addGroupByClause(pCxt, yymsp[-11].minor.yy652, yymsp[-1].minor.yy210); - yymsp[-11].minor.yy652 = addHavingClause(pCxt, yymsp[-11].minor.yy652, yymsp[0].minor.yy652); - yymsp[-11].minor.yy652 = addRangeClause(pCxt, yymsp[-11].minor.yy652, yymsp[-5].minor.yy652); - yymsp[-11].minor.yy652 = addEveryClause(pCxt, yymsp[-11].minor.yy652, yymsp[-4].minor.yy652); - yymsp[-11].minor.yy652 = addFillClause(pCxt, yymsp[-11].minor.yy652, yymsp[-3].minor.yy652); + yymsp[-11].minor.yy560 = createSelectStmt(pCxt, yymsp[-10].minor.yy173, yymsp[-9].minor.yy712, yymsp[-8].minor.yy560); + yymsp[-11].minor.yy560 = addWhereClause(pCxt, yymsp[-11].minor.yy560, yymsp[-7].minor.yy560); + yymsp[-11].minor.yy560 = addPartitionByClause(pCxt, yymsp[-11].minor.yy560, yymsp[-6].minor.yy712); + yymsp[-11].minor.yy560 = addWindowClauseClause(pCxt, yymsp[-11].minor.yy560, yymsp[-2].minor.yy560); + yymsp[-11].minor.yy560 = addGroupByClause(pCxt, yymsp[-11].minor.yy560, yymsp[-1].minor.yy712); + yymsp[-11].minor.yy560 = addHavingClause(pCxt, yymsp[-11].minor.yy560, yymsp[0].minor.yy560); + yymsp[-11].minor.yy560 = addRangeClause(pCxt, yymsp[-11].minor.yy560, yymsp[-5].minor.yy560); + yymsp[-11].minor.yy560 = addEveryClause(pCxt, yymsp[-11].minor.yy560, yymsp[-4].minor.yy560); + yymsp[-11].minor.yy560 = addFillClause(pCxt, yymsp[-11].minor.yy560, yymsp[-3].minor.yy560); } break; - case 423: /* set_quantifier_opt ::= ALL */ -{ yymsp[0].minor.yy403 = false; } + case 424: /* set_quantifier_opt ::= ALL */ +{ yymsp[0].minor.yy173 = false; } break; - case 426: /* select_item ::= NK_STAR */ -{ yylhsminor.yy652 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy652 = yylhsminor.yy652; + case 427: /* select_item ::= NK_STAR */ +{ yylhsminor.yy560 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy560 = yylhsminor.yy560; break; - case 428: /* select_item ::= common_expression column_alias */ -{ yylhsminor.yy652 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy652), &yymsp[0].minor.yy5); } - yymsp[-1].minor.yy652 = yylhsminor.yy652; + case 429: /* select_item ::= common_expression column_alias */ +{ yylhsminor.yy560 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560), &yymsp[0].minor.yy533); } + yymsp[-1].minor.yy560 = yylhsminor.yy560; break; - case 429: /* select_item ::= common_expression AS column_alias */ -{ yylhsminor.yy652 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), &yymsp[0].minor.yy5); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 430: /* select_item ::= common_expression AS column_alias */ +{ yylhsminor.yy560 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), &yymsp[0].minor.yy533); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 434: /* partition_by_clause_opt ::= PARTITION BY expression_list */ - case 451: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==451); - case 467: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==467); -{ yymsp[-2].minor.yy210 = yymsp[0].minor.yy210; } + case 435: /* partition_by_clause_opt ::= PARTITION BY expression_list */ + case 452: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==452); + case 468: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==468); +{ yymsp[-2].minor.yy712 = yymsp[0].minor.yy712; } break; - case 436: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ -{ yymsp[-5].minor.yy652 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), releaseRawExprNode(pCxt, yymsp[-1].minor.yy652)); } + case 437: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ +{ yymsp[-5].minor.yy560 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); } break; - case 437: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ -{ yymsp[-3].minor.yy652 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy652)); } + case 438: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ +{ yymsp[-3].minor.yy560 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); } break; - case 438: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ -{ yymsp[-5].minor.yy652 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), NULL, yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } + case 439: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ +{ yymsp[-5].minor.yy560 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), NULL, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } break; - case 439: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ -{ yymsp[-7].minor.yy652 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy652), releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), yymsp[-1].minor.yy652, yymsp[0].minor.yy652); } + case 440: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ +{ yymsp[-7].minor.yy560 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy560), releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), yymsp[-1].minor.yy560, yymsp[0].minor.yy560); } break; - case 441: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ - case 459: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==459); -{ yymsp[-3].minor.yy652 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy652); } + case 442: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ + case 460: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==460); +{ yymsp[-3].minor.yy560 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy560); } break; - case 443: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */ -{ yymsp[-3].minor.yy652 = createFillNode(pCxt, yymsp[-1].minor.yy270, NULL); } + case 444: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */ +{ yymsp[-3].minor.yy560 = createFillNode(pCxt, yymsp[-1].minor.yy18, NULL); } break; - case 444: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ -{ yymsp[-5].minor.yy652 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy210)); } + case 445: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ +{ yymsp[-5].minor.yy560 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy712)); } break; - case 445: /* fill_mode ::= NONE */ -{ yymsp[0].minor.yy270 = FILL_MODE_NONE; } + case 446: /* fill_mode ::= NONE */ +{ yymsp[0].minor.yy18 = FILL_MODE_NONE; } break; - case 446: /* fill_mode ::= PREV */ -{ yymsp[0].minor.yy270 = FILL_MODE_PREV; } + case 447: /* fill_mode ::= PREV */ +{ yymsp[0].minor.yy18 = FILL_MODE_PREV; } break; - case 447: /* fill_mode ::= NULL */ -{ yymsp[0].minor.yy270 = FILL_MODE_NULL; } + case 448: /* fill_mode ::= NULL */ +{ yymsp[0].minor.yy18 = FILL_MODE_NULL; } break; - case 448: /* fill_mode ::= LINEAR */ -{ yymsp[0].minor.yy270 = FILL_MODE_LINEAR; } + case 449: /* fill_mode ::= LINEAR */ +{ yymsp[0].minor.yy18 = FILL_MODE_LINEAR; } break; - case 449: /* fill_mode ::= NEXT */ -{ yymsp[0].minor.yy270 = FILL_MODE_NEXT; } + case 450: /* fill_mode ::= NEXT */ +{ yymsp[0].minor.yy18 = FILL_MODE_NEXT; } break; - case 452: /* group_by_list ::= expression */ -{ yylhsminor.yy210 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); } - yymsp[0].minor.yy210 = yylhsminor.yy210; + case 453: /* group_by_list ::= expression */ +{ yylhsminor.yy712 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } + yymsp[0].minor.yy712 = yylhsminor.yy712; break; - case 453: /* group_by_list ::= group_by_list NK_COMMA expression */ -{ yylhsminor.yy210 = addNodeToList(pCxt, yymsp[-2].minor.yy210, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy652))); } - yymsp[-2].minor.yy210 = yylhsminor.yy210; + case 454: /* group_by_list ::= group_by_list NK_COMMA expression */ +{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); } + yymsp[-2].minor.yy712 = yylhsminor.yy712; break; - case 457: /* range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */ -{ yymsp[-5].minor.yy652 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy652), releaseRawExprNode(pCxt, yymsp[-1].minor.yy652)); } + case 458: /* range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */ +{ yymsp[-5].minor.yy560 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); } break; - case 460: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ + case 461: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ { - yylhsminor.yy652 = addOrderByClause(pCxt, yymsp[-3].minor.yy652, yymsp[-2].minor.yy210); - yylhsminor.yy652 = addSlimitClause(pCxt, yylhsminor.yy652, yymsp[-1].minor.yy652); - yylhsminor.yy652 = addLimitClause(pCxt, yylhsminor.yy652, yymsp[0].minor.yy652); + yylhsminor.yy560 = addOrderByClause(pCxt, yymsp[-3].minor.yy560, yymsp[-2].minor.yy712); + yylhsminor.yy560 = addSlimitClause(pCxt, yylhsminor.yy560, yymsp[-1].minor.yy560); + yylhsminor.yy560 = addLimitClause(pCxt, yylhsminor.yy560, yymsp[0].minor.yy560); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 462: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */ -{ yylhsminor.yy652 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy652, yymsp[0].minor.yy652); } - yymsp[-3].minor.yy652 = yylhsminor.yy652; + case 463: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */ +{ yylhsminor.yy560 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy560, yymsp[0].minor.yy560); } + yymsp[-3].minor.yy560 = yylhsminor.yy560; break; - case 463: /* query_expression_body ::= query_expression_body UNION query_expression_body */ -{ yylhsminor.yy652 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy652, yymsp[0].minor.yy652); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 464: /* query_expression_body ::= query_expression_body UNION query_expression_body */ +{ yylhsminor.yy560 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy560, yymsp[0].minor.yy560); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 465: /* query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */ + case 466: /* query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */ { - yymsp[-5].minor.yy652 = addOrderByClause(pCxt, yymsp[-4].minor.yy652, yymsp[-3].minor.yy210); - yymsp[-5].minor.yy652 = addSlimitClause(pCxt, yymsp[-5].minor.yy652, yymsp[-2].minor.yy652); - yymsp[-5].minor.yy652 = addLimitClause(pCxt, yymsp[-5].minor.yy652, yymsp[-1].minor.yy652); + yymsp[-5].minor.yy560 = addOrderByClause(pCxt, yymsp[-4].minor.yy560, yymsp[-3].minor.yy712); + yymsp[-5].minor.yy560 = addSlimitClause(pCxt, yymsp[-5].minor.yy560, yymsp[-2].minor.yy560); + yymsp[-5].minor.yy560 = addLimitClause(pCxt, yymsp[-5].minor.yy560, yymsp[-1].minor.yy560); } break; - case 469: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ - case 473: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==473); -{ yymsp[-1].minor.yy652 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); } + case 470: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ + case 474: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==474); +{ yymsp[-1].minor.yy560 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); } break; - case 470: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ - case 474: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==474); -{ yymsp[-3].minor.yy652 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } + case 471: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ + case 475: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==475); +{ yymsp[-3].minor.yy560 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } break; - case 471: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - case 475: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==475); -{ yymsp[-3].minor.yy652 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); } + case 472: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + case 476: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==476); +{ yymsp[-3].minor.yy560 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); } break; - case 476: /* subquery ::= NK_LP query_expression NK_RP */ -{ yylhsminor.yy652 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy652); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 477: /* subquery ::= NK_LP query_expression NK_RP */ +{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy560); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 480: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */ -{ yylhsminor.yy652 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy652), yymsp[-1].minor.yy553, yymsp[0].minor.yy477); } - yymsp[-2].minor.yy652 = yylhsminor.yy652; + case 481: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */ +{ yylhsminor.yy560 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), yymsp[-1].minor.yy218, yymsp[0].minor.yy109); } + yymsp[-2].minor.yy560 = yylhsminor.yy560; break; - case 481: /* ordering_specification_opt ::= */ -{ yymsp[1].minor.yy553 = ORDER_ASC; } + case 482: /* ordering_specification_opt ::= */ +{ yymsp[1].minor.yy218 = ORDER_ASC; } break; - case 482: /* ordering_specification_opt ::= ASC */ -{ yymsp[0].minor.yy553 = ORDER_ASC; } + case 483: /* ordering_specification_opt ::= ASC */ +{ yymsp[0].minor.yy218 = ORDER_ASC; } break; - case 483: /* ordering_specification_opt ::= DESC */ -{ yymsp[0].minor.yy553 = ORDER_DESC; } + case 484: /* ordering_specification_opt ::= DESC */ +{ yymsp[0].minor.yy218 = ORDER_DESC; } break; - case 484: /* null_ordering_opt ::= */ -{ yymsp[1].minor.yy477 = NULL_ORDER_DEFAULT; } + case 485: /* null_ordering_opt ::= */ +{ yymsp[1].minor.yy109 = NULL_ORDER_DEFAULT; } break; - case 485: /* null_ordering_opt ::= NULLS FIRST */ -{ yymsp[-1].minor.yy477 = NULL_ORDER_FIRST; } + case 486: /* null_ordering_opt ::= NULLS FIRST */ +{ yymsp[-1].minor.yy109 = NULL_ORDER_FIRST; } break; - case 486: /* null_ordering_opt ::= NULLS LAST */ -{ yymsp[-1].minor.yy477 = NULL_ORDER_LAST; } + case 487: /* null_ordering_opt ::= NULLS LAST */ +{ yymsp[-1].minor.yy109 = NULL_ORDER_LAST; } break; default: break; diff --git a/source/libs/parser/test/parShowToUse.cpp b/source/libs/parser/test/parShowToUse.cpp index e109781169..eecb291554 100644 --- a/source/libs/parser/test/parShowToUse.cpp +++ b/source/libs/parser/test/parShowToUse.cpp @@ -222,6 +222,25 @@ TEST_F(ParserShowToUseTest, splitVgroup) { run("SPLIT VGROUP 15"); } +TEST_F(ParserShowToUseTest, trimDatabase) { + useDb("root", "test"); + + STrimDbReq expect = {0}; + + auto setTrimDbReq = [&](const char* pDb) { snprintf(expect.db, sizeof(expect.db), "0.%s", pDb); }; + + setCheckDdlFunc([&](const SQuery* pQuery, ParserStage stage) { + ASSERT_EQ(nodeType(pQuery->pRoot), QUERY_NODE_TRIM_DATABASE_STMT); + ASSERT_EQ(pQuery->pCmdMsg->msgType, TDMT_MND_TRIM_DB); + STrimDbReq req = {0}; + ASSERT_EQ(tDeserializeSTrimDbReq(pQuery->pCmdMsg->pMsg, pQuery->pCmdMsg->msgLen, &req), TSDB_CODE_SUCCESS); + ASSERT_EQ(std::string(req.db), std::string(expect.db)); + }); + + setTrimDbReq("wxy_db"); + run("TRIM DATABASE wxy_db"); +} + TEST_F(ParserShowToUseTest, useDatabase) { useDb("root", "test");