Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1193
Star 22018
Fork 4786
T
TDengine
“46ed40a8aef7eb57f5740206aff6faf1aad61446”上不存在“mobile/src/fpga/common/driver.h”
提交 240a5309 编写于 作者: D dapan1121
浏览文件
操作

Merge remote-tracking branch 'origin/3.0' into feature/qnode

上级 d61aa9b6 1ba2f77c
显示空白变更内容
内联 并排
Showing with 3754 addition and 2872 deletion
.devcontainer/devcontainer.json
浏览文件 @ 240a5309
......@@ -28,5 +28,5 @@
// "postCreateCommand": "gcc -v",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
"remoteUser": "root"
}
contrib/test/tdev/src/main.c
浏览文件 @ 240a5309
......@@ -14,6 +14,10 @@
#define tPutB(buf, val) \
({ \
((uint8_t *)buf)[7] = ((val) >> 56) & 0xff; \
((uint8_t *)buf)[6] = ((val) >> 48) & 0xff; \
((uint8_t *)buf)[5] = ((val) >> 40) & 0xff; \
((uint8_t *)buf)[4] = ((val) >> 32) & 0xff; \
((uint8_t *)buf)[3] = ((val) >> 24) & 0xff; \
((uint8_t *)buf)[2] = ((val) >> 16) & 0xff; \
((uint8_t *)buf)[1] = ((val) >> 8) & 0xff; \
......@@ -23,11 +27,31 @@
#define tPutC(buf, val) \
({ \
if (buf) { \
((uint64_t *)buf)[0] = (val); \
POINTER_SHIFT(buf, sizeof(val)); \
} \
NULL; \
})
typedef enum { A, B, C } T;
#define tPutD(buf, val) \
({ \
uint64_t tmp = val; \
for (size_t i = 0; i < sizeof(val); i++) { \
((uint8_t *)buf)[i] = tmp & 0xff; \
tmp >>= 8; \
} \
POINTER_SHIFT(buf, sizeof(val)); \
})
static inline void tPutE(void **buf, uint64_t val) {
if (buf) {
((uint64_t *)(*buf))[0] = val;
*buf = POINTER_SHIFT(*buf, sizeof(val));
}
}
typedef enum { A, B, C, D, E } T;
static void func(T t) {
uint64_t val = 198;
......@@ -59,6 +83,22 @@ static void func(T t) {
}
}
break;
case D:
for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) {
pBuf = tPutD(pBuf, val);
if (POINTER_DISTANCE(buf, pBuf) == 1024) {
pBuf = buf;
}
}
break;
case E:
for (size_t i = 0; i < 10 * 1024l * 1024l * 1024l; i++) {
tPutE(&pBuf, val);
if (POINTER_DISTANCE(buf, pBuf) == 1024) {
pBuf = buf;
}
}
break;
default:
break;
......@@ -83,5 +123,11 @@ int main(int argc, char const *argv[]) {
func(C);
uint64_t t4 = now();
printf("C: %ld\n", t4 - t3);
func(D);
uint64_t t5 = now();
printf("D: %ld\n", t5 - t4);
func(E);
uint64_t t6 = now();
printf("E: %ld\n", t6 - t5);
return 0;
}
include/common/tmsg.h
浏览文件 @ 240a5309
......@@ -20,6 +20,7 @@
extern "C" {
#endif
#include "encode.h"
#include "taosdef.h"
#include "taoserror.h"
#include "tcoding.h"
......@@ -641,8 +642,6 @@ typedef struct {
typedef struct {
int32_t dnodeId;
int64_t clusterId;
int8_t dropped;
char reserved[7];
} SDnodeCfg;
typedef struct {
......@@ -1239,6 +1238,31 @@ static FORCE_INLINE void* tDeserializeSVCreateTbReq(void* buf, SVCreateTbReq* pR
typedef struct SVCreateTbRsp {
} SVCreateTbRsp;
typedef struct SVShowTablesReq {
SMsgHead head;
} SVShowTablesReq;
typedef struct SVShowTablesRsp {
int64_t id;
STableMetaMsg metaInfo;
} SVShowTablesRsp;
typedef struct SVShowTablesFetchReq {
SMsgHead head;
int64_t id;
} SVShowTablesFetchReq;
typedef struct SVShowTablesFetchRsp {
int64_t useconds;
int8_t completed; // all results are returned to client
int8_t precision;
int8_t compressed;
int32_t compLen;
int32_t numOfRows;
char data[];
} SVShowTablesFetchRsp;
#pragma pack(pop)
#ifdef __cplusplus
......
include/common/tmsgdef.h
浏览文件 @ 240a5309
......@@ -146,6 +146,8 @@ enum {
TD_DEF_MSG_TYPE(TDMT_VND_CREATE_TOPIC, "vnode-create-topic", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_ALTER_TOPIC, "vnode-alter-topic", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_DROP_TOPIC, "vnode-drop-topic", NULL, NULL)
TD_DEF_MSG_TYPE(TDMT_VND_SHOW_TABLES, "vnode-show-tables", SVShowTablesReq, SVShowTablesRsp)
TD_DEF_MSG_TYPE(TDMT_VND_SHOW_TABLES_FETCH, "vnode-show-tables-fetch", SVShowTablesFetchReq, SVShowTablesFetchRsp)
// Requests handled by QNODE
TD_NEW_MSG_SEG(TDMT_QND_MSG)
......
include/dnode/mnode/sdb/sdb.h
浏览文件 @ 240a5309
......@@ -25,7 +25,7 @@ extern "C" {
#define SDB_GET_INT64(pData, pRow, dataPos, val) \
{ \
if (sdbGetRawInt64(pRaw, dataPos, val) != 0) { \
sdbFreeRow(pRow); \
tfree(pRow); \
return NULL; \
} \
dataPos += sizeof(int64_t); \
......@@ -34,7 +34,7 @@ extern "C" {
#define SDB_GET_INT32(pData, pRow, dataPos, val) \
{ \
if (sdbGetRawInt32(pRaw, dataPos, val) != 0) { \
sdbFreeRow(pRow); \
tfree(pRow); \
return NULL; \
} \
dataPos += sizeof(int32_t); \
......@@ -43,7 +43,7 @@ extern "C" {
#define SDB_GET_INT16(pData, pRow, dataPos, val) \
{ \
if (sdbGetRawInt16(pRaw, dataPos, val) != 0) { \
sdbFreeRow(pRow); \
tfree(pRow); \
return NULL; \
} \
dataPos += sizeof(int16_t); \
......@@ -52,7 +52,7 @@ extern "C" {
#define SDB_GET_INT8(pData, pRow, dataPos, val) \
{ \
if (sdbGetRawInt8(pRaw, dataPos, val) != 0) { \
sdbFreeRow(pRow); \
tfree(pRow); \
return NULL; \
} \
dataPos += sizeof(int8_t); \
......@@ -61,7 +61,7 @@ extern "C" {
#define SDB_GET_BINARY(pRaw, pRow, dataPos, val, valLen) \
{ \
if (sdbGetRawBinary(pRaw, dataPos, val, valLen) != 0) { \
sdbFreeRow(pRow); \
tfree(pRow); \
return NULL; \
} \
dataPos += valLen; \
......@@ -71,7 +71,7 @@ extern "C" {
{ \
char val[valLen] = {0}; \
if (sdbGetRawBinary(pRaw, dataPos, val, valLen) != 0) { \
sdbFreeRow(pRow); \
tfree(pRow); \
return NULL; \
} \
dataPos += valLen; \
......@@ -325,7 +325,7 @@ int32_t sdbGetRawSoftVer(SSdbRaw *pRaw, int8_t *sver);
int32_t sdbGetRawTotalSize(SSdbRaw *pRaw);
SSdbRow *sdbAllocRow(int32_t objSize);
void sdbFreeRow(SSdbRow *pRow);
void sdbFreeRow(SSdb *pSdb, SSdbRow *pRow);
void *sdbGetRowObj(SSdbRow *pRow);
#ifdef __cplusplus
......
include/dnode/vnode/meta/meta.h
浏览文件 @ 240a5309
......@@ -18,8 +18,8 @@
#include "mallocator.h"
#include "os.h"
#include "trow.h"
#include "tmsg.h"
#include "trow.h"
#ifdef __cplusplus
extern "C" {
......@@ -47,35 +47,13 @@ int metaCreateTable(SMeta *pMeta, STbCfg *pTbCfg);
int metaDropTable(SMeta *pMeta, tb_uid_t uid);
int metaCommit(SMeta *pMeta);
// For Query
int metaGetTableInfo(SMeta *pMeta, char *tbname, STableMetaMsg **ppMsg);
// Options
void metaOptionsInit(SMetaCfg *pMetaCfg);
void metaOptionsClear(SMetaCfg *pMetaCfg);
// STbCfg
#define META_INIT_STB_CFG(NAME, TTL, KEEP, SUID, PSCHEMA, PTAGSCHEMA) \
{ \
.name = (NAME), .ttl = (TTL), .keep = (KEEP), .type = META_SUPER_TABLE, .stbCfg = { \
.suid = (SUID), \
.pSchema = (PSCHEMA), \
.pTagSchema = (PTAGSCHEMA) \
} \
}
#define META_INIT_CTB_CFG(NAME, TTL, KEEP, SUID, PTAG) \
{ \
.name = (NAME), .ttl = (TTL), .keep = (KEEP), .type = META_CHILD_TABLE, .ctbCfg = {.suid = (SUID), .pTag = PTAG } \
}
#define META_INIT_NTB_CFG(NAME, TTL, KEEP, SUID, PSCHEMA) \
{ \
.name = (NAME), .ttl = (TTL), .keep = (KEEP), .type = META_NORMAL_TABLE, .ntbCfg = {.pSchema = (PSCHEMA) } \
}
#define META_CLEAR_TB_CFG(pTbCfg)
int metaEncodeTbCfg(void **pBuf, STbCfg *pTbCfg);
void *metaDecodeTbCfg(void *pBuf, STbCfg *pTbCfg);
#ifdef __cplusplus
}
#endif
......
include/dnode/vnode/vnode.h
浏览文件 @ 240a5309
......@@ -162,16 +162,6 @@ int vnodeProcessQueryReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
*/
int vnodeProcessFetchReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
/**
* @brief Process a consume message.
*
* @param pVnode The vnode object.
* @param pMsg The request message
* @param pRsp The response message
* @return int 0 for success, -1 for failure
*/
int vnodeProcessConsumeReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
/* ------------------------ SVnodeCfg ------------------------ */
/**
* @brief Initialize VNODE options.
......@@ -187,68 +177,6 @@ void vnodeOptionsInit(SVnodeCfg *pOptions);
*/
void vnodeOptionsClear(SVnodeCfg *pOptions);
/* ------------------------ REQUESTS ------------------------ */
typedef STbCfg SVCreateTableReq;
typedef struct {
tb_uid_t uid;
} SVDropTableReq;
typedef struct {
// TODO
} SVSubmitReq;
typedef struct {
uint64_t ver;
union {
SVCreateTableReq ctReq;
SVDropTableReq dtReq;
};
} SVnodeReq;
typedef struct {
int err;
char info[];
} SVnodeRsp;
static FORCE_INLINE void vnodeSetCreateStbReq(SVnodeReq *pReq, char *name, uint32_t ttl, uint32_t keep, tb_uid_t suid,
STSchema *pSchema, STSchema *pTagSchema) {
pReq->ver = 0;
pReq->ctReq.name = name;
pReq->ctReq.ttl = ttl;
pReq->ctReq.keep = keep;
pReq->ctReq.type = META_SUPER_TABLE;
pReq->ctReq.stbCfg.suid = suid;
pReq->ctReq.stbCfg.pSchema = pSchema;
pReq->ctReq.stbCfg.pTagSchema = pTagSchema;
}
static FORCE_INLINE void vnodeSetCreateCtbReq(SVnodeReq *pReq, char *name, uint32_t ttl, uint32_t keep, tb_uid_t suid,
SKVRow pTag) {
pReq->ver = 0;
pReq->ctReq.name = name;
pReq->ctReq.ttl = ttl;
pReq->ctReq.keep = keep;
pReq->ctReq.type = META_CHILD_TABLE;
pReq->ctReq.ctbCfg.suid = suid;
pReq->ctReq.ctbCfg.pTag = pTag;
}
static FORCE_INLINE void vnodeSetCreateNtbReq(SVnodeReq *pReq, char *name, uint32_t ttl, uint32_t keep,
STSchema *pSchema) {
pReq->ver = 0;
pReq->ctReq.name = name;
pReq->ctReq.ttl = ttl;
pReq->ctReq.keep = keep;
pReq->ctReq.type = META_NORMAL_TABLE;
pReq->ctReq.ntbCfg.pSchema = pSchema;
}
int vnodeBuildReq(void **buf, const SVnodeReq *pReq, tmsg_t type);
void *vnodeParseReq(void *buf, SVnodeReq *pReq, tmsg_t type);
/* ------------------------ FOR COMPILE ------------------------ */
int32_t vnodeAlter(SVnode *pVnode, const SVnodeCfg *pCfg);
......
include/libs/catalog/catalog.h
浏览文件 @ 240a5309
......@@ -21,13 +21,14 @@ extern "C" {
#endif
#include "os.h"
#include "thash.h"
#include "tarray.h"
#include "taosdef.h"
#include "transport.h"
#include "query.h"
#include "tname.h"
#include "common.h"
#include "tarray.h"
#include "thash.h"
#include "tmsg.h"
#include "query.h"
#include "transport.h"
struct SCatalog;
......@@ -80,35 +81,32 @@ int32_t catalogUpdateDBVgroup(struct SCatalog* pCatalog, const char* dbName, SDB
* @param pCatalog (input, got with catalogGetHandle)
* @param pTransporter (input, rpc object)
* @param pMgmtEps (input, mnode EPs)
* @param pDBName (input, full db name)
* @param pTableName (input, table name, NOT including db name)
* @param pTableMeta(output, table meta data, NEED to free it by calller)
* @return error code
*/
int32_t catalogGetTableMeta(struct SCatalog* pCatalog, void * pTransporter, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, STableMeta** pTableMeta);
int32_t catalogGetTableMeta(struct SCatalog* pCatalog, void * pTransporter, const SEpSet* pMgmtEps, const SName* pTableName, STableMeta** pTableMeta);
/**
* Force renew a table's local cached meta data.
* @param pCatalog (input, got with catalogGetHandle)
* @param pRpc (input, rpc object)
* @param pMgmtEps (input, mnode EPs)
* @param pDBName (input, full db name)
* @param pTableName (input, table name, NOT including db name)
* @return error code
*/
int32_t catalogRenewTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName);
int32_t catalogRenewTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName);
/**
* Force renew a table's local cached meta data and get the new one.
* @param pCatalog (input, got with catalogGetHandle)
* @param pRpc (input, rpc object)
* @param pMgmtEps (input, mnode EPs)
* @param pDBName (input, full db name)
* @param pTableName (input, table name, NOT including db name)
* @param pTableMeta(output, table meta data, NEED to free it by calller)
* @return error code
*/
int32_t catalogRenewAndGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, STableMeta** pTableMeta);
int32_t catalogRenewAndGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, STableMeta** pTableMeta);
/**
......@@ -116,24 +114,22 @@ int32_t catalogRenewAndGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const
* @param pCatalog (input, got with catalogGetHandle)
* @param pRpc (input, rpc object)
* @param pMgmtEps (input, mnode EPs)
* @param pDBName (input, full db name)
* @param pTableName (input, table name, NOT including db name)
* @param pVgroupList (output, vgroup info list, element is SVgroupInfo, NEED to simply free the array by caller)
* @return error code
*/
int32_t catalogGetTableDistVgroup(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, SArray** pVgroupList);
int32_t catalogGetTableDistVgroup(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, SArray** pVgroupList);
/**
* Get a table's vgroup from its name's hash value.
* @param pCatalog (input, got with catalogGetHandle)
* @param pTransporter (input, rpc object)
* @param pMgmtEps (input, mnode EPs)
* @param pDBName (input, full db name)
* @param pTableName (input, table name, NOT including db name)
* @param vgInfo (output, vgroup info)
* @return error code
*/
int32_t catalogGetTableHashVgroup(struct SCatalog* pCatalog, void * pTransporter, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, SVgroupInfo* vgInfo);
int32_t catalogGetTableHashVgroup(struct SCatalog* pCatalog, void * pTransporter, const SEpSet* pMgmtEps, const SName* pName, SVgroupInfo* vgInfo);
/**
......
include/libs/parser/parser.h
浏览文件 @ 240a5309
......@@ -27,7 +27,7 @@ typedef struct SParseContext {
int8_t schemaAttached; // denote if submit block is built with table schema or not
const char *pSql; // sql string
size_t sqlLen; // length of the sql string
char *pMsg; // extended error message if exists to help avoid the problem in sql statement.
char *pMsg; // extended error message if exists to help identifying the problem in sql statement.
int32_t msgLen; // max length of the msg
} SParseContext;
......
include/libs/qcom/query.h
浏览文件 @ 240a5309
......@@ -23,6 +23,7 @@ extern "C" {
#include "tarray.h"
#include "thash.h"
#include "tlog.h"
#include "tmsg.h"
enum {
JOB_TASK_STATUS_NULL = 0,
......@@ -73,7 +74,6 @@ typedef struct STableMeta {
SSchema schema[];
} STableMeta;
typedef struct SDBVgroupInfo {
int32_t lock;
int32_t vgVersion;
......
include/os/osEndian.h
浏览文件 @ 240a5309
......@@ -20,8 +20,11 @@
extern "C" {
#endif
typedef enum { TD_LITTLE_ENDIAN = 0, TD_BIG_ENDIAN } td_endian_t;
static const int32_t endian_test_var = 1;
#define IS_LITTLE_ENDIAN() (*(uint8_t *)(&endian_test_var) != 0)
#define TD_RT_ENDIAN() (IS_LITTLE_ENDIAN() ? TD_LITTLE_ENDIAN : TD_BIG_ENDIAN)
#ifdef __cplusplus
}
......
include/util/encode.h 0 → 100644
浏览文件 @ 240a5309
/*
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3
* or later ("AGPL"), as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_UTIL_ENCODE_H_
#define _TD_UTIL_ENCODE_H_
#include "tcoding.h"
#include "tmacro.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
td_endian_t endian;
uint8_t* data;
int64_t size;
int64_t pos;
} SEncoder, SDecoder;
#define tPut(TYPE, BUF, VAL) ((TYPE*)(BUF))[0] = (VAL)
#define tGet(TYPE, BUF, VAL) (VAL) = ((TYPE*)(BUF))[0]
#define tRPut16(PDEST, PSRC) \
((uint8_t*)(PDEST))[0] = ((uint8_t*)(PSRC))[1]; \
((uint8_t*)(PDEST))[1] = ((uint8_t*)(PSRC))[0];
#define tRPut32(PDEST, PSRC) \
((uint8_t*)(PDEST))[0] = ((uint8_t*)(PSRC))[3]; \
((uint8_t*)(PDEST))[1] = ((uint8_t*)(PSRC))[2]; \
((uint8_t*)(PDEST))[2] = ((uint8_t*)(PSRC))[1]; \
((uint8_t*)(PDEST))[3] = ((uint8_t*)(PSRC))[0];
#define tRPut64(PDEST, PSRC) \
((uint8_t*)(PDEST))[0] = ((uint8_t*)(PSRC))[7]; \
((uint8_t*)(PDEST))[1] = ((uint8_t*)(PSRC))[6]; \
((uint8_t*)(PDEST))[2] = ((uint8_t*)(PSRC))[5]; \
((uint8_t*)(PDEST))[3] = ((uint8_t*)(PSRC))[4]; \
((uint8_t*)(PDEST))[4] = ((uint8_t*)(PSRC))[3]; \
((uint8_t*)(PDEST))[5] = ((uint8_t*)(PSRC))[2]; \
((uint8_t*)(PDEST))[6] = ((uint8_t*)(PSRC))[1]; \
((uint8_t*)(PDEST))[7] = ((uint8_t*)(PSRC))[0];
#define tRGet16 tRPut16
#define tRGet32 tRPut32
#define tRGet64 tRPut64
#define TD_CODER_CURRENT(CODER) ((CODER)->data + (CODER)->pos)
#define TD_CODER_MOVE_POS(CODER, MOVE) ((CODER)->pos += (MOVE))
#define TD_CHECK_CODER_CAPACITY_FAILED(CODER, EXPSIZE) (((CODER)->size - (CODER)->pos) < (EXPSIZE))
/* ------------------------ FOR ENCODER ------------------------ */
static FORCE_INLINE void tInitEncoder(SEncoder* pEncoder, td_endian_t endian, uint8_t* data, int64_t size) {
pEncoder->endian = endian;
pEncoder->data = data;
pEncoder->size = (data) ? size : 0;
pEncoder->pos = 0;
}
// 8
static FORCE_INLINE int tEncodeU8(SEncoder* pEncoder, uint8_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
tPut(uint8_t, TD_CODER_CURRENT(pEncoder), val);
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
static FORCE_INLINE int tEncodeI8(SEncoder* pEncoder, int8_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
tPut(int8_t, TD_CODER_CURRENT(pEncoder), val);
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
// 16
static FORCE_INLINE int tEncodeU16(SEncoder* pEncoder, uint16_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
if (TD_RT_ENDIAN() == pEncoder->endian) {
tPut(uint16_t, TD_CODER_CURRENT(pEncoder), val);
} else {
tRPut16(TD_CODER_CURRENT(pEncoder), &val);
}
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
static FORCE_INLINE int tEncodeI16(SEncoder* pEncoder, int16_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
if (TD_RT_ENDIAN() == pEncoder->endian) {
tPut(int16_t, TD_CODER_CURRENT(pEncoder), val);
} else {
tRPut16(TD_CODER_CURRENT(pEncoder), &val);
}
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
// 32
static FORCE_INLINE int tEncodeU32(SEncoder* pEncoder, uint32_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
if (TD_RT_ENDIAN() == pEncoder->endian) {
tPut(uint32_t, TD_CODER_CURRENT(pEncoder), val);
} else {
tRPut32(TD_CODER_CURRENT(pEncoder), &val);
}
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
static FORCE_INLINE int tEncodeI32(SEncoder* pEncoder, int32_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
if (TD_RT_ENDIAN() == pEncoder->endian) {
tPut(int32_t, TD_CODER_CURRENT(pEncoder), val);
} else {
tRPut32(TD_CODER_CURRENT(pEncoder), &val);
}
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
// 64
static FORCE_INLINE int tEncodeU64(SEncoder* pEncoder, uint64_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
if (TD_RT_ENDIAN() == pEncoder->endian) {
tPut(uint64_t, TD_CODER_CURRENT(pEncoder), val);
} else {
tRPut64(TD_CODER_CURRENT(pEncoder), &val);
}
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
static FORCE_INLINE int tEncodeI64(SEncoder* pEncoder, int64_t val) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, sizeof(val))) return -1;
if (TD_RT_ENDIAN() == pEncoder->endian) {
tPut(int64_t, TD_CODER_CURRENT(pEncoder), val);
} else {
tRPut64(TD_CODER_CURRENT(pEncoder), &val);
}
}
TD_CODER_MOVE_POS(pEncoder, sizeof(val));
return 0;
}
// 16v
static FORCE_INLINE int tEncodeU16v(SEncoder* pEncoder, uint16_t val) {
int64_t i = 0;
while (val >= ENCODE_LIMIT) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, 1)) return -1;
TD_CODER_CURRENT(pEncoder)[i] = (val | ENCODE_LIMIT) & 0xff;
}
val >>= 7;
i++;
}
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, 1)) return -1;
TD_CODER_CURRENT(pEncoder)[i] = (uint8_t)val;
}
TD_CODER_MOVE_POS(pEncoder, i + 1);
return 0;
}
static FORCE_INLINE int tEncodeI16v(SEncoder* pEncoder, int16_t val) {
return tEncodeU16v(pEncoder, ZIGZAGE(int16_t, val));
}
// 32v
static FORCE_INLINE int tEncodeU32v(SEncoder* pEncoder, uint32_t val) {
int64_t i = 0;
while (val >= ENCODE_LIMIT) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, 1)) return -1;
TD_CODER_CURRENT(pEncoder)[i] = (val | ENCODE_LIMIT) & 0xff;
}
val >>= 7;
i++;
}
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, 1)) return -1;
TD_CODER_CURRENT(pEncoder)[i] = (uint8_t)val;
}
TD_CODER_MOVE_POS(pEncoder, i + 1);
return 0;
}
static FORCE_INLINE int tEncodeI32v(SEncoder* pEncoder, int32_t val) {
return tEncodeU32v(pEncoder, ZIGZAGE(int32_t, val));
}
// 64v
static FORCE_INLINE int tEncodeU64v(SEncoder* pEncoder, uint64_t val) {
int64_t i = 0;
while (val >= ENCODE_LIMIT) {
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, 1)) return -1;
TD_CODER_CURRENT(pEncoder)[i] = (val | ENCODE_LIMIT) & 0xff;
}
val >>= 7;
i++;
}
if (pEncoder->data) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pEncoder, 1)) return -1;
TD_CODER_CURRENT(pEncoder)[i] = (uint8_t)val;
}
TD_CODER_MOVE_POS(pEncoder, i + 1);
return 0;
}
static FORCE_INLINE int tEncodeI64v(SEncoder* pEncoder, int64_t val) {
return tEncodeU64v(pEncoder, ZIGZAGE(int64_t, val));
}
static FORCE_INLINE int tEncodeFloat(SEncoder* pEncoder, float val) {
// TODO
return 0;
}
static FORCE_INLINE int tEncodeDouble(SEncoder* pEncoder, double val) {
// TODO
return 0;
}
static FORCE_INLINE int tEncodeCStr(SEncoder* pEncoder, const char* val) {
// TODO
return 0;
}
/* ------------------------ FOR DECODER ------------------------ */
static FORCE_INLINE void tInitDecoder(SDecoder* pDecoder, td_endian_t endian, uint8_t* data, int64_t size) {
ASSERT(!TD_IS_NULL(data));
pDecoder->endian = endian;
pDecoder->data = data;
pDecoder->size = size;
pDecoder->pos = 0;
}
// 8
static FORCE_INLINE int tDecodeU8(SDecoder* pDecoder, uint8_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
tGet(uint8_t, TD_CODER_CURRENT(pDecoder), *val);
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
static FORCE_INLINE int tDecodeI8(SDecoder* pDecoder, int8_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
tGet(int8_t, TD_CODER_CURRENT(pDecoder), *val);
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
// 16
static FORCE_INLINE int tDecodeU16(SDecoder* pDecoder, uint16_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
if (TD_RT_ENDIAN() == pDecoder->endian) {
tGet(uint16_t, TD_CODER_CURRENT(pDecoder), *val);
} else {
tRGet16(val, TD_CODER_CURRENT(pDecoder));
}
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
static FORCE_INLINE int tDecodeI16(SDecoder* pDecoder, int16_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
if (TD_RT_ENDIAN() == pDecoder->endian) {
tGet(int16_t, TD_CODER_CURRENT(pDecoder), *val);
} else {
tRGet16(val, TD_CODER_CURRENT(pDecoder));
}
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
// 32
static FORCE_INLINE int tDecodeU32(SDecoder* pDecoder, uint32_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
if (TD_RT_ENDIAN() == pDecoder->endian) {
tGet(uint32_t, TD_CODER_CURRENT(pDecoder), *val);
} else {
tRGet32(val, TD_CODER_CURRENT(pDecoder));
}
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
static FORCE_INLINE int tDecodeI32(SDecoder* pDecoder, int32_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
if (TD_RT_ENDIAN() == pDecoder->endian) {
tGet(int32_t, TD_CODER_CURRENT(pDecoder), *val);
} else {
tRGet32(val, TD_CODER_CURRENT(pDecoder));
}
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
// 64
static FORCE_INLINE int tDecodeU64(SDecoder* pDecoder, uint64_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
if (TD_RT_ENDIAN() == pDecoder->endian) {
tGet(uint64_t, TD_CODER_CURRENT(pDecoder), *val);
} else {
tRGet64(val, TD_CODER_CURRENT(pDecoder));
}
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
static FORCE_INLINE int tDecodeI64(SDecoder* pDecoder, int64_t* val) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, sizeof(*val))) return -1;
if (TD_RT_ENDIAN() == pDecoder->endian) {
tGet(int64_t, TD_CODER_CURRENT(pDecoder), *val);
} else {
tRGet64(val, TD_CODER_CURRENT(pDecoder));
}
TD_CODER_MOVE_POS(pDecoder, sizeof(*val));
return 0;
}
// 16v
static FORCE_INLINE int tDecodeU16v(SDecoder* pDecoder, uint16_t* val) {
int64_t i = 0;
*val = 0;
for (;;) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, 1)) return -1;
uint16_t tval = TD_CODER_CURRENT(pDecoder)[i];
if (tval < ENCODE_LIMIT) {
(*val) |= (tval << (7 * i));
break;
} else {
(*val) |= (((tval) & (ENCODE_LIMIT - 1)) << (7 * i));
i++;
}
}
TD_CODER_MOVE_POS(pDecoder, i);
return 0;
}
static FORCE_INLINE int tDecodeI16v(SDecoder* pDecoder, int16_t* val) {
uint16_t tval;
if (tDecodeU16v(pDecoder, &tval) < 0) {
return -1;
}
*val = ZIGZAGD(int16_t, tval);
return 0;
}
// 32v
static FORCE_INLINE int tDecodeU32v(SDecoder* pDecoder, uint32_t* val) {
int64_t i = 0;
*val = 0;
for (;;) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, 1)) return -1;
uint32_t tval = TD_CODER_CURRENT(pDecoder)[i];
if (tval < ENCODE_LIMIT) {
(*val) |= (tval << (7 * i));
break;
} else {
(*val) |= (((tval) & (ENCODE_LIMIT - 1)) << (7 * i));
i++;
}
}
TD_CODER_MOVE_POS(pDecoder, i);
return 0;
}
static FORCE_INLINE int tDecodeI32v(SDecoder* pDecoder, int32_t* val) {
uint32_t tval;
if (tDecodeU32v(pDecoder, &tval) < 0) {
return -1;
}
*val = ZIGZAGD(int32_t, tval);
return 0;
}
// 64v
static FORCE_INLINE int tDecodeU64v(SDecoder* pDecoder, uint64_t* val) {
int64_t i = 0;
*val = 0;
for (;;) {
if (TD_CHECK_CODER_CAPACITY_FAILED(pDecoder, 1)) return -1;
uint64_t tval = TD_CODER_CURRENT(pDecoder)[i];
if (tval < ENCODE_LIMIT) {
(*val) |= (tval << (7 * i));
break;
} else {
(*val) |= (((tval) & (ENCODE_LIMIT - 1)) << (7 * i));
i++;
}
}
TD_CODER_MOVE_POS(pDecoder, i);
return 0;
}
static FORCE_INLINE int tDecodeI64v(SDecoder* pDecoder, int64_t* val) {
uint64_t tval;
if (tDecodeU64v(pDecoder, &tval) < 0) {
return -1;
}
*val = ZIGZAGD(int64_t, tval);
return 0;
}
static FORCE_INLINE int tDecodeFloat(SDecoder* pDecoder, float* val) {
// TODO
return 0;
}
static FORCE_INLINE int tDecodeDouble(SDecoder* pDecoder, double* val) {
// TODO
return 0;
}
static FORCE_INLINE int tDecodeCStr(SDecoder* pEncoder, const char** val) {
// TODO
return 0;
}
#ifdef __cplusplus
}
#endif
#endif /*_TD_UTIL_ENCODE_H_*/
\ No newline at end of file
include/util/tbuffer.h
浏览文件 @ 240a5309
......@@ -16,6 +16,8 @@
#ifndef _TD_UTIL_BUFFER_H
#define _TD_UTIL_BUFFER_H
#include "os.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -82,91 +84,84 @@ typedef struct SBufferWriter {
char* data;
size_t pos;
size_t size;
void* (*allocator)( void*, size_t );
void* (*allocator)(void*, size_t);
} SBufferWriter;
////////////////////////////////////////////////////////////////////////////////
// common functions & macros for both reader & writer
#define tbufTell( buf ) ((buf)->pos)
#define tbufTell(buf) ((buf)->pos)
////////////////////////////////////////////////////////////////////////////////
// reader functions & macros
// *Endian*, if true, reader functions of primitive types will do 'ntoh' automatically
#define tbufInitReader( Data, Size, Endian ) {.endian = (Endian), .data = (Data), .pos = 0, .size = ((Data) == NULL ? 0 :(Size))}
size_t tbufSkip( SBufferReader* buf, size_t size );
const char* tbufRead( SBufferReader* buf, size_t size );
void tbufReadToBuffer( SBufferReader* buf, void* dst, size_t size );
const char* tbufReadString( SBufferReader* buf, size_t* len );
size_t tbufReadToString( SBufferReader* buf, char* dst, size_t size );
const char* tbufReadBinary( SBufferReader* buf, size_t *len );
size_t tbufReadToBinary( SBufferReader* buf, void* dst, size_t size );
bool tbufReadBool( SBufferReader* buf );
char tbufReadChar( SBufferReader* buf );
int8_t tbufReadInt8( SBufferReader* buf );
uint8_t tbufReadUint8( SBufferReader* buf );
int16_t tbufReadInt16( SBufferReader* buf );
uint16_t tbufReadUint16( SBufferReader* buf );
int32_t tbufReadInt32( SBufferReader* buf );
uint32_t tbufReadUint32( SBufferReader* buf );
int64_t tbufReadInt64( SBufferReader* buf );
uint64_t tbufReadUint64( SBufferReader* buf );
float tbufReadFloat( SBufferReader* buf );
double tbufReadDouble( SBufferReader* buf );
////////////////////////////////////////////////////////////////////////////////
// writer functions & macros
/* ------------------------ BUFFER WRITER FUNCTIONS AND MACROS ------------------------ */
// *Allocator*, function to allocate memory, will use 'realloc' if NULL
// *Endian*, if true, writer functions of primitive types will do 'hton' automatically
#define tbufInitWriter( Allocator, Endian ) {.endian = (Endian), .data = NULL, .pos = 0, .size = 0, .allocator = ((Allocator) == NULL ? realloc : (Allocator))}
void tbufCloseWriter( SBufferWriter* buf );
void tbufEnsureCapacity( SBufferWriter* buf, size_t size );
size_t tbufReserve( SBufferWriter* buf, size_t size );
char* tbufGetData( SBufferWriter* buf, bool takeOver );
void tbufWrite( SBufferWriter* buf, const void* data, size_t size );
void tbufWriteAt( SBufferWriter* buf, size_t pos, const void* data, size_t size );
void tbufWriteStringLen( SBufferWriter* buf, const char* str, size_t len );
void tbufWriteString( SBufferWriter* buf, const char* str );
#define tbufInitWriter(Allocator, Endian) \
{ .endian = (Endian), .data = NULL, .pos = 0, .size = 0, .allocator = ((Allocator) == NULL ? realloc : (Allocator)) }
void tbufCloseWriter(SBufferWriter* buf);
void tbufEnsureCapacity(SBufferWriter* buf, size_t size);
size_t tbufReserve(SBufferWriter* buf, size_t size);
char* tbufGetData(SBufferWriter* buf, bool takeOver);
void tbufWrite(SBufferWriter* buf, const void* data, size_t size);
void tbufWriteAt(SBufferWriter* buf, size_t pos, const void* data, size_t size);
void tbufWriteStringLen(SBufferWriter* buf, const char* str, size_t len);
void tbufWriteString(SBufferWriter* buf, const char* str);
// the prototype of tbufWriteBinary and tbufWrite are identical
// the difference is: tbufWriteBinary writes the length of the data to the buffer
// first, then the actual data, which means the reader don't need to know data
// size before read. Write only write the data itself, which means the reader
// need to know data size before read.
void tbufWriteBinary( SBufferWriter* buf, const void* data, size_t len );
void tbufWriteBool( SBufferWriter* buf, bool data );
void tbufWriteBoolAt( SBufferWriter* buf, size_t pos, bool data );
void tbufWriteChar( SBufferWriter* buf, char data );
void tbufWriteCharAt( SBufferWriter* buf, size_t pos, char data );
void tbufWriteInt8( SBufferWriter* buf, int8_t data );
void tbufWriteInt8At( SBufferWriter* buf, size_t pos, int8_t data );
void tbufWriteUint8( SBufferWriter* buf, uint8_t data );
void tbufWriteUint8At( SBufferWriter* buf, size_t pos, uint8_t data );
void tbufWriteInt16( SBufferWriter* buf, int16_t data );
void tbufWriteInt16At( SBufferWriter* buf, size_t pos, int16_t data );
void tbufWriteUint16( SBufferWriter* buf, uint16_t data );
void tbufWriteUint16At( SBufferWriter* buf, size_t pos, uint16_t data );
void tbufWriteInt32( SBufferWriter* buf, int32_t data );
void tbufWriteInt32At( SBufferWriter* buf, size_t pos, int32_t data );
void tbufWriteUint32( SBufferWriter* buf, uint32_t data );
void tbufWriteUint32At( SBufferWriter* buf, size_t pos, uint32_t data );
void tbufWriteInt64( SBufferWriter* buf, int64_t data );
void tbufWriteInt64At( SBufferWriter* buf, size_t pos, int64_t data );
void tbufWriteUint64( SBufferWriter* buf, uint64_t data );
void tbufWriteUint64At( SBufferWriter* buf, size_t pos, uint64_t data );
void tbufWriteFloat( SBufferWriter* buf, float data );
void tbufWriteFloatAt( SBufferWriter* buf, size_t pos, float data );
void tbufWriteDouble( SBufferWriter* buf, double data );
void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data );
void tbufWriteBinary(SBufferWriter* buf, const void* data, size_t len);
void tbufWriteBool(SBufferWriter* buf, bool data);
void tbufWriteBoolAt(SBufferWriter* buf, size_t pos, bool data);
void tbufWriteChar(SBufferWriter* buf, char data);
void tbufWriteCharAt(SBufferWriter* buf, size_t pos, char data);
void tbufWriteInt8(SBufferWriter* buf, int8_t data);
void tbufWriteInt8At(SBufferWriter* buf, size_t pos, int8_t data);
void tbufWriteUint8(SBufferWriter* buf, uint8_t data);
void tbufWriteUint8At(SBufferWriter* buf, size_t pos, uint8_t data);
void tbufWriteInt16(SBufferWriter* buf, int16_t data);
void tbufWriteInt16At(SBufferWriter* buf, size_t pos, int16_t data);
void tbufWriteUint16(SBufferWriter* buf, uint16_t data);
void tbufWriteUint16At(SBufferWriter* buf, size_t pos, uint16_t data);
void tbufWriteInt32(SBufferWriter* buf, int32_t data);
void tbufWriteInt32At(SBufferWriter* buf, size_t pos, int32_t data);
void tbufWriteUint32(SBufferWriter* buf, uint32_t data);
void tbufWriteUint32At(SBufferWriter* buf, size_t pos, uint32_t data);
void tbufWriteInt64(SBufferWriter* buf, int64_t data);
void tbufWriteInt64At(SBufferWriter* buf, size_t pos, int64_t data);
void tbufWriteUint64(SBufferWriter* buf, uint64_t data);
void tbufWriteUint64At(SBufferWriter* buf, size_t pos, uint64_t data);
void tbufWriteFloat(SBufferWriter* buf, float data);
void tbufWriteFloatAt(SBufferWriter* buf, size_t pos, float data);
void tbufWriteDouble(SBufferWriter* buf, double data);
void tbufWriteDoubleAt(SBufferWriter* buf, size_t pos, double data);
/* ------------------------ BUFFER READER FUNCTIONS AND MACROS ------------------------ */
// *Endian*, if true, reader functions of primitive types will do 'ntoh' automatically
#define tbufInitReader(Data, Size, Endian) \
{ .endian = (Endian), .data = (Data), .pos = 0, .size = ((Data) == NULL ? 0 : (Size)) }
size_t tbufSkip(SBufferReader* buf, size_t size);
const char* tbufRead(SBufferReader* buf, size_t size);
void tbufReadToBuffer(SBufferReader* buf, void* dst, size_t size);
const char* tbufReadString(SBufferReader* buf, size_t* len);
size_t tbufReadToString(SBufferReader* buf, char* dst, size_t size);
const char* tbufReadBinary(SBufferReader* buf, size_t* len);
size_t tbufReadToBinary(SBufferReader* buf, void* dst, size_t size);
bool tbufReadBool(SBufferReader* buf);
char tbufReadChar(SBufferReader* buf);
int8_t tbufReadInt8(SBufferReader* buf);
uint8_t tbufReadUint8(SBufferReader* buf);
int16_t tbufReadInt16(SBufferReader* buf);
uint16_t tbufReadUint16(SBufferReader* buf);
int32_t tbufReadInt32(SBufferReader* buf);
uint32_t tbufReadUint32(SBufferReader* buf);
int64_t tbufReadInt64(SBufferReader* buf);
uint64_t tbufReadUint64(SBufferReader* buf);
float tbufReadFloat(SBufferReader* buf);
double tbufReadDouble(SBufferReader* buf);
#ifdef __cplusplus
}
......
include/util/tcoding.h
浏览文件 @ 240a5309
......@@ -25,6 +25,8 @@ extern "C" {
#define ZIGZAGE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1) // zigzag encode
#define ZIGZAGD(T, v) ((v) >> 1) ^ -((T)((v)&1)) // zigzag decode
/* ------------------------ LEGACY CODES ------------------------ */
#if 1
// ---- Fixed U8
static FORCE_INLINE int taosEncodeFixedU8(void **buf, uint8_t value) {
if (buf != NULL) {
......@@ -368,6 +370,8 @@ static FORCE_INLINE void *taosDecodeStringTo(void *buf, char *value) {
return POINTER_SHIFT(buf, size);
}
#endif
#ifdef __cplusplus
}
#endif
......
include/util/tmacro.h
浏览文件 @ 240a5309
......@@ -35,6 +35,8 @@ typedef int8_t td_mode_flag_t;
#define TD_CHECK_AND_SET_MOD_CLEAR(FLAG) atomic_val_compare_exchange_8((FLAG), TD_MOD_UNCLEARD, TD_MOD_CLEARD)
#define TD_IS_NULL(PTR) ((PTR) == NULL)
#ifdef __cplusplus
}
#endif
......
source/client/src/clientImpl.c
浏览文件 @ 240a5309
......@@ -181,43 +181,13 @@ int32_t execDdlQuery(SRequestObj* pRequest, SQueryNode* pQuery) {
pRequest->body.requestMsg = (SDataBuf){.pData = pDcl->pMsg, .len = pDcl->msgLen};
STscObj* pTscObj = pRequest->pTscObj;
SMsgSendInfo* pSendMsg = buildSendMsgInfoImpl(pRequest);
SEpSet* pEpSet = &pTscObj->pAppInfo->mgmtEp.epSet;
if (pDcl->msgType == TDMT_VND_CREATE_TABLE) {
// struct SCatalog* pCatalog = NULL;
//
// char buf[18] = {0};
// sprintf(buf, "%" PRId64, pRequest->pTscObj->pAppInfo->clusterId);
// int32_t code = catalogGetHandle(buf, &pCatalog);
// if (code != TSDB_CODE_SUCCESS) {
// return code;
// }
//
// SCreateTableMsg* pMsg = pSendMsg->msgInfo.pData;
//
// SName t = {0};
// tNameFromString(&t, pMsg->name, T_NAME_ACCT|T_NAME_DB|T_NAME_TABLE);
//
// char db[TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN + TSDB_ACCT_ID_LEN] = {0};
// tNameGetFullDbName(&t, db);
//
// SVgroupInfo info = {0};
// catalogGetTableHashVgroup(pCatalog, pRequest->pTscObj->pTransporter, pEpSet, db, tNameGetTableName(&t), &info);
//
int64_t transporterId = 0;
// SEpSet ep = {0};
// ep.inUse = info.inUse;
// ep.numOfEps = info.numOfEps;
// for(int32_t i = 0; i < ep.numOfEps; ++i) {
// ep.port[i] = info.epAddr[i].port;
// tstrncpy(ep.fqdn[i], info.epAddr[i].fqdn, tListLen(ep.fqdn[i]));
// }
if (pDcl->msgType == TDMT_VND_CREATE_TABLE) {
asyncSendMsgToServer(pTscObj->pTransporter, &pDcl->epSet, &transporterId, pSendMsg);
} else {
int64_t transporterId = 0;
SEpSet* pEpSet = &pTscObj->pAppInfo->mgmtEp.epSet;
asyncSendMsgToServer(pTscObj->pTransporter, pEpSet, &transporterId, pSendMsg);
}
......
source/client/src/clientMsgHandler.c
浏览文件 @ 240a5309
......@@ -188,14 +188,21 @@ int32_t processCreateDbRsp(void* param, const SDataBuf* pMsg, int32_t code) {
}
int32_t processUseDbRsp(void* param, const SDataBuf* pMsg, int32_t code) {
SUseDbRsp* pUseDbRsp = (SUseDbRsp*) pMsg->pData;
SRequestObj* pRequest = param;
if (code != TSDB_CODE_SUCCESS) {
pRequest->code = code;
tsem_post(&pRequest->body.rspSem);
return code;
}
SUseDbRsp* pUseDbRsp = (SUseDbRsp*)pMsg->pData;
SName name = {0};
tNameFromString(&name, pUseDbRsp->db, T_NAME_ACCT|T_NAME_DB);
tNameFromString(&name, pUseDbRsp->db, T_NAME_ACCT | T_NAME_DB);
char db[TSDB_DB_NAME_LEN] = {0};
tNameGetDbName(&name, db);
SRequestObj* pRequest = param;
setConnectionDB(pRequest->pTscObj, db);
tsem_post(&pRequest->body.rspSem);
......
source/client/test/clientTests.cpp
浏览文件 @ 240a5309
......@@ -162,7 +162,7 @@ TEST(testCase, create_db_Test) {
taos_free_result(pRes);
pRes = taos_query(pConn, "create database abc1");
pRes = taos_query(pConn, "create database abc1 vgroups 4");
if (taos_errno(pRes) != 0) {
printf("error in create db, reason:%s\n", taos_errstr(pRes));
}
......@@ -399,50 +399,49 @@ TEST(testCase, drop_stable_Test) {
taos_close(pConn);
}
TEST(testCase, create_topic_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "create database abc1");
if (taos_errno(pRes) != 0) {
printf("error in create db, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
pRes = taos_query(pConn, "use abc1");
if (taos_errno(pRes) != 0) {
printf("error in use db, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
pRes = taos_query(pConn, "create stable st1(ts timestamp, k int) tags(a int)");
if (taos_errno(pRes) != 0) {
printf("error in create stable, reason:%s\n", taos_errstr(pRes));
}
TAOS_FIELD* pFields = taos_fetch_fields(pRes);
ASSERT_TRUE(pFields == NULL);
int32_t numOfFields = taos_num_fields(pRes);
ASSERT_EQ(numOfFields, 0);
taos_free_result(pRes);
char* sql = "select * from st1";
tmq_create_topic(pConn, "test_topic_1", sql, strlen(sql));
taos_close(pConn);
}
//TEST(testCase, show_table_Test) {
//TEST(testCase, create_topic_Test) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
// assert(pConn != NULL);
//
// TAOS_RES* pRes = taos_query(pConn, "use abc1");
// TAOS_RES* pRes = taos_query(pConn, "create database abc1");
// if (taos_errno(pRes) != 0) {
// printf("error in create db, reason:%s\n", taos_errstr(pRes));
// }
// taos_free_result(pRes);
//
// pRes = taos_query(pConn, "use abc1");
// if (taos_errno(pRes) != 0) {
// printf("error in use db, reason:%s\n", taos_errstr(pRes));
// }
// taos_free_result(pRes);
//
// pRes = taos_query(pConn, "show tables");
// pRes = taos_query(pConn, "create stable st1(ts timestamp, k int) tags(a int)");
// if (taos_errno(pRes) != 0) {
// printf("error in create stable, reason:%s\n", taos_errstr(pRes));
// }
//
// TAOS_FIELD* pFields = taos_fetch_fields(pRes);
// ASSERT_TRUE(pFields == NULL);
//
// int32_t numOfFields = taos_num_fields(pRes);
// ASSERT_EQ(numOfFields, 0);
//
// taos_free_result(pRes);
//
// char* sql = "select * from st1";
// tmq_create_topic(pConn, "test_topic_1", sql, strlen(sql));
// taos_close(pConn);
//}
TEST(testCase, show_table_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "use abc1");
taos_free_result(pRes);
pRes = taos_query(pConn, "show tables");
taos_free_result(pRes);
taos_close(pConn);
}
source/dnode/mgmt/daemon/src/daemon.c
浏览文件 @ 240a5309
......@@ -139,7 +139,7 @@ void dmnWaitSignal() {
void dmnInitOption(SDnodeOpt *pOption) {
pOption->sver = 30000000; //3.0.0.0
pOption->numOfCores = tsNumOfCores;
pOption->numOfSupportVnodes = 1;
pOption->numOfSupportVnodes = 16;
pOption->numOfCommitThreads = 1;
pOption->statusInterval = tsStatusInterval;
pOption->numOfThreadsPerCore = tsNumOfThreadsPerCore;
......
source/dnode/mgmt/impl/src/dndDnode.c
浏览文件 @ 240a5309
......@@ -393,13 +393,11 @@ void dndSendStatusMsg(SDnode *pDnode) {
static void dndUpdateDnodeCfg(SDnode *pDnode, SDnodeCfg *pCfg) {
SDnodeMgmt *pMgmt = &pDnode->dmgmt;
if (pMgmt->dnodeId == 0 || pMgmt->dropped != pCfg->dropped) {
dInfo("set dnodeId:%d clusterId:% " PRId64 " dropped:%d", pCfg->dnodeId, pCfg->clusterId, pCfg->dropped);
if (pMgmt->dnodeId == 0) {
dInfo("set dnodeId:%d clusterId:% " PRId64, pCfg->dnodeId, pCfg->clusterId);
taosWLockLatch(&pMgmt->latch);
pMgmt->dnodeId = pCfg->dnodeId;
pMgmt->clusterId = pCfg->clusterId;
pMgmt->dropped = pCfg->dropped;
dndWriteDnodes(pDnode);
taosWUnLockLatch(&pMgmt->latch);
}
......@@ -430,6 +428,11 @@ static void dndProcessStatusRsp(SDnode *pDnode, SRpcMsg *pMsg) {
if (pMsg->code != TSDB_CODE_SUCCESS) {
pMgmt->statusSent = 0;
if (pMsg->code == TSDB_CODE_MND_DNODE_NOT_EXIST && !pMgmt->dropped && pMgmt->dnodeId > 0) {
dInfo("dnode:%d, set to dropped since not exist in mnode", pMgmt->dnodeId);
pMgmt->dropped = 1;
dndWriteDnodes(pDnode);
}
return;
}
......@@ -439,11 +442,6 @@ static void dndProcessStatusRsp(SDnode *pDnode, SRpcMsg *pMsg) {
pCfg->clusterId = htobe64(pCfg->clusterId);
dndUpdateDnodeCfg(pDnode, pCfg);
if (pCfg->dropped) {
pMgmt->statusSent = 0;
return;
}
SDnodeEps *pDnodeEps = &pRsp->dnodeEps;
pDnodeEps->num = htonl(pDnodeEps->num);
for (int32_t i = 0; i < pDnodeEps->num; ++i) {
......@@ -487,7 +485,7 @@ static void *dnodeThreadRoutine(void *param) {
pthread_testcancel();
taosMsleep(ms);
if (dndGetStat(pDnode) == DND_STAT_RUNNING && !pMgmt->statusSent) {
if (dndGetStat(pDnode) == DND_STAT_RUNNING && !pMgmt->statusSent && !pMgmt->dropped) {
dndSendStatusMsg(pDnode);
}
}
......@@ -522,6 +520,11 @@ int32_t dndInitDnode(SDnode *pDnode) {
return -1;
}
if (pMgmt->dropped) {
dError("dnode will not start for its already dropped");
return -1;
}
if (dndInitMgmtWorker(pDnode) != 0) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
......
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @ 240a5309
......@@ -124,12 +124,8 @@ typedef struct {
int64_t rebootTime;
int64_t lastAccessTime;
int32_t accessTimes;
int16_t numOfMnodes;
int16_t numOfVnodes;
int16_t numOfQnodes;
int16_t numOfSupportMnodes;
int16_t numOfSupportVnodes;
int16_t numOfSupportQnodes;
int16_t numOfCores;
EDndStatus status;
EDndReason offlineReason;
......
source/dnode/mnode/impl/inc/mndInt.h
浏览文件 @ 240a5309
......@@ -19,6 +19,7 @@
#include "mndDef.h"
#include "sdb.h"
#include "tcache.h"
#include "tep.h"
#include "tqueue.h"
#include "ttime.h"
......
source/dnode/mnode/impl/inc/mndVgroup.h
浏览文件 @ 240a5309
......@@ -29,6 +29,7 @@ void mndReleaseVgroup(SMnode *pMnode, SVgObj *pVgroup);
SSdbRaw *mndVgroupActionEncode(SVgObj *pVgroup);
int32_t mndAllocVgroup(SMnode *pMnode, SDbObj *pDb, SVgObj **ppVgroups);
SEpSet mndGetVgroupEpset(SMnode *pMnode, SVgObj *pVgroup);
int32_t mndGetVnodesNum(SMnode *pMnode, int32_t dnodeId);
SCreateVnodeMsg *mndBuildCreateVnodeMsg(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *pDb, SVgObj *pVgroup);
SDropVnodeMsg *mndBuildDropVnodeMsg(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *pDb, SVgObj *pVgroup);
......
source/dnode/mnode/impl/src/mndDnode.c
浏览文件 @ 240a5309
......@@ -18,8 +18,7 @@
#include "mndMnode.h"
#include "mndShow.h"
#include "mndTrans.h"
#include "tep.h"
#include "ttime.h"
#include "mndVgroup.h"
#define TSDB_DNODE_VER_NUMBER 1
#define TSDB_DNODE_RESERVE_SIZE 64
......@@ -370,7 +369,6 @@ static int32_t mndProcessStatusMsg(SMnodeMsg *pMsg) {
}
pRsp->dnodeCfg.dnodeId = htonl(pDnode->id);
pRsp->dnodeCfg.dropped = 0;
pRsp->dnodeCfg.clusterId = htobe64(pMnode->clusterId);
mndGetDnodeData(pMnode, &pRsp->dnodeEps, numOfEps);
......@@ -700,7 +698,7 @@ static int32_t mndRetrieveDnodes(SMnodeMsg *pMsg, SShowObj *pShow, char *data, i
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int16_t *)pWrite = pDnode->numOfVnodes;
*(int16_t *)pWrite = mndGetVnodesNum(pMnode, pDnode->id);
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
......
source/dnode/mnode/impl/src/mndProfile.c
浏览文件 @ 240a5309
......@@ -118,17 +118,17 @@ static SConnObj *mndCreateConn(SMnode *pMnode, SRpcConnInfo *pInfo, int32_t pid,
SConnObj *pConn = taosCachePut(pMgmt->cache, &connId, sizeof(int32_t), &connObj, sizeof(connObj), keepTime * 1000);
if (pConn == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
mError("conn:%d, data:%p failed to put into cache since %s, user:%s", connId, pConn, pInfo->user, terrstr());
mError("conn:%d, failed to put into cache since %s, user:%s", connId, pInfo->user, terrstr());
return NULL;
} else {
mTrace("conn:%d, data:%p created, user:%s", pConn->id, pConn, pInfo->user);
mTrace("conn:%d, is created, data:%p user:%s", pConn->id, pConn, pInfo->user);
return pConn;
}
}
static void mndFreeConn(SConnObj *pConn) {
tfree(pConn->pQueries);
mTrace("conn:%d, data:%p destroyed", pConn->id, pConn);
mTrace("conn:%d, is destroyed, data:%p", pConn->id, pConn);
}
static SConnObj *mndAcquireConn(SMnode *pMnode, int32_t connId) {
......@@ -143,13 +143,13 @@ static SConnObj *mndAcquireConn(SMnode *pMnode, int32_t connId) {
int32_t keepTime = pMnode->cfg.shellActivityTimer * 3;
pConn->lastAccessTimeMs = keepTime * 1000 + (uint64_t)taosGetTimestampMs();
mTrace("conn:%d, data:%p acquired from cache", pConn->id, pConn);
mTrace("conn:%d, acquired from cache, data:%p", pConn->id, pConn);
return pConn;
}
static void mndReleaseConn(SMnode *pMnode, SConnObj *pConn) {
if (pConn == NULL) return;
mTrace("conn:%d, data:%p released from cache", pConn->id, pConn);
mTrace("conn:%d, released from cache, data:%p", pConn->id, pConn);
SProfileMgmt *pMgmt = &pMnode->profileMgmt;
taosCacheRelease(pMgmt->cache, (void **)&pConn, false);
......
source/dnode/mnode/impl/src/mndShow.c
浏览文件 @ 240a5309
......@@ -56,31 +56,24 @@ static SShowObj *mndCreateShowObj(SMnode *pMnode, SShowMsg *pMsg) {
if (showId == 0) atomic_add_fetch_32(&pMgmt->showId, 1);
int32_t size = sizeof(SShowObj) + pMsg->payloadLen;
SShowObj *pShow = calloc(1, size);
if (pShow != NULL) {
pShow->id = showId;
pShow->pMnode = pMnode;
pShow->type = pMsg->type;
pShow->payloadLen = pMsg->payloadLen;
memcpy(pShow->db, pMsg->db, TSDB_DB_FNAME_LEN);
memcpy(pShow->payload, pMsg->payload, pMsg->payloadLen);
} else {
terrno = TSDB_CODE_OUT_OF_MEMORY;
mError("failed to process show-meta msg:%s since %s", mndShowStr(pMsg->type), terrstr());
return NULL;
}
SShowObj showObj = {0};
showObj.id = showId;
showObj.pMnode = pMnode;
showObj.type = pMsg->type;
showObj.payloadLen = pMsg->payloadLen;
memcpy(showObj.db, pMsg->db, TSDB_DB_FNAME_LEN);
memcpy(showObj.payload, pMsg->payload, pMsg->payloadLen);
int32_t keepTime = pMnode->cfg.shellActivityTimer * 6 * 1000;
SShowObj *pShowRet = taosCachePut(pMgmt->cache, &showId, sizeof(int32_t), pShow, size, keepTime);
free(pShow);
if (pShowRet == NULL) {
SShowObj *pShow = taosCachePut(pMgmt->cache, &showId, sizeof(int32_t), &showObj, size, keepTime);
if (pShow == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
mError("show:%d, failed to put into cache since %s", showId, terrstr());
return NULL;
} else {
mTrace("show:%d, data:%p created", showId, pShowRet);
return pShowRet;
}
mTrace("show:%d, is created, data:%p", showId, pShow);
return pShow;
}
static void mndFreeShowObj(SShowObj *pShow) {
......@@ -94,7 +87,7 @@ static void mndFreeShowObj(SShowObj *pShow) {
}
}
mTrace("show:%d, data:%p destroyed", pShow->id, pShow);
mTrace("show:%d, is destroyed, data:%p", pShow->id, pShow);
}
static SShowObj *mndAcquireShowObj(SMnode *pMnode, int32_t showId) {
......@@ -106,13 +99,13 @@ static SShowObj *mndAcquireShowObj(SMnode *pMnode, int32_t showId) {
return NULL;
}
mTrace("show:%d, data:%p acquired from cache", pShow->id, pShow);
mTrace("show:%d, acquired from cache, data:%p", pShow->id, pShow);
return pShow;
}
static void mndReleaseShowObj(SShowObj *pShow, bool forceRemove) {
if (pShow == NULL) return;
mTrace("show:%d, data:%p released from cache, force:%d", pShow->id, pShow, forceRemove);
mTrace("show:%d, released from cache, data:%p force:%d", pShow->id, pShow, forceRemove);
// A bug in tcache.c
forceRemove = 0;
......@@ -158,8 +151,8 @@ static int32_t mndProcessShowMsg(SMnodeMsg *pMnodeMsg) {
}
int32_t code = (*metaFp)(pMnodeMsg, pShow, &pRsp->tableMeta);
mDebug("show:%d, data:%p get meta finished, numOfRows:%d cols:%d type:%s result:%s", pShow->id, pShow,
pShow->numOfRows, pShow->numOfColumns, mndShowStr(type), tstrerror(code));
mDebug("show:%d, get meta finished, numOfRows:%d cols:%d type:%s result:%s", pShow->id, pShow->numOfRows,
pShow->numOfColumns, mndShowStr(type), tstrerror(code));
if (code == TSDB_CODE_SUCCESS) {
pMnodeMsg->contLen = sizeof(SShowRsp) + sizeof(SSchema) * pShow->numOfColumns;
......@@ -195,16 +188,15 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
if (retrieveFp == NULL) {
mndReleaseShowObj(pShow, false);
terrno = TSDB_CODE_MSG_NOT_PROCESSED;
mError("show:%d, data:%p failed to retrieve data since %s", pShow->id, pShow, terrstr());
mError("show:%d, failed to retrieve data since %s", pShow->id, terrstr());
return -1;
}
mDebug("show:%d, data:%p start retrieve data, numOfReads:%d numOfRows:%d type:%s", pShow->id, pShow,
pShow->numOfReads, pShow->numOfRows, mndShowStr(pShow->type));
mDebug("show:%d, start retrieve data, numOfReads:%d numOfRows:%d type:%s", pShow->id, pShow->numOfReads,
pShow->numOfRows, mndShowStr(pShow->type));
if (mndCheckRetrieveFinished(pShow)) {
mDebug("show:%d, data:%p read finished, numOfReads:%d numOfRows:%d", pShow->id, pShow, pShow->numOfReads,
pShow->numOfRows);
mDebug("show:%d, read finished, numOfReads:%d numOfRows:%d", pShow->id, pShow->numOfReads, pShow->numOfRows);
pShow->numOfReads = pShow->numOfRows;
}
......@@ -227,7 +219,7 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
if (pRsp == NULL) {
mndReleaseShowObj(pShow, false);
terrno = TSDB_CODE_OUT_OF_MEMORY;
mError("show:%d, data:%p failed to retrieve data since %s", pShow->id, pShow, terrstr());
mError("show:%d, failed to retrieve data since %s", pShow->id, terrstr());
return -1;
}
......@@ -236,7 +228,7 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
rowsRead = (*retrieveFp)(pMnodeMsg, pShow, pRsp->data, rowsToRead);
}
mDebug("show:%d, data:%p stop retrieve data, rowsRead:%d rowsToRead:%d", pShow->id, pShow, rowsRead, rowsToRead);
mDebug("show:%d, stop retrieve data, rowsRead:%d rowsToRead:%d", pShow->id, rowsRead, rowsToRead);
pRsp->numOfRows = htonl(rowsRead);
pRsp->precision = TSDB_TIME_PRECISION_MILLI; // millisecond time precision
......@@ -246,10 +238,10 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
if (rowsRead == 0 || rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows == pShow->numOfReads)) {
pRsp->completed = 1;
mDebug("show:%d, data:%p retrieve completed", pShow->id, pShow);
mDebug("show:%d, retrieve completed", pShow->id);
mndReleaseShowObj(pShow, true);
} else {
mDebug("show:%d, data:%p retrieve not completed yet", pShow->id, pShow);
mDebug("show:%d, retrieve not completed yet", pShow->id);
mndReleaseShowObj(pShow, false);
}
......
source/dnode/mnode/impl/src/mndTrans.c
浏览文件 @ 240a5309
......@@ -294,18 +294,18 @@ TRANS_DECODE_OVER:
return NULL;
}
mTrace("trans:%d, decode from raw:%p", pTrans->id, pRaw);
mTrace("trans:%d, decode from raw:%p, data:%p", pTrans->id, pRaw, pTrans);
return pRow;
}
static int32_t mndTransActionInsert(SSdb *pSdb, STrans *pTrans) {
pTrans->stage = TRN_STAGE_PREPARE;
mTrace("trans:%d, perform insert action", pTrans->id);
mTrace("trans:%d, perform insert action, data:%p", pTrans->id, pTrans);
return 0;
}
static int32_t mndTransActionDelete(SSdb *pSdb, STrans *pTrans) {
mTrace("trans:%d, perform delete action", pTrans->id);
mTrace("trans:%d, perform delete action, data:%p", pTrans->id, pTrans);
mndTransDropLogs(pTrans->redoLogs);
mndTransDropLogs(pTrans->undoLogs);
......@@ -317,7 +317,7 @@ static int32_t mndTransActionDelete(SSdb *pSdb, STrans *pTrans) {
}
static int32_t mndTransActionUpdate(SSdb *pSdb, STrans *pOldTrans, STrans *pNewTrans) {
mTrace("trans:%d, perform update action", pOldTrans->id);
mTrace("trans:%d, perform update action, data:%p", pOldTrans->id, pOldTrans);
pOldTrans->stage = pNewTrans->stage;
return 0;
}
......@@ -362,14 +362,14 @@ STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, SRpcMsg *pMsg) {
return NULL;
}
mDebug("trans:%d, is created", pTrans->id);
mDebug("trans:%d, is created, data:%p", pTrans->id, pTrans);
return pTrans;
}
static void mndTransDropLogs(SArray *pArray) {
for (int32_t i = 0; i < pArray->size; ++i) {
SSdbRaw *pRaw = taosArrayGetP(pArray, i);
tfree(pRaw);
sdbFreeRaw(pRaw);
}
taosArrayDestroy(pArray);
......@@ -391,7 +391,7 @@ void mndTransDrop(STrans *pTrans) {
mndTransDropActions(pTrans->redoActions);
mndTransDropActions(pTrans->undoActions);
// mDebug("trans:%d, is dropped, data:%p", pTrans->id, pTrans);
mDebug("trans:%d, is dropped, data:%p", pTrans->id, pTrans);
tfree(pTrans);
}
......@@ -442,7 +442,7 @@ static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) {
}
sdbSetRawStatus(pRaw, SDB_STATUS_READY);
mTrace("trans:%d, sync to other nodes", pTrans->id);
mDebug("trans:%d, sync to other nodes", pTrans->id);
int32_t code = mndSyncPropose(pMnode, pRaw);
if (code != 0) {
mError("trans:%d, failed to sync since %s", pTrans->id, terrstr());
......@@ -450,7 +450,7 @@ static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) {
return -1;
}
mTrace("trans:%d, sync finished", pTrans->id);
mDebug("trans:%d, sync finished", pTrans->id);
code = sdbWrite(pMnode->pSdb, pRaw);
if (code != 0) {
......
source/dnode/mnode/impl/src/mndVgroup.c
浏览文件 @ 240a5309
......@@ -86,7 +86,6 @@ SSdbRaw *mndVgroupActionEncode(SVgObj *pVgroup) {
for (int8_t i = 0; i < pVgroup->replica; ++i) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
SDB_SET_INT32(pRaw, dataPos, pVgid->dnodeId)
SDB_SET_INT8(pRaw, dataPos, pVgid->role)
}
SDB_SET_RESERVE(pRaw, dataPos, TSDB_VGROUP_RESERVE_SIZE)
SDB_SET_DATALEN(pRaw, dataPos);
......@@ -121,7 +120,6 @@ SSdbRow *mndVgroupActionDecode(SSdbRaw *pRaw) {
for (int8_t i = 0; i < pVgroup->replica; ++i) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
SDB_GET_INT32(pRaw, pRow, dataPos, &pVgid->dnodeId)
SDB_GET_INT8(pRaw, pRow, dataPos, (int8_t *)&pVgid->role)
}
SDB_GET_RESERVE(pRaw, pRow, dataPos, TSDB_VGROUP_RESERVE_SIZE)
......@@ -237,44 +235,95 @@ SDropVnodeMsg *mndBuildDropVnodeMsg(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *p
return pDrop;
}
static int32_t mndGetAvailableDnode(SMnode *pMnode, SVgObj *pVgroup) {
static SArray *mndBuildDnodesArray(SMnode *pMnode) {
SSdb *pSdb = pMnode->pSdb;
int32_t allocedVnodes = 0;
void *pIter = NULL;
int32_t numOfDnodes = mndGetDnodeSize(pMnode);
SArray *pArray = taosArrayInit(numOfDnodes, sizeof(SDnodeObj));
if (pArray == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return NULL;
}
while (allocedVnodes < pVgroup->replica) {
void *pIter = NULL;
while (1) {
SDnodeObj *pDnode = NULL;
pIter = sdbFetch(pSdb, SDB_DNODE, pIter, (void **)&pDnode);
if (pIter == NULL) break;
// todo
if (mndIsDnodeInReadyStatus(pMnode, pDnode)) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[allocedVnodes];
pVgid->dnodeId = pDnode->id;
if (pVgroup->replica == 1) {
pVgid->role = TAOS_SYNC_STATE_LEADER;
} else {
pVgid->role = TAOS_SYNC_STATE_FOLLOWER;
int32_t numOfVnodes = mndGetVnodesNum(pMnode, pDnode->id);
bool isMnode = mndIsMnode(pMnode, pDnode->id);
if (isMnode) {
pDnode->numOfVnodes++;
}
allocedVnodes++;
bool isReady = mndIsDnodeInReadyStatus(pMnode, pDnode);
if (isReady) {
taosArrayPush(pArray, pDnode);
}
mDebug("dnode:%d, numOfVnodes:%d numOfSupportVnodes:%d isMnode:%d ready:%d", pDnode->id, numOfVnodes,
pDnode->numOfSupportVnodes, isMnode, isReady);
sdbRelease(pSdb, pDnode);
}
if (allocedVnodes != pVgroup->replica) {
return pArray;
}
static int32_t mndCompareDnodeVnodes(SDnodeObj *pDnode1, SDnodeObj *pDnode2) {
float d1Score = (float)pDnode1->numOfVnodes / pDnode1->numOfSupportVnodes;
float d2Score = (float)pDnode2->numOfVnodes / pDnode2->numOfSupportVnodes;
return d1Score > d2Score ? 0 : 1;
}
static int32_t mndGetAvailableDnode(SMnode *pMnode, SVgObj *pVgroup, SArray *pArray) {
SSdb *pSdb = pMnode->pSdb;
int32_t allocedVnodes = 0;
void *pIter = NULL;
taosArraySort(pArray, (__compar_fn_t)mndCompareDnodeVnodes);
for (int32_t v = 0; v < pVgroup->replica; ++v) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[v];
SDnodeObj *pDnode = taosArrayGet(pArray, v);
if (pDnode == NULL || pDnode->numOfVnodes > pDnode->numOfSupportVnodes) {
terrno = TSDB_CODE_MND_NO_ENOUGH_DNODES;
return -1;
}
pVgid->dnodeId = pDnode->id;
if (pVgroup->replica == 1) {
pVgid->role = TAOS_SYNC_STATE_LEADER;
} else {
pVgid->role = TAOS_SYNC_STATE_FOLLOWER;
}
mDebug("db:%s, vgId:%d, vindex:%d dnodeId:%d is alloced", pVgroup->dbName, pVgroup->vgId, v, pVgid->dnodeId);
pDnode->numOfVnodes++;
}
return 0;
}
int32_t mndAllocVgroup(SMnode *pMnode, SDbObj *pDb, SVgObj **ppVgroups) {
SVgObj *pVgroups = calloc(pDb->cfg.numOfVgroups, sizeof(SVgObj));
int32_t code = -1;
SArray *pArray = NULL;
SVgObj *pVgroups = NULL;
pVgroups = calloc(pDb->cfg.numOfVgroups, sizeof(SVgObj));
if (pVgroups == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
goto ALLOC_VGROUP_OVER;
}
pArray = mndBuildDnodesArray(pMnode);
if (pArray == NULL) {
goto ALLOC_VGROUP_OVER;
}
mDebug("db:%s, total %d dnodes used to create %d vgroups (%d vnodes)", pDb->name, (int32_t)taosArrayGetSize(pArray),
pDb->cfg.numOfVgroups, pDb->cfg.numOfVgroups * pDb->cfg.replications);
int32_t allocedVgroups = 0;
int32_t maxVgId = sdbGetMaxId(pMnode->pSdb, SDB_VGROUP);
uint32_t hashMin = 0;
......@@ -298,17 +347,23 @@ int32_t mndAllocVgroup(SMnode *pMnode, SDbObj *pDb, SVgObj **ppVgroups) {
pVgroup->dbUid = pDb->uid;
pVgroup->replica = pDb->cfg.replications;
if (mndGetAvailableDnode(pMnode, pVgroup) != 0) {
if (mndGetAvailableDnode(pMnode, pVgroup, pArray) != 0) {
terrno = TSDB_CODE_MND_NO_ENOUGH_DNODES;
free(pVgroups);
return -1;
goto ALLOC_VGROUP_OVER;
}
allocedVgroups++;
}
*ppVgroups = pVgroups;
return 0;
code = 0;
mDebug("db:%s, %d vgroups is alloced, replica:%d", pDb->name, pDb->cfg.numOfVgroups, pDb->cfg.replications);
ALLOC_VGROUP_OVER:
if (code != 0) free(pVgroups);
taosArrayDestroy(pArray);
return code;
}
SEpSet mndGetVgroupEpset(SMnode *pMnode, SVgObj *pVgroup) {
......@@ -348,6 +403,7 @@ static int32_t mndProcessDropVnodeRsp(SMnodeMsg *pMsg) {
}
static int32_t mndProcessSyncVnodeRsp(SMnodeMsg *pMsg) { return 0; }
static int32_t mndProcessCompactVnodeRsp(SMnodeMsg *pMsg) { return 0; }
static int32_t mndGetVgroupMaxReplica(SMnode *pMnode, char *dbName, int8_t *pReplica, int32_t *pNumOfVgroups) {
......@@ -478,7 +534,7 @@ static void mndCancelGetNextVgroup(SMnode *pMnode, void *pIter) {
sdbCancelFetch(pSdb, pIter);
}
static int32_t mndGetVnodesNum(SMnode *pMnode, int32_t dnodeId) {
int32_t mndGetVnodesNum(SMnode *pMnode, int32_t dnodeId) {
SSdb *pSdb = pMnode->pSdb;
int32_t numOfVnodes = 0;
void *pIter = NULL;
......
source/dnode/mnode/impl/src/mnode.c
浏览文件 @ 240a5309
......@@ -146,15 +146,15 @@ static int32_t mndInitSteps(SMnode *pMnode) {
if (mndAllocStep(pMnode, "mnode-sdb", mndInitSdb, mndCleanupSdb) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-trans", mndInitTrans, mndCleanupTrans) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-cluster", mndInitCluster, mndCleanupCluster) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-dnode", mndInitDnode, mndCleanupDnode) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-mnode", mndInitMnode, mndCleanupMnode) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-acct", mndInitAcct, mndCleanupAcct) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-auth", mndInitAuth, mndCleanupAuth) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-dnode", mndInitDnode, mndCleanupDnode) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-user", mndInitUser, mndCleanupUser) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-db", mndInitDb, mndCleanupDb) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-auth", mndInitAuth, mndCleanupAuth) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-acct", mndInitAcct, mndCleanupAcct) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-topic", mndInitTopic, mndCleanupTopic) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-vgroup", mndInitVgroup, mndCleanupVgroup) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-stb", mndInitStb, mndCleanupStb) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-topic", mndInitTopic, mndCleanupTopic) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-db", mndInitDb, mndCleanupDb) != 0) return -1;
if (mndAllocStep(pMnode, "mnode-func", mndInitFunc, mndCleanupFunc) != 0) return -1;
if (pMnode->clusterId <= 0) {
if (mndAllocStep(pMnode, "mnode-sdb-deploy", mndDeploySdb, NULL) != 0) return -1;
......
source/dnode/mnode/sdb/inc/sdbInt.h
浏览文件 @ 240a5309
......@@ -72,6 +72,7 @@ typedef struct SSdb {
} SSdb;
int32_t sdbWriteFile(SSdb *pSdb);
void sdbPrintOper(SSdb *pSdb, SSdbRow *pRow, const char *oper);
#ifdef __cplusplus
}
......
source/dnode/mnode/sdb/src/sdb.c
浏览文件 @ 240a5309
......@@ -80,16 +80,12 @@ void sdbCleanup(SSdb *pSdb) {
SHashObj *hash = pSdb->hashObjs[i];
if (hash == NULL) continue;
SdbDeleteFp deleteFp = pSdb->deleteFps[i];
SSdbRow **ppRow = taosHashIterate(hash, NULL);
while (ppRow != NULL) {
SSdbRow *pRow = *ppRow;
if (pRow == NULL) continue;
if (deleteFp != NULL) {
(*deleteFp)(pSdb, pRow->pObj);
}
sdbFreeRow(pRow);
sdbFreeRow(pSdb, pRow);
ppRow = taosHashIterate(hash, ppRow);
}
}
......
source/dnode/mnode/sdb/src/sdbFile.c
浏览文件 @ 240a5309
......@@ -151,7 +151,7 @@ int32_t sdbWriteFile(SSdb *pSdb) {
if (taosWriteFile(fd, pRaw, writeLen) != writeLen) {
code = TAOS_SYSTEM_ERROR(terrno);
taosHashCancelIterate(hash, ppRow);
free(pRaw);
sdbFreeRaw(pRaw);
break;
}
......@@ -159,7 +159,7 @@ int32_t sdbWriteFile(SSdb *pSdb) {
if (taosWriteFile(fd, &cksum, sizeof(int32_t)) != sizeof(int32_t)) {
code = TAOS_SYSTEM_ERROR(terrno);
taosHashCancelIterate(hash, ppRow);
free(pRaw);
sdbFreeRaw(pRaw);
break;
}
} else {
......@@ -168,7 +168,7 @@ int32_t sdbWriteFile(SSdb *pSdb) {
break;
}
free(pRaw);
sdbFreeRaw(pRaw);
ppRow = taosHashIterate(hash, ppRow);
}
taosWUnLockLatch(pLock);
......
source/dnode/mnode/sdb/src/sdbHash.c
浏览文件 @ 240a5309
......@@ -16,6 +16,50 @@
#define _DEFAULT_SOURCE
#include "sdbInt.h"
static const char *sdbTableName(ESdbType type) {
switch (type) {
case SDB_TRANS:
return "trans";
case SDB_CLUSTER:
return "cluster";
case SDB_MNODE:
return "mnode";
case SDB_DNODE:
return "dnode";
case SDB_USER:
return "user";
case SDB_AUTH:
return "auth";
case SDB_ACCT:
return "acct";
case SDB_TOPIC:
return "topic";
case SDB_VGROUP:
return "vgId";
case SDB_STB:
return "stb";
case SDB_DB:
return "db";
case SDB_FUNC:
return "func";
default:
return "undefine";
}
}
void sdbPrintOper(SSdb *pSdb, SSdbRow *pRow, const char *oper) {
EKeyType keyType = pSdb->keyTypes[pRow->type];
if (keyType == SDB_KEY_BINARY) {
mTrace("%s:%s, refCount:%d oper:%s", sdbTableName(pRow->type), (char *)pRow->pObj, pRow->refCount, oper);
} else if (keyType == SDB_KEY_INT32) {
mTrace("%s:%d, refCount:%d oper:%s", sdbTableName(pRow->type), *(int32_t *)pRow->pObj, pRow->refCount, oper);
} else if (keyType == SDB_KEY_INT64) {
mTrace("%s:%" PRId64 ", refCount:%d oper:%s", sdbTableName(pRow->type), *(int64_t *)pRow->pObj, pRow->refCount, oper);
} else {
}
}
static SHashObj *sdbGetHash(SSdb *pSdb, int32_t type) {
if (type >= SDB_MAX || type <= SDB_START) {
terrno = TSDB_CODE_SDB_INVALID_TABLE_TYPE;
......@@ -55,17 +99,18 @@ static int32_t sdbInsertRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
SSdbRow *pOldRow = taosHashGet(hash, pRow->pObj, keySize);
if (pOldRow != NULL) {
taosWUnLockLatch(pLock);
sdbFreeRow(pRow);
sdbFreeRow(pSdb, pRow);
terrno = TSDB_CODE_SDB_OBJ_ALREADY_THERE;
return terrno;
}
pRow->refCount = 1;
pRow->refCount = 0;
pRow->status = pRaw->status;
sdbPrintOper(pSdb, pRow, "insertRow");
if (taosHashPut(hash, pRow->pObj, keySize, &pRow, sizeof(void *)) != 0) {
taosWUnLockLatch(pLock);
sdbFreeRow(pRow);
sdbFreeRow(pSdb, pRow);
terrno = TSDB_CODE_SDB_OBJ_ALREADY_THERE;
return terrno;
}
......@@ -83,7 +128,7 @@ static int32_t sdbInsertRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
taosWLockLatch(pLock);
taosHashRemove(hash, pRow->pObj, keySize);
taosWUnLockLatch(pLock);
sdbFreeRow(pRow);
sdbFreeRow(pSdb, pRow);
terrno = code;
return terrno;
}
......@@ -113,7 +158,7 @@ static int32_t sdbUpdateRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
code = (*updateFp)(pSdb, pOldRow->pObj, pNewRow->pObj);
}
sdbFreeRow(pNewRow);
sdbFreeRow(pSdb, pNewRow);
return code;
}
......@@ -123,14 +168,10 @@ static int32_t sdbDeleteRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
SRWLatch *pLock = &pSdb->locks[pRow->type];
taosWLockLatch(pLock);
// remove attached object such as trans
SdbDeleteFp deleteFp = pSdb->deleteFps[pRow->type];
if (deleteFp != NULL) (*deleteFp)(pSdb, pRow->pObj);
SSdbRow **ppOldRow = taosHashGet(hash, pRow->pObj, keySize);
if (ppOldRow == NULL || *ppOldRow == NULL) {
taosWUnLockLatch(pLock);
sdbFreeRow(pRow);
sdbFreeRow(pSdb, pRow);
terrno = TSDB_CODE_SDB_OBJ_NOT_THERE;
return terrno;
}
......@@ -140,8 +181,8 @@ static int32_t sdbDeleteRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
taosHashRemove(hash, pOldRow->pObj, keySize);
taosWUnLockLatch(pLock);
sdbRelease(pSdb, pOldRow->pObj);
sdbFreeRow(pRow);
// sdbRelease(pSdb, pOldRow->pObj);
sdbFreeRow(pSdb, pRow);
return code;
}
......@@ -206,6 +247,7 @@ void *sdbAcquire(SSdb *pSdb, ESdbType type, void *pKey) {
case SDB_STATUS_UPDATING:
atomic_add_fetch_32(&pRow->refCount, 1);
pRet = pRow->pObj;
sdbPrintOper(pSdb, pRow, "acquireRow");
break;
case SDB_STATUS_CREATING:
terrno = TSDB_CODE_SDB_OBJ_CREATING;
......@@ -232,13 +274,9 @@ void sdbRelease(SSdb *pSdb, void *pObj) {
taosRLockLatch(pLock);
int32_t ref = atomic_sub_fetch_32(&pRow->refCount, 1);
sdbPrintOper(pSdb, pRow, "releaseRow");
if (ref <= 0 && pRow->status == SDB_STATUS_DROPPED) {
SdbDeleteFp deleteFp = pSdb->deleteFps[pRow->type];
if (deleteFp != NULL) {
(*deleteFp)(pSdb, pRow->pObj);
}
sdbFreeRow(pRow);
sdbFreeRow(pSdb, pRow);
}
taosRUnLockLatch(pLock);
......@@ -255,9 +293,9 @@ void *sdbFetch(SSdb *pSdb, ESdbType type, void *pIter, void **ppObj) {
if (pIter != NULL) {
SSdbRow *pLastRow = *(SSdbRow **)pIter;
int32_t ref = atomic_sub_fetch_32(&pLastRow->refCount, 1);
int32_t ref = atomic_load_32(&pLastRow->refCount);
if (ref <= 0 && pLastRow->status == SDB_STATUS_DROPPED) {
sdbFreeRow(pLastRow);
sdbFreeRow(pSdb, pLastRow);
}
}
......@@ -270,6 +308,7 @@ void *sdbFetch(SSdb *pSdb, ESdbType type, void *pIter, void **ppObj) {
}
atomic_add_fetch_32(&pRow->refCount, 1);
sdbPrintOper(pSdb, pRow, "fetchRow");
*ppObj = pRow->pObj;
break;
}
......
source/dnode/mnode/sdb/src/sdbRaw.c
浏览文件 @ 240a5309
......@@ -27,12 +27,12 @@ SSdbRaw *sdbAllocRaw(ESdbType type, int8_t sver, int32_t dataLen) {
pRaw->sver = sver;
pRaw->dataLen = dataLen;
// mTrace("raw:%p, is created, len:%d", pRaw, dataLen);
mTrace("raw:%p, is created, len:%d", pRaw, dataLen);
return pRaw;
}
void sdbFreeRaw(SSdbRaw *pRaw) {
// mTrace("raw:%p, is freed", pRaw);
mTrace("raw:%p, is freed", pRaw);
free(pRaw);
}
......
source/dnode/mnode/sdb/src/sdbRow.c
浏览文件 @ 240a5309
......@@ -35,4 +35,13 @@ void *sdbGetRowObj(SSdbRow *pRow) {
return pRow->pObj;
}
void sdbFreeRow(SSdbRow *pRow) { tfree(pRow); }
void sdbFreeRow(SSdb *pSdb, SSdbRow *pRow) {
// remove attached object such as trans
SdbDeleteFp deleteFp = pSdb->deleteFps[pRow->type];
if (deleteFp != NULL) {
(*deleteFp)(pSdb, pRow->pObj);
}
sdbPrintOper(pSdb, pRow, "freeRow");
tfree(pRow);
}
source/dnode/vnode/impl/inc/vnodeRequest.h
浏览文件 @ 240a5309
......@@ -23,8 +23,8 @@ extern "C" {
#endif
// SVDropTableReq
int vnodeBuildDropTableReq(void **buf, const SVDropTableReq *pReq);
void *vnodeParseDropTableReq(void *buf, SVDropTableReq *pReq);
// int vnodeBuildDropTableReq(void **buf, const SVDropTableReq *pReq);
// void *vnodeParseDropTableReq(void *buf, SVDropTableReq *pReq);
#ifdef __cplusplus
}
......
source/dnode/vnode/impl/src/vnodeInt.c
浏览文件 @ 240a5309
......@@ -28,8 +28,3 @@ int vnodeProcessSyncReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
vInfo("sync message is processed");
return 0;
}
int vnodeProcessConsumeReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
vInfo("consume message is processed");
return 0;
}
source/dnode/vnode/impl/src/vnodeQuery.c
浏览文件 @ 240a5309
......@@ -13,12 +13,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "vnodeDef.h"
#include "vnodeQuery.h"
#include "vnodeDef.h"
int vnodeQueryOpen(SVnode *pVnode) {
return qWorkerInit(NULL, &pVnode->pQuery);
}
int vnodeQueryOpen(SVnode *pVnode) { return qWorkerInit(NULL, &pVnode->pQuery); }
int vnodeProcessQueryReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
vInfo("query message is processed");
......@@ -46,4 +44,24 @@ int vnodeProcessFetchReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
return 0;
}
static int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
STableInfoMsg *pReq = (STableInfoMsg *)(pMsg->pCont);
STableMetaMsg *pRspMsg;
int ret;
if (metaGetTableInfo(pVnode->pMeta, pReq->tableFname, &pRspMsg) < 0) {
return -1;
}
*pRsp = malloc(sizeof(SRpcMsg));
if (TD_IS_NULL(*pRsp)) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
free(pMsg);
return -1;
}
// TODO
(*pRsp)->pCont = pRspMsg;
return 0;
}
\ No newline at end of file
source/dnode/vnode/impl/src/vnodeRequest.c
浏览文件 @ 240a5309
......@@ -15,6 +15,8 @@
#include "vnodeDef.h"
#if 0
static int vnodeBuildCreateTableReq(void **buf, const SVCreateTableReq *pReq);
static void *vnodeParseCreateTableReq(void *buf, SVCreateTableReq *pReq);
......@@ -114,3 +116,4 @@ int vnodeBuildDropTableReq(void **buf, const SVDropTableReq *pReq) {
void *vnodeParseDropTableReq(void *buf, SVDropTableReq *pReq) {
// TODO
}
#endif
\ No newline at end of file
source/dnode/vnode/impl/src/vnodeWrite.c
浏览文件 @ 240a5309
......@@ -28,7 +28,6 @@ int vnodeProcessNoWalWMsgs(SVnode *pVnode, SRpcMsg *pMsg) {
int vnodeProcessWMsgs(SVnode *pVnode, SArray *pMsgs) {
SRpcMsg * pMsg;
SVnodeReq *pVnodeReq;
for (int i = 0; i < taosArrayGetSize(pMsgs); i++) {
pMsg = *(SRpcMsg **)taosArrayGet(pMsgs, i);
......@@ -51,7 +50,6 @@ int vnodeProcessWMsgs(SVnode *pVnode, SArray *pMsgs) {
}
int vnodeApplyWMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
SVnodeReq vReq;
SVCreateTbReq vCreateTbReq;
void * ptr = vnodeMalloc(pVnode, pMsg->contLen);
if (ptr == NULL) {
......@@ -70,6 +68,7 @@ int vnodeApplyWMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
switch (pMsg->msgType) {
case TDMT_VND_CREATE_STB:
case TDMT_VND_CREATE_TABLE:
tDeserializeSVCreateTbReq(POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead)), &vCreateTbReq);
if (metaCreateTable(pVnode->pMeta, &(vCreateTbReq)) < 0) {
// TODO: handle error
......@@ -79,9 +78,9 @@ int vnodeApplyWMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
break;
case TDMT_VND_DROP_STB:
case TDMT_VND_DROP_TABLE:
if (metaDropTable(pVnode->pMeta, vReq.dtReq.uid) < 0) {
// TODO: handle error
}
// if (metaDropTable(pVnode->pMeta, vReq.dtReq.uid) < 0) {
// // TODO: handle error
// }
break;
case TDMT_VND_SUBMIT:
if (tsdbInsertData(pVnode->pTsdb, (SSubmitMsg *)ptr) < 0) {
......
source/dnode/vnode/meta/src/metaBDBImpl.c
浏览文件 @ 240a5309
......@@ -351,7 +351,7 @@ static int metaCtbIdxCb(DB *pIdx, const DBT *pKey, const DBT *pValue, DBT *pSKey
pDbt[0].size = sizeof(pTbCfg->ctbCfg.suid);
// Second key is the first tag
void *pTagVal = tdGetKVRowValOfCol(pTbCfg->ctbCfg.pTag, 0);
void *pTagVal = tdGetKVRowValOfCol(pTbCfg->ctbCfg.pTag, (kvRowColIdx(pTbCfg->ctbCfg.pTag))[0].colId);
pDbt[1].data = varDataVal(pTagVal);
pDbt[1].size = varDataLen(pTagVal);
......@@ -403,10 +403,10 @@ static void *metaDecodeTbInfo(void *buf, STbCfg *pTbCfg) {
buf = taosDecodeFixedU8(buf, &(pTbCfg->type));
if (pTbCfg->type == META_SUPER_TABLE) {
buf = taosDecodeVariantU32(buf, pTbCfg->stbCfg.nTagCols);
buf = taosDecodeVariantU32(buf, &(pTbCfg->stbCfg.nTagCols));
pTbCfg->stbCfg.pTagSchema = (SSchema *)malloc(sizeof(SSchema) * pTbCfg->stbCfg.nTagCols);
for (uint32_t i = 0; i < pTbCfg->stbCfg.nTagCols; i++) {
buf = taosDecodeFixedI8(buf, &pTbCfg->stbCfg.pSchema[i].type);
buf = taosDecodeFixedI8(buf, &(pTbCfg->stbCfg.pSchema[i].type));
buf = taosDecodeFixedI32(buf, &pTbCfg->stbCfg.pSchema[i].colId);
buf = taosDecodeFixedI32(buf, &pTbCfg->stbCfg.pSchema[i].bytes);
buf = taosDecodeStringTo(buf, pTbCfg->stbCfg.pSchema[i].name);
......@@ -429,3 +429,81 @@ static void metaClearTbCfg(STbCfg *pTbCfg) {
tfree(pTbCfg->ctbCfg.pTag);
}
}
/* ------------------------ FOR QUERY ------------------------ */
int metaGetTableInfo(SMeta *pMeta, char *tbname, STableMetaMsg **ppMsg) {
DBT key = {0};
DBT value = {0};
SMetaDB * pMetaDB = pMeta->pDB;
int ret;
STbCfg tbCfg;
SSchemaKey schemaKey;
DBT key1 = {0};
DBT value1 = {0};
uint32_t ncols;
void * pBuf;
int tlen;
STableMetaMsg *pMsg;
key.data = tbname;
key.size = strlen(tbname) + 1;
ret = pMetaDB->pNameIdx->get(pMetaDB->pNameIdx, NULL, &key, &value, 0);
if (ret != 0) {
// TODO
return -1;
}
metaDecodeTbInfo(value.data, &tbCfg);
switch (tbCfg.type) {
case META_SUPER_TABLE:
schemaKey.uid = tbCfg.stbCfg.suid;
schemaKey.sver = 0;
key1.data = &schemaKey;
key1.size = sizeof(schemaKey);
ret = pMetaDB->pSchemaDB->get(pMetaDB->pSchemaDB, &key1, &value1, NULL, 0);
if (ret != 0) {
// TODO
return -1;
}
pBuf = value1.data;
pBuf = taosDecodeFixedU32(pBuf, &ncols);
tlen = sizeof(STableMetaMsg) + (tbCfg.stbCfg.nTagCols + ncols) * sizeof(SSchema);
pMsg = calloc(1, tlen);
if (pMsg == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
}
strcpy(pMsg->tbFname, tbCfg.name);
pMsg->numOfTags = tbCfg.stbCfg.nTagCols;
pMsg->numOfColumns = ncols;
pMsg->tableType = tbCfg.type;
pMsg->sversion = 0;
pMsg->tversion = 0;
pMsg->suid = tbCfg.stbCfg.suid;
pMsg->tuid = tbCfg.stbCfg.suid;
for (size_t i = 0; i < tbCfg.stbCfg.nTagCols; i++) {
}
break;
case META_CHILD_TABLE:
ASSERT(0);
break;
case META_NORMAL_TABLE:
ASSERT(0);
break;
default:
ASSERT(0);
break;
}
*ppMsg = pMsg;
return 0;
}
\ No newline at end of file
source/dnode/vnode/meta/src/metaTbCfg.c
浏览文件 @ 240a5309
......@@ -47,57 +47,3 @@ size_t metaEncodeTbObjFromTbOptions(const STbCfg *pTbOptions, void *pBuf, size_t
return tlen;
}
\ No newline at end of file
int metaEncodeTbCfg(void **pBuf, STbCfg *pTbCfg) {
int tsize = 0;
tsize += taosEncodeString(pBuf, pTbCfg->name);
tsize += taosEncodeFixedU32(pBuf, pTbCfg->ttl);
tsize += taosEncodeFixedU32(pBuf, pTbCfg->keep);
tsize += taosEncodeFixedU8(pBuf, pTbCfg->type);
switch (pTbCfg->type) {
case META_SUPER_TABLE:
tsize += taosEncodeFixedU64(pBuf, pTbCfg->stbCfg.suid);
tsize += tdEncodeSchema(pBuf, pTbCfg->stbCfg.pSchema);
tsize += tdEncodeSchema(pBuf, pTbCfg->stbCfg.pTagSchema);
break;
case META_CHILD_TABLE:
tsize += taosEncodeFixedU64(pBuf, pTbCfg->ctbCfg.suid);
tsize += tdEncodeKVRow(pBuf, pTbCfg->ctbCfg.pTag);
break;
case META_NORMAL_TABLE:
tsize += tdEncodeSchema(pBuf, pTbCfg->ntbCfg.pSchema);
break;
default:
break;
}
return tsize;
}
void *metaDecodeTbCfg(void *pBuf, STbCfg *pTbCfg) {
pBuf = taosDecodeString(pBuf, &(pTbCfg->name));
pBuf = taosDecodeFixedU32(pBuf, &(pTbCfg->ttl));
pBuf = taosDecodeFixedU32(pBuf, &(pTbCfg->keep));
pBuf = taosDecodeFixedU8(pBuf, &(pTbCfg->type));
switch (pTbCfg->type) {
case META_SUPER_TABLE:
pBuf = taosDecodeFixedU64(pBuf, &(pTbCfg->stbCfg.suid));
pBuf = tdDecodeSchema(pBuf, &(pTbCfg->stbCfg.pSchema));
pBuf = tdDecodeSchema(pBuf, &(pTbCfg->stbCfg.pTagSchema));
break;
case META_CHILD_TABLE:
pBuf = taosDecodeFixedU64(pBuf, &(pTbCfg->ctbCfg.suid));
pBuf = tdDecodeKVRow(pBuf, &(pTbCfg->ctbCfg.pTag));
break;
case META_NORMAL_TABLE:
pBuf = tdDecodeSchema(pBuf, &(pTbCfg->ntbCfg.pSchema));
break;
default:
break;
}
return pBuf;
}
\ No newline at end of file
source/libs/catalog/src/catalog.c
浏览文件 @ 240a5309
......@@ -13,10 +13,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "catalogInt.h"
#include "trpc.h"
#include "query.h"
#include "tname.h"
#include "catalogInt.h"
SCatalogMgmt ctgMgmt = {0};
......@@ -75,15 +75,14 @@ int32_t ctgGetDBVgroupFromMnode(struct SCatalog* pCatalog, void *pRpc, const SEp
}
int32_t ctgGetTableMetaFromCache(struct SCatalog* pCatalog, const char *dbName, const char* pTableName, STableMeta** pTableMeta, int32_t *exist) {
int32_t ctgGetTableMetaFromCache(struct SCatalog* pCatalog, const SName* pTableName, STableMeta** pTableMeta, int32_t *exist) {
if (NULL == pCatalog->tableCache.cache) {
*exist = 0;
return TSDB_CODE_SUCCESS;
}
char tbFullName[TSDB_TABLE_FNAME_LEN];
snprintf(tbFullName, sizeof(tbFullName), "%s.%s", dbName, pTableName);
tNameExtractFullName(pTableName, tbFullName);
*pTableMeta = NULL;
......@@ -144,14 +143,13 @@ void ctgGenEpSet(SEpSet *epSet, SVgroupInfo *vgroupInfo) {
}
}
int32_t ctgGetTableMetaFromMnode(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char *pDBName, const char* pTableName, STableMetaOutput* output) {
if (NULL == pCatalog || NULL == pRpc || NULL == pMgmtEps || NULL == pDBName || NULL == pTableName || NULL == output) {
int32_t ctgGetTableMetaFromMnode(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, STableMetaOutput* output) {
if (NULL == pCatalog || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName || NULL == output) {
CTG_ERR_RET(TSDB_CODE_CTG_INVALID_INPUT);
}
char tbFullName[TSDB_TABLE_FNAME_LEN];
snprintf(tbFullName, sizeof(tbFullName), "%s.%s", pDBName, pTableName);
tNameExtractFullName(pTableName, tbFullName);
SBuildTableMetaInput bInput = {.vgId = 0, .tableFullName = tbFullName};
char *msg = NULL;
......@@ -270,15 +268,18 @@ _return:
CTG_RET(code);
}
int32_t ctgGetVgInfoFromHashValue(SDBVgroupInfo *dbInfo, const char *pDBName, const char *pTableName, SVgroupInfo *pVgroup) {
int32_t ctgGetVgInfoFromHashValue(SDBVgroupInfo *dbInfo, const SName *pTableName, SVgroupInfo *pVgroup) {
int32_t code = 0;
CTG_LOCK(CTG_READ, &dbInfo->lock);
int32_t vgNum = taosHashGetSize(dbInfo->vgInfo);
char db[TSDB_DB_FNAME_LEN] = {0};
tNameGetFullDbName(pTableName, db);
if (vgNum <= 0) {
ctgError("db[%s] vgroup cache invalid, vgroup number:%d", pDBName, vgNum);
CTG_ERR_JRET(TSDB_CODE_TSC_DB_NOT_SELECTED);
ctgError("db[%s] vgroup cache invalid, vgroup number:%d", db, vgNum);
CTG_ERR_RET(TSDB_CODE_TSC_DB_NOT_SELECTED);
}
tableNameHashFp fp = NULL;
......@@ -287,8 +288,7 @@ int32_t ctgGetVgInfoFromHashValue(SDBVgroupInfo *dbInfo, const char *pDBName, co
CTG_ERR_JRET(ctgGetHashFunction(dbInfo->hashMethod, &fp));
char tbFullName[TSDB_TABLE_FNAME_LEN];
snprintf(tbFullName, sizeof(tbFullName), "%s.%s", pDBName, pTableName);
tNameExtractFullName(pTableName, tbFullName);
uint32_t hashValue = (*fp)(tbFullName, (uint32_t)strlen(tbFullName));
......@@ -317,24 +317,24 @@ _return:
CTG_RET(TSDB_CODE_SUCCESS);
}
int32_t ctgGetTableMetaImpl(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, bool forceUpdate, STableMeta** pTableMeta) {
if (NULL == pCatalog || NULL == pDBName || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName || NULL == pTableMeta) {
int32_t ctgGetTableMetaImpl(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, bool forceUpdate, STableMeta** pTableMeta) {
if (NULL == pCatalog || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName || NULL == pTableMeta) {
CTG_ERR_RET(TSDB_CODE_CTG_INVALID_INPUT);
}
int32_t exist = 0;
if (!forceUpdate) {
CTG_ERR_RET(ctgGetTableMetaFromCache(pCatalog, pDBName, pTableName, pTableMeta, &exist));
CTG_ERR_RET(ctgGetTableMetaFromCache(pCatalog, pTableName, pTableMeta, &exist));
if (exist) {
return TSDB_CODE_SUCCESS;
}
}
CTG_ERR_RET(catalogRenewTableMeta(pCatalog, pRpc, pMgmtEps, pDBName, pTableName));
CTG_ERR_RET(catalogRenewTableMeta(pCatalog, pRpc, pMgmtEps, pTableName));
CTG_ERR_RET(ctgGetTableMetaFromCache(pCatalog, pDBName, pTableName, pTableMeta, &exist));
CTG_ERR_RET(ctgGetTableMetaFromCache(pCatalog, pTableName, pTableMeta, &exist));
if (0 == exist) {
ctgError("get table meta from cache failed, but fetch succeed");
......@@ -632,25 +632,25 @@ int32_t catalogUpdateDBVgroup(struct SCatalog* pCatalog, const char* dbName, SDB
return TSDB_CODE_SUCCESS;
}
int32_t catalogGetTableMeta(struct SCatalog* pCatalog, void *pTransporter, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, STableMeta** pTableMeta) {
return ctgGetTableMetaImpl(pCatalog, pTransporter, pMgmtEps, pDBName, pTableName, false, pTableMeta);
int32_t catalogGetTableMeta(struct SCatalog* pCatalog, void *pTransporter, const SEpSet* pMgmtEps, const SName* pTableName, STableMeta** pTableMeta) {
return ctgGetTableMetaImpl(pCatalog, pTransporter, pMgmtEps, pTableName, false, pTableMeta);
}
int32_t catalogRenewTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName) {
if (NULL == pCatalog || NULL == pDBName || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName) {
int32_t catalogRenewTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName) {
if (NULL == pCatalog || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName) {
CTG_ERR_RET(TSDB_CODE_CTG_INVALID_INPUT);
}
SVgroupInfo vgroupInfo = {0};
int32_t code = 0;
CTG_ERR_RET(catalogGetTableHashVgroup(pCatalog, pRpc, pMgmtEps, pDBName, pTableName, &vgroupInfo));
CTG_ERR_RET(catalogGetTableHashVgroup(pCatalog, pRpc, pMgmtEps, pTableName, &vgroupInfo));
STableMetaOutput output = {0};
//CTG_ERR_RET(ctgGetTableMetaFromVnode(pCatalog, pRpc, pMgmtEps, pDBName, pTableName, &vgroupInfo, &output));
CTG_ERR_RET(ctgGetTableMetaFromMnode(pCatalog, pRpc, pMgmtEps, pDBName, pTableName, &output));
CTG_ERR_RET(ctgGetTableMetaFromMnode(pCatalog, pRpc, pMgmtEps, pTableName, &output));
CTG_ERR_JRET(ctgUpdateTableMetaCache(pCatalog, &output));
......@@ -661,12 +661,12 @@ _return:
CTG_RET(code);
}
int32_t catalogRenewAndGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, STableMeta** pTableMeta) {
return ctgGetTableMetaImpl(pCatalog, pRpc, pMgmtEps, pDBName, pTableName, true, pTableMeta);
int32_t catalogRenewAndGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, STableMeta** pTableMeta) {
return ctgGetTableMetaImpl(pCatalog, pRpc, pMgmtEps, pTableName, true, pTableMeta);
}
int32_t catalogGetTableDistVgroup(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, SArray** pVgroupList) {
if (NULL == pCatalog || NULL == pRpc || NULL == pMgmtEps || NULL == pDBName || NULL == pTableName || NULL == pVgroupList) {
int32_t catalogGetTableDistVgroup(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, SArray** pVgroupList) {
if (NULL == pCatalog || NULL == pRpc || NULL == pMgmtEps || NULL == pTableName || NULL == pVgroupList) {
CTG_ERR_RET(TSDB_CODE_CTG_INVALID_INPUT);
}
......@@ -678,9 +678,11 @@ int32_t catalogGetTableDistVgroup(struct SCatalog* pCatalog, void *pRpc, const S
*pVgroupList = NULL;
CTG_ERR_JRET(catalogGetTableMeta(pCatalog, pRpc, pMgmtEps, pDBName, pTableName, &tbMeta));
CTG_ERR_JRET(catalogGetTableMeta(pCatalog, pRpc, pMgmtEps, pTableName, &tbMeta));
CTG_ERR_JRET(ctgGetDBVgroup(pCatalog, pRpc, pMgmtEps, pDBName, false, &dbVgroup));
char db[TSDB_DB_FNAME_LEN] = {0};
tNameGetFullDbName(pTableName, db);
CTG_ERR_JRET(ctgGetDBVgroup(pCatalog, pRpc, pMgmtEps, db, false, &dbVgroup));
if (tbMeta->tableType == TSDB_SUPER_TABLE) {
CTG_ERR_JRET(ctgGetVgInfoFromDB(pCatalog, pRpc, pMgmtEps, dbVgroup, pVgroupList));
......@@ -723,14 +725,16 @@ _return:
}
int32_t catalogGetTableHashVgroup(struct SCatalog *pCatalog, void *pTransporter, const SEpSet *pMgmtEps, const char *pDBName, const char *pTableName, SVgroupInfo *pVgroup) {
int32_t catalogGetTableHashVgroup(struct SCatalog *pCatalog, void *pTransporter, const SEpSet *pMgmtEps, const SName *pTableName, SVgroupInfo *pVgroup) {
SDBVgroupInfo* dbInfo = NULL;
int32_t code = 0;
int32_t vgId = 0;
CTG_ERR_RET(ctgGetDBVgroup(pCatalog, pTransporter, pMgmtEps, pDBName, false, &dbInfo));
char db[TSDB_DB_FNAME_LEN] = {0};
tNameGetFullDbName(pTableName, db);
CTG_ERR_JRET(ctgGetVgInfoFromHashValue(dbInfo, pDBName, pTableName, pVgroup));
CTG_ERR_RET(ctgGetDBVgroup(pCatalog, pTransporter, pMgmtEps, db, false, &dbInfo));
CTG_ERR_JRET(ctgGetVgInfoFromHashValue(dbInfo, pTableName, pVgroup));
_return:
......@@ -751,7 +755,6 @@ int32_t catalogGetAllMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* p
int32_t code = 0;
if (pReq->pTableName) {
char dbName[TSDB_DB_FNAME_LEN];
int32_t tbNum = (int32_t)taosArrayGetSize(pReq->pTableName);
if (tbNum <= 0) {
ctgError("empty table name list");
......@@ -768,9 +771,7 @@ int32_t catalogGetAllMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* p
SName *name = taosArrayGet(pReq->pTableName, i);
STableMeta *pTableMeta = NULL;
snprintf(dbName, sizeof(dbName), "%d.%s", name->acctId, name->dbname);
CTG_ERR_JRET(catalogGetTableMeta(pCatalog, pRpc, pMgmtEps, dbName, name->tname, &pTableMeta));
CTG_ERR_JRET(catalogGetTableMeta(pCatalog, pRpc, pMgmtEps, name, &pTableMeta));
if (NULL == taosArrayPush(pRsp->pTableMeta, &pTableMeta)) {
ctgError("taosArrayPush failed, idx:%d", i);
......
source/libs/catalog/test/catalogTests.cpp
浏览文件 @ 240a5309
......@@ -388,7 +388,11 @@ TEST(tableMeta, normalTable) {
code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
code = catalogGetTableHashVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestTablename, &vgInfo);
SName n = {.type = T_NAME_TABLE, .acctId = 1};
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestTablename);
code = catalogGetTableHashVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &vgInfo);
ASSERT_EQ(code, 0);
ASSERT_EQ(vgInfo.vgId, 8);
ASSERT_EQ(vgInfo.numOfEps, 3);
......@@ -396,7 +400,7 @@ TEST(tableMeta, normalTable) {
ctgTestSetPrepareTableMeta();
STableMeta *tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestTablename, &tableMeta);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 8);
ASSERT_EQ(tableMeta->tableType, TSDB_NORMAL_TABLE);
......@@ -408,7 +412,7 @@ TEST(tableMeta, normalTable) {
ASSERT_EQ(tableMeta->tableInfo.rowSize, 12);
tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestTablename, &tableMeta);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 8);
ASSERT_EQ(tableMeta->tableType, TSDB_NORMAL_TABLE);
......@@ -433,14 +437,15 @@ TEST(tableMeta, childTableCase) {
//sendCreateDbMsg(pConn->pTransporter, &pConn->pAppInfo->mgmtEp.epSet);
int32_t code = catalogInit(NULL);
int32_t code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
SName n = {.type = T_NAME_TABLE, .acctId = 1};
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestCTablename);
STableMeta *tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestCTablename, &tableMeta);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 9);
ASSERT_EQ(tableMeta->tableType, TSDB_CHILD_TABLE);
......@@ -452,7 +457,7 @@ TEST(tableMeta, childTableCase) {
ASSERT_EQ(tableMeta->tableInfo.rowSize, 12);
tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestCTablename, &tableMeta);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 9);
ASSERT_EQ(tableMeta->tableType, TSDB_CHILD_TABLE);
......@@ -464,7 +469,9 @@ TEST(tableMeta, childTableCase) {
ASSERT_EQ(tableMeta->tableInfo.rowSize, 12);
tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestSTablename, &tableMeta);
strcpy(n.tname, ctgTestSTablename);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 0);
ASSERT_EQ(tableMeta->tableType, TSDB_SUPER_TABLE);
......@@ -488,15 +495,15 @@ TEST(tableMeta, superTableCase) {
initQueryModuleMsgHandle();
//sendCreateDbMsg(pConn->pTransporter, &pConn->pAppInfo->mgmtEp.epSet);
int32_t code = catalogInit(NULL);
int32_t code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
SName n = {.type = T_NAME_TABLE, .acctId = 1};
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestSTablename);
STableMeta *tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestSTablename, &tableMeta);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 0);
ASSERT_EQ(tableMeta->tableType, TSDB_SUPER_TABLE);
......@@ -510,7 +517,10 @@ TEST(tableMeta, superTableCase) {
ctgTestSetPrepareCTableMeta();
tableMeta = NULL;
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestCTablename, &tableMeta);
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestCTablename);
code = catalogGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 9);
ASSERT_EQ(tableMeta->tableType, TSDB_CHILD_TABLE);
......@@ -522,7 +532,7 @@ TEST(tableMeta, superTableCase) {
ASSERT_EQ(tableMeta->tableInfo.rowSize, 12);
tableMeta = NULL;
code = catalogRenewAndGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestCTablename, &tableMeta);
code = catalogRenewAndGetTableMeta(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &tableMeta);
ASSERT_EQ(code, 0);
ASSERT_EQ(tableMeta->vgId, 9);
ASSERT_EQ(tableMeta->tableType, TSDB_CHILD_TABLE);
......@@ -550,14 +560,14 @@ TEST(tableDistVgroup, normalTable) {
//sendCreateDbMsg(pConn->pTransporter, &pConn->pAppInfo->mgmtEp.epSet);
int32_t code = catalogInit(NULL);
int32_t code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
SName n = {.type = T_NAME_TABLE, .acctId = 1};
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestTablename);
code = catalogGetTableDistVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestTablename, &vgList);
code = catalogGetTableDistVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &vgList);
ASSERT_EQ(code, 0);
ASSERT_EQ(taosArrayGetSize((const SArray *)vgList), 1);
vgInfo = (SVgroupInfo *)taosArrayGet(vgList, 0);
......@@ -585,7 +595,11 @@ TEST(tableDistVgroup, childTableCase) {
code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
code = catalogGetTableDistVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestCTablename, &vgList);
SName n = {.type = T_NAME_TABLE, .acctId = 1};
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestCTablename);
code = catalogGetTableDistVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &vgList);
ASSERT_EQ(code, 0);
ASSERT_EQ(taosArrayGetSize((const SArray *)vgList), 1);
vgInfo = (SVgroupInfo *)taosArrayGet(vgList, 0);
......@@ -607,14 +621,14 @@ TEST(tableDistVgroup, superTableCase) {
initQueryModuleMsgHandle();
//sendCreateDbMsg(pConn->pTransporter, &pConn->pAppInfo->mgmtEp.epSet);
int32_t code = catalogInit(NULL);
int32_t code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
code = catalogGetHandle(ctgTestClusterId, &pCtg);
ASSERT_EQ(code, 0);
SName n = {.type = T_NAME_TABLE, .acctId = 1};
strcpy(n.dbname, "db1");
strcpy(n.tname, ctgTestSTablename);
code = catalogGetTableDistVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, ctgTestDbname, ctgTestSTablename, &vgList);
code = catalogGetTableDistVgroup(pCtg, mockPointer, (const SEpSet *)mockPointer, &n, &vgList);
ASSERT_EQ(code, 0);
ASSERT_EQ(taosArrayGetSize((const SArray *)vgList), 10);
vgInfo = (SVgroupInfo *)taosArrayGet(vgList, 0);
......
source/libs/index/inc/index_cache.h
浏览文件 @ 240a5309
......@@ -30,9 +30,13 @@
extern "C" {
#endif
typedef struct MemTable {
T_REF_DECLARE()
SSkipList* mem;
} MemTable;
typedef struct IndexCache {
T_REF_DECLARE()
SSkipList *mem, *imm;
MemTable *mem, *imm;
SIndex* index;
char* colName;
int32_t version;
......@@ -45,7 +49,6 @@ typedef struct IndexCache {
#define CACHE_VERSION(cache) atomic_load_32(&cache->version)
typedef struct CacheTerm {
// key
int32_t nColVal;
char* colVal;
int32_t version;
// value
......
source/libs/index/src/index.c
浏览文件 @ 240a5309
......@@ -34,9 +34,7 @@ int32_t indexInit() {
return indexQhandle == NULL ? -1 : 0;
// do nothing
}
void indexCleanUp() {
taosCleanUpScheduler(indexQhandle);
}
void indexCleanUp() { taosCleanUpScheduler(indexQhandle); }
static int uidCompare(const void* a, const void* b) {
uint64_t u1 = *(uint64_t*)a;
......@@ -63,7 +61,9 @@ static int indexMergeFinalResults(SArray* interResults, EIndexOperatorType oTyp
int indexOpen(SIndexOpts* opts, const char* path, SIndex** index) {
// pthread_once(&isInit, indexInit);
SIndex* sIdx = calloc(1, sizeof(SIndex));
if (sIdx == NULL) { return -1; }
if (sIdx == NULL) {
return -1;
}
#ifdef USE_LUCENE
index_t* index = index_open(path);
......@@ -99,7 +99,9 @@ void indexClose(SIndex* sIdx) {
void* iter = taosHashIterate(sIdx->colObj, NULL);
while (iter) {
IndexCache** pCache = iter;
if (*pCache) { indexCacheUnRef(*pCache); }
if (*pCache) {
indexCacheUnRef(*pCache);
}
iter = taosHashIterate(sIdx->colObj, iter);
}
taosHashCleanup(sIdx->colObj);
......@@ -133,7 +135,7 @@ int indexPut(SIndex* index, SIndexMultiTerm* fVals, uint64_t uid) {
for (int i = 0; i < taosArrayGetSize(fVals); i++) {
SIndexTerm* p = taosArrayGetP(fVals, i);
IndexCache** cache = taosHashGet(index->colObj, p->colName, p->nColName);
if (*cache == NULL) {
if (cache == NULL) {
IndexCache* pCache = indexCacheCreate(index, p->colName, p->colType);
taosHashPut(index->colObj, p->colName, p->nColName, &pCache, sizeof(void*));
}
......@@ -143,10 +145,11 @@ int indexPut(SIndex* index, SIndexMultiTerm* fVals, uint64_t uid) {
for (int i = 0; i < taosArrayGetSize(fVals); i++) {
SIndexTerm* p = taosArrayGetP(fVals, i);
IndexCache** cache = taosHashGet(index->colObj, p->colName, p->nColName);
assert(*cache != NULL);
int ret = indexCachePut(*cache, p, uid);
if (ret != 0) { return ret; }
if (ret != 0) {
return ret;
}
}
#endif
......@@ -224,17 +227,20 @@ SIndexOpts* indexOptsCreate() {
#endif
return NULL;
}
void indexOptsDestroy(SIndexOpts* opts){
void indexOptsDestroy(SIndexOpts* opts) {
#ifdef USE_LUCENE
#endif
} /*
return;
}
/*
* @param: oper
*
*/
SIndexMultiTermQuery* indexMultiTermQueryCreate(EIndexOperatorType opera) {
SIndexMultiTermQuery* p = (SIndexMultiTermQuery*)malloc(sizeof(SIndexMultiTermQuery));
if (p == NULL) { return NULL; }
if (p == NULL) {
return NULL;
}
p->opera = opera;
p->query = taosArrayInit(4, sizeof(SIndexTermQuery));
return p;
......@@ -253,15 +259,12 @@ int indexMultiTermQueryAdd(SIndexMultiTermQuery* pQuery, SIndexTerm* term, EInde
return 0;
}
SIndexTerm* indexTermCreate(int64_t suid,
SIndexOperOnColumn oper,
uint8_t colType,
const char* colName,
int32_t nColName,
const char* colVal,
int32_t nColVal) {
SIndexTerm* indexTermCreate(int64_t suid, SIndexOperOnColumn oper, uint8_t colType, const char* colName,
int32_t nColName, const char* colVal, int32_t nColVal) {
SIndexTerm* t = (SIndexTerm*)calloc(1, (sizeof(SIndexTerm)));
if (t == NULL) { return NULL; }
if (t == NULL) {
return NULL;
}
t->suid = suid;
t->operType = oper;
......@@ -282,9 +285,7 @@ void indexTermDestroy(SIndexTerm* p) {
free(p);
}
SIndexMultiTerm* indexMultiTermCreate() {
return taosArrayInit(4, sizeof(SIndexTerm*));
}
SIndexMultiTerm* indexMultiTermCreate() { return taosArrayInit(4, sizeof(SIndexTerm*)); }
int indexMultiTermAdd(SIndexMultiTerm* terms, SIndexTerm* term) {
taosArrayPush(terms, &term);
......@@ -307,7 +308,7 @@ static int indexTermSearch(SIndex* sIdx, SIndexTermQuery* query, SArray** result
IndexCache* cache = NULL;
pthread_mutex_lock(&sIdx->mtx);
IndexCache** pCache = taosHashGet(sIdx->colObj, colName, nColName);
if (*pCache == NULL) {
if (pCache == NULL) {
pthread_mutex_unlock(&sIdx->mtx);
return -1;
}
......@@ -335,7 +336,9 @@ static int indexTermSearch(SIndex* sIdx, SIndexTermQuery* query, SArray** result
return 0;
}
static void indexInterResultsDestroy(SArray* results) {
if (results == NULL) { return; }
if (results == NULL) {
return;
}
size_t sz = taosArrayGetSize(results);
for (size_t i = 0; i < sz; i++) {
......@@ -366,7 +369,9 @@ static int indexMergeFinalResults(SArray* interResults, EIndexOperatorType oType
}
int indexFlushCacheTFile(SIndex* sIdx, void* cache) {
if (sIdx == NULL) { return -1; }
if (sIdx == NULL) {
return -1;
}
indexWarn("suid %" PRIu64 " merge cache into tindex", sIdx->suid);
IndexCache* pCache = (IndexCache*)cache;
......@@ -399,7 +404,6 @@ int indexFlushCacheTFile(SIndex* sIdx, void* cache) {
TFileValue* tfv = tfileValueCreate(cv->colVal);
taosArrayAddAll(tfv->tableId, cv->val);
taosArrayPush(result, &tfv);
// copy to final Result;
cn = cacheIter->next(cacheIter);
} else {
......@@ -433,7 +437,9 @@ int indexFlushCacheTFile(SIndex* sIdx, void* cache) {
indexError("faile to open file to write");
} else {
int ret = tfileWriterPut(tw, result);
if (ret != 0) { indexError("faile to write into tindex "); }
if (ret != 0) {
indexError("faile to write into tindex ");
}
}
// not free later, just put int table cache
indexCacheDestroyImm(pCache);
......
source/libs/index/src/index_cache.c
浏览文件 @ 240a5309
......@@ -23,46 +23,22 @@
#define MEM_TERM_LIMIT 1000000
// ref index_cache.h:22
//#define CACHE_KEY_LEN(p) \
// (sizeof(int32_t) + sizeof(uint16_t) + sizeof(p->colType) + sizeof(p->nColVal) + p->nColVal + sizeof(uint64_t) + sizeof(p->operType))
// (sizeof(int32_t) + sizeof(uint16_t) + sizeof(p->colType) + sizeof(p->nColVal) + p->nColVal + sizeof(uint64_t) +
// sizeof(p->operType))
static void cacheTermDestroy(CacheTerm* ct) {
if (ct == NULL) { return; }
static void indexMemRef(MemTable* tbl);
static void indexMemUnRef(MemTable* tbl);
free(ct->colVal);
free(ct);
}
static char* getIndexKey(const void* pData) {
CacheTerm* p = (CacheTerm*)pData;
return (char*)p;
}
static void cacheTermDestroy(CacheTerm* ct);
static char* getIndexKey(const void* pData);
static int32_t compareKey(const void* l, const void* r);
static int32_t compareKey(const void* l, const void* r) {
CacheTerm* lt = (CacheTerm*)l;
CacheTerm* rt = (CacheTerm*)r;
static MemTable* indexInternalCacheCreate(int8_t type);
// compare colVal
int i, j;
for (i = 0, j = 0; i < lt->nColVal && j < rt->nColVal; i++, j++) {
if (lt->colVal[i] == rt->colVal[j]) {
continue;
} else {
return lt->colVal[i] < rt->colVal[j] ? -1 : 1;
}
}
if (i < lt->nColVal) {
return 1;
} else if (j < rt->nColVal) {
return -1;
}
// compare version
return rt->version - lt->version;
}
static void doMergeWork(SSchedMsg* msg);
static bool indexCacheIteratorNext(Iterate* itera);
static SSkipList* indexInternalCacheCreate(int8_t type) {
if (type == TSDB_DATA_TYPE_BINARY) {
return tSkipListCreate(MAX_SKIP_LIST_LEVEL, type, MAX_INDEX_KEY_LEN, compareKey, SL_ALLOW_DUP_KEY, getIndexKey);
}
}
static IterateValue* indexCacheIteratorGetValue(Iterate* iter);
IndexCache* indexCacheCreate(SIndex* idx, const char* colName, int8_t type) {
IndexCache* cache = calloc(1, sizeof(IndexCache));
......@@ -83,7 +59,15 @@ IndexCache* indexCacheCreate(SIndex* idx, const char* colName, int8_t type) {
return cache;
}
void indexCacheDebug(IndexCache* cache) {
SSkipListIterator* iter = tSkipListCreateIter(cache->mem);
MemTable* tbl = NULL;
pthread_mutex_lock(&cache->mtx);
tbl = cache->mem;
indexMemRef(tbl);
pthread_mutex_unlock(&cache->mtx);
SSkipList* slt = tbl->mem;
SSkipListIterator* iter = tSkipListCreateIter(slt);
while (tSkipListIterNext(iter)) {
SSkipListNode* node = tSkipListIterGet(iter);
CacheTerm* ct = (CacheTerm*)SL_GET_NODE_DATA(node);
......@@ -93,6 +77,8 @@ void indexCacheDebug(IndexCache* cache) {
}
}
tSkipListDestroyIter(iter);
indexMemUnRef(tbl);
}
void indexCacheDestroySkiplist(SSkipList* slt) {
......@@ -100,71 +86,50 @@ void indexCacheDestroySkiplist(SSkipList* slt) {
while (tSkipListIterNext(iter)) {
SSkipListNode* node = tSkipListIterGet(iter);
CacheTerm* ct = (CacheTerm*)SL_GET_NODE_DATA(node);
if (ct != NULL) {}
if (ct != NULL) {
}
}
tSkipListDestroyIter(iter);
tSkipListDestroy(slt);
}
void indexCacheDestroyImm(IndexCache* cache) {
MemTable* tbl = NULL;
pthread_mutex_lock(&cache->mtx);
SSkipList* timm = (SSkipList*)cache->imm;
tbl = cache->imm;
cache->imm = NULL; // or throw int bg thread
pthread_mutex_unlock(&cache->mtx);
indexCacheDestroySkiplist(timm);
indexMemUnRef(tbl);
}
void indexCacheDestroy(void* cache) {
IndexCache* pCache = cache;
if (pCache == NULL) { return; }
tSkipListDestroy(pCache->mem);
tSkipListDestroy(pCache->imm);
if (pCache == NULL) {
return;
}
indexMemUnRef(pCache->mem);
indexMemUnRef(pCache->imm);
free(pCache->colName);
free(pCache);
}
static void doMergeWork(SSchedMsg* msg) {
IndexCache* pCache = msg->ahandle;
SIndex* sidx = (SIndex*)pCache->index;
indexFlushCacheTFile(sidx, pCache);
}
static bool indexCacheIteratorNext(Iterate* itera) {
SSkipListIterator* iter = itera->iter;
if (iter == NULL) { return false; }
IterateValue* iv = &itera->val;
iterateValueDestroy(iv, false);
bool next = tSkipListIterNext(iter);
if (next) {
SSkipListNode* node = tSkipListIterGet(iter);
CacheTerm* ct = (CacheTerm*)SL_GET_NODE_DATA(node);
iv->type = ct->operaType;
iv->colVal = ct->colVal;
taosArrayPush(iv->val, &ct->uid);
}
return next;
}
static IterateValue* indexCacheIteratorGetValue(Iterate* iter) {
return &iter->val;
}
Iterate* indexCacheIteratorCreate(IndexCache* cache) {
Iterate* iiter = calloc(1, sizeof(Iterate));
if (iiter == NULL) { return NULL; }
if (iiter == NULL) {
return NULL;
}
MemTable* tbl = cache->imm;
iiter->val.val = taosArrayInit(1, sizeof(uint64_t));
iiter->iter = cache->imm != NULL ? tSkipListCreateIter(cache->imm) : NULL;
iiter->iter = tbl != NULL ? tSkipListCreateIter(tbl->mem) : NULL;
iiter->next = indexCacheIteratorNext;
iiter->getValue = indexCacheIteratorGetValue;
return iiter;
}
void indexCacheIteratorDestroy(Iterate* iter) {
if (iter == NULL) { return; }
if (iter == NULL) {
return;
}
tSkipListDestroyIter(iter->iter);
iterateValueDestroy(&iter->val, true);
free(iter);
......@@ -201,18 +166,21 @@ static void indexCacheMakeRoomForWrite(IndexCache* cache) {
}
int indexCachePut(void* cache, SIndexTerm* term, uint64_t uid) {
if (cache == NULL) { return -1; }
if (cache == NULL) {
return -1;
}
IndexCache* pCache = cache;
indexCacheRef(pCache);
// encode data
CacheTerm* ct = calloc(1, sizeof(CacheTerm));
if (cache == NULL) { return -1; }
if (cache == NULL) {
return -1;
}
// set up key
ct->colType = term->colType;
ct->nColVal = term->nColVal;
ct->colVal = (char*)calloc(1, sizeof(char) * (ct->nColVal + 1));
memcpy(ct->colVal, term->colVal, ct->nColVal);
ct->colVal = (char*)calloc(1, sizeof(char) * (term->nColVal + 1));
memcpy(ct->colVal, term->colVal, term->nColVal);
ct->version = atomic_add_fetch_32(&pCache->version, 1);
// set value
ct->uid = uid;
......@@ -220,8 +188,13 @@ int indexCachePut(void* cache, SIndexTerm* term, uint64_t uid) {
// ugly code, refactor later
pthread_mutex_lock(&pCache->mtx);
indexCacheMakeRoomForWrite(pCache);
tSkipListPut(pCache->mem, (char*)ct);
MemTable* tbl = pCache->mem;
indexMemRef(tbl);
tSkipListPut(tbl->mem, (char*)ct);
indexMemUnRef(tbl);
pthread_mutex_unlock(&pCache->mtx);
indexCacheUnRef(pCache);
......@@ -233,27 +206,38 @@ int indexCacheDel(void* cache, const char* fieldValue, int32_t fvlen, uint64_t u
return 0;
}
int indexCacheSearch(void* cache, SIndexTermQuery* query, SArray* result, STermValueType* s) {
if (cache == NULL) { return -1; }
if (cache == NULL) {
return -1;
}
IndexCache* pCache = cache;
SIndexTerm* term = query->term;
EIndexQueryType qtype = query->qType;
MemTable *mem = NULL, *imm = NULL;
pthread_mutex_lock(&pCache->mtx);
mem = pCache->mem;
imm = pCache->imm;
indexMemRef(mem);
indexMemRef(imm);
pthread_mutex_unlock(&pCache->mtx);
CacheTerm* ct = calloc(1, sizeof(CacheTerm));
if (ct == NULL) { return -1; }
ct->nColVal = term->nColVal;
ct->colVal = calloc(1, sizeof(char) * (ct->nColVal + 1));
memcpy(ct->colVal, term->colVal, ct->nColVal);
if (ct == NULL) {
return -1;
}
ct->colVal = calloc(1, sizeof(char) * (term->nColVal + 1));
memcpy(ct->colVal, term->colVal, term->nColVal);
ct->version = atomic_load_32(&pCache->version);
char* key = getIndexKey(ct);
// TODO handle multi situation later, and refactor
SSkipListIterator* iter = tSkipListCreateIterFromVal(pCache->mem, key, TSDB_DATA_TYPE_BINARY, TSDB_ORDER_ASC);
SSkipListIterator* iter = tSkipListCreateIterFromVal(mem->mem, key, TSDB_DATA_TYPE_BINARY, TSDB_ORDER_ASC);
while (tSkipListIterNext(iter)) {
SSkipListNode* node = tSkipListIterGet(iter);
if (node != NULL) {
CacheTerm* c = (CacheTerm*)SL_GET_NODE_DATA(node);
if (c->operaType == ADD_VALUE || qtype == QUERY_TERM) {
if (c->nColVal == ct->nColVal && strncmp(c->colVal, ct->colVal, c->nColVal) == 0) {
if (strcmp(c->colVal, ct->colVal) == 0) {
taosArrayPush(result, &c->uid);
*s = kTypeValue;
} else {
......@@ -279,14 +263,104 @@ int indexCacheSearch(void* cache, SIndexTermQuery* query, SArray* result, STermV
} else if (qtype == QUERY_REGEX) {
//
}
indexMemUnRef(mem);
indexMemUnRef(imm);
return 0;
}
void indexCacheRef(IndexCache* cache) {
if (cache == NULL) {
return;
}
int ref = T_REF_INC(cache);
UNUSED(ref);
}
void indexCacheUnRef(IndexCache* cache) {
if (cache == NULL) {
return;
}
int ref = T_REF_DEC(cache);
if (ref == 0) { indexCacheDestroy(cache); }
if (ref == 0) {
indexCacheDestroy(cache);
}
}
void indexMemRef(MemTable* tbl) {
if (tbl == NULL) {
return;
}
int ref = T_REF_INC(tbl);
UNUSED(ref);
}
void indexMemUnRef(MemTable* tbl) {
if (tbl == NULL) {
return;
}
int ref = T_REF_DEC(tbl);
if (ref == 0) {
SSkipList* slt = tbl->mem;
indexCacheDestroySkiplist(slt);
free(tbl);
}
}
static void cacheTermDestroy(CacheTerm* ct) {
if (ct == NULL) {
return;
}
free(ct->colVal);
free(ct);
}
static char* getIndexKey(const void* pData) {
CacheTerm* p = (CacheTerm*)pData;
return (char*)p;
}
static int32_t compareKey(const void* l, const void* r) {
CacheTerm* lt = (CacheTerm*)l;
CacheTerm* rt = (CacheTerm*)r;
// compare colVal
int32_t cmp = strcmp(lt->colVal, rt->colVal);
if (cmp == 0) {
return rt->version - lt->version;
}
return cmp;
}
static MemTable* indexInternalCacheCreate(int8_t type) {
MemTable* tbl = calloc(1, sizeof(MemTable));
indexMemRef(tbl);
if (type == TSDB_DATA_TYPE_BINARY) {
tbl->mem = tSkipListCreate(MAX_SKIP_LIST_LEVEL, type, MAX_INDEX_KEY_LEN, compareKey, SL_ALLOW_DUP_KEY, getIndexKey);
}
return tbl;
}
static void doMergeWork(SSchedMsg* msg) {
IndexCache* pCache = msg->ahandle;
SIndex* sidx = (SIndex*)pCache->index;
indexFlushCacheTFile(sidx, pCache);
}
static bool indexCacheIteratorNext(Iterate* itera) {
SSkipListIterator* iter = itera->iter;
if (iter == NULL) {
return false;
}
IterateValue* iv = &itera->val;
iterateValueDestroy(iv, false);
bool next = tSkipListIterNext(iter);
if (next) {
SSkipListNode* node = tSkipListIterGet(iter);
CacheTerm* ct = (CacheTerm*)SL_GET_NODE_DATA(node);
iv->type = ct->operaType;
iv->colVal = ct->colVal;
taosArrayPush(iv->val, &ct->uid);
}
return next;
}
static IterateValue* indexCacheIteratorGetValue(Iterate* iter) { return &iter->val; }
source/libs/index/src/index_tfile.c
浏览文件 @ 240a5309
......@@ -54,7 +54,9 @@ static void tfileSerialCacheKey(TFileCacheKey* key, char* buf);
TFileCache* tfileCacheCreate(const char* path) {
TFileCache* tcache = calloc(1, sizeof(TFileCache));
if (tcache == NULL) { return NULL; }
if (tcache == NULL) {
return NULL;
}
tcache->tableCache = taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_ENTRY_LOCK);
tcache->capacity = 64;
......@@ -83,7 +85,10 @@ TFileCache* tfileCacheCreate(const char* path) {
tfileReaderRef(reader);
// loader fst and validate it
TFileHeader* header = &reader->header;
TFileCacheKey key = {.suid = header->suid, .colName = header->colName, .nColName = strlen(header->colName), .colType = header->colType};
TFileCacheKey key = {.suid = header->suid,
.colName = header->colName,
.nColName = strlen(header->colName),
.colType = header->colType};
char buf[128] = {0};
tfileSerialCacheKey(&key, buf);
......@@ -97,13 +102,16 @@ End:
return NULL;
}
void tfileCacheDestroy(TFileCache* tcache) {
if (tcache == NULL) { return; }
if (tcache == NULL) {
return;
}
// free table cache
TFileReader** reader = taosHashIterate(tcache->tableCache, NULL);
while (reader) {
TFileReader* p = *reader;
indexInfo("drop table cache suid: %" PRIu64 ", colName: %s, colType: %d", p->header.suid, p->header.colName, p->header.colType);
indexInfo("drop table cache suid: %" PRIu64 ", colName: %s, colType: %d", p->header.suid, p->header.colName,
p->header.colType);
tfileReaderUnRef(p);
reader = taosHashIterate(tcache->tableCache, reader);
......@@ -116,10 +124,13 @@ TFileReader* tfileCacheGet(TFileCache* tcache, TFileCacheKey* key) {
char buf[128] = {0};
tfileSerialCacheKey(key, buf);
TFileReader* reader = taosHashGet(tcache->tableCache, buf, strlen(buf));
tfileReaderRef(reader);
TFileReader** reader = taosHashGet(tcache->tableCache, buf, strlen(buf));
if (reader == NULL) {
return NULL;
}
tfileReaderRef(*reader);
return reader;
return *reader;
}
void tfileCachePut(TFileCache* tcache, TFileCacheKey* key, TFileReader* reader) {
char buf[128] = {0};
......@@ -138,14 +149,17 @@ void tfileCachePut(TFileCache* tcache, TFileCacheKey* key, TFileReader* reader)
}
TFileReader* tfileReaderCreate(WriterCtx* ctx) {
TFileReader* reader = calloc(1, sizeof(TFileReader));
if (reader == NULL) { return NULL; }
if (reader == NULL) {
return NULL;
}
// T_REF_INC(reader);
reader->ctx = ctx;
if (0 != tfileReaderLoadHeader(reader)) {
tfileReaderDestroy(reader);
indexError("failed to load index header, suid: %" PRIu64 ", colName: %s", reader->header.suid, reader->header.colName);
indexError("failed to load index header, suid: %" PRIu64 ", colName: %s", reader->header.suid,
reader->header.colName);
return NULL;
}
......@@ -158,7 +172,9 @@ TFileReader* tfileReaderCreate(WriterCtx* ctx) {
return reader;
}
void tfileReaderDestroy(TFileReader* reader) {
if (reader == NULL) { return; }
if (reader == NULL) {
return;
}
// T_REF_INC(reader);
fstDestroy(reader->fst);
writerCtxDestroy(reader->ctx);
......@@ -175,10 +191,12 @@ int tfileReaderSearch(TFileReader* reader, SIndexTermQuery* query, SArray* resul
uint64_t offset;
FstSlice key = fstSliceCreate(term->colVal, term->nColVal);
if (fstGet(reader->fst, &key, &offset)) {
indexInfo("index: %" PRIu64 ", col: %s, colVal: %s, found table info in tindex", term->suid, term->colName, term->colVal);
indexInfo("index: %" PRIu64 ", col: %s, colVal: %s, found table info in tindex", term->suid, term->colName,
term->colVal);
ret = tfileReaderLoadTableIds(reader, offset, result);
} else {
indexInfo("index: %" PRIu64 ", col: %s, colVal: %s, not found table info in tindex", term->suid, term->colName, term->colVal);
indexInfo("index: %" PRIu64 ", col: %s, colVal: %s, not found table info in tindex", term->suid, term->colName,
term->colVal);
}
fstSliceDestroy(&key);
} else if (qtype == QUERY_PREFIX) {
......@@ -304,12 +322,16 @@ int tfileWriterPut(TFileWriter* tw, void* data) {
return 0;
}
void tfileWriteClose(TFileWriter* tw) {
if (tw == NULL) { return; }
if (tw == NULL) {
return;
}
writerCtxDestroy(tw->ctx);
free(tw);
}
void tfileWriterDestroy(TFileWriter* tw) {
if (tw == NULL) { return; }
if (tw == NULL) {
return;
}
writerCtxDestroy(tw->ctx);
free(tw);
......@@ -317,29 +339,35 @@ void tfileWriterDestroy(TFileWriter* tw) {
IndexTFile* indexTFileCreate(const char* path) {
IndexTFile* tfile = calloc(1, sizeof(IndexTFile));
if (tfile == NULL) { return NULL; }
if (tfile == NULL) {
return NULL;
}
tfile->cache = tfileCacheCreate(path);
return tfile;
}
void IndexTFileDestroy(IndexTFile* tfile) {
free(tfile);
}
void IndexTFileDestroy(IndexTFile* tfile) { free(tfile); }
int indexTFileSearch(void* tfile, SIndexTermQuery* query, SArray* result) {
int ret = -1;
if (tfile == NULL) { return ret; }
if (tfile == NULL) {
return ret;
}
IndexTFile* pTfile = (IndexTFile*)tfile;
SIndexTerm* term = query->term;
TFileCacheKey key = {.suid = term->suid, .colType = term->colType, .colName = term->colName, .nColName = term->nColName};
TFileCacheKey key = {
.suid = term->suid, .colType = term->colType, .colName = term->colName, .nColName = term->nColName};
TFileReader* reader = tfileCacheGet(pTfile->cache, &key);
if (reader == NULL) {
return 0;
}
return tfileReaderSearch(reader, query, result);
}
int indexTFilePut(void* tfile, SIndexTerm* term, uint64_t uid) {
// TFileWriterOpt wOpt = {.suid = term->suid, .colType = term->colType, .colName = term->colName, .nColName = term->nColName, .version =
// 1};
// TFileWriterOpt wOpt = {.suid = term->suid, .colType = term->colType, .colName = term->colName, .nColName =
// term->nColName, .version = 1};
return 0;
}
......@@ -353,7 +381,9 @@ static bool tfileIteratorNext(Iterate* iiter) {
TFileFstIter* tIter = iiter->iter;
StreamWithStateResult* rt = streamWithStateNextWith(tIter->st, NULL);
if (rt == NULL) { return false; }
if (rt == NULL) {
return false;
}
int32_t sz = 0;
char* ch = (char*)fstSliceData(&rt->data, &sz);
......@@ -364,20 +394,22 @@ static bool tfileIteratorNext(Iterate* iiter) {
swsResultDestroy(rt);
// set up iterate value
if (tfileReaderLoadTableIds(tIter->rdr, offset, iv->val) != 0) { return false; }
if (tfileReaderLoadTableIds(tIter->rdr, offset, iv->val) != 0) {
return false;
}
iv->colVal = colVal;
// std::string key(ch, sz);
}
static IterateValue* tifileIterateGetValue(Iterate* iter) {
return &iter->val;
}
static IterateValue* tifileIterateGetValue(Iterate* iter) { return &iter->val; }
static TFileFstIter* tfileFstIteratorCreate(TFileReader* reader) {
TFileFstIter* tIter = calloc(1, sizeof(Iterate));
if (tIter == NULL) { return NULL; }
if (tIter == NULL) {
return NULL;
}
tIter->ctx = automCtxCreate(NULL, AUTOMATION_ALWAYS);
tIter->fb = fstSearch(reader->fst, tIter->ctx);
tIter->st = streamBuilderIntoStream(tIter->fb);
......@@ -389,14 +421,18 @@ Iterate* tfileIteratorCreate(TFileReader* reader) {
Iterate* iter = calloc(1, sizeof(Iterate));
iter->iter = tfileFstIteratorCreate(reader);
if (iter->iter == NULL) { return NULL; }
if (iter->iter == NULL) {
return NULL;
}
iter->next = tfileIteratorNext;
iter->getValue = tifileIterateGetValue;
return iter;
}
void tfileIteratorDestroy(Iterate* iter) {
if (iter == NULL) { return; }
if (iter == NULL) {
return;
}
IterateValue* iv = &iter->val;
iterateValueDestroy(iv, true);
......@@ -409,14 +445,18 @@ void tfileIteratorDestroy(Iterate* iter) {
}
TFileReader* tfileGetReaderByCol(IndexTFile* tf, char* colName) {
if (tf == NULL) { return NULL; }
if (tf == NULL) {
return NULL;
}
TFileCacheKey key = {.suid = 0, .colType = TSDB_DATA_TYPE_BINARY, .colName = colName, .nColName = strlen(colName)};
return tfileCacheGet(tf->cache, &key);
}
static int tfileStrCompare(const void* a, const void* b) {
int ret = strcmp((char*)a, (char*)b);
if (ret == 0) { return ret; }
if (ret == 0) {
return ret;
}
return ret < 0 ? -1 : 1;
}
......@@ -431,13 +471,17 @@ static int tfileValueCompare(const void* a, const void* b, const void* param) {
TFileValue* tfileValueCreate(char* val) {
TFileValue* tf = calloc(1, sizeof(TFileValue));
if (tf == NULL) { return NULL; }
if (tf == NULL) {
return NULL;
}
tf->tableId = taosArrayInit(32, sizeof(uint64_t));
return tf;
}
int tfileValuePush(TFileValue* tf, uint64_t val) {
if (tf == NULL) { return -1; }
if (tf == NULL) {
return -1;
}
taosArrayPush(tf->tableId, &val);
return 0;
}
......@@ -457,7 +501,9 @@ static void tfileSerialTableIdsToBuf(char* buf, SArray* ids) {
static int tfileWriteFstOffset(TFileWriter* tw, int32_t offset) {
int32_t fstOffset = offset + sizeof(tw->header.fstOffset);
tw->header.fstOffset = fstOffset;
if (sizeof(fstOffset) != tw->ctx->write(tw->ctx, (char*)&fstOffset, sizeof(fstOffset))) { return -1; }
if (sizeof(fstOffset) != tw->ctx->write(tw->ctx, (char*)&fstOffset, sizeof(fstOffset))) {
return -1;
}
tw->offset += sizeof(fstOffset);
return 0;
}
......@@ -468,7 +514,9 @@ static int tfileWriteHeader(TFileWriter* writer) {
memcpy(buf, (char*)header, sizeof(buf));
int nwrite = writer->ctx->write(writer->ctx, buf, sizeof(buf));
if (sizeof(buf) != nwrite) { return -1; }
if (sizeof(buf) != nwrite) {
return -1;
}
writer->offset = nwrite;
return 0;
}
......@@ -502,7 +550,9 @@ static int tfileReaderLoadFst(TFileReader* reader) {
static int FST_MAX_SIZE = 16 * 1024;
char* buf = calloc(1, sizeof(char) * FST_MAX_SIZE);
if (buf == NULL) { return -1; }
if (buf == NULL) {
return -1;
}
WriterCtx* ctx = reader->ctx;
int32_t nread = ctx->readFrom(ctx, buf, FST_MAX_SIZE, reader->header.fstOffset);
......@@ -525,7 +575,9 @@ static int tfileReaderLoadTableIds(TFileReader* reader, int32_t offset, SArray*
int32_t total = sizeof(uint64_t) * nid;
char* buf = calloc(1, total);
if (buf == NULL) { return -1; }
if (buf == NULL) {
return -1;
}
nread = ctx->read(ctx, buf, total);
assert(total == nread);
......@@ -543,12 +595,16 @@ void tfileReaderRef(TFileReader* reader) {
void tfileReaderUnRef(TFileReader* reader) {
int ref = T_REF_DEC(reader);
if (ref == 0) { tfileReaderDestroy(reader); }
if (ref == 0) {
tfileReaderDestroy(reader);
}
}
static int tfileGetFileList(const char* path, SArray* result) {
DIR* dir = opendir(path);
if (NULL == dir) { return -1; }
if (NULL == dir) {
return -1;
}
struct dirent* entry;
while ((entry = readdir(dir)) != NULL) {
......@@ -576,7 +632,9 @@ static int tfileCompare(const void* a, const void* b) {
size_t bLen = strlen(bName);
int ret = strncmp(aName, bName, aLen > bLen ? aLen : bLen);
if (ret == 0) { return ret; }
if (ret == 0) {
return ret;
}
return ret < 0 ? -1 : 1;
}
// tfile name suid-colId-version.tindex
......
source/libs/index/test/indexTests.cc
浏览文件 @ 240a5309
......@@ -2,7 +2,8 @@
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
*
* This program is free software: you can use, redistribute, and/or modify
* it under the terms of the GNU Affero General Public License, version 3 * or later ("AGPL"), as published by the Free Software Foundation.
* it under the terms of the GNU Affero General Public License, version 3 * or later ("AGPL"), as published by the Free
* Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
......@@ -75,7 +76,9 @@ class FstReadMemory {
bool init() {
char* buf = (char*)calloc(1, sizeof(char) * _size);
int nRead = fstCountingWriterRead(_w, (uint8_t*)buf, _size);
if (nRead <= 0) { return false; }
if (nRead <= 0) {
return false;
}
_size = nRead;
_s = fstSliceCreate((uint8_t*)buf, _size);
_fst = fstCreate(&_s);
......@@ -179,7 +182,9 @@ void checkFstPerf() {
delete fw;
FstReadMemory* m = new FstReadMemory(1024 * 64);
if (m->init()) { printf("success to init fst read"); }
if (m->init()) {
printf("success to init fst read");
}
Performance_fstReadRecords(m);
delete m;
}
......@@ -283,7 +288,8 @@ class IndexEnv : public ::testing::Test {
// / {
// / std::string colName("tag1"), colVal("Hello world");
// / SIndexTerm* term =
// indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), / colVal.size());
// indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), /
// colVal.size());
// SIndexMultiTerm* terms = indexMultiTermCreate();
// indexMultiTermAdd(terms, term);
// / / for (size_t i = 0; i < 100; i++) {
......@@ -301,14 +307,16 @@ class IndexEnv : public ::testing::Test {
// / {
// / std::string colName("tag1"), colVal("Hello world");
// / SIndexTerm* term =
// / indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
// / indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(),
// colVal.size());
// / indexMultiTermAdd(terms, term);
// /
// }
// / {
// / std::string colName("tag2"), colVal("Hello world");
// / SIndexTerm* term =
// / indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
// / indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(),
// colVal.size());
// / indexMultiTermAdd(terms, term);
// /
// }
......@@ -327,7 +335,8 @@ class IndexEnv : public ::testing::Test {
class TFileObj {
public:
TFileObj(const std::string& path = "/tmp/tindex", const std::string& colName = "voltage") : path_(path), colName_(colName) {
TFileObj(const std::string& path = "/tmp/tindex", const std::string& colName = "voltage")
: path_(path), colName_(colName) {
colId_ = 10;
// Do Nothing
//
......@@ -337,7 +346,9 @@ class TFileObj {
tfileReaderDestroy(reader_);
reader_ = NULL;
}
if (writer_ == NULL) { InitWriter(); }
if (writer_ == NULL) {
InitWriter();
}
return tfileWriterPut(writer_, tv);
}
bool InitWriter() {
......@@ -377,8 +388,12 @@ class TFileObj {
return tfileReaderSearch(reader_, query, result);
}
~TFileObj() {
if (writer_) { tfileWriterDestroy(writer_); }
if (reader_) { tfileReaderDestroy(reader_); }
if (writer_) {
tfileWriterDestroy(writer_);
}
if (reader_) {
tfileReaderDestroy(reader_);
}
}
private:
......@@ -457,7 +472,8 @@ TEST_F(IndexTFileEnv, test_tfile_write) {
std::string colName("voltage");
std::string colVal("ab");
SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(1, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
SIndexTermQuery query = {.term = term, .qType = QUERY_TERM};
SArray* result = (SArray*)taosArrayInit(1, sizeof(uint64_t));
......@@ -525,46 +541,53 @@ TEST_F(IndexCacheEnv, cache_test) {
std::string colName("voltage");
{
std::string colVal("v1");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, colId, version++, suid++);
}
{
std::string colVal("v3");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, colId, version++, suid++);
}
{
std::string colVal("v2");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, colId, version++, suid++);
}
{
std::string colVal("v3");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, colId, version++, suid++);
}
{
std::string colVal("v3");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, colId, version++, suid++);
}
{
std::string colVal("v3");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, othColId, version++, suid++);
}
{
std::string colVal("v4");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, othColId, version++, suid++);
}
{
std::string colVal("v4");
for (size_t i = 0; i < 10; i++) {
colVal[colVal.size() - 1] = 'a' + i;
SIndexTerm* term =
indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
coj->Put(term, colId, version++, suid++);
}
}
......@@ -572,7 +595,8 @@ TEST_F(IndexCacheEnv, cache_test) {
// begin query
{
std::string colVal("v3");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
SIndexTermQuery query = {.term = term, .qType = QUERY_TERM};
SArray* ret = (SArray*)taosArrayInit(4, sizeof(suid));
STermValueType valType;
......@@ -583,7 +607,8 @@ TEST_F(IndexCacheEnv, cache_test) {
}
{
std::string colVal("v2");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(), colVal.c_str(), colVal.size());
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
SIndexTermQuery query = {.term = term, .qType = QUERY_TERM};
SArray* ret = (SArray*)taosArrayInit(4, sizeof(suid));
STermValueType valType;
......@@ -592,3 +617,132 @@ TEST_F(IndexCacheEnv, cache_test) {
assert(taosArrayGetSize(ret) == 1);
}
}
class IndexObj {
public:
IndexObj() {
// opt
numOfWrite = 0;
numOfRead = 0;
indexInit();
}
int Init(const std::string& dir) {
taosRemoveDir(dir.c_str());
taosMkDir(dir.c_str());
int ret = indexOpen(&opts, dir.c_str(), &idx);
if (ret != 0) {
// opt
std::cout << "failed to open index: %s" << dir << std::endl;
}
return ret;
}
int Put(SIndexMultiTerm* fvs, uint64_t uid) {
numOfWrite += taosArrayGetSize(fvs);
return indexPut(idx, fvs, uid);
}
int Search(SIndexMultiTermQuery* multiQ, SArray* result) {
SArray* query = multiQ->query;
numOfRead = taosArrayGetSize(query);
return indexSearch(idx, multiQ, result);
}
void Debug() {
std::cout << "numOfWrite:" << numOfWrite << std::endl;
std::cout << "numOfRead:" << numOfRead << std::endl;
}
~IndexObj() {
indexClose(idx);
indexCleanUp();
}
private:
SIndexOpts opts;
SIndex* idx;
int numOfWrite;
int numOfRead;
};
class IndexEnv2 : public ::testing::Test {
protected:
virtual void SetUp() {
index = new IndexObj();
//
}
virtual void TearDown() {
// r
delete index;
}
IndexObj* index;
};
TEST_F(IndexEnv2, testIndexOpen) {
std::string path = "/tmp";
if (index->Init(path) != 0) {
std::cout << "failed to init index" << std::endl;
exit(1);
}
int targetSize = 100;
{
std::string colName("tag1"), colVal("Hello world");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
SIndexMultiTerm* terms = indexMultiTermCreate();
indexMultiTermAdd(terms, term);
for (size_t i = 0; i < targetSize; i++) {
int tableId = i;
int ret = index->Put(terms, tableId);
assert(ret == 0);
}
indexMultiTermDestroy(terms);
}
{
size_t size = 100;
std::string colName("tag1"), colVal("hello world");
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
SIndexMultiTerm* terms = indexMultiTermCreate();
indexMultiTermAdd(terms, term);
for (size_t i = 0; i < size; i++) {
int tableId = i;
int ret = index->Put(terms, tableId);
assert(ret == 0);
}
indexMultiTermDestroy(terms);
}
{
std::string colName("tag1"), colVal("Hello world");
SIndexMultiTermQuery* mq = indexMultiTermQueryCreate(MUST);
SIndexTerm* term = indexTermCreate(0, ADD_VALUE, TSDB_DATA_TYPE_BINARY, colName.c_str(), colName.size(),
colVal.c_str(), colVal.size());
indexMultiTermQueryAdd(mq, term, QUERY_TERM);
SArray* result = (SArray*)taosArrayInit(1, sizeof(uint64_t));
index->Search(mq, result);
assert(taosArrayGetSize(result) == targetSize);
}
}
TEST_F(IndexEnv2, testIndex_CachePut) {
std::string path = "/tmp";
if (index->Init(path) != 0) {
}
}
TEST_F(IndexEnv2, testIndexr_TFilePut) {
std::string path = "/tmp";
if (index->Init(path) != 0) {
}
}
TEST_F(IndexEnv2, testIndex_CacheSearch) {
std::string path = "/tmp";
if (index->Init(path) != 0) {
}
}
TEST_F(IndexEnv2, testIndex_TFileSearch) {
std::string path = "/tmp";
if (index->Init(path) != 0) {
}
}
source/libs/parser/inc/astGenerator.h
浏览文件 @ 240a5309
......@@ -156,7 +156,7 @@ typedef struct SCreateDbInfo {
SToken dbname;
int32_t replica;
int32_t cacheBlockSize;
int32_t maxTablesPerVnode;
int32_t numOfVgroups;
int32_t numOfBlocks;
int32_t daysPerFile;
int32_t minRowsPerBlock;
......
source/libs/parser/inc/astToMsg.h
浏览文件 @ 240a5309
......@@ -4,7 +4,6 @@
#include "parserInt.h"
#include "tmsg.h"
int32_t createSName(SName* pName, SToken* pTableName, SParseBasicCtx* pParseCtx, SMsgBuf* pMsgBuf);
SCreateUserMsg* buildUserManipulationMsg(SSqlInfo* pInfo, int32_t* outputLen, int64_t id, char* msgBuf, int32_t msgLen);
SCreateAcctMsg* buildAcctManipulationMsg(SSqlInfo* pInfo, int32_t* outputLen, int64_t id, char* msgBuf, int32_t msgLen);
......
source/libs/parser/inc/parserUtil.h
浏览文件 @ 240a5309
......@@ -70,6 +70,19 @@ bool isDclSqlStatement(SSqlInfo* pSqlInfo);
bool isDdlSqlStatement(SSqlInfo* pSqlInfo);
bool isDqlSqlStatement(SSqlInfo* pSqlInfo);
typedef struct SKvParam {
SKVRowBuilder *builder;
SSchema *schema;
char buf[TSDB_MAX_TAGS_LEN];
} SKvParam;
int32_t KvRowAppend(const void *value, int32_t len, void *param);
typedef int32_t (*_row_append_fn_t)(const void *value, int32_t len, void *param);
int32_t parseValueToken(char** end, SToken* pToken, SSchema* pSchema, int16_t timePrec, char* tmpTokenBuf, _row_append_fn_t func, void* param, SMsgBuf* pMsgBuf);
int32_t createSName(SName* pName, SToken* pTableName, SParseBasicCtx* pParseCtx, SMsgBuf* pMsgBuf);
#ifdef __cplusplus
}
#endif
......
source/libs/parser/inc/sql.y
浏览文件 @ 240a5309
......@@ -280,6 +280,7 @@ comp(Y) ::= COMP INTEGER(X). { Y = X; }
prec(Y) ::= PRECISION STRING(X). { Y = X; }
update(Y) ::= UPDATE INTEGER(X). { Y = X; }
cachelast(Y) ::= CACHELAST INTEGER(X). { Y = X; }
vgroups(Y) ::= VGROUPS INTEGER(X). { Y = X; }
//partitions(Y) ::= PARTITIONS INTEGER(X). { Y = X; }
%type db_optr {SCreateDbInfo}
......@@ -300,6 +301,7 @@ db_optr(Y) ::= db_optr(Z) prec(X). { Y = Z; Y.precision = X; }
db_optr(Y) ::= db_optr(Z) keep(X). { Y = Z; Y.keep = X; }
db_optr(Y) ::= db_optr(Z) update(X). { Y = Z; Y.update = strtol(X.z, NULL, 10); }
db_optr(Y) ::= db_optr(Z) cachelast(X). { Y = Z; Y.cachelast = strtol(X.z, NULL, 10); }
db_optr(Y) ::= db_optr(Z) vgroups(X). { Y = Z; Y.numOfVgroups = strtol(X.z, NULL, 10); }
//%type topic_optr {SCreateDbInfo}
//
......
source/libs/parser/src/astGenerator.c
浏览文件 @ 240a5309
......@@ -13,11 +13,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "astGenerator.h"
#include <parserInt.h>
#include "os.h"
#include "taos.h"
#include "tmsg.h"
#include "parserInt.h"
#include "tmsgtype.h"
#include "astGenerator.h"
SArray *tListItemAppend(SArray *pList, SVariant *pVar, uint8_t sortOrder) {
if (pList == NULL) {
......@@ -947,23 +948,19 @@ void setCompactVnodeSql(SSqlInfo *pInfo, int32_t type, SArray *pParam) {
}
void setDefaultCreateDbOption(SCreateDbInfo *pDBInfo) {
pDBInfo->compressionLevel = -1;
pDBInfo->compressionLevel= -1;
pDBInfo->walLevel = -1;
pDBInfo->fsyncPeriod = -1;
pDBInfo->commitTime = -1;
pDBInfo->maxTablesPerVnode = -1;
pDBInfo->numOfVgroups = 2;
pDBInfo->cacheBlockSize = -1;
pDBInfo->numOfBlocks = -1;
pDBInfo->maxRowsPerBlock = -1;
pDBInfo->minRowsPerBlock = -1;
pDBInfo->daysPerFile = -1;
pDBInfo->replica = -1;
pDBInfo->quorum = -1;
pDBInfo->keep = NULL;
pDBInfo->update = -1;
pDBInfo->cachelast = -1;
......
source/libs/parser/src/astToMsg.c
浏览文件 @ 240a5309
......@@ -188,13 +188,14 @@ static void doSetDbOptions(SCreateDbMsg* pMsg, const SCreateDbInfo* pCreateDb) {
pMsg->minRows = htonl(pCreateDb->minRowsPerBlock);
pMsg->maxRows = htonl(pCreateDb->maxRowsPerBlock);
pMsg->fsyncPeriod = htonl(pCreateDb->fsyncPeriod);
pMsg->compression = pCreateDb->compressionLevel;
pMsg->compression = (int8_t) pCreateDb->compressionLevel;
pMsg->walLevel = (char)pCreateDb->walLevel;
pMsg->replications = pCreateDb->replica;
pMsg->quorum = pCreateDb->quorum;
pMsg->ignoreExist = pCreateDb->ignoreExists;
pMsg->update = pCreateDb->update;
pMsg->cacheLastRow = pCreateDb->cachelast;
pMsg->numOfVgroups = htonl(pCreateDb->numOfVgroups);
}
int32_t setDbOptions(SCreateDbMsg* pCreateDbMsg, const SCreateDbInfo* pCreateDbSql, SMsgBuf* pMsgBuf) {
......@@ -208,8 +209,6 @@ int32_t setDbOptions(SCreateDbMsg* pCreateDbMsg, const SCreateDbInfo* pCreateDbS
return TSDB_CODE_TSC_INVALID_OPERATION;
}
// todo configurable
pCreateDbMsg->numOfVgroups = htonl(2);
return TSDB_CODE_SUCCESS;
}
......@@ -233,45 +232,6 @@ SCreateDbMsg* buildCreateDbMsg(SCreateDbInfo* pCreateDbInfo, SParseBasicCtx *pCt
return pCreateMsg;
}
int32_t createSName(SName* pName, SToken* pTableName, SParseBasicCtx* pParseCtx, SMsgBuf* pMsgBuf) {
const char* msg1 = "name too long";
const char* msg2 = "acctId too long";
int32_t code = TSDB_CODE_SUCCESS;
char* p = strnchr(pTableName->z, TS_PATH_DELIMITER[0], pTableName->n, false);
if (p != NULL) { // db has been specified in sql string so we ignore current db path
code = tNameSetAcctId(pName, pParseCtx->acctId);
if (code != 0) {
return buildInvalidOperationMsg(pMsgBuf, msg2);
}
char name[TSDB_TABLE_FNAME_LEN] = {0};
strncpy(name, pTableName->z, pTableName->n);
code = tNameFromString(pName, name, T_NAME_DB|T_NAME_TABLE);
if (code != 0) {
return buildInvalidOperationMsg(pMsgBuf, msg1);
}
} else { // get current DB name first, and then set it into path
if (pTableName->n >= TSDB_TABLE_NAME_LEN) {
return buildInvalidOperationMsg(pMsgBuf, msg1);
}
tNameSetDbName(pName, pParseCtx->acctId, pParseCtx->db, strlen(pParseCtx->db));
char name[TSDB_TABLE_FNAME_LEN] = {0};
strncpy(name, pTableName->z, pTableName->n);
code = tNameFromString(pName, name, T_NAME_TABLE);
if (code != 0) {
code = buildInvalidOperationMsg(pMsgBuf, msg1);
}
}
return code;
}
SCreateStbMsg* buildCreateTableMsg(SCreateTableSql* pCreateTableSql, int32_t* len, SParseBasicCtx* pParseCtx, SMsgBuf* pMsgBuf) {
SSchema* pSchema;
......
source/libs/parser/src/dCDAstProcess.c
浏览文件 @ 240a5309
......@@ -17,7 +17,8 @@ static bool has(SArray* pFieldList, int32_t startIndex, const char* name) {
return false;
}
static int32_t setShowInfo(SShowInfo* pShowInfo, SParseBasicCtx *pCtx, void** output, int32_t* outputLen, SMsgBuf* pMsgBuf) {
static int32_t setShowInfo(SShowInfo* pShowInfo, SParseBasicCtx* pCtx, void** output, int32_t* outputLen,
SMsgBuf* pMsgBuf) {
const char* msg1 = "invalid name";
const char* msg2 = "wildcard string should be less than %d characters";
const char* msg3 = "database name too long";
......@@ -80,7 +81,7 @@ static int32_t setShowInfo(SShowInfo* pShowInfo, SParseBasicCtx *pCtx, void** ou
}
*output = buildShowMsg(pShowInfo, pCtx, pMsgBuf->buf, pMsgBuf->len);
*outputLen = sizeof(SShowMsg)/* + htons(pShowMsg->payloadLen)*/;
*outputLen = sizeof(SShowMsg) /* + htons(pShowMsg->payloadLen)*/;
return TSDB_CODE_SUCCESS;
}
......@@ -116,8 +117,8 @@ static int32_t doCheckDbOptions(SCreateDbMsg* pCreate, SMsgBuf* pMsgBuf) {
int32_t val = htonl(pCreate->daysPerFile);
if (val != -1 && (val < TSDB_MIN_DAYS_PER_FILE || val > TSDB_MAX_DAYS_PER_FILE)) {
snprintf(msg, tListLen(msg), "invalid db option daysPerFile: %d valid range: [%d, %d]", val,
TSDB_MIN_DAYS_PER_FILE, TSDB_MAX_DAYS_PER_FILE);
snprintf(msg, tListLen(msg), "invalid db option daysPerFile: %d valid range: [%d, %d]", val, TSDB_MIN_DAYS_PER_FILE,
TSDB_MAX_DAYS_PER_FILE);
return buildInvalidOperationMsg(pMsgBuf, msg);
}
......@@ -137,15 +138,15 @@ static int32_t doCheckDbOptions(SCreateDbMsg* pCreate, SMsgBuf* pMsgBuf) {
val = htonl(pCreate->commitTime);
if (val != -1 && (val < TSDB_MIN_COMMIT_TIME || val > TSDB_MAX_COMMIT_TIME)) {
snprintf(msg, tListLen(msg), "invalid db option commitTime: %d valid range: [%d, %d]", val,
TSDB_MIN_COMMIT_TIME, TSDB_MAX_COMMIT_TIME);
snprintf(msg, tListLen(msg), "invalid db option commitTime: %d valid range: [%d, %d]", val, TSDB_MIN_COMMIT_TIME,
TSDB_MAX_COMMIT_TIME);
return buildInvalidOperationMsg(pMsgBuf, msg);
}
val = htonl(pCreate->fsyncPeriod);
if (val != -1 && (val < TSDB_MIN_FSYNC_PERIOD || val > TSDB_MAX_FSYNC_PERIOD)) {
snprintf(msg, tListLen(msg), "invalid db option fsyncPeriod: %d valid range: [%d, %d]", val,
TSDB_MIN_FSYNC_PERIOD, TSDB_MAX_FSYNC_PERIOD);
snprintf(msg, tListLen(msg), "invalid db option fsyncPeriod: %d valid range: [%d, %d]", val, TSDB_MIN_FSYNC_PERIOD,
TSDB_MAX_FSYNC_PERIOD);
return buildInvalidOperationMsg(pMsgBuf, msg);
}
......@@ -156,6 +157,12 @@ static int32_t doCheckDbOptions(SCreateDbMsg* pCreate, SMsgBuf* pMsgBuf) {
return buildInvalidOperationMsg(pMsgBuf, msg);
}
val = htonl(pCreate->numOfVgroups);
if (val < TSDB_MIN_VNODES_PER_DB || val > TSDB_MAX_VNODES_PER_DB) {
snprintf(msg, tListLen(msg), "invalid number of vgroups for DB:%d valid range: [%d, %d]", val,
TSDB_MIN_VNODES_PER_DB, TSDB_MAX_VNODES_PER_DB);
}
return TSDB_CODE_SUCCESS;
}
......@@ -284,7 +291,8 @@ int32_t doCheckForCreateTable(SSqlInfo* pInfo, SMsgBuf* pMsgBuf) {
return TSDB_CODE_SUCCESS;
}
int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* pMsgBuf, char** pOutput, int32_t* len, SEpSet* pEpSet) {
int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SMsgBuf* pMsgBuf, char** pOutput, int32_t* len,
SEpSet* pEpSet) {
const char* msg1 = "invalid table name";
const char* msg2 = "tags number not matched";
const char* msg3 = "tag value too long";
......@@ -293,8 +301,8 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
SCreateTableSql* pCreateTable = pInfo->pCreateTableInfo;
// super table name, create table by using dst
int32_t numOfTables = (int32_t) taosArrayGetSize(pCreateTable->childTableInfo);
for(int32_t j = 0; j < numOfTables; ++j) {
int32_t numOfTables = (int32_t)taosArrayGetSize(pCreateTable->childTableInfo);
for (int32_t j = 0; j < numOfTables; ++j) {
SCreatedTableInfo* pCreateTableInfo = taosArrayGet(pCreateTable->childTableInfo, j);
SToken* pSTableNameToken = &pCreateTableInfo->stbName;
......@@ -314,22 +322,18 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
return code;
}
const char* pStableName = tNameGetTableName(&name);
SArray* pValList = pCreateTableInfo->pTagVals;
size_t numOfInputTag = taosArrayGetSize(pValList);
STableMeta* pSuperTableMeta = NULL;
char dbName[TSDB_DB_FNAME_LEN] = {0};
tNameGetFullDbName(&name, dbName);
catalogGetTableMeta(pCtx->pCatalog, pCtx->pTransporter, &pCtx->mgmtEpSet, dbName, pStableName, &pSuperTableMeta);
catalogGetTableMeta(pCtx->pCatalog, pCtx->pTransporter, &pCtx->mgmtEpSet, &name, &pSuperTableMeta);
assert(pSuperTableMeta != NULL);
// too long tag values will return invalid sql, not be truncated automatically
SSchema *pTagSchema = getTableTagSchema(pSuperTableMeta);
SSchema* pTagSchema = getTableTagSchema(pSuperTableMeta);
STableComInfo tinfo = getTableInfo(pSuperTableMeta);
STagData *pTag = &pCreateTableInfo->tagdata;
STagData* pTag = &pCreateTableInfo->tagdata;
SKVRowBuilder kvRowBuilder = {0};
if (tdInitKVRowBuilder(&kvRowBuilder) < 0) {
......@@ -357,13 +361,13 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
strncpy(tmpTokenBuf, sToken->z, sToken->n);
sToken->z = tmpTokenBuf;
// if (TK_STRING == sToken->type) {
// tscDequoteAndTrimToken(sToken);
// }
// if (TK_STRING == sToken->type) {
// tscDequoteAndTrimToken(sToken);
// }
// if (TK_ID == sToken->type) {
// tscRmEscapeAndTrimToken(sToken);
// }
// if (TK_ID == sToken->type) {
// tscRmEscapeAndTrimToken(sToken);
// }
SListItem* pItem = taosArrayGet(pValList, i);
......@@ -382,10 +386,10 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
}
} else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) {
if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) {
// code = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision);
// if (code != TSDB_CODE_SUCCESS) {
// return buildInvalidOperationMsg(pMsgBuf, msg4);
// }
// code = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision);
// if (code != TSDB_CODE_SUCCESS) {
// return buildInvalidOperationMsg(pMsgBuf, msg4);
// }
} else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) {
pItem->pVar.i = convertTimePrecision(pItem->pVar.i, TSDB_TIME_PRECISION_NANO, tinfo.precision);
}
......@@ -416,7 +420,7 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
if (!findColumnIndex) {
tdDestroyKVRowBuilder(&kvRowBuilder);
// return buildInvalidOperationMsg(pMsgBuf, "invalid tag name", sToken->z);
// return buildInvalidOperationMsg(pMsgBuf, "invalid tag name", sToken->z);
}
}
} else {
......@@ -426,46 +430,35 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
}
for (int32_t i = 0; i < numOfInputTag; ++i) {
SSchema *pSchema = &pTagSchema[i];
SSchema* pSchema = &pTagSchema[i];
SToken* pItem = taosArrayGet(pValList, i);
char tagVal[TSDB_MAX_TAGS_LEN];
if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
if (pItem->n > pSchema->bytes) {
tdDestroyKVRowBuilder(&kvRowBuilder);
return buildInvalidOperationMsg(pMsgBuf, msg3);
}
} else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) {
// if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) {
//// code = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision);
// if (code != TSDB_CODE_SUCCESS) {
// return buildInvalidOperationMsg(pMsgBuf, msg4);
// }
// } else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) {
// pItem->pVar.i = convertTimePrecision(pItem->pVar.i, TSDB_TIME_PRECISION_NANO, tinfo.precision);
// }
// if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) {
//// code = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision);
// if (code != TSDB_CODE_SUCCESS) {
// return buildInvalidOperationMsg(pMsgBuf, msg4);
// }
// } else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) {
// pItem->pVar.i = convertTimePrecision(pItem->pVar.i, TSDB_TIME_PRECISION_NANO, tinfo.precision);
// }
}
char* endPtr = NULL;
int64_t v = strtoll(pItem->z, &endPtr, 10);
*(int32_t*) tagVal = v;
// code = taosVariantDump(&(pItem->pVar), tagVal, pSchema->type, true);
char tmpTokenBuf[TSDB_MAX_TAGS_LEN] = {0};
SKvParam param = {.builder = &kvRowBuilder, .schema = pSchema};
// check again after the convert since it may be converted from binary to nchar.
if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) {
int16_t len = varDataTLen(tagVal);
if (len > pSchema->bytes) {
tdDestroyKVRowBuilder(&kvRowBuilder);
return buildInvalidOperationMsg(pMsgBuf, msg3);
}
}
char* endPtr = NULL;
code = parseValueToken(&endPtr, pItem, pSchema, tinfo.precision, tmpTokenBuf, KvRowAppend, &param, pMsgBuf);
if (code != TSDB_CODE_SUCCESS) {
tdDestroyKVRowBuilder(&kvRowBuilder);
return buildInvalidOperationMsg(pMsgBuf, msg4);
}
tdAddColToKVRow(&kvRowBuilder, pSchema->colId, pSchema->type, tagVal);
}
}
......@@ -489,32 +482,36 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p
req.ctbCfg.suid = pSuperTableMeta->suid;
req.ctbCfg.pTag = row;
int32_t serLen = tSerializeSVCreateTbReq(NULL, &req);
int32_t serLen = sizeof(SMsgHead) + tSerializeSVCreateTbReq(NULL, &req);
char* buf1 = calloc(1, serLen);
char* p = buf1;
tSerializeSVCreateTbReq((void*) &buf1, &req);
*pOutput = p;
*pOutput = buf1;
buf1 += sizeof(SMsgHead);
tSerializeSVCreateTbReq((void*)&buf1, &req);
*len = serLen;
SVgroupInfo info = {0};
catalogGetTableHashVgroup(pCtx->pCatalog, pCtx->pTransporter, &pCtx->mgmtEpSet, dbName, req.name, &info);
catalogGetTableHashVgroup(pCtx->pCatalog, pCtx->pTransporter, &pCtx->mgmtEpSet, &tableName, &info);
pEpSet->inUse = info.inUse;
pEpSet->numOfEps = info.numOfEps;
for(int32_t i = 0; i < pEpSet->numOfEps; ++i) {
for (int32_t i = 0; i < pEpSet->numOfEps; ++i) {
pEpSet->port[i] = info.epAddr[i].port;
tstrncpy(pEpSet->fqdn[i], info.epAddr[i].fqdn, tListLen(pEpSet->fqdn[i]));
}
((SMsgHead*)(*pOutput))->vgId = htonl(info.vgId);
((SMsgHead*)(*pOutput))->contLen = htonl(serLen);
}
return TSDB_CODE_SUCCESS;
}
int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStmtInfo* pDcl, char* msgBuf, int32_t msgBufLen) {
int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStmtInfo* pDcl, char* msgBuf,
int32_t msgBufLen) {
int32_t code = 0;
SMsgBuf m = {.buf = msgBuf, .len = msgBufLen};
SMsgBuf *pMsgBuf = &m;
SMsgBuf* pMsgBuf = &m;
switch (pInfo->type) {
case TSDB_SQL_CREATE_USER:
......@@ -562,7 +559,7 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
}
pDcl->pMsg = (char*)buildUserManipulationMsg(pInfo, &pDcl->msgLen, pCtx->requestId, msgBuf, msgBufLen);
pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_USER)? TDMT_MND_CREATE_USER:TDMT_MND_ALTER_USER;
pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_USER) ? TDMT_MND_CREATE_USER : TDMT_MND_ALTER_USER;
break;
}
......@@ -599,14 +596,14 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
}
pDcl->pMsg = (char*)buildAcctManipulationMsg(pInfo, &pDcl->msgLen, pCtx->requestId, msgBuf, msgBufLen);
pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_ACCT)? TDMT_MND_CREATE_ACCT:TDMT_MND_ALTER_ACCT;
pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_ACCT) ? TDMT_MND_CREATE_ACCT : TDMT_MND_ALTER_ACCT;
break;
}
case TSDB_SQL_DROP_ACCT:
case TSDB_SQL_DROP_USER: {
pDcl->pMsg = (char*)buildDropUserMsg(pInfo, &pDcl->msgLen, pCtx->requestId, msgBuf, msgBufLen);
pDcl->msgType = (pInfo->type == TSDB_SQL_DROP_ACCT)? TDMT_MND_DROP_ACCT:TDMT_MND_DROP_USER;
pDcl->msgType = (pInfo->type == TSDB_SQL_DROP_ACCT) ? TDMT_MND_DROP_ACCT : TDMT_MND_DROP_USER;
break;
}
......@@ -630,7 +627,7 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
return buildInvalidOperationMsg(pMsgBuf, msg);
}
SUseDbMsg *pUseDbMsg = (SUseDbMsg *) calloc(1, sizeof(SUseDbMsg));
SUseDbMsg* pUseDbMsg = (SUseDbMsg*)calloc(1, sizeof(SUseDbMsg));
tNameExtractFullName(&n, pUseDbMsg->db);
pDcl->pMsg = (char*)pUseDbMsg;
......@@ -663,7 +660,7 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
pDcl->pMsg = (char*)pCreateMsg;
pDcl->msgLen = sizeof(SCreateDbMsg);
pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_DB)? TDMT_MND_CREATE_DB:TDMT_MND_ALTER_DB;
pDcl->msgType = (pInfo->type == TSDB_SQL_CREATE_DB) ? TDMT_MND_CREATE_DB : TDMT_MND_ALTER_DB;
break;
}
......@@ -679,7 +676,7 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
return buildInvalidOperationMsg(pMsgBuf, msg1);
}
SDropDbMsg *pDropDbMsg = (SDropDbMsg*) calloc(1, sizeof(SDropDbMsg));
SDropDbMsg* pDropDbMsg = (SDropDbMsg*)calloc(1, sizeof(SDropDbMsg));
code = tNameExtractFullName(&name, pDropDbMsg->db);
pDropDbMsg->ignoreNotExists = pInfo->pMiscInfo->existsCheck ? 1 : 0;
......@@ -699,9 +696,10 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
return code;
}
pDcl->pMsg = (char*)buildCreateTableMsg(pCreateTable, &pDcl->msgLen, pCtx, pMsgBuf);
pDcl->msgType = (pCreateTable->type == TSQL_CREATE_TABLE)? TDMT_VND_CREATE_TABLE:TDMT_MND_CREATE_STB;
pDcl->msgType = (pCreateTable->type == TSQL_CREATE_TABLE) ? TDMT_VND_CREATE_TABLE : TDMT_MND_CREATE_STB;
} else if (pCreateTable->type == TSQL_CREATE_CTABLE) {
if ((code = doCheckForCreateCTable(pInfo, pCtx, pMsgBuf, &pDcl->pMsg, &pDcl->msgLen, &pDcl->epSet)) != TSDB_CODE_SUCCESS) {
if ((code = doCheckForCreateCTable(pInfo, pCtx, pMsgBuf, &pDcl->pMsg, &pDcl->msgLen, &pDcl->epSet)) !=
TSDB_CODE_SUCCESS) {
return code;
}
......@@ -725,7 +723,7 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
}
case TSDB_SQL_CREATE_DNODE: {
pDcl->pMsg = (char*) buildCreateDnodeMsg(pInfo, &pDcl->msgLen, pMsgBuf);
pDcl->pMsg = (char*)buildCreateDnodeMsg(pInfo, &pDcl->msgLen, pMsgBuf);
if (pDcl->pMsg == NULL) {
code = terrno;
}
......@@ -735,7 +733,7 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
}
case TSDB_SQL_DROP_DNODE: {
pDcl->pMsg = (char*) buildDropDnodeMsg(pInfo, &pDcl->msgLen, pMsgBuf);
pDcl->pMsg = (char*)buildDropDnodeMsg(pInfo, &pDcl->msgLen, pMsgBuf);
if (pDcl->pMsg == NULL) {
code = terrno;
}
......@@ -750,4 +748,3 @@ int32_t qParserValidateDclSqlNode(SSqlInfo* pInfo, SParseBasicCtx* pCtx, SDclStm
return code;
}
source/libs/parser/src/insertParser.c
浏览文件 @ 240a5309
......@@ -51,7 +51,7 @@ enum {
typedef struct SInsertParseContext {
SParseContext* pComCxt; // input
const char* pSql; // input
char *pSql; // input
SMsgBuf msg; // input
STableMeta* pTableMeta; // each table
SParsedDataColInfo tags; // each table
......@@ -64,22 +64,6 @@ typedef struct SInsertParseContext {
SInsertStmtInfo* pOutput;
} SInsertParseContext;
typedef int32_t (*FRowAppend)(const void *value, int32_t len, void *param);
typedef struct SKvParam {
char buf[TSDB_MAX_TAGS_LEN];
SKVRowBuilder* builder;
SSchema* schema;
} SKvParam;
static uint8_t TRUE_VALUE = (uint8_t)TSDB_TRUE;
static uint8_t FALSE_VALUE = (uint8_t)TSDB_FALSE;
static bool isNullStr(SToken *pToken) {
return (pToken->type == TK_NULL) || ((pToken->type == TK_STRING) && (pToken->n != 0) &&
(strncasecmp(TSDB_DATA_NULL_STR_L, pToken->z, pToken->n) == 0));
}
static FORCE_INLINE int32_t toDouble(SToken *pToken, double *value, char **endPtr) {
errno = 0;
*value = strtold(pToken->z, endPtr);
......@@ -170,12 +154,17 @@ static int32_t buildName(SInsertParseContext* pCxt, SToken* pStname, char* fullD
}
static int32_t getTableMeta(SInsertParseContext* pCxt, SToken* pTname) {
char fullDbName[TSDB_DB_FNAME_LEN] = {0};
char tableName[TSDB_TABLE_NAME_LEN] = {0};
CHECK_CODE(buildName(pCxt, pTname, fullDbName, tableName));
CHECK_CODE(catalogGetTableMeta(pCxt->pComCxt->ctx.pCatalog, pCxt->pComCxt->ctx.pTransporter, &pCxt->pComCxt->ctx.mgmtEpSet, fullDbName, tableName, &pCxt->pTableMeta));
SName name = {0};
createSName(&name, pTname, &pCxt->pComCxt->ctx, &pCxt->msg);
char tableName[TSDB_TABLE_FNAME_LEN] = {0};
tNameExtractFullName(&name, tableName);
SParseBasicCtx* pBasicCtx = &pCxt->pComCxt->ctx;
CHECK_CODE(catalogGetTableMeta(pBasicCtx->pCatalog, pBasicCtx->pTransporter, &pBasicCtx->mgmtEpSet, &name, &pCxt->pTableMeta));
SVgroupInfo vg;
CHECK_CODE(catalogGetTableHashVgroup(pCxt->pComCxt->ctx.pCatalog, pCxt->pComCxt->ctx.pTransporter, &pCxt->pComCxt->ctx.mgmtEpSet, fullDbName, tableName, &vg));
CHECK_CODE(catalogGetTableHashVgroup(pBasicCtx->pCatalog, pBasicCtx->pTransporter, &pBasicCtx->mgmtEpSet, &name, &vg));
CHECK_CODE(taosHashPut(pCxt->pVgroupsHashObj, (const char*)&vg.vgId, sizeof(vg.vgId), (char*)&vg, sizeof(vg)));
return TSDB_CODE_SUCCESS;
}
......@@ -263,23 +252,21 @@ static int32_t checkTimestamp(STableDataBlocks *pDataBlocks, const char *start)
return TSDB_CODE_SUCCESS;
}
static int parseTime(SInsertParseContext* pCxt, SToken *pToken, int16_t timePrec, int64_t *time) {
static int parseTime(char **end, SToken *pToken, int16_t timePrec, int64_t *time, SMsgBuf* pMsgBuf) {
int32_t index = 0;
SToken sToken;
int64_t interval;
int64_t useconds = 0;
const char* pTokenEnd = pCxt->pSql;
int64_t ts = 0;
char* pTokenEnd = *end;
if (pToken->type == TK_NOW) {
useconds = taosGetTimestamp(timePrec);
} else if (strncmp(pToken->z, "0", 1) == 0 && pToken->n == 1) {
// do nothing
ts = taosGetTimestamp(timePrec);
} else if (pToken->type == TK_INTEGER) {
useconds = taosStr2int64(pToken->z);
} else {
// strptime("2001-11-12 18:31:01", "%Y-%m-%d %H:%M:%S", &tm);
bool isSigned = false;
toInteger(pToken->z, pToken->n, 10, &ts, &isSigned);
} else { // parse the RFC-3339/ISO-8601 timestamp format string
if (taosParseTime(pToken->z, time, pToken->n, timePrec, tsDaylight) != TSDB_CODE_SUCCESS) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid timestamp format", pToken->z);
return buildSyntaxErrMsg(pMsgBuf, "invalid timestamp format", pToken->z);
}
return TSDB_CODE_SUCCESS;
......@@ -288,8 +275,8 @@ static int parseTime(SInsertParseContext* pCxt, SToken *pToken, int16_t timePrec
for (int k = pToken->n; pToken->z[k] != '\0'; k++) {
if (pToken->z[k] == ' ' || pToken->z[k] == '\t') continue;
if (pToken->z[k] == ',') {
pCxt->pSql = pTokenEnd;
*time = useconds;
*end = pTokenEnd;
*time = ts;
return 0;
}
......@@ -311,7 +298,7 @@ static int parseTime(SInsertParseContext* pCxt, SToken *pToken, int16_t timePrec
pTokenEnd += index;
if (valueToken.n < 2) {
return buildSyntaxErrMsg(&pCxt->msg, "value expected in timestamp", sToken.z);
return buildSyntaxErrMsg(pMsgBuf, "value expected in timestamp", sToken.z);
}
char unit = 0;
......@@ -320,34 +307,15 @@ static int parseTime(SInsertParseContext* pCxt, SToken *pToken, int16_t timePrec
}
if (sToken.type == TK_PLUS) {
useconds += interval;
ts += interval;
} else {
useconds = useconds - interval;
ts = ts - interval;
}
pCxt->pSql = pTokenEnd;
*end = pTokenEnd;
}
*time = useconds;
return TSDB_CODE_SUCCESS;
}
static FORCE_INLINE int32_t KvRowAppend(const void *value, int32_t len, void *param) {
SKvParam* pa = (SKvParam*)param;
if (TSDB_DATA_TYPE_BINARY == pa->schema->type) {
STR_WITH_SIZE_TO_VARSTR(pa->buf, value, len);
tdAddColToKVRow(pa->builder, pa->schema->colId, pa->schema->type, pa->buf);
} else if (TSDB_DATA_TYPE_NCHAR == pa->schema->type) {
// if the converted output len is over than pColumnModel->bytes, return error: 'Argument list too long'
int32_t output = 0;
if (!taosMbsToUcs4(value, len, varDataVal(pa->buf), pa->schema->bytes - VARSTR_HEADER_SIZE, &output)) {
return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
varDataSetLen(pa->buf, output);
tdAddColToKVRow(pa->builder, pa->schema->colId, pa->schema->type, pa->buf);
} else {
tdAddColToKVRow(pa->builder, pa->schema->colId, pa->schema->type, value);
}
*time = ts;
return TSDB_CODE_SUCCESS;
}
......@@ -381,193 +349,206 @@ static FORCE_INLINE int32_t MemRowAppend(const void *value, int32_t len, void *p
return TSDB_CODE_SUCCESS;
}
static FORCE_INLINE int32_t checkAndTrimValue(SInsertParseContext* pCxt, SToken* pToken, SSchema* pSchema, char* tmpTokenBuf) {
int16_t type = pToken->type;
if ((type != TK_NOW && type != TK_INTEGER && type != TK_STRING && type != TK_FLOAT && type != TK_BOOL &&
type != TK_NULL && type != TK_HEX && type != TK_OCT && type != TK_BIN) ||
(pToken->n == 0) || (type == TK_RP)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid data or symbol", pToken->z);
}
if (IS_NUMERIC_TYPE(pSchema->type) && pToken->n == 0) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid numeric data", pToken->z);
}
// Remove quotation marks
if (TK_STRING == type) {
if (pToken->n >= TSDB_MAX_BYTES_PER_ROW) {
return buildSyntaxErrMsg(&pCxt->msg, "too long string", pToken->z);
}
// delete escape character: \\, \', \"
char delim = pToken->z[0];
int32_t cnt = 0;
int32_t j = 0;
for (uint32_t k = 1; k < pToken->n - 1; ++k) {
if (pToken->z[k] == '\\' || (pToken->z[k] == delim && pToken->z[k + 1] == delim)) {
tmpTokenBuf[j] = pToken->z[k + 1];
cnt++;
j++;
k++;
continue;
}
tmpTokenBuf[j] = pToken->z[k];
j++;
}
tmpTokenBuf[j] = 0;
pToken->z = tmpTokenBuf;
pToken->n -= 2 + cnt;
}
return TSDB_CODE_SUCCESS;
}
static FORCE_INLINE int32_t parseOneValue(SInsertParseContext* pCxt, SToken* pToken, SSchema* pSchema, int16_t timePrec, char* tmpTokenBuf, FRowAppend func, void* param) {
int64_t iv;
int32_t ret;
char * endptr = NULL;
CHECK_CODE(checkAndTrimValue(pCxt, pToken, pSchema, tmpTokenBuf));
if (isNullStr(pToken)) {
if (TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && PRIMARYKEY_TIMESTAMP_COL_ID == pSchema->colId) {
int64_t tmpVal = 0;
return func(&tmpVal, pSchema->bytes, param);
}
return func(getNullValue(pSchema->type), 0, param);
}
switch (pSchema->type) {
case TSDB_DATA_TYPE_BOOL: {
if ((pToken->type == TK_BOOL || pToken->type == TK_STRING) && (pToken->n != 0)) {
if (strncmp(pToken->z, "true", pToken->n) == 0) {
return func(&TRUE_VALUE, pSchema->bytes, param);
} else if (strncmp(pToken->z, "false", pToken->n) == 0) {
return func(&FALSE_VALUE, pSchema->bytes, param);
} else {
return buildSyntaxErrMsg(&pCxt->msg, "invalid bool data", pToken->z);
}
} else if (pToken->type == TK_INTEGER) {
return func(((strtoll(pToken->z, NULL, 10) == 0) ? &FALSE_VALUE : &TRUE_VALUE), pSchema->bytes, param);
} else if (pToken->type == TK_FLOAT) {
return func(((strtod(pToken->z, NULL) == 0) ? &FALSE_VALUE : &TRUE_VALUE), pSchema->bytes, param);
} else {
return buildSyntaxErrMsg(&pCxt->msg, "invalid bool data", pToken->z);
}
break;
}
case TSDB_DATA_TYPE_TINYINT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, true)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid tinyint data", pToken->z);
} else if (!IS_VALID_TINYINT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "data overflow", pToken->z);
}
uint8_t tmpVal = (uint8_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_UTINYINT:{
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, false)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid unsigned tinyint data", pToken->z);
} else if (!IS_VALID_UTINYINT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "unsigned tinyint data overflow", pToken->z);
}
uint8_t tmpVal = (uint8_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_SMALLINT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, true)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid smallint data", pToken->z);
} else if (!IS_VALID_SMALLINT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "smallint data overflow", pToken->z);
}
int16_t tmpVal = (int16_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_USMALLINT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, false)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid unsigned smallint data", pToken->z);
} else if (!IS_VALID_USMALLINT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "unsigned smallint data overflow", pToken->z);
}
uint16_t tmpVal = (uint16_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_INT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, true)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid int data", pToken->z);
} else if (!IS_VALID_INT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "int data overflow", pToken->z);
}
int32_t tmpVal = (int32_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_UINT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, false)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid unsigned int data", pToken->z);
} else if (!IS_VALID_UINT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "unsigned int data overflow", pToken->z);
}
uint32_t tmpVal = (uint32_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_BIGINT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, true)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid bigint data", pToken->z);
} else if (!IS_VALID_BIGINT(iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "bigint data overflow", pToken->z);
}
return func(&iv, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_UBIGINT: {
if (TSDB_CODE_SUCCESS != toInt64(pToken->z, pToken->type, pToken->n, &iv, false)) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid unsigned bigint data", pToken->z);
} else if (!IS_VALID_UBIGINT((uint64_t)iv)) {
return buildSyntaxErrMsg(&pCxt->msg, "unsigned bigint data overflow", pToken->z);
}
uint64_t tmpVal = (uint64_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_FLOAT: {
double dv;
if (TK_ILLEGAL == toDouble(pToken, &dv, &endptr)) {
return buildSyntaxErrMsg(&pCxt->msg, "illegal float data", pToken->z);
}
if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || dv > FLT_MAX || dv < -FLT_MAX || isinf(dv) || isnan(dv)) {
return buildSyntaxErrMsg(&pCxt->msg, "illegal float data", pToken->z);
}
float tmpVal = (float)dv;
return func(&tmpVal, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_DOUBLE: {
double dv;
if (TK_ILLEGAL == toDouble(pToken, &dv, &endptr)) {
return buildSyntaxErrMsg(&pCxt->msg, "illegal double data", pToken->z);
}
if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || isinf(dv) || isnan(dv)) {
return buildSyntaxErrMsg(&pCxt->msg, "illegal double data", pToken->z);
}
return func(&dv, pSchema->bytes, param);
}
case TSDB_DATA_TYPE_BINARY: {
// too long values will return invalid sql, not be truncated automatically
if (pToken->n + VARSTR_HEADER_SIZE > pSchema->bytes) {
return buildSyntaxErrMsg(&pCxt->msg, "string data overflow", pToken->z);
}
return func(pToken->z, pToken->n, param);
}
case TSDB_DATA_TYPE_NCHAR: {
return func(pToken->z, pToken->n, param);
}
case TSDB_DATA_TYPE_TIMESTAMP: {
int64_t tmpVal;
if (parseTime(pCxt, pToken, timePrec, &tmpVal) != TSDB_CODE_SUCCESS) {
return buildSyntaxErrMsg(&pCxt->msg, "invalid timestamp", pToken->z);
}
return func(&tmpVal, pSchema->bytes, param);
}
}
return TSDB_CODE_FAILED;
}
//static FORCE_INLINE int32_t checkAndTrimValue(SToken* pToken, uint32_t type, char* tmpTokenBuf, SMsgBuf* pMsgBuf) {
// if ((type != TK_NOW && type != TK_INTEGER && type != TK_STRING && type != TK_FLOAT && type != TK_BOOL &&
// type != TK_NULL && type != TK_HEX && type != TK_OCT && type != TK_BIN) ||
// (pToken->n == 0) || (type == TK_RP)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid data or symbol", pToken->z);
// }
//
// if (IS_NUMERIC_TYPE(type) && pToken->n == 0) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid numeric data", pToken->z);
// }
//
// // Remove quotation marks
// if (TK_STRING == type) {
// if (pToken->n >= TSDB_MAX_BYTES_PER_ROW) {
// return buildSyntaxErrMsg(pMsgBuf, "too long string", pToken->z);
// }
//
// // delete escape character: \\, \', \"
// char delim = pToken->z[0];
// int32_t cnt = 0;
// int32_t j = 0;
// for (uint32_t k = 1; k < pToken->n - 1; ++k) {
// if (pToken->z[k] == '\\' || (pToken->z[k] == delim && pToken->z[k + 1] == delim)) {
// tmpTokenBuf[j] = pToken->z[k + 1];
// cnt++;
// j++;
// k++;
// continue;
// }
// tmpTokenBuf[j] = pToken->z[k];
// j++;
// }
//
// tmpTokenBuf[j] = 0;
// pToken->z = tmpTokenBuf;
// pToken->n -= 2 + cnt;
// }
//
// return TSDB_CODE_SUCCESS;
//}
//static FORCE_INLINE int32_t parseValueToken(char** end, SToken* pToken, SSchema* pSchema, int16_t timePrec, char* tmpTokenBuf, _row_append_fn_t func, void* param, SMsgBuf* pMsgBuf) {
// int64_t iv;
// char *endptr = NULL;
// bool isSigned = false;
//
// CHECK_CODE(checkAndTrimValue(pToken, pSchema->type, tmpTokenBuf, pMsgBuf));
//
// if (isNullStr(pToken)) {
// if (TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && PRIMARYKEY_TIMESTAMP_COL_ID == pSchema->colId) {
// int64_t tmpVal = 0;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// return func(getNullValue(pSchema->type), 0, param);
// }
//
// switch (pSchema->type) {
// case TSDB_DATA_TYPE_BOOL: {
// if ((pToken->type == TK_BOOL || pToken->type == TK_STRING) && (pToken->n != 0)) {
// if (strncmp(pToken->z, "true", pToken->n) == 0) {
// return func(&TRUE_VALUE, pSchema->bytes, param);
// } else if (strncmp(pToken->z, "false", pToken->n) == 0) {
// return func(&FALSE_VALUE, pSchema->bytes, param);
// } else {
// return buildSyntaxErrMsg(pMsgBuf, "invalid bool data", pToken->z);
// }
// } else if (pToken->type == TK_INTEGER) {
// return func(((strtoll(pToken->z, NULL, 10) == 0) ? &FALSE_VALUE : &TRUE_VALUE), pSchema->bytes, param);
// } else if (pToken->type == TK_FLOAT) {
// return func(((strtod(pToken->z, NULL) == 0) ? &FALSE_VALUE : &TRUE_VALUE), pSchema->bytes, param);
// } else {
// return buildSyntaxErrMsg(pMsgBuf, "invalid bool data", pToken->z);
// }
// }
//
// case TSDB_DATA_TYPE_TINYINT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid tinyint data", pToken->z);
// } else if (!IS_VALID_TINYINT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "tinyint data overflow", pToken->z);
// }
//
// uint8_t tmpVal = (uint8_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_UTINYINT:{
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned tinyint data", pToken->z);
// } else if (!IS_VALID_UTINYINT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "unsigned tinyint data overflow", pToken->z);
// }
// uint8_t tmpVal = (uint8_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_SMALLINT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid smallint data", pToken->z);
// } else if (!IS_VALID_SMALLINT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "smallint data overflow", pToken->z);
// }
// int16_t tmpVal = (int16_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_USMALLINT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned smallint data", pToken->z);
// } else if (!IS_VALID_USMALLINT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "unsigned smallint data overflow", pToken->z);
// }
// uint16_t tmpVal = (uint16_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_INT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid int data", pToken->z);
// } else if (!IS_VALID_INT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "int data overflow", pToken->z);
// }
// int32_t tmpVal = (int32_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_UINT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned int data", pToken->z);
// } else if (!IS_VALID_UINT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "unsigned int data overflow", pToken->z);
// }
// uint32_t tmpVal = (uint32_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_BIGINT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid bigint data", pToken->z);
// } else if (!IS_VALID_BIGINT(iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "bigint data overflow", pToken->z);
// }
// return func(&iv, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_UBIGINT: {
// if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned bigint data", pToken->z);
// } else if (!IS_VALID_UBIGINT((uint64_t)iv)) {
// return buildSyntaxErrMsg(pMsgBuf, "unsigned bigint data overflow", pToken->z);
// }
// uint64_t tmpVal = (uint64_t)iv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_FLOAT: {
// double dv;
// if (TK_ILLEGAL == toDouble(pToken, &dv, &endptr)) {
// return buildSyntaxErrMsg(pMsgBuf, "illegal float data", pToken->z);
// }
// if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || dv > FLT_MAX || dv < -FLT_MAX || isinf(dv) || isnan(dv)) {
// return buildSyntaxErrMsg(pMsgBuf, "illegal float data", pToken->z);
// }
// float tmpVal = (float)dv;
// return func(&tmpVal, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_DOUBLE: {
// double dv;
// if (TK_ILLEGAL == toDouble(pToken, &dv, &endptr)) {
// return buildSyntaxErrMsg(pMsgBuf, "illegal double data", pToken->z);
// }
// if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || isinf(dv) || isnan(dv)) {
// return buildSyntaxErrMsg(pMsgBuf, "illegal double data", pToken->z);
// }
// return func(&dv, pSchema->bytes, param);
// }
//
// case TSDB_DATA_TYPE_BINARY: {
// // too long values will return invalid sql, not be truncated automatically
// if (pToken->n + VARSTR_HEADER_SIZE > pSchema->bytes) {
// return buildSyntaxErrMsg(pMsgBuf, "string data overflow", pToken->z);
// }
// return func(pToken->z, pToken->n, param);
// }
// case TSDB_DATA_TYPE_NCHAR: {
// return func(pToken->z, pToken->n, param);
// }
// case TSDB_DATA_TYPE_TIMESTAMP: {
// int64_t tmpVal;
// if (parseTime(end, pToken, timePrec, &tmpVal, pMsgBuf) != TSDB_CODE_SUCCESS) {
// return buildSyntaxErrMsg(pMsgBuf, "invalid timestamp", pToken->z);
// }
// return func(&tmpVal, pSchema->bytes, param);
// }
// }
//
// return TSDB_CODE_FAILED;
//}
// pSql -> tag1_name, ...)
static int32_t parseBoundColumns(SInsertParseContext* pCxt, SParsedDataColInfo* pColList, SSchema* pSchema) {
......@@ -644,7 +625,7 @@ static int32_t parseTagsClause(SInsertParseContext* pCxt, SSchema* pTagsSchema,
NEXT_TOKEN(pCxt->pSql, sToken);
SSchema* pSchema = &pTagsSchema[pCxt->tags.boundedColumns[i]];
param.schema = pSchema;
CHECK_CODE(parseOneValue(pCxt, &sToken, pSchema, precision, tmpTokenBuf, KvRowAppend, &param));
CHECK_CODE(parseValueToken(&pCxt->pSql, &sToken, pSchema, precision, tmpTokenBuf, KvRowAppend, &param, &pCxt->msg));
}
SKVRow row = tdGetKVRowFromBuilder(&pCxt->tagsBuilder);
......@@ -709,7 +690,7 @@ static int parseOneRow(SInsertParseContext* pCxt, STableDataBlocks* pDataBlocks,
param.schema = pSchema;
param.compareStat = pBuilder->compareStat;
getMemRowAppendInfo(schema, pBuilder->memRowType, spd, i, &param.toffset);
CHECK_CODE(parseOneValue(pCxt, &sToken, pSchema, timePrec, tmpTokenBuf, MemRowAppend, &param));
CHECK_CODE(parseValueToken(&pCxt->pSql, &sToken, pSchema, timePrec, tmpTokenBuf, MemRowAppend, &param, &pCxt->msg));
if (PRIMARYKEY_TIMESTAMP_COL_ID == pSchema->colId) {
TSKEY tsKey = memRowKey(row);
......@@ -894,7 +875,7 @@ static int32_t parseInsertBody(SInsertParseContext* pCxt) {
int32_t parseInsertSql(SParseContext* pContext, SInsertStmtInfo** pInfo) {
SInsertParseContext context = {
.pComCxt = pContext,
.pSql = pContext->pSql,
.pSql = (char*) pContext->pSql,
.msg = {.buf = pContext->pMsg, .len = pContext->msgLen},
.pTableMeta = NULL,
.pVgroupsHashObj = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, false),
......
source/libs/parser/src/parserUtil.c
浏览文件 @ 240a5309
......@@ -13,19 +13,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "tmsg.h"
#include "parserUtil.h"
#include <tglobal.h>
#include <ttime.h>
#include "function.h"
#include "parser.h"
#include "parserInt.h"
#include "queryInfoUtil.h"
#include "taoserror.h"
#include "tutil.h"
#include "ttypes.h"
#include "thash.h"
#include "tbuffer.h"
#include "parserInt.h"
#include "parserUtil.h"
#include "thash.h"
#include "tmsg.h"
#include "tmsgtype.h"
#include "queryInfoUtil.h"
#include "function.h"
#include "ttypes.h"
#include "tutil.h"
typedef struct STableFilterCond {
uint64_t uid;
......@@ -1627,313 +1628,357 @@ bool isDqlSqlStatement(SSqlInfo* pSqlInfo) {
return pSqlInfo->type == TSDB_SQL_SELECT;
}
#if 0
int32_t tscCreateQueryFromQueryInfo(SQueryStmtInfo* pQueryInfo, SQueryAttr* pQueryAttr, void* addr) {
memset(pQueryAttr, 0, sizeof(SQueryAttr));
int16_t numOfCols = (int16_t) taosArrayGetSize(pQueryInfo->colList);
int16_t numOfOutput = (int16_t) getNumOfExprs(pQueryInfo);
pQueryAttr->topBotQuery = tscIsTopBotQuery(pQueryInfo);
pQueryAttr->hasTagResults = hasTagValOutput(pQueryInfo);
pQueryAttr->stabledev = isStabledev(pQueryInfo);
pQueryAttr->tsCompQuery = isTsCompQuery(pQueryInfo);
pQueryAttr->diffQuery = tscIsDiffDerivQuery(pQueryInfo);
pQueryAttr->simpleAgg = isSimpleAggregateRv(pQueryInfo);
pQueryAttr->needReverseScan = tscNeedReverseScan(pQueryInfo);
pQueryAttr->stableQuery = QUERY_IS_STABLE_QUERY(pQueryInfo->type);
pQueryAttr->groupbyColumn = (!pQueryInfo->stateWindow) && tscGroupbyColumn(pQueryInfo);
pQueryAttr->queryBlockDist = isBlockDistQuery(pQueryInfo);
pQueryAttr->pointInterpQuery = tscIsPointInterpQuery(pQueryInfo);
pQueryAttr->timeWindowInterpo = timeWindowInterpoRequired(pQueryInfo);
pQueryAttr->distinct = pQueryInfo->distinct;
pQueryAttr->sw = pQueryInfo->sessionWindow;
pQueryAttr->stateWindow = pQueryInfo->stateWindow;
pQueryAttr->multigroupResult = pQueryInfo->multigroupResult;
pQueryAttr->numOfCols = numOfCols;
pQueryAttr->numOfOutput = numOfOutput;
pQueryAttr->limit = pQueryInfo->limit;
pQueryAttr->slimit = pQueryInfo->slimit;
pQueryAttr->order = pQueryInfo->order;
pQueryAttr->fillType = pQueryInfo->fillType;
pQueryAttr->havingNum = pQueryInfo->havingFieldNum;
pQueryAttr->pUdfInfo = pQueryInfo->pUdfInfo;
if (pQueryInfo->order.order == TSDB_ORDER_ASC) { // TODO refactor
pQueryAttr->window = pQueryInfo->window;
} else {
pQueryAttr->window.skey = pQueryInfo->window.ekey;
pQueryAttr->window.ekey = pQueryInfo->window.skey;
static uint8_t TRUE_VALUE = (uint8_t)TSDB_TRUE;
static uint8_t FALSE_VALUE = (uint8_t)TSDB_FALSE;
static FORCE_INLINE int32_t toDouble(SToken *pToken, double *value, char **endPtr) {
errno = 0;
*value = strtold(pToken->z, endPtr);
// not a valid integer number, return error
if ((*endPtr - pToken->z) != pToken->n) {
return TK_ILLEGAL;
}
memcpy(&pQueryAttr->interval, &pQueryInfo->interval, sizeof(pQueryAttr->interval));
return pToken->type;
}
STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[0];
static bool isNullStr(SToken *pToken) {
return (pToken->type == TK_NULL) || ((pToken->type == TK_STRING) && (pToken->n != 0) &&
(strncasecmp(TSDB_DATA_NULL_STR_L, pToken->z, pToken->n) == 0));
}
if (pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
pQueryAttr->pGroupbyExpr = calloc(1, sizeof(SGroupbyExpr));
*(pQueryAttr->pGroupbyExpr) = pQueryInfo->groupbyExpr;
pQueryAttr->pGroupbyExpr->columnInfo = taosArrayDup(pQueryInfo->groupbyExpr.columnInfo);
} else {
assert(pQueryInfo->groupbyExpr.columnInfo == NULL);
static FORCE_INLINE int32_t checkAndTrimValue(SToken* pToken, uint32_t type, char* tmpTokenBuf, SMsgBuf* pMsgBuf) {
if ((type != TK_NOW && type != TK_INTEGER && type != TK_STRING && type != TK_FLOAT && type != TK_BOOL &&
type != TK_NULL && type != TK_HEX && type != TK_OCT && type != TK_BIN) ||
(pToken->n == 0) || (type == TK_RP)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid data or symbol", pToken->z);
}
pQueryAttr->pExpr1 = calloc(pQueryAttr->numOfOutput, sizeof(SExprInfo));
for(int32_t i = 0; i < pQueryAttr->numOfOutput; ++i) {
SExprInfo* pExpr = getExprInfo(pQueryInfo, i);
ExprInfoCopy(&pQueryAttr->pExpr1[i], pExpr);
if (IS_NUMERIC_TYPE(type) && pToken->n == 0) {
return buildSyntaxErrMsg(pMsgBuf, "invalid numeric data", pToken->z);
}
if (pQueryAttr->pExpr1[i].base.functionId == FUNCTION_ARITHM) {
for (int32_t j = 0; j < pQueryAttr->pExpr1[i].base.numOfParams; ++j) {
buildArithmeticExprFromMsg(&pQueryAttr->pExpr1[i], NULL);
// Remove quotation marks
if (TK_STRING == type) {
if (pToken->n >= TSDB_MAX_BYTES_PER_ROW) {
return buildSyntaxErrMsg(pMsgBuf, "too long string", pToken->z);
}
// delete escape character: \\, \', \"
char delim = pToken->z[0];
int32_t cnt = 0;
int32_t j = 0;
for (uint32_t k = 1; k < pToken->n - 1; ++k) {
if (pToken->z[k] == '\\' || (pToken->z[k] == delim && pToken->z[k + 1] == delim)) {
tmpTokenBuf[j] = pToken->z[k + 1];
cnt++;
j++;
k++;
continue;
}
tmpTokenBuf[j] = pToken->z[k];
j++;
}
pQueryAttr->tableCols = calloc(numOfCols, sizeof(SColumnInfo));
for(int32_t i = 0; i < numOfCols; ++i) {
SColumn* pCol = taosArrayGetP(pQueryInfo->colList, i);
if (!isValidDataType(pCol->info.type) || pCol->info.type == TSDB_DATA_TYPE_NULL) {
assert(0);
tmpTokenBuf[j] = 0;
pToken->z = tmpTokenBuf;
pToken->n -= 2 + cnt;
}
pQueryAttr->tableCols[i] = pCol->info;
pQueryAttr->tableCols[i].flist.filterInfo = tFilterInfoDup(pCol->info.flist.filterInfo, pQueryAttr->tableCols[i].flist.numOfFilters);
}
return TSDB_CODE_SUCCESS;
}
// global aggregate query
if (pQueryAttr->stableQuery && (pQueryAttr->simpleAgg || pQueryAttr->interval.interval > 0) && tscIsTwoStageSTableQuery(pQueryInfo, 0)) {
createGlobalAggregateExpr(pQueryAttr, pQueryInfo);
}
static int parseTime(char **end, SToken *pToken, int16_t timePrec, int64_t *time, SMsgBuf* pMsgBuf) {
int32_t index = 0;
SToken sToken;
int64_t interval;
int64_t ts = 0;
char* pTokenEnd = *end;
// for simple table, not for super table
if (pQueryInfo->arithmeticOnAgg) {
pQueryAttr->numOfExpr2 = (int32_t) taosArrayGetSize(pQueryInfo->exprList1);
pQueryAttr->pExpr2 = calloc(pQueryAttr->numOfExpr2, sizeof(SExprInfo));
for(int32_t i = 0; i < pQueryAttr->numOfExpr2; ++i) {
SExprInfo* p = taosArrayGetP(pQueryInfo->exprList1, i);
ExprInfoCopy(&pQueryAttr->pExpr2[i], p);
}
if (pToken->type == TK_NOW) {
ts = taosGetTimestamp(timePrec);
} else if (pToken->type == TK_INTEGER) {
bool isSigned = false;
toInteger(pToken->z, pToken->n, 10, &ts, &isSigned);
} else { // parse the RFC-3339/ISO-8601 timestamp format string
if (taosParseTime(pToken->z, time, pToken->n, timePrec, tsDaylight) != TSDB_CODE_SUCCESS) {
return buildSyntaxErrMsg(pMsgBuf, "invalid timestamp format", pToken->z);
}
// tag column info
int32_t code = createTagColumnInfo(pQueryAttr, pQueryInfo, pTableMetaInfo);
if (code != TSDB_CODE_SUCCESS) {
return code;
return TSDB_CODE_SUCCESS;
}
if (pQueryAttr->fillType != TSDB_FILL_NONE) {
pQueryAttr->fillVal = calloc(pQueryAttr->numOfOutput, sizeof(int64_t));
memcpy(pQueryAttr->fillVal, pQueryInfo->fillVal, pQueryInfo->numOfFillVal * sizeof(int64_t));
for (int k = pToken->n; pToken->z[k] != '\0'; k++) {
if (pToken->z[k] == ' ' || pToken->z[k] == '\t') continue;
if (pToken->z[k] == ',') {
*end = pTokenEnd;
*time = ts;
return 0;
}
pQueryAttr->srcRowSize = 0;
pQueryAttr->maxTableColumnWidth = 0;
for (int16_t i = 0; i < numOfCols; ++i) {
pQueryAttr->srcRowSize += pQueryAttr->tableCols[i].bytes;
if (pQueryAttr->maxTableColumnWidth < pQueryAttr->tableCols[i].bytes) {
pQueryAttr->maxTableColumnWidth = pQueryAttr->tableCols[i].bytes;
}
break;
}
pQueryAttr->interBufSize = getOutputInterResultBufSize(pQueryAttr);
/*
* time expression:
* e.g., now+12a, now-5h
*/
SToken valueToken;
index = 0;
sToken = tStrGetToken(pTokenEnd, &index, false);
pTokenEnd += index;
if (pQueryAttr->numOfCols <= 0 && !tscQueryTags(pQueryInfo) && !pQueryAttr->queryBlockDist) {
tscError("%p illegal value of numOfCols in query msg: %" PRIu64 ", table cols:%d", addr,
(uint64_t)pQueryAttr->numOfCols, numOfCols);
if (sToken.type == TK_MINUS || sToken.type == TK_PLUS) {
index = 0;
valueToken = tStrGetToken(pTokenEnd, &index, false);
pTokenEnd += index;
return TSDB_CODE_TSC_INVALID_OPERATION;
if (valueToken.n < 2) {
return buildSyntaxErrMsg(pMsgBuf, "value expected in timestamp", sToken.z);
}
if (pQueryAttr->interval.interval < 0) {
tscError("%p illegal value of aggregation time interval in query msg: %" PRId64, addr,
(int64_t)pQueryInfo->interval.interval);
char unit = 0;
if (parseAbsoluteDuration(valueToken.z, valueToken.n, &interval, &unit, timePrec) != TSDB_CODE_SUCCESS) {
return TSDB_CODE_TSC_INVALID_OPERATION;
}
if (pQueryAttr->pGroupbyExpr != NULL && pQueryAttr->pGroupbyExpr->numOfGroupCols < 0) {
tscError("%p illegal value of numOfGroupCols in query msg: %d", addr, pQueryInfo->groupbyExpr.numOfGroupCols);
return TSDB_CODE_TSC_INVALID_OPERATION;
if (sToken.type == TK_PLUS) {
ts += interval;
} else {
ts = ts - interval;
}
*end = pTokenEnd;
}
*time = ts;
return TSDB_CODE_SUCCESS;
}
static int32_t doAddTableName(char* nextStr, char** str, SArray* pNameArray, SSqlObj* pSql) {
int32_t code = TSDB_CODE_SUCCESS;
SSqlCmd* pCmd = &pSql->cmd;
int32_t parseValueToken(char** end, SToken* pToken, SSchema* pSchema, int16_t timePrec, char* tmpTokenBuf, _row_append_fn_t func, void* param, SMsgBuf* pMsgBuf) {
int64_t iv;
char *endptr = NULL;
bool isSigned = false;
char tablename[TSDB_TABLE_FNAME_LEN] = {0};
int32_t len = 0;
if (nextStr == NULL) {
tstrncpy(tablename, *str, TSDB_TABLE_FNAME_LEN);
len = (int32_t) strlen(tablename);
} else {
len = (int32_t)(nextStr - (*str));
if (len >= TSDB_TABLE_NAME_LEN) {
sprintf(pCmd->payload, "table name too long");
return TSDB_CODE_TSC_INVALID_OPERATION;
int32_t code = checkAndTrimValue(pToken, pSchema->type, tmpTokenBuf, pMsgBuf);
if (code != TSDB_CODE_SUCCESS) {
return code;
}
memcpy(tablename, *str, nextStr - (*str));
tablename[len] = '\0';
if (isNullStr(pToken)) {
if (TSDB_DATA_TYPE_TIMESTAMP == pSchema->type && PRIMARYKEY_TIMESTAMP_COL_ID == pSchema->colId) {
int64_t tmpVal = 0;
return func(&tmpVal, pSchema->bytes, param);
}
(*str) = nextStr + 1;
len = (int32_t)strtrim(tablename);
SToken sToken = {.n = len, .type = TK_ID, .z = tablename};
tGetToken(tablename, &sToken.type);
// Check if the table name available or not
if (tscValidateName(&sToken) != TSDB_CODE_SUCCESS) {
sprintf(pCmd->payload, "table name is invalid");
return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
return func(getNullValue(pSchema->type), 0, param);
}
SName name = {0};
if ((code = tscSetTableFullName(&name, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
return code;
switch (pSchema->type) {
case TSDB_DATA_TYPE_BOOL: {
if ((pToken->type == TK_BOOL || pToken->type == TK_STRING) && (pToken->n != 0)) {
if (strncmp(pToken->z, "true", pToken->n) == 0) {
return func(&TRUE_VALUE, pSchema->bytes, param);
} else if (strncmp(pToken->z, "false", pToken->n) == 0) {
return func(&FALSE_VALUE, pSchema->bytes, param);
} else {
return buildSyntaxErrMsg(pMsgBuf, "invalid bool data", pToken->z);
}
memset(tablename, 0, tListLen(tablename));
tNameExtractFullName(&name, tablename);
char* p = strdup(tablename);
taosArrayPush(pNameArray, &p);
return TSDB_CODE_SUCCESS;
}
int32_t nameComparFn(const void* n1, const void* n2) {
int32_t ret = strcmp(*(char**)n1, *(char**)n2);
if (ret == 0) {
return 0;
} else if (pToken->type == TK_INTEGER) {
return func(((strtoll(pToken->z, NULL, 10) == 0) ? &FALSE_VALUE : &TRUE_VALUE), pSchema->bytes, param);
} else if (pToken->type == TK_FLOAT) {
return func(((strtod(pToken->z, NULL) == 0) ? &FALSE_VALUE : &TRUE_VALUE), pSchema->bytes, param);
} else {
return ret > 0? 1:-1;
return buildSyntaxErrMsg(pMsgBuf, "invalid bool data", pToken->z);
}
}
}
static void freeContent(void* p) {
char* ptr = *(char**)p;
tfree(ptr);
}
case TSDB_DATA_TYPE_TINYINT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid tinyint data", pToken->z);
} else if (!IS_VALID_TINYINT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "tinyint data overflow", pToken->z);
}
uint8_t tmpVal = (uint8_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
int tscTransferTableNameList(SSqlObj *pSql, const char *pNameList, int32_t length, SArray* pNameArray) {
SSqlCmd *pCmd = &pSql->cmd;
case TSDB_DATA_TYPE_UTINYINT:{
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned tinyint data", pToken->z);
} else if (!IS_VALID_UTINYINT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "unsigned tinyint data overflow", pToken->z);
}
uint8_t tmpVal = (uint8_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
pCmd->command = TSDB_SQL_MULTI_META;
pCmd->msgType = TDMT_VND_TABLES_META;
case TSDB_DATA_TYPE_SMALLINT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid smallint data", pToken->z);
} else if (!IS_VALID_SMALLINT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "smallint data overflow", pToken->z);
}
int16_t tmpVal = (int16_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
int code = TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
char *str = (char *)pNameList;
case TSDB_DATA_TYPE_USMALLINT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned smallint data", pToken->z);
} else if (!IS_VALID_USMALLINT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "unsigned smallint data overflow", pToken->z);
}
uint16_t tmpVal = (uint16_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
SQueryStmtInfo *pQueryInfo = tscGetQueryInfoS(pCmd);
if (pQueryInfo == NULL) {
pSql->res.code = terrno;
return terrno;
case TSDB_DATA_TYPE_INT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid int data", pToken->z);
} else if (!IS_VALID_INT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "int data overflow", pToken->z);
}
int32_t tmpVal = (int32_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
char *nextStr;
while (1) {
nextStr = strchr(str, ',');
if (nextStr == NULL) {
code = doAddTableName(nextStr, &str, pNameArray, pSql);
break;
case TSDB_DATA_TYPE_UINT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned int data", pToken->z);
} else if (!IS_VALID_UINT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "unsigned int data overflow", pToken->z);
}
uint32_t tmpVal = (uint32_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
code = doAddTableName(nextStr, &str, pNameArray, pSql);
if (code != TSDB_CODE_SUCCESS) {
return code;
case TSDB_DATA_TYPE_BIGINT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid bigint data", pToken->z);
} else if (!IS_VALID_BIGINT(iv)) {
return buildSyntaxErrMsg(pMsgBuf, "bigint data overflow", pToken->z);
}
return func(&iv, pSchema->bytes, param);
}
if (taosArrayGetSize(pNameArray) > TSDB_MULTI_TABLEMETA_MAX_NUM) {
code = TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
sprintf(pCmd->payload, "tables over the max number");
return code;
case TSDB_DATA_TYPE_UBIGINT: {
if (TSDB_CODE_SUCCESS != toInteger(pToken->z, pToken->n, pToken->type, &iv, &isSigned)) {
return buildSyntaxErrMsg(pMsgBuf, "invalid unsigned bigint data", pToken->z);
} else if (!IS_VALID_UBIGINT((uint64_t)iv)) {
return buildSyntaxErrMsg(pMsgBuf, "unsigned bigint data overflow", pToken->z);
}
uint64_t tmpVal = (uint64_t)iv;
return func(&tmpVal, pSchema->bytes, param);
}
size_t len = taosArrayGetSize(pNameArray);
if (len == 1) {
return TSDB_CODE_SUCCESS;
case TSDB_DATA_TYPE_FLOAT: {
double dv;
if (TK_ILLEGAL == toDouble(pToken, &dv, &endptr)) {
return buildSyntaxErrMsg(pMsgBuf, "illegal float data", pToken->z);
}
if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || dv > FLT_MAX || dv < -FLT_MAX || isinf(dv) || isnan(dv)) {
return buildSyntaxErrMsg(pMsgBuf, "illegal float data", pToken->z);
}
float tmpVal = (float)dv;
return func(&tmpVal, pSchema->bytes, param);
}
if (len > TSDB_MULTI_TABLEMETA_MAX_NUM) {
code = TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH;
sprintf(pCmd->payload, "tables over the max number");
return code;
case TSDB_DATA_TYPE_DOUBLE: {
double dv;
if (TK_ILLEGAL == toDouble(pToken, &dv, &endptr)) {
return buildSyntaxErrMsg(pMsgBuf, "illegal double data", pToken->z);
}
if (((dv == HUGE_VAL || dv == -HUGE_VAL) && errno == ERANGE) || isinf(dv) || isnan(dv)) {
return buildSyntaxErrMsg(pMsgBuf, "illegal double data", pToken->z);
}
return func(&dv, pSchema->bytes, param);
}
taosArraySort(pNameArray, nameComparFn);
taosArrayRemoveDuplicate(pNameArray, nameComparFn, freeContent);
return TSDB_CODE_SUCCESS;
}
case TSDB_DATA_TYPE_BINARY: {
// Too long values will raise the invalid sql error message
if (pToken->n + VARSTR_HEADER_SIZE > pSchema->bytes) {
return buildSyntaxErrMsg(pMsgBuf, "string data overflow", pToken->z);
}
bool vgroupInfoIdentical(SNewVgroupInfo *pExisted, SVgroupMsg* src) {
assert(pExisted != NULL && src != NULL);
if (pExisted->numOfEps != src->numOfEps) {
return false;
return func(pToken->z, pToken->n, param);
}
for(int32_t i = 0; i < pExisted->numOfEps; ++i) {
if (pExisted->ep[i].port != src->epAddr[i].port) {
return false;
case TSDB_DATA_TYPE_NCHAR: {
return func(pToken->z, pToken->n, param);
}
if (strncmp(pExisted->ep[i].fqdn, src->epAddr[i].fqdn, tListLen(pExisted->ep[i].fqdn)) != 0) {
return false;
case TSDB_DATA_TYPE_TIMESTAMP: {
int64_t tmpVal;
if (parseTime(end, pToken, timePrec, &tmpVal, pMsgBuf) != TSDB_CODE_SUCCESS) {
return buildSyntaxErrMsg(pMsgBuf, "invalid timestamp", pToken->z);
}
return func(&tmpVal, pSchema->bytes, param);
}
}
return true;
return TSDB_CODE_FAILED;
}
SNewVgroupInfo createNewVgroupInfo(SVgroupMsg *pVgroupMsg) {
assert(pVgroupMsg != NULL);
int32_t KvRowAppend(const void *value, int32_t len, void *param) {
SKvParam* pa = (SKvParam*) param;
SNewVgroupInfo info = {0};
info.numOfEps = pVgroupMsg->numOfEps;
info.vgId = pVgroupMsg->vgId;
info.inUse = 0; // 0 is the default value of inUse in case of multiple replica
int32_t type = pa->schema->type;
int32_t colId = pa->schema->colId;
assert(info.numOfEps >= 1 && info.vgId >= 1);
for(int32_t i = 0; i < pVgroupMsg->numOfEps; ++i) {
tstrncpy(info.ep[i].fqdn, pVgroupMsg->epAddr[i].fqdn, TSDB_FQDN_LEN);
info.ep[i].port = pVgroupMsg->epAddr[i].port;
if (TSDB_DATA_TYPE_BINARY == type) {
STR_WITH_SIZE_TO_VARSTR(pa->buf, value, len);
tdAddColToKVRow(pa->builder, colId, type, pa->buf);
} else if (TSDB_DATA_TYPE_NCHAR == type) {
// if the converted output len is over than pColumnModel->bytes, return error: 'Argument list too long'
int32_t output = 0;
if (!taosMbsToUcs4(value, len, varDataVal(pa->buf), pa->schema->bytes - VARSTR_HEADER_SIZE, &output)) {
return TSDB_CODE_TSC_SQL_SYNTAX_ERROR;
}
return info;
varDataSetLen(pa->buf, output);
tdAddColToKVRow(pa->builder, colId, type, pa->buf);
} else {
tdAddColToKVRow(pa->builder, colId, type, value);
}
return TSDB_CODE_SUCCESS;
}
char* cloneCurrentDBName(SSqlObj* pSql) {
char *p = NULL;
HttpContext *pCtx = NULL;
int32_t createSName(SName* pName, SToken* pTableName, SParseBasicCtx* pParseCtx, SMsgBuf* pMsgBuf) {
const char* msg1 = "name too long";
pthread_mutex_lock(&pSql->pTscObj->mutex);
STscObj *pTscObj = pSql->pTscObj;
switch (pTscObj->from) {
case TAOS_REQ_FROM_HTTP:
pCtx = pSql->param;
if (pCtx && pCtx->db[0] != '\0') {
char db[TSDB_DB_FNAME_LEN] = {0};
int32_t len = sprintf(db, "%s%s%s", pTscObj->acctId, TS_PATH_DELIMITER, pCtx->db);
assert(len <= sizeof(db));
int32_t code = TSDB_CODE_SUCCESS;
char* p = strnchr(pTableName->z, TS_PATH_DELIMITER[0], pTableName->n, false);
if (p != NULL) { // db has been specified in sql string so we ignore current db path
tNameSetAcctId(pName, pParseCtx->acctId);
p = strdup(db);
char name[TSDB_TABLE_FNAME_LEN] = {0};
strncpy(name, pTableName->z, pTableName->n);
code = tNameFromString(pName, name, T_NAME_DB|T_NAME_TABLE);
if (code != 0) {
return buildInvalidOperationMsg(pMsgBuf, msg1);
}
break;
default:
break;
} else { // get current DB name first, and then set it into path
if (pTableName->n >= TSDB_TABLE_NAME_LEN) {
return buildInvalidOperationMsg(pMsgBuf, msg1);
}
tNameSetDbName(pName, pParseCtx->acctId, pParseCtx->db, strlen(pParseCtx->db));
char name[TSDB_TABLE_FNAME_LEN] = {0};
strncpy(name, pTableName->z, pTableName->n);
code = tNameFromString(pName, name, T_NAME_TABLE);
if (code != 0) {
code = buildInvalidOperationMsg(pMsgBuf, msg1);
}
if (p == NULL) {
p = strdup(pSql->pTscObj->db);
}
pthread_mutex_unlock(&pSql->pTscObj->mutex);
return p;
return code;
}
#endif
\ No newline at end of file
source/libs/parser/src/sql.c
浏览文件 @ 240a5309
......@@ -97,30 +97,30 @@
#endif
/************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int
#define YYNOCODE 273
#define YYNOCODE 274
#define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SToken
typedef union {
int yyinit;
ParseTOKENTYPE yy0;
SSqlNode* yy24;
int yy60;
SSubclause* yy129;
SIntervalVal yy136;
int64_t yy157;
SCreateAcctInfo yy171;
SSessionWindowVal yy251;
SCreateDbInfo yy254;
SWindowStateVal yy256;
SField yy280;
SRelationInfo* yy292;
tSqlExpr* yy370;
SArray* yy413;
SCreateTableSql* yy438;
SVariant yy461;
SLimit yy503;
int32_t yy516;
SCreatedTableInfo yy544;
SWindowStateVal yy6;
SRelationInfo* yy10;
SCreateDbInfo yy16;
int32_t yy46;
int yy47;
SSessionWindowVal yy97;
SField yy106;
SCreatedTableInfo yy150;
SArray* yy165;
tSqlExpr* yy202;
int64_t yy207;
SCreateAcctInfo yy211;
SSqlNode* yy278;
SCreateTableSql* yy326;
SLimit yy367;
SVariant yy425;
SSubclause* yy503;
SIntervalVal yy532;
} YYMINORTYPE;
#ifndef YYSTACKDEPTH
#define YYSTACKDEPTH 100
......@@ -130,17 +130,17 @@ typedef union {
#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo
#define ParseARG_STORE yypParser->pInfo = pInfo
#define YYFALLBACK 1
#define YYNSTATE 365
#define YYNRULE 301
#define YYNSTATE 366
#define YYNRULE 303
#define YYNTOKEN 191
#define YY_MAX_SHIFT 364
#define YY_MIN_SHIFTREDUCE 584
#define YY_MAX_SHIFTREDUCE 884
#define YY_ERROR_ACTION 885
#define YY_ACCEPT_ACTION 886
#define YY_NO_ACTION 887
#define YY_MIN_REDUCE 888
#define YY_MAX_REDUCE 1188
#define YY_MAX_SHIFT 365
#define YY_MIN_SHIFTREDUCE 587
#define YY_MAX_SHIFTREDUCE 889
#define YY_ERROR_ACTION 890
#define YY_ACCEPT_ACTION 891
#define YY_NO_ACTION 892
#define YY_MIN_REDUCE 893
#define YY_MAX_REDUCE 1195
/************* End control #defines *******************************************/
/* Define the yytestcase() macro to be a no-op if is not already defined
......@@ -206,292 +206,294 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
#define YY_ACTTAB_COUNT (779)
#define YY_ACTTAB_COUNT (782)
static const YYACTIONTYPE yy_action[] = {
/* 0 */ 1073, 635, 155, 363, 230, 636, 671, 55, 56, 635,
/* 10 */ 59, 60, 1032, 636, 252, 49, 48, 47, 162, 58,
/* 20 */ 322, 63, 61, 64, 62, 236, 1050, 242, 206, 54,
/* 30 */ 53, 1038, 635, 52, 51, 50, 636, 55, 56, 1164,
/* 40 */ 59, 60, 936, 1063, 252, 49, 48, 47, 188, 58,
/* 50 */ 322, 63, 61, 64, 62, 1010, 243, 1008, 1009, 54,
/* 60 */ 53, 233, 1011, 52, 51, 50, 1012, 1070, 1013, 1014,
/* 70 */ 280, 279, 947, 55, 56, 246, 59, 60, 188, 1038,
/* 80 */ 252, 49, 48, 47, 81, 58, 322, 63, 61, 64,
/* 90 */ 62, 320, 1112, 99, 292, 54, 53, 352, 635, 52,
/* 100 */ 51, 50, 636, 55, 57, 261, 59, 60, 318, 821,
/* 110 */ 252, 49, 48, 47, 176, 58, 322, 63, 61, 64,
/* 120 */ 62, 42, 249, 358, 357, 54, 53, 1026, 356, 52,
/* 130 */ 51, 50, 355, 87, 354, 353, 886, 364, 585, 586,
/* 140 */ 587, 588, 589, 590, 591, 592, 593, 594, 595, 596,
/* 150 */ 597, 598, 153, 56, 231, 59, 60, 767, 1063, 252,
/* 160 */ 49, 48, 47, 171, 58, 322, 63, 61, 64, 62,
/* 170 */ 162, 43, 1024, 86, 54, 53, 234, 21, 52, 51,
/* 180 */ 50, 282, 206, 1063, 635, 59, 60, 203, 636, 252,
/* 190 */ 49, 48, 47, 1165, 58, 322, 63, 61, 64, 62,
/* 200 */ 162, 274, 827, 830, 54, 53, 786, 787, 52, 51,
/* 210 */ 50, 36, 42, 316, 358, 357, 315, 314, 313, 356,
/* 220 */ 312, 311, 310, 355, 309, 354, 353, 1004, 992, 993,
/* 230 */ 994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003,
/* 240 */ 1005, 1006, 294, 771, 92, 22, 63, 61, 64, 62,
/* 250 */ 826, 829, 318, 232, 54, 53, 204, 1035, 52, 51,
/* 260 */ 50, 27, 215, 36, 251, 836, 825, 828, 831, 216,
/* 270 */ 750, 747, 748, 749, 1111, 137, 136, 135, 217, 162,
/* 280 */ 266, 255, 327, 87, 251, 836, 825, 828, 831, 270,
/* 290 */ 269, 96, 228, 229, 261, 261, 323, 257, 258, 742,
/* 300 */ 739, 740, 741, 177, 1036, 240, 3, 39, 178, 1035,
/* 310 */ 260, 209, 228, 229, 105, 77, 101, 108, 250, 248,
/* 320 */ 834, 43, 1021, 1022, 33, 1025, 244, 245, 197, 195,
/* 330 */ 193, 52, 51, 50, 305, 192, 141, 140, 139, 138,
/* 340 */ 4, 65, 253, 273, 80, 79, 122, 116, 126, 152,
/* 350 */ 150, 149, 224, 93, 36, 131, 134, 125, 256, 36,
/* 360 */ 254, 65, 330, 329, 128, 54, 53, 714, 835, 52,
/* 370 */ 51, 50, 87, 36, 36, 36, 1023, 837, 832, 206,
/* 380 */ 36, 36, 751, 752, 833, 36, 36, 262, 36, 259,
/* 390 */ 1165, 337, 336, 342, 341, 803, 241, 837, 832, 764,
/* 400 */ 1035, 331, 206, 12, 833, 1035, 84, 85, 937, 95,
/* 410 */ 43, 743, 744, 1165, 188, 332, 333, 334, 324, 1035,
/* 420 */ 1035, 1035, 338, 339, 7, 124, 1035, 1035, 340, 94,
/* 430 */ 344, 1034, 1035, 275, 1035, 362, 361, 146, 98, 352,
/* 440 */ 359, 974, 783, 82, 70, 70, 793, 794, 71, 37,
/* 450 */ 724, 74, 297, 802, 726, 299, 737, 738, 157, 735,
/* 460 */ 736, 725, 66, 24, 32, 823, 37, 859, 37, 838,
/* 470 */ 67, 97, 634, 14, 115, 13, 114, 67, 78, 16,
/* 480 */ 18, 15, 17, 23, 121, 23, 120, 210, 23, 72,
/* 490 */ 75, 211, 755, 756, 753, 754, 1159, 824, 300, 20,
/* 500 */ 1158, 19, 133, 132, 1157, 226, 1037, 1049, 1065, 227,
/* 510 */ 207, 713, 208, 212, 205, 213, 214, 219, 220, 221,
/* 520 */ 218, 202, 1184, 840, 1176, 44, 1122, 1121, 321, 271,
/* 530 */ 238, 1118, 1117, 239, 343, 154, 1104, 1072, 1083, 1080,
/* 540 */ 1081, 1085, 156, 161, 1064, 277, 288, 1103, 1033, 173,
/* 550 */ 151, 281, 172, 1031, 174, 175, 951, 782, 306, 302,
/* 560 */ 303, 170, 164, 304, 307, 163, 308, 1061, 295, 291,
/* 570 */ 165, 200, 40, 319, 946, 945, 235, 328, 1183, 112,
/* 580 */ 283, 1182, 285, 1179, 76, 179, 335, 73, 1175, 118,
/* 590 */ 1174, 1171, 180, 971, 46, 41, 38, 201, 934, 127,
/* 600 */ 932, 129, 130, 293, 930, 929, 263, 190, 191, 926,
/* 610 */ 925, 924, 923, 922, 921, 920, 194, 196, 917, 915,
/* 620 */ 913, 911, 289, 198, 908, 199, 904, 287, 284, 276,
/* 630 */ 83, 88, 45, 286, 1105, 123, 345, 346, 347, 348,
/* 640 */ 349, 225, 350, 247, 301, 351, 360, 884, 264, 265,
/* 650 */ 883, 222, 267, 950, 949, 106, 223, 268, 882, 865,
/* 660 */ 864, 272, 70, 8, 928, 296, 927, 758, 183, 182,
/* 670 */ 972, 181, 142, 184, 185, 187, 186, 143, 919, 918,
/* 680 */ 973, 144, 145, 910, 909, 28, 278, 89, 31, 784,
/* 690 */ 2, 166, 167, 158, 168, 169, 795, 159, 1, 789,
/* 700 */ 160, 90, 237, 791, 91, 290, 29, 9, 30, 10,
/* 710 */ 11, 25, 298, 26, 98, 100, 34, 103, 102, 649,
/* 720 */ 684, 35, 104, 682, 681, 680, 678, 677, 676, 673,
/* 730 */ 639, 107, 109, 325, 110, 839, 317, 5, 6, 841,
/* 740 */ 326, 68, 111, 113, 69, 716, 117, 119, 37, 715,
/* 750 */ 712, 665, 663, 655, 661, 657, 659, 653, 651, 686,
/* 760 */ 685, 683, 679, 675, 674, 189, 602, 637, 888, 887,
/* 770 */ 887, 887, 887, 887, 887, 887, 887, 147, 148,
/* 0 */ 249, 638, 364, 230, 162, 639, 248, 55, 56, 638,
/* 10 */ 59, 60, 1031, 639, 252, 49, 48, 47, 94, 58,
/* 20 */ 323, 63, 61, 64, 62, 674, 1080, 891, 365, 54,
/* 30 */ 53, 206, 82, 52, 51, 50, 253, 55, 56, 638,
/* 40 */ 59, 60, 1171, 639, 252, 49, 48, 47, 21, 58,
/* 50 */ 323, 63, 61, 64, 62, 1017, 203, 1015, 1016, 54,
/* 60 */ 53, 206, 1018, 52, 51, 50, 1019, 206, 1020, 1021,
/* 70 */ 832, 835, 1172, 55, 56, 1070, 59, 60, 1172, 1118,
/* 80 */ 252, 49, 48, 47, 81, 58, 323, 63, 61, 64,
/* 90 */ 62, 321, 319, 274, 1077, 54, 53, 206, 638, 52,
/* 100 */ 51, 50, 639, 55, 57, 353, 59, 60, 1172, 826,
/* 110 */ 252, 49, 48, 47, 155, 58, 323, 63, 61, 64,
/* 120 */ 62, 42, 319, 359, 358, 54, 53, 162, 357, 52,
/* 130 */ 51, 50, 356, 87, 355, 354, 162, 162, 588, 589,
/* 140 */ 590, 591, 592, 593, 594, 595, 596, 597, 598, 599,
/* 150 */ 600, 601, 153, 56, 231, 59, 60, 236, 1057, 252,
/* 160 */ 49, 48, 47, 87, 58, 323, 63, 61, 64, 62,
/* 170 */ 772, 43, 32, 86, 54, 53, 255, 204, 52, 51,
/* 180 */ 50, 309, 209, 280, 279, 59, 60, 941, 839, 252,
/* 190 */ 49, 48, 47, 188, 58, 323, 63, 61, 64, 62,
/* 200 */ 294, 43, 92, 242, 54, 53, 300, 1045, 52, 51,
/* 210 */ 50, 1119, 93, 292, 42, 317, 359, 358, 316, 315,
/* 220 */ 314, 357, 313, 312, 311, 356, 310, 355, 354, 99,
/* 230 */ 22, 1010, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005,
/* 240 */ 1006, 1007, 1008, 1009, 1011, 1012, 1013, 215, 251, 841,
/* 250 */ 830, 833, 836, 256, 216, 254, 776, 331, 330, 250,
/* 260 */ 137, 136, 135, 217, 1033, 266, 719, 328, 87, 251,
/* 270 */ 841, 830, 833, 836, 270, 269, 228, 229, 831, 834,
/* 280 */ 324, 4, 63, 61, 64, 62, 755, 752, 753, 754,
/* 290 */ 54, 53, 343, 342, 52, 51, 50, 228, 229, 747,
/* 300 */ 744, 745, 746, 52, 51, 50, 43, 3, 39, 178,
/* 310 */ 152, 150, 149, 257, 258, 105, 77, 101, 108, 1039,
/* 320 */ 96, 791, 792, 260, 36, 65, 244, 245, 273, 36,
/* 330 */ 79, 197, 195, 193, 36, 305, 210, 224, 192, 141,
/* 340 */ 140, 139, 138, 36, 36, 36, 65, 122, 116, 126,
/* 350 */ 36, 211, 1028, 1029, 33, 1032, 131, 134, 125, 638,
/* 360 */ 36, 842, 837, 639, 243, 128, 36, 232, 838, 54,
/* 370 */ 53, 1042, 240, 52, 51, 50, 1042, 241, 36, 36,
/* 380 */ 36, 1042, 842, 837, 1166, 261, 332, 333, 334, 838,
/* 390 */ 1042, 1042, 1042, 335, 176, 12, 840, 1042, 756, 757,
/* 400 */ 262, 95, 259, 339, 338, 337, 171, 1042, 363, 362,
/* 410 */ 146, 748, 749, 1041, 246, 80, 808, 1070, 1045, 1070,
/* 420 */ 261, 340, 341, 345, 282, 1042, 1042, 1042, 124, 177,
/* 430 */ 98, 261, 952, 942, 769, 233, 27, 234, 188, 188,
/* 440 */ 1043, 275, 353, 360, 979, 84, 85, 788, 1030, 798,
/* 450 */ 799, 71, 74, 729, 297, 731, 299, 37, 325, 7,
/* 460 */ 742, 743, 730, 157, 828, 66, 24, 740, 741, 37,
/* 470 */ 37, 67, 97, 864, 807, 760, 761, 843, 67, 637,
/* 480 */ 14, 78, 13, 70, 70, 115, 1165, 114, 16, 23,
/* 490 */ 15, 75, 72, 23, 1111, 23, 829, 758, 759, 133,
/* 500 */ 132, 18, 121, 17, 120, 20, 1164, 19, 1129, 226,
/* 510 */ 322, 227, 207, 1056, 718, 208, 212, 205, 213, 214,
/* 520 */ 1044, 219, 1072, 220, 1191, 221, 218, 202, 1128, 1183,
/* 530 */ 238, 1125, 1124, 239, 344, 271, 154, 44, 172, 1079,
/* 540 */ 151, 1110, 1090, 1087, 1088, 1071, 277, 1092, 1040, 156,
/* 550 */ 1068, 281, 235, 283, 31, 161, 285, 165, 288, 173,
/* 560 */ 163, 168, 787, 845, 164, 276, 1038, 174, 166, 169,
/* 570 */ 167, 291, 175, 956, 302, 303, 304, 76, 307, 308,
/* 580 */ 200, 40, 320, 951, 950, 329, 1190, 112, 73, 1189,
/* 590 */ 1186, 179, 46, 336, 295, 1182, 118, 287, 1181, 1178,
/* 600 */ 180, 976, 41, 38, 201, 939, 127, 937, 129, 130,
/* 610 */ 935, 934, 263, 190, 191, 931, 930, 929, 928, 293,
/* 620 */ 927, 926, 925, 194, 196, 922, 920, 918, 916, 198,
/* 630 */ 913, 199, 909, 289, 284, 83, 88, 45, 286, 1112,
/* 640 */ 306, 123, 346, 225, 247, 347, 301, 348, 349, 351,
/* 650 */ 222, 223, 350, 352, 361, 955, 954, 106, 889, 264,
/* 660 */ 265, 888, 267, 268, 887, 870, 933, 869, 272, 183,
/* 670 */ 182, 977, 932, 181, 142, 184, 185, 187, 186, 143,
/* 680 */ 144, 924, 978, 923, 2, 70, 145, 915, 914, 296,
/* 690 */ 8, 28, 1, 763, 278, 170, 789, 89, 158, 160,
/* 700 */ 800, 159, 237, 794, 90, 29, 796, 91, 290, 9,
/* 710 */ 30, 10, 11, 25, 26, 298, 100, 34, 98, 103,
/* 720 */ 652, 102, 690, 35, 104, 687, 685, 684, 683, 681,
/* 730 */ 680, 679, 676, 642, 326, 327, 107, 111, 109, 318,
/* 740 */ 113, 110, 5, 68, 844, 846, 6, 69, 721, 37,
/* 750 */ 117, 119, 720, 717, 668, 666, 658, 664, 660, 662,
/* 760 */ 656, 654, 689, 688, 686, 682, 678, 677, 189, 640,
/* 770 */ 893, 605, 892, 892, 892, 892, 892, 892, 892, 892,
/* 780 */ 147, 148,
};
static const YYCODETYPE yy_lookahead[] = {
/* 0 */ 194, 1, 194, 194, 195, 5, 3, 7, 8, 1,
/* 10 */ 10, 11, 194, 5, 14, 15, 16, 17, 194, 19,
/* 20 */ 20, 21, 22, 23, 24, 242, 243, 237, 260, 29,
/* 30 */ 30, 241, 1, 33, 34, 35, 5, 7, 8, 271,
/* 40 */ 10, 11, 199, 239, 14, 15, 16, 17, 205, 19,
/* 50 */ 20, 21, 22, 23, 24, 216, 238, 218, 219, 29,
/* 60 */ 30, 257, 223, 33, 34, 35, 227, 261, 229, 230,
/* 70 */ 262, 263, 199, 7, 8, 237, 10, 11, 205, 241,
/* 0 */ 200, 1, 194, 195, 194, 5, 200, 7, 8, 1,
/* 10 */ 10, 11, 0, 5, 14, 15, 16, 17, 245, 19,
/* 20 */ 20, 21, 22, 23, 24, 3, 194, 192, 193, 29,
/* 30 */ 30, 261, 259, 33, 34, 35, 200, 7, 8, 1,
/* 40 */ 10, 11, 272, 5, 14, 15, 16, 17, 261, 19,
/* 50 */ 20, 21, 22, 23, 24, 216, 261, 218, 219, 29,
/* 60 */ 30, 261, 223, 33, 34, 35, 227, 261, 229, 230,
/* 70 */ 3, 4, 272, 7, 8, 240, 10, 11, 272, 269,
/* 80 */ 14, 15, 16, 17, 84, 19, 20, 21, 22, 23,
/* 90 */ 24, 83, 268, 201, 270, 29, 30, 88, 1, 33,
/* 100 */ 34, 35, 5, 7, 8, 194, 10, 11, 80, 79,
/* 110 */ 14, 15, 16, 17, 203, 19, 20, 21, 22, 23,
/* 120 */ 24, 96, 200, 98, 99, 29, 30, 235, 103, 33,
/* 130 */ 34, 35, 107, 78, 109, 110, 192, 193, 41, 42,
/* 90 */ 24, 83, 80, 258, 262, 29, 30, 261, 1, 33,
/* 100 */ 34, 35, 5, 7, 8, 88, 10, 11, 272, 79,
/* 110 */ 14, 15, 16, 17, 194, 19, 20, 21, 22, 23,
/* 120 */ 24, 96, 80, 98, 99, 29, 30, 194, 103, 33,
/* 130 */ 34, 35, 107, 78, 109, 110, 194, 194, 41, 42,
/* 140 */ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
/* 150 */ 53, 54, 55, 8, 57, 10, 11, 33, 239, 14,
/* 160 */ 15, 16, 17, 247, 19, 20, 21, 22, 23, 24,
/* 170 */ 194, 116, 0, 118, 29, 30, 257, 260, 33, 34,
/* 180 */ 35, 265, 260, 239, 1, 10, 11, 260, 5, 14,
/* 190 */ 15, 16, 17, 271, 19, 20, 21, 22, 23, 24,
/* 200 */ 194, 257, 3, 4, 29, 30, 122, 123, 33, 34,
/* 210 */ 35, 194, 96, 97, 98, 99, 100, 101, 102, 103,
/* 220 */ 104, 105, 106, 107, 108, 109, 110, 216, 217, 218,
/* 230 */ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
/* 240 */ 229, 230, 266, 119, 268, 40, 21, 22, 23, 24,
/* 250 */ 3, 4, 80, 236, 29, 30, 260, 240, 33, 34,
/* 260 */ 35, 78, 57, 194, 1, 2, 3, 4, 5, 64,
/* 270 */ 2, 3, 4, 5, 268, 70, 71, 72, 73, 194,
/* 280 */ 139, 64, 77, 78, 1, 2, 3, 4, 5, 148,
/* 290 */ 149, 201, 29, 30, 194, 194, 33, 29, 30, 2,
/* 300 */ 3, 4, 5, 203, 203, 236, 58, 59, 60, 240,
/* 310 */ 64, 260, 29, 30, 66, 67, 68, 69, 56, 200,
/* 320 */ 121, 116, 232, 233, 234, 235, 29, 30, 58, 59,
/* 330 */ 60, 33, 34, 35, 86, 65, 66, 67, 68, 69,
/* 340 */ 78, 78, 200, 138, 201, 140, 58, 59, 60, 58,
/* 350 */ 59, 60, 147, 268, 194, 67, 68, 69, 141, 194,
/* 360 */ 143, 78, 145, 146, 76, 29, 30, 3, 121, 33,
/* 370 */ 34, 35, 78, 194, 194, 194, 233, 114, 115, 260,
/* 380 */ 194, 194, 114, 115, 121, 194, 194, 141, 194, 143,
/* 390 */ 271, 145, 146, 29, 30, 72, 236, 114, 115, 95,
/* 400 */ 240, 236, 260, 78, 121, 240, 79, 79, 199, 84,
/* 410 */ 116, 114, 115, 271, 205, 236, 236, 236, 9, 240,
/* 420 */ 240, 240, 236, 236, 120, 74, 240, 240, 236, 244,
/* 430 */ 236, 240, 240, 79, 240, 61, 62, 63, 113, 88,
/* 440 */ 214, 215, 79, 258, 117, 117, 79, 79, 95, 95,
/* 450 */ 79, 95, 79, 130, 79, 79, 3, 4, 95, 3,
/* 460 */ 4, 79, 95, 95, 78, 1, 95, 79, 95, 79,
/* 470 */ 95, 95, 79, 142, 142, 144, 144, 95, 78, 142,
/* 480 */ 142, 144, 144, 95, 142, 95, 144, 260, 95, 136,
/* 490 */ 134, 260, 3, 4, 3, 4, 260, 33, 112, 142,
/* 500 */ 260, 144, 74, 75, 260, 260, 241, 243, 239, 260,
/* 510 */ 260, 111, 260, 260, 260, 260, 260, 260, 260, 260,
/* 520 */ 260, 260, 243, 114, 243, 259, 231, 231, 194, 194,
/* 530 */ 231, 231, 231, 231, 231, 194, 269, 194, 194, 194,
/* 540 */ 194, 194, 194, 194, 239, 239, 194, 269, 239, 194,
/* 550 */ 56, 264, 245, 194, 194, 194, 194, 121, 87, 194,
/* 560 */ 194, 248, 254, 194, 194, 255, 194, 256, 128, 126,
/* 570 */ 253, 194, 194, 194, 194, 194, 264, 194, 194, 194,
/* 580 */ 264, 194, 264, 194, 133, 194, 194, 135, 194, 194,
/* 590 */ 194, 194, 194, 194, 132, 194, 194, 194, 194, 194,
/* 600 */ 194, 194, 194, 131, 194, 194, 194, 194, 194, 194,
/* 610 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
/* 620 */ 194, 194, 125, 194, 194, 194, 194, 124, 127, 196,
/* 630 */ 196, 196, 137, 196, 196, 94, 93, 47, 90, 92,
/* 640 */ 51, 196, 91, 196, 196, 89, 80, 3, 150, 3,
/* 650 */ 3, 196, 150, 204, 204, 201, 196, 3, 3, 98,
/* 660 */ 97, 139, 117, 78, 196, 112, 196, 79, 207, 211,
/* 670 */ 213, 212, 197, 210, 208, 206, 209, 197, 196, 196,
/* 680 */ 215, 197, 197, 196, 196, 78, 95, 95, 246, 79,
/* 690 */ 198, 252, 251, 78, 250, 249, 79, 78, 202, 79,
/* 700 */ 95, 78, 1, 79, 78, 78, 95, 129, 95, 129,
/* 710 */ 78, 78, 112, 78, 113, 74, 85, 66, 84, 3,
/* 720 */ 5, 85, 84, 3, 3, 3, 3, 3, 3, 3,
/* 730 */ 81, 74, 82, 20, 82, 79, 9, 78, 78, 114,
/* 740 */ 55, 10, 144, 144, 10, 3, 144, 144, 95, 3,
/* 750 */ 79, 3, 3, 3, 3, 3, 3, 3, 3, 3,
/* 760 */ 3, 3, 3, 3, 3, 95, 56, 81, 0, 272,
/* 770 */ 272, 272, 272, 272, 272, 272, 272, 15, 15, 272,
/* 780 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 790 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 800 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 810 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 820 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 830 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 840 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 850 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 860 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 870 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 880 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 890 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 900 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 910 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 920 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 930 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 940 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 950 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 960 */ 272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
/* 150 */ 53, 54, 55, 8, 57, 10, 11, 243, 244, 14,
/* 160 */ 15, 16, 17, 78, 19, 20, 21, 22, 23, 24,
/* 170 */ 33, 116, 78, 118, 29, 30, 64, 261, 33, 34,
/* 180 */ 35, 63, 261, 263, 264, 10, 11, 199, 121, 14,
/* 190 */ 15, 16, 17, 205, 19, 20, 21, 22, 23, 24,
/* 200 */ 267, 116, 269, 238, 29, 30, 112, 242, 33, 34,
/* 210 */ 35, 269, 269, 271, 96, 97, 98, 99, 100, 101,
/* 220 */ 102, 103, 104, 105, 106, 107, 108, 109, 110, 201,
/* 230 */ 40, 216, 217, 218, 219, 220, 221, 222, 223, 224,
/* 240 */ 225, 226, 227, 228, 229, 230, 231, 57, 1, 2,
/* 250 */ 3, 4, 5, 141, 64, 143, 119, 145, 146, 56,
/* 260 */ 70, 71, 72, 73, 236, 139, 3, 77, 78, 1,
/* 270 */ 2, 3, 4, 5, 148, 149, 29, 30, 3, 4,
/* 280 */ 33, 78, 21, 22, 23, 24, 2, 3, 4, 5,
/* 290 */ 29, 30, 29, 30, 33, 34, 35, 29, 30, 2,
/* 300 */ 3, 4, 5, 33, 34, 35, 116, 58, 59, 60,
/* 310 */ 58, 59, 60, 29, 30, 66, 67, 68, 69, 194,
/* 320 */ 201, 122, 123, 64, 194, 78, 29, 30, 138, 194,
/* 330 */ 140, 58, 59, 60, 194, 86, 261, 147, 65, 66,
/* 340 */ 67, 68, 69, 194, 194, 194, 78, 58, 59, 60,
/* 350 */ 194, 261, 233, 234, 235, 236, 67, 68, 69, 1,
/* 360 */ 194, 114, 115, 5, 239, 76, 194, 237, 121, 29,
/* 370 */ 30, 241, 237, 33, 34, 35, 241, 237, 194, 194,
/* 380 */ 194, 241, 114, 115, 261, 194, 237, 237, 237, 121,
/* 390 */ 241, 241, 241, 237, 203, 78, 121, 241, 114, 115,
/* 400 */ 141, 84, 143, 237, 145, 146, 248, 241, 61, 62,
/* 410 */ 63, 114, 115, 241, 238, 201, 72, 240, 242, 240,
/* 420 */ 194, 237, 237, 237, 266, 241, 241, 241, 74, 203,
/* 430 */ 113, 194, 199, 199, 95, 258, 78, 258, 205, 205,
/* 440 */ 203, 79, 88, 214, 215, 79, 79, 79, 234, 79,
/* 450 */ 79, 95, 95, 79, 79, 79, 79, 95, 9, 120,
/* 460 */ 3, 4, 79, 95, 1, 95, 95, 3, 4, 95,
/* 470 */ 95, 95, 95, 79, 130, 3, 4, 79, 95, 79,
/* 480 */ 142, 78, 144, 117, 117, 142, 261, 144, 142, 95,
/* 490 */ 144, 134, 136, 95, 270, 95, 33, 3, 4, 74,
/* 500 */ 75, 142, 142, 144, 144, 142, 261, 144, 232, 261,
/* 510 */ 194, 261, 261, 244, 111, 261, 261, 261, 261, 261,
/* 520 */ 242, 261, 240, 261, 244, 261, 261, 261, 232, 244,
/* 530 */ 232, 232, 232, 232, 232, 194, 194, 260, 246, 194,
/* 540 */ 56, 270, 194, 194, 194, 240, 240, 194, 240, 194,
/* 550 */ 257, 265, 265, 265, 247, 194, 265, 254, 194, 194,
/* 560 */ 256, 251, 121, 114, 255, 196, 194, 194, 253, 250,
/* 570 */ 252, 126, 194, 194, 194, 194, 194, 133, 194, 194,
/* 580 */ 194, 194, 194, 194, 194, 194, 194, 194, 135, 194,
/* 590 */ 194, 194, 132, 194, 128, 194, 194, 124, 194, 194,
/* 600 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
/* 610 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 131,
/* 620 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
/* 630 */ 194, 194, 194, 125, 127, 196, 196, 137, 196, 196,
/* 640 */ 87, 94, 93, 196, 196, 47, 196, 90, 92, 91,
/* 650 */ 196, 196, 51, 89, 80, 204, 204, 201, 3, 150,
/* 660 */ 3, 3, 150, 3, 3, 98, 196, 97, 139, 207,
/* 670 */ 211, 213, 196, 212, 197, 210, 208, 206, 209, 197,
/* 680 */ 197, 196, 215, 196, 198, 117, 197, 196, 196, 112,
/* 690 */ 78, 78, 202, 79, 95, 249, 79, 95, 78, 95,
/* 700 */ 79, 78, 1, 79, 78, 95, 79, 78, 78, 129,
/* 710 */ 95, 129, 78, 78, 78, 112, 74, 85, 113, 66,
/* 720 */ 3, 84, 3, 85, 84, 5, 3, 3, 3, 3,
/* 730 */ 3, 3, 3, 81, 20, 55, 74, 144, 82, 9,
/* 740 */ 144, 82, 78, 10, 79, 114, 78, 10, 3, 95,
/* 750 */ 144, 144, 3, 79, 3, 3, 3, 3, 3, 3,
/* 760 */ 3, 3, 3, 3, 3, 3, 3, 3, 95, 81,
/* 770 */ 0, 56, 273, 273, 273, 273, 273, 273, 273, 273,
/* 780 */ 15, 15, 273, 273, 273, 273, 273, 273, 273, 273,
/* 790 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 800 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 810 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 820 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 830 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 840 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 850 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 860 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 870 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 880 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 890 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 900 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 910 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 920 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 930 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 940 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 950 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 960 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
/* 970 */ 273, 273, 273,
};
#define YY_SHIFT_COUNT (364)
#define YY_SHIFT_COUNT (365)
#define YY_SHIFT_MIN (0)
#define YY_SHIFT_MAX (768)
#define YY_SHIFT_MAX (770)
static const unsigned short int yy_shift_ofst[] = {
/* 0 */ 205, 116, 25, 28, 263, 283, 283, 183, 31, 31,
/* 10 */ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
/* 20 */ 31, 0, 97, 283, 268, 297, 297, 294, 294, 31,
/* 30 */ 31, 84, 31, 172, 31, 31, 31, 31, 351, 28,
/* 40 */ 9, 9, 3, 779, 283, 283, 283, 283, 283, 283,
/* 50 */ 283, 283, 283, 283, 283, 283, 283, 283, 283, 283,
/* 60 */ 283, 283, 283, 283, 283, 283, 268, 297, 268, 268,
/* 70 */ 55, 364, 364, 364, 364, 364, 364, 8, 364, 31,
/* 80 */ 31, 31, 124, 31, 31, 31, 294, 294, 31, 31,
/* 90 */ 31, 31, 323, 323, 304, 294, 31, 31, 31, 31,
/* 100 */ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
/* 110 */ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
/* 120 */ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
/* 130 */ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
/* 140 */ 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
/* 150 */ 31, 31, 31, 31, 494, 494, 494, 436, 436, 436,
/* 160 */ 436, 494, 494, 451, 452, 440, 462, 472, 443, 497,
/* 170 */ 503, 501, 495, 494, 494, 494, 471, 471, 28, 494,
/* 180 */ 494, 541, 543, 590, 548, 547, 589, 551, 556, 3,
/* 190 */ 494, 494, 566, 566, 494, 566, 494, 566, 494, 494,
/* 200 */ 779, 779, 30, 66, 66, 96, 66, 145, 175, 225,
/* 210 */ 225, 225, 225, 225, 225, 248, 270, 288, 336, 336,
/* 220 */ 336, 336, 217, 246, 141, 325, 298, 298, 199, 247,
/* 230 */ 374, 291, 354, 327, 328, 363, 367, 368, 353, 356,
/* 240 */ 371, 373, 375, 376, 453, 456, 382, 386, 388, 390,
/* 250 */ 464, 262, 409, 393, 331, 332, 337, 489, 491, 338,
/* 260 */ 342, 400, 357, 428, 644, 498, 646, 647, 502, 654,
/* 270 */ 655, 561, 563, 522, 545, 553, 585, 588, 607, 591,
/* 280 */ 592, 610, 615, 617, 619, 620, 605, 623, 624, 626,
/* 290 */ 701, 627, 611, 578, 613, 580, 632, 553, 633, 600,
/* 300 */ 635, 601, 641, 631, 634, 651, 716, 636, 638, 715,
/* 310 */ 720, 721, 722, 723, 724, 725, 726, 649, 727, 657,
/* 320 */ 650, 652, 659, 656, 625, 660, 713, 685, 731, 598,
/* 330 */ 599, 653, 653, 653, 653, 734, 602, 603, 653, 653,
/* 340 */ 653, 742, 746, 671, 653, 748, 749, 750, 751, 752,
/* 350 */ 753, 754, 755, 756, 757, 758, 759, 760, 761, 670,
/* 360 */ 686, 762, 763, 710, 768,
/* 0 */ 190, 118, 25, 42, 247, 268, 268, 358, 38, 38,
/* 10 */ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
/* 20 */ 38, 0, 97, 268, 284, 297, 297, 85, 85, 38,
/* 30 */ 38, 199, 38, 12, 38, 38, 38, 38, 354, 42,
/* 40 */ 17, 17, 22, 782, 268, 268, 268, 268, 268, 268,
/* 50 */ 268, 268, 268, 268, 268, 268, 268, 268, 268, 268,
/* 60 */ 268, 268, 268, 268, 268, 268, 284, 297, 284, 284,
/* 70 */ 55, 263, 263, 263, 263, 263, 263, 8, 263, 38,
/* 80 */ 38, 38, 137, 38, 38, 38, 85, 85, 38, 38,
/* 90 */ 38, 38, 344, 344, 339, 85, 38, 38, 38, 38,
/* 100 */ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
/* 110 */ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
/* 120 */ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
/* 130 */ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
/* 140 */ 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
/* 150 */ 38, 38, 38, 38, 484, 484, 484, 441, 441, 441,
/* 160 */ 441, 484, 484, 444, 453, 466, 460, 488, 445, 508,
/* 170 */ 473, 507, 500, 484, 484, 484, 553, 553, 42, 484,
/* 180 */ 484, 547, 549, 598, 557, 556, 601, 558, 564, 22,
/* 190 */ 484, 484, 574, 574, 484, 574, 484, 574, 484, 484,
/* 200 */ 782, 782, 30, 66, 66, 96, 66, 145, 175, 261,
/* 210 */ 261, 261, 261, 261, 261, 249, 273, 289, 340, 340,
/* 220 */ 340, 340, 112, 259, 126, 317, 270, 270, 67, 275,
/* 230 */ 347, 252, 362, 366, 367, 368, 370, 371, 356, 357,
/* 240 */ 374, 375, 376, 377, 457, 464, 383, 94, 394, 398,
/* 250 */ 463, 203, 449, 400, 338, 343, 346, 472, 494, 359,
/* 260 */ 360, 403, 363, 425, 655, 509, 657, 658, 512, 660,
/* 270 */ 661, 567, 570, 529, 568, 577, 612, 614, 613, 599,
/* 280 */ 602, 617, 620, 621, 623, 624, 604, 626, 627, 629,
/* 290 */ 701, 630, 610, 580, 615, 582, 634, 577, 635, 603,
/* 300 */ 636, 605, 642, 632, 637, 653, 717, 638, 640, 719,
/* 310 */ 720, 723, 724, 725, 726, 727, 728, 729, 652, 730,
/* 320 */ 662, 656, 659, 664, 665, 631, 668, 714, 680, 733,
/* 330 */ 593, 596, 654, 654, 654, 654, 737, 606, 607, 654,
/* 340 */ 654, 654, 745, 749, 674, 654, 751, 752, 753, 754,
/* 350 */ 755, 756, 757, 758, 759, 760, 761, 762, 763, 764,
/* 360 */ 673, 688, 765, 766, 715, 770,
};
#define YY_REDUCE_COUNT (201)
#define YY_REDUCE_MIN (-232)
#define YY_REDUCE_MAX (496)
#define YY_REDUCE_MIN (-230)
#define YY_REDUCE_MAX (492)
static const short yy_reduce_ofst[] = {
/* 0 */ -56, 11, -161, 90, -78, 119, 142, -192, 17, -176,
/* 10 */ -24, 69, 160, 165, 179, 180, 181, 186, 187, 192,
/* 20 */ 194, -194, -191, -232, -217, -210, -162, -196, -81, 6,
/* 30 */ 85, -84, -182, -108, -89, 100, 101, 191, -157, 143,
/* 40 */ -127, 209, 226, 185, -83, -73, -4, 51, 227, 231,
/* 50 */ 236, 240, 244, 245, 249, 250, 252, 253, 254, 255,
/* 60 */ 256, 257, 258, 259, 260, 261, 264, 265, 279, 281,
/* 70 */ 269, 295, 296, 299, 300, 301, 302, 334, 303, 335,
/* 80 */ 341, 343, 266, 344, 345, 346, 305, 306, 347, 348,
/* 90 */ 349, 352, 267, 278, 307, 309, 355, 359, 360, 361,
/* 100 */ 362, 365, 366, 369, 370, 372, 377, 378, 379, 380,
/* 110 */ 381, 383, 384, 385, 387, 389, 391, 392, 394, 395,
/* 120 */ 396, 397, 398, 399, 401, 402, 403, 404, 405, 406,
/* 130 */ 407, 408, 410, 411, 412, 413, 414, 415, 416, 417,
/* 140 */ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
/* 150 */ 429, 430, 431, 432, 433, 434, 435, 287, 312, 316,
/* 160 */ 318, 437, 438, 311, 310, 308, 317, 439, 441, 444,
/* 170 */ 446, 313, 442, 445, 447, 448, 449, 450, 454, 455,
/* 180 */ 460, 457, 459, 458, 461, 463, 466, 467, 469, 465,
/* 190 */ 468, 470, 475, 480, 482, 484, 483, 485, 487, 488,
/* 200 */ 496, 492,
/* 0 */ -165, 15, -161, 119, -200, -194, -164, -80, 130, -58,
/* 10 */ -67, 135, 140, 149, 150, 151, 156, 166, 184, 185,
/* 20 */ 186, -168, -192, -230, -86, -35, 176, 177, 179, -190,
/* 30 */ -57, 158, 125, 28, 191, 226, 237, 172, -12, 214,
/* 40 */ 233, 234, 229, -227, -213, -205, -84, -79, 75, 90,
/* 50 */ 123, 225, 245, 248, 250, 251, 254, 255, 256, 257,
/* 60 */ 258, 260, 262, 264, 265, 266, 269, 278, 280, 285,
/* 70 */ 282, 276, 296, 298, 299, 300, 301, 316, 302, 341,
/* 80 */ 342, 345, 277, 348, 349, 350, 305, 306, 353, 355,
/* 90 */ 361, 364, 224, 271, 292, 308, 365, 372, 373, 378,
/* 100 */ 379, 380, 381, 382, 384, 385, 386, 387, 388, 389,
/* 110 */ 390, 391, 392, 393, 395, 396, 397, 399, 401, 402,
/* 120 */ 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
/* 130 */ 414, 415, 416, 417, 418, 419, 420, 421, 422, 423,
/* 140 */ 424, 426, 427, 428, 429, 430, 431, 432, 433, 434,
/* 150 */ 435, 436, 437, 438, 369, 439, 440, 286, 287, 288,
/* 160 */ 291, 442, 443, 293, 304, 309, 303, 315, 318, 310,
/* 170 */ 319, 446, 307, 447, 448, 450, 451, 452, 456, 454,
/* 180 */ 455, 458, 461, 459, 462, 465, 468, 469, 471, 467,
/* 190 */ 470, 476, 477, 482, 485, 483, 487, 489, 491, 492,
/* 200 */ 490, 486,
};
static const YYACTIONTYPE yy_default[] = {
/* 0 */ 885, 948, 935, 944, 1167, 1167, 1167, 885, 885, 885,
/* 10 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 20 */ 885, 1074, 905, 1167, 885, 885, 885, 885, 885, 885,
/* 30 */ 885, 1089, 885, 944, 885, 885, 885, 885, 954, 944,
/* 40 */ 954, 954, 885, 1069, 885, 885, 885, 885, 885, 885,
/* 50 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 60 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 70 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 80 */ 885, 885, 1076, 1082, 1079, 885, 885, 885, 1084, 885,
/* 90 */ 885, 885, 1108, 1108, 1067, 885, 885, 885, 885, 885,
/* 100 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 110 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 120 */ 885, 885, 885, 885, 885, 885, 885, 933, 885, 931,
/* 130 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 140 */ 885, 885, 885, 885, 885, 885, 916, 885, 885, 885,
/* 150 */ 885, 885, 885, 903, 907, 907, 907, 885, 885, 885,
/* 160 */ 885, 907, 907, 1115, 1119, 1101, 1113, 1109, 1096, 1094,
/* 170 */ 1092, 1100, 1123, 907, 907, 907, 952, 952, 944, 907,
/* 180 */ 907, 970, 968, 966, 958, 964, 960, 962, 956, 885,
/* 190 */ 907, 907, 942, 942, 907, 942, 907, 942, 907, 907,
/* 200 */ 991, 1007, 885, 1124, 1114, 885, 1166, 1154, 1153, 1162,
/* 210 */ 1161, 1160, 1152, 1151, 1150, 885, 885, 885, 1146, 1149,
/* 220 */ 1148, 1147, 885, 885, 885, 885, 1156, 1155, 885, 885,
/* 230 */ 885, 885, 885, 885, 885, 885, 885, 885, 1120, 1116,
/* 240 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 250 */ 885, 1126, 885, 885, 885, 885, 885, 885, 885, 885,
/* 260 */ 885, 1015, 885, 885, 885, 885, 885, 885, 885, 885,
/* 270 */ 885, 885, 885, 885, 1066, 885, 885, 885, 885, 1078,
/* 280 */ 1077, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 290 */ 885, 885, 1110, 885, 1102, 885, 885, 1027, 885, 885,
/* 300 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 310 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 320 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 885,
/* 330 */ 885, 1185, 1180, 1181, 1178, 885, 885, 885, 1177, 1172,
/* 340 */ 1173, 885, 885, 885, 1170, 885, 885, 885, 885, 885,
/* 350 */ 885, 885, 885, 885, 885, 885, 885, 885, 885, 976,
/* 360 */ 885, 914, 912, 885, 885,
/* 0 */ 890, 953, 940, 949, 1174, 1174, 1174, 890, 890, 890,
/* 10 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 20 */ 890, 1081, 910, 1174, 890, 890, 890, 890, 890, 890,
/* 30 */ 890, 1096, 890, 949, 890, 890, 890, 890, 959, 949,
/* 40 */ 959, 959, 890, 1076, 890, 890, 890, 890, 890, 890,
/* 50 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 60 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 70 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 80 */ 890, 890, 1083, 1089, 1086, 890, 890, 890, 1091, 890,
/* 90 */ 890, 890, 1115, 1115, 1074, 890, 890, 890, 890, 890,
/* 100 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 110 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 120 */ 890, 890, 890, 890, 890, 890, 890, 938, 890, 936,
/* 130 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 140 */ 890, 890, 890, 890, 890, 890, 921, 890, 890, 890,
/* 150 */ 890, 890, 890, 908, 912, 912, 912, 890, 890, 890,
/* 160 */ 890, 912, 912, 1122, 1126, 1108, 1120, 1116, 1103, 1101,
/* 170 */ 1099, 1107, 1130, 912, 912, 912, 957, 957, 949, 912,
/* 180 */ 912, 975, 973, 971, 963, 969, 965, 967, 961, 890,
/* 190 */ 912, 912, 947, 947, 912, 947, 912, 947, 912, 912,
/* 200 */ 997, 1014, 890, 1131, 1121, 890, 1173, 1161, 1160, 1169,
/* 210 */ 1168, 1167, 1159, 1158, 1157, 890, 890, 890, 1153, 1156,
/* 220 */ 1155, 1154, 890, 890, 890, 890, 1163, 1162, 890, 890,
/* 230 */ 890, 890, 890, 890, 890, 890, 890, 890, 1127, 1123,
/* 240 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 250 */ 890, 1133, 890, 890, 890, 890, 890, 890, 890, 890,
/* 260 */ 890, 1022, 890, 890, 890, 890, 890, 890, 890, 890,
/* 270 */ 890, 890, 890, 890, 1073, 890, 890, 890, 890, 1085,
/* 280 */ 1084, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 290 */ 890, 890, 1117, 890, 1109, 890, 890, 1034, 890, 890,
/* 300 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 310 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 320 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 330 */ 890, 890, 1192, 1187, 1188, 1185, 890, 890, 890, 1184,
/* 340 */ 1179, 1180, 890, 890, 890, 1177, 890, 890, 890, 890,
/* 350 */ 890, 890, 890, 890, 890, 890, 890, 890, 890, 890,
/* 360 */ 981, 890, 919, 917, 890, 890,
};
/********** End of lemon-generated parsing tables *****************************/
......@@ -1019,47 +1021,48 @@ static const char *const yyTokenName[] = {
/* 228 */ "prec",
/* 229 */ "update",
/* 230 */ "cachelast",
/* 231 */ "signed",
/* 232 */ "create_table_args",
/* 233 */ "create_stable_args",
/* 234 */ "create_table_list",
/* 235 */ "create_from_stable",
/* 236 */ "columnlist",
/* 237 */ "tagitemlist1",
/* 238 */ "tagNamelist",
/* 239 */ "select",
/* 240 */ "column",
/* 241 */ "tagitem1",
/* 242 */ "tagitemlist",
/* 243 */ "tagitem",
/* 244 */ "selcollist",
/* 245 */ "from",
/* 246 */ "where_opt",
/* 247 */ "interval_option",
/* 248 */ "sliding_opt",
/* 249 */ "session_option",
/* 250 */ "windowstate_option",
/* 251 */ "fill_opt",
/* 252 */ "groupby_opt",
/* 253 */ "having_opt",
/* 254 */ "orderby_opt",
/* 255 */ "slimit_opt",
/* 256 */ "limit_opt",
/* 257 */ "union",
/* 258 */ "sclp",
/* 259 */ "distinct",
/* 260 */ "expr",
/* 261 */ "as",
/* 262 */ "tablelist",
/* 263 */ "sub",
/* 264 */ "tmvar",
/* 265 */ "intervalKey",
/* 266 */ "sortlist",
/* 267 */ "sortitem",
/* 268 */ "item",
/* 269 */ "sortorder",
/* 270 */ "grouplist",
/* 271 */ "expritem",
/* 231 */ "vgroups",
/* 232 */ "signed",
/* 233 */ "create_table_args",
/* 234 */ "create_stable_args",
/* 235 */ "create_table_list",
/* 236 */ "create_from_stable",
/* 237 */ "columnlist",
/* 238 */ "tagitemlist1",
/* 239 */ "tagNamelist",
/* 240 */ "select",
/* 241 */ "column",
/* 242 */ "tagitem1",
/* 243 */ "tagitemlist",
/* 244 */ "tagitem",
/* 245 */ "selcollist",
/* 246 */ "from",
/* 247 */ "where_opt",
/* 248 */ "interval_option",
/* 249 */ "sliding_opt",
/* 250 */ "session_option",
/* 251 */ "windowstate_option",
/* 252 */ "fill_opt",
/* 253 */ "groupby_opt",
/* 254 */ "having_opt",
/* 255 */ "orderby_opt",
/* 256 */ "slimit_opt",
/* 257 */ "limit_opt",
/* 258 */ "union",
/* 259 */ "sclp",
/* 260 */ "distinct",
/* 261 */ "expr",
/* 262 */ "as",
/* 263 */ "tablelist",
/* 264 */ "sub",
/* 265 */ "tmvar",
/* 266 */ "intervalKey",
/* 267 */ "sortlist",
/* 268 */ "sortitem",
/* 269 */ "item",
/* 270 */ "sortorder",
/* 271 */ "grouplist",
/* 272 */ "expritem",
};
#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
......@@ -1170,204 +1173,206 @@ static const char *const yyRuleName[] = {
/* 100 */ "prec ::= PRECISION STRING",
/* 101 */ "update ::= UPDATE INTEGER",
/* 102 */ "cachelast ::= CACHELAST INTEGER",
/* 103 */ "db_optr ::=",
/* 104 */ "db_optr ::= db_optr cache",
/* 105 */ "db_optr ::= db_optr replica",
/* 106 */ "db_optr ::= db_optr quorum",
/* 107 */ "db_optr ::= db_optr days",
/* 108 */ "db_optr ::= db_optr minrows",
/* 109 */ "db_optr ::= db_optr maxrows",
/* 110 */ "db_optr ::= db_optr blocks",
/* 111 */ "db_optr ::= db_optr ctime",
/* 112 */ "db_optr ::= db_optr wal",
/* 113 */ "db_optr ::= db_optr fsync",
/* 114 */ "db_optr ::= db_optr comp",
/* 115 */ "db_optr ::= db_optr prec",
/* 116 */ "db_optr ::= db_optr keep",
/* 117 */ "db_optr ::= db_optr update",
/* 118 */ "db_optr ::= db_optr cachelast",
/* 119 */ "alter_db_optr ::=",
/* 120 */ "alter_db_optr ::= alter_db_optr replica",
/* 121 */ "alter_db_optr ::= alter_db_optr quorum",
/* 122 */ "alter_db_optr ::= alter_db_optr keep",
/* 123 */ "alter_db_optr ::= alter_db_optr blocks",
/* 124 */ "alter_db_optr ::= alter_db_optr comp",
/* 125 */ "alter_db_optr ::= alter_db_optr update",
/* 126 */ "alter_db_optr ::= alter_db_optr cachelast",
/* 127 */ "typename ::= ids",
/* 128 */ "typename ::= ids LP signed RP",
/* 129 */ "typename ::= ids UNSIGNED",
/* 130 */ "signed ::= INTEGER",
/* 131 */ "signed ::= PLUS INTEGER",
/* 132 */ "signed ::= MINUS INTEGER",
/* 133 */ "cmd ::= CREATE TABLE create_table_args",
/* 134 */ "cmd ::= CREATE TABLE create_stable_args",
/* 135 */ "cmd ::= CREATE STABLE create_stable_args",
/* 136 */ "cmd ::= CREATE TABLE create_table_list",
/* 137 */ "create_table_list ::= create_from_stable",
/* 138 */ "create_table_list ::= create_table_list create_from_stable",
/* 139 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP",
/* 140 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP",
/* 141 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP",
/* 142 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP",
/* 143 */ "tagNamelist ::= tagNamelist COMMA ids",
/* 144 */ "tagNamelist ::= ids",
/* 145 */ "create_table_args ::= ifnotexists ids cpxName AS select",
/* 146 */ "columnlist ::= columnlist COMMA column",
/* 147 */ "columnlist ::= column",
/* 148 */ "column ::= ids typename",
/* 149 */ "tagitemlist1 ::= tagitemlist1 COMMA tagitem1",
/* 150 */ "tagitemlist1 ::= tagitem1",
/* 151 */ "tagitem1 ::= MINUS INTEGER",
/* 152 */ "tagitem1 ::= MINUS FLOAT",
/* 153 */ "tagitem1 ::= PLUS INTEGER",
/* 154 */ "tagitem1 ::= PLUS FLOAT",
/* 155 */ "tagitem1 ::= INTEGER",
/* 156 */ "tagitem1 ::= FLOAT",
/* 157 */ "tagitem1 ::= STRING",
/* 158 */ "tagitem1 ::= BOOL",
/* 159 */ "tagitem1 ::= NULL",
/* 160 */ "tagitem1 ::= NOW",
/* 161 */ "tagitemlist ::= tagitemlist COMMA tagitem",
/* 162 */ "tagitemlist ::= tagitem",
/* 163 */ "tagitem ::= INTEGER",
/* 164 */ "tagitem ::= FLOAT",
/* 165 */ "tagitem ::= STRING",
/* 166 */ "tagitem ::= BOOL",
/* 167 */ "tagitem ::= NULL",
/* 168 */ "tagitem ::= NOW",
/* 169 */ "tagitem ::= MINUS INTEGER",
/* 170 */ "tagitem ::= MINUS FLOAT",
/* 171 */ "tagitem ::= PLUS INTEGER",
/* 172 */ "tagitem ::= PLUS FLOAT",
/* 173 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt",
/* 174 */ "select ::= LP select RP",
/* 175 */ "union ::= select",
/* 176 */ "union ::= union UNION ALL select",
/* 177 */ "union ::= union UNION select",
/* 178 */ "cmd ::= union",
/* 179 */ "select ::= SELECT selcollist",
/* 180 */ "sclp ::= selcollist COMMA",
/* 181 */ "sclp ::=",
/* 182 */ "selcollist ::= sclp distinct expr as",
/* 183 */ "selcollist ::= sclp STAR",
/* 184 */ "as ::= AS ids",
/* 185 */ "as ::= ids",
/* 186 */ "as ::=",
/* 187 */ "distinct ::= DISTINCT",
/* 188 */ "distinct ::=",
/* 189 */ "from ::= FROM tablelist",
/* 190 */ "from ::= FROM sub",
/* 191 */ "sub ::= LP union RP",
/* 192 */ "sub ::= LP union RP ids",
/* 193 */ "sub ::= sub COMMA LP union RP ids",
/* 194 */ "tablelist ::= ids cpxName",
/* 195 */ "tablelist ::= ids cpxName ids",
/* 196 */ "tablelist ::= tablelist COMMA ids cpxName",
/* 197 */ "tablelist ::= tablelist COMMA ids cpxName ids",
/* 198 */ "tmvar ::= VARIABLE",
/* 199 */ "interval_option ::= intervalKey LP tmvar RP",
/* 200 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP",
/* 201 */ "interval_option ::=",
/* 202 */ "intervalKey ::= INTERVAL",
/* 203 */ "intervalKey ::= EVERY",
/* 204 */ "session_option ::=",
/* 205 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP",
/* 206 */ "windowstate_option ::=",
/* 207 */ "windowstate_option ::= STATE_WINDOW LP ids RP",
/* 208 */ "fill_opt ::=",
/* 209 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
/* 210 */ "fill_opt ::= FILL LP ID RP",
/* 211 */ "sliding_opt ::= SLIDING LP tmvar RP",
/* 212 */ "sliding_opt ::=",
/* 213 */ "orderby_opt ::=",
/* 214 */ "orderby_opt ::= ORDER BY sortlist",
/* 215 */ "sortlist ::= sortlist COMMA item sortorder",
/* 216 */ "sortlist ::= item sortorder",
/* 217 */ "item ::= ids cpxName",
/* 218 */ "sortorder ::= ASC",
/* 219 */ "sortorder ::= DESC",
/* 220 */ "sortorder ::=",
/* 221 */ "groupby_opt ::=",
/* 222 */ "groupby_opt ::= GROUP BY grouplist",
/* 223 */ "grouplist ::= grouplist COMMA item",
/* 224 */ "grouplist ::= item",
/* 225 */ "having_opt ::=",
/* 226 */ "having_opt ::= HAVING expr",
/* 227 */ "limit_opt ::=",
/* 228 */ "limit_opt ::= LIMIT signed",
/* 229 */ "limit_opt ::= LIMIT signed OFFSET signed",
/* 230 */ "limit_opt ::= LIMIT signed COMMA signed",
/* 231 */ "slimit_opt ::=",
/* 232 */ "slimit_opt ::= SLIMIT signed",
/* 233 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
/* 234 */ "slimit_opt ::= SLIMIT signed COMMA signed",
/* 235 */ "where_opt ::=",
/* 236 */ "where_opt ::= WHERE expr",
/* 237 */ "expr ::= LP expr RP",
/* 238 */ "expr ::= ID",
/* 239 */ "expr ::= ID DOT ID",
/* 240 */ "expr ::= ID DOT STAR",
/* 241 */ "expr ::= INTEGER",
/* 242 */ "expr ::= MINUS INTEGER",
/* 243 */ "expr ::= PLUS INTEGER",
/* 244 */ "expr ::= FLOAT",
/* 245 */ "expr ::= MINUS FLOAT",
/* 246 */ "expr ::= PLUS FLOAT",
/* 247 */ "expr ::= STRING",
/* 248 */ "expr ::= NOW",
/* 249 */ "expr ::= VARIABLE",
/* 250 */ "expr ::= PLUS VARIABLE",
/* 251 */ "expr ::= MINUS VARIABLE",
/* 252 */ "expr ::= BOOL",
/* 253 */ "expr ::= NULL",
/* 254 */ "expr ::= ID LP exprlist RP",
/* 255 */ "expr ::= ID LP STAR RP",
/* 256 */ "expr ::= expr IS NULL",
/* 257 */ "expr ::= expr IS NOT NULL",
/* 258 */ "expr ::= expr LT expr",
/* 259 */ "expr ::= expr GT expr",
/* 260 */ "expr ::= expr LE expr",
/* 261 */ "expr ::= expr GE expr",
/* 262 */ "expr ::= expr NE expr",
/* 263 */ "expr ::= expr EQ expr",
/* 264 */ "expr ::= expr BETWEEN expr AND expr",
/* 265 */ "expr ::= expr AND expr",
/* 266 */ "expr ::= expr OR expr",
/* 267 */ "expr ::= expr PLUS expr",
/* 268 */ "expr ::= expr MINUS expr",
/* 269 */ "expr ::= expr STAR expr",
/* 270 */ "expr ::= expr SLASH expr",
/* 271 */ "expr ::= expr REM expr",
/* 272 */ "expr ::= expr LIKE expr",
/* 273 */ "expr ::= expr MATCH expr",
/* 274 */ "expr ::= expr NMATCH expr",
/* 275 */ "expr ::= expr IN LP exprlist RP",
/* 276 */ "exprlist ::= exprlist COMMA expritem",
/* 277 */ "exprlist ::= expritem",
/* 278 */ "expritem ::= expr",
/* 279 */ "expritem ::=",
/* 280 */ "cmd ::= RESET QUERY CACHE",
/* 281 */ "cmd ::= SYNCDB ids REPLICA",
/* 282 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
/* 283 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
/* 284 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
/* 285 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
/* 286 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
/* 287 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
/* 288 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
/* 289 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
/* 290 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
/* 291 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
/* 292 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
/* 293 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
/* 294 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
/* 295 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
/* 296 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
/* 297 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
/* 298 */ "cmd ::= KILL CONNECTION INTEGER",
/* 299 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
/* 300 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
/* 103 */ "vgroups ::= VGROUPS INTEGER",
/* 104 */ "db_optr ::=",
/* 105 */ "db_optr ::= db_optr cache",
/* 106 */ "db_optr ::= db_optr replica",
/* 107 */ "db_optr ::= db_optr quorum",
/* 108 */ "db_optr ::= db_optr days",
/* 109 */ "db_optr ::= db_optr minrows",
/* 110 */ "db_optr ::= db_optr maxrows",
/* 111 */ "db_optr ::= db_optr blocks",
/* 112 */ "db_optr ::= db_optr ctime",
/* 113 */ "db_optr ::= db_optr wal",
/* 114 */ "db_optr ::= db_optr fsync",
/* 115 */ "db_optr ::= db_optr comp",
/* 116 */ "db_optr ::= db_optr prec",
/* 117 */ "db_optr ::= db_optr keep",
/* 118 */ "db_optr ::= db_optr update",
/* 119 */ "db_optr ::= db_optr cachelast",
/* 120 */ "db_optr ::= db_optr vgroups",
/* 121 */ "alter_db_optr ::=",
/* 122 */ "alter_db_optr ::= alter_db_optr replica",
/* 123 */ "alter_db_optr ::= alter_db_optr quorum",
/* 124 */ "alter_db_optr ::= alter_db_optr keep",
/* 125 */ "alter_db_optr ::= alter_db_optr blocks",
/* 126 */ "alter_db_optr ::= alter_db_optr comp",
/* 127 */ "alter_db_optr ::= alter_db_optr update",
/* 128 */ "alter_db_optr ::= alter_db_optr cachelast",
/* 129 */ "typename ::= ids",
/* 130 */ "typename ::= ids LP signed RP",
/* 131 */ "typename ::= ids UNSIGNED",
/* 132 */ "signed ::= INTEGER",
/* 133 */ "signed ::= PLUS INTEGER",
/* 134 */ "signed ::= MINUS INTEGER",
/* 135 */ "cmd ::= CREATE TABLE create_table_args",
/* 136 */ "cmd ::= CREATE TABLE create_stable_args",
/* 137 */ "cmd ::= CREATE STABLE create_stable_args",
/* 138 */ "cmd ::= CREATE TABLE create_table_list",
/* 139 */ "create_table_list ::= create_from_stable",
/* 140 */ "create_table_list ::= create_table_list create_from_stable",
/* 141 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP",
/* 142 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP",
/* 143 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP",
/* 144 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP",
/* 145 */ "tagNamelist ::= tagNamelist COMMA ids",
/* 146 */ "tagNamelist ::= ids",
/* 147 */ "create_table_args ::= ifnotexists ids cpxName AS select",
/* 148 */ "columnlist ::= columnlist COMMA column",
/* 149 */ "columnlist ::= column",
/* 150 */ "column ::= ids typename",
/* 151 */ "tagitemlist1 ::= tagitemlist1 COMMA tagitem1",
/* 152 */ "tagitemlist1 ::= tagitem1",
/* 153 */ "tagitem1 ::= MINUS INTEGER",
/* 154 */ "tagitem1 ::= MINUS FLOAT",
/* 155 */ "tagitem1 ::= PLUS INTEGER",
/* 156 */ "tagitem1 ::= PLUS FLOAT",
/* 157 */ "tagitem1 ::= INTEGER",
/* 158 */ "tagitem1 ::= FLOAT",
/* 159 */ "tagitem1 ::= STRING",
/* 160 */ "tagitem1 ::= BOOL",
/* 161 */ "tagitem1 ::= NULL",
/* 162 */ "tagitem1 ::= NOW",
/* 163 */ "tagitemlist ::= tagitemlist COMMA tagitem",
/* 164 */ "tagitemlist ::= tagitem",
/* 165 */ "tagitem ::= INTEGER",
/* 166 */ "tagitem ::= FLOAT",
/* 167 */ "tagitem ::= STRING",
/* 168 */ "tagitem ::= BOOL",
/* 169 */ "tagitem ::= NULL",
/* 170 */ "tagitem ::= NOW",
/* 171 */ "tagitem ::= MINUS INTEGER",
/* 172 */ "tagitem ::= MINUS FLOAT",
/* 173 */ "tagitem ::= PLUS INTEGER",
/* 174 */ "tagitem ::= PLUS FLOAT",
/* 175 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt",
/* 176 */ "select ::= LP select RP",
/* 177 */ "union ::= select",
/* 178 */ "union ::= union UNION ALL select",
/* 179 */ "union ::= union UNION select",
/* 180 */ "cmd ::= union",
/* 181 */ "select ::= SELECT selcollist",
/* 182 */ "sclp ::= selcollist COMMA",
/* 183 */ "sclp ::=",
/* 184 */ "selcollist ::= sclp distinct expr as",
/* 185 */ "selcollist ::= sclp STAR",
/* 186 */ "as ::= AS ids",
/* 187 */ "as ::= ids",
/* 188 */ "as ::=",
/* 189 */ "distinct ::= DISTINCT",
/* 190 */ "distinct ::=",
/* 191 */ "from ::= FROM tablelist",
/* 192 */ "from ::= FROM sub",
/* 193 */ "sub ::= LP union RP",
/* 194 */ "sub ::= LP union RP ids",
/* 195 */ "sub ::= sub COMMA LP union RP ids",
/* 196 */ "tablelist ::= ids cpxName",
/* 197 */ "tablelist ::= ids cpxName ids",
/* 198 */ "tablelist ::= tablelist COMMA ids cpxName",
/* 199 */ "tablelist ::= tablelist COMMA ids cpxName ids",
/* 200 */ "tmvar ::= VARIABLE",
/* 201 */ "interval_option ::= intervalKey LP tmvar RP",
/* 202 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP",
/* 203 */ "interval_option ::=",
/* 204 */ "intervalKey ::= INTERVAL",
/* 205 */ "intervalKey ::= EVERY",
/* 206 */ "session_option ::=",
/* 207 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP",
/* 208 */ "windowstate_option ::=",
/* 209 */ "windowstate_option ::= STATE_WINDOW LP ids RP",
/* 210 */ "fill_opt ::=",
/* 211 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP",
/* 212 */ "fill_opt ::= FILL LP ID RP",
/* 213 */ "sliding_opt ::= SLIDING LP tmvar RP",
/* 214 */ "sliding_opt ::=",
/* 215 */ "orderby_opt ::=",
/* 216 */ "orderby_opt ::= ORDER BY sortlist",
/* 217 */ "sortlist ::= sortlist COMMA item sortorder",
/* 218 */ "sortlist ::= item sortorder",
/* 219 */ "item ::= ids cpxName",
/* 220 */ "sortorder ::= ASC",
/* 221 */ "sortorder ::= DESC",
/* 222 */ "sortorder ::=",
/* 223 */ "groupby_opt ::=",
/* 224 */ "groupby_opt ::= GROUP BY grouplist",
/* 225 */ "grouplist ::= grouplist COMMA item",
/* 226 */ "grouplist ::= item",
/* 227 */ "having_opt ::=",
/* 228 */ "having_opt ::= HAVING expr",
/* 229 */ "limit_opt ::=",
/* 230 */ "limit_opt ::= LIMIT signed",
/* 231 */ "limit_opt ::= LIMIT signed OFFSET signed",
/* 232 */ "limit_opt ::= LIMIT signed COMMA signed",
/* 233 */ "slimit_opt ::=",
/* 234 */ "slimit_opt ::= SLIMIT signed",
/* 235 */ "slimit_opt ::= SLIMIT signed SOFFSET signed",
/* 236 */ "slimit_opt ::= SLIMIT signed COMMA signed",
/* 237 */ "where_opt ::=",
/* 238 */ "where_opt ::= WHERE expr",
/* 239 */ "expr ::= LP expr RP",
/* 240 */ "expr ::= ID",
/* 241 */ "expr ::= ID DOT ID",
/* 242 */ "expr ::= ID DOT STAR",
/* 243 */ "expr ::= INTEGER",
/* 244 */ "expr ::= MINUS INTEGER",
/* 245 */ "expr ::= PLUS INTEGER",
/* 246 */ "expr ::= FLOAT",
/* 247 */ "expr ::= MINUS FLOAT",
/* 248 */ "expr ::= PLUS FLOAT",
/* 249 */ "expr ::= STRING",
/* 250 */ "expr ::= NOW",
/* 251 */ "expr ::= VARIABLE",
/* 252 */ "expr ::= PLUS VARIABLE",
/* 253 */ "expr ::= MINUS VARIABLE",
/* 254 */ "expr ::= BOOL",
/* 255 */ "expr ::= NULL",
/* 256 */ "expr ::= ID LP exprlist RP",
/* 257 */ "expr ::= ID LP STAR RP",
/* 258 */ "expr ::= expr IS NULL",
/* 259 */ "expr ::= expr IS NOT NULL",
/* 260 */ "expr ::= expr LT expr",
/* 261 */ "expr ::= expr GT expr",
/* 262 */ "expr ::= expr LE expr",
/* 263 */ "expr ::= expr GE expr",
/* 264 */ "expr ::= expr NE expr",
/* 265 */ "expr ::= expr EQ expr",
/* 266 */ "expr ::= expr BETWEEN expr AND expr",
/* 267 */ "expr ::= expr AND expr",
/* 268 */ "expr ::= expr OR expr",
/* 269 */ "expr ::= expr PLUS expr",
/* 270 */ "expr ::= expr MINUS expr",
/* 271 */ "expr ::= expr STAR expr",
/* 272 */ "expr ::= expr SLASH expr",
/* 273 */ "expr ::= expr REM expr",
/* 274 */ "expr ::= expr LIKE expr",
/* 275 */ "expr ::= expr MATCH expr",
/* 276 */ "expr ::= expr NMATCH expr",
/* 277 */ "expr ::= expr IN LP exprlist RP",
/* 278 */ "exprlist ::= exprlist COMMA expritem",
/* 279 */ "exprlist ::= expritem",
/* 280 */ "expritem ::= expr",
/* 281 */ "expritem ::=",
/* 282 */ "cmd ::= RESET QUERY CACHE",
/* 283 */ "cmd ::= SYNCDB ids REPLICA",
/* 284 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist",
/* 285 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids",
/* 286 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist",
/* 287 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist",
/* 288 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids",
/* 289 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids",
/* 290 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem",
/* 291 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist",
/* 292 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist",
/* 293 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids",
/* 294 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist",
/* 295 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist",
/* 296 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids",
/* 297 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids",
/* 298 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem",
/* 299 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist",
/* 300 */ "cmd ::= KILL CONNECTION INTEGER",
/* 301 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER",
/* 302 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER",
};
#endif /* NDEBUG */
......@@ -1489,60 +1494,60 @@ static void yy_destructor(
*/
/********* Begin destructor definitions ***************************************/
case 200: /* exprlist */
case 244: /* selcollist */
case 258: /* sclp */
case 245: /* selcollist */
case 259: /* sclp */
{
tSqlExprListDestroy((yypminor->yy413));
tSqlExprListDestroy((yypminor->yy165));
}
break;
case 214: /* intitemlist */
case 216: /* keep */
case 236: /* columnlist */
case 237: /* tagitemlist1 */
case 238: /* tagNamelist */
case 242: /* tagitemlist */
case 251: /* fill_opt */
case 252: /* groupby_opt */
case 254: /* orderby_opt */
case 266: /* sortlist */
case 270: /* grouplist */
case 237: /* columnlist */
case 238: /* tagitemlist1 */
case 239: /* tagNamelist */
case 243: /* tagitemlist */
case 252: /* fill_opt */
case 253: /* groupby_opt */
case 255: /* orderby_opt */
case 267: /* sortlist */
case 271: /* grouplist */
{
taosArrayDestroy((yypminor->yy413));
taosArrayDestroy((yypminor->yy165));
}
break;
case 234: /* create_table_list */
case 235: /* create_table_list */
{
destroyCreateTableSql((yypminor->yy438));
destroyCreateTableSql((yypminor->yy326));
}
break;
case 239: /* select */
case 240: /* select */
{
destroySqlNode((yypminor->yy24));
destroySqlNode((yypminor->yy278));
}
break;
case 245: /* from */
case 262: /* tablelist */
case 263: /* sub */
case 246: /* from */
case 263: /* tablelist */
case 264: /* sub */
{
destroyRelationInfo((yypminor->yy292));
destroyRelationInfo((yypminor->yy10));
}
break;
case 246: /* where_opt */
case 253: /* having_opt */
case 260: /* expr */
case 271: /* expritem */
case 247: /* where_opt */
case 254: /* having_opt */
case 261: /* expr */
case 272: /* expritem */
{
tSqlExprDestroy((yypminor->yy370));
tSqlExprDestroy((yypminor->yy202));
}
break;
case 257: /* union */
case 258: /* union */
{
destroyAllSqlNode((yypminor->yy129));
destroyAllSqlNode((yypminor->yy503));
}
break;
case 267: /* sortitem */
case 268: /* sortitem */
{
taosVariantDestroy(&(yypminor->yy461));
taosVariantDestroy(&(yypminor->yy425));
}
break;
/********* End destructor definitions *****************************************/
......@@ -1939,204 +1944,206 @@ static const struct {
{ 228, -2 }, /* (100) prec ::= PRECISION STRING */
{ 229, -2 }, /* (101) update ::= UPDATE INTEGER */
{ 230, -2 }, /* (102) cachelast ::= CACHELAST INTEGER */
{ 202, 0 }, /* (103) db_optr ::= */
{ 202, -2 }, /* (104) db_optr ::= db_optr cache */
{ 202, -2 }, /* (105) db_optr ::= db_optr replica */
{ 202, -2 }, /* (106) db_optr ::= db_optr quorum */
{ 202, -2 }, /* (107) db_optr ::= db_optr days */
{ 202, -2 }, /* (108) db_optr ::= db_optr minrows */
{ 202, -2 }, /* (109) db_optr ::= db_optr maxrows */
{ 202, -2 }, /* (110) db_optr ::= db_optr blocks */
{ 202, -2 }, /* (111) db_optr ::= db_optr ctime */
{ 202, -2 }, /* (112) db_optr ::= db_optr wal */
{ 202, -2 }, /* (113) db_optr ::= db_optr fsync */
{ 202, -2 }, /* (114) db_optr ::= db_optr comp */
{ 202, -2 }, /* (115) db_optr ::= db_optr prec */
{ 202, -2 }, /* (116) db_optr ::= db_optr keep */
{ 202, -2 }, /* (117) db_optr ::= db_optr update */
{ 202, -2 }, /* (118) db_optr ::= db_optr cachelast */
{ 198, 0 }, /* (119) alter_db_optr ::= */
{ 198, -2 }, /* (120) alter_db_optr ::= alter_db_optr replica */
{ 198, -2 }, /* (121) alter_db_optr ::= alter_db_optr quorum */
{ 198, -2 }, /* (122) alter_db_optr ::= alter_db_optr keep */
{ 198, -2 }, /* (123) alter_db_optr ::= alter_db_optr blocks */
{ 198, -2 }, /* (124) alter_db_optr ::= alter_db_optr comp */
{ 198, -2 }, /* (125) alter_db_optr ::= alter_db_optr update */
{ 198, -2 }, /* (126) alter_db_optr ::= alter_db_optr cachelast */
{ 203, -1 }, /* (127) typename ::= ids */
{ 203, -4 }, /* (128) typename ::= ids LP signed RP */
{ 203, -2 }, /* (129) typename ::= ids UNSIGNED */
{ 231, -1 }, /* (130) signed ::= INTEGER */
{ 231, -2 }, /* (131) signed ::= PLUS INTEGER */
{ 231, -2 }, /* (132) signed ::= MINUS INTEGER */
{ 193, -3 }, /* (133) cmd ::= CREATE TABLE create_table_args */
{ 193, -3 }, /* (134) cmd ::= CREATE TABLE create_stable_args */
{ 193, -3 }, /* (135) cmd ::= CREATE STABLE create_stable_args */
{ 193, -3 }, /* (136) cmd ::= CREATE TABLE create_table_list */
{ 234, -1 }, /* (137) create_table_list ::= create_from_stable */
{ 234, -2 }, /* (138) create_table_list ::= create_table_list create_from_stable */
{ 232, -6 }, /* (139) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
{ 233, -10 }, /* (140) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
{ 235, -10 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */
{ 235, -13 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */
{ 238, -3 }, /* (143) tagNamelist ::= tagNamelist COMMA ids */
{ 238, -1 }, /* (144) tagNamelist ::= ids */
{ 232, -5 }, /* (145) create_table_args ::= ifnotexists ids cpxName AS select */
{ 236, -3 }, /* (146) columnlist ::= columnlist COMMA column */
{ 236, -1 }, /* (147) columnlist ::= column */
{ 240, -2 }, /* (148) column ::= ids typename */
{ 237, -3 }, /* (149) tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */
{ 237, -1 }, /* (150) tagitemlist1 ::= tagitem1 */
{ 241, -2 }, /* (151) tagitem1 ::= MINUS INTEGER */
{ 241, -2 }, /* (152) tagitem1 ::= MINUS FLOAT */
{ 241, -2 }, /* (153) tagitem1 ::= PLUS INTEGER */
{ 241, -2 }, /* (154) tagitem1 ::= PLUS FLOAT */
{ 241, -1 }, /* (155) tagitem1 ::= INTEGER */
{ 241, -1 }, /* (156) tagitem1 ::= FLOAT */
{ 241, -1 }, /* (157) tagitem1 ::= STRING */
{ 241, -1 }, /* (158) tagitem1 ::= BOOL */
{ 241, -1 }, /* (159) tagitem1 ::= NULL */
{ 241, -1 }, /* (160) tagitem1 ::= NOW */
{ 242, -3 }, /* (161) tagitemlist ::= tagitemlist COMMA tagitem */
{ 242, -1 }, /* (162) tagitemlist ::= tagitem */
{ 243, -1 }, /* (163) tagitem ::= INTEGER */
{ 243, -1 }, /* (164) tagitem ::= FLOAT */
{ 243, -1 }, /* (165) tagitem ::= STRING */
{ 243, -1 }, /* (166) tagitem ::= BOOL */
{ 243, -1 }, /* (167) tagitem ::= NULL */
{ 243, -1 }, /* (168) tagitem ::= NOW */
{ 243, -2 }, /* (169) tagitem ::= MINUS INTEGER */
{ 243, -2 }, /* (170) tagitem ::= MINUS FLOAT */
{ 243, -2 }, /* (171) tagitem ::= PLUS INTEGER */
{ 243, -2 }, /* (172) tagitem ::= PLUS FLOAT */
{ 239, -14 }, /* (173) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
{ 239, -3 }, /* (174) select ::= LP select RP */
{ 257, -1 }, /* (175) union ::= select */
{ 257, -4 }, /* (176) union ::= union UNION ALL select */
{ 257, -3 }, /* (177) union ::= union UNION select */
{ 193, -1 }, /* (178) cmd ::= union */
{ 239, -2 }, /* (179) select ::= SELECT selcollist */
{ 258, -2 }, /* (180) sclp ::= selcollist COMMA */
{ 258, 0 }, /* (181) sclp ::= */
{ 244, -4 }, /* (182) selcollist ::= sclp distinct expr as */
{ 244, -2 }, /* (183) selcollist ::= sclp STAR */
{ 261, -2 }, /* (184) as ::= AS ids */
{ 261, -1 }, /* (185) as ::= ids */
{ 261, 0 }, /* (186) as ::= */
{ 259, -1 }, /* (187) distinct ::= DISTINCT */
{ 259, 0 }, /* (188) distinct ::= */
{ 245, -2 }, /* (189) from ::= FROM tablelist */
{ 245, -2 }, /* (190) from ::= FROM sub */
{ 263, -3 }, /* (191) sub ::= LP union RP */
{ 263, -4 }, /* (192) sub ::= LP union RP ids */
{ 263, -6 }, /* (193) sub ::= sub COMMA LP union RP ids */
{ 262, -2 }, /* (194) tablelist ::= ids cpxName */
{ 262, -3 }, /* (195) tablelist ::= ids cpxName ids */
{ 262, -4 }, /* (196) tablelist ::= tablelist COMMA ids cpxName */
{ 262, -5 }, /* (197) tablelist ::= tablelist COMMA ids cpxName ids */
{ 264, -1 }, /* (198) tmvar ::= VARIABLE */
{ 247, -4 }, /* (199) interval_option ::= intervalKey LP tmvar RP */
{ 247, -6 }, /* (200) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
{ 247, 0 }, /* (201) interval_option ::= */
{ 265, -1 }, /* (202) intervalKey ::= INTERVAL */
{ 265, -1 }, /* (203) intervalKey ::= EVERY */
{ 249, 0 }, /* (204) session_option ::= */
{ 249, -7 }, /* (205) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
{ 250, 0 }, /* (206) windowstate_option ::= */
{ 250, -4 }, /* (207) windowstate_option ::= STATE_WINDOW LP ids RP */
{ 251, 0 }, /* (208) fill_opt ::= */
{ 251, -6 }, /* (209) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{ 251, -4 }, /* (210) fill_opt ::= FILL LP ID RP */
{ 248, -4 }, /* (211) sliding_opt ::= SLIDING LP tmvar RP */
{ 248, 0 }, /* (212) sliding_opt ::= */
{ 254, 0 }, /* (213) orderby_opt ::= */
{ 254, -3 }, /* (214) orderby_opt ::= ORDER BY sortlist */
{ 266, -4 }, /* (215) sortlist ::= sortlist COMMA item sortorder */
{ 266, -2 }, /* (216) sortlist ::= item sortorder */
{ 268, -2 }, /* (217) item ::= ids cpxName */
{ 269, -1 }, /* (218) sortorder ::= ASC */
{ 269, -1 }, /* (219) sortorder ::= DESC */
{ 269, 0 }, /* (220) sortorder ::= */
{ 252, 0 }, /* (221) groupby_opt ::= */
{ 252, -3 }, /* (222) groupby_opt ::= GROUP BY grouplist */
{ 270, -3 }, /* (223) grouplist ::= grouplist COMMA item */
{ 270, -1 }, /* (224) grouplist ::= item */
{ 253, 0 }, /* (225) having_opt ::= */
{ 253, -2 }, /* (226) having_opt ::= HAVING expr */
{ 256, 0 }, /* (227) limit_opt ::= */
{ 256, -2 }, /* (228) limit_opt ::= LIMIT signed */
{ 256, -4 }, /* (229) limit_opt ::= LIMIT signed OFFSET signed */
{ 256, -4 }, /* (230) limit_opt ::= LIMIT signed COMMA signed */
{ 255, 0 }, /* (231) slimit_opt ::= */
{ 255, -2 }, /* (232) slimit_opt ::= SLIMIT signed */
{ 255, -4 }, /* (233) slimit_opt ::= SLIMIT signed SOFFSET signed */
{ 255, -4 }, /* (234) slimit_opt ::= SLIMIT signed COMMA signed */
{ 246, 0 }, /* (235) where_opt ::= */
{ 246, -2 }, /* (236) where_opt ::= WHERE expr */
{ 260, -3 }, /* (237) expr ::= LP expr RP */
{ 260, -1 }, /* (238) expr ::= ID */
{ 260, -3 }, /* (239) expr ::= ID DOT ID */
{ 260, -3 }, /* (240) expr ::= ID DOT STAR */
{ 260, -1 }, /* (241) expr ::= INTEGER */
{ 260, -2 }, /* (242) expr ::= MINUS INTEGER */
{ 260, -2 }, /* (243) expr ::= PLUS INTEGER */
{ 260, -1 }, /* (244) expr ::= FLOAT */
{ 260, -2 }, /* (245) expr ::= MINUS FLOAT */
{ 260, -2 }, /* (246) expr ::= PLUS FLOAT */
{ 260, -1 }, /* (247) expr ::= STRING */
{ 260, -1 }, /* (248) expr ::= NOW */
{ 260, -1 }, /* (249) expr ::= VARIABLE */
{ 260, -2 }, /* (250) expr ::= PLUS VARIABLE */
{ 260, -2 }, /* (251) expr ::= MINUS VARIABLE */
{ 260, -1 }, /* (252) expr ::= BOOL */
{ 260, -1 }, /* (253) expr ::= NULL */
{ 260, -4 }, /* (254) expr ::= ID LP exprlist RP */
{ 260, -4 }, /* (255) expr ::= ID LP STAR RP */
{ 260, -3 }, /* (256) expr ::= expr IS NULL */
{ 260, -4 }, /* (257) expr ::= expr IS NOT NULL */
{ 260, -3 }, /* (258) expr ::= expr LT expr */
{ 260, -3 }, /* (259) expr ::= expr GT expr */
{ 260, -3 }, /* (260) expr ::= expr LE expr */
{ 260, -3 }, /* (261) expr ::= expr GE expr */
{ 260, -3 }, /* (262) expr ::= expr NE expr */
{ 260, -3 }, /* (263) expr ::= expr EQ expr */
{ 260, -5 }, /* (264) expr ::= expr BETWEEN expr AND expr */
{ 260, -3 }, /* (265) expr ::= expr AND expr */
{ 260, -3 }, /* (266) expr ::= expr OR expr */
{ 260, -3 }, /* (267) expr ::= expr PLUS expr */
{ 260, -3 }, /* (268) expr ::= expr MINUS expr */
{ 260, -3 }, /* (269) expr ::= expr STAR expr */
{ 260, -3 }, /* (270) expr ::= expr SLASH expr */
{ 260, -3 }, /* (271) expr ::= expr REM expr */
{ 260, -3 }, /* (272) expr ::= expr LIKE expr */
{ 260, -3 }, /* (273) expr ::= expr MATCH expr */
{ 260, -3 }, /* (274) expr ::= expr NMATCH expr */
{ 260, -5 }, /* (275) expr ::= expr IN LP exprlist RP */
{ 200, -3 }, /* (276) exprlist ::= exprlist COMMA expritem */
{ 200, -1 }, /* (277) exprlist ::= expritem */
{ 271, -1 }, /* (278) expritem ::= expr */
{ 271, 0 }, /* (279) expritem ::= */
{ 193, -3 }, /* (280) cmd ::= RESET QUERY CACHE */
{ 193, -3 }, /* (281) cmd ::= SYNCDB ids REPLICA */
{ 193, -7 }, /* (282) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{ 193, -7 }, /* (283) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{ 193, -7 }, /* (284) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
{ 193, -7 }, /* (285) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{ 193, -7 }, /* (286) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{ 193, -8 }, /* (287) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{ 193, -9 }, /* (288) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{ 193, -7 }, /* (289) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
{ 193, -7 }, /* (290) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
{ 193, -7 }, /* (291) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{ 193, -7 }, /* (292) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
{ 193, -7 }, /* (293) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
{ 193, -7 }, /* (294) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
{ 193, -8 }, /* (295) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
{ 193, -9 }, /* (296) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
{ 193, -7 }, /* (297) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
{ 193, -3 }, /* (298) cmd ::= KILL CONNECTION INTEGER */
{ 193, -5 }, /* (299) cmd ::= KILL STREAM INTEGER COLON INTEGER */
{ 193, -5 }, /* (300) cmd ::= KILL QUERY INTEGER COLON INTEGER */
{ 231, -2 }, /* (103) vgroups ::= VGROUPS INTEGER */
{ 202, 0 }, /* (104) db_optr ::= */
{ 202, -2 }, /* (105) db_optr ::= db_optr cache */
{ 202, -2 }, /* (106) db_optr ::= db_optr replica */
{ 202, -2 }, /* (107) db_optr ::= db_optr quorum */
{ 202, -2 }, /* (108) db_optr ::= db_optr days */
{ 202, -2 }, /* (109) db_optr ::= db_optr minrows */
{ 202, -2 }, /* (110) db_optr ::= db_optr maxrows */
{ 202, -2 }, /* (111) db_optr ::= db_optr blocks */
{ 202, -2 }, /* (112) db_optr ::= db_optr ctime */
{ 202, -2 }, /* (113) db_optr ::= db_optr wal */
{ 202, -2 }, /* (114) db_optr ::= db_optr fsync */
{ 202, -2 }, /* (115) db_optr ::= db_optr comp */
{ 202, -2 }, /* (116) db_optr ::= db_optr prec */
{ 202, -2 }, /* (117) db_optr ::= db_optr keep */
{ 202, -2 }, /* (118) db_optr ::= db_optr update */
{ 202, -2 }, /* (119) db_optr ::= db_optr cachelast */
{ 202, -2 }, /* (120) db_optr ::= db_optr vgroups */
{ 198, 0 }, /* (121) alter_db_optr ::= */
{ 198, -2 }, /* (122) alter_db_optr ::= alter_db_optr replica */
{ 198, -2 }, /* (123) alter_db_optr ::= alter_db_optr quorum */
{ 198, -2 }, /* (124) alter_db_optr ::= alter_db_optr keep */
{ 198, -2 }, /* (125) alter_db_optr ::= alter_db_optr blocks */
{ 198, -2 }, /* (126) alter_db_optr ::= alter_db_optr comp */
{ 198, -2 }, /* (127) alter_db_optr ::= alter_db_optr update */
{ 198, -2 }, /* (128) alter_db_optr ::= alter_db_optr cachelast */
{ 203, -1 }, /* (129) typename ::= ids */
{ 203, -4 }, /* (130) typename ::= ids LP signed RP */
{ 203, -2 }, /* (131) typename ::= ids UNSIGNED */
{ 232, -1 }, /* (132) signed ::= INTEGER */
{ 232, -2 }, /* (133) signed ::= PLUS INTEGER */
{ 232, -2 }, /* (134) signed ::= MINUS INTEGER */
{ 193, -3 }, /* (135) cmd ::= CREATE TABLE create_table_args */
{ 193, -3 }, /* (136) cmd ::= CREATE TABLE create_stable_args */
{ 193, -3 }, /* (137) cmd ::= CREATE STABLE create_stable_args */
{ 193, -3 }, /* (138) cmd ::= CREATE TABLE create_table_list */
{ 235, -1 }, /* (139) create_table_list ::= create_from_stable */
{ 235, -2 }, /* (140) create_table_list ::= create_table_list create_from_stable */
{ 233, -6 }, /* (141) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
{ 234, -10 }, /* (142) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
{ 236, -10 }, /* (143) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */
{ 236, -13 }, /* (144) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */
{ 239, -3 }, /* (145) tagNamelist ::= tagNamelist COMMA ids */
{ 239, -1 }, /* (146) tagNamelist ::= ids */
{ 233, -5 }, /* (147) create_table_args ::= ifnotexists ids cpxName AS select */
{ 237, -3 }, /* (148) columnlist ::= columnlist COMMA column */
{ 237, -1 }, /* (149) columnlist ::= column */
{ 241, -2 }, /* (150) column ::= ids typename */
{ 238, -3 }, /* (151) tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */
{ 238, -1 }, /* (152) tagitemlist1 ::= tagitem1 */
{ 242, -2 }, /* (153) tagitem1 ::= MINUS INTEGER */
{ 242, -2 }, /* (154) tagitem1 ::= MINUS FLOAT */
{ 242, -2 }, /* (155) tagitem1 ::= PLUS INTEGER */
{ 242, -2 }, /* (156) tagitem1 ::= PLUS FLOAT */
{ 242, -1 }, /* (157) tagitem1 ::= INTEGER */
{ 242, -1 }, /* (158) tagitem1 ::= FLOAT */
{ 242, -1 }, /* (159) tagitem1 ::= STRING */
{ 242, -1 }, /* (160) tagitem1 ::= BOOL */
{ 242, -1 }, /* (161) tagitem1 ::= NULL */
{ 242, -1 }, /* (162) tagitem1 ::= NOW */
{ 243, -3 }, /* (163) tagitemlist ::= tagitemlist COMMA tagitem */
{ 243, -1 }, /* (164) tagitemlist ::= tagitem */
{ 244, -1 }, /* (165) tagitem ::= INTEGER */
{ 244, -1 }, /* (166) tagitem ::= FLOAT */
{ 244, -1 }, /* (167) tagitem ::= STRING */
{ 244, -1 }, /* (168) tagitem ::= BOOL */
{ 244, -1 }, /* (169) tagitem ::= NULL */
{ 244, -1 }, /* (170) tagitem ::= NOW */
{ 244, -2 }, /* (171) tagitem ::= MINUS INTEGER */
{ 244, -2 }, /* (172) tagitem ::= MINUS FLOAT */
{ 244, -2 }, /* (173) tagitem ::= PLUS INTEGER */
{ 244, -2 }, /* (174) tagitem ::= PLUS FLOAT */
{ 240, -14 }, /* (175) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
{ 240, -3 }, /* (176) select ::= LP select RP */
{ 258, -1 }, /* (177) union ::= select */
{ 258, -4 }, /* (178) union ::= union UNION ALL select */
{ 258, -3 }, /* (179) union ::= union UNION select */
{ 193, -1 }, /* (180) cmd ::= union */
{ 240, -2 }, /* (181) select ::= SELECT selcollist */
{ 259, -2 }, /* (182) sclp ::= selcollist COMMA */
{ 259, 0 }, /* (183) sclp ::= */
{ 245, -4 }, /* (184) selcollist ::= sclp distinct expr as */
{ 245, -2 }, /* (185) selcollist ::= sclp STAR */
{ 262, -2 }, /* (186) as ::= AS ids */
{ 262, -1 }, /* (187) as ::= ids */
{ 262, 0 }, /* (188) as ::= */
{ 260, -1 }, /* (189) distinct ::= DISTINCT */
{ 260, 0 }, /* (190) distinct ::= */
{ 246, -2 }, /* (191) from ::= FROM tablelist */
{ 246, -2 }, /* (192) from ::= FROM sub */
{ 264, -3 }, /* (193) sub ::= LP union RP */
{ 264, -4 }, /* (194) sub ::= LP union RP ids */
{ 264, -6 }, /* (195) sub ::= sub COMMA LP union RP ids */
{ 263, -2 }, /* (196) tablelist ::= ids cpxName */
{ 263, -3 }, /* (197) tablelist ::= ids cpxName ids */
{ 263, -4 }, /* (198) tablelist ::= tablelist COMMA ids cpxName */
{ 263, -5 }, /* (199) tablelist ::= tablelist COMMA ids cpxName ids */
{ 265, -1 }, /* (200) tmvar ::= VARIABLE */
{ 248, -4 }, /* (201) interval_option ::= intervalKey LP tmvar RP */
{ 248, -6 }, /* (202) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
{ 248, 0 }, /* (203) interval_option ::= */
{ 266, -1 }, /* (204) intervalKey ::= INTERVAL */
{ 266, -1 }, /* (205) intervalKey ::= EVERY */
{ 250, 0 }, /* (206) session_option ::= */
{ 250, -7 }, /* (207) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
{ 251, 0 }, /* (208) windowstate_option ::= */
{ 251, -4 }, /* (209) windowstate_option ::= STATE_WINDOW LP ids RP */
{ 252, 0 }, /* (210) fill_opt ::= */
{ 252, -6 }, /* (211) fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{ 252, -4 }, /* (212) fill_opt ::= FILL LP ID RP */
{ 249, -4 }, /* (213) sliding_opt ::= SLIDING LP tmvar RP */
{ 249, 0 }, /* (214) sliding_opt ::= */
{ 255, 0 }, /* (215) orderby_opt ::= */
{ 255, -3 }, /* (216) orderby_opt ::= ORDER BY sortlist */
{ 267, -4 }, /* (217) sortlist ::= sortlist COMMA item sortorder */
{ 267, -2 }, /* (218) sortlist ::= item sortorder */
{ 269, -2 }, /* (219) item ::= ids cpxName */
{ 270, -1 }, /* (220) sortorder ::= ASC */
{ 270, -1 }, /* (221) sortorder ::= DESC */
{ 270, 0 }, /* (222) sortorder ::= */
{ 253, 0 }, /* (223) groupby_opt ::= */
{ 253, -3 }, /* (224) groupby_opt ::= GROUP BY grouplist */
{ 271, -3 }, /* (225) grouplist ::= grouplist COMMA item */
{ 271, -1 }, /* (226) grouplist ::= item */
{ 254, 0 }, /* (227) having_opt ::= */
{ 254, -2 }, /* (228) having_opt ::= HAVING expr */
{ 257, 0 }, /* (229) limit_opt ::= */
{ 257, -2 }, /* (230) limit_opt ::= LIMIT signed */
{ 257, -4 }, /* (231) limit_opt ::= LIMIT signed OFFSET signed */
{ 257, -4 }, /* (232) limit_opt ::= LIMIT signed COMMA signed */
{ 256, 0 }, /* (233) slimit_opt ::= */
{ 256, -2 }, /* (234) slimit_opt ::= SLIMIT signed */
{ 256, -4 }, /* (235) slimit_opt ::= SLIMIT signed SOFFSET signed */
{ 256, -4 }, /* (236) slimit_opt ::= SLIMIT signed COMMA signed */
{ 247, 0 }, /* (237) where_opt ::= */
{ 247, -2 }, /* (238) where_opt ::= WHERE expr */
{ 261, -3 }, /* (239) expr ::= LP expr RP */
{ 261, -1 }, /* (240) expr ::= ID */
{ 261, -3 }, /* (241) expr ::= ID DOT ID */
{ 261, -3 }, /* (242) expr ::= ID DOT STAR */
{ 261, -1 }, /* (243) expr ::= INTEGER */
{ 261, -2 }, /* (244) expr ::= MINUS INTEGER */
{ 261, -2 }, /* (245) expr ::= PLUS INTEGER */
{ 261, -1 }, /* (246) expr ::= FLOAT */
{ 261, -2 }, /* (247) expr ::= MINUS FLOAT */
{ 261, -2 }, /* (248) expr ::= PLUS FLOAT */
{ 261, -1 }, /* (249) expr ::= STRING */
{ 261, -1 }, /* (250) expr ::= NOW */
{ 261, -1 }, /* (251) expr ::= VARIABLE */
{ 261, -2 }, /* (252) expr ::= PLUS VARIABLE */
{ 261, -2 }, /* (253) expr ::= MINUS VARIABLE */
{ 261, -1 }, /* (254) expr ::= BOOL */
{ 261, -1 }, /* (255) expr ::= NULL */
{ 261, -4 }, /* (256) expr ::= ID LP exprlist RP */
{ 261, -4 }, /* (257) expr ::= ID LP STAR RP */
{ 261, -3 }, /* (258) expr ::= expr IS NULL */
{ 261, -4 }, /* (259) expr ::= expr IS NOT NULL */
{ 261, -3 }, /* (260) expr ::= expr LT expr */
{ 261, -3 }, /* (261) expr ::= expr GT expr */
{ 261, -3 }, /* (262) expr ::= expr LE expr */
{ 261, -3 }, /* (263) expr ::= expr GE expr */
{ 261, -3 }, /* (264) expr ::= expr NE expr */
{ 261, -3 }, /* (265) expr ::= expr EQ expr */
{ 261, -5 }, /* (266) expr ::= expr BETWEEN expr AND expr */
{ 261, -3 }, /* (267) expr ::= expr AND expr */
{ 261, -3 }, /* (268) expr ::= expr OR expr */
{ 261, -3 }, /* (269) expr ::= expr PLUS expr */
{ 261, -3 }, /* (270) expr ::= expr MINUS expr */
{ 261, -3 }, /* (271) expr ::= expr STAR expr */
{ 261, -3 }, /* (272) expr ::= expr SLASH expr */
{ 261, -3 }, /* (273) expr ::= expr REM expr */
{ 261, -3 }, /* (274) expr ::= expr LIKE expr */
{ 261, -3 }, /* (275) expr ::= expr MATCH expr */
{ 261, -3 }, /* (276) expr ::= expr NMATCH expr */
{ 261, -5 }, /* (277) expr ::= expr IN LP exprlist RP */
{ 200, -3 }, /* (278) exprlist ::= exprlist COMMA expritem */
{ 200, -1 }, /* (279) exprlist ::= expritem */
{ 272, -1 }, /* (280) expritem ::= expr */
{ 272, 0 }, /* (281) expritem ::= */
{ 193, -3 }, /* (282) cmd ::= RESET QUERY CACHE */
{ 193, -3 }, /* (283) cmd ::= SYNCDB ids REPLICA */
{ 193, -7 }, /* (284) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{ 193, -7 }, /* (285) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{ 193, -7 }, /* (286) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
{ 193, -7 }, /* (287) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{ 193, -7 }, /* (288) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{ 193, -8 }, /* (289) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{ 193, -9 }, /* (290) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{ 193, -7 }, /* (291) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
{ 193, -7 }, /* (292) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
{ 193, -7 }, /* (293) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{ 193, -7 }, /* (294) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
{ 193, -7 }, /* (295) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
{ 193, -7 }, /* (296) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
{ 193, -8 }, /* (297) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
{ 193, -9 }, /* (298) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
{ 193, -7 }, /* (299) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
{ 193, -3 }, /* (300) cmd ::= KILL CONNECTION INTEGER */
{ 193, -5 }, /* (301) cmd ::= KILL STREAM INTEGER COLON INTEGER */
{ 193, -5 }, /* (302) cmd ::= KILL QUERY INTEGER COLON INTEGER */
};
static void yy_accept(yyParser*); /* Forward Declaration */
......@@ -2217,9 +2224,9 @@ static void yy_reduce(
/********** Begin reduce actions **********************************************/
YYMINORTYPE yylhsminor;
case 0: /* program ::= cmd */
case 133: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==133);
case 134: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==134);
case 135: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==135);
case 135: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==135);
case 136: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==136);
case 137: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==137);
{}
break;
case 1: /* cmd ::= SHOW DATABASES */
......@@ -2395,16 +2402,16 @@ static void yy_reduce(
{ setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
break;
case 47: /* cmd ::= ALTER DATABASE ids alter_db_optr */
{ SToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy254, &t);}
{ SToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy16, &t);}
break;
case 48: /* cmd ::= ALTER ACCOUNT ids acct_optr */
{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy171);}
{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy211);}
break;
case 49: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */
{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);}
{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy211);}
break;
case 50: /* cmd ::= COMPACT VNODES IN LP exprlist RP */
{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy413);}
{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy165);}
break;
case 51: /* ids ::= ID */
case 52: /* ids ::= STRING */ yytestcase(yyruleno==52);
......@@ -2416,7 +2423,7 @@ static void yy_reduce(
break;
case 54: /* ifexists ::= */
case 56: /* ifnotexists ::= */ yytestcase(yyruleno==56);
case 188: /* distinct ::= */ yytestcase(yyruleno==188);
case 190: /* distinct ::= */ yytestcase(yyruleno==190);
{ yymsp[1].minor.yy0.n = 0;}
break;
case 55: /* ifnotexists ::= IF NOT EXISTS */
......@@ -2427,16 +2434,16 @@ static void yy_reduce(
{ setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 2, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
break;
case 59: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);}
{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy211);}
break;
case 60: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */
{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy254, &yymsp[-2].minor.yy0);}
{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy16, &yymsp[-2].minor.yy0);}
break;
case 61: /* cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy280, &yymsp[0].minor.yy0, 1);}
{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy106, &yymsp[0].minor.yy0, 1);}
break;
case 62: /* cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */
{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy280, &yymsp[0].minor.yy0, 2);}
{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy106, &yymsp[0].minor.yy0, 2);}
break;
case 63: /* cmd ::= CREATE USER ids PASS ids */
{ setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);}
......@@ -2467,38 +2474,38 @@ static void yy_reduce(
break;
case 84: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */
{
yylhsminor.yy171.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
yylhsminor.yy171.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
yylhsminor.yy171.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
yylhsminor.yy171.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
yylhsminor.yy171.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
yylhsminor.yy171.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
yylhsminor.yy171.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
yylhsminor.yy171.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
yylhsminor.yy171.stat = yymsp[0].minor.yy0;
yylhsminor.yy211.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1;
yylhsminor.yy211.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1;
yylhsminor.yy211.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1;
yylhsminor.yy211.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1;
yylhsminor.yy211.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1;
yylhsminor.yy211.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1;
yylhsminor.yy211.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1;
yylhsminor.yy211.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1;
yylhsminor.yy211.stat = yymsp[0].minor.yy0;
}
yymsp[-8].minor.yy171 = yylhsminor.yy171;
yymsp[-8].minor.yy211 = yylhsminor.yy211;
break;
case 85: /* intitemlist ::= intitemlist COMMA intitem */
case 161: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==161);
{ yylhsminor.yy413 = tListItemAppend(yymsp[-2].minor.yy413, &yymsp[0].minor.yy461, -1); }
yymsp[-2].minor.yy413 = yylhsminor.yy413;
case 163: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==163);
{ yylhsminor.yy165 = tListItemAppend(yymsp[-2].minor.yy165, &yymsp[0].minor.yy425, -1); }
yymsp[-2].minor.yy165 = yylhsminor.yy165;
break;
case 86: /* intitemlist ::= intitem */
case 162: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==162);
{ yylhsminor.yy413 = tListItemAppend(NULL, &yymsp[0].minor.yy461, -1); }
yymsp[0].minor.yy413 = yylhsminor.yy413;
case 164: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==164);
{ yylhsminor.yy165 = tListItemAppend(NULL, &yymsp[0].minor.yy425, -1); }
yymsp[0].minor.yy165 = yylhsminor.yy165;
break;
case 87: /* intitem ::= INTEGER */
case 163: /* tagitem ::= INTEGER */ yytestcase(yyruleno==163);
case 164: /* tagitem ::= FLOAT */ yytestcase(yyruleno==164);
case 165: /* tagitem ::= STRING */ yytestcase(yyruleno==165);
case 166: /* tagitem ::= BOOL */ yytestcase(yyruleno==166);
{ toTSDBType(yymsp[0].minor.yy0.type); taosVariantCreate(&yylhsminor.yy461, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); }
yymsp[0].minor.yy461 = yylhsminor.yy461;
case 165: /* tagitem ::= INTEGER */ yytestcase(yyruleno==165);
case 166: /* tagitem ::= FLOAT */ yytestcase(yyruleno==166);
case 167: /* tagitem ::= STRING */ yytestcase(yyruleno==167);
case 168: /* tagitem ::= BOOL */ yytestcase(yyruleno==168);
{ toTSDBType(yymsp[0].minor.yy0.type); taosVariantCreate(&yylhsminor.yy425, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); }
yymsp[0].minor.yy425 = yylhsminor.yy425;
break;
case 88: /* keep ::= KEEP intitemlist */
{ yymsp[-1].minor.yy413 = yymsp[0].minor.yy413; }
{ yymsp[-1].minor.yy165 = yymsp[0].minor.yy165; }
break;
case 89: /* cache ::= CACHE INTEGER */
case 90: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==90);
......@@ -2514,673 +2521,678 @@ static void yy_reduce(
case 100: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==100);
case 101: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==101);
case 102: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==102);
case 103: /* vgroups ::= VGROUPS INTEGER */ yytestcase(yyruleno==103);
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break;
case 103: /* db_optr ::= */
{setDefaultCreateDbOption(&yymsp[1].minor.yy254);}
case 104: /* db_optr ::= */
{setDefaultCreateDbOption(&yymsp[1].minor.yy16);}
break;
case 104: /* db_optr ::= db_optr cache */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 105: /* db_optr ::= db_optr cache */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 105: /* db_optr ::= db_optr replica */
case 120: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==120);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 106: /* db_optr ::= db_optr replica */
case 122: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==122);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 106: /* db_optr ::= db_optr quorum */
case 121: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==121);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 107: /* db_optr ::= db_optr quorum */
case 123: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==123);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 107: /* db_optr ::= db_optr days */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 108: /* db_optr ::= db_optr days */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 108: /* db_optr ::= db_optr minrows */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 109: /* db_optr ::= db_optr minrows */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 109: /* db_optr ::= db_optr maxrows */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 110: /* db_optr ::= db_optr maxrows */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 110: /* db_optr ::= db_optr blocks */
case 123: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==123);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 111: /* db_optr ::= db_optr blocks */
case 125: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==125);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 111: /* db_optr ::= db_optr ctime */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 112: /* db_optr ::= db_optr ctime */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 112: /* db_optr ::= db_optr wal */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 113: /* db_optr ::= db_optr wal */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 113: /* db_optr ::= db_optr fsync */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 114: /* db_optr ::= db_optr fsync */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 114: /* db_optr ::= db_optr comp */
case 124: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==124);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 115: /* db_optr ::= db_optr comp */
case 126: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==126);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 115: /* db_optr ::= db_optr prec */
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.precision = yymsp[0].minor.yy0; }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 116: /* db_optr ::= db_optr prec */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.precision = yymsp[0].minor.yy0; }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 116: /* db_optr ::= db_optr keep */
case 122: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==122);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.keep = yymsp[0].minor.yy413; }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 117: /* db_optr ::= db_optr keep */
case 124: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==124);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.keep = yymsp[0].minor.yy165; }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 117: /* db_optr ::= db_optr update */
case 125: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==125);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 118: /* db_optr ::= db_optr update */
case 127: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==127);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 118: /* db_optr ::= db_optr cachelast */
case 126: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==126);
{ yylhsminor.yy254 = yymsp[-1].minor.yy254; yylhsminor.yy254.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy254 = yylhsminor.yy254;
case 119: /* db_optr ::= db_optr cachelast */
case 128: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==128);
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 119: /* alter_db_optr ::= */
{ setDefaultCreateDbOption(&yymsp[1].minor.yy254);}
case 120: /* db_optr ::= db_optr vgroups */
{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.numOfVgroups = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[-1].minor.yy16 = yylhsminor.yy16;
break;
case 127: /* typename ::= ids */
case 121: /* alter_db_optr ::= */
{ setDefaultCreateDbOption(&yymsp[1].minor.yy16);}
break;
case 129: /* typename ::= ids */
{
yymsp[0].minor.yy0.type = 0;
tSetColumnType (&yylhsminor.yy280, &yymsp[0].minor.yy0);
tSetColumnType (&yylhsminor.yy106, &yymsp[0].minor.yy0);
}
yymsp[0].minor.yy280 = yylhsminor.yy280;
yymsp[0].minor.yy106 = yylhsminor.yy106;
break;
case 128: /* typename ::= ids LP signed RP */
case 130: /* typename ::= ids LP signed RP */
{
if (yymsp[-1].minor.yy157 <= 0) {
if (yymsp[-1].minor.yy207 <= 0) {
yymsp[-3].minor.yy0.type = 0;
tSetColumnType(&yylhsminor.yy280, &yymsp[-3].minor.yy0);
tSetColumnType(&yylhsminor.yy106, &yymsp[-3].minor.yy0);
} else {
yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy157; // negative value of name length
tSetColumnType(&yylhsminor.yy280, &yymsp[-3].minor.yy0);
yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy207; // negative value of name length
tSetColumnType(&yylhsminor.yy106, &yymsp[-3].minor.yy0);
}
}
yymsp[-3].minor.yy280 = yylhsminor.yy280;
yymsp[-3].minor.yy106 = yylhsminor.yy106;
break;
case 129: /* typename ::= ids UNSIGNED */
case 131: /* typename ::= ids UNSIGNED */
{
yymsp[-1].minor.yy0.type = 0;
yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z);
tSetColumnType (&yylhsminor.yy280, &yymsp[-1].minor.yy0);
tSetColumnType (&yylhsminor.yy106, &yymsp[-1].minor.yy0);
}
yymsp[-1].minor.yy280 = yylhsminor.yy280;
yymsp[-1].minor.yy106 = yylhsminor.yy106;
break;
case 130: /* signed ::= INTEGER */
{ yylhsminor.yy157 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[0].minor.yy157 = yylhsminor.yy157;
case 132: /* signed ::= INTEGER */
{ yylhsminor.yy207 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
yymsp[0].minor.yy207 = yylhsminor.yy207;
break;
case 131: /* signed ::= PLUS INTEGER */
{ yymsp[-1].minor.yy157 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
case 133: /* signed ::= PLUS INTEGER */
{ yymsp[-1].minor.yy207 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
break;
case 132: /* signed ::= MINUS INTEGER */
{ yymsp[-1].minor.yy157 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
case 134: /* signed ::= MINUS INTEGER */
{ yymsp[-1].minor.yy207 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);}
break;
case 136: /* cmd ::= CREATE TABLE create_table_list */
{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy438;}
case 138: /* cmd ::= CREATE TABLE create_table_list */
{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy326;}
break;
case 137: /* create_table_list ::= create_from_stable */
case 139: /* create_table_list ::= create_from_stable */
{
SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql));
pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo));
taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy544);
taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy150);
pCreateTable->type = TSQL_CREATE_CTABLE;
yylhsminor.yy438 = pCreateTable;
yylhsminor.yy326 = pCreateTable;
}
yymsp[0].minor.yy438 = yylhsminor.yy438;
yymsp[0].minor.yy326 = yylhsminor.yy326;
break;
case 138: /* create_table_list ::= create_table_list create_from_stable */
case 140: /* create_table_list ::= create_table_list create_from_stable */
{
taosArrayPush(yymsp[-1].minor.yy438->childTableInfo, &yymsp[0].minor.yy544);
yylhsminor.yy438 = yymsp[-1].minor.yy438;
taosArrayPush(yymsp[-1].minor.yy326->childTableInfo, &yymsp[0].minor.yy150);
yylhsminor.yy326 = yymsp[-1].minor.yy326;
}
yymsp[-1].minor.yy438 = yylhsminor.yy438;
yymsp[-1].minor.yy326 = yylhsminor.yy326;
break;
case 139: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
case 141: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */
{
yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-1].minor.yy413, NULL, NULL, TSQL_CREATE_TABLE);
setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yylhsminor.yy326 = tSetCreateTableInfo(yymsp[-1].minor.yy165, NULL, NULL, TSQL_CREATE_TABLE);
setSqlInfo(pInfo, yylhsminor.yy326, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0);
}
yymsp[-5].minor.yy438 = yylhsminor.yy438;
yymsp[-5].minor.yy326 = yylhsminor.yy326;
break;
case 140: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
case 142: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */
{
yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-5].minor.yy413, yymsp[-1].minor.yy413, NULL, TSQL_CREATE_STABLE);
setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yylhsminor.yy326 = tSetCreateTableInfo(yymsp[-5].minor.yy165, yymsp[-1].minor.yy165, NULL, TSQL_CREATE_STABLE);
setSqlInfo(pInfo, yylhsminor.yy326, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
}
yymsp[-9].minor.yy438 = yylhsminor.yy438;
yymsp[-9].minor.yy326 = yylhsminor.yy326;
break;
case 141: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */
case 143: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
yylhsminor.yy544 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy413, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
yylhsminor.yy150 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy165, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0);
}
yymsp[-9].minor.yy544 = yylhsminor.yy544;
yymsp[-9].minor.yy150 = yylhsminor.yy150;
break;
case 142: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */
case 144: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */
{
yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n;
yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n;
yylhsminor.yy544 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy413, yymsp[-1].minor.yy413, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
yylhsminor.yy150 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy165, yymsp[-1].minor.yy165, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0);
}
yymsp[-12].minor.yy544 = yylhsminor.yy544;
yymsp[-12].minor.yy150 = yylhsminor.yy150;
break;
case 143: /* tagNamelist ::= tagNamelist COMMA ids */
{taosArrayPush(yymsp[-2].minor.yy413, &yymsp[0].minor.yy0); yylhsminor.yy413 = yymsp[-2].minor.yy413; }
yymsp[-2].minor.yy413 = yylhsminor.yy413;
case 145: /* tagNamelist ::= tagNamelist COMMA ids */
{taosArrayPush(yymsp[-2].minor.yy165, &yymsp[0].minor.yy0); yylhsminor.yy165 = yymsp[-2].minor.yy165; }
yymsp[-2].minor.yy165 = yylhsminor.yy165;
break;
case 144: /* tagNamelist ::= ids */
{yylhsminor.yy413 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy413, &yymsp[0].minor.yy0);}
yymsp[0].minor.yy413 = yylhsminor.yy413;
case 146: /* tagNamelist ::= ids */
{yylhsminor.yy165 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy165, &yymsp[0].minor.yy0);}
yymsp[0].minor.yy165 = yylhsminor.yy165;
break;
case 145: /* create_table_args ::= ifnotexists ids cpxName AS select */
case 147: /* create_table_args ::= ifnotexists ids cpxName AS select */
{
yylhsminor.yy438 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy24, TSQL_CREATE_STREAM);
setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE);
yylhsminor.yy326 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy278, TSQL_CREATE_STREAM);
setSqlInfo(pInfo, yylhsminor.yy326, NULL, TSDB_SQL_CREATE_TABLE);
yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n;
setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0);
}
yymsp[-4].minor.yy438 = yylhsminor.yy438;
yymsp[-4].minor.yy326 = yylhsminor.yy326;
break;
case 146: /* columnlist ::= columnlist COMMA column */
{taosArrayPush(yymsp[-2].minor.yy413, &yymsp[0].minor.yy280); yylhsminor.yy413 = yymsp[-2].minor.yy413; }
yymsp[-2].minor.yy413 = yylhsminor.yy413;
case 148: /* columnlist ::= columnlist COMMA column */
{taosArrayPush(yymsp[-2].minor.yy165, &yymsp[0].minor.yy106); yylhsminor.yy165 = yymsp[-2].minor.yy165; }
yymsp[-2].minor.yy165 = yylhsminor.yy165;
break;
case 147: /* columnlist ::= column */
{yylhsminor.yy413 = taosArrayInit(4, sizeof(SField)); taosArrayPush(yylhsminor.yy413, &yymsp[0].minor.yy280);}
yymsp[0].minor.yy413 = yylhsminor.yy413;
case 149: /* columnlist ::= column */
{yylhsminor.yy165 = taosArrayInit(4, sizeof(SField)); taosArrayPush(yylhsminor.yy165, &yymsp[0].minor.yy106);}
yymsp[0].minor.yy165 = yylhsminor.yy165;
break;
case 148: /* column ::= ids typename */
case 150: /* column ::= ids typename */
{
tSetColumnInfo(&yylhsminor.yy280, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy280);
tSetColumnInfo(&yylhsminor.yy106, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy106);
}
yymsp[-1].minor.yy280 = yylhsminor.yy280;
yymsp[-1].minor.yy106 = yylhsminor.yy106;
break;
case 149: /* tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */
{ taosArrayPush(yymsp[-2].minor.yy413, &yymsp[0].minor.yy0); yylhsminor.yy413 = yymsp[-2].minor.yy413;}
yymsp[-2].minor.yy413 = yylhsminor.yy413;
case 151: /* tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */
{ taosArrayPush(yymsp[-2].minor.yy165, &yymsp[0].minor.yy0); yylhsminor.yy165 = yymsp[-2].minor.yy165;}
yymsp[-2].minor.yy165 = yylhsminor.yy165;
break;
case 150: /* tagitemlist1 ::= tagitem1 */
{ yylhsminor.yy413 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy413, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy413 = yylhsminor.yy413;
case 152: /* tagitemlist1 ::= tagitem1 */
{ yylhsminor.yy165 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy165, &yymsp[0].minor.yy0); }
yymsp[0].minor.yy165 = yylhsminor.yy165;
break;
case 151: /* tagitem1 ::= MINUS INTEGER */
case 152: /* tagitem1 ::= MINUS FLOAT */ yytestcase(yyruleno==152);
case 153: /* tagitem1 ::= PLUS INTEGER */ yytestcase(yyruleno==153);
case 154: /* tagitem1 ::= PLUS FLOAT */ yytestcase(yyruleno==154);
case 153: /* tagitem1 ::= MINUS INTEGER */
case 154: /* tagitem1 ::= MINUS FLOAT */ yytestcase(yyruleno==154);
case 155: /* tagitem1 ::= PLUS INTEGER */ yytestcase(yyruleno==155);
case 156: /* tagitem1 ::= PLUS FLOAT */ yytestcase(yyruleno==156);
{ yylhsminor.yy0.n = yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n; yylhsminor.yy0.type = yymsp[0].minor.yy0.type; }
yymsp[-1].minor.yy0 = yylhsminor.yy0;
break;
case 155: /* tagitem1 ::= INTEGER */
case 156: /* tagitem1 ::= FLOAT */ yytestcase(yyruleno==156);
case 157: /* tagitem1 ::= STRING */ yytestcase(yyruleno==157);
case 158: /* tagitem1 ::= BOOL */ yytestcase(yyruleno==158);
case 159: /* tagitem1 ::= NULL */ yytestcase(yyruleno==159);
case 160: /* tagitem1 ::= NOW */ yytestcase(yyruleno==160);
case 157: /* tagitem1 ::= INTEGER */
case 158: /* tagitem1 ::= FLOAT */ yytestcase(yyruleno==158);
case 159: /* tagitem1 ::= STRING */ yytestcase(yyruleno==159);
case 160: /* tagitem1 ::= BOOL */ yytestcase(yyruleno==160);
case 161: /* tagitem1 ::= NULL */ yytestcase(yyruleno==161);
case 162: /* tagitem1 ::= NOW */ yytestcase(yyruleno==162);
{ yylhsminor.yy0 = yymsp[0].minor.yy0; }
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 167: /* tagitem ::= NULL */
{ yymsp[0].minor.yy0.type = 0; taosVariantCreate(&yylhsminor.yy461, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); }
yymsp[0].minor.yy461 = yylhsminor.yy461;
case 169: /* tagitem ::= NULL */
{ yymsp[0].minor.yy0.type = 0; taosVariantCreate(&yylhsminor.yy425, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); }
yymsp[0].minor.yy425 = yylhsminor.yy425;
break;
case 168: /* tagitem ::= NOW */
{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; taosVariantCreate(&yylhsminor.yy461, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type);}
yymsp[0].minor.yy461 = yylhsminor.yy461;
case 170: /* tagitem ::= NOW */
{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; taosVariantCreate(&yylhsminor.yy425, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type);}
yymsp[0].minor.yy425 = yylhsminor.yy425;
break;
case 169: /* tagitem ::= MINUS INTEGER */
case 170: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==170);
case 171: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==171);
case 172: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==172);
case 171: /* tagitem ::= MINUS INTEGER */
case 172: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==172);
case 173: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==173);
case 174: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==174);
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type;
toTSDBType(yymsp[-1].minor.yy0.type);
taosVariantCreate(&yylhsminor.yy461, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type);
taosVariantCreate(&yylhsminor.yy425, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type);
}
yymsp[-1].minor.yy461 = yylhsminor.yy461;
yymsp[-1].minor.yy425 = yylhsminor.yy425;
break;
case 173: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
case 175: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */
{
yylhsminor.yy24 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy413, yymsp[-11].minor.yy292, yymsp[-10].minor.yy370, yymsp[-4].minor.yy413, yymsp[-2].minor.yy413, &yymsp[-9].minor.yy136, &yymsp[-7].minor.yy251, &yymsp[-6].minor.yy256, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy413, &yymsp[0].minor.yy503, &yymsp[-1].minor.yy503, yymsp[-3].minor.yy370);
yylhsminor.yy278 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy165, yymsp[-11].minor.yy10, yymsp[-10].minor.yy202, yymsp[-4].minor.yy165, yymsp[-2].minor.yy165, &yymsp[-9].minor.yy532, &yymsp[-7].minor.yy97, &yymsp[-6].minor.yy6, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy165, &yymsp[0].minor.yy367, &yymsp[-1].minor.yy367, yymsp[-3].minor.yy202);
}
yymsp[-13].minor.yy24 = yylhsminor.yy24;
yymsp[-13].minor.yy278 = yylhsminor.yy278;
break;
case 174: /* select ::= LP select RP */
{yymsp[-2].minor.yy24 = yymsp[-1].minor.yy24;}
case 176: /* select ::= LP select RP */
{yymsp[-2].minor.yy278 = yymsp[-1].minor.yy278;}
break;
case 175: /* union ::= select */
{ yylhsminor.yy129 = setSubclause(NULL, yymsp[0].minor.yy24); }
yymsp[0].minor.yy129 = yylhsminor.yy129;
case 177: /* union ::= select */
{ yylhsminor.yy503 = setSubclause(NULL, yymsp[0].minor.yy278); }
yymsp[0].minor.yy503 = yylhsminor.yy503;
break;
case 176: /* union ::= union UNION ALL select */
{ yylhsminor.yy129 = appendSelectClause(yymsp[-3].minor.yy129, SQL_TYPE_UNIONALL, yymsp[0].minor.yy24); }
yymsp[-3].minor.yy129 = yylhsminor.yy129;
case 178: /* union ::= union UNION ALL select */
{ yylhsminor.yy503 = appendSelectClause(yymsp[-3].minor.yy503, SQL_TYPE_UNIONALL, yymsp[0].minor.yy278); }
yymsp[-3].minor.yy503 = yylhsminor.yy503;
break;
case 177: /* union ::= union UNION select */
{ yylhsminor.yy129 = appendSelectClause(yymsp[-2].minor.yy129, SQL_TYPE_UNION, yymsp[0].minor.yy24); }
yymsp[-2].minor.yy129 = yylhsminor.yy129;
case 179: /* union ::= union UNION select */
{ yylhsminor.yy503 = appendSelectClause(yymsp[-2].minor.yy503, SQL_TYPE_UNION, yymsp[0].minor.yy278); }
yymsp[-2].minor.yy503 = yylhsminor.yy503;
break;
case 178: /* cmd ::= union */
{ setSqlInfo(pInfo, yymsp[0].minor.yy129, NULL, TSDB_SQL_SELECT); }
case 180: /* cmd ::= union */
{ setSqlInfo(pInfo, yymsp[0].minor.yy503, NULL, TSDB_SQL_SELECT); }
break;
case 179: /* select ::= SELECT selcollist */
case 181: /* select ::= SELECT selcollist */
{
yylhsminor.yy24 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy413, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
yylhsminor.yy278 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy165, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
}
yymsp[-1].minor.yy24 = yylhsminor.yy24;
yymsp[-1].minor.yy278 = yylhsminor.yy278;
break;
case 180: /* sclp ::= selcollist COMMA */
{yylhsminor.yy413 = yymsp[-1].minor.yy413;}
yymsp[-1].minor.yy413 = yylhsminor.yy413;
case 182: /* sclp ::= selcollist COMMA */
{yylhsminor.yy165 = yymsp[-1].minor.yy165;}
yymsp[-1].minor.yy165 = yylhsminor.yy165;
break;
case 181: /* sclp ::= */
case 213: /* orderby_opt ::= */ yytestcase(yyruleno==213);
{yymsp[1].minor.yy413 = 0;}
case 183: /* sclp ::= */
case 215: /* orderby_opt ::= */ yytestcase(yyruleno==215);
{yymsp[1].minor.yy165 = 0;}
break;
case 182: /* selcollist ::= sclp distinct expr as */
case 184: /* selcollist ::= sclp distinct expr as */
{
yylhsminor.yy413 = tSqlExprListAppend(yymsp[-3].minor.yy413, yymsp[-1].minor.yy370, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
yylhsminor.yy165 = tSqlExprListAppend(yymsp[-3].minor.yy165, yymsp[-1].minor.yy202, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0);
}
yymsp[-3].minor.yy413 = yylhsminor.yy413;
yymsp[-3].minor.yy165 = yylhsminor.yy165;
break;
case 183: /* selcollist ::= sclp STAR */
case 185: /* selcollist ::= sclp STAR */
{
tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL);
yylhsminor.yy413 = tSqlExprListAppend(yymsp[-1].minor.yy413, pNode, 0, 0);
yylhsminor.yy165 = tSqlExprListAppend(yymsp[-1].minor.yy165, pNode, 0, 0);
}
yymsp[-1].minor.yy413 = yylhsminor.yy413;
yymsp[-1].minor.yy165 = yylhsminor.yy165;
break;
case 184: /* as ::= AS ids */
case 186: /* as ::= AS ids */
{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; }
break;
case 185: /* as ::= ids */
case 187: /* as ::= ids */
{ yylhsminor.yy0 = yymsp[0].minor.yy0; }
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 186: /* as ::= */
case 188: /* as ::= */
{ yymsp[1].minor.yy0.n = 0; }
break;
case 187: /* distinct ::= DISTINCT */
case 189: /* distinct ::= DISTINCT */
{ yylhsminor.yy0 = yymsp[0].minor.yy0; }
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 189: /* from ::= FROM tablelist */
case 190: /* from ::= FROM sub */ yytestcase(yyruleno==190);
{yymsp[-1].minor.yy292 = yymsp[0].minor.yy292;}
case 191: /* from ::= FROM tablelist */
case 192: /* from ::= FROM sub */ yytestcase(yyruleno==192);
{yymsp[-1].minor.yy10 = yymsp[0].minor.yy10;}
break;
case 191: /* sub ::= LP union RP */
{yymsp[-2].minor.yy292 = addSubquery(NULL, yymsp[-1].minor.yy129, NULL);}
case 193: /* sub ::= LP union RP */
{yymsp[-2].minor.yy10 = addSubquery(NULL, yymsp[-1].minor.yy503, NULL);}
break;
case 192: /* sub ::= LP union RP ids */
{yymsp[-3].minor.yy292 = addSubquery(NULL, yymsp[-2].minor.yy129, &yymsp[0].minor.yy0);}
case 194: /* sub ::= LP union RP ids */
{yymsp[-3].minor.yy10 = addSubquery(NULL, yymsp[-2].minor.yy503, &yymsp[0].minor.yy0);}
break;
case 193: /* sub ::= sub COMMA LP union RP ids */
{yylhsminor.yy292 = addSubquery(yymsp[-5].minor.yy292, yymsp[-2].minor.yy129, &yymsp[0].minor.yy0);}
yymsp[-5].minor.yy292 = yylhsminor.yy292;
case 195: /* sub ::= sub COMMA LP union RP ids */
{yylhsminor.yy10 = addSubquery(yymsp[-5].minor.yy10, yymsp[-2].minor.yy503, &yymsp[0].minor.yy0);}
yymsp[-5].minor.yy10 = yylhsminor.yy10;
break;
case 194: /* tablelist ::= ids cpxName */
case 196: /* tablelist ::= ids cpxName */
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yylhsminor.yy292 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
yylhsminor.yy10 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL);
}
yymsp[-1].minor.yy292 = yylhsminor.yy292;
yymsp[-1].minor.yy10 = yylhsminor.yy10;
break;
case 195: /* tablelist ::= ids cpxName ids */
case 197: /* tablelist ::= ids cpxName ids */
{
yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
yylhsminor.yy292 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
yylhsminor.yy10 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
}
yymsp[-2].minor.yy292 = yylhsminor.yy292;
yymsp[-2].minor.yy10 = yylhsminor.yy10;
break;
case 196: /* tablelist ::= tablelist COMMA ids cpxName */
case 198: /* tablelist ::= tablelist COMMA ids cpxName */
{
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
yylhsminor.yy292 = setTableNameList(yymsp[-3].minor.yy292, &yymsp[-1].minor.yy0, NULL);
yylhsminor.yy10 = setTableNameList(yymsp[-3].minor.yy10, &yymsp[-1].minor.yy0, NULL);
}
yymsp[-3].minor.yy292 = yylhsminor.yy292;
yymsp[-3].minor.yy10 = yylhsminor.yy10;
break;
case 197: /* tablelist ::= tablelist COMMA ids cpxName ids */
case 199: /* tablelist ::= tablelist COMMA ids cpxName ids */
{
yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n;
yylhsminor.yy292 = setTableNameList(yymsp[-4].minor.yy292, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
yylhsminor.yy10 = setTableNameList(yymsp[-4].minor.yy10, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);
}
yymsp[-4].minor.yy292 = yylhsminor.yy292;
yymsp[-4].minor.yy10 = yylhsminor.yy10;
break;
case 198: /* tmvar ::= VARIABLE */
case 200: /* tmvar ::= VARIABLE */
{yylhsminor.yy0 = yymsp[0].minor.yy0;}
yymsp[0].minor.yy0 = yylhsminor.yy0;
break;
case 199: /* interval_option ::= intervalKey LP tmvar RP */
{yylhsminor.yy136.interval = yymsp[-1].minor.yy0; yylhsminor.yy136.offset.n = 0; yylhsminor.yy136.token = yymsp[-3].minor.yy516;}
yymsp[-3].minor.yy136 = yylhsminor.yy136;
case 201: /* interval_option ::= intervalKey LP tmvar RP */
{yylhsminor.yy532.interval = yymsp[-1].minor.yy0; yylhsminor.yy532.offset.n = 0; yylhsminor.yy532.token = yymsp[-3].minor.yy46;}
yymsp[-3].minor.yy532 = yylhsminor.yy532;
break;
case 200: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
{yylhsminor.yy136.interval = yymsp[-3].minor.yy0; yylhsminor.yy136.offset = yymsp[-1].minor.yy0; yylhsminor.yy136.token = yymsp[-5].minor.yy516;}
yymsp[-5].minor.yy136 = yylhsminor.yy136;
case 202: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */
{yylhsminor.yy532.interval = yymsp[-3].minor.yy0; yylhsminor.yy532.offset = yymsp[-1].minor.yy0; yylhsminor.yy532.token = yymsp[-5].minor.yy46;}
yymsp[-5].minor.yy532 = yylhsminor.yy532;
break;
case 201: /* interval_option ::= */
{memset(&yymsp[1].minor.yy136, 0, sizeof(yymsp[1].minor.yy136));}
case 203: /* interval_option ::= */
{memset(&yymsp[1].minor.yy532, 0, sizeof(yymsp[1].minor.yy532));}
break;
case 202: /* intervalKey ::= INTERVAL */
{yymsp[0].minor.yy516 = TK_INTERVAL;}
case 204: /* intervalKey ::= INTERVAL */
{yymsp[0].minor.yy46 = TK_INTERVAL;}
break;
case 203: /* intervalKey ::= EVERY */
{yymsp[0].minor.yy516 = TK_EVERY; }
case 205: /* intervalKey ::= EVERY */
{yymsp[0].minor.yy46 = TK_EVERY; }
break;
case 204: /* session_option ::= */
{yymsp[1].minor.yy251.col.n = 0; yymsp[1].minor.yy251.gap.n = 0;}
case 206: /* session_option ::= */
{yymsp[1].minor.yy97.col.n = 0; yymsp[1].minor.yy97.gap.n = 0;}
break;
case 205: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
case 207: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
yymsp[-6].minor.yy251.col = yymsp[-4].minor.yy0;
yymsp[-6].minor.yy251.gap = yymsp[-1].minor.yy0;
yymsp[-6].minor.yy97.col = yymsp[-4].minor.yy0;
yymsp[-6].minor.yy97.gap = yymsp[-1].minor.yy0;
}
break;
case 206: /* windowstate_option ::= */
{ yymsp[1].minor.yy256.col.n = 0; yymsp[1].minor.yy256.col.z = NULL;}
case 208: /* windowstate_option ::= */
{ yymsp[1].minor.yy6.col.n = 0; yymsp[1].minor.yy6.col.z = NULL;}
break;
case 207: /* windowstate_option ::= STATE_WINDOW LP ids RP */
{ yymsp[-3].minor.yy256.col = yymsp[-1].minor.yy0; }
case 209: /* windowstate_option ::= STATE_WINDOW LP ids RP */
{ yymsp[-3].minor.yy6.col = yymsp[-1].minor.yy0; }
break;
case 208: /* fill_opt ::= */
{ yymsp[1].minor.yy413 = 0; }
case 210: /* fill_opt ::= */
{ yymsp[1].minor.yy165 = 0; }
break;
case 209: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
case 211: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */
{
SVariant A = {0};
toTSDBType(yymsp[-3].minor.yy0.type);
taosVariantCreate(&A, yymsp[-3].minor.yy0.z, yymsp[-3].minor.yy0.n, yymsp[-3].minor.yy0.type);
tListItemInsert(yymsp[-1].minor.yy413, &A, -1, 0);
yymsp[-5].minor.yy413 = yymsp[-1].minor.yy413;
tListItemInsert(yymsp[-1].minor.yy165, &A, -1, 0);
yymsp[-5].minor.yy165 = yymsp[-1].minor.yy165;
}
break;
case 210: /* fill_opt ::= FILL LP ID RP */
case 212: /* fill_opt ::= FILL LP ID RP */
{
toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-3].minor.yy413 = tListItemAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
yymsp[-3].minor.yy165 = tListItemAppendToken(NULL, &yymsp[-1].minor.yy0, -1);
}
break;
case 211: /* sliding_opt ::= SLIDING LP tmvar RP */
case 213: /* sliding_opt ::= SLIDING LP tmvar RP */
{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; }
break;
case 212: /* sliding_opt ::= */
case 214: /* sliding_opt ::= */
{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; }
break;
case 214: /* orderby_opt ::= ORDER BY sortlist */
{yymsp[-2].minor.yy413 = yymsp[0].minor.yy413;}
case 216: /* orderby_opt ::= ORDER BY sortlist */
{yymsp[-2].minor.yy165 = yymsp[0].minor.yy165;}
break;
case 215: /* sortlist ::= sortlist COMMA item sortorder */
case 217: /* sortlist ::= sortlist COMMA item sortorder */
{
yylhsminor.yy413 = tListItemAppend(yymsp[-3].minor.yy413, &yymsp[-1].minor.yy461, yymsp[0].minor.yy60);
yylhsminor.yy165 = tListItemAppend(yymsp[-3].minor.yy165, &yymsp[-1].minor.yy425, yymsp[0].minor.yy47);
}
yymsp[-3].minor.yy413 = yylhsminor.yy413;
yymsp[-3].minor.yy165 = yylhsminor.yy165;
break;
case 216: /* sortlist ::= item sortorder */
case 218: /* sortlist ::= item sortorder */
{
yylhsminor.yy413 = tListItemAppend(NULL, &yymsp[-1].minor.yy461, yymsp[0].minor.yy60);
yylhsminor.yy165 = tListItemAppend(NULL, &yymsp[-1].minor.yy425, yymsp[0].minor.yy47);
}
yymsp[-1].minor.yy413 = yylhsminor.yy413;
yymsp[-1].minor.yy165 = yylhsminor.yy165;
break;
case 217: /* item ::= ids cpxName */
case 219: /* item ::= ids cpxName */
{
toTSDBType(yymsp[-1].minor.yy0.type);
yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n;
taosVariantCreate(&yylhsminor.yy461, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type);
taosVariantCreate(&yylhsminor.yy425, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type);
}
yymsp[-1].minor.yy461 = yylhsminor.yy461;
yymsp[-1].minor.yy425 = yylhsminor.yy425;
break;
case 218: /* sortorder ::= ASC */
{ yymsp[0].minor.yy60 = TSDB_ORDER_ASC; }
case 220: /* sortorder ::= ASC */
{ yymsp[0].minor.yy47 = TSDB_ORDER_ASC; }
break;
case 219: /* sortorder ::= DESC */
{ yymsp[0].minor.yy60 = TSDB_ORDER_DESC;}
case 221: /* sortorder ::= DESC */
{ yymsp[0].minor.yy47 = TSDB_ORDER_DESC;}
break;
case 220: /* sortorder ::= */
{ yymsp[1].minor.yy60 = TSDB_ORDER_ASC; }
case 222: /* sortorder ::= */
{ yymsp[1].minor.yy47 = TSDB_ORDER_ASC; }
break;
case 221: /* groupby_opt ::= */
{ yymsp[1].minor.yy413 = 0;}
case 223: /* groupby_opt ::= */
{ yymsp[1].minor.yy165 = 0;}
break;
case 222: /* groupby_opt ::= GROUP BY grouplist */
{ yymsp[-2].minor.yy413 = yymsp[0].minor.yy413;}
case 224: /* groupby_opt ::= GROUP BY grouplist */
{ yymsp[-2].minor.yy165 = yymsp[0].minor.yy165;}
break;
case 223: /* grouplist ::= grouplist COMMA item */
case 225: /* grouplist ::= grouplist COMMA item */
{
yylhsminor.yy413 = tListItemAppend(yymsp[-2].minor.yy413, &yymsp[0].minor.yy461, -1);
yylhsminor.yy165 = tListItemAppend(yymsp[-2].minor.yy165, &yymsp[0].minor.yy425, -1);
}
yymsp[-2].minor.yy413 = yylhsminor.yy413;
yymsp[-2].minor.yy165 = yylhsminor.yy165;
break;
case 224: /* grouplist ::= item */
case 226: /* grouplist ::= item */
{
yylhsminor.yy413 = tListItemAppend(NULL, &yymsp[0].minor.yy461, -1);
yylhsminor.yy165 = tListItemAppend(NULL, &yymsp[0].minor.yy425, -1);
}
yymsp[0].minor.yy413 = yylhsminor.yy413;
yymsp[0].minor.yy165 = yylhsminor.yy165;
break;
case 225: /* having_opt ::= */
case 235: /* where_opt ::= */ yytestcase(yyruleno==235);
case 279: /* expritem ::= */ yytestcase(yyruleno==279);
{yymsp[1].minor.yy370 = 0;}
case 227: /* having_opt ::= */
case 237: /* where_opt ::= */ yytestcase(yyruleno==237);
case 281: /* expritem ::= */ yytestcase(yyruleno==281);
{yymsp[1].minor.yy202 = 0;}
break;
case 226: /* having_opt ::= HAVING expr */
case 236: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==236);
{yymsp[-1].minor.yy370 = yymsp[0].minor.yy370;}
case 228: /* having_opt ::= HAVING expr */
case 238: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==238);
{yymsp[-1].minor.yy202 = yymsp[0].minor.yy202;}
break;
case 227: /* limit_opt ::= */
case 231: /* slimit_opt ::= */ yytestcase(yyruleno==231);
{yymsp[1].minor.yy503.limit = -1; yymsp[1].minor.yy503.offset = 0;}
case 229: /* limit_opt ::= */
case 233: /* slimit_opt ::= */ yytestcase(yyruleno==233);
{yymsp[1].minor.yy367.limit = -1; yymsp[1].minor.yy367.offset = 0;}
break;
case 228: /* limit_opt ::= LIMIT signed */
case 232: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==232);
{yymsp[-1].minor.yy503.limit = yymsp[0].minor.yy157; yymsp[-1].minor.yy503.offset = 0;}
case 230: /* limit_opt ::= LIMIT signed */
case 234: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==234);
{yymsp[-1].minor.yy367.limit = yymsp[0].minor.yy207; yymsp[-1].minor.yy367.offset = 0;}
break;
case 229: /* limit_opt ::= LIMIT signed OFFSET signed */
{ yymsp[-3].minor.yy503.limit = yymsp[-2].minor.yy157; yymsp[-3].minor.yy503.offset = yymsp[0].minor.yy157;}
case 231: /* limit_opt ::= LIMIT signed OFFSET signed */
{ yymsp[-3].minor.yy367.limit = yymsp[-2].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[0].minor.yy207;}
break;
case 230: /* limit_opt ::= LIMIT signed COMMA signed */
{ yymsp[-3].minor.yy503.limit = yymsp[0].minor.yy157; yymsp[-3].minor.yy503.offset = yymsp[-2].minor.yy157;}
case 232: /* limit_opt ::= LIMIT signed COMMA signed */
{ yymsp[-3].minor.yy367.limit = yymsp[0].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[-2].minor.yy207;}
break;
case 233: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
{yymsp[-3].minor.yy503.limit = yymsp[-2].minor.yy157; yymsp[-3].minor.yy503.offset = yymsp[0].minor.yy157;}
case 235: /* slimit_opt ::= SLIMIT signed SOFFSET signed */
{yymsp[-3].minor.yy367.limit = yymsp[-2].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[0].minor.yy207;}
break;
case 234: /* slimit_opt ::= SLIMIT signed COMMA signed */
{yymsp[-3].minor.yy503.limit = yymsp[0].minor.yy157; yymsp[-3].minor.yy503.offset = yymsp[-2].minor.yy157;}
case 236: /* slimit_opt ::= SLIMIT signed COMMA signed */
{yymsp[-3].minor.yy367.limit = yymsp[0].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[-2].minor.yy207;}
break;
case 237: /* expr ::= LP expr RP */
{yylhsminor.yy370 = yymsp[-1].minor.yy370; yylhsminor.yy370->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy370->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 239: /* expr ::= LP expr RP */
{yylhsminor.yy202 = yymsp[-1].minor.yy202; yylhsminor.yy202->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy202->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 238: /* expr ::= ID */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 240: /* expr ::= ID */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 239: /* expr ::= ID DOT ID */
{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 241: /* expr ::= ID DOT ID */
{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 240: /* expr ::= ID DOT STAR */
{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 242: /* expr ::= ID DOT STAR */
{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 241: /* expr ::= INTEGER */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 243: /* expr ::= INTEGER */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 242: /* expr ::= MINUS INTEGER */
case 243: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==243);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
yymsp[-1].minor.yy370 = yylhsminor.yy370;
case 244: /* expr ::= MINUS INTEGER */
case 245: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==245);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);}
yymsp[-1].minor.yy202 = yylhsminor.yy202;
break;
case 244: /* expr ::= FLOAT */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 246: /* expr ::= FLOAT */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 245: /* expr ::= MINUS FLOAT */
case 246: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==246);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
yymsp[-1].minor.yy370 = yylhsminor.yy370;
case 247: /* expr ::= MINUS FLOAT */
case 248: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==248);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);}
yymsp[-1].minor.yy202 = yylhsminor.yy202;
break;
case 247: /* expr ::= STRING */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 249: /* expr ::= STRING */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 248: /* expr ::= NOW */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 250: /* expr ::= NOW */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); }
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 249: /* expr ::= VARIABLE */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 251: /* expr ::= VARIABLE */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 250: /* expr ::= PLUS VARIABLE */
case 251: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==251);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
yymsp[-1].minor.yy370 = yylhsminor.yy370;
case 252: /* expr ::= PLUS VARIABLE */
case 253: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==253);
{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);}
yymsp[-1].minor.yy202 = yylhsminor.yy202;
break;
case 252: /* expr ::= BOOL */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 254: /* expr ::= BOOL */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 253: /* expr ::= NULL */
{ yylhsminor.yy370 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 255: /* expr ::= NULL */
{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 254: /* expr ::= ID LP exprlist RP */
{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy370 = tSqlExprCreateFunction(yymsp[-1].minor.yy413, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
yymsp[-3].minor.yy370 = yylhsminor.yy370;
case 256: /* expr ::= ID LP exprlist RP */
{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy202 = tSqlExprCreateFunction(yymsp[-1].minor.yy165, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
yymsp[-3].minor.yy202 = yylhsminor.yy202;
break;
case 255: /* expr ::= ID LP STAR RP */
{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy370 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
yymsp[-3].minor.yy370 = yylhsminor.yy370;
case 257: /* expr ::= ID LP STAR RP */
{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy202 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); }
yymsp[-3].minor.yy202 = yylhsminor.yy202;
break;
case 256: /* expr ::= expr IS NULL */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, NULL, TK_ISNULL);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 258: /* expr ::= expr IS NULL */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, NULL, TK_ISNULL);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 257: /* expr ::= expr IS NOT NULL */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-3].minor.yy370, NULL, TK_NOTNULL);}
yymsp[-3].minor.yy370 = yylhsminor.yy370;
case 259: /* expr ::= expr IS NOT NULL */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-3].minor.yy202, NULL, TK_NOTNULL);}
yymsp[-3].minor.yy202 = yylhsminor.yy202;
break;
case 258: /* expr ::= expr LT expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LT);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 260: /* expr ::= expr LT expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_LT);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 259: /* expr ::= expr GT expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_GT);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 261: /* expr ::= expr GT expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_GT);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 260: /* expr ::= expr LE expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LE);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 262: /* expr ::= expr LE expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_LE);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 261: /* expr ::= expr GE expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_GE);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 263: /* expr ::= expr GE expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_GE);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 262: /* expr ::= expr NE expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_NE);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 264: /* expr ::= expr NE expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_NE);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 263: /* expr ::= expr EQ expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_EQ);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 265: /* expr ::= expr EQ expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_EQ);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 264: /* expr ::= expr BETWEEN expr AND expr */
{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy370); yylhsminor.yy370 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy370, yymsp[-2].minor.yy370, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy370, TK_LE), TK_AND);}
yymsp[-4].minor.yy370 = yylhsminor.yy370;
case 266: /* expr ::= expr BETWEEN expr AND expr */
{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy202); yylhsminor.yy202 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy202, yymsp[-2].minor.yy202, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy202, TK_LE), TK_AND);}
yymsp[-4].minor.yy202 = yylhsminor.yy202;
break;
case 265: /* expr ::= expr AND expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_AND);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 267: /* expr ::= expr AND expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_AND);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 266: /* expr ::= expr OR expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_OR); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 268: /* expr ::= expr OR expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_OR); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 267: /* expr ::= expr PLUS expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_PLUS); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 269: /* expr ::= expr PLUS expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_PLUS); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 268: /* expr ::= expr MINUS expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_MINUS); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 270: /* expr ::= expr MINUS expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_MINUS); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 269: /* expr ::= expr STAR expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_STAR); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 271: /* expr ::= expr STAR expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_STAR); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 270: /* expr ::= expr SLASH expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_DIVIDE);}
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 272: /* expr ::= expr SLASH expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_DIVIDE);}
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 271: /* expr ::= expr REM expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_REM); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 273: /* expr ::= expr REM expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_REM); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 272: /* expr ::= expr LIKE expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_LIKE); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 274: /* expr ::= expr LIKE expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_LIKE); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 273: /* expr ::= expr MATCH expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_MATCH); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 275: /* expr ::= expr MATCH expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_MATCH); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 274: /* expr ::= expr NMATCH expr */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-2].minor.yy370, yymsp[0].minor.yy370, TK_NMATCH); }
yymsp[-2].minor.yy370 = yylhsminor.yy370;
case 276: /* expr ::= expr NMATCH expr */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_NMATCH); }
yymsp[-2].minor.yy202 = yylhsminor.yy202;
break;
case 275: /* expr ::= expr IN LP exprlist RP */
{yylhsminor.yy370 = tSqlExprCreate(yymsp[-4].minor.yy370, (tSqlExpr*)yymsp[-1].minor.yy413, TK_IN); }
yymsp[-4].minor.yy370 = yylhsminor.yy370;
case 277: /* expr ::= expr IN LP exprlist RP */
{yylhsminor.yy202 = tSqlExprCreate(yymsp[-4].minor.yy202, (tSqlExpr*)yymsp[-1].minor.yy165, TK_IN); }
yymsp[-4].minor.yy202 = yylhsminor.yy202;
break;
case 276: /* exprlist ::= exprlist COMMA expritem */
{yylhsminor.yy413 = tSqlExprListAppend(yymsp[-2].minor.yy413,yymsp[0].minor.yy370,0, 0);}
yymsp[-2].minor.yy413 = yylhsminor.yy413;
case 278: /* exprlist ::= exprlist COMMA expritem */
{yylhsminor.yy165 = tSqlExprListAppend(yymsp[-2].minor.yy165,yymsp[0].minor.yy202,0, 0);}
yymsp[-2].minor.yy165 = yylhsminor.yy165;
break;
case 277: /* exprlist ::= expritem */
{yylhsminor.yy413 = tSqlExprListAppend(0,yymsp[0].minor.yy370,0, 0);}
yymsp[0].minor.yy413 = yylhsminor.yy413;
case 279: /* exprlist ::= expritem */
{yylhsminor.yy165 = tSqlExprListAppend(0,yymsp[0].minor.yy202,0, 0);}
yymsp[0].minor.yy165 = yylhsminor.yy165;
break;
case 278: /* expritem ::= expr */
{yylhsminor.yy370 = yymsp[0].minor.yy370;}
yymsp[0].minor.yy370 = yylhsminor.yy370;
case 280: /* expritem ::= expr */
{yylhsminor.yy202 = yymsp[0].minor.yy202;}
yymsp[0].minor.yy202 = yylhsminor.yy202;
break;
case 280: /* cmd ::= RESET QUERY CACHE */
case 282: /* cmd ::= RESET QUERY CACHE */
{ setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);}
break;
case 281: /* cmd ::= SYNCDB ids REPLICA */
case 283: /* cmd ::= SYNCDB ids REPLICA */
{ setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);}
break;
case 282: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
case 284: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 283: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
case 285: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
toTSDBType(yymsp[0].minor.yy0.type);
......@@ -3189,21 +3201,21 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 284: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
case 286: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 285: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
case 287: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 286: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
case 288: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
......@@ -3214,7 +3226,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 287: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
case 289: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
......@@ -3228,33 +3240,33 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 288: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
case 290: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */
{
yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
toTSDBType(yymsp[-2].minor.yy0.type);
SArray* A = tListItemAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
A = tListItemAppend(A, &yymsp[0].minor.yy461, -1);
A = tListItemAppend(A, &yymsp[0].minor.yy425, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 289: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
case 291: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 290: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
case 292: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 291: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
case 293: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
......@@ -3265,21 +3277,21 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 292: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
case 294: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 293: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
case 295: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 294: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
case 296: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
......@@ -3290,7 +3302,7 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 295: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
case 297: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */
{
yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n;
......@@ -3304,32 +3316,32 @@ static void yy_reduce(
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 296: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
case 298: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */
{
yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n;
toTSDBType(yymsp[-2].minor.yy0.type);
SArray* A = tListItemAppendToken(NULL, &yymsp[-2].minor.yy0, -1);
A = tListItemAppend(A, &yymsp[0].minor.yy461, -1);
A = tListItemAppend(A, &yymsp[0].minor.yy425, -1);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 297: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
case 299: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */
{
yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n;
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy413, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE);
setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE);
}
break;
case 298: /* cmd ::= KILL CONNECTION INTEGER */
case 300: /* cmd ::= KILL CONNECTION INTEGER */
{setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);}
break;
case 299: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
case 301: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */
{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);}
break;
case 300: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
case 302: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */
{yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);}
break;
default:
......
source/libs/parser/test/mockCatalog.cpp
浏览文件 @ 240a5309
......@@ -45,12 +45,12 @@ int32_t __catalogGetHandle(const char *clusterId, struct SCatalog** catalogHandl
return 0;
}
int32_t __catalogGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, STableMeta** pTableMeta) {
return mockCatalogService->catalogGetTableMeta(pDBName, pTableName, pTableMeta);
int32_t __catalogGetTableMeta(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, STableMeta** pTableMeta) {
return mockCatalogService->catalogGetTableMeta(pTableName, pTableMeta);
}
int32_t __catalogGetTableHashVgroup(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const char* pDBName, const char* pTableName, SVgroupInfo* vgInfo) {
return mockCatalogService->catalogGetTableHashVgroup(pDBName, pTableName, vgInfo);
int32_t __catalogGetTableHashVgroup(struct SCatalog* pCatalog, void *pRpc, const SEpSet* pMgmtEps, const SName* pTableName, SVgroupInfo* vgInfo) {
return mockCatalogService->catalogGetTableHashVgroup(pTableName, vgInfo);
}
void initMetaDataEnv() {
......
source/libs/parser/test/mockCatalogService.cpp
浏览文件 @ 240a5309
......@@ -94,9 +94,14 @@ public:
return 0;
}
int32_t catalogGetTableMeta(const char* pDbFullName, const char* pTableName, STableMeta** pTableMeta) const {
int32_t catalogGetTableMeta(const SName* pTableName, STableMeta** pTableMeta) const {
std::unique_ptr<STableMeta> table;
int32_t code = copyTableSchemaMeta(toDbname(pDbFullName), pTableName, &table);
char db[TSDB_DB_FNAME_LEN] = {0};
tNameGetFullDbName(pTableName, db);
const char* tname = tNameGetTableName(pTableName);
int32_t code = copyTableSchemaMeta(db, tname, &table);
if (TSDB_CODE_SUCCESS != code) {
return code;
}
......@@ -104,7 +109,7 @@ public:
return TSDB_CODE_SUCCESS;
}
int32_t catalogGetTableHashVgroup(const char* pDbFullName, const char* pTableName, SVgroupInfo* vgInfo) const {
int32_t catalogGetTableHashVgroup(const SName* pTableName, SVgroupInfo* vgInfo) const {
// todo
return 0;
}
......@@ -283,10 +288,10 @@ std::shared_ptr<MockTableMeta> MockCatalogService::getTableMeta(const std::strin
return impl_->getTableMeta(db, tbname);
}
int32_t MockCatalogService::catalogGetTableMeta(const char* pDBName, const char* pTableName, STableMeta** pTableMeta) const {
return impl_->catalogGetTableMeta(pDBName, pTableName, pTableMeta);
int32_t MockCatalogService::catalogGetTableMeta(const SName* pTableName, STableMeta** pTableMeta) const {
return impl_->catalogGetTableMeta(pTableName, pTableMeta);
}
int32_t MockCatalogService::catalogGetTableHashVgroup(const char* pDBName, const char* pTableName, SVgroupInfo* vgInfo) const {
return impl_->catalogGetTableHashVgroup(pDBName, pTableName, vgInfo);
int32_t MockCatalogService::catalogGetTableHashVgroup(const SName* pTableName, SVgroupInfo* vgInfo) const {
return impl_->catalogGetTableHashVgroup(pTableName, vgInfo);
}
\ No newline at end of file
source/libs/parser/test/mockCatalogService.h
浏览文件 @ 240a5309
......@@ -57,8 +57,8 @@ public:
void showTables() const;
std::shared_ptr<MockTableMeta> getTableMeta(const std::string& db, const std::string& tbname) const;
int32_t catalogGetTableMeta(const char* pDBName, const char* pTableName, STableMeta** pTableMeta) const;
int32_t catalogGetTableHashVgroup(const char* pDBName, const char* pTableName, SVgroupInfo* vgInfo) const;
int32_t catalogGetTableMeta(const SName* pTableName, STableMeta** pTableMeta) const;
int32_t catalogGetTableHashVgroup(const SName* pTableName, SVgroupInfo* vgInfo) const;
private:
std::unique_ptr<MockCatalogServiceImpl> impl_;
......
source/util/src/tbuffer.c
浏览文件 @ 240a5309
......@@ -13,9 +13,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "os.h"
#include "tbuffer.h"
#include "exception.h"
#include "os.h"
//#include "taoserror.h"
typedef union Un4B {
......@@ -40,172 +40,172 @@ static_assert(sizeof(Un8B) == sizeof(double), "sizeof(Un8B) must equal to sizeof
// reader functions
size_t tbufSkip(SBufferReader* buf, size_t size) {
if( (buf->pos + size) > buf->size ) {
THROW( -1 );
if ((buf->pos + size) > buf->size) {
THROW(-1);
}
size_t old = buf->pos;
buf->pos += size;
return old;
}
const char* tbufRead( SBufferReader* buf, size_t size ) {
const char* tbufRead(SBufferReader* buf, size_t size) {
const char* ret = buf->data + buf->pos;
tbufSkip( buf, size );
tbufSkip(buf, size);
return ret;
}
void tbufReadToBuffer( SBufferReader* buf, void* dst, size_t size ) {
assert( dst != NULL );
void tbufReadToBuffer(SBufferReader* buf, void* dst, size_t size) {
assert(dst != NULL);
// always using memcpy, leave optimization to compiler
memcpy( dst, tbufRead(buf, size), size );
memcpy(dst, tbufRead(buf, size), size);
}
static size_t tbufReadLength( SBufferReader* buf ) {
static size_t tbufReadLength(SBufferReader* buf) {
// maximum length is 65535, if larger length is required
// this function and the corresponding write function need to be
// revised.
uint16_t l = tbufReadUint16( buf );
uint16_t l = tbufReadUint16(buf);
return l;
}
const char* tbufReadString( SBufferReader* buf, size_t* len ) {
size_t l = tbufReadLength( buf );
const char* tbufReadString(SBufferReader* buf, size_t* len) {
size_t l = tbufReadLength(buf);
const char* ret = buf->data + buf->pos;
tbufSkip( buf, l + 1 );
if( ret[l] != 0 ) {
THROW( -1 );
tbufSkip(buf, l + 1);
if (ret[l] != 0) {
THROW(-1);
}
if( len != NULL ) {
if (len != NULL) {
*len = l;
}
return ret;
}
size_t tbufReadToString( SBufferReader* buf, char* dst, size_t size ) {
assert( dst != NULL );
size_t tbufReadToString(SBufferReader* buf, char* dst, size_t size) {
assert(dst != NULL);
size_t len;
const char* str = tbufReadString( buf, &len );
const char* str = tbufReadString(buf, &len);
if (len >= size) {
len = size - 1;
}
memcpy( dst, str, len );
memcpy(dst, str, len);
dst[len] = 0;
return len;
}
const char* tbufReadBinary( SBufferReader* buf, size_t *len ) {
size_t l = tbufReadLength( buf );
const char* tbufReadBinary(SBufferReader* buf, size_t* len) {
size_t l = tbufReadLength(buf);
const char* ret = buf->data + buf->pos;
tbufSkip( buf, l );
if( len != NULL ) {
tbufSkip(buf, l);
if (len != NULL) {
*len = l;
}
return ret;
}
size_t tbufReadToBinary( SBufferReader* buf, void* dst, size_t size ) {
assert( dst != NULL );
size_t tbufReadToBinary(SBufferReader* buf, void* dst, size_t size) {
assert(dst != NULL);
size_t len;
const char* data = tbufReadBinary( buf, &len );
if( len >= size ) {
const char* data = tbufReadBinary(buf, &len);
if (len >= size) {
len = size;
}
memcpy( dst, data, len );
memcpy(dst, data, len);
return len;
}
bool tbufReadBool( SBufferReader* buf ) {
bool tbufReadBool(SBufferReader* buf) {
bool ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
tbufReadToBuffer(buf, &ret, sizeof(ret));
return ret;
}
char tbufReadChar( SBufferReader* buf ) {
char tbufReadChar(SBufferReader* buf) {
char ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
tbufReadToBuffer(buf, &ret, sizeof(ret));
return ret;
}
int8_t tbufReadInt8( SBufferReader* buf ) {
int8_t tbufReadInt8(SBufferReader* buf) {
int8_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
tbufReadToBuffer(buf, &ret, sizeof(ret));
return ret;
}
uint8_t tbufReadUint8( SBufferReader* buf ) {
uint8_t tbufReadUint8(SBufferReader* buf) {
uint8_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
tbufReadToBuffer(buf, &ret, sizeof(ret));
return ret;
}
int16_t tbufReadInt16( SBufferReader* buf ) {
int16_t tbufReadInt16(SBufferReader* buf) {
int16_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
if( buf->endian ) {
return (int16_t)ntohs( ret );
tbufReadToBuffer(buf, &ret, sizeof(ret));
if (buf->endian) {
return (int16_t)ntohs(ret);
}
return ret;
}
uint16_t tbufReadUint16( SBufferReader* buf ) {
uint16_t tbufReadUint16(SBufferReader* buf) {
uint16_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
if( buf->endian ) {
return ntohs( ret );
tbufReadToBuffer(buf, &ret, sizeof(ret));
if (buf->endian) {
return ntohs(ret);
}
return ret;
}
int32_t tbufReadInt32( SBufferReader* buf ) {
int32_t tbufReadInt32(SBufferReader* buf) {
int32_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
if( buf->endian ) {
return (int32_t)ntohl( ret );
tbufReadToBuffer(buf, &ret, sizeof(ret));
if (buf->endian) {
return (int32_t)ntohl(ret);
}
return ret;
}
uint32_t tbufReadUint32( SBufferReader* buf ) {
uint32_t tbufReadUint32(SBufferReader* buf) {
uint32_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
if( buf->endian ) {
return ntohl( ret );
tbufReadToBuffer(buf, &ret, sizeof(ret));
if (buf->endian) {
return ntohl(ret);
}
return ret;
}
int64_t tbufReadInt64( SBufferReader* buf ) {
int64_t tbufReadInt64(SBufferReader* buf) {
int64_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
if( buf->endian ) {
return (int64_t)htobe64( ret ); // TODO: ntohll
tbufReadToBuffer(buf, &ret, sizeof(ret));
if (buf->endian) {
return (int64_t)htobe64(ret); // TODO: ntohll
}
return ret;
}
uint64_t tbufReadUint64( SBufferReader* buf ) {
uint64_t tbufReadUint64(SBufferReader* buf) {
uint64_t ret;
tbufReadToBuffer( buf, &ret, sizeof(ret) );
if( buf->endian ) {
return htobe64( ret ); // TODO: ntohll
tbufReadToBuffer(buf, &ret, sizeof(ret));
if (buf->endian) {
return htobe64(ret); // TODO: ntohll
}
return ret;
}
float tbufReadFloat( SBufferReader* buf ) {
float tbufReadFloat(SBufferReader* buf) {
Un4B _un;
tbufReadToBuffer( buf, &_un, sizeof(_un) );
if( buf->endian ) {
_un.ui = ntohl( _un.ui );
tbufReadToBuffer(buf, &_un, sizeof(_un));
if (buf->endian) {
_un.ui = ntohl(_un.ui);
}
return _un.f;
}
double tbufReadDouble(SBufferReader* buf) {
Un8B _un;
tbufReadToBuffer( buf, &_un, sizeof(_un) );
if( buf->endian ) {
_un.ull = htobe64( _un.ull );
tbufReadToBuffer(buf, &_un, sizeof(_un));
if (buf->endian) {
_un.ull = htobe64(_un.ull);
}
return _un.d;
}
......@@ -213,38 +213,38 @@ double tbufReadDouble(SBufferReader* buf) {
////////////////////////////////////////////////////////////////////////////////
// writer functions
void tbufCloseWriter( SBufferWriter* buf ) {
void tbufCloseWriter(SBufferWriter* buf) {
tfree(buf->data);
// (*buf->allocator)( buf->data, 0 ); // potential memory leak.
// (*buf->allocator)( buf->data, 0 ); // potential memory leak.
buf->data = NULL;
buf->pos = 0;
buf->size = 0;
}
void tbufEnsureCapacity( SBufferWriter* buf, size_t size ) {
void tbufEnsureCapacity(SBufferWriter* buf, size_t size) {
size += buf->pos;
if( size > buf->size ) {
if (size > buf->size) {
size_t nsize = size + buf->size;
char* data = (*buf->allocator)( buf->data, nsize );
char* data = (*buf->allocator)(buf->data, nsize);
// TODO: the exception should be thrown by the allocator function
if( data == NULL ) {
THROW( -1 );
if (data == NULL) {
THROW(-1);
}
buf->data = data;
buf->size = nsize;
}
}
size_t tbufReserve( SBufferWriter* buf, size_t size ) {
tbufEnsureCapacity( buf, size );
size_t tbufReserve(SBufferWriter* buf, size_t size) {
tbufEnsureCapacity(buf, size);
size_t old = buf->pos;
buf->pos += size;
return old;
}
char* tbufGetData( SBufferWriter* buf, bool takeOver ) {
char* tbufGetData(SBufferWriter* buf, bool takeOver) {
char* ret = buf->data;
if( takeOver ) {
if (takeOver) {
buf->pos = 0;
buf->size = 0;
buf->data = NULL;
......@@ -252,192 +252,174 @@ char* tbufGetData( SBufferWriter* buf, bool takeOver ) {
return ret;
}
void tbufWrite( SBufferWriter* buf, const void* data, size_t size ) {
assert( data != NULL );
tbufEnsureCapacity( buf, size );
memcpy( buf->data + buf->pos, data, size );
void tbufWrite(SBufferWriter* buf, const void* data, size_t size) {
assert(data != NULL);
tbufEnsureCapacity(buf, size);
memcpy(buf->data + buf->pos, data, size);
buf->pos += size;
}
void tbufWriteAt( SBufferWriter* buf, size_t pos, const void* data, size_t size ) {
assert( data != NULL );
void tbufWriteAt(SBufferWriter* buf, size_t pos, const void* data, size_t size) {
assert(data != NULL);
// this function can only be called to fill the gap on previous writes,
// so 'pos + size <= buf->pos' must be true
assert( pos + size <= buf->pos );
memcpy( buf->data + pos, data, size );
assert(pos + size <= buf->pos);
memcpy(buf->data + pos, data, size);
}
static void tbufWriteLength( SBufferWriter* buf, size_t len ) {
static void tbufWriteLength(SBufferWriter* buf, size_t len) {
// maximum length is 65535, if larger length is required
// this function and the corresponding read function need to be
// revised.
assert( len <= 0xffff );
tbufWriteUint16( buf, (uint16_t)len );
assert(len <= 0xffff);
tbufWriteUint16(buf, (uint16_t)len);
}
void tbufWriteStringLen( SBufferWriter* buf, const char* str, size_t len ) {
tbufWriteLength( buf, len );
tbufWrite( buf, str, len );
tbufWriteChar( buf, '\0' );
void tbufWriteStringLen(SBufferWriter* buf, const char* str, size_t len) {
tbufWriteLength(buf, len);
tbufWrite(buf, str, len);
tbufWriteChar(buf, '\0');
}
void tbufWriteString( SBufferWriter* buf, const char* str ) {
tbufWriteStringLen( buf, str, strlen(str) );
}
void tbufWriteString(SBufferWriter* buf, const char* str) { tbufWriteStringLen(buf, str, strlen(str)); }
void tbufWriteBinary( SBufferWriter* buf, const void* data, size_t len ) {
tbufWriteLength( buf, len );
tbufWrite( buf, data, len );
void tbufWriteBinary(SBufferWriter* buf, const void* data, size_t len) {
tbufWriteLength(buf, len);
tbufWrite(buf, data, len);
}
void tbufWriteBool( SBufferWriter* buf, bool data ) {
tbufWrite( buf, &data, sizeof(data) );
}
void tbufWriteBool(SBufferWriter* buf, bool data) { tbufWrite(buf, &data, sizeof(data)); }
void tbufWriteBoolAt( SBufferWriter* buf, size_t pos, bool data ) {
tbufWriteAt( buf, pos, &data, sizeof(data) );
}
void tbufWriteBoolAt(SBufferWriter* buf, size_t pos, bool data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
void tbufWriteChar( SBufferWriter* buf, char data ) {
tbufWrite( buf, &data, sizeof(data) );
}
void tbufWriteChar(SBufferWriter* buf, char data) { tbufWrite(buf, &data, sizeof(data)); }
void tbufWriteCharAt( SBufferWriter* buf, size_t pos, char data ) {
tbufWriteAt( buf, pos, &data, sizeof(data) );
}
void tbufWriteCharAt(SBufferWriter* buf, size_t pos, char data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
void tbufWriteInt8( SBufferWriter* buf, int8_t data ) {
tbufWrite( buf, &data, sizeof(data) );
}
void tbufWriteInt8(SBufferWriter* buf, int8_t data) { tbufWrite(buf, &data, sizeof(data)); }
void tbufWriteInt8At( SBufferWriter* buf, size_t pos, int8_t data ) {
tbufWriteAt( buf, pos, &data, sizeof(data) );
}
void tbufWriteInt8At(SBufferWriter* buf, size_t pos, int8_t data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
void tbufWriteUint8( SBufferWriter* buf, uint8_t data ) {
tbufWrite( buf, &data, sizeof(data) );
}
void tbufWriteUint8(SBufferWriter* buf, uint8_t data) { tbufWrite(buf, &data, sizeof(data)); }
void tbufWriteUint8At( SBufferWriter* buf, size_t pos, uint8_t data ) {
tbufWriteAt( buf, pos, &data, sizeof(data) );
}
void tbufWriteUint8At(SBufferWriter* buf, size_t pos, uint8_t data) { tbufWriteAt(buf, pos, &data, sizeof(data)); }
void tbufWriteInt16( SBufferWriter* buf, int16_t data ) {
if( buf->endian ) {
data = (int16_t)htons( data );
void tbufWriteInt16(SBufferWriter* buf, int16_t data) {
if (buf->endian) {
data = (int16_t)htons(data);
}
tbufWrite( buf, &data, sizeof(data) );
tbufWrite(buf, &data, sizeof(data));
}
void tbufWriteInt16At( SBufferWriter* buf, size_t pos, int16_t data ) {
if( buf->endian ) {
data = (int16_t)htons( data );
void tbufWriteInt16At(SBufferWriter* buf, size_t pos, int16_t data) {
if (buf->endian) {
data = (int16_t)htons(data);
}
tbufWriteAt( buf, pos, &data, sizeof(data) );
tbufWriteAt(buf, pos, &data, sizeof(data));
}
void tbufWriteUint16( SBufferWriter* buf, uint16_t data ) {
if( buf->endian ) {
data = htons( data );
void tbufWriteUint16(SBufferWriter* buf, uint16_t data) {
if (buf->endian) {
data = htons(data);
}
tbufWrite( buf, &data, sizeof(data) );
tbufWrite(buf, &data, sizeof(data));
}
void tbufWriteUint16At( SBufferWriter* buf, size_t pos, uint16_t data ) {
if( buf->endian ) {
data = htons( data );
void tbufWriteUint16At(SBufferWriter* buf, size_t pos, uint16_t data) {
if (buf->endian) {
data = htons(data);
}
tbufWriteAt( buf, pos, &data, sizeof(data) );
tbufWriteAt(buf, pos, &data, sizeof(data));
}
void tbufWriteInt32( SBufferWriter* buf, int32_t data ) {
if( buf->endian ) {
data = (int32_t)htonl( data );
void tbufWriteInt32(SBufferWriter* buf, int32_t data) {
if (buf->endian) {
data = (int32_t)htonl(data);
}
tbufWrite( buf, &data, sizeof(data) );
tbufWrite(buf, &data, sizeof(data));
}
void tbufWriteInt32At( SBufferWriter* buf, size_t pos, int32_t data ) {
if( buf->endian ) {
data = (int32_t)htonl( data );
void tbufWriteInt32At(SBufferWriter* buf, size_t pos, int32_t data) {
if (buf->endian) {
data = (int32_t)htonl(data);
}
tbufWriteAt( buf, pos, &data, sizeof(data) );
tbufWriteAt(buf, pos, &data, sizeof(data));
}
void tbufWriteUint32( SBufferWriter* buf, uint32_t data ) {
if( buf->endian ) {
data = htonl( data );
void tbufWriteUint32(SBufferWriter* buf, uint32_t data) {
if (buf->endian) {
data = htonl(data);
}
tbufWrite( buf, &data, sizeof(data) );
tbufWrite(buf, &data, sizeof(data));
}
void tbufWriteUint32At( SBufferWriter* buf, size_t pos, uint32_t data ) {
if( buf->endian ) {
data = htonl( data );
void tbufWriteUint32At(SBufferWriter* buf, size_t pos, uint32_t data) {
if (buf->endian) {
data = htonl(data);
}
tbufWriteAt( buf, pos, &data, sizeof(data) );
tbufWriteAt(buf, pos, &data, sizeof(data));
}
void tbufWriteInt64( SBufferWriter* buf, int64_t data ) {
if( buf->endian ) {
data = (int64_t)htobe64( data );
void tbufWriteInt64(SBufferWriter* buf, int64_t data) {
if (buf->endian) {
data = (int64_t)htobe64(data);
}
tbufWrite( buf, &data, sizeof(data) );
tbufWrite(buf, &data, sizeof(data));
}
void tbufWriteInt64At( SBufferWriter* buf, size_t pos, int64_t data ) {
if( buf->endian ) {
data = (int64_t)htobe64( data );
void tbufWriteInt64At(SBufferWriter* buf, size_t pos, int64_t data) {
if (buf->endian) {
data = (int64_t)htobe64(data);
}
tbufWriteAt( buf, pos, &data, sizeof(data) );
tbufWriteAt(buf, pos, &data, sizeof(data));
}
void tbufWriteUint64( SBufferWriter* buf, uint64_t data ) {
if( buf->endian ) {
data = htobe64( data );
void tbufWriteUint64(SBufferWriter* buf, uint64_t data) {
if (buf->endian) {
data = htobe64(data);
}
tbufWrite( buf, &data, sizeof(data) );
tbufWrite(buf, &data, sizeof(data));
}
void tbufWriteUint64At( SBufferWriter* buf, size_t pos, uint64_t data ) {
if( buf->endian ) {
data = htobe64( data );
void tbufWriteUint64At(SBufferWriter* buf, size_t pos, uint64_t data) {
if (buf->endian) {
data = htobe64(data);
}
tbufWriteAt( buf, pos, &data, sizeof(data) );
tbufWriteAt(buf, pos, &data, sizeof(data));
}
void tbufWriteFloat( SBufferWriter* buf, float data ) {
void tbufWriteFloat(SBufferWriter* buf, float data) {
Un4B _un;
_un.f = data;
if( buf->endian ) {
_un.ui = htonl( _un.ui );
if (buf->endian) {
_un.ui = htonl(_un.ui);
}
tbufWrite( buf, &_un, sizeof(_un) );
tbufWrite(buf, &_un, sizeof(_un));
}
void tbufWriteFloatAt( SBufferWriter* buf, size_t pos, float data ) {
void tbufWriteFloatAt(SBufferWriter* buf, size_t pos, float data) {
Un4B _un;
_un.f = data;
if( buf->endian ) {
_un.ui = htonl( _un.ui );
if (buf->endian) {
_un.ui = htonl(_un.ui);
}
tbufWriteAt( buf, pos, &_un, sizeof(_un) );
tbufWriteAt(buf, pos, &_un, sizeof(_un));
}
void tbufWriteDouble( SBufferWriter* buf, double data ) {
void tbufWriteDouble(SBufferWriter* buf, double data) {
Un8B _un;
_un.d = data;
if( buf->endian ) {
_un.ull = htobe64( _un.ull );
if (buf->endian) {
_un.ull = htobe64(_un.ull);
}
tbufWrite( buf, &_un, sizeof(_un) );
tbufWrite(buf, &_un, sizeof(_un));
}
void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data ) {
void tbufWriteDoubleAt(SBufferWriter* buf, size_t pos, double data) {
Un8B _un;
_un.d = data;
if( buf->endian ) {
_un.ull = htobe64( _un.ull );
if (buf->endian) {
_un.ull = htobe64(_un.ull);
}
tbufWriteAt( buf, pos, &_un, sizeof(_un) );
tbufWriteAt(buf, pos, &_un, sizeof(_un));
}
tests/script/general/db/basic1.sim
浏览文件 @ 240a5309
......@@ -59,9 +59,29 @@ if $data03 != 0 then
endi
print =============== show vgroups
sql show databases
if $rows != 1 then
return -1
endi
sql_error use d1
sql use d4
sql show vgroups
if $rows == 0 then
if $rows != 2 then
return -1
endi
print =============== show dnodes
sql show dnodes
if $data00 != 1 then
return -1
endi
if $data02 != 2 then
return -1
endi
......
tests/script/general/table/basic1.sim
浏览文件 @ 240a5309
......@@ -23,7 +23,7 @@ endi
print $data00 $data01 $data02
sql create table st2 (ts timestamp, i float) tags (j bigint)
sql create table st2 (ts timestamp, i float) tags (j int)
sql show stables
if $rows != 2 then
return -1
......@@ -39,15 +39,14 @@ if $rows != 1 then
return -1
endi
print -->
print $data00 $data01 $data02
print $data10 $data11 $data12
return
print =============== create child table
sql create table c1 using st tags(1)
sql create table c2 using st tags(2)
return
sql show tables
if $rows != 2 then
return -1
......
tests/script/sh/exec.sh
浏览文件 @ 240a5309
......@@ -17,7 +17,7 @@ OS_TYPE=`$UNAME_BIN`
NODE_NAME=
EXEC_OPTON=
CLEAR_OPTION="false"
while getopts "n:s:u:x:ct" arg
while getopts "n:s:u:x:cv" arg
do
case $arg in
n)
......@@ -29,7 +29,7 @@ do
c)
CLEAR_OPTION="clear"
;;
t)
v)
SHELL_OPTION="true"
;;
u)
......
tests/script/tmp/dnodes.sim
浏览文件 @ 240a5309
......@@ -2,20 +2,19 @@ system sh/stop_dnodes.sh
############## config parameter #####################
$node1 = 192.168.101.174
$node1 = 192.168.0.201
$node2 = 192.168.0.202
$node2 = 192.168.0.203
$node3 = 192.168.0.204
$node3 = 192.168.0.203
$node4 = 192.168.0.204
$first = 1
$num = 5
$self = $node1
$num = 25
############### deploy firstEp #####################
$firstEp = $node1 . :7100
$firstPort = 7100
if $first == 1 then
if $self == $node1 then
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c firstEp -v $firstEp
system sh/cfg.sh -n dnode1 -c secondEp -v $firstEp
......@@ -28,7 +27,7 @@ if $first == 1 then
$i = 0
while $i < $num
$port = $i * 100
$port = $port + 8000
$port = $port + 8100
$i = $i + 1
sql create dnode $node1 port $port
endw
......@@ -36,7 +35,7 @@ if $first == 1 then
$i = 0
while $i < $num
$port = $i * 100
$port = $port + 8000
$port = $port + 8100
$i = $i + 1
sql create dnode $node2 port $port
endw
......@@ -44,7 +43,7 @@ if $first == 1 then
$i = 0
while $i < $num
$port = $i * 100
$port = $port + 8000
$port = $port + 8100
$i = $i + 1
sql create dnode $node3 port $port
endw
......@@ -52,7 +51,7 @@ if $first == 1 then
$i = 0
while $i < $num
$port = $i * 100
$port = $port + 8000
$port = $port + 8100
$i = $i + 1
sql create dnode $node4 port $port
endw
......@@ -64,7 +63,7 @@ $i = 0
while $i < $num
$index = $i + 80
$port = $i * 100
$port = $port + 8000
$port = $port + 8100
$dnodename = dnode . $index
$i = $i + 1
......@@ -74,5 +73,5 @@ while $i < $num
system sh/cfg.sh -n $dnodename -c fqdn -v $self
system sh/cfg.sh -n $dnodename -c serverPort -v $port
#system sh/exec.sh -n $dnodename -s start
system sh/exec.sh -n $dnodename -s start
endw
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或