diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 539a60b670..f148009f81 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -111,15 +111,16 @@ typedef enum _mgmt_table {
TSDB_MGMT_TABLE_MAX,
} EShowType;
-#define TSDB_ALTER_TABLE_ADD_TAG 1
-#define TSDB_ALTER_TABLE_DROP_TAG 2
-#define TSDB_ALTER_TABLE_UPDATE_TAG_NAME 3
-#define TSDB_ALTER_TABLE_UPDATE_TAG_VAL 4
-
+#define TSDB_ALTER_TABLE_ADD_TAG 1
+#define TSDB_ALTER_TABLE_DROP_TAG 2
+#define TSDB_ALTER_TABLE_UPDATE_TAG_NAME 3
+#define TSDB_ALTER_TABLE_UPDATE_TAG_VAL 4
#define TSDB_ALTER_TABLE_ADD_COLUMN 5
#define TSDB_ALTER_TABLE_DROP_COLUMN 6
#define TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES 7
#define TSDB_ALTER_TABLE_UPDATE_TAG_BYTES 8
+#define TSDB_ALTER_TABLE_UPDATE_OPTIONS 9
+#define TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME 10
#define TSDB_FILL_NONE 0
#define TSDB_FILL_NULL 1
@@ -2053,27 +2054,19 @@ static FORCE_INLINE void* tDecodeTSma(void* buf, STSma* pSma) {
buf = taosDecodeFixedI64(buf, &pSma->sliding);
if (pSma->exprLen > 0) {
- pSma->expr = (char*)calloc(pSma->exprLen, 1);
- if (pSma->expr != NULL) {
- buf = taosDecodeStringTo(buf, pSma->expr);
- } else {
+ if ((buf = taosDecodeString(buf, &pSma->expr)) == NULL) {
tdDestroyTSma(pSma);
return NULL;
}
-
} else {
pSma->expr = NULL;
}
if (pSma->tagsFilterLen > 0) {
- pSma->tagsFilter = (char*)calloc(pSma->tagsFilterLen, 1);
- if (pSma->tagsFilter != NULL) {
- buf = taosDecodeStringTo(buf, pSma->tagsFilter);
- } else {
+ if ((buf = taosDecodeString(buf, &pSma->tagsFilter)) == NULL) {
tdDestroyTSma(pSma);
return NULL;
}
-
} else {
pSma->tagsFilter = NULL;
}
diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
index 167c72a778..27d509e931 100644
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@@ -34,128 +34,147 @@
#define TK_NK_REM 16
#define TK_NK_CONCAT 17
#define TK_CREATE 18
-#define TK_USER 19
-#define TK_PASS 20
-#define TK_NK_STRING 21
-#define TK_ALTER 22
-#define TK_PRIVILEGE 23
-#define TK_DROP 24
-#define TK_SHOW 25
-#define TK_USERS 26
-#define TK_DNODE 27
-#define TK_PORT 28
-#define TK_NK_INTEGER 29
-#define TK_DNODES 30
-#define TK_NK_ID 31
-#define TK_NK_IPTOKEN 32
-#define TK_QNODE 33
-#define TK_ON 34
-#define TK_QNODES 35
-#define TK_DATABASE 36
-#define TK_DATABASES 37
-#define TK_USE 38
-#define TK_IF 39
-#define TK_NOT 40
-#define TK_EXISTS 41
-#define TK_BLOCKS 42
-#define TK_CACHE 43
-#define TK_CACHELAST 44
-#define TK_COMP 45
-#define TK_DAYS 46
-#define TK_FSYNC 47
-#define TK_MAXROWS 48
-#define TK_MINROWS 49
-#define TK_KEEP 50
-#define TK_PRECISION 51
-#define TK_QUORUM 52
-#define TK_REPLICA 53
-#define TK_TTL 54
-#define TK_WAL 55
-#define TK_VGROUPS 56
-#define TK_SINGLE_STABLE 57
-#define TK_STREAM_MODE 58
-#define TK_TABLE 59
-#define TK_NK_LP 60
-#define TK_NK_RP 61
-#define TK_STABLE 62
-#define TK_TABLES 63
-#define TK_STABLES 64
-#define TK_USING 65
-#define TK_TAGS 66
-#define TK_NK_DOT 67
-#define TK_NK_COMMA 68
-#define TK_COMMENT 69
-#define TK_BOOL 70
-#define TK_TINYINT 71
-#define TK_SMALLINT 72
-#define TK_INT 73
-#define TK_INTEGER 74
-#define TK_BIGINT 75
-#define TK_FLOAT 76
-#define TK_DOUBLE 77
-#define TK_BINARY 78
-#define TK_TIMESTAMP 79
-#define TK_NCHAR 80
-#define TK_UNSIGNED 81
-#define TK_JSON 82
-#define TK_VARCHAR 83
-#define TK_MEDIUMBLOB 84
-#define TK_BLOB 85
-#define TK_VARBINARY 86
-#define TK_DECIMAL 87
-#define TK_SMA 88
-#define TK_INDEX 89
-#define TK_FULLTEXT 90
-#define TK_FUNCTION 91
-#define TK_INTERVAL 92
-#define TK_TOPIC 93
-#define TK_AS 94
-#define TK_MNODES 95
-#define TK_NK_FLOAT 96
-#define TK_NK_BOOL 97
-#define TK_NK_VARIABLE 98
-#define TK_BETWEEN 99
-#define TK_IS 100
-#define TK_NULL 101
-#define TK_NK_LT 102
-#define TK_NK_GT 103
-#define TK_NK_LE 104
-#define TK_NK_GE 105
-#define TK_NK_NE 106
-#define TK_NK_EQ 107
-#define TK_LIKE 108
-#define TK_MATCH 109
-#define TK_NMATCH 110
-#define TK_IN 111
-#define TK_FROM 112
-#define TK_JOIN 113
-#define TK_INNER 114
-#define TK_SELECT 115
-#define TK_DISTINCT 116
-#define TK_WHERE 117
-#define TK_PARTITION 118
-#define TK_BY 119
-#define TK_SESSION 120
-#define TK_STATE_WINDOW 121
-#define TK_SLIDING 122
-#define TK_FILL 123
-#define TK_VALUE 124
-#define TK_NONE 125
-#define TK_PREV 126
-#define TK_LINEAR 127
-#define TK_NEXT 128
-#define TK_GROUP 129
-#define TK_HAVING 130
-#define TK_ORDER 131
-#define TK_SLIMIT 132
-#define TK_SOFFSET 133
-#define TK_LIMIT 134
-#define TK_OFFSET 135
-#define TK_ASC 136
-#define TK_DESC 137
-#define TK_NULLS 138
-#define TK_FIRST 139
-#define TK_LAST 140
+#define TK_ACCOUNT 19
+#define TK_NK_ID 20
+#define TK_PASS 21
+#define TK_NK_STRING 22
+#define TK_ALTER 23
+#define TK_PPS 24
+#define TK_TSERIES 25
+#define TK_STORAGE 26
+#define TK_STREAMS 27
+#define TK_QTIME 28
+#define TK_DBS 29
+#define TK_USERS 30
+#define TK_CONNS 31
+#define TK_STATE 32
+#define TK_USER 33
+#define TK_PRIVILEGE 34
+#define TK_DROP 35
+#define TK_SHOW 36
+#define TK_DNODE 37
+#define TK_PORT 38
+#define TK_NK_INTEGER 39
+#define TK_DNODES 40
+#define TK_NK_IPTOKEN 41
+#define TK_LOCAL 42
+#define TK_QNODE 43
+#define TK_ON 44
+#define TK_QNODES 45
+#define TK_DATABASE 46
+#define TK_DATABASES 47
+#define TK_USE 48
+#define TK_IF 49
+#define TK_NOT 50
+#define TK_EXISTS 51
+#define TK_BLOCKS 52
+#define TK_CACHE 53
+#define TK_CACHELAST 54
+#define TK_COMP 55
+#define TK_DAYS 56
+#define TK_FSYNC 57
+#define TK_MAXROWS 58
+#define TK_MINROWS 59
+#define TK_KEEP 60
+#define TK_PRECISION 61
+#define TK_QUORUM 62
+#define TK_REPLICA 63
+#define TK_TTL 64
+#define TK_WAL 65
+#define TK_VGROUPS 66
+#define TK_SINGLE_STABLE 67
+#define TK_STREAM_MODE 68
+#define TK_RETENTIONS 69
+#define TK_FILE_FACTOR 70
+#define TK_NK_FLOAT 71
+#define TK_TABLE 72
+#define TK_NK_LP 73
+#define TK_NK_RP 74
+#define TK_STABLE 75
+#define TK_TABLES 76
+#define TK_STABLES 77
+#define TK_ADD 78
+#define TK_COLUMN 79
+#define TK_MODIFY 80
+#define TK_RENAME 81
+#define TK_TAG 82
+#define TK_SET 83
+#define TK_NK_EQ 84
+#define TK_USING 85
+#define TK_TAGS 86
+#define TK_NK_DOT 87
+#define TK_NK_COMMA 88
+#define TK_COMMENT 89
+#define TK_BOOL 90
+#define TK_TINYINT 91
+#define TK_SMALLINT 92
+#define TK_INT 93
+#define TK_INTEGER 94
+#define TK_BIGINT 95
+#define TK_FLOAT 96
+#define TK_DOUBLE 97
+#define TK_BINARY 98
+#define TK_TIMESTAMP 99
+#define TK_NCHAR 100
+#define TK_UNSIGNED 101
+#define TK_JSON 102
+#define TK_VARCHAR 103
+#define TK_MEDIUMBLOB 104
+#define TK_BLOB 105
+#define TK_VARBINARY 106
+#define TK_DECIMAL 107
+#define TK_SMA 108
+#define TK_ROLLUP 109
+#define TK_INDEX 110
+#define TK_FULLTEXT 111
+#define TK_FUNCTION 112
+#define TK_INTERVAL 113
+#define TK_TOPIC 114
+#define TK_AS 115
+#define TK_MNODES 116
+#define TK_NK_BOOL 117
+#define TK_NK_VARIABLE 118
+#define TK_BETWEEN 119
+#define TK_IS 120
+#define TK_NULL 121
+#define TK_NK_LT 122
+#define TK_NK_GT 123
+#define TK_NK_LE 124
+#define TK_NK_GE 125
+#define TK_NK_NE 126
+#define TK_LIKE 127
+#define TK_MATCH 128
+#define TK_NMATCH 129
+#define TK_IN 130
+#define TK_FROM 131
+#define TK_JOIN 132
+#define TK_INNER 133
+#define TK_SELECT 134
+#define TK_DISTINCT 135
+#define TK_WHERE 136
+#define TK_PARTITION 137
+#define TK_BY 138
+#define TK_SESSION 139
+#define TK_STATE_WINDOW 140
+#define TK_SLIDING 141
+#define TK_FILL 142
+#define TK_VALUE 143
+#define TK_NONE 144
+#define TK_PREV 145
+#define TK_LINEAR 146
+#define TK_NEXT 147
+#define TK_GROUP 148
+#define TK_HAVING 149
+#define TK_ORDER 150
+#define TK_SLIMIT 151
+#define TK_SOFFSET 152
+#define TK_LIMIT 153
+#define TK_OFFSET 154
+#define TK_ASC 155
+#define TK_DESC 156
+#define TK_NULLS 157
+#define TK_FIRST 158
+#define TK_LAST 159
#define TK_NK_SPACE 300
#define TK_NK_COMMENT 301
diff --git a/include/common/ttypes.h b/include/common/ttypes.h
index 5aa22bdcad..a936ea3b54 100644
--- a/include/common/ttypes.h
+++ b/include/common/ttypes.h
@@ -27,7 +27,7 @@ extern "C" {
typedef int32_t VarDataOffsetT;
typedef uint32_t TDRowLenT;
typedef uint8_t TDRowValT;
-typedef uint16_t col_id_t;
+typedef int16_t col_id_t;
typedef int8_t col_type_t;
#pragma pack(push, 1)
diff --git a/include/libs/nodes/cmdnodes.h b/include/libs/nodes/cmdnodes.h
index 5d7174fc08..5dbfd6c2c2 100644
--- a/include/libs/nodes/cmdnodes.h
+++ b/include/libs/nodes/cmdnodes.h
@@ -127,6 +127,18 @@ typedef struct SDropSuperTableStmt {
bool ignoreNotExists;
} SDropSuperTableStmt;
+typedef struct SAlterTableStmt {
+ ENodeType type;
+ char dbName[TSDB_DB_NAME_LEN];
+ char tableName[TSDB_TABLE_NAME_LEN];
+ int8_t alterType;
+ char colName[TSDB_COL_NAME_LEN];
+ char newColName[TSDB_COL_NAME_LEN];
+ STableOptions* pOptions;
+ SDataType dataType;
+ SValueNode* pVal;
+} SAlterTableStmt;
+
typedef struct SCreateUserStmt {
ENodeType type;
char useName[TSDB_USER_LEN];
@@ -158,6 +170,13 @@ typedef struct SDropDnodeStmt {
int32_t port;
} SDropDnodeStmt;
+typedef struct SAlterDnodeStmt {
+ ENodeType type;
+ int32_t dnodeId;
+ char config[TSDB_DNODE_CONFIG_LEN];
+ char value[TSDB_DNODE_VALUE_LEN];
+} SAlterDnodeStmt;
+
typedef struct SShowStmt {
ENodeType type;
char dbName[TSDB_DB_NAME_LEN];
@@ -215,6 +234,12 @@ typedef struct SDropTopicStmt {
bool ignoreNotExists;
} SDropTopicStmt;
+typedef struct SAlterLocalStmt {
+ ENodeType type;
+ char config[TSDB_DNODE_CONFIG_LEN];
+ char value[TSDB_DNODE_VALUE_LEN];
+} SAlterLocalStmt;
+
#ifdef __cplusplus
}
#endif
diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h
index 4ef70fc7ab..d7e67be9e0 100644
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -85,6 +85,7 @@ typedef enum ENodeType {
QUERY_NODE_DROP_TABLE_CLAUSE,
QUERY_NODE_DROP_TABLE_STMT,
QUERY_NODE_DROP_SUPER_TABLE_STMT,
+ QUERY_NODE_ALTER_TABLE_STMT,
QUERY_NODE_SHOW_TABLES_STMT, // temp
QUERY_NODE_SHOW_STABLES_STMT,
QUERY_NODE_CREATE_USER_STMT,
@@ -94,6 +95,7 @@ typedef enum ENodeType {
QUERY_NODE_USE_DATABASE_STMT,
QUERY_NODE_CREATE_DNODE_STMT,
QUERY_NODE_DROP_DNODE_STMT,
+ QUERY_NODE_ALTER_DNODE_STMT,
QUERY_NODE_SHOW_DNODES_STMT,
QUERY_NODE_SHOW_VGROUPS_STMT,
QUERY_NODE_SHOW_MNODES_STMT,
@@ -104,6 +106,7 @@ typedef enum ENodeType {
QUERY_NODE_DROP_QNODE_STMT,
QUERY_NODE_CREATE_TOPIC_STMT,
QUERY_NODE_DROP_TOPIC_STMT,
+ QUERY_NODE_ALTER_LOCAL_STMT,
// logic plan node
QUERY_NODE_LOGIC_PLAN_SCAN,
@@ -163,6 +166,7 @@ SNodeList* nodesMakeList();
int32_t nodesListAppend(SNodeList* pList, SNodeptr pNode);
int32_t nodesListStrictAppend(SNodeList* pList, SNodeptr pNode);
int32_t nodesListAppendList(SNodeList* pTarget, SNodeList* pSrc);
+int32_t nodesListStrictAppendList(SNodeList* pTarget, SNodeList* pSrc);
SListCell* nodesListErase(SNodeList* pList, SListCell* pCell);
SNodeptr nodesListGetNode(SNodeList* pList, int32_t index);
void nodesDestroyList(SNodeList* pList);
diff --git a/include/libs/nodes/plannodes.h b/include/libs/nodes/plannodes.h
index 1d89b07539..cbc1f6c1f8 100644
--- a/include/libs/nodes/plannodes.h
+++ b/include/libs/nodes/plannodes.h
@@ -26,7 +26,6 @@ extern "C" {
typedef struct SLogicNode {
ENodeType type;
- int32_t id;
SNodeList* pTargets; // SColumnNode
SNode* pConditions;
SNodeList* pChildren;
@@ -37,6 +36,7 @@ typedef enum EScanType {
SCAN_TYPE_TAG,
SCAN_TYPE_TABLE,
SCAN_TYPE_STABLE,
+ SCAN_TYPE_TOPIC,
SCAN_TYPE_STREAM
} EScanType;
@@ -155,7 +155,7 @@ typedef struct SPhysiNode {
} SPhysiNode;
typedef struct SScanPhysiNode {
- SPhysiNode node;
+ SPhysiNode node;
SNodeList* pScanCols;
uint64_t uid; // unique id of the table
int8_t tableType;
@@ -167,6 +167,7 @@ typedef struct SScanPhysiNode {
typedef SScanPhysiNode SSystemTableScanPhysiNode;
typedef SScanPhysiNode STagScanPhysiNode;
+typedef SScanPhysiNode SStreamScanPhysiNode;
typedef struct STableScanPhysiNode {
SScanPhysiNode scan;
diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index fe44d8666b..2c733454dc 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -23,6 +23,10 @@ extern "C" {
#include "nodes.h"
#include "tmsg.h"
+#define TABLE_TOTAL_COL_NUM(pMeta) ((pMeta)->tableInfo.numOfColumns + (pMeta)->tableInfo.numOfTags)
+#define TABLE_META_SIZE(pMeta) (NULL == (pMeta) ? 0 : (sizeof(STableMeta) + TABLE_TOTAL_COL_NUM((pMeta)) * sizeof(SSchema)))
+#define VGROUPS_INFO_SIZE(pInfo) (NULL == (pInfo) ? 0 : (sizeof(SVgroupsInfo) + (pInfo)->numOfVgroups * sizeof(SVgroupInfo)))
+
typedef struct SRawExprNode {
ENodeType nodeType;
char* p;
diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index 77838c705f..74a15e2d18 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -26,6 +26,7 @@ typedef struct SParseContext {
uint64_t requestId;
int32_t acctId;
const char *db;
+ bool topicQuery;
void *pTransporter;
SEpSet mgmtEpSet;
const char *pSql; // sql string
diff --git a/include/libs/planner/planner.h b/include/libs/planner/planner.h
index 7eb9d038a5..4ba04d1713 100644
--- a/include/libs/planner/planner.h
+++ b/include/libs/planner/planner.h
@@ -26,6 +26,7 @@ typedef struct SPlanContext {
uint64_t queryId;
int32_t acctId;
SNode* pAstRoot;
+ bool topicQuery;
bool streamQuery;
} SPlanContext;
diff --git a/include/libs/transport/trpc.h b/include/libs/transport/trpc.h
index d3cd77eb3f..02029a996c 100644
--- a/include/libs/transport/trpc.h
+++ b/include/libs/transport/trpc.h
@@ -38,13 +38,13 @@ typedef struct SRpcConnInfo {
typedef struct SRpcMsg {
tmsg_t msgType;
- tmsg_t expectMsgType;
void * pCont;
int contLen;
int32_t code;
- void * handle; // rpc handle returned to app
- void * ahandle; // app handle set by client
- int noResp; // has response or not(default 0 indicate resp);
+ void * handle; // rpc handle returned to app
+ void * ahandle; // app handle set by client
+ int noResp; // has response or not(default 0, 0: resp, 1: no resp);
+ int persistHandle; // persist handle or not
} SRpcMsg;
@@ -77,18 +77,19 @@ typedef struct SRpcInit {
// call back to retrieve the client auth info, for server app only
int (*afp)(void *parent, char *tableId, char *spi, char *encrypt, char *secret, char *ckey);
- // call back to keep conn or not
- bool (*pfp)(void *parent, tmsg_t msgType);
-
- // to support Send messages multiple times on a link
- void *(*mfp)(void *parent, tmsg_t msgType);
-
- // call back to handle except when query/fetch in progress
- bool (*efp)(void *parent, tmsg_t msgType);
-
void *parent;
} SRpcInit;
+typedef struct {
+ void * val;
+ int32_t len;
+ void (*free)(void *arg);
+} SRpcCtxVal;
+
+typedef struct {
+ SHashObj *args;
+} SRpcCtx;
+
int32_t rpcInit();
void rpcCleanup();
void * rpcOpen(const SRpcInit *pRpc);
@@ -97,16 +98,17 @@ void * rpcMallocCont(int contLen);
void rpcFreeCont(void *pCont);
void * rpcReallocCont(void *ptr, int contLen);
void rpcSendRequest(void *thandle, const SEpSet *pEpSet, SRpcMsg *pMsg, int64_t *rid);
-void rpcSendResponse(const SRpcMsg *pMsg);
-void rpcSendRedirectRsp(void *pConn, const SEpSet *pEpSet);
-int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
-void rpcSendRecv(void *shandle, SEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
-int rpcReportProgress(void *pConn, char *pCont, int contLen);
-void rpcCancelRequest(int64_t rid);
+void rpcSendRequestWithCtx(void *thandle, const SEpSet *pEpSet, SRpcMsg *pMsg, int64_t *rid, SRpcCtx *ctx);
+void rpcSendResponse(const SRpcMsg *pMsg);
+void rpcSendRedirectRsp(void *pConn, const SEpSet *pEpSet);
+int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
+void rpcSendRecv(void *shandle, SEpSet *pEpSet, SRpcMsg *pReq, SRpcMsg *pRsp);
+int rpcReportProgress(void *pConn, char *pCont, int contLen);
+void rpcCancelRequest(int64_t rid);
+void rpcRegisterBrokenLinkArg(SRpcMsg *msg);
// just release client conn to rpc instance, no close sock
-void rpcReleaseHandle(void *handle, int8_t type);
-
+void rpcReleaseHandle(void *handle, int8_t type); //
void rpcRefHandle(void *handle, int8_t type);
void rpcUnrefHandle(void *handle, int8_t type);
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index ca1ee96f89..9f95848865 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -463,6 +463,7 @@ int32_t* taosGetErrno();
#define TSDB_CODE_PAR_PASSWD_EMPTY TAOS_DEF_ERROR_CODE(0, 0x2611)
#define TSDB_CODE_PAR_INVALID_PORT TAOS_DEF_ERROR_CODE(0, 0x2612)
#define TSDB_CODE_PAR_INVALID_ENDPOINT TAOS_DEF_ERROR_CODE(0, 0x2613)
+#define TSDB_CODE_PAR_EXPRIE_STATEMENT TAOS_DEF_ERROR_CODE(0, 0x2614)
#ifdef __cplusplus
}
diff --git a/include/util/tjson.h b/include/util/tjson.h
index 1218caae35..6b2221f704 100644
--- a/include/util/tjson.h
+++ b/include/util/tjson.h
@@ -22,6 +22,14 @@
extern "C" {
#endif
+#define tjsonGetNumberValue(pJson, pName, val) \
+ ({ \
+ uint64_t _tmp = 0; \
+ int32_t _code = tjsonGetUBigIntValue(pJson, pName, &_tmp); \
+ val = _tmp; \
+ _code; \
+ })
+
typedef void SJson;
SJson* tjsonCreateObject();
@@ -44,6 +52,7 @@ int32_t tjsonGetIntValue(const SJson* pJson, const char* pName, int32_t* pVal);
int32_t tjsonGetSmallIntValue(const SJson* pJson, const char* pName, int16_t* pVal);
int32_t tjsonGetTinyIntValue(const SJson* pJson, const char* pName, int8_t* pVal);
int32_t tjsonGetUBigIntValue(const SJson* pJson, const char* pName, uint64_t* pVal);
+int32_t tjsonGetUIntValue(const SJson* pJson, const char* pName, uint32_t* pVal);
int32_t tjsonGetUTinyIntValue(const SJson* pJson, const char* pName, uint8_t* pVal);
int32_t tjsonGetBoolValue(const SJson* pJson, const char* pName, bool* pVal);
int32_t tjsonGetDoubleValue(const SJson* pJson, const char* pName, double* pVal);
@@ -60,6 +69,7 @@ int32_t tjsonAddArray(SJson* pJson, const char* pName, FToJson func, const void*
typedef int32_t (*FToObject)(const SJson* pJson, void* pObj);
int32_t tjsonToObject(const SJson* pJson, const char* pName, FToObject func, void* pObj);
+int32_t tjsonMakeObject(const SJson* pJson, const char* pName, FToObject func, void** pObj, int32_t objSize);
int32_t tjsonToArray(const SJson* pJson, const char* pName, FToObject func, void* pArray, int32_t itemSize);
char* tjsonToString(const SJson* pJson);
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index b672c9bb47..4067807eaf 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -179,6 +179,7 @@ typedef struct SRequestObj {
uint64_t requestId;
int32_t type; // request type
STscObj* pTscObj;
+ char* pDb;
char* sqlstr; // sql string
int32_t sqlLen;
int64_t self;
@@ -229,7 +230,7 @@ void setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32_t
int32_t buildRequest(STscObj* pTscObj, const char* sql, int sqlLen, SRequestObj** pRequest);
-int32_t parseSql(SRequestObj* pRequest, SQuery** pQuery);
+int32_t parseSql(SRequestObj* pRequest, bool topicQuery, SQuery** pQuery);
int32_t getPlan(SRequestObj* pRequest, SQuery* pQuery, SQueryPlan** pPlan, SArray* pNodeList);
// --- heartbeat
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 525c5f9fb8..24abbd263c 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -90,7 +90,6 @@ void *openTransporter(const char *user, const char *auth, int32_t numOfThread) {
rpcInit.label = "TSC";
rpcInit.numOfThreads = numOfThread;
rpcInit.cfp = processMsgFromServer;
- rpcInit.pfp = persistConnForSpecificMsg;
rpcInit.sessions = tsMaxConnections;
rpcInit.connType = TAOS_CONN_CLIENT;
rpcInit.user = (char *)user;
@@ -150,6 +149,7 @@ void *createRequest(STscObj *pObj, __taos_async_fn_t fp, void *param, int32_t ty
return NULL;
}
+ pRequest->pDb = getDbOfConnection(pObj);
pRequest->requestId = generateRequestId();
pRequest->metric.start = taosGetTimestampMs();
@@ -180,6 +180,7 @@ static void doDestroyRequest(void *p) {
tfree(pRequest->msgBuf);
tfree(pRequest->sqlstr);
tfree(pRequest->pInfo);
+ tfree(pRequest->pDb);
doFreeReqResultInfo(&pRequest->body.resInfo);
qDestroyQueryPlan(pRequest->body.pDag);
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index fc97f4113c..a5752a6f2e 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -137,13 +137,14 @@ int32_t buildRequest(STscObj* pTscObj, const char* sql, int sqlLen, SRequestObj*
return TSDB_CODE_SUCCESS;
}
-int32_t parseSql(SRequestObj* pRequest, SQuery** pQuery) {
+int32_t parseSql(SRequestObj* pRequest, bool topicQuery, SQuery** pQuery) {
STscObj* pTscObj = pRequest->pTscObj;
SParseContext cxt = {
.requestId = pRequest->requestId,
.acctId = pTscObj->acctId,
- .db = getDbOfConnection(pTscObj),
+ .db = pRequest->pDb,
+ .topicQuery = topicQuery,
.pSql = pRequest->sqlstr,
.sqlLen = pRequest->sqlLen,
.pMsg = pRequest->msgBuf,
@@ -154,7 +155,6 @@ int32_t parseSql(SRequestObj* pRequest, SQuery** pQuery) {
cxt.mgmtEpSet = getEpSet_s(&pTscObj->pAppInfo->mgmtEp);
int32_t code = catalogGetHandle(pTscObj->pAppInfo->clusterId, &cxt.pCatalog);
if (code != TSDB_CODE_SUCCESS) {
- tfree(cxt.db);
return code;
}
@@ -163,7 +163,6 @@ int32_t parseSql(SRequestObj* pRequest, SQuery** pQuery) {
setResSchemaInfo(&pRequest->body.resInfo, (*pQuery)->pResSchema, (*pQuery)->numOfResCols);
}
- tfree(cxt.db);
return code;
}
@@ -249,7 +248,7 @@ TAOS_RES* taos_query_l(TAOS* taos, const char* sql, int sqlLen) {
terrno = TSDB_CODE_SUCCESS;
CHECK_CODE_GOTO(buildRequest(pTscObj, sql, sqlLen, &pRequest), _return);
- CHECK_CODE_GOTO(parseSql(pRequest, &pQuery), _return);
+ CHECK_CODE_GOTO(parseSql(pRequest, false, &pQuery), _return);
if (pQuery->directRpc) {
CHECK_CODE_GOTO(execDdlQuery(pRequest, pQuery), _return);
diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index ee13527b96..2aebd67c56 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -482,38 +482,24 @@ TAOS_RES* tmq_create_topic(TAOS* taos, const char* topicName, const char* sql, i
}
tscDebug("start to create topic, %s", topicName);
-#if 0
- CHECK_CODE_GOTO(buildRequest(pTscObj, sql, sqlLen, &pRequest), _return);
- CHECK_CODE_GOTO(parseSql(pRequest, &pQueryNode), _return);
- pQueryNode->streamQuery = true;
+ CHECK_CODE_GOTO(buildRequest(pTscObj, sql, sqlLen, &pRequest), _return);
+ CHECK_CODE_GOTO(parseSql(pRequest, true, &pQueryNode), _return);
// todo check for invalid sql statement and return with error code
- SSchema* schema = NULL;
- int32_t numOfCols = 0;
- CHECK_CODE_GOTO(getPlan(pRequest, pQueryNode, &pRequest->body.pDag, NULL), _return);
-
- pStr = qQueryPlanToString(pRequest->body.pDag);
- if (pStr == NULL) {
- goto _return;
- }
+ CHECK_CODE_GOTO(nodesNodeToString(pQueryNode->pRoot, false, &pStr, NULL), _return);
/*printf("%s\n", pStr);*/
- // The topic should be related to a database that the queried table is belonged to.
- SName name = {0};
- char dbName[TSDB_DB_FNAME_LEN] = {0};
- // tNameGetFullDbName(&((SQueryStmtInfo*)pQueryNode)->pTableMetaInfo[0]->name, dbName);
-
- tNameFromString(&name, dbName, T_NAME_ACCT | T_NAME_DB);
- tNameFromString(&name, topicName, T_NAME_TABLE);
+ SName name = { .acctId = pTscObj->acctId, .type = TSDB_TABLE_NAME_T };
+ strcpy(name.dbname, pRequest->pDb);
+ strcpy(name.tname, topicName);
SCMCreateTopicReq req = {
.igExists = 1,
- .physicalPlan = (char*)pStr,
+ .ast = (char*)pStr,
.sql = (char*)sql,
- .logicalPlan = (char*)"no logic plan",
};
tNameExtractFullName(&name, req.name);
@@ -536,7 +522,7 @@ TAOS_RES* tmq_create_topic(TAOS* taos, const char* topicName, const char* sql, i
asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &epSet, &transporterId, sendInfo);
tsem_wait(&pRequest->body.rspSem);
-#endif
+
_return:
qDestroyQuery(pQueryNode);
/*if (sendInfo != NULL) {*/
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 4b649d5f62..31328cc4b2 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1072,6 +1072,10 @@ void blockDataClearup(SSDataBlock* pDataBlock) {
}
int32_t blockDataEnsureColumnCapacity(SColumnInfoData* pColumn, uint32_t numOfRows) {
+ if (0 == numOfRows) {
+ return TSDB_CODE_SUCCESS;
+ }
+
if (IS_VAR_DATA_TYPE(pColumn->info.type)) {
char* tmp = realloc(pColumn->varmeta.offset, sizeof(int32_t) * numOfRows);
if (tmp == NULL) {
@@ -1092,7 +1096,7 @@ int32_t blockDataEnsureColumnCapacity(SColumnInfoData* pColumn, uint32_t numOfRo
pColumn->nullbitmap = tmp;
memset(pColumn->nullbitmap, 0, BitmapLen(numOfRows));
-
+ assert(pColumn->info.bytes);
tmp = realloc(pColumn->pData, numOfRows * pColumn->info.bytes);
if (tmp == NULL) {
return TSDB_CODE_OUT_OF_MEMORY;
@@ -1137,7 +1141,7 @@ void* blockDataDestroy(SSDataBlock* pBlock) {
taosArrayDestroy(pBlock->pDataBlock);
tfree(pBlock->pBlockAgg);
- tfree(pBlock);
+ // tfree(pBlock);
return NULL;
}
@@ -1190,7 +1194,7 @@ int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) {
}
int32_t len = colDataGetLength(pColData, rows);
- taosEncodeFixedI32(buf, len);
+ tlen += taosEncodeFixedI32(buf, len);
tlen += taosEncodeBinary(buf, pColData->pData, len);
}
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index 798b5a9059..e94ae4f8ec 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -246,7 +246,7 @@ static int32_t mndGetPlanString(SCMCreateTopicReq *pCreate, char **pStr) {
SQueryPlan* pPlan = NULL;
if (TSDB_CODE_SUCCESS == code) {
- SPlanContext cxt = { .pAstRoot = pAst, .streamQuery = true };
+ SPlanContext cxt = { .pAstRoot = pAst, .topicQuery = true };
code = qCreateQueryPlan(&cxt, &pPlan, NULL);
}
diff --git a/source/dnode/vnode/src/inc/tsdbDBDef.h b/source/dnode/vnode/src/inc/tsdbDBDef.h
index 2e37b0ba45..ca9b60049e 100644
--- a/source/dnode/vnode/src/inc/tsdbDBDef.h
+++ b/source/dnode/vnode/src/inc/tsdbDBDef.h
@@ -26,8 +26,9 @@ typedef struct SDBFile SDBFile;
typedef DB_ENV* TDBEnv;
struct SDBFile {
- DB* pDB;
- char* path;
+ int32_t fid;
+ DB* pDB;
+ char* path;
};
int32_t tsdbOpenDBF(TDBEnv pEnv, SDBFile* pDBF);
diff --git a/source/dnode/vnode/src/inc/tsdbDef.h b/source/dnode/vnode/src/inc/tsdbDef.h
index 5e4c852621..69bd1ccea5 100644
--- a/source/dnode/vnode/src/inc/tsdbDef.h
+++ b/source/dnode/vnode/src/inc/tsdbDef.h
@@ -63,6 +63,7 @@ struct STsdb {
#define REPO_ID(r) ((r)->vgId)
#define REPO_CFG(r) (&(r)->config)
#define REPO_FS(r) (r)->fs
+#define REPO_TFS(r) (r)->pTfs
#define IS_REPO_LOCKED(r) (r)->repoLocked
#define REPO_SMA_ENV(r, t) ((TSDB_SMA_TYPE_ROLLUP == (t)) ? (r)->pRSmaEnv : (r)->pTSmaEnv)
diff --git a/source/dnode/vnode/src/inc/tsdbFS.h b/source/dnode/vnode/src/inc/tsdbFS.h
index 96c5f8468f..21b445755f 100644
--- a/source/dnode/vnode/src/inc/tsdbFS.h
+++ b/source/dnode/vnode/src/inc/tsdbFS.h
@@ -42,23 +42,23 @@ typedef struct {
typedef struct {
STsdbFSMeta meta; // FS meta
SArray * df; // data file array
- SArray * sf; // sma data file array v2(t|r)1900.index_name_1
+ SArray * sf; // sma data file array v2f1900.index_name_1
} SFSStatus;
/**
* @brief Directory structure of .tsma data files.
*
- * /vnode2/tsdb $ tree .sma/
- * .sma/
- * ├── v2t100.index_name_1
- * ├── v2t101.index_name_1
- * ├── v2t102.index_name_1
- * ├── v2t1900.index_name_3
- * ├── v2t1901.index_name_3
- * ├── v2t1902.index_name_3
- * ├── v2t200.index_name_2
- * ├── v2t201.index_name_2
- * └── v2t202.index_name_2
+ * /vnode2/tsdb $ tree tsma/
+ * tsma/
+ * ├── v2f100.index_name_1
+ * ├── v2f101.index_name_1
+ * ├── v2f102.index_name_1
+ * ├── v2f1900.index_name_3
+ * ├── v2f1901.index_name_3
+ * ├── v2f1902.index_name_3
+ * ├── v2f200.index_name_2
+ * ├── v2f201.index_name_2
+ * └── v2f202.index_name_2
*
* 0 directories, 9 files
*/
diff --git a/source/dnode/vnode/src/inc/tsdbSma.h b/source/dnode/vnode/src/inc/tsdbSma.h
index 649b5a2d47..b94f0b1b83 100644
--- a/source/dnode/vnode/src/inc/tsdbSma.h
+++ b/source/dnode/vnode/src/inc/tsdbSma.h
@@ -21,12 +21,14 @@ typedef struct SSmaEnv SSmaEnv;
struct SSmaEnv {
pthread_rwlock_t lock;
- TDBEnv dbEnv;
- char * path;
+ SDiskID did;
+ TDBEnv dbEnv; // TODO: If it's better to put it in smaIndex level?
+ char * path; // relative path
SSmaStat * pStat;
};
#define SMA_ENV_LOCK(env) ((env)->lock)
+#define SMA_ENV_DID(env) ((env)->did)
#define SMA_ENV_ENV(env) ((env)->dbEnv)
#define SMA_ENV_PATH(env) ((env)->path)
#define SMA_ENV_STAT(env) ((env)->pStat)
diff --git a/source/dnode/vnode/src/meta/metaBDBImpl.c b/source/dnode/vnode/src/meta/metaBDBImpl.c
index df2d9604d2..99a2b272ed 100644
--- a/source/dnode/vnode/src/meta/metaBDBImpl.c
+++ b/source/dnode/vnode/src/meta/metaBDBImpl.c
@@ -884,7 +884,7 @@ const char *metaSmaCursorNext(SMSmaCursor *pCur) {
STSmaWrapper *metaGetSmaInfoByTable(SMeta *pMeta, tb_uid_t uid) {
STSmaWrapper *pSW = NULL;
- pSW = calloc(sizeof(*pSW), 1);
+ pSW = calloc(1, sizeof(*pSW));
if (pSW == NULL) {
return NULL;
}
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index a2342ec85a..0c4b933c19 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -13,6 +13,7 @@
* along with this program. If not, see .
*/
+#include "tdatablock.h"
#include "vnode.h"
STqReadHandle* tqInitSubmitMsgScanner(SMeta* pMeta) {
@@ -128,10 +129,13 @@ SArray* tqRetrieveDataBlock(STqReadHandle* pHandle) {
int j = 0;
for (int32_t i = 0; i < colNumNeed; i++) {
- int32_t colId = *(int32_t*)taosArrayGet(pHandle->pColIdList, i);
+ int16_t colId = *(int16_t*)taosArrayGet(pHandle->pColIdList, i);
while (j < pSchemaWrapper->nCols && pSchemaWrapper->pSchema[j].colId < colId) {
j++;
}
+ if (j >= pSchemaWrapper->nCols) {
+ continue;
+ }
SSchema* pColSchema = &pSchemaWrapper->pSchema[j];
SColumnInfoData colInfo = {0};
int sz = numOfRows * pColSchema->bytes;
@@ -145,6 +149,8 @@ SArray* tqRetrieveDataBlock(STqReadHandle* pHandle) {
taosArrayDestroy(pArray);
return NULL;
}
+
+ blockDataEnsureColumnCapacity(&colInfo, numOfRows);
taosArrayPush(pArray, &colInfo);
}
diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index 42bfebc77b..512ea9fa25 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -67,7 +67,7 @@ typedef struct {
*/
int8_t state; // ETsdbSmaStat
SHashObj *expiredWindows; // key: skey of time window, value: N/A
- STSma * pSma;
+ STSma * pSma; // cache schema
} SSmaStatItem;
struct SSmaStat {
@@ -81,8 +81,8 @@ struct SSmaStat {
static int32_t tsdbUpdateExpiredWindow(STsdb *pTsdb, ETsdbSmaType smaType, char *msg);
static int32_t tsdbInitSmaStat(SSmaStat **pSmaStat);
static int32_t tsdbDestroySmaState(SSmaStat *pSmaStat);
-static SSmaEnv *tsdbNewSmaEnv(const STsdb *pTsdb, const char *path);
-static int32_t tsdbInitSmaEnv(STsdb *pTsdb, const char *path, SSmaEnv **pEnv);
+static SSmaEnv *tsdbNewSmaEnv(const STsdb *pTsdb, const char *path, SDiskID did);
+static int32_t tsdbInitSmaEnv(STsdb *pTsdb, const char *path, SDiskID did, SSmaEnv **pEnv);
static int32_t tsdbResetExpiredWindow(STsdb *pTsdb, SSmaStat *pStat, int64_t indexUid, TSKEY skey);
static int32_t tsdbRefSmaStat(STsdb *pTsdb, SSmaStat *pStat);
static int32_t tsdbUnRefSmaStat(STsdb *pTsdb, SSmaStat *pStat);
@@ -102,8 +102,8 @@ static int32_t tsdbInsertTSmaDataSection(STSmaWriteH *pSmaH, STSmaDataWrapper *p
static int32_t tsdbInsertTSmaBlocks(STSmaWriteH *pSmaH, void *smaKey, uint32_t keyLen, void *pData, uint32_t dataLen);
static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit, int8_t precision);
static int32_t tsdbGetTSmaDays(STsdb *pTsdb, int64_t interval, int32_t storageLevel);
-static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int32_t storageLevel, int32_t fid);
-static int32_t tsdbInitTSmaFile(STSmaReadH *pSmaH, TSKEY skey);
+static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int64_t indexUid, int32_t fid);
+static int32_t tsdbInitTSmaFile(STSmaReadH *pSmaH, int64_t indexUid, TSKEY skey);
static bool tsdbSetAndOpenTSmaFile(STSmaReadH *pReadH, TSKEY *queryKey);
static void tsdbGetSmaDir(int32_t vgId, ETsdbSmaType smaType, char dirName[]);
static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg);
@@ -111,10 +111,11 @@ static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg);
// implementation
static void tsdbGetSmaDir(int32_t vgId, ETsdbSmaType smaType, char dirName[]) {
- snprintf(dirName, TSDB_FILENAME_LEN, "vnode/vnode%d/tsdb/%s", vgId, TSDB_SMA_DNAME[smaType]);
+ snprintf(dirName, TSDB_FILENAME_LEN, "vnode%svnode%d%stsdb%s%s", TD_DIRSEP, vgId, TD_DIRSEP, TD_DIRSEP,
+ TSDB_SMA_DNAME[smaType]);
}
-static SSmaEnv *tsdbNewSmaEnv(const STsdb *pTsdb, const char *path) {
+static SSmaEnv *tsdbNewSmaEnv(const STsdb *pTsdb, const char *path, SDiskID did) {
SSmaEnv *pEnv = NULL;
pEnv = (SSmaEnv *)calloc(1, sizeof(SSmaEnv));
@@ -137,12 +138,16 @@ static SSmaEnv *tsdbNewSmaEnv(const STsdb *pTsdb, const char *path) {
return NULL;
}
+ pEnv->did = did;
+
if (tsdbInitSmaStat(&pEnv->pStat) != TSDB_CODE_SUCCESS) {
tsdbFreeSmaEnv(pEnv);
return NULL;
}
- if (tsdbOpenBDBEnv(&pEnv->dbEnv, pEnv->path) != TSDB_CODE_SUCCESS) {
+ char aname[TSDB_FILENAME_LEN] = {0};
+ tfsAbsoluteName(pTsdb->pTfs, did, path, aname);
+ if (tsdbOpenBDBEnv(&pEnv->dbEnv, aname) != TSDB_CODE_SUCCESS) {
tsdbFreeSmaEnv(pEnv);
return NULL;
}
@@ -150,18 +155,14 @@ static SSmaEnv *tsdbNewSmaEnv(const STsdb *pTsdb, const char *path) {
return pEnv;
}
-static int32_t tsdbInitSmaEnv(STsdb *pTsdb, const char *path, SSmaEnv **pEnv) {
+static int32_t tsdbInitSmaEnv(STsdb *pTsdb, const char *path, SDiskID did, SSmaEnv **pEnv) {
if (!pEnv) {
terrno = TSDB_CODE_INVALID_PTR;
return TSDB_CODE_FAILED;
}
- if (*pEnv) {
- return TSDB_CODE_SUCCESS;
- }
-
if (*pEnv == NULL) {
- if ((*pEnv = tsdbNewSmaEnv(pTsdb, path)) == NULL) {
+ if ((*pEnv = tsdbNewSmaEnv(pTsdb, path, did)) == NULL) {
return TSDB_CODE_FAILED;
}
}
@@ -260,10 +261,15 @@ static SSmaStatItem *tsdbNewSmaStatItem(int8_t state) {
int32_t tsdbDestroySmaState(SSmaStat *pSmaStat) {
if (pSmaStat) {
// TODO: use taosHashSetFreeFp when taosHashSetFreeFp is ready.
- SSmaStatItem *item = taosHashIterate(pSmaStat->smaStatItems, NULL);
+ void *item = taosHashIterate(pSmaStat->smaStatItems, NULL);
while (item != NULL) {
- tfree(item->pSma);
- taosHashCleanup(item->expiredWindows);
+ SSmaStatItem *pItem = *(SSmaStatItem **)item;
+ if (pItem != NULL) {
+ tdDestroyTSma(pItem->pSma);
+ tfree(pItem->pSma);
+ taosHashCleanup(pItem->expiredWindows);
+ tfree(pItem);
+ }
item = taosHashIterate(pSmaStat->smaStatItems, item);
}
taosHashCleanup(pSmaStat->smaStatItems);
@@ -292,9 +298,9 @@ static int32_t tsdbCheckAndInitSmaEnv(STsdb *pTsdb, int8_t smaType) {
// init sma env
tsdbLockRepo(pTsdb);
- if (pTsdb->pTSmaEnv == NULL) {
+ pEnv = (smaType == TSDB_SMA_TYPE_TIME_RANGE) ? atomic_load_ptr(&pTsdb->pTSmaEnv) : atomic_load_ptr(&pTsdb->pRSmaEnv);
+ if (pEnv == NULL) {
char rname[TSDB_FILENAME_LEN] = {0};
- char aname[TSDB_FILENAME_LEN * 2 + 32] = {0}; // TODO: make TMPNAME_LEN public as TSDB_FILENAME_LEN?
SDiskID did = {0};
tfsAllocDisk(pTsdb->pTfs, TFS_PRIMARY_LEVEL, &did);
@@ -303,23 +309,19 @@ static int32_t tsdbCheckAndInitSmaEnv(STsdb *pTsdb, int8_t smaType) {
return TSDB_CODE_FAILED;
}
tsdbGetSmaDir(REPO_ID(pTsdb), smaType, rname);
- tfsAbsoluteName(pTsdb->pTfs, did, rname, aname);
if (tfsMkdirRecurAt(pTsdb->pTfs, rname, did) != TSDB_CODE_SUCCESS) {
tsdbUnlockRepo(pTsdb);
return TSDB_CODE_FAILED;
}
- if (tsdbInitSmaEnv(pTsdb, aname, &pEnv) != TSDB_CODE_SUCCESS) {
+ if (tsdbInitSmaEnv(pTsdb, rname, did, &pEnv) != TSDB_CODE_SUCCESS) {
tsdbUnlockRepo(pTsdb);
return TSDB_CODE_FAILED;
}
- if (smaType == TSDB_SMA_TYPE_TIME_RANGE) {
- atomic_store_ptr(&pTsdb->pTSmaEnv, pEnv);
- } else {
- atomic_store_ptr(&pTsdb->pRSmaEnv, pEnv);
- }
+ (smaType == TSDB_SMA_TYPE_TIME_RANGE) ? atomic_store_ptr(&pTsdb->pTSmaEnv, pEnv)
+ : atomic_store_ptr(&pTsdb->pRSmaEnv, pEnv);
}
tsdbUnlockRepo(pTsdb);
@@ -340,11 +342,6 @@ int32_t tsdbUpdateExpiredWindow(STsdb *pTsdb, ETsdbSmaType smaType, char *msg) {
return TSDB_CODE_FAILED;
}
- if (tsdbCheckAndInitSmaEnv(pTsdb, smaType) != TSDB_CODE_SUCCESS) {
- terrno = TSDB_CODE_TDB_INIT_FAILED;
- return TSDB_CODE_FAILED;
- }
-
// TODO: decode the msg from Stream Computing module => start
int64_t indexUid = SMA_TEST_INDEX_UID;
const int32_t SMA_TEST_EXPIRED_WINDOW_SIZE = 10;
@@ -355,12 +352,19 @@ int32_t tsdbUpdateExpiredWindow(STsdb *pTsdb, ETsdbSmaType smaType, char *msg) {
}
// TODO: decode the msg <= end
+ if (tsdbCheckAndInitSmaEnv(pTsdb, smaType) != TSDB_CODE_SUCCESS) {
+ terrno = TSDB_CODE_TDB_INIT_FAILED;
+ return TSDB_CODE_FAILED;
+ }
+
SSmaEnv * pEnv = REPO_SMA_ENV(pTsdb, smaType);
SSmaStat *pStat = SMA_ENV_STAT(pEnv);
SHashObj *pItemsHash = SMA_ENV_STAT_ITEMS(pEnv);
+ TASSERT(pEnv != NULL && pStat != NULL && pItemsHash != NULL);
+
tsdbRefSmaStat(pTsdb, pStat);
- SSmaStatItem *pItem = (SSmaStatItem *)taosHashGet(pItemsHash, &indexUid, sizeof(indexUid));
+ SSmaStatItem *pItem = taosHashGet(pItemsHash, &indexUid, sizeof(indexUid));
if (pItem == NULL) {
pItem = tsdbNewSmaStatItem(TSDB_SMA_STAT_EXPIRED); // TODO use the real state
if (pItem == NULL) {
@@ -421,9 +425,9 @@ static int32_t tsdbResetExpiredWindow(STsdb *pTsdb, SSmaStat *pStat, int64_t ind
tsdbRefSmaStat(pTsdb, pStat);
if (pStat && pStat->smaStatItems) {
- pItem = *(SSmaStatItem **)taosHashGet(pStat->smaStatItems, &indexUid, sizeof(indexUid));
+ pItem = taosHashGet(pStat->smaStatItems, &indexUid, sizeof(indexUid));
}
- if (pItem != NULL) {
+ if ((pItem != NULL) && ((pItem = *(SSmaStatItem **)pItem) != NULL)) {
// pItem resides in hash buffer all the time unless drop sma index
// TODO: multithread protect
if (taosHashRemove(pItem->expiredWindows, &skey, sizeof(TSKEY)) != 0) {
@@ -494,7 +498,7 @@ static int32_t tsdbGetSmaStorageLevel(int64_t interval, int8_t intervalUnit) {
* @brief Insert TSma data blocks to DB File build by B+Tree
*
* @param pSmaH
- * @param smaKey
+ * @param smaKey tableUid-colId-skeyOfWindow(8-2-8)
* @param keyLen
* @param pData
* @param dataLen
@@ -502,12 +506,11 @@ static int32_t tsdbGetSmaStorageLevel(int64_t interval, int8_t intervalUnit) {
*/
static int32_t tsdbInsertTSmaBlocks(STSmaWriteH *pSmaH, void *smaKey, uint32_t keyLen, void *pData, uint32_t dataLen) {
SDBFile *pDBFile = &pSmaH->dFile;
-
- // TODO: insert sma data blocks into B+Tree
tsdbDebug("vgId:%d insert sma data blocks into %s: smaKey %" PRIx64 "-%" PRIu16 "-%" PRIx64 ", dataLen %d",
REPO_ID(pSmaH->pTsdb), pDBFile->path, *(tb_uid_t *)smaKey, *(uint16_t *)POINTER_SHIFT(smaKey, 8),
*(int64_t *)POINTER_SHIFT(smaKey, 10), dataLen);
+ // TODO: insert sma data blocks into B+Tree(TDB)
if (tsdbSaveSmaToDB(pDBFile, smaKey, keyLen, pData, dataLen) != 0) {
return TSDB_CODE_FAILED;
}
@@ -564,34 +567,34 @@ static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit
return interval / 1e3;
} else if (TIME_UNIT_NANOSECOND == intervalUnit) { // nano second
return interval / 1e6;
- } else {
+ } else { // ms
return interval;
}
break;
case TSDB_TIME_PRECISION_MICRO:
if (TIME_UNIT_MICROSECOND == intervalUnit) { // us
return interval;
- } else if (TIME_UNIT_NANOSECOND == intervalUnit) { // nano second
+ } else if (TIME_UNIT_NANOSECOND == intervalUnit) { // ns
return interval / 1e3;
- } else {
+ } else { // ms
return interval * 1e3;
}
break;
case TSDB_TIME_PRECISION_NANO:
- if (TIME_UNIT_MICROSECOND == intervalUnit) {
+ if (TIME_UNIT_MICROSECOND == intervalUnit) { // us
return interval * 1e3;
- } else if (TIME_UNIT_NANOSECOND == intervalUnit) { // nano second
+ } else if (TIME_UNIT_NANOSECOND == intervalUnit) { // ns
return interval;
- } else {
+ } else { // ms
return interval * 1e6;
}
break;
default: // ms
if (TIME_UNIT_MICROSECOND == intervalUnit) { // us
return interval / 1e3;
- } else if (TIME_UNIT_NANOSECOND == intervalUnit) { // nano second
+ } else if (TIME_UNIT_NANOSECOND == intervalUnit) { // ns
return interval / 1e6;
- } else {
+ } else { // ms
return interval;
}
break;
@@ -660,12 +663,15 @@ static void tsdbDestroyTSmaWriteH(STSmaWriteH *pSmaH) {
}
}
-static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int32_t storageLevel, int32_t fid) {
+static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int64_t indexUid, int32_t fid) {
STsdb *pTsdb = pSmaH->pTsdb;
ASSERT(pSmaH->dFile.path == NULL && pSmaH->dFile.pDB == NULL);
+
+ pSmaH->dFile.fid = fid;
char tSmaFile[TSDB_FILENAME_LEN] = {0};
- snprintf(tSmaFile, TSDB_FILENAME_LEN, "v%df%d.tsma", REPO_ID(pTsdb), fid);
+ snprintf(tSmaFile, TSDB_FILENAME_LEN, "%" PRIi64 "%sv%df%d.tsma", indexUid, TD_DIRSEP, REPO_ID(pTsdb), fid);
pSmaH->dFile.path = strdup(tSmaFile);
+
return TSDB_CODE_SUCCESS;
}
@@ -704,8 +710,9 @@ static int32_t tsdbGetTSmaDays(STsdb *pTsdb, int64_t interval, int32_t storageLe
static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
STsdbCfg * pCfg = REPO_CFG(pTsdb);
STSmaDataWrapper *pData = (STSmaDataWrapper *)msg;
+ SSmaEnv * pEnv = atomic_load_ptr(&pTsdb->pTSmaEnv);
- if (!pTsdb->pTSmaEnv) {
+ if (pEnv == NULL) {
terrno = TSDB_CODE_INVALID_PTR;
tsdbWarn("vgId:%d insert tSma data failed since pTSmaEnv is NULL", REPO_ID(pTsdb));
return terrno;
@@ -723,6 +730,17 @@ static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
return TSDB_CODE_FAILED;
}
+ int64_t indexUid = SMA_TEST_INDEX_UID;
+ char rPath[TSDB_FILENAME_LEN] = {0};
+ char aPath[TSDB_FILENAME_LEN] = {0};
+ snprintf(rPath, TSDB_FILENAME_LEN, "%s%s%" PRIi64, SMA_ENV_PATH(pEnv), TD_DIRSEP, indexUid);
+ tfsAbsoluteName(REPO_TFS(pTsdb), SMA_ENV_DID(pEnv), rPath, aPath);
+ if (!taosCheckExistFile(aPath)) {
+ if (tfsMkdirRecurAt(REPO_TFS(pTsdb), rPath, SMA_ENV_DID(pEnv)) != TSDB_CODE_SUCCESS) {
+ return TSDB_CODE_FAILED;
+ }
+ }
+
// Step 1: Judge the storage level and days
int32_t storageLevel = tsdbGetSmaStorageLevel(pData->interval, pData->intervalUnit);
int32_t daysPerFile = tsdbGetTSmaDays(pTsdb, tSmaH.interval, storageLevel);
@@ -731,7 +749,7 @@ static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
// Step 2: Set the DFile for storage of SMA index, and iterate/split the TSma data and store to B+Tree index file
// - Set and open the DFile or the B+Tree file
// TODO: tsdbStartTSmaCommit();
- tsdbSetTSmaDataFile(&tSmaH, pData, storageLevel, fid);
+ tsdbSetTSmaDataFile(&tSmaH, pData, indexUid, fid);
if (tsdbOpenDBF(pTsdb->pTSmaEnv->dbEnv, &tSmaH.dFile) != 0) {
tsdbWarn("vgId:%d open DB file %s failed since %s", REPO_ID(pTsdb),
tSmaH.dFile.path ? tSmaH.dFile.path : "path is NULL", tstrerror(terrno));
@@ -818,13 +836,16 @@ static int32_t tsdbInitTSmaReadH(STSmaReadH *pSmaH, STsdb *pTsdb, int64_t interv
* @brief Init of tSma FS
*
* @param pReadH
+ * @param indexUid
* @param skey
* @return int32_t
*/
-static int32_t tsdbInitTSmaFile(STSmaReadH *pSmaH, TSKEY skey) {
- int32_t fid = (int32_t)(TSDB_KEY_FID(skey, pSmaH->days, REPO_CFG(pSmaH->pTsdb)->precision));
+static int32_t tsdbInitTSmaFile(STSmaReadH *pSmaH, int64_t indexUid, TSKEY skey) {
+ STsdb *pTsdb = pSmaH->pTsdb;
+
+ int32_t fid = (int32_t)(TSDB_KEY_FID(skey, pSmaH->days, REPO_CFG(pTsdb)->precision));
char tSmaFile[TSDB_FILENAME_LEN] = {0};
- snprintf(tSmaFile, TSDB_FILENAME_LEN, "v%df%d.tsma", REPO_ID(pSmaH->pTsdb), fid);
+ snprintf(tSmaFile, TSDB_FILENAME_LEN, "%" PRIi64 "%sv%df%d.tsma", indexUid, TD_DIRSEP, REPO_ID(pTsdb), fid);
pSmaH->dFile.path = strdup(tSmaFile);
pSmaH->smaFsIter.iter = 0;
pSmaH->smaFsIter.fid = fid;
@@ -883,15 +904,17 @@ static bool tsdbSetAndOpenTSmaFile(STSmaReadH *pReadH, TSKEY *queryKey) {
static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSmaDataWrapper *pData, int64_t indexUid, int64_t interval,
int8_t intervalUnit, tb_uid_t tableUid, col_id_t colId, TSKEY querySKey,
int32_t nMaxResult) {
- if (!pTsdb->pTSmaEnv) {
+ SSmaEnv *pEnv = atomic_load_ptr(&pTsdb->pTSmaEnv);
+
+ if (!pEnv) {
terrno = TSDB_CODE_INVALID_PTR;
tsdbWarn("vgId:%d getTSmaDataImpl failed since pTSmaEnv is NULL", REPO_ID(pTsdb));
return TSDB_CODE_FAILED;
}
- tsdbRefSmaStat(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv));
- SSmaStatItem *pItem = *(SSmaStatItem **)taosHashGet(SMA_ENV_STAT_ITEMS(pTsdb->pTSmaEnv), &indexUid, sizeof(indexUid));
- if (pItem == NULL) {
+ tsdbRefSmaStat(pTsdb, SMA_ENV_STAT(pEnv));
+ SSmaStatItem *pItem = taosHashGet(SMA_ENV_STAT_ITEMS(pEnv), &indexUid, sizeof(indexUid));
+ if ((pItem == NULL) || ((pItem = *(SSmaStatItem **)pItem) == NULL)) {
// Normally pItem should not be NULL, mark all windows as expired and notify query module to fetch raw TS data if
// it's NULL.
tsdbUnRefSmaStat(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv));
@@ -922,11 +945,12 @@ static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSmaDataWrapper *pData, int64_
tsdbUnRefSmaStat(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv));
#endif
+
STSmaReadH tReadH = {0};
tsdbInitTSmaReadH(&tReadH, pTsdb, interval, intervalUnit);
tsdbCloseDBF(&tReadH.dFile);
- tsdbInitTSmaFile(&tReadH, querySKey);
+ tsdbInitTSmaFile(&tReadH, indexUid, querySKey);
if (tsdbOpenDBF(SMA_ENV_ENV(pTsdb->pTSmaEnv), &tReadH.dFile) != 0) {
tsdbWarn("vgId:%d open DBF %s failed since %s", REPO_ID(pTsdb), tReadH.dFile.path, tstrerror(terrno));
return TSDB_CODE_FAILED;
diff --git a/source/dnode/vnode/src/vnd/vnodeWrite.c b/source/dnode/vnode/src/vnd/vnodeWrite.c
index 2a75eebfd9..3fa987ab9b 100644
--- a/source/dnode/vnode/src/vnd/vnodeWrite.c
+++ b/source/dnode/vnode/src/vnd/vnodeWrite.c
@@ -146,6 +146,9 @@ int vnodeApplyWMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
return -1;
}
+ // record current timezone of server side
+ tstrncpy(vCreateSmaReq.tSma.timezone, tsTimezone, TD_TIMEZONE_LEN);
+
if (metaCreateTSma(pVnode->pMeta, &vCreateSmaReq) < 0) {
// TODO: handle error
tdDestroyTSma(&vCreateSmaReq.tSma);
diff --git a/source/dnode/vnode/test/tsdbSmaTest.cpp b/source/dnode/vnode/test/tsdbSmaTest.cpp
index 86958da406..bdeb51c018 100644
--- a/source/dnode/vnode/test/tsdbSmaTest.cpp
+++ b/source/dnode/vnode/test/tsdbSmaTest.cpp
@@ -33,6 +33,7 @@ int main(int argc, char **argv) {
return RUN_ALL_TESTS();
}
+#if 1
TEST(testCase, tSma_Meta_Encode_Decode_Test) {
// encode
STSma tSma = {0};
@@ -49,7 +50,7 @@ TEST(testCase, tSma_Meta_Encode_Decode_Test) {
STSmaWrapper tSmaWrapper = {.number = 1, .tSma = &tSma};
uint32_t bufLen = tEncodeTSmaWrapper(NULL, &tSmaWrapper);
- void *buf = calloc(bufLen, 1);
+ void *buf = calloc(1, bufLen);
ASSERT_NE(buf, nullptr);
STSmaWrapper *pSW = (STSmaWrapper *)buf;
@@ -84,9 +85,11 @@ TEST(testCase, tSma_Meta_Encode_Decode_Test) {
}
// resource release
+ tfree(pSW);
tdDestroyTSma(&tSma);
tdDestroyTSmaWrapper(&dstTSmaWrapper);
}
+#endif
#if 1
TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
@@ -113,7 +116,7 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
tSma.tableUid = tbUid;
tSma.exprLen = strlen(expr);
- tSma.expr = (char *)calloc(tSma.exprLen + 1, 1);
+ tSma.expr = (char *)calloc(1, tSma.exprLen + 1);
ASSERT_NE(tSma.expr, nullptr);
tstrncpy(tSma.expr, expr, tSma.exprLen + 1);
@@ -251,12 +254,12 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
tSma.tableUid = tbUid;
tSma.exprLen = strlen(expr);
- tSma.expr = (char *)calloc(tSma.exprLen + 1, 1);
+ tSma.expr = (char *)calloc(1, tSma.exprLen + 1);
ASSERT_NE(tSma.expr, nullptr);
tstrncpy(tSma.expr, expr, tSma.exprLen + 1);
tSma.tagsFilterLen = strlen(tagsFilter);
- tSma.tagsFilter = (char *)calloc(tSma.tagsFilterLen + 1, 1);
+ tSma.tagsFilter = (char *)calloc(1, tSma.tagsFilterLen + 1);
ASSERT_NE(tSma.tagsFilter, nullptr);
tstrncpy(tSma.tagsFilter, tagsFilter, tSma.tagsFilterLen + 1);
@@ -273,20 +276,20 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
// step 2: insert data
STSmaDataWrapper *pSmaData = NULL;
- STsdb tsdb = {0};
- STsdbCfg * pCfg = &tsdb.config;
+ STsdb * pTsdb = (STsdb *)calloc(1, sizeof(STsdb));
+ STsdbCfg * pCfg = &pTsdb->config;
- tsdb.pMeta = pMeta;
- tsdb.vgId = 2;
- tsdb.config.daysPerFile = 10; // default days is 10
- tsdb.config.keep1 = 30;
- tsdb.config.keep2 = 90;
- tsdb.config.keep = 365;
- tsdb.config.precision = TSDB_TIME_PRECISION_MILLI;
- tsdb.config.update = TD_ROW_OVERWRITE_UPDATE;
- tsdb.config.compression = TWO_STAGE_COMP;
+ pTsdb->pMeta = pMeta;
+ pTsdb->vgId = 2;
+ pTsdb->config.daysPerFile = 10; // default days is 10
+ pTsdb->config.keep1 = 30;
+ pTsdb->config.keep2 = 90;
+ pTsdb->config.keep = 365;
+ pTsdb->config.precision = TSDB_TIME_PRECISION_MILLI;
+ pTsdb->config.update = TD_ROW_OVERWRITE_UPDATE;
+ pTsdb->config.compression = TWO_STAGE_COMP;
- switch (tsdb.config.precision) {
+ switch (pTsdb->config.precision) {
case TSDB_TIME_PRECISION_MILLI:
skey1 *= 1e3;
break;
@@ -304,12 +307,12 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
SDiskCfg pDisks = {.level = 0, .primary = 1};
strncpy(pDisks.dir, "/var/lib/taos", TSDB_FILENAME_LEN);
int32_t numOfDisks = 1;
- tsdb.pTfs = tfsOpen(&pDisks, numOfDisks);
- ASSERT_NE(tsdb.pTfs, nullptr);
+ pTsdb->pTfs = tfsOpen(&pDisks, numOfDisks);
+ ASSERT_NE(pTsdb->pTfs, nullptr);
char *msg = (char *)calloc(1, 100);
ASSERT_NE(msg, nullptr);
- ASSERT_EQ(tsdbUpdateSmaWindow(&tsdb, TSDB_SMA_TYPE_TIME_RANGE, msg), 0);
+ ASSERT_EQ(tsdbUpdateSmaWindow(pTsdb, TSDB_SMA_TYPE_TIME_RANGE, msg), 0);
// init
int32_t allocCnt = 0;
@@ -367,13 +370,13 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
ASSERT_GE(bufSize, pSmaData->dataLen);
// execute
- ASSERT_EQ(tsdbInsertTSmaData(&tsdb, (char *)pSmaData), TSDB_CODE_SUCCESS);
+ ASSERT_EQ(tsdbInsertTSmaData(pTsdb, (char *)pSmaData), TSDB_CODE_SUCCESS);
// step 3: query
uint32_t checkDataCnt = 0;
for (int32_t t = 0; t < numOfTables; ++t) {
for (col_id_t c = 0; c < numOfCols; ++c) {
- ASSERT_EQ(tsdbGetTSmaData(&tsdb, NULL, indexUid1, interval1, intervalUnit1, tbUid + t,
+ ASSERT_EQ(tsdbGetTSmaData(pTsdb, NULL, indexUid1, interval1, intervalUnit1, tbUid + t,
c + PRIMARYKEY_TIMESTAMP_COL_ID, skey1, 1),
TSDB_CODE_SUCCESS);
++checkDataCnt;
@@ -383,9 +386,12 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
printf("%s:%d The sma data check count for insert and query is %" PRIu32 "\n", __FILE__, __LINE__, checkDataCnt);
// release data
+ tfree(msg);
taosTZfree(buf);
// release meta
tdDestroyTSma(&tSma);
+ tfsClose(pTsdb->pTfs);
+ tsdbClose(pTsdb);
metaClose(pMeta);
}
#endif
diff --git a/source/libs/CMakeLists.txt b/source/libs/CMakeLists.txt
index d766f3cbf1..ea8195bfd1 100644
--- a/source/libs/CMakeLists.txt
+++ b/source/libs/CMakeLists.txt
@@ -1,6 +1,6 @@
add_subdirectory(transport)
add_subdirectory(sync)
-add_subdirectory(tdb)
+# add_subdirectory(tdb)
add_subdirectory(index)
add_subdirectory(wal)
add_subdirectory(parser)
diff --git a/source/libs/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c
index 34c211561b..d66203eb40 100644
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
@@ -190,7 +190,6 @@ static SNode* fillNodeCopy(const SFillNode* pSrc, SFillNode* pDst) {
}
static SNode* logicNodeCopy(const SLogicNode* pSrc, SLogicNode* pDst) {
- COPY_SCALAR_FIELD(id);
CLONE_NODE_LIST_FIELD(pTargets);
CLONE_NODE_FIELD(pConditions);
CLONE_NODE_LIST_FIELD(pChildren);
@@ -198,7 +197,7 @@ static SNode* logicNodeCopy(const SLogicNode* pSrc, SLogicNode* pDst) {
}
static STableMeta* tableMetaClone(const STableMeta* pSrc) {
- int32_t len = sizeof(STableMeta) + (pSrc->tableInfo.numOfTags + pSrc->tableInfo.numOfColumns) * sizeof(SSchema);
+ int32_t len = TABLE_META_SIZE(pSrc);
STableMeta* pDst = malloc(len);
if (NULL == pDst) {
return NULL;
@@ -208,7 +207,7 @@ static STableMeta* tableMetaClone(const STableMeta* pSrc) {
}
static SVgroupsInfo* vgroupsInfoClone(const SVgroupsInfo* pSrc) {
- int32_t len = sizeof(SVgroupsInfo) + pSrc->numOfVgroups * sizeof(SVgroupInfo);
+ int32_t len = VGROUPS_INFO_SIZE(pSrc);
SVgroupsInfo* pDst = malloc(len);
if (NULL == pDst) {
return NULL;
diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c
index a2fd32d238..9b9eaaa6a9 100644
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
@@ -13,6 +13,7 @@
* along with this program. If not, see .
*/
+#include "cmdnodes.h"
#include "nodesUtil.h"
#include "plannodes.h"
#include "querynodes.h"
@@ -85,6 +86,8 @@ const char* nodesNodeName(ENodeType type) {
return "ShowDatabaseStmt";
case QUERY_NODE_SHOW_TABLES_STMT:
return "ShowTablesStmt";
+ case QUERY_NODE_CREATE_TOPIC_STMT:
+ return "CreateTopicStmt";
case QUERY_NODE_LOGIC_PLAN_SCAN:
return "LogicScan";
case QUERY_NODE_LOGIC_PLAN_JOIN:
@@ -179,21 +182,151 @@ static int32_t jsonToNodeList(const SJson* pJson, const char* pName, SNodeList**
return jsonToNodeListImpl(tjsonGetObjectItem(pJson, pName), pList);
}
-static const char* jkTableMetaUid = "TableMetaUid";
-static const char* jkTableMetaSuid = "TableMetaSuid";
+static const char* jkTableComInfoNumOfTags = "NumOfTags";
+static const char* jkTableComInfoPrecision = "Precision";
+static const char* jkTableComInfoNumOfColumns = "NumOfColumns";
+static const char* jkTableComInfoRowSize = "RowSize";
+
+static int32_t tableComInfoToJson(const void* pObj, SJson* pJson) {
+ const STableComInfo* pNode = (const STableComInfo*)pObj;
+
+ int32_t code = tjsonAddIntegerToObject(pJson, jkTableComInfoNumOfTags, pNode->numOfTags);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableComInfoPrecision, pNode->precision);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableComInfoNumOfColumns, pNode->numOfColumns);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableComInfoRowSize, pNode->rowSize);
+ }
+
+ return code;
+}
+
+static int32_t jsonToTableComInfo(const SJson* pJson, void* pObj) {
+ STableComInfo* pNode = (STableComInfo*)pObj;
+
+ int32_t code = tjsonGetNumberValue(pJson, jkTableComInfoNumOfTags, pNode->numOfTags);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableComInfoPrecision, pNode->precision);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableComInfoNumOfColumns, pNode->numOfColumns);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableComInfoRowSize, pNode->rowSize);
+ }
+
+ return code;
+}
+
+static const char* jkSchemaType = "Type";
+static const char* jkSchemaColId = "ColId";
+static const char* jkSchemaBytes = "bytes";
+static const char* jkSchemaName = "Name";
+
+static int32_t schemaToJson(const void* pObj, SJson* pJson) {
+ const SSchema* pNode = (const SSchema*)pObj;
+
+ int32_t code = tjsonAddIntegerToObject(pJson, jkSchemaType, pNode->type);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkSchemaColId, pNode->colId);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkSchemaBytes, pNode->bytes);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddStringToObject(pJson, jkSchemaName, pNode->name);
+ }
+
+ return code;
+}
+
+static int32_t jsonToSchema(const SJson* pJson, void* pObj) {
+ SSchema* pNode = (SSchema*)pObj;
+
+ int32_t code = tjsonGetNumberValue(pJson, jkSchemaType, pNode->type);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkSchemaColId, pNode->colId);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkSchemaBytes, pNode->bytes);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetStringValue(pJson, jkSchemaName, pNode->name);
+ }
+
+ return code;
+}
+
+static const char* jkTableMetaVgId = "VgId";
+static const char* jkTableMetaTableType = "TableType";
+static const char* jkTableMetaUid = "Uid";
+static const char* jkTableMetaSuid = "Suid";
+static const char* jkTableMetaSversion = "Sversion";
+static const char* jkTableMetaTversion = "Tversion";
+static const char* jkTableMetaComInfo = "ComInfo";
+static const char* jkTableMetaColSchemas = "ColSchemas";
static int32_t tableMetaToJson(const void* pObj, SJson* pJson) {
const STableMeta* pNode = (const STableMeta*)pObj;
- int32_t code = tjsonAddIntegerToObject(pJson, jkTableMetaUid, pNode->uid);
+ int32_t code = tjsonAddIntegerToObject(pJson, jkTableMetaVgId, pNode->vgId);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableMetaTableType, pNode->tableType);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableMetaUid, pNode->uid);
+ }
if (TSDB_CODE_SUCCESS == code) {
code = tjsonAddIntegerToObject(pJson, jkTableMetaSuid, pNode->suid);
}
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableMetaSversion, pNode->sversion);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkTableMetaTversion, pNode->tversion);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddObject(pJson, jkTableMetaComInfo, tableComInfoToJson, &pNode->tableInfo);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddArray(pJson, jkTableMetaColSchemas, schemaToJson, pNode->schema, sizeof(SSchema), TABLE_TOTAL_COL_NUM(pNode));
+ }
+
+ return code;
+}
+
+static int32_t jsonToTableMeta(const SJson* pJson, void* pObj) {
+ STableMeta* pNode = (STableMeta*)pObj;
+
+ int32_t code = tjsonGetNumberValue(pJson, jkTableMetaVgId, pNode->vgId);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableMetaTableType, pNode->tableType);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableMetaUid, pNode->uid);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableMetaSuid, pNode->suid);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableMetaSversion, pNode->sversion);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetNumberValue(pJson, jkTableMetaTversion, pNode->tversion);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonToObject(pJson, jkTableMetaComInfo, jsonToTableComInfo, &pNode->tableInfo);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonToArray(pJson, jkTableMetaColSchemas, jsonToSchema, pNode->schema, sizeof(SSchema));
+ }
return code;
}
-static const char* jkLogicPlanId = "Id";
static const char* jkLogicPlanTargets = "Targets";
static const char* jkLogicPlanConditions = "Conditions";
static const char* jkLogicPlanChildren = "Children";
@@ -201,10 +334,7 @@ static const char* jkLogicPlanChildren = "Children";
static int32_t logicPlanNodeToJson(const void* pObj, SJson* pJson) {
const SLogicNode* pNode = (const SLogicNode*)pObj;
- int32_t code = tjsonAddIntegerToObject(pJson, jkLogicPlanId, pNode->id);
- if (TSDB_CODE_SUCCESS == code) {
- code = nodeListToJson(pJson, jkLogicPlanTargets, pNode->pTargets);
- }
+ int32_t code = nodeListToJson(pJson, jkLogicPlanTargets, pNode->pTargets);
if (TSDB_CODE_SUCCESS == code) {
code = tjsonAddObject(pJson, jkLogicPlanConditions, nodeToJson, pNode->pConditions);
}
@@ -215,7 +345,22 @@ static int32_t logicPlanNodeToJson(const void* pObj, SJson* pJson) {
return code;
}
+static int32_t jsonToLogicPlanNode(const SJson* pJson, void* pObj) {
+ SLogicNode* pNode = (SLogicNode*)pObj;
+
+ int32_t code = jsonToNodeList(pJson, jkLogicPlanTargets, &pNode->pTargets);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkLogicPlanConditions, &pNode->pConditions);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkLogicPlanChildren, &pNode->pChildren);
+ }
+
+ return code;
+}
+
static const char* jkScanLogicPlanScanCols = "ScanCols";
+static const char* jkScanLogicPlanTableMetaSize = "TableMetaSize";
static const char* jkScanLogicPlanTableMeta = "TableMeta";
static int32_t logicScanNodeToJson(const void* pObj, SJson* pJson) {
@@ -225,6 +370,9 @@ static int32_t logicScanNodeToJson(const void* pObj, SJson* pJson) {
if (TSDB_CODE_SUCCESS == code) {
code = nodeListToJson(pJson, jkScanLogicPlanScanCols, pNode->pScanCols);
}
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkScanLogicPlanTableMetaSize, TABLE_META_SIZE(pNode->pMeta));
+ }
if (TSDB_CODE_SUCCESS == code) {
code = tjsonAddObject(pJson, jkScanLogicPlanTableMeta, tableMetaToJson, pNode->pMeta);
}
@@ -232,6 +380,24 @@ static int32_t logicScanNodeToJson(const void* pObj, SJson* pJson) {
return code;
}
+static int32_t jsonToLogicScanNode(const SJson* pJson, void* pObj) {
+ SScanLogicNode* pNode = (SScanLogicNode*)pObj;
+
+ int32_t objSize = 0;
+ int32_t code = jsonToLogicPlanNode(pJson, pObj);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkScanLogicPlanScanCols, &pNode->pScanCols);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetIntValue(pJson, jkScanLogicPlanTableMetaSize, &objSize);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonMakeObject(pJson, jkScanLogicPlanTableMeta, jsonToTableMeta, (void**)&pNode->pMeta, objSize);
+ }
+
+ return code;
+}
+
static const char* jkProjectLogicPlanProjections = "Projections";
static int32_t logicProjectNodeToJson(const void* pObj, SJson* pJson) {
@@ -245,6 +411,17 @@ static int32_t logicProjectNodeToJson(const void* pObj, SJson* pJson) {
return code;
}
+static int32_t jsonToLogicProjectNode(const SJson* pJson, void* pObj) {
+ SProjectLogicNode* pNode = (SProjectLogicNode*)pObj;
+
+ int32_t code = jsonToLogicPlanNode(pJson, pObj);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkProjectLogicPlanProjections, &pNode->pProjections);
+ }
+
+ return code;
+}
+
static const char* jkJoinLogicPlanJoinType = "JoinType";
static const char* jkJoinLogicPlanOnConditions = "OnConditions";
@@ -445,6 +622,14 @@ static int32_t jsonToPhysiTableScanNode(const SJson* pJson, void* pObj) {
return code;
}
+static int32_t physiStreamScanNodeToJson(const void* pObj, SJson* pJson) {
+ return physiScanNodeToJson(pObj, pJson);
+}
+
+static int32_t jsonToPhysiStreamScanNode(const SJson* pJson, void* pObj) {
+ return jsonToPhysiScanNode(pJson, pObj);
+}
+
static const char* jkProjectPhysiPlanProjections = "Projections";
static int32_t physiProjectNodeToJson(const void* pObj, SJson* pJson) {
@@ -1273,6 +1458,193 @@ static int32_t jsonToFunctionNode(const SJson* pJson, void* pObj) {
return code;
}
+static const char* jkTableDbName = "DbName";
+static const char* jkTableTableName = "tableName";
+static const char* jkTableTableAlias = "tableAlias";
+
+static int32_t tableNodeToJson(const void* pObj, SJson* pJson) {
+ const STableNode* pNode = (const STableNode*)pObj;
+
+ int32_t code = exprNodeToJson(pObj, pJson);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddStringToObject(pJson, jkTableDbName, pNode->dbName);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddStringToObject(pJson, jkTableTableName, pNode->tableName);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddStringToObject(pJson, jkTableTableAlias, pNode->tableAlias);
+ }
+
+ return code;
+}
+
+static int32_t jsonToTableNode(const SJson* pJson, void* pObj) {
+ STableNode* pNode = (STableNode*)pObj;
+
+ int32_t code = jsonToExprNode(pJson, pObj);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetStringValue(pJson, jkTableDbName, pNode->dbName);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetStringValue(pJson, jkTableTableName, pNode->tableName);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetStringValue(pJson, jkTableTableAlias, pNode->tableAlias);
+ }
+
+ return code;
+}
+
+static const char* jkEpSetInUse = "InUse";
+static const char* jkEpSetNumOfEps = "NumOfEps";
+static const char* jkEpSetEps = "Eps";
+
+static int32_t epSetToJson(const void* pObj, SJson* pJson) {
+ const SEpSet* pNode = (const SEpSet*)pObj;
+
+ int32_t code = tjsonAddIntegerToObject(pJson, jkEpSetInUse, pNode->inUse);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkEpSetNumOfEps, pNode->numOfEps);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddArray(pJson, jkEpSetEps, epToJson, pNode->eps, sizeof(SEp), pNode->numOfEps);
+ }
+
+ return code;
+}
+
+static int32_t jsonToEpSet(const SJson* pJson, void* pObj) {
+ SEpSet* pNode = (SEpSet*)pObj;
+
+ int32_t code = tjsonGetTinyIntValue(pJson, jkEpSetInUse, &pNode->inUse);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetTinyIntValue(pJson, jkEpSetNumOfEps, &pNode->numOfEps);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonToArray(pJson, jkEpSetEps, jsonToEp, pNode->eps, sizeof(SEp));
+ }
+
+ return code;
+}
+
+static const char* jkVgroupInfoVgId = "VgId";
+static const char* jkVgroupInfoHashBegin = "HashBegin";
+static const char* jkVgroupInfoHashEnd = "HashEnd";
+static const char* jkVgroupInfoEpSet = "EpSet";
+static const char* jkVgroupInfoNumOfTable = "NumOfTable";
+
+static int32_t vgroupInfoToJson(const void* pObj, SJson* pJson) {
+ const SVgroupInfo* pNode = (const SVgroupInfo*)pObj;
+
+ int32_t code = tjsonAddIntegerToObject(pJson, jkVgroupInfoVgId, pNode->vgId);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkVgroupInfoHashBegin, pNode->hashBegin);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkVgroupInfoHashEnd, pNode->hashEnd);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddObject(pJson, jkVgroupInfoEpSet, epSetToJson, &pNode->epSet);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkVgroupInfoNumOfTable, pNode->numOfTable);
+ }
+
+ return code;
+}
+
+static int32_t jsonToVgroupInfo(const SJson* pJson, void* pObj) {
+ SVgroupInfo* pNode = (SVgroupInfo*)pObj;
+
+ int32_t code = tjsonGetIntValue(pJson, jkVgroupInfoVgId, &pNode->vgId);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetUIntValue(pJson, jkVgroupInfoHashBegin, &pNode->hashBegin);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetUIntValue(pJson, jkVgroupInfoHashEnd, &pNode->hashEnd);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonToObject(pJson, jkVgroupInfoEpSet, jsonToEpSet, &pNode->epSet);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetIntValue(pJson, jkVgroupInfoNumOfTable, &pNode->numOfTable);
+ }
+
+ return code;
+}
+
+static const char* jkVgroupsInfoNum = "Num";
+static const char* jkVgroupsInfoVgroups = "Vgroups";
+
+static int32_t vgroupsInfoToJson(const void* pObj, SJson* pJson) {
+ const SVgroupsInfo* pNode = (const SVgroupsInfo*)pObj;
+
+ int32_t code = tjsonAddIntegerToObject(pJson, jkVgroupsInfoNum, pNode->numOfVgroups);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddArray(pJson, jkVgroupsInfoVgroups, vgroupInfoToJson, pNode->vgroups, sizeof(SVgroupInfo), pNode->numOfVgroups);
+ }
+
+ return code;
+}
+
+static int32_t jsonToVgroupsInfo(const SJson* pJson, void* pObj) {
+ SVgroupsInfo* pNode = (SVgroupsInfo*)pObj;
+
+ int32_t code = tjsonGetIntValue(pJson, jkVgroupsInfoNum, &pNode->numOfVgroups);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonToArray(pJson, jkVgroupsInfoVgroups, jsonToVgroupInfo, pNode->vgroups, sizeof(SVgroupInfo));
+ }
+
+ return code;
+}
+
+static const char* jkRealTableMetaSize = "MetaSize";
+static const char* jkRealTableMeta = "Meta";
+static const char* jkRealTableVgroupsInfoSize = "VgroupsInfoSize";
+static const char* jkRealTableVgroupsInfo = "VgroupsInfo";
+
+static int32_t realTableNodeToJson(const void* pObj, SJson* pJson) {
+ const SRealTableNode* pNode = (const SRealTableNode*)pObj;
+
+ int32_t code = tableNodeToJson(pObj, pJson);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkRealTableMetaSize, TABLE_META_SIZE(pNode->pMeta));
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddObject(pJson, jkRealTableMeta, tableMetaToJson, pNode->pMeta);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddIntegerToObject(pJson, jkRealTableVgroupsInfoSize, VGROUPS_INFO_SIZE(pNode->pVgroupList));
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddObject(pJson, jkRealTableVgroupsInfo, vgroupsInfoToJson, pNode->pVgroupList);
+ }
+
+ return code;
+}
+
+static int32_t jsonToRealTableNode(const SJson* pJson, void* pObj) {
+ SRealTableNode* pNode = (SRealTableNode*)pObj;
+
+ int32_t objSize = 0;
+ int32_t code = jsonToTableNode(pJson, pObj);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetIntValue(pJson, jkRealTableMetaSize, &objSize);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonMakeObject(pJson, jkRealTableMeta, jsonToTableMeta, (void**)&pNode->pMeta, objSize);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetIntValue(pJson, jkRealTableVgroupsInfoSize, &objSize);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonMakeObject(pJson, jkRealTableVgroupsInfo, jsonToVgroupsInfo, (void**)&pNode->pVgroupList, objSize);
+ }
+
+ return code;
+}
+
static const char* jkGroupingSetType = "GroupingSetType";
static const char* jkGroupingSetParameter = "Parameters";
@@ -1464,7 +1836,7 @@ static const char* jkSelectStmtSlimit = "Slimit";
static int32_t selectStmtTojson(const void* pObj, SJson* pJson) {
const SSelectStmt* pNode = (const SSelectStmt*)pObj;
- int32_t code = tjsonAddIntegerToObject(pJson, jkSelectStmtDistinct, pNode->isDistinct);
+ int32_t code = tjsonAddBoolToObject(pJson, jkSelectStmtDistinct, pNode->isDistinct);
if (TSDB_CODE_SUCCESS == code) {
code = nodeListToJson(pJson, jkSelectStmtProjections, pNode->pProjectionList);
}
@@ -1499,6 +1871,83 @@ static int32_t selectStmtTojson(const void* pObj, SJson* pJson) {
return code;
}
+static int32_t jsonToSelectStmt(const SJson* pJson, void* pObj) {
+ SSelectStmt* pNode = (SSelectStmt*)pObj;
+
+ int32_t code = tjsonGetBoolValue(pJson, jkSelectStmtDistinct, &pNode->isDistinct);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkSelectStmtProjections, &pNode->pProjectionList);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkSelectStmtFrom, &pNode->pFromTable);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkSelectStmtWhere, &pNode->pWhere);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkSelectStmtPartitionBy, &pNode->pPartitionByList);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkSelectStmtWindow, &pNode->pWindow);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkSelectStmtGroupBy, &pNode->pGroupByList);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkSelectStmtHaving, &pNode->pHaving);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeList(pJson, jkSelectStmtOrderBy, &pNode->pOrderByList);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkSelectStmtLimit, &pNode->pLimit);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkSelectStmtSlimit, &pNode->pSlimit);
+ }
+
+ return code;
+}
+
+static const char* jkCreateTopicStmtTopicName = "TopicName";
+static const char* jkCreateTopicStmtSubscribeDbName = "SubscribeDbName";
+static const char* jkCreateTopicStmtIgnoreExists = "IgnoreExists";
+static const char* jkCreateTopicStmtQuery = "Query";
+
+static int32_t createTopicStmtToJson(const void* pObj, SJson* pJson) {
+ const SCreateTopicStmt* pNode = (const SCreateTopicStmt*)pObj;
+
+ int32_t code = tjsonAddStringToObject(pJson, jkCreateTopicStmtTopicName, pNode->topicName);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddStringToObject(pJson, jkCreateTopicStmtSubscribeDbName, pNode->subscribeDbName);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddBoolToObject(pJson, jkCreateTopicStmtIgnoreExists, pNode->ignoreExists);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddObject(pJson, jkCreateTopicStmtQuery, nodeToJson, pNode->pQuery);
+ }
+
+ return code;
+}
+
+static int32_t jsonToCreateTopicStmt(const SJson* pJson, void* pObj) {
+ SCreateTopicStmt* pNode = (SCreateTopicStmt*)pObj;
+
+ int32_t code = tjsonGetStringValue(pJson, jkCreateTopicStmtTopicName, pNode->topicName);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetStringValue(pJson, jkCreateTopicStmtSubscribeDbName, pNode->subscribeDbName);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetBoolValue(pJson, jkCreateTopicStmtIgnoreExists, &pNode->ignoreExists);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = jsonToNodeObject(pJson, jkCreateTopicStmtQuery, &pNode->pQuery);
+ }
+
+ return code;
+}
+
static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
switch (nodeType(pObj)) {
case QUERY_NODE_COLUMN:
@@ -1512,6 +1961,7 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
case QUERY_NODE_FUNCTION:
return functionNodeToJson(pObj, pJson);
case QUERY_NODE_REAL_TABLE:
+ return realTableNodeToJson(pObj, pJson);
case QUERY_NODE_TEMP_TABLE:
case QUERY_NODE_JOIN_TABLE:
break;
@@ -1549,6 +1999,8 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
case QUERY_NODE_SHOW_DATABASES_STMT:
case QUERY_NODE_SHOW_TABLES_STMT:
break;
+ case QUERY_NODE_CREATE_TOPIC_STMT:
+ return createTopicStmtToJson(pObj, pJson);
case QUERY_NODE_LOGIC_PLAN_SCAN:
return logicScanNodeToJson(pObj, pJson);
case QUERY_NODE_LOGIC_PLAN_JOIN:
@@ -1565,9 +2017,8 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
return physiTagScanNodeToJson(pObj, pJson);
case QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN:
return physiTableScanNodeToJson(pObj, pJson);
- case QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN:
case QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN:
- break;
+ return physiStreamScanNodeToJson(pObj, pJson);
case QUERY_NODE_PHYSICAL_PLAN_PROJECT:
return physiProjectNodeToJson(pObj, pJson);
case QUERY_NODE_PHYSICAL_PLAN_JOIN:
@@ -1589,6 +2040,7 @@ static int32_t specificNodeToJson(const void* pObj, SJson* pJson) {
case QUERY_NODE_PHYSICAL_PLAN:
return planToJson(pObj, pJson);
default:
+ assert(0);
break;
}
nodesWarn("specificNodeToJson unknown node = %s", nodesNodeName(nodeType(pObj)));
@@ -1607,7 +2059,8 @@ static int32_t jsonToSpecificNode(const SJson* pJson, void* pObj) {
return jsonToLogicConditionNode(pJson, pObj);
case QUERY_NODE_FUNCTION:
return jsonToFunctionNode(pJson, pObj);
- // case QUERY_NODE_REAL_TABLE:
+ case QUERY_NODE_REAL_TABLE:
+ return jsonToRealTableNode(pJson, pObj);
// case QUERY_NODE_TEMP_TABLE:
// case QUERY_NODE_JOIN_TABLE:
// break;
@@ -1633,20 +2086,24 @@ static int32_t jsonToSpecificNode(const SJson* pJson, void* pObj) {
return jsonToDownstreamSourceNode(pJson, pObj);
// case QUERY_NODE_SET_OPERATOR:
// break;
- // case QUERY_NODE_SELECT_STMT:
- // return jsonToSelectStmt(pJson, pObj);
- // case QUERY_NODE_LOGIC_PLAN_SCAN:
- // return jsonToLogicScanNode(pJson, pObj);
+ case QUERY_NODE_SELECT_STMT:
+ return jsonToSelectStmt(pJson, pObj);
+ case QUERY_NODE_CREATE_TOPIC_STMT:
+ return jsonToCreateTopicStmt(pJson, pObj);
+ case QUERY_NODE_LOGIC_PLAN_SCAN:
+ return jsonToLogicScanNode(pJson, pObj);
// case QUERY_NODE_LOGIC_PLAN_JOIN:
// return jsonToLogicJoinNode(pJson, pObj);
// case QUERY_NODE_LOGIC_PLAN_AGG:
// return jsonToLogicAggNode(pJson, pObj);
- // case QUERY_NODE_LOGIC_PLAN_PROJECT:
- // return jsonToLogicProjectNode(pJson, pObj);
+ case QUERY_NODE_LOGIC_PLAN_PROJECT:
+ return jsonToLogicProjectNode(pJson, pObj);
case QUERY_NODE_PHYSICAL_PLAN_TAG_SCAN:
return jsonToPhysiTagScanNode(pJson, pObj);
case QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN:
return jsonToPhysiTableScanNode(pJson, pObj);
+ case QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN:
+ return jsonToPhysiStreamScanNode(pJson, pObj);
case QUERY_NODE_PHYSICAL_PLAN_PROJECT:
return jsonToPhysiProjectNode(pJson, pObj);
case QUERY_NODE_PHYSICAL_PLAN_JOIN:
@@ -1768,6 +2225,7 @@ int32_t nodesStringToNode(const char* pStr, SNode** pNode) {
int32_t code = makeNodeByJson(pJson, pNode);
if (TSDB_CODE_SUCCESS != code) {
nodesDestroyNode(*pNode);
+ *pNode = NULL;
terrno = code;
return code;
}
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index 75568019cb..0d48202f73 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -125,6 +125,8 @@ SNodeptr nodesMakeNode(ENodeType type) {
return makeNode(type, sizeof(SCreateDnodeStmt));
case QUERY_NODE_DROP_DNODE_STMT:
return makeNode(type, sizeof(SDropDnodeStmt));
+ case QUERY_NODE_ALTER_DNODE_STMT:
+ return makeNode(type, sizeof(SAlterDnodeStmt));
case QUERY_NODE_SHOW_DNODES_STMT:
return makeNode(type, sizeof(SShowStmt));
case QUERY_NODE_SHOW_VGROUPS_STMT:
@@ -168,7 +170,7 @@ SNodeptr nodesMakeNode(ENodeType type) {
case QUERY_NODE_PHYSICAL_PLAN_TABLE_SEQ_SCAN:
return makeNode(type, sizeof(STableSeqScanPhysiNode));
case QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN:
- return makeNode(type, sizeof(SNode));
+ return makeNode(type, sizeof(SStreamScanPhysiNode));
case QUERY_NODE_PHYSICAL_PLAN_PROJECT:
return makeNode(type, sizeof(SProjectPhysiNode));
case QUERY_NODE_PHYSICAL_PLAN_JOIN:
@@ -357,6 +359,17 @@ int32_t nodesListAppendList(SNodeList* pTarget, SNodeList* pSrc) {
return TSDB_CODE_SUCCESS;
}
+int32_t nodesListStrictAppendList(SNodeList* pTarget, SNodeList* pSrc) {
+ if (NULL == pSrc) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ int32_t code = nodesListAppendList(pTarget, pSrc);
+ if (TSDB_CODE_SUCCESS != code) {
+ nodesDestroyList(pSrc);
+ }
+ return code;
+}
+
SListCell* nodesListErase(SNodeList* pList, SListCell* pCell) {
if (NULL == pCell->pPrev) {
pList->pHead = pCell->pNext;
@@ -571,7 +584,7 @@ typedef struct SCollectFuncsCxt {
static EDealRes collectFuncs(SNode* pNode, void* pContext) {
SCollectFuncsCxt* pCxt = (SCollectFuncsCxt*)pContext;
if (QUERY_NODE_FUNCTION == nodeType(pNode) && pCxt->classifier(((SFunctionNode*)pNode)->funcId)) {
- pCxt->errCode = nodesListAppend(pCxt->pFuncs, pNode);
+ pCxt->errCode = nodesListStrictAppend(pCxt->pFuncs, nodesCloneNode(pNode));
return (TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_IGNORE_CHILD : DEAL_RES_ERROR);
}
return DEAL_RES_CONTINUE;
diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 31d7331d0e..46bed1d61e 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -50,8 +50,10 @@ typedef enum EDatabaseOptionType {
DB_OPTION_TTL,
DB_OPTION_WAL,
DB_OPTION_VGROUPS,
- DB_OPTION_SINGLESTABLE,
- DB_OPTION_STREAMMODE,
+ DB_OPTION_SINGLE_STABLE,
+ DB_OPTION_STREAM_MODE,
+ DB_OPTION_RETENTIONS,
+ DB_OPTION_FILE_FACTOR,
DB_OPTION_MAX
} EDatabaseOptionType;
@@ -65,6 +67,11 @@ typedef enum ETableOptionType {
TABLE_OPTION_MAX
} ETableOptionType;
+typedef struct SAlterOption {
+ int32_t type;
+ SToken val;
+} SAlterOption;
+
extern SToken nil_token;
void initAstCreateContext(SParseContext* pParseCxt, SAstCreateContext* pCxt);
@@ -110,13 +117,16 @@ SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pPr
SNode* createSetOperator(SAstCreateContext* pCxt, ESetOperatorType type, SNode* pLeft, SNode* pRight);
SNode* createDefaultDatabaseOptions(SAstCreateContext* pCxt);
+SNode* createDefaultAlterDatabaseOptions(SAstCreateContext* pCxt);
SNode* setDatabaseOption(SAstCreateContext* pCxt, SNode* pOptions, EDatabaseOptionType type, const SToken* pVal);
SNode* createCreateDatabaseStmt(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pDbName, SNode* pOptions);
SNode* createDropDatabaseStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pDbName);
SNode* createAlterDatabaseStmt(SAstCreateContext* pCxt, const SToken* pDbName, SNode* pOptions);
SNode* createDefaultTableOptions(SAstCreateContext* pCxt);
+SNode* createDefaultAlterTableOptions(SAstCreateContext* pCxt);
SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType type, const SToken* pVal);
SNode* setTableSmaOption(SAstCreateContext* pCxt, SNode* pOptions, SNodeList* pSma);
+SNode* setTableRollupOption(SAstCreateContext* pCxt, SNode* pOptions, SNodeList* pFuncs);
SNode* createColumnDefNode(SAstCreateContext* pCxt, const SToken* pColName, SDataType dataType, const SToken* pComment);
SDataType createDataType(uint8_t type);
SDataType createVarLenDataType(uint8_t type, const SToken* pLen);
@@ -126,6 +136,11 @@ SNode* createCreateMultiTableStmt(SAstCreateContext* pCxt, SNodeList* pSubTables
SNode* createDropTableClause(SAstCreateContext* pCxt, bool ignoreNotExists, SNode* pRealTable);
SNode* createDropTableStmt(SAstCreateContext* pCxt, SNodeList* pTables);
SNode* createDropSuperTableStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SNode* pRealTable);
+SNode* createAlterTableOption(SAstCreateContext* pCxt, SNode* pRealTable, SNode* pOptions);
+SNode* createAlterTableAddModifyCol(SAstCreateContext* pCxt, SNode* pRealTable, int8_t alterType, const SToken* pColName, SDataType dataType);
+SNode* createAlterTableDropCol(SAstCreateContext* pCxt, SNode* pRealTable, int8_t alterType, const SToken* pColName);
+SNode* createAlterTableRenameCol(SAstCreateContext* pCxt, SNode* pRealTable, int8_t alterType, const SToken* pOldColName, const SToken* pNewColName);
+SNode* createAlterTableSetTag(SAstCreateContext* pCxt, SNode* pRealTable, const SToken* pTagName, SNode* pVal);
SNode* createUseDatabaseStmt(SAstCreateContext* pCxt, const SToken* pDbName);
SNode* createShowStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDbName);
SNode* createCreateUserStmt(SAstCreateContext* pCxt, const SToken* pUserName, const SToken* pPassword);
@@ -133,6 +148,7 @@ SNode* createAlterUserStmt(SAstCreateContext* pCxt, const SToken* pUserName, int
SNode* createDropUserStmt(SAstCreateContext* pCxt, const SToken* pUserName);
SNode* createCreateDnodeStmt(SAstCreateContext* pCxt, const SToken* pFqdn, const SToken* pPort);
SNode* createDropDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode);
+SNode* createAlterDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode, const SToken* pConfig, const SToken* pValue);
SNode* createCreateIndexStmt(SAstCreateContext* pCxt, EIndexType type, const SToken* pIndexName, const SToken* pTableName, SNodeList* pCols, SNode* pOptions);
SNode* createIndexOption(SAstCreateContext* pCxt, SNodeList* pFuncs, SNode* pInterval, SNode* pOffset, SNode* pSliding);
SNode* createDropIndexStmt(SAstCreateContext* pCxt, const SToken* pIndexName, const SToken* pTableName);
@@ -140,6 +156,7 @@ SNode* createCreateQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId);
SNode* createDropQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId);
SNode* createCreateTopicStmt(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, SNode* pQuery, const SToken* pSubscribeDbName);
SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pTopicName);
+SNode* createAlterLocalStmt(SAstCreateContext* pCxt, const SToken* pConfig, const SToken* pValue);
#ifdef __cplusplus
}
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 31c26e1e40..2298ae0761 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -21,13 +21,15 @@
#include "parAst.h"
}
-%syntax_error {
- if(TOKEN.z) {
- generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, TOKEN.z);
- } else {
- generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INCOMPLETE_SQL);
+%syntax_error {
+ if (pCxt->valid) {
+ if(TOKEN.z) {
+ generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, TOKEN.z);
+ } else {
+ generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INCOMPLETE_SQL);
+ }
+ pCxt->valid = false;
}
- pCxt->valid = false;
}
%left OR.
@@ -41,6 +43,41 @@
%left NK_CONCAT.
//%right NK_BITNOT.
+/************************************************ create/alter account *****************************************/
+cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options. { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
+cmd ::= ALTER ACCOUNT NK_ID alter_account_options. { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
+
+%type account_options { int32_t }
+%destructor account_options { }
+account_options ::= . { }
+account_options ::= account_options PPS literal. { }
+account_options ::= account_options TSERIES literal. { }
+account_options ::= account_options STORAGE literal. { }
+account_options ::= account_options STREAMS literal. { }
+account_options ::= account_options QTIME literal. { }
+account_options ::= account_options DBS literal. { }
+account_options ::= account_options USERS literal. { }
+account_options ::= account_options CONNS literal. { }
+account_options ::= account_options STATE literal. { }
+
+%type alter_account_options { int32_t }
+%destructor alter_account_options { }
+alter_account_options ::= alter_account_option. { }
+alter_account_options ::= alter_account_options alter_account_option. { }
+
+%type alter_account_option { int32_t }
+%destructor alter_account_option { }
+alter_account_option ::= PASS literal. { }
+alter_account_option ::= PPS literal. { }
+alter_account_option ::= TSERIES literal. { }
+alter_account_option ::= STORAGE literal. { }
+alter_account_option ::= STREAMS literal. { }
+alter_account_option ::= QTIME literal. { }
+alter_account_option ::= DBS literal. { }
+alter_account_option ::= USERS literal. { }
+alter_account_option ::= CONNS literal. { }
+alter_account_option ::= STATE literal. { }
+
/************************************************ create/alter/drop/show user *****************************************/
cmd ::= CREATE USER user_name(A) PASS NK_STRING(B). { pCxt->pRootNode = createCreateUserStmt(pCxt, &A, &B); }
cmd ::= ALTER USER user_name(A) PASS NK_STRING(B). { pCxt->pRootNode = createAlterUserStmt(pCxt, &A, TSDB_ALTER_USER_PASSWD, &B); }
@@ -48,12 +85,16 @@ cmd ::= ALTER USER user_name(A) PRIVILEGE NK_STRING(B).
cmd ::= DROP USER user_name(A). { pCxt->pRootNode = createDropUserStmt(pCxt, &A); }
cmd ::= SHOW USERS. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_USERS_STMT, NULL); }
-/************************************************ create/drop/show dnode **********************************************/
+/************************************************ create/drop/alter/show dnode ****************************************/
cmd ::= CREATE DNODE dnode_endpoint(A). { pCxt->pRootNode = createCreateDnodeStmt(pCxt, &A, NULL); }
cmd ::= CREATE DNODE dnode_host_name(A) PORT NK_INTEGER(B). { pCxt->pRootNode = createCreateDnodeStmt(pCxt, &A, &B); }
cmd ::= DROP DNODE NK_INTEGER(A). { pCxt->pRootNode = createDropDnodeStmt(pCxt, &A); }
cmd ::= DROP DNODE dnode_endpoint(A). { pCxt->pRootNode = createDropDnodeStmt(pCxt, &A); }
cmd ::= SHOW DNODES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL); }
+cmd ::= ALTER DNODE NK_INTEGER(A) NK_STRING(B). { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &A, &B, NULL); }
+cmd ::= ALTER DNODE NK_INTEGER(A) NK_STRING(B) NK_STRING(C). { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &A, &B, &C); }
+cmd ::= ALTER ALL DNODES NK_STRING(A). { pCxt->pRootNode = createAlterDnodeStmt(pCxt, NULL, &A, NULL); }
+cmd ::= ALTER ALL DNODES NK_STRING(A) NK_STRING(B). { pCxt->pRootNode = createAlterDnodeStmt(pCxt, NULL, &A, &B); }
%type dnode_endpoint { SToken }
%destructor dnode_endpoint { }
@@ -64,9 +105,13 @@ dnode_endpoint(A) ::= NK_STRING(B).
dnode_host_name(A) ::= NK_ID(B). { A = B; }
dnode_host_name(A) ::= NK_IPTOKEN(B). { A = B; }
+/************************************************ alter local *********************************************************/
+cmd ::= ALTER LOCAL NK_STRING(A). { pCxt->pRootNode = createAlterLocalStmt(pCxt, &A, NULL); }
+cmd ::= ALTER LOCAL NK_STRING(A) NK_STRING(B). { pCxt->pRootNode = createAlterLocalStmt(pCxt, &A, &B); }
+
/************************************************ create/drop qnode ***************************************************/
cmd ::= CREATE QNODE ON DNODE NK_INTEGER(A). { pCxt->pRootNode = createCreateQnodeStmt(pCxt, &A); }
-cmd ::= DROP QNODE ON DNODE NK_INTEGER(A). { pCxt->pRootNode = createDropQnodeStmt(pCxt, &A); }
+cmd ::= DROP QNODE ON DNODE NK_INTEGER(A). { pCxt->pRootNode = createDropQnodeStmt(pCxt, &A); }
cmd ::= SHOW QNODES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT, NULL); }
/************************************************ create/drop/show/use database ***************************************/
@@ -74,7 +119,7 @@ cmd ::= CREATE DATABASE not_exists_opt(A) db_name(B) db_options(C).
cmd ::= DROP DATABASE exists_opt(A) db_name(B). { pCxt->pRootNode = createDropDatabaseStmt(pCxt, A, &B); }
cmd ::= SHOW DATABASES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL); }
cmd ::= USE db_name(A). { pCxt->pRootNode = createUseDatabaseStmt(pCxt, &A); }
-cmd ::= ALTER DATABASE db_name(A) db_options(B). { pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &A, B); }
+cmd ::= ALTER DATABASE db_name(A) alter_db_options(B). { pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &A, B); }
%type not_exists_opt { bool }
%destructor not_exists_opt { }
@@ -102,20 +147,55 @@ db_options(A) ::= db_options(B) REPLICA NK_INTEGER(C).
db_options(A) ::= db_options(B) TTL NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_TTL, &C); }
db_options(A) ::= db_options(B) WAL NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_WAL, &C); }
db_options(A) ::= db_options(B) VGROUPS NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_VGROUPS, &C); }
-db_options(A) ::= db_options(B) SINGLE_STABLE NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_SINGLESTABLE, &C); }
-db_options(A) ::= db_options(B) STREAM_MODE NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_STREAMMODE, &C); }
+db_options(A) ::= db_options(B) SINGLE_STABLE NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_SINGLE_STABLE, &C); }
+db_options(A) ::= db_options(B) STREAM_MODE NK_INTEGER(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_STREAM_MODE, &C); }
+db_options(A) ::= db_options(B) RETENTIONS NK_STRING(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_RETENTIONS, &C); }
+db_options(A) ::= db_options(B) FILE_FACTOR NK_FLOAT(C). { A = setDatabaseOption(pCxt, B, DB_OPTION_FILE_FACTOR, &C); }
+
+alter_db_options(A) ::= alter_db_option(B). { A = createDefaultAlterDatabaseOptions(pCxt); A = setDatabaseOption(pCxt, A, B.type, &B.val); }
+alter_db_options(A) ::= alter_db_options(B) alter_db_option(C). { A = setDatabaseOption(pCxt, B, C.type, &C.val); }
+
+%type alter_db_option { SAlterOption }
+%destructor alter_db_option { }
+alter_db_option(A) ::= BLOCKS NK_INTEGER(B). { A.type = DB_OPTION_BLOCKS; A.val = B; }
+alter_db_option(A) ::= FSYNC NK_INTEGER(B). { A.type = DB_OPTION_FSYNC; A.val = B; }
+alter_db_option(A) ::= KEEP NK_INTEGER(B). { A.type = DB_OPTION_KEEP; A.val = B; }
+alter_db_option(A) ::= WAL NK_INTEGER(B). { A.type = DB_OPTION_WAL; A.val = B; }
+alter_db_option(A) ::= QUORUM NK_INTEGER(B). { A.type = DB_OPTION_QUORUM; A.val = B; }
+alter_db_option(A) ::= CACHELAST NK_INTEGER(B). { A.type = DB_OPTION_CACHELAST; A.val = B; }
/************************************************ create/drop/show table/stable ***************************************/
cmd ::= CREATE TABLE not_exists_opt(A) full_table_name(B)
- NK_LP column_def_list(C) NK_RP tags_def_opt(D) table_options(E). { pCxt->pRootNode = createCreateTableStmt(pCxt, A, B, C, D, E);}
-cmd ::= CREATE TABLE multi_create_clause(A). { pCxt->pRootNode = createCreateMultiTableStmt(pCxt, A);}
+ NK_LP column_def_list(C) NK_RP tags_def_opt(D) table_options(E). { pCxt->pRootNode = createCreateTableStmt(pCxt, A, B, C, D, E); }
+cmd ::= CREATE TABLE multi_create_clause(A). { pCxt->pRootNode = createCreateMultiTableStmt(pCxt, A); }
cmd ::= CREATE STABLE not_exists_opt(A) full_table_name(B)
- NK_LP column_def_list(C) NK_RP tags_def(D) table_options(E). { pCxt->pRootNode = createCreateTableStmt(pCxt, A, B, C, D, E);}
+ NK_LP column_def_list(C) NK_RP tags_def(D) table_options(E). { pCxt->pRootNode = createCreateTableStmt(pCxt, A, B, C, D, E); }
cmd ::= DROP TABLE multi_drop_clause(A). { pCxt->pRootNode = createDropTableStmt(pCxt, A); }
cmd ::= DROP STABLE exists_opt(A) full_table_name(B). { pCxt->pRootNode = createDropSuperTableStmt(pCxt, A, B); }
cmd ::= SHOW TABLES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, NULL); }
cmd ::= SHOW STABLES. { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, NULL); }
+cmd ::= ALTER TABLE alter_table_clause(A). { pCxt->pRootNode = A; }
+cmd ::= ALTER STABLE alter_table_clause(A). { pCxt->pRootNode = A; }
+
+alter_table_clause(A) ::= full_table_name(B) alter_table_options(C). { A = createAlterTableOption(pCxt, B, C); }
+alter_table_clause(A) ::=
+ full_table_name(B) ADD COLUMN column_name(C) type_name(D). { A = createAlterTableAddModifyCol(pCxt, B, TSDB_ALTER_TABLE_ADD_COLUMN, &C, D); }
+alter_table_clause(A) ::= full_table_name(B) DROP COLUMN column_name(C). { A = createAlterTableDropCol(pCxt, B, TSDB_ALTER_TABLE_DROP_COLUMN, &C); }
+alter_table_clause(A) ::=
+ full_table_name(B) MODIFY COLUMN column_name(C) type_name(D). { A = createAlterTableAddModifyCol(pCxt, B, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &C, D); }
+alter_table_clause(A) ::=
+ full_table_name(B) RENAME COLUMN column_name(C) column_name(D). { A = createAlterTableRenameCol(pCxt, B, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &C, &D); }
+alter_table_clause(A) ::=
+ full_table_name(B) ADD TAG column_name(C) type_name(D). { A = createAlterTableAddModifyCol(pCxt, B, TSDB_ALTER_TABLE_ADD_TAG, &C, D); }
+alter_table_clause(A) ::= full_table_name(B) DROP TAG column_name(C). { A = createAlterTableDropCol(pCxt, B, TSDB_ALTER_TABLE_DROP_TAG, &C); }
+alter_table_clause(A) ::=
+ full_table_name(B) MODIFY TAG column_name(C) type_name(D). { A = createAlterTableAddModifyCol(pCxt, B, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &C, D); }
+alter_table_clause(A) ::=
+ full_table_name(B) RENAME TAG column_name(C) column_name(D). { A = createAlterTableRenameCol(pCxt, B, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &C, &D); }
+alter_table_clause(A) ::=
+ full_table_name(B) SET TAG column_name(C) NK_EQ literal(D). { A = createAlterTableSetTag(pCxt, B, &C, D); }
+
%type multi_create_clause { SNodeList* }
%destructor multi_create_clause { nodesDestroyList($$); }
multi_create_clause(A) ::= create_subtable_clause(B). { A = createNodeList(pCxt, B); }
@@ -183,11 +263,21 @@ tags_def_opt(A) ::= tags_def(B).
%destructor tags_def { nodesDestroyList($$); }
tags_def(A) ::= TAGS NK_LP column_def_list(B) NK_RP. { A = B; }
-table_options(A) ::= . { A = createDefaultTableOptions(pCxt);}
+table_options(A) ::= . { A = createDefaultTableOptions(pCxt); }
table_options(A) ::= table_options(B) COMMENT NK_STRING(C). { A = setTableOption(pCxt, B, TABLE_OPTION_COMMENT, &C); }
table_options(A) ::= table_options(B) KEEP NK_INTEGER(C). { A = setTableOption(pCxt, B, TABLE_OPTION_KEEP, &C); }
table_options(A) ::= table_options(B) TTL NK_INTEGER(C). { A = setTableOption(pCxt, B, TABLE_OPTION_TTL, &C); }
table_options(A) ::= table_options(B) SMA NK_LP col_name_list(C) NK_RP. { A = setTableSmaOption(pCxt, B, C); }
+table_options(A) ::= table_options(B) ROLLUP NK_LP func_name_list(C) NK_RP. { A = setTableRollupOption(pCxt, B, C); }
+
+alter_table_options(A) ::= alter_table_option(B). { A = createDefaultAlterTableOptions(pCxt); A = setTableOption(pCxt, A, B.type, &B.val); }
+alter_table_options(A) ::= alter_table_options(B) alter_table_option(C). { A = setTableOption(pCxt, B, C.type, &C.val); }
+
+%type alter_table_option { SAlterOption }
+%destructor alter_table_option { }
+alter_table_option(A) ::= COMMENT NK_STRING(B). { A.type = TABLE_OPTION_COMMENT; A.val = B; }
+alter_table_option(A) ::= KEEP NK_INTEGER(B). { A.type = TABLE_OPTION_KEEP; A.val = B; }
+alter_table_option(A) ::= TTL NK_INTEGER(B). { A.type = TABLE_OPTION_TTL; A.val = B; }
%type col_name_list { SNodeList* }
%destructor col_name_list { nodesDestroyList($$); }
@@ -196,6 +286,13 @@ col_name_list(A) ::= col_name_list(B) NK_COMMA col_name(C).
col_name(A) ::= column_name(B). { A = createColumnNode(pCxt, NULL, &B); }
+%type func_name_list { SNodeList* }
+%destructor func_name_list { nodesDestroyList($$); }
+func_name_list(A) ::= func_name(B). { A = createNodeList(pCxt, B); }
+func_name_list(A) ::= func_name_list(B) NK_COMMA col_name(C). { A = addNodeToList(pCxt, B, C); }
+
+func_name(A) ::= function_name(B). { A = createFunctionNode(pCxt, &B, NULL); }
+
/************************************************ create index ********************************************************/
cmd ::= CREATE SMA INDEX index_name(A) ON table_name(B) index_options(C). { pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, &A, &B, NULL, C); }
cmd ::= CREATE FULLTEXT INDEX
@@ -546,7 +643,7 @@ query_expression_body(A) ::=
query_primary(A) ::= query_specification(B). { A = B; }
//query_primary(A) ::=
// NK_LP query_expression_body(B)
-// order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP. { A = B;}
+// order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP. { A = B; }
%type order_by_clause_opt { SNodeList* }
%destructor order_by_clause_opt { nodesDestroyList($$); }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 034346362c..eed6391d5c 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -246,6 +246,16 @@ static SDatabaseOptions* setDbStreamMode(SAstCreateContext* pCxt, SDatabaseOptio
return pOptions;
}
+static SDatabaseOptions* setDbRetentions(SAstCreateContext* pCxt, SDatabaseOptions* pOptions, const SToken* pVal) {
+ // todo
+ return pOptions;
+}
+
+static SDatabaseOptions* setDbFileFactor(SAstCreateContext* pCxt, SDatabaseOptions* pOptions, const SToken* pVal) {
+ // todo
+ return pOptions;
+}
+
static void initSetDatabaseOptionFp() {
setDbOptionFuncs[DB_OPTION_BLOCKS] = setDbBlocks;
setDbOptionFuncs[DB_OPTION_CACHE] = setDbCache;
@@ -262,8 +272,10 @@ static void initSetDatabaseOptionFp() {
setDbOptionFuncs[DB_OPTION_TTL] = setDbTtl;
setDbOptionFuncs[DB_OPTION_WAL] = setDbWal;
setDbOptionFuncs[DB_OPTION_VGROUPS] = setDbVgroups;
- setDbOptionFuncs[DB_OPTION_SINGLESTABLE] = setDbSingleStable;
- setDbOptionFuncs[DB_OPTION_STREAMMODE] = setDbStreamMode;
+ setDbOptionFuncs[DB_OPTION_SINGLE_STABLE] = setDbSingleStable;
+ setDbOptionFuncs[DB_OPTION_STREAM_MODE] = setDbStreamMode;
+ setDbOptionFuncs[DB_OPTION_RETENTIONS] = setDbRetentions;
+ setDbOptionFuncs[DB_OPTION_FILE_FACTOR] = setDbFileFactor;
}
static STableOptions* setTableKeep(SAstCreateContext* pCxt, STableOptions* pOptions, const SToken* pVal) {
@@ -772,6 +784,29 @@ SNode* createDefaultDatabaseOptions(SAstCreateContext* pCxt) {
return (SNode*)pOptions;
}
+SNode* createDefaultAlterDatabaseOptions(SAstCreateContext* pCxt) {
+ SDatabaseOptions* pOptions = nodesMakeNode(QUERY_NODE_DATABASE_OPTIONS);
+ CHECK_OUT_OF_MEM(pOptions);
+ pOptions->numOfBlocks = -1;
+ pOptions->cacheBlockSize = -1;
+ pOptions->cachelast = -1;
+ pOptions->compressionLevel = -1;
+ pOptions->daysPerFile = -1;
+ pOptions->fsyncPeriod = -1;
+ pOptions->maxRowsPerBlock = -1;
+ pOptions->minRowsPerBlock = -1;
+ pOptions->keep = -1;
+ pOptions->precision = -1;
+ pOptions->quorum = -1;
+ pOptions->replica = -1;
+ pOptions->ttl = -1;
+ pOptions->walLevel = -1;
+ pOptions->numOfVgroups = -1;
+ pOptions->singleStable = -1;
+ pOptions->streamMode = -1;
+ return (SNode*)pOptions;
+}
+
SNode* setDatabaseOption(SAstCreateContext* pCxt, SNode* pOptions, EDatabaseOptionType type, const SToken* pVal) {
return (SNode*)setDbOptionFuncs[type](pCxt, (SDatabaseOptions*)pOptions, pVal);
}
@@ -818,6 +853,14 @@ SNode* createDefaultTableOptions(SAstCreateContext* pCxt) {
return (SNode*)pOptions;
}
+SNode* createDefaultAlterTableOptions(SAstCreateContext* pCxt) {
+ STableOptions* pOptions = nodesMakeNode(QUERY_NODE_TABLE_OPTIONS);
+ CHECK_OUT_OF_MEM(pOptions);
+ pOptions->keep = -1;
+ pOptions->ttl = -1;
+ return (SNode*)pOptions;
+}
+
SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType type, const SToken* pVal) {
return (SNode*)setTableOptionFuncs[type](pCxt, (STableOptions*)pOptions, pVal);
}
@@ -827,6 +870,11 @@ SNode* setTableSmaOption(SAstCreateContext* pCxt, SNode* pOptions, SNodeList* pS
return pOptions;
}
+SNode* setTableRollupOption(SAstCreateContext* pCxt, SNode* pOptions, SNodeList* pFuncs) {
+ // todo
+ return pOptions;
+}
+
SNode* createColumnDefNode(SAstCreateContext* pCxt, const SToken* pColName, SDataType dataType, const SToken* pComment) {
SColumnDefNode* pCol = (SColumnDefNode*)nodesMakeNode(QUERY_NODE_COLUMN_DEF);
CHECK_OUT_OF_MEM(pCol);
@@ -912,6 +960,49 @@ SNode* createDropSuperTableStmt(SAstCreateContext* pCxt, bool ignoreNotExists, S
return (SNode*)pStmt;
}
+SNode* createAlterTableOption(SAstCreateContext* pCxt, SNode* pRealTable, SNode* pOptions) {
+ SAlterTableStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_TABLE_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ pStmt->alterType = TSDB_ALTER_TABLE_UPDATE_OPTIONS;
+ pStmt->pOptions = (STableOptions*)pOptions;
+ return (SNode*)pStmt;
+}
+
+SNode* createAlterTableAddModifyCol(SAstCreateContext* pCxt, SNode* pRealTable, int8_t alterType, const SToken* pColName, SDataType dataType) {
+ SAlterTableStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_TABLE_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ pStmt->alterType = alterType;
+ strncpy(pStmt->colName, pColName->z, pColName->n);
+ pStmt->dataType = dataType;
+ return (SNode*)pStmt;
+}
+
+SNode* createAlterTableDropCol(SAstCreateContext* pCxt, SNode* pRealTable, int8_t alterType, const SToken* pColName) {
+ SAlterTableStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_TABLE_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ pStmt->alterType = alterType;
+ strncpy(pStmt->colName, pColName->z, pColName->n);
+ return (SNode*)pStmt;
+}
+
+SNode* createAlterTableRenameCol(SAstCreateContext* pCxt, SNode* pRealTable, int8_t alterType, const SToken* pOldColName, const SToken* pNewColName) {
+ SAlterTableStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_TABLE_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ pStmt->alterType = alterType;
+ strncpy(pStmt->colName, pOldColName->z, pOldColName->n);
+ strncpy(pStmt->newColName, pNewColName->z, pNewColName->n);
+ return (SNode*)pStmt;
+}
+
+SNode* createAlterTableSetTag(SAstCreateContext* pCxt, SNode* pRealTable, const SToken* pTagName, SNode* pVal) {
+ SAlterTableStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_TABLE_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ pStmt->alterType = TSDB_ALTER_TABLE_UPDATE_TAG_VAL;
+ strncpy(pStmt->colName, pTagName->z, pTagName->n);
+ pStmt->pVal = (SValueNode*)pVal;
+ return (SNode*)pStmt;
+}
+
SNode* createUseDatabaseStmt(SAstCreateContext* pCxt, const SToken* pDbName) {
SUseDatabaseStmt* pStmt = (SUseDatabaseStmt*)nodesMakeNode(QUERY_NODE_USE_DATABASE_STMT);
CHECK_OUT_OF_MEM(pStmt);
@@ -1009,6 +1100,17 @@ SNode* createDropDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode) {
return (SNode*)pStmt;
}
+SNode* createAlterDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode, const SToken* pConfig, const SToken* pValue) {
+ SAlterDnodeStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_DNODE_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ pStmt->dnodeId = strtol(pDnode->z, NULL, 10);
+ trimString(pConfig->z, pConfig->n, pStmt->config, sizeof(pStmt->config));
+ if (NULL != pValue) {
+ trimString(pValue->z, pValue->n, pStmt->value, sizeof(pStmt->value));
+ }
+ return (SNode*)pStmt;
+}
+
SNode* createCreateIndexStmt(SAstCreateContext* pCxt, EIndexType type, const SToken* pIndexName, const SToken* pTableName, SNodeList* pCols, SNode* pOptions) {
if (!checkIndexName(pCxt, pIndexName) || !checkTableName(pCxt, pTableName)) {
return NULL;
@@ -1077,3 +1179,13 @@ SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const
pStmt->ignoreNotExists = ignoreNotExists;
return (SNode*)pStmt;
}
+
+SNode* createAlterLocalStmt(SAstCreateContext* pCxt, const SToken* pConfig, const SToken* pValue) {
+ SAlterLocalStmt* pStmt = nodesMakeNode(QUERY_NODE_ALTER_LOCAL_STMT);
+ CHECK_OUT_OF_MEM(pStmt);
+ trimString(pConfig->z, pConfig->n, pStmt->config, sizeof(pStmt->config));
+ if (NULL != pValue) {
+ trimString(pValue->z, pValue->n, pStmt->value, sizeof(pStmt->value));
+ }
+ return (SNode*)pStmt;
+}
diff --git a/source/libs/parser/src/parInsert.c b/source/libs/parser/src/parInsert.c
index a37820634f..803d8e00d8 100644
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
@@ -391,7 +391,7 @@ static FORCE_INLINE int32_t checkAndTrimValue(SToken* pToken, uint32_t type, cha
}
// Remove quotation marks
- if (TSDB_DATA_TYPE_BINARY == type) {
+ if (TK_NK_STRING == pToken->type) {
if (pToken->n >= TSDB_MAX_BYTES_PER_ROW) {
return buildSyntaxErrMsg(pMsgBuf, "too long string", pToken->z);
}
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index 2d58d4e1e3..4549660c76 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -28,6 +28,7 @@ typedef struct SKeyword {
// keywords in sql string
static SKeyword keywordTable[] = {
+ {"ACCOUNT", TK_ACCOUNT},
{"ALL", TK_ALL},
{"ALTER", TK_ALTER},
{"AND", TK_AND},
@@ -168,7 +169,6 @@ static SKeyword keywordTable[] = {
// {"SCORES", TK_SCORES},
// {"GRANTS", TK_GRANTS},
// {"DOT", TK_DOT},
- // {"ACCOUNT", TK_ACCOUNT},
// {"DESCRIBE", TK_DESCRIBE},
// {"SYNCDB", TK_SYNCDB},
// {"LOCAL", TK_LOCAL},
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index af7a38b702..70652901ef 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -126,7 +126,7 @@ static void setColumnInfoByExpr(const STableNode* pTable, SExprNode* pExpr, SCol
static int32_t createColumnNodeByTable(STranslateContext* pCxt, const STableNode* pTable, SNodeList* pList) {
if (QUERY_NODE_REAL_TABLE == nodeType(pTable)) {
const STableMeta* pMeta = ((SRealTableNode*)pTable)->pMeta;
- int32_t nums = pMeta->tableInfo.numOfColumns + ((TSDB_SUPER_TABLE == pMeta->tableType)? pMeta->tableInfo.numOfTags:0);
+ int32_t nums = pMeta->tableInfo.numOfColumns + ((TSDB_SUPER_TABLE == pMeta->tableType) ? pMeta->tableInfo.numOfTags : 0);
for (int32_t i = 0; i < nums; ++i) {
SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
if (NULL == pCol) {
@@ -499,6 +499,10 @@ static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect)
}
static int32_t setTableVgroupList(SParseContext* pCxt, SName* name, SRealTableNode* pRealTable) {
+ if (pCxt->topicQuery) {
+ return TSDB_CODE_SUCCESS;
+ }
+
if (TSDB_SUPER_TABLE == pRealTable->pMeta->tableType) {
SArray* vgroupList = NULL;
int32_t code = catalogGetTableDistVgInfo(pCxt->pCatalog, pCxt->pTransporter, &pCxt->mgmtEpSet, name, &vgroupList);
@@ -962,6 +966,73 @@ static int32_t translateDropSuperTable(STranslateContext* pCxt, SDropSuperTableS
return doTranslateDropSuperTable(pCxt, &tableName, pStmt->ignoreNotExists);
}
+static int32_t setAlterTableField(SAlterTableStmt* pStmt, SMAltertbReq* pAlterReq) {
+ pAlterReq->pFields = taosArrayInit(2, sizeof(TAOS_FIELD));
+ if (NULL == pAlterReq->pFields) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+
+ switch (pStmt->alterType) {
+ case TSDB_ALTER_TABLE_ADD_TAG:
+ case TSDB_ALTER_TABLE_DROP_TAG:
+ case TSDB_ALTER_TABLE_ADD_COLUMN:
+ case TSDB_ALTER_TABLE_DROP_COLUMN:
+ case TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES:
+ case TSDB_ALTER_TABLE_UPDATE_TAG_BYTES: {
+ TAOS_FIELD field = { .type = pStmt->dataType.type, .bytes = pStmt->dataType.bytes };
+ strcpy(field.name, pStmt->colName);
+ taosArrayPush(pAlterReq->pFields, &field);
+ break;
+ }
+ case TSDB_ALTER_TABLE_UPDATE_TAG_NAME:
+ case TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME: {
+ TAOS_FIELD oldField = {0};
+ strcpy(oldField.name, pStmt->colName);
+ taosArrayPush(pAlterReq->pFields, &oldField);
+ TAOS_FIELD newField = {0};
+ strcpy(oldField.name, pStmt->newColName);
+ taosArrayPush(pAlterReq->pFields, &newField);
+ break;
+ }
+ default:
+ break;
+ }
+
+ return TSDB_CODE_SUCCESS;
+}
+
+static int32_t translateAlterTable(STranslateContext* pCxt, SAlterTableStmt* pStmt) {
+ SMAltertbReq alterReq = {0};
+ SName tableName = { .type = TSDB_TABLE_NAME_T, .acctId = pCxt->pParseCxt->acctId };
+ strcpy(tableName.dbname, pStmt->dbName);
+ strcpy(tableName.tname, pStmt->tableName);
+ tNameExtractFullName(&tableName, alterReq.name);
+ alterReq.alterType = pStmt->alterType;
+ alterReq.numOfFields = 1;
+ if (TSDB_ALTER_TABLE_UPDATE_OPTIONS == pStmt->alterType) {
+ // todo
+ } else {
+ if (TSDB_CODE_SUCCESS != setAlterTableField(pStmt, &alterReq)) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ }
+
+ pCxt->pCmdMsg = malloc(sizeof(SCmdMsgInfo));
+ if (NULL == pCxt->pCmdMsg) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
+ pCxt->pCmdMsg->msgType = TDMT_MND_ALTER_STB;
+ pCxt->pCmdMsg->msgLen = tSerializeSMAlterStbReq(NULL, 0, &alterReq);
+ pCxt->pCmdMsg->pMsg = malloc(pCxt->pCmdMsg->msgLen);
+ if (NULL == pCxt->pCmdMsg->pMsg) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ tSerializeSMAlterStbReq(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, &alterReq);
+
+ return TSDB_CODE_SUCCESS;
+}
+
static int32_t translateUseDatabase(STranslateContext* pCxt, SUseDatabaseStmt* pStmt) {
SName name = {0};
tNameSetDbName(&name, pCxt->pParseCxt->acctId, pStmt->dbName, strlen(pStmt->dbName));
@@ -1099,6 +1170,28 @@ static int32_t translateDropDnode(STranslateContext* pCxt, SDropDnodeStmt* pStmt
return TSDB_CODE_SUCCESS;
}
+static int32_t translateAlterDnode(STranslateContext* pCxt, SAlterDnodeStmt* pStmt) {
+ SMCfgDnodeReq cfgReq = {0};
+ cfgReq.dnodeId = pStmt->dnodeId;
+ strcpy(cfgReq.config, pStmt->config);
+ strcpy(cfgReq.value, pStmt->value);
+
+ pCxt->pCmdMsg = malloc(sizeof(SCmdMsgInfo));
+ if (NULL == pCxt->pCmdMsg) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ pCxt->pCmdMsg->epSet = pCxt->pParseCxt->mgmtEpSet;
+ pCxt->pCmdMsg->msgType = TDMT_MND_CONFIG_DNODE;
+ pCxt->pCmdMsg->msgLen = tSerializeSMCfgDnodeReq(NULL, 0, &cfgReq);
+ pCxt->pCmdMsg->pMsg = malloc(pCxt->pCmdMsg->msgLen);
+ if (NULL == pCxt->pCmdMsg->pMsg) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ tSerializeSMCfgDnodeReq(pCxt->pCmdMsg->pMsg, pCxt->pCmdMsg->msgLen, &cfgReq);
+
+ return TSDB_CODE_SUCCESS;
+}
+
static int32_t nodeTypeToShowType(ENodeType nt) {
switch (nt) {
case QUERY_NODE_SHOW_DATABASES_STMT:
@@ -1300,6 +1393,7 @@ static int32_t translateCreateTopic(STranslateContext* pCxt, SCreateTopicStmt* p
SCMCreateTopicReq createReq = {0};
if (NULL != pStmt->pQuery) {
+ pCxt->pParseCxt->topicQuery = true;
int32_t code = translateQuery(pCxt, pStmt->pQuery);
if (TSDB_CODE_SUCCESS == code) {
code = nodesNodeToString(pStmt->pQuery, false, &createReq.ast, NULL);
@@ -1364,6 +1458,11 @@ static int32_t translateDropTopic(STranslateContext* pCxt, SDropTopicStmt* pStmt
return TSDB_CODE_SUCCESS;
}
+static int32_t translateAlterLocal(STranslateContext* pCxt, SAlterLocalStmt* pStmt) {
+ // todo
+ return TSDB_CODE_SUCCESS;
+}
+
static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
int32_t code = TSDB_CODE_SUCCESS;
switch (nodeType(pNode)) {
@@ -1388,6 +1487,9 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
case QUERY_NODE_DROP_SUPER_TABLE_STMT:
code = translateDropSuperTable(pCxt, (SDropSuperTableStmt*)pNode);
break;
+ case QUERY_NODE_ALTER_TABLE_STMT:
+ code = translateAlterTable(pCxt, (SAlterTableStmt*)pNode);
+ break;
case QUERY_NODE_CREATE_USER_STMT:
code = translateCreateUser(pCxt, (SCreateUserStmt*)pNode);
break;
@@ -1406,6 +1508,9 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
case QUERY_NODE_DROP_DNODE_STMT:
code = translateDropDnode(pCxt, (SDropDnodeStmt*)pNode);
break;
+ case QUERY_NODE_ALTER_DNODE_STMT:
+ code = translateAlterDnode(pCxt, (SAlterDnodeStmt*)pNode);
+ break;
case QUERY_NODE_SHOW_DATABASES_STMT:
case QUERY_NODE_SHOW_STABLES_STMT:
case QUERY_NODE_SHOW_USERS_STMT:
@@ -1436,6 +1541,9 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
case QUERY_NODE_DROP_TOPIC_STMT:
code = translateDropTopic(pCxt, (SDropTopicStmt*)pNode);
break;
+ case QUERY_NODE_ALTER_LOCAL_STMT:
+ code = translateAlterLocal(pCxt, (SAlterLocalStmt*)pNode);
+ break;
default:
break;
}
@@ -1855,6 +1963,11 @@ static int32_t rewriteCreateMultiTable(STranslateContext* pCxt, SQuery* pQuery)
return rewriteToVnodeModifOpStmt(pQuery, pBufArray);
}
+static int32_t rewriteAlterTable(STranslateContext* pCxt, SQuery* pQuery) {
+ // todo
+ return TSDB_CODE_SUCCESS;
+}
+
static int32_t rewriteQuery(STranslateContext* pCxt, SQuery* pQuery) {
int32_t code = TSDB_CODE_SUCCESS;
switch (nodeType(pQuery->pRoot)) {
@@ -1866,6 +1979,11 @@ static int32_t rewriteQuery(STranslateContext* pCxt, SQuery* pQuery) {
case QUERY_NODE_CREATE_MULTI_TABLE_STMT:
code = rewriteCreateMultiTable(pCxt, pQuery);
break;
+ case QUERY_NODE_ALTER_TABLE_STMT:
+ if (TSDB_ALTER_TABLE_UPDATE_TAG_VAL == ((SAlterTableStmt*)pQuery->pRoot)->alterType) {
+ code = rewriteAlterTable(pCxt, pQuery);
+ }
+ break;
default:
break;
}
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index aa2516e2b9..69c2380b45 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -46,17 +46,19 @@ static char* getSyntaxErrFormat(int32_t errCode) {
case TSDB_CODE_PAR_NOT_SINGLE_GROUP:
return "Not a single-group group function";
case TSDB_CODE_PAR_TAGS_NOT_MATCHED:
- return "tags number not matched";
+ return "Tags number not matched";
case TSDB_CODE_PAR_INVALID_TAG_NAME:
- return "invalid tag name : %s";
+ return "Invalid tag name : %s";
case TSDB_CODE_PAR_NAME_OR_PASSWD_TOO_LONG:
- return "name or password too long";
+ return "Name or password too long";
case TSDB_CODE_PAR_PASSWD_EMPTY:
- return "password can not be empty";
+ return "Password can not be empty";
case TSDB_CODE_PAR_INVALID_PORT:
- return "port should be an integer that is less than 65535 and greater than 0";
+ return "Port should be an integer that is less than 65535 and greater than 0";
case TSDB_CODE_PAR_INVALID_ENDPOINT:
- return "endpoint should be in the format of 'fqdn:port'";
+ return "Endpoint should be in the format of 'fqdn:port'";
+ case TSDB_CODE_PAR_EXPRIE_STATEMENT:
+ return "This statement is no longer supported";
case TSDB_CODE_OUT_OF_MEMORY:
return "Out of memory";
default:
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index 18b507c1b0..3d88eb5336 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -99,22 +99,24 @@
#endif
/************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned char
-#define YYNOCODE 220
+#define YYNOCODE 249
#define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SToken
typedef union {
int yyinit;
ParseTOKENTYPE yy0;
- SNodeList* yy24;
- bool yy97;
- SToken yy129;
- SDataType yy224;
- ENullOrder yy257;
- EOperatorType yy260;
- EFillMode yy294;
- EJoinType yy332;
- EOrder yy378;
- SNode* yy432;
+ SNode* yy26;
+ EOrder yy32;
+ SNodeList* yy64;
+ EOperatorType yy80;
+ bool yy107;
+ EFillMode yy192;
+ SToken yy353;
+ SDataType yy370;
+ EJoinType yy372;
+ ENullOrder yy391;
+ SAlterOption yy443;
+ int32_t yy448;
} YYMINORTYPE;
#ifndef YYSTACKDEPTH
#define YYSTACKDEPTH 100
@@ -129,17 +131,17 @@ typedef union {
#define ParseCTX_PARAM
#define ParseCTX_FETCH
#define ParseCTX_STORE
-#define YYNSTATE 333
-#define YYNRULE 255
-#define YYNTOKEN 141
-#define YY_MAX_SHIFT 332
-#define YY_MIN_SHIFTREDUCE 501
-#define YY_MAX_SHIFTREDUCE 755
-#define YY_ERROR_ACTION 756
-#define YY_ACCEPT_ACTION 757
-#define YY_NO_ACTION 758
-#define YY_MIN_REDUCE 759
-#define YY_MAX_REDUCE 1013
+#define YYNSTATE 414
+#define YYNRULE 316
+#define YYNTOKEN 160
+#define YY_MAX_SHIFT 413
+#define YY_MIN_SHIFTREDUCE 631
+#define YY_MAX_SHIFTREDUCE 946
+#define YY_ERROR_ACTION 947
+#define YY_ACCEPT_ACTION 948
+#define YY_NO_ACTION 949
+#define YY_MIN_REDUCE 950
+#define YY_MAX_REDUCE 1265
/************* End control #defines *******************************************/
#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
@@ -206,322 +208,379 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (1012)
+#define YY_ACTTAB_COUNT (1182)
static const YYACTIONTYPE yy_action[] = {
- /* 0 */ 163, 856, 240, 855, 272, 162, 272, 200, 856, 814,
- /* 10 */ 854, 878, 31, 29, 27, 26, 25, 65, 880, 817,
- /* 20 */ 178, 817, 256, 176, 906, 31, 29, 27, 26, 25,
- /* 30 */ 779, 878, 40, 705, 55, 819, 71, 63, 880, 62,
- /* 40 */ 155, 229, 66, 812, 243, 809, 906, 79, 938, 939,
- /* 50 */ 626, 943, 878, 155, 175, 258, 511, 863, 259, 891,
- /* 60 */ 511, 638, 58, 892, 895, 931, 512, 513, 208, 165,
- /* 70 */ 927, 77, 321, 320, 319, 318, 317, 316, 315, 314,
- /* 80 */ 313, 312, 311, 310, 309, 308, 307, 306, 305, 775,
- /* 90 */ 959, 27, 26, 25, 31, 29, 27, 26, 25, 23,
- /* 100 */ 170, 271, 656, 657, 658, 659, 660, 661, 662, 664,
- /* 110 */ 665, 666, 23, 170, 271, 656, 657, 658, 659, 660,
- /* 120 */ 661, 662, 664, 665, 666, 31, 29, 27, 26, 25,
- /* 130 */ 10, 321, 320, 319, 318, 317, 316, 315, 314, 313,
- /* 140 */ 312, 311, 310, 309, 308, 307, 306, 305, 565, 295,
- /* 150 */ 294, 293, 569, 292, 571, 572, 291, 574, 288, 804,
- /* 160 */ 580, 285, 582, 583, 282, 279, 24, 117, 256, 196,
- /* 170 */ 906, 992, 626, 195, 624, 256, 177, 906, 194, 856,
- /* 180 */ 193, 854, 83, 878, 991, 83, 258, 233, 990, 244,
- /* 190 */ 891, 180, 271, 57, 892, 895, 931, 54, 182, 190,
- /* 200 */ 154, 927, 51, 819, 71, 272, 192, 191, 269, 301,
- /* 210 */ 819, 71, 992, 300, 805, 243, 624, 906, 751, 752,
- /* 220 */ 817, 10, 234, 878, 298, 82, 258, 945, 302, 990,
- /* 230 */ 891, 757, 627, 58, 892, 895, 931, 256, 186, 906,
- /* 240 */ 165, 927, 77, 228, 942, 878, 201, 299, 258, 628,
- /* 250 */ 30, 28, 891, 201, 113, 58, 892, 895, 931, 617,
- /* 260 */ 221, 958, 165, 927, 1004, 184, 256, 615, 906, 172,
- /* 270 */ 629, 235, 230, 965, 878, 304, 878, 258, 12, 272,
- /* 280 */ 297, 891, 270, 881, 58, 892, 895, 931, 992, 9,
- /* 290 */ 8, 165, 927, 1004, 817, 256, 272, 906, 1, 130,
- /* 300 */ 83, 82, 988, 878, 181, 990, 258, 856, 40, 854,
- /* 310 */ 891, 817, 112, 58, 892, 895, 931, 273, 21, 813,
- /* 320 */ 165, 927, 1004, 30, 28, 698, 272, 663, 189, 183,
- /* 330 */ 667, 949, 617, 99, 616, 618, 621, 114, 30, 28,
- /* 340 */ 615, 817, 172, 329, 328, 803, 247, 617, 256, 674,
- /* 350 */ 906, 12, 722, 83, 140, 615, 878, 172, 161, 258,
- /* 360 */ 141, 72, 244, 891, 30, 28, 144, 892, 895, 49,
- /* 370 */ 945, 1, 945, 617, 84, 225, 720, 721, 723, 724,
- /* 380 */ 810, 615, 226, 172, 304, 992, 7, 941, 6, 940,
- /* 390 */ 273, 697, 12, 864, 259, 256, 248, 906, 82, 820,
- /* 400 */ 71, 136, 990, 878, 847, 273, 258, 616, 618, 621,
- /* 410 */ 891, 240, 1, 59, 892, 895, 931, 256, 107, 906,
- /* 420 */ 930, 927, 616, 618, 621, 878, 65, 217, 258, 950,
- /* 430 */ 693, 273, 891, 251, 69, 59, 892, 895, 931, 207,
- /* 440 */ 244, 83, 254, 927, 213, 961, 63, 211, 616, 618,
- /* 450 */ 621, 83, 94, 30, 28, 257, 110, 938, 239, 241,
- /* 460 */ 238, 249, 617, 992, 719, 617, 30, 28, 693, 93,
- /* 470 */ 615, 60, 172, 615, 246, 617, 82, 104, 907, 256,
- /* 480 */ 990, 906, 668, 615, 102, 172, 116, 878, 255, 32,
- /* 490 */ 258, 2, 754, 755, 891, 635, 624, 73, 892, 895,
- /* 500 */ 252, 7, 32, 696, 607, 9, 8, 30, 28, 185,
- /* 510 */ 256, 32, 906, 632, 7, 885, 617, 625, 878, 85,
- /* 520 */ 273, 258, 883, 273, 615, 891, 172, 631, 59, 892,
- /* 530 */ 895, 931, 214, 273, 245, 1005, 928, 616, 618, 621,
- /* 540 */ 616, 618, 621, 197, 198, 256, 199, 906, 39, 653,
- /* 550 */ 616, 618, 621, 878, 202, 1, 258, 171, 90, 122,
- /* 560 */ 891, 215, 209, 148, 892, 895, 120, 256, 630, 906,
- /* 570 */ 264, 134, 160, 127, 273, 878, 558, 67, 258, 222,
- /* 580 */ 68, 216, 891, 69, 992, 148, 892, 895, 256, 218,
- /* 590 */ 906, 616, 618, 621, 629, 553, 878, 82, 95, 258,
- /* 600 */ 962, 990, 60, 891, 586, 133, 147, 892, 895, 590,
- /* 610 */ 256, 277, 906, 61, 802, 227, 68, 219, 878, 325,
- /* 620 */ 972, 258, 132, 262, 256, 891, 906, 100, 73, 892,
- /* 630 */ 895, 621, 878, 224, 971, 258, 169, 236, 256, 891,
- /* 640 */ 906, 103, 148, 892, 895, 56, 878, 164, 128, 258,
- /* 650 */ 173, 5, 256, 891, 906, 952, 148, 892, 895, 237,
- /* 660 */ 878, 75, 106, 258, 301, 223, 1006, 891, 300, 108,
- /* 670 */ 146, 892, 895, 240, 268, 4, 220, 64, 256, 96,
- /* 680 */ 906, 693, 628, 302, 595, 946, 878, 33, 65, 258,
- /* 690 */ 253, 69, 256, 891, 906, 109, 149, 892, 895, 70,
- /* 700 */ 878, 989, 299, 258, 1007, 250, 68, 891, 63, 166,
- /* 710 */ 142, 892, 895, 256, 17, 906, 115, 242, 78, 938,
- /* 720 */ 939, 878, 943, 913, 258, 862, 260, 256, 891, 906,
- /* 730 */ 261, 150, 892, 895, 861, 878, 265, 174, 258, 266,
- /* 740 */ 124, 256, 891, 906, 267, 143, 892, 895, 48, 878,
- /* 750 */ 135, 818, 258, 50, 275, 256, 891, 906, 137, 151,
- /* 760 */ 892, 895, 131, 878, 872, 138, 258, 332, 152, 256,
- /* 770 */ 891, 906, 153, 903, 892, 895, 139, 878, 778, 871,
- /* 780 */ 258, 870, 187, 256, 891, 906, 188, 902, 892, 895,
- /* 790 */ 869, 878, 808, 807, 258, 777, 774, 256, 891, 906,
- /* 800 */ 768, 901, 892, 895, 763, 878, 868, 859, 258, 87,
- /* 810 */ 806, 256, 891, 906, 524, 158, 892, 895, 776, 878,
- /* 820 */ 773, 205, 258, 203, 204, 256, 891, 906, 767, 157,
- /* 830 */ 892, 895, 766, 878, 762, 761, 258, 210, 760, 867,
- /* 840 */ 891, 866, 212, 159, 892, 895, 36, 858, 256, 42,
- /* 850 */ 906, 97, 98, 3, 240, 14, 878, 15, 74, 258,
- /* 860 */ 101, 105, 256, 891, 906, 43, 156, 892, 895, 65,
- /* 870 */ 878, 32, 231, 258, 718, 712, 92, 891, 34, 37,
- /* 880 */ 145, 892, 895, 711, 76, 44, 11, 232, 690, 63,
- /* 890 */ 206, 883, 689, 91, 19, 45, 20, 111, 745, 80,
- /* 900 */ 938, 939, 740, 943, 35, 739, 31, 29, 27, 26,
- /* 910 */ 25, 22, 81, 167, 16, 744, 41, 743, 168, 89,
- /* 920 */ 8, 31, 29, 27, 26, 25, 118, 636, 13, 31,
- /* 930 */ 29, 27, 26, 25, 654, 18, 263, 857, 119, 716,
- /* 940 */ 121, 123, 46, 126, 125, 47, 88, 619, 51, 276,
- /* 950 */ 86, 179, 38, 280, 882, 579, 587, 129, 278, 274,
- /* 960 */ 584, 281, 283, 581, 284, 286, 575, 287, 289, 573,
- /* 970 */ 564, 290, 52, 53, 594, 296, 593, 578, 638, 592,
- /* 980 */ 303, 577, 522, 543, 576, 542, 541, 536, 540, 539,
- /* 990 */ 538, 537, 535, 534, 533, 772, 532, 531, 530, 529,
- /* 1000 */ 528, 527, 322, 323, 765, 764, 326, 327, 324, 759,
- /* 1010 */ 330, 331,
+ /* 0 */ 996, 347, 347, 24, 162, 334, 253, 1057, 227, 1049,
+ /* 10 */ 108, 1115, 1158, 31, 29, 27, 26, 25, 951, 331,
+ /* 20 */ 347, 1098, 1060, 1060, 103, 64, 962, 31, 29, 27,
+ /* 30 */ 26, 25, 263, 233, 1051, 973, 1106, 1108, 304, 76,
+ /* 40 */ 346, 1060, 75, 74, 73, 72, 71, 70, 69, 68,
+ /* 50 */ 67, 201, 398, 397, 396, 395, 394, 393, 392, 391,
+ /* 60 */ 390, 389, 388, 387, 386, 385, 384, 383, 382, 381,
+ /* 70 */ 380, 1130, 1130, 30, 28, 829, 31, 29, 27, 26,
+ /* 80 */ 25, 224, 346, 808, 76, 852, 42, 75, 74, 73,
+ /* 90 */ 72, 71, 70, 69, 68, 67, 275, 102, 270, 42,
+ /* 100 */ 806, 274, 1244, 1056, 273, 1063, 271, 1105, 88, 272,
+ /* 110 */ 289, 12, 950, 214, 201, 1243, 1055, 815, 1103, 1242,
+ /* 120 */ 23, 222, 346, 847, 848, 849, 850, 851, 853, 855,
+ /* 130 */ 856, 857, 807, 254, 1, 10, 86, 85, 84, 83,
+ /* 140 */ 82, 81, 80, 79, 78, 1132, 290, 303, 852, 747,
+ /* 150 */ 369, 368, 367, 751, 366, 753, 754, 365, 756, 362,
+ /* 160 */ 410, 762, 359, 764, 765, 356, 353, 287, 1244, 215,
+ /* 170 */ 942, 943, 817, 310, 305, 10, 913, 1143, 809, 812,
+ /* 180 */ 285, 116, 1130, 23, 222, 1242, 847, 848, 849, 850,
+ /* 190 */ 851, 853, 855, 856, 857, 117, 117, 1158, 300, 911,
+ /* 200 */ 912, 914, 915, 1132, 331, 31, 29, 27, 26, 25,
+ /* 210 */ 333, 347, 347, 888, 1130, 1143, 344, 345, 815, 319,
+ /* 220 */ 105, 1025, 60, 1144, 1147, 1183, 948, 230, 249, 200,
+ /* 230 */ 1179, 117, 1060, 1060, 347, 1158, 972, 292, 248, 64,
+ /* 240 */ 1130, 1244, 318, 247, 315, 246, 269, 309, 333, 379,
+ /* 250 */ 1158, 96, 1130, 1197, 116, 1060, 180, 331, 1242, 1090,
+ /* 260 */ 61, 1144, 1147, 1183, 243, 91, 1105, 217, 1179, 111,
+ /* 270 */ 1194, 237, 229, 1130, 245, 244, 308, 1103, 1143, 406,
+ /* 280 */ 405, 158, 30, 28, 889, 89, 347, 296, 1210, 819,
+ /* 290 */ 224, 175, 808, 1244, 317, 112, 1190, 1191, 1158, 1195,
+ /* 300 */ 228, 315, 27, 26, 25, 318, 116, 1060, 102, 806,
+ /* 310 */ 1242, 333, 51, 1143, 239, 1130, 1062, 58, 1202, 884,
+ /* 320 */ 12, 818, 91, 61, 1144, 1147, 1183, 92, 1036, 1053,
+ /* 330 */ 217, 1179, 111, 1158, 1052, 31, 29, 27, 26, 25,
+ /* 340 */ 331, 807, 89, 1, 887, 267, 333, 232, 1143, 266,
+ /* 350 */ 1130, 1211, 113, 1190, 1191, 102, 1195, 910, 61, 1144,
+ /* 360 */ 1147, 1183, 235, 1062, 117, 217, 1179, 1256, 1158, 410,
+ /* 370 */ 102, 77, 372, 971, 268, 331, 1217, 254, 1062, 1143,
+ /* 380 */ 1105, 333, 30, 28, 157, 1130, 234, 809, 812, 1035,
+ /* 390 */ 224, 1103, 808, 61, 1144, 1147, 1183, 829, 347, 1158,
+ /* 400 */ 217, 1179, 1256, 236, 9, 8, 331, 30, 28, 806,
+ /* 410 */ 1130, 1240, 333, 30, 28, 224, 1130, 808, 1143, 1060,
+ /* 420 */ 12, 224, 334, 808, 61, 1144, 1147, 1183, 1116, 1197,
+ /* 430 */ 808, 217, 1179, 1256, 806, 669, 970, 670, 1158, 669,
+ /* 440 */ 806, 807, 1201, 1, 1045, 331, 1193, 806, 1047, 376,
+ /* 450 */ 1105, 333, 261, 375, 969, 1130, 1143, 1034, 671, 21,
+ /* 460 */ 319, 1107, 322, 190, 1144, 1147, 807, 854, 7, 410,
+ /* 470 */ 858, 149, 807, 1130, 7, 1105, 1158, 865, 377, 807,
+ /* 480 */ 57, 6, 1244, 331, 968, 147, 1104, 809, 812, 333,
+ /* 490 */ 1143, 1130, 53, 1130, 410, 116, 967, 374, 373, 1242,
+ /* 500 */ 410, 62, 1144, 1147, 1183, 820, 379, 410, 1182, 1179,
+ /* 510 */ 1158, 315, 809, 812, 30, 28, 332, 331, 809, 812,
+ /* 520 */ 966, 1130, 224, 333, 808, 809, 812, 1130, 896, 117,
+ /* 530 */ 965, 964, 91, 1130, 817, 62, 1144, 1147, 1183, 1133,
+ /* 540 */ 961, 806, 329, 1179, 960, 30, 28, 319, 945, 946,
+ /* 550 */ 959, 1143, 89, 224, 958, 808, 957, 1130, 131, 9,
+ /* 560 */ 8, 129, 155, 1190, 314, 413, 313, 1130, 1130, 1244,
+ /* 570 */ 884, 1158, 806, 807, 956, 7, 1130, 1130, 331, 178,
+ /* 580 */ 1043, 1130, 116, 87, 333, 955, 1242, 1130, 1130, 402,
+ /* 590 */ 1143, 1130, 177, 1130, 954, 323, 106, 1144, 1147, 330,
+ /* 600 */ 144, 410, 953, 126, 807, 326, 1, 110, 1197, 321,
+ /* 610 */ 1158, 1130, 371, 259, 963, 242, 125, 331, 59, 809,
+ /* 620 */ 812, 173, 1130, 333, 1026, 1192, 133, 1130, 1143, 132,
+ /* 630 */ 159, 1130, 410, 320, 1257, 62, 1144, 1147, 1183, 1130,
+ /* 640 */ 991, 135, 43, 1180, 134, 123, 137, 301, 1158, 136,
+ /* 650 */ 809, 812, 1143, 859, 343, 331, 986, 295, 152, 324,
+ /* 660 */ 141, 333, 276, 1143, 185, 1130, 984, 32, 223, 187,
+ /* 670 */ 844, 327, 1158, 196, 1144, 1147, 1099, 826, 278, 331,
+ /* 680 */ 122, 186, 104, 1158, 120, 333, 1143, 260, 281, 1130,
+ /* 690 */ 331, 32, 297, 1137, 118, 1213, 333, 196, 1144, 1147,
+ /* 700 */ 1130, 1143, 316, 798, 167, 1159, 1158, 1135, 195, 1144,
+ /* 710 */ 1147, 1033, 339, 331, 161, 172, 1143, 32, 165, 333,
+ /* 720 */ 2, 1158, 250, 1130, 238, 815, 93, 823, 331, 94,
+ /* 730 */ 119, 106, 1144, 1147, 333, 816, 1158, 1143, 1130, 311,
+ /* 740 */ 251, 221, 252, 331, 740, 735, 196, 1144, 1147, 333,
+ /* 750 */ 822, 41, 1143, 1130, 255, 124, 225, 1158, 96, 77,
+ /* 760 */ 821, 196, 1144, 1147, 331, 262, 264, 768, 1143, 1258,
+ /* 770 */ 333, 376, 1158, 772, 1130, 375, 778, 1050, 777, 331,
+ /* 780 */ 117, 351, 194, 1144, 1147, 333, 66, 94, 1158, 1130,
+ /* 790 */ 95, 1143, 96, 128, 97, 331, 1143, 197, 1144, 1147,
+ /* 800 */ 377, 333, 1046, 291, 130, 1130, 98, 1143, 94, 99,
+ /* 810 */ 1048, 1158, 1143, 188, 1144, 1147, 1158, 1044, 331, 374,
+ /* 820 */ 373, 140, 100, 331, 333, 101, 213, 1158, 1130, 333,
+ /* 830 */ 820, 1214, 1158, 1130, 331, 293, 198, 1144, 1147, 331,
+ /* 840 */ 333, 189, 1144, 1147, 1130, 333, 1224, 1143, 294, 1130,
+ /* 850 */ 1143, 302, 199, 1144, 1147, 337, 145, 1155, 1144, 1147,
+ /* 860 */ 812, 148, 299, 216, 298, 5, 1204, 1158, 1223, 312,
+ /* 870 */ 1158, 4, 884, 90, 331, 819, 151, 331, 109, 1198,
+ /* 880 */ 333, 33, 153, 333, 1130, 1143, 154, 1130, 218, 328,
+ /* 890 */ 17, 1241, 1154, 1144, 1147, 1153, 1144, 1147, 1259, 325,
+ /* 900 */ 1143, 160, 1165, 340, 1114, 1158, 335, 169, 336, 50,
+ /* 910 */ 341, 1113, 331, 226, 1061, 342, 1143, 179, 333, 52,
+ /* 920 */ 1158, 1143, 1130, 315, 181, 176, 409, 331, 191, 349,
+ /* 930 */ 204, 1144, 1147, 333, 183, 184, 1158, 1130, 1124, 192,
+ /* 940 */ 999, 1158, 1123, 331, 91, 203, 1144, 1147, 331, 333,
+ /* 950 */ 1122, 240, 1143, 1130, 333, 241, 1121, 208, 1130, 1039,
+ /* 960 */ 1038, 205, 1144, 1147, 89, 998, 202, 1144, 1147, 1000,
+ /* 970 */ 995, 983, 1158, 121, 114, 1190, 1191, 280, 1195, 331,
+ /* 980 */ 978, 1120, 267, 1111, 1037, 333, 266, 684, 997, 1130,
+ /* 990 */ 994, 256, 288, 258, 257, 982, 981, 193, 1144, 1147,
+ /* 1000 */ 209, 977, 207, 206, 1041, 265, 139, 65, 127, 781,
+ /* 1010 */ 283, 268, 1040, 783, 782, 277, 713, 712, 711, 138,
+ /* 1020 */ 992, 275, 210, 270, 710, 709, 274, 987, 708, 273,
+ /* 1030 */ 211, 271, 279, 985, 272, 212, 282, 976, 284, 975,
+ /* 1040 */ 286, 63, 1119, 1118, 1110, 38, 36, 142, 37, 44,
+ /* 1050 */ 3, 20, 32, 143, 14, 39, 146, 15, 306, 34,
+ /* 1060 */ 307, 31, 29, 27, 26, 25, 22, 909, 903, 47,
+ /* 1070 */ 11, 107, 150, 931, 930, 45, 31, 29, 27, 26,
+ /* 1080 */ 25, 902, 46, 8, 881, 880, 219, 935, 1109, 934,
+ /* 1090 */ 220, 993, 1135, 980, 19, 949, 936, 170, 827, 164,
+ /* 1100 */ 350, 156, 13, 35, 115, 18, 231, 354, 357, 360,
+ /* 1110 */ 907, 16, 845, 163, 166, 363, 53, 746, 168, 48,
+ /* 1120 */ 774, 704, 776, 775, 348, 49, 400, 1134, 769, 40,
+ /* 1130 */ 352, 399, 766, 355, 401, 378, 763, 757, 682, 358,
+ /* 1140 */ 171, 338, 174, 703, 361, 702, 755, 364, 701, 700,
+ /* 1150 */ 699, 698, 54, 55, 697, 56, 696, 705, 695, 694,
+ /* 1160 */ 761, 693, 692, 691, 690, 689, 403, 370, 688, 687,
+ /* 1170 */ 404, 979, 974, 407, 760, 408, 759, 810, 758, 182,
+ /* 1180 */ 411, 412,
};
static const YYCODETYPE yy_lookahead[] = {
- /* 0 */ 158, 163, 146, 165, 146, 160, 146, 149, 163, 149,
- /* 10 */ 165, 169, 12, 13, 14, 15, 16, 161, 176, 161,
- /* 20 */ 158, 161, 161, 150, 163, 12, 13, 14, 15, 16,
- /* 30 */ 0, 169, 148, 14, 145, 162, 163, 181, 176, 155,
- /* 40 */ 40, 180, 153, 159, 161, 156, 163, 191, 192, 193,
- /* 50 */ 31, 195, 169, 40, 168, 172, 21, 171, 172, 176,
- /* 60 */ 21, 61, 179, 180, 181, 182, 31, 32, 29, 186,
- /* 70 */ 187, 188, 42, 43, 44, 45, 46, 47, 48, 49,
- /* 80 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 0,
- /* 90 */ 207, 14, 15, 16, 12, 13, 14, 15, 16, 99,
- /* 100 */ 100, 31, 102, 103, 104, 105, 106, 107, 108, 109,
- /* 110 */ 110, 111, 99, 100, 31, 102, 103, 104, 105, 106,
- /* 120 */ 107, 108, 109, 110, 111, 12, 13, 14, 15, 16,
- /* 130 */ 60, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- /* 140 */ 51, 52, 53, 54, 55, 56, 57, 58, 70, 71,
- /* 150 */ 72, 73, 74, 75, 76, 77, 78, 79, 80, 0,
- /* 160 */ 82, 83, 84, 85, 86, 87, 183, 184, 161, 26,
- /* 170 */ 163, 198, 31, 30, 31, 161, 160, 163, 35, 163,
- /* 180 */ 37, 165, 115, 169, 211, 115, 172, 180, 215, 175,
- /* 190 */ 176, 150, 31, 179, 180, 181, 182, 60, 150, 56,
- /* 200 */ 186, 187, 65, 162, 163, 146, 63, 64, 149, 50,
- /* 210 */ 162, 163, 198, 54, 0, 161, 31, 163, 136, 137,
- /* 220 */ 161, 60, 31, 169, 66, 211, 172, 177, 69, 215,
- /* 230 */ 176, 141, 31, 179, 180, 181, 182, 161, 95, 163,
- /* 240 */ 186, 187, 188, 92, 194, 169, 39, 88, 172, 31,
- /* 250 */ 12, 13, 176, 39, 200, 179, 180, 181, 182, 21,
- /* 260 */ 206, 207, 186, 187, 188, 175, 161, 29, 163, 31,
- /* 270 */ 31, 120, 121, 197, 169, 39, 169, 172, 40, 146,
- /* 280 */ 164, 176, 149, 176, 179, 180, 181, 182, 198, 1,
- /* 290 */ 2, 186, 187, 188, 161, 161, 146, 163, 60, 149,
- /* 300 */ 115, 211, 197, 169, 160, 215, 172, 163, 148, 165,
- /* 310 */ 176, 161, 94, 179, 180, 181, 182, 79, 99, 159,
- /* 320 */ 186, 187, 188, 12, 13, 14, 146, 108, 146, 149,
- /* 330 */ 111, 197, 21, 94, 96, 97, 98, 218, 12, 13,
- /* 340 */ 29, 161, 31, 143, 144, 0, 3, 21, 161, 61,
- /* 350 */ 163, 40, 101, 115, 18, 29, 169, 31, 22, 172,
- /* 360 */ 24, 25, 175, 176, 12, 13, 179, 180, 181, 145,
- /* 370 */ 177, 60, 177, 21, 38, 124, 125, 126, 127, 128,
- /* 380 */ 156, 29, 209, 31, 39, 198, 60, 194, 34, 194,
- /* 390 */ 79, 4, 40, 171, 172, 161, 68, 163, 211, 162,
- /* 400 */ 163, 151, 215, 169, 154, 79, 172, 96, 97, 98,
- /* 410 */ 176, 146, 60, 179, 180, 181, 182, 161, 203, 163,
- /* 420 */ 186, 187, 96, 97, 98, 169, 161, 61, 172, 113,
- /* 430 */ 114, 79, 176, 68, 68, 179, 180, 181, 182, 143,
- /* 440 */ 175, 115, 186, 187, 20, 178, 181, 23, 96, 97,
- /* 450 */ 98, 115, 19, 12, 13, 14, 191, 192, 193, 196,
- /* 460 */ 195, 133, 21, 198, 61, 21, 12, 13, 114, 36,
- /* 470 */ 29, 68, 31, 29, 131, 21, 211, 61, 163, 161,
- /* 480 */ 215, 163, 61, 29, 68, 31, 212, 169, 40, 68,
- /* 490 */ 172, 199, 139, 140, 176, 61, 31, 179, 180, 181,
- /* 500 */ 135, 60, 68, 116, 61, 1, 2, 12, 13, 146,
- /* 510 */ 161, 68, 163, 31, 60, 60, 21, 31, 169, 148,
- /* 520 */ 79, 172, 67, 79, 29, 176, 31, 31, 179, 180,
- /* 530 */ 181, 182, 146, 79, 216, 217, 187, 96, 97, 98,
- /* 540 */ 96, 97, 98, 174, 161, 161, 166, 163, 148, 101,
- /* 550 */ 96, 97, 98, 169, 146, 60, 172, 173, 148, 61,
- /* 560 */ 176, 175, 142, 179, 180, 181, 68, 161, 31, 163,
- /* 570 */ 61, 146, 142, 61, 79, 169, 61, 68, 172, 173,
- /* 580 */ 68, 174, 176, 68, 198, 179, 180, 181, 161, 161,
- /* 590 */ 163, 96, 97, 98, 31, 61, 169, 211, 145, 172,
- /* 600 */ 178, 215, 68, 176, 61, 19, 179, 180, 181, 61,
- /* 610 */ 161, 68, 163, 27, 0, 123, 68, 166, 169, 33,
- /* 620 */ 208, 172, 36, 122, 161, 176, 163, 170, 179, 180,
- /* 630 */ 181, 98, 169, 169, 208, 172, 173, 210, 161, 176,
- /* 640 */ 163, 170, 179, 180, 181, 59, 169, 169, 62, 172,
- /* 650 */ 173, 130, 161, 176, 163, 205, 179, 180, 181, 129,
- /* 660 */ 169, 202, 204, 172, 50, 118, 217, 176, 54, 201,
- /* 670 */ 179, 180, 181, 146, 88, 117, 90, 161, 161, 93,
- /* 680 */ 163, 114, 31, 69, 61, 177, 169, 112, 161, 172,
- /* 690 */ 134, 68, 161, 176, 163, 189, 179, 180, 181, 61,
- /* 700 */ 169, 214, 88, 172, 219, 132, 68, 176, 181, 138,
- /* 710 */ 179, 180, 181, 161, 60, 163, 213, 190, 191, 192,
- /* 720 */ 193, 169, 195, 185, 172, 170, 169, 161, 176, 163,
- /* 730 */ 169, 179, 180, 181, 170, 169, 91, 169, 172, 167,
- /* 740 */ 161, 161, 176, 163, 166, 179, 180, 181, 145, 169,
- /* 750 */ 154, 161, 172, 60, 157, 161, 176, 163, 146, 179,
- /* 760 */ 180, 181, 145, 169, 0, 147, 172, 142, 152, 161,
- /* 770 */ 176, 163, 152, 179, 180, 181, 147, 169, 0, 0,
- /* 780 */ 172, 0, 56, 161, 176, 163, 67, 179, 180, 181,
- /* 790 */ 0, 169, 0, 0, 172, 0, 0, 161, 176, 163,
- /* 800 */ 0, 179, 180, 181, 0, 169, 0, 0, 172, 34,
- /* 810 */ 0, 161, 176, 163, 41, 179, 180, 181, 0, 169,
- /* 820 */ 0, 34, 172, 29, 27, 161, 176, 163, 0, 179,
- /* 830 */ 180, 181, 0, 169, 0, 0, 172, 21, 0, 0,
- /* 840 */ 176, 0, 21, 179, 180, 181, 94, 0, 161, 60,
- /* 850 */ 163, 34, 89, 68, 146, 119, 169, 119, 60, 172,
- /* 860 */ 61, 60, 161, 176, 163, 60, 179, 180, 181, 161,
- /* 870 */ 169, 68, 29, 172, 61, 61, 19, 176, 113, 68,
- /* 880 */ 179, 180, 181, 61, 27, 60, 119, 68, 61, 181,
- /* 890 */ 33, 67, 61, 36, 68, 4, 2, 67, 61, 191,
- /* 900 */ 192, 193, 29, 195, 68, 29, 12, 13, 14, 15,
- /* 910 */ 16, 2, 67, 29, 68, 29, 59, 29, 29, 62,
- /* 920 */ 2, 12, 13, 14, 15, 16, 67, 61, 60, 12,
- /* 930 */ 13, 14, 15, 16, 101, 60, 92, 0, 61, 61,
- /* 940 */ 60, 60, 60, 89, 34, 60, 89, 21, 65, 29,
- /* 950 */ 93, 29, 60, 29, 67, 81, 61, 67, 60, 66,
- /* 960 */ 61, 60, 29, 61, 60, 29, 61, 60, 29, 61,
- /* 970 */ 21, 60, 60, 60, 29, 69, 29, 81, 61, 21,
- /* 980 */ 40, 81, 41, 29, 81, 29, 29, 21, 29, 29,
- /* 990 */ 29, 29, 29, 29, 29, 0, 29, 29, 29, 29,
- /* 1000 */ 29, 29, 29, 27, 0, 0, 29, 28, 34, 0,
- /* 1010 */ 21, 20, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1020 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1030 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1040 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1050 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1060 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1070 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1080 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1090 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1100 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1110 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1120 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1130 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1140 */ 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- /* 1150 */ 220, 220, 220,
+ /* 0 */ 0, 169, 169, 212, 213, 196, 174, 174, 199, 184,
+ /* 10 */ 182, 202, 183, 12, 13, 14, 15, 16, 0, 190,
+ /* 20 */ 169, 193, 190, 190, 162, 174, 164, 12, 13, 14,
+ /* 30 */ 15, 16, 181, 192, 163, 163, 195, 196, 209, 21,
+ /* 40 */ 20, 190, 24, 25, 26, 27, 28, 29, 30, 31,
+ /* 50 */ 32, 50, 52, 53, 54, 55, 56, 57, 58, 59,
+ /* 60 */ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ /* 70 */ 70, 200, 200, 12, 13, 74, 12, 13, 14, 15,
+ /* 80 */ 16, 20, 20, 22, 21, 84, 171, 24, 25, 26,
+ /* 90 */ 27, 28, 29, 30, 31, 32, 52, 183, 54, 171,
+ /* 100 */ 39, 57, 227, 188, 60, 191, 62, 183, 180, 65,
+ /* 110 */ 169, 50, 0, 189, 50, 240, 188, 20, 194, 244,
+ /* 120 */ 119, 120, 20, 122, 123, 124, 125, 126, 127, 128,
+ /* 130 */ 129, 130, 71, 49, 73, 73, 24, 25, 26, 27,
+ /* 140 */ 28, 29, 30, 31, 32, 163, 205, 113, 84, 90,
+ /* 150 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ /* 160 */ 99, 102, 103, 104, 105, 106, 107, 21, 227, 187,
+ /* 170 */ 155, 156, 20, 139, 140, 73, 121, 163, 117, 118,
+ /* 180 */ 34, 240, 200, 119, 120, 244, 122, 123, 124, 125,
+ /* 190 */ 126, 127, 128, 129, 130, 134, 134, 183, 143, 144,
+ /* 200 */ 145, 146, 147, 163, 190, 12, 13, 14, 15, 16,
+ /* 210 */ 196, 169, 169, 4, 200, 163, 174, 174, 20, 205,
+ /* 220 */ 172, 173, 208, 209, 210, 211, 160, 187, 30, 215,
+ /* 230 */ 216, 134, 190, 190, 169, 183, 163, 74, 40, 174,
+ /* 240 */ 200, 227, 190, 45, 169, 47, 181, 20, 196, 49,
+ /* 250 */ 183, 88, 200, 206, 240, 190, 176, 190, 244, 179,
+ /* 260 */ 208, 209, 210, 211, 66, 190, 183, 215, 216, 217,
+ /* 270 */ 223, 205, 189, 200, 76, 77, 209, 194, 163, 166,
+ /* 280 */ 167, 229, 12, 13, 14, 210, 169, 235, 236, 20,
+ /* 290 */ 20, 174, 22, 227, 219, 220, 221, 222, 183, 224,
+ /* 300 */ 175, 169, 14, 15, 16, 190, 240, 190, 183, 39,
+ /* 310 */ 244, 196, 168, 163, 116, 200, 191, 168, 132, 133,
+ /* 320 */ 50, 20, 190, 208, 209, 210, 211, 178, 0, 185,
+ /* 330 */ 215, 216, 217, 183, 185, 12, 13, 14, 15, 16,
+ /* 340 */ 190, 71, 210, 73, 135, 60, 196, 175, 163, 64,
+ /* 350 */ 200, 236, 220, 221, 222, 183, 224, 74, 208, 209,
+ /* 360 */ 210, 211, 175, 191, 134, 215, 216, 217, 183, 99,
+ /* 370 */ 183, 88, 86, 163, 89, 190, 226, 49, 191, 163,
+ /* 380 */ 183, 196, 12, 13, 115, 200, 189, 117, 118, 0,
+ /* 390 */ 20, 194, 22, 208, 209, 210, 211, 74, 169, 183,
+ /* 400 */ 215, 216, 217, 174, 1, 2, 190, 12, 13, 39,
+ /* 410 */ 200, 226, 196, 12, 13, 20, 200, 22, 163, 190,
+ /* 420 */ 50, 20, 196, 22, 208, 209, 210, 211, 202, 206,
+ /* 430 */ 22, 215, 216, 217, 39, 22, 163, 20, 183, 22,
+ /* 440 */ 39, 71, 226, 73, 184, 190, 223, 39, 184, 60,
+ /* 450 */ 183, 196, 39, 64, 163, 200, 163, 0, 41, 119,
+ /* 460 */ 205, 194, 3, 208, 209, 210, 71, 127, 73, 99,
+ /* 470 */ 130, 74, 71, 200, 73, 183, 183, 74, 89, 71,
+ /* 480 */ 73, 44, 227, 190, 163, 88, 194, 117, 118, 196,
+ /* 490 */ 163, 200, 85, 200, 99, 240, 163, 108, 109, 244,
+ /* 500 */ 99, 208, 209, 210, 211, 20, 49, 99, 215, 216,
+ /* 510 */ 183, 169, 117, 118, 12, 13, 14, 190, 117, 118,
+ /* 520 */ 163, 200, 20, 196, 22, 117, 118, 200, 14, 134,
+ /* 530 */ 163, 163, 190, 200, 20, 208, 209, 210, 211, 163,
+ /* 540 */ 163, 39, 215, 216, 163, 12, 13, 205, 158, 159,
+ /* 550 */ 163, 163, 210, 20, 163, 22, 163, 200, 79, 1,
+ /* 560 */ 2, 82, 220, 221, 222, 19, 224, 200, 200, 227,
+ /* 570 */ 133, 183, 39, 71, 163, 73, 200, 200, 190, 33,
+ /* 580 */ 184, 200, 240, 37, 196, 163, 244, 200, 200, 43,
+ /* 590 */ 163, 200, 46, 200, 163, 88, 208, 209, 210, 50,
+ /* 600 */ 115, 99, 163, 33, 71, 88, 73, 37, 206, 150,
+ /* 610 */ 183, 200, 184, 43, 164, 169, 46, 190, 72, 117,
+ /* 620 */ 118, 75, 200, 196, 173, 223, 79, 200, 163, 82,
+ /* 630 */ 247, 200, 99, 245, 246, 208, 209, 210, 211, 200,
+ /* 640 */ 0, 79, 72, 216, 82, 75, 79, 238, 183, 82,
+ /* 650 */ 117, 118, 163, 74, 108, 190, 0, 111, 232, 152,
+ /* 660 */ 114, 196, 22, 163, 18, 200, 0, 88, 203, 23,
+ /* 670 */ 121, 154, 183, 208, 209, 210, 193, 74, 22, 190,
+ /* 680 */ 110, 35, 36, 183, 114, 196, 163, 166, 22, 200,
+ /* 690 */ 190, 88, 203, 73, 48, 207, 196, 208, 209, 210,
+ /* 700 */ 200, 163, 225, 74, 74, 183, 183, 87, 208, 209,
+ /* 710 */ 210, 0, 74, 190, 241, 74, 163, 88, 88, 196,
+ /* 720 */ 228, 183, 204, 200, 169, 20, 88, 20, 190, 88,
+ /* 730 */ 171, 208, 209, 210, 196, 20, 183, 163, 200, 239,
+ /* 740 */ 190, 203, 197, 190, 74, 74, 208, 209, 210, 196,
+ /* 750 */ 20, 171, 163, 200, 169, 171, 203, 183, 88, 88,
+ /* 760 */ 20, 208, 209, 210, 190, 165, 183, 74, 163, 246,
+ /* 770 */ 196, 60, 183, 74, 200, 64, 74, 183, 74, 190,
+ /* 780 */ 134, 88, 208, 209, 210, 196, 169, 88, 183, 200,
+ /* 790 */ 88, 163, 88, 183, 74, 190, 163, 208, 209, 210,
+ /* 800 */ 89, 196, 183, 204, 183, 200, 183, 163, 88, 183,
+ /* 810 */ 183, 183, 163, 208, 209, 210, 183, 183, 190, 108,
+ /* 820 */ 109, 168, 183, 190, 196, 183, 165, 183, 200, 196,
+ /* 830 */ 20, 207, 183, 200, 190, 190, 208, 209, 210, 190,
+ /* 840 */ 196, 208, 209, 210, 200, 196, 237, 163, 197, 200,
+ /* 850 */ 163, 142, 208, 209, 210, 141, 201, 208, 209, 210,
+ /* 860 */ 118, 201, 200, 200, 137, 149, 234, 183, 237, 148,
+ /* 870 */ 183, 136, 133, 190, 190, 20, 233, 190, 231, 206,
+ /* 880 */ 196, 131, 230, 196, 200, 163, 218, 200, 157, 153,
+ /* 890 */ 73, 243, 208, 209, 210, 208, 209, 210, 248, 151,
+ /* 900 */ 163, 242, 214, 112, 201, 183, 200, 190, 200, 168,
+ /* 910 */ 198, 201, 190, 200, 190, 197, 163, 179, 196, 73,
+ /* 920 */ 183, 163, 200, 169, 169, 168, 165, 190, 177, 186,
+ /* 930 */ 208, 209, 210, 196, 170, 161, 183, 200, 0, 177,
+ /* 940 */ 0, 183, 0, 190, 190, 208, 209, 210, 190, 196,
+ /* 950 */ 0, 66, 163, 200, 196, 87, 0, 35, 200, 0,
+ /* 960 */ 0, 208, 209, 210, 210, 0, 208, 209, 210, 0,
+ /* 970 */ 0, 0, 183, 44, 220, 221, 222, 4, 224, 190,
+ /* 980 */ 0, 0, 60, 0, 0, 196, 64, 51, 0, 200,
+ /* 990 */ 0, 39, 19, 44, 37, 0, 0, 208, 209, 210,
+ /* 1000 */ 78, 0, 80, 81, 0, 83, 33, 84, 82, 22,
+ /* 1010 */ 37, 89, 0, 39, 39, 42, 39, 39, 39, 46,
+ /* 1020 */ 0, 52, 22, 54, 39, 39, 57, 0, 39, 60,
+ /* 1030 */ 22, 62, 40, 0, 65, 22, 39, 0, 22, 0,
+ /* 1040 */ 22, 20, 0, 0, 0, 72, 115, 44, 75, 73,
+ /* 1050 */ 88, 2, 88, 110, 138, 88, 74, 138, 39, 132,
+ /* 1060 */ 88, 12, 13, 14, 15, 16, 2, 74, 74, 4,
+ /* 1070 */ 138, 73, 73, 39, 39, 73, 12, 13, 14, 15,
+ /* 1080 */ 16, 74, 73, 2, 74, 74, 39, 39, 0, 39,
+ /* 1090 */ 39, 0, 87, 0, 88, 249, 74, 44, 74, 74,
+ /* 1100 */ 39, 87, 73, 88, 87, 73, 39, 39, 39, 39,
+ /* 1110 */ 74, 88, 121, 87, 73, 39, 85, 22, 73, 73,
+ /* 1120 */ 22, 22, 39, 39, 86, 73, 37, 87, 74, 73,
+ /* 1130 */ 73, 39, 74, 73, 44, 50, 74, 74, 51, 73,
+ /* 1140 */ 110, 113, 87, 39, 73, 39, 74, 73, 39, 39,
+ /* 1150 */ 39, 39, 73, 73, 39, 73, 22, 71, 39, 39,
+ /* 1160 */ 101, 39, 39, 39, 39, 39, 39, 89, 39, 39,
+ /* 1170 */ 38, 0, 0, 22, 101, 21, 101, 22, 101, 22,
+ /* 1180 */ 21, 20, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1190 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1200 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1210 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1220 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1230 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1240 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1250 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1260 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1270 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1280 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1290 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1300 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1310 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1320 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1330 */ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ /* 1340 */ 249, 249,
};
-#define YY_SHIFT_COUNT (332)
+#define YY_SHIFT_COUNT (413)
#define YY_SHIFT_MIN (0)
-#define YY_SHIFT_MAX (1009)
+#define YY_SHIFT_MAX (1172)
static const unsigned short int yy_shift_ofst[] = {
- /* 0 */ 336, 238, 311, 352, 352, 352, 352, 326, 352, 352,
- /* 10 */ 70, 454, 495, 441, 454, 454, 454, 454, 454, 454,
- /* 20 */ 454, 454, 454, 454, 454, 454, 454, 454, 454, 454,
- /* 30 */ 454, 454, 454, 161, 161, 161, 185, 444, 444, 83,
- /* 40 */ 83, 207, 141, 191, 191, 67, 201, 141, 83, 83,
- /* 50 */ 141, 83, 141, 141, 141, 83, 236, 0, 13, 13,
- /* 60 */ 444, 35, 214, 218, 218, 218, 345, 201, 141, 141,
- /* 70 */ 158, 78, 143, 82, 251, 151, 39, 239, 316, 354,
- /* 80 */ 316, 19, 343, 387, 465, 482, 207, 486, 496, 207,
- /* 90 */ 465, 207, 537, 465, 537, 482, 236, 486, 496, 563,
- /* 100 */ 492, 501, 533, 492, 501, 533, 521, 530, 547, 558,
- /* 110 */ 567, 486, 651, 575, 571, 556, 573, 654, 141, 501,
- /* 120 */ 533, 533, 501, 533, 645, 486, 496, 158, 236, 486,
- /* 130 */ 693, 465, 236, 537, 1012, 1012, 1012, 1012, 30, 89,
- /* 140 */ 586, 857, 894, 909, 917, 113, 113, 113, 113, 113,
- /* 150 */ 113, 113, 159, 614, 288, 219, 77, 77, 77, 77,
- /* 160 */ 424, 433, 366, 403, 416, 504, 353, 328, 365, 421,
- /* 170 */ 448, 434, 455, 443, 498, 509, 512, 515, 534, 543,
- /* 180 */ 548, 623, 638, 137, 764, 778, 779, 781, 726, 719,
- /* 190 */ 790, 792, 793, 795, 796, 800, 804, 806, 807, 775,
- /* 200 */ 810, 773, 818, 820, 794, 797, 787, 828, 832, 834,
- /* 210 */ 835, 816, 838, 821, 839, 841, 752, 847, 789, 817,
- /* 220 */ 763, 785, 803, 736, 799, 811, 813, 798, 801, 814,
- /* 230 */ 805, 822, 843, 819, 824, 825, 826, 738, 827, 831,
- /* 240 */ 830, 765, 836, 845, 837, 846, 767, 891, 873, 876,
- /* 250 */ 884, 886, 888, 889, 918, 833, 859, 866, 868, 875,
- /* 260 */ 877, 878, 880, 881, 844, 882, 937, 910, 854, 885,
- /* 270 */ 883, 887, 890, 926, 892, 893, 895, 920, 922, 898,
- /* 280 */ 899, 924, 901, 902, 933, 904, 905, 936, 907, 908,
- /* 290 */ 939, 911, 874, 896, 900, 903, 949, 906, 912, 913,
- /* 300 */ 945, 947, 958, 941, 940, 954, 956, 957, 959, 960,
- /* 310 */ 961, 962, 966, 963, 964, 965, 967, 968, 969, 970,
- /* 320 */ 971, 972, 995, 973, 976, 974, 1004, 977, 979, 1005,
- /* 330 */ 1009, 989, 991,
+ /* 0 */ 646, 61, 270, 370, 370, 370, 370, 395, 370, 370,
+ /* 10 */ 62, 401, 533, 502, 401, 401, 401, 401, 401, 401,
+ /* 20 */ 401, 401, 401, 401, 401, 401, 401, 401, 401, 401,
+ /* 30 */ 401, 401, 401, 102, 102, 102, 97, 20, 20, 408,
+ /* 40 */ 408, 20, 20, 84, 152, 227, 227, 230, 301, 152,
+ /* 50 */ 20, 20, 152, 20, 152, 301, 152, 152, 20, 200,
+ /* 60 */ 1, 64, 64, 63, 922, 408, 44, 408, 408, 408,
+ /* 70 */ 408, 408, 408, 408, 408, 408, 408, 408, 408, 408,
+ /* 80 */ 408, 408, 408, 408, 408, 408, 408, 417, 328, 269,
+ /* 90 */ 269, 269, 457, 301, 152, 152, 152, 286, 59, 59,
+ /* 100 */ 59, 59, 59, 18, 198, 969, 15, 55, 285, 34,
+ /* 110 */ 413, 485, 186, 437, 186, 514, 459, 209, 705, 707,
+ /* 120 */ 84, 715, 730, 84, 705, 84, 740, 152, 152, 152,
+ /* 130 */ 152, 152, 152, 152, 152, 152, 152, 152, 705, 740,
+ /* 140 */ 707, 200, 715, 730, 810, 709, 714, 742, 709, 714,
+ /* 150 */ 742, 716, 721, 727, 735, 739, 715, 855, 750, 731,
+ /* 160 */ 736, 748, 817, 152, 714, 742, 742, 714, 742, 791,
+ /* 170 */ 715, 730, 286, 200, 715, 846, 705, 200, 740, 1182,
+ /* 180 */ 1182, 1182, 1182, 0, 112, 546, 570, 973, 1049, 1064,
+ /* 190 */ 323, 389, 711, 193, 193, 193, 193, 193, 193, 193,
+ /* 200 */ 403, 340, 288, 288, 288, 288, 479, 547, 562, 567,
+ /* 210 */ 640, 656, 666, 146, 163, 283, 397, 558, 390, 507,
+ /* 220 */ 517, 579, 549, 603, 620, 629, 630, 638, 641, 670,
+ /* 230 */ 671, 693, 699, 702, 704, 720, 407, 938, 940, 942,
+ /* 240 */ 950, 885, 868, 956, 959, 960, 965, 970, 971, 980,
+ /* 250 */ 981, 983, 929, 984, 936, 988, 990, 952, 957, 949,
+ /* 260 */ 995, 996, 1001, 1004, 923, 926, 974, 975, 987, 1012,
+ /* 270 */ 977, 978, 979, 985, 986, 989, 1020, 1000, 1027, 1008,
+ /* 280 */ 992, 1033, 1013, 997, 1037, 1016, 1039, 1018, 1021, 1042,
+ /* 290 */ 1043, 931, 1044, 976, 1003, 943, 962, 964, 916, 982,
+ /* 300 */ 967, 993, 998, 999, 994, 1002, 1007, 1019, 972, 1005,
+ /* 310 */ 1009, 1006, 919, 1010, 1011, 1014, 927, 1015, 1017, 1022,
+ /* 320 */ 1023, 932, 1065, 1034, 1035, 1047, 1048, 1050, 1051, 1081,
+ /* 330 */ 991, 1026, 1024, 1029, 1032, 1025, 1036, 1041, 1045, 1028,
+ /* 340 */ 1046, 1088, 1053, 1030, 1052, 1031, 1040, 1055, 1056, 1038,
+ /* 350 */ 1054, 1061, 1067, 1057, 1058, 1068, 1060, 1062, 1069, 1066,
+ /* 360 */ 1063, 1070, 1071, 1072, 1076, 1074, 1059, 1073, 1075, 1077,
+ /* 370 */ 1095, 1078, 1079, 1080, 1082, 1083, 1084, 1098, 1087, 1085,
+ /* 380 */ 1086, 1099, 1104, 1106, 1109, 1110, 1111, 1112, 1115, 1134,
+ /* 390 */ 1119, 1120, 1122, 1123, 1124, 1125, 1126, 1129, 1130, 1091,
+ /* 400 */ 1092, 1089, 1090, 1093, 1127, 1132, 1171, 1172, 1151, 1154,
+ /* 410 */ 1155, 1157, 1159, 1161,
};
-#define YY_REDUCE_COUNT (137)
-#define YY_REDUCE_MIN (-162)
-#define YY_REDUCE_MAX (708)
+#define YY_REDUCE_COUNT (182)
+#define YY_REDUCE_MIN (-209)
+#define YY_REDUCE_MAX (789)
static const short yy_reduce_ofst[] = {
- /* 0 */ 90, 14, 54, -117, 76, 105, 134, 187, 234, 256,
- /* 10 */ 265, 318, 349, 384, 406, 427, 449, 463, 477, 491,
- /* 20 */ 517, 531, 552, 566, 580, 594, 608, 622, 636, 650,
- /* 30 */ 664, 687, 701, 527, -144, 708, 386, -158, -138, -142,
- /* 40 */ -140, -116, -155, -139, 7, -27, -114, -127, 59, 133,
- /* 50 */ 16, 150, 41, 144, 48, 180, -111, -17, -17, -17,
- /* 60 */ 107, 200, 160, 50, 193, 195, 224, 222, 237, -162,
- /* 70 */ 250, 116, 182, 119, 173, 215, 296, 267, 263, 263,
- /* 80 */ 263, 315, 274, 292, 363, 369, 371, 383, 380, 400,
- /* 90 */ 408, 410, 420, 425, 430, 407, 453, 428, 451, 422,
- /* 100 */ 412, 457, 464, 426, 471, 478, 450, 458, 459, 468,
- /* 110 */ 263, 516, 508, 506, 485, 487, 503, 538, 315, 555,
- /* 120 */ 557, 561, 564, 568, 572, 579, 578, 596, 603, 590,
- /* 130 */ 597, 612, 617, 625, 618, 616, 620, 629,
+ /* 0 */ 66, 14, 52, 115, 150, 185, 216, 255, 293, 327,
+ /* 10 */ 342, 388, 427, 465, 489, 500, 523, 538, 553, 574,
+ /* 20 */ 589, 605, 628, 633, 644, 649, 684, 687, 722, 737,
+ /* 30 */ 753, 758, 789, 75, 132, 754, -59, -149, 65, -18,
+ /* 40 */ 40, -168, -167, -72, -76, -171, 67, -125, -191, 125,
+ /* 50 */ 42, 43, 83, 117, 172, -159, 197, 187, 229, 149,
+ /* 60 */ -209, -209, -209, -138, -172, -129, 48, -128, 73, 210,
+ /* 70 */ 273, 291, 321, 333, 357, 367, 368, 376, 377, 381,
+ /* 80 */ 387, 391, 393, 411, 422, 431, 439, 113, -85, 47,
+ /* 90 */ 223, 402, 144, 226, -86, 267, 292, 80, -175, 260,
+ /* 100 */ 264, 396, 428, 450, 446, 451, 383, 409, 483, 426,
+ /* 110 */ 521, 488, 477, 477, 477, 522, 473, 492, 555, 518,
+ /* 120 */ 559, 550, 545, 580, 585, 584, 600, 583, 594, 610,
+ /* 130 */ 619, 621, 623, 626, 627, 634, 639, 642, 617, 661,
+ /* 140 */ 599, 653, 645, 651, 624, 609, 655, 662, 631, 660,
+ /* 150 */ 663, 632, 643, 647, 652, 477, 683, 673, 668, 650,
+ /* 160 */ 648, 659, 688, 522, 703, 706, 708, 710, 713, 712,
+ /* 170 */ 717, 718, 738, 741, 724, 743, 755, 757, 761, 751,
+ /* 180 */ 762, 764, 774,
};
static const YYACTIONTYPE yy_default[] = {
- /* 0 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 10 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 20 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 30 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 40 */ 756, 783, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 50 */ 756, 756, 756, 756, 756, 756, 781, 756, 933, 756,
- /* 60 */ 756, 756, 783, 944, 944, 944, 781, 756, 756, 756,
- /* 70 */ 846, 756, 756, 1008, 756, 968, 756, 960, 936, 950,
- /* 80 */ 937, 756, 993, 953, 756, 756, 783, 756, 756, 783,
- /* 90 */ 756, 783, 756, 756, 756, 756, 781, 756, 756, 756,
- /* 100 */ 975, 973, 756, 975, 973, 756, 987, 983, 966, 964,
- /* 110 */ 950, 756, 756, 756, 1011, 999, 995, 756, 756, 973,
- /* 120 */ 756, 756, 973, 756, 860, 756, 756, 756, 781, 756,
- /* 130 */ 815, 756, 781, 756, 784, 849, 849, 784, 756, 756,
- /* 140 */ 756, 756, 756, 756, 756, 905, 986, 985, 904, 910,
- /* 150 */ 909, 908, 756, 756, 756, 756, 899, 900, 898, 897,
- /* 160 */ 756, 756, 756, 756, 756, 934, 756, 996, 1000, 756,
- /* 170 */ 756, 756, 884, 756, 756, 756, 756, 756, 756, 756,
- /* 180 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 190 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 200 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 210 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 220 */ 756, 957, 967, 756, 756, 756, 756, 756, 756, 756,
- /* 230 */ 756, 756, 756, 756, 884, 756, 984, 756, 943, 939,
- /* 240 */ 756, 756, 935, 756, 756, 994, 756, 756, 756, 756,
- /* 250 */ 756, 756, 756, 756, 929, 756, 756, 756, 756, 756,
- /* 260 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 270 */ 756, 883, 756, 756, 756, 756, 756, 756, 756, 843,
- /* 280 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 290 */ 756, 756, 828, 826, 825, 824, 756, 821, 756, 756,
- /* 300 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 310 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 320 */ 756, 756, 756, 756, 756, 756, 756, 756, 756, 756,
- /* 330 */ 756, 756, 756,
+ /* 0 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 10 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 20 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 30 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 40 */ 947, 947, 947, 1004, 947, 947, 947, 947, 947, 947,
+ /* 50 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 1002,
+ /* 60 */ 947, 1185, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 70 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 80 */ 947, 947, 947, 947, 947, 947, 947, 947, 1004, 1196,
+ /* 90 */ 1196, 1196, 1002, 947, 947, 947, 947, 1089, 947, 947,
+ /* 100 */ 947, 947, 947, 947, 947, 947, 1260, 947, 1042, 1220,
+ /* 110 */ 947, 1212, 1188, 1202, 1189, 947, 1245, 1205, 947, 947,
+ /* 120 */ 1004, 947, 947, 1004, 947, 1004, 947, 947, 947, 947,
+ /* 130 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 140 */ 947, 1002, 947, 947, 947, 1227, 1225, 947, 1227, 1225,
+ /* 150 */ 947, 1239, 1235, 1218, 1216, 1202, 947, 947, 947, 1263,
+ /* 160 */ 1251, 1247, 947, 947, 1225, 947, 947, 1225, 947, 1112,
+ /* 170 */ 947, 947, 947, 1002, 947, 1058, 947, 1002, 947, 1092,
+ /* 180 */ 1092, 1005, 952, 947, 947, 947, 947, 947, 947, 947,
+ /* 190 */ 947, 947, 947, 1157, 1238, 1237, 1156, 1162, 1161, 1160,
+ /* 200 */ 947, 947, 1151, 1152, 1150, 1149, 947, 947, 947, 947,
+ /* 210 */ 947, 947, 947, 947, 947, 947, 947, 1186, 947, 1248,
+ /* 220 */ 1252, 947, 947, 947, 1136, 947, 947, 947, 947, 947,
+ /* 230 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 240 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 250 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 260 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 270 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 280 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 290 */ 947, 947, 947, 947, 947, 947, 1209, 1219, 947, 947,
+ /* 300 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 1136,
+ /* 310 */ 947, 1236, 947, 1195, 1191, 947, 947, 1187, 947, 947,
+ /* 320 */ 1246, 947, 947, 947, 947, 947, 947, 947, 947, 1181,
+ /* 330 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 340 */ 947, 947, 947, 947, 947, 947, 1135, 947, 947, 947,
+ /* 350 */ 947, 947, 947, 1086, 947, 947, 947, 947, 947, 947,
+ /* 360 */ 947, 947, 947, 947, 947, 947, 1071, 1069, 1068, 1067,
+ /* 370 */ 947, 1064, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 380 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 390 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 400 */ 947, 947, 947, 947, 947, 947, 947, 947, 947, 947,
+ /* 410 */ 947, 947, 947, 947,
};
/********** End of lemon-generated parsing tables *****************************/
@@ -647,207 +706,236 @@ static const char *const yyTokenName[] = {
/* 16 */ "NK_REM",
/* 17 */ "NK_CONCAT",
/* 18 */ "CREATE",
- /* 19 */ "USER",
- /* 20 */ "PASS",
- /* 21 */ "NK_STRING",
- /* 22 */ "ALTER",
- /* 23 */ "PRIVILEGE",
- /* 24 */ "DROP",
- /* 25 */ "SHOW",
- /* 26 */ "USERS",
- /* 27 */ "DNODE",
- /* 28 */ "PORT",
- /* 29 */ "NK_INTEGER",
- /* 30 */ "DNODES",
- /* 31 */ "NK_ID",
- /* 32 */ "NK_IPTOKEN",
- /* 33 */ "QNODE",
- /* 34 */ "ON",
- /* 35 */ "QNODES",
- /* 36 */ "DATABASE",
- /* 37 */ "DATABASES",
- /* 38 */ "USE",
- /* 39 */ "IF",
- /* 40 */ "NOT",
- /* 41 */ "EXISTS",
- /* 42 */ "BLOCKS",
- /* 43 */ "CACHE",
- /* 44 */ "CACHELAST",
- /* 45 */ "COMP",
- /* 46 */ "DAYS",
- /* 47 */ "FSYNC",
- /* 48 */ "MAXROWS",
- /* 49 */ "MINROWS",
- /* 50 */ "KEEP",
- /* 51 */ "PRECISION",
- /* 52 */ "QUORUM",
- /* 53 */ "REPLICA",
- /* 54 */ "TTL",
- /* 55 */ "WAL",
- /* 56 */ "VGROUPS",
- /* 57 */ "SINGLE_STABLE",
- /* 58 */ "STREAM_MODE",
- /* 59 */ "TABLE",
- /* 60 */ "NK_LP",
- /* 61 */ "NK_RP",
- /* 62 */ "STABLE",
- /* 63 */ "TABLES",
- /* 64 */ "STABLES",
- /* 65 */ "USING",
- /* 66 */ "TAGS",
- /* 67 */ "NK_DOT",
- /* 68 */ "NK_COMMA",
- /* 69 */ "COMMENT",
- /* 70 */ "BOOL",
- /* 71 */ "TINYINT",
- /* 72 */ "SMALLINT",
- /* 73 */ "INT",
- /* 74 */ "INTEGER",
- /* 75 */ "BIGINT",
- /* 76 */ "FLOAT",
- /* 77 */ "DOUBLE",
- /* 78 */ "BINARY",
- /* 79 */ "TIMESTAMP",
- /* 80 */ "NCHAR",
- /* 81 */ "UNSIGNED",
- /* 82 */ "JSON",
- /* 83 */ "VARCHAR",
- /* 84 */ "MEDIUMBLOB",
- /* 85 */ "BLOB",
- /* 86 */ "VARBINARY",
- /* 87 */ "DECIMAL",
- /* 88 */ "SMA",
- /* 89 */ "INDEX",
- /* 90 */ "FULLTEXT",
- /* 91 */ "FUNCTION",
- /* 92 */ "INTERVAL",
- /* 93 */ "TOPIC",
- /* 94 */ "AS",
- /* 95 */ "MNODES",
- /* 96 */ "NK_FLOAT",
- /* 97 */ "NK_BOOL",
- /* 98 */ "NK_VARIABLE",
- /* 99 */ "BETWEEN",
- /* 100 */ "IS",
- /* 101 */ "NULL",
- /* 102 */ "NK_LT",
- /* 103 */ "NK_GT",
- /* 104 */ "NK_LE",
- /* 105 */ "NK_GE",
- /* 106 */ "NK_NE",
- /* 107 */ "NK_EQ",
- /* 108 */ "LIKE",
- /* 109 */ "MATCH",
- /* 110 */ "NMATCH",
- /* 111 */ "IN",
- /* 112 */ "FROM",
- /* 113 */ "JOIN",
- /* 114 */ "INNER",
- /* 115 */ "SELECT",
- /* 116 */ "DISTINCT",
- /* 117 */ "WHERE",
- /* 118 */ "PARTITION",
- /* 119 */ "BY",
- /* 120 */ "SESSION",
- /* 121 */ "STATE_WINDOW",
- /* 122 */ "SLIDING",
- /* 123 */ "FILL",
- /* 124 */ "VALUE",
- /* 125 */ "NONE",
- /* 126 */ "PREV",
- /* 127 */ "LINEAR",
- /* 128 */ "NEXT",
- /* 129 */ "GROUP",
- /* 130 */ "HAVING",
- /* 131 */ "ORDER",
- /* 132 */ "SLIMIT",
- /* 133 */ "SOFFSET",
- /* 134 */ "LIMIT",
- /* 135 */ "OFFSET",
- /* 136 */ "ASC",
- /* 137 */ "DESC",
- /* 138 */ "NULLS",
- /* 139 */ "FIRST",
- /* 140 */ "LAST",
- /* 141 */ "cmd",
- /* 142 */ "user_name",
- /* 143 */ "dnode_endpoint",
- /* 144 */ "dnode_host_name",
- /* 145 */ "not_exists_opt",
- /* 146 */ "db_name",
- /* 147 */ "db_options",
- /* 148 */ "exists_opt",
- /* 149 */ "full_table_name",
- /* 150 */ "column_def_list",
- /* 151 */ "tags_def_opt",
- /* 152 */ "table_options",
- /* 153 */ "multi_create_clause",
- /* 154 */ "tags_def",
- /* 155 */ "multi_drop_clause",
- /* 156 */ "create_subtable_clause",
- /* 157 */ "specific_tags_opt",
- /* 158 */ "literal_list",
- /* 159 */ "drop_table_clause",
- /* 160 */ "col_name_list",
- /* 161 */ "table_name",
- /* 162 */ "column_def",
- /* 163 */ "column_name",
- /* 164 */ "type_name",
- /* 165 */ "col_name",
- /* 166 */ "index_name",
- /* 167 */ "index_options",
- /* 168 */ "func_list",
- /* 169 */ "duration_literal",
- /* 170 */ "sliding_opt",
- /* 171 */ "func",
- /* 172 */ "function_name",
- /* 173 */ "expression_list",
- /* 174 */ "topic_name",
- /* 175 */ "query_expression",
- /* 176 */ "literal",
- /* 177 */ "table_alias",
- /* 178 */ "column_alias",
- /* 179 */ "expression",
- /* 180 */ "column_reference",
- /* 181 */ "subquery",
- /* 182 */ "predicate",
- /* 183 */ "compare_op",
- /* 184 */ "in_op",
- /* 185 */ "in_predicate_value",
- /* 186 */ "boolean_value_expression",
- /* 187 */ "boolean_primary",
- /* 188 */ "common_expression",
- /* 189 */ "from_clause",
- /* 190 */ "table_reference_list",
- /* 191 */ "table_reference",
- /* 192 */ "table_primary",
- /* 193 */ "joined_table",
- /* 194 */ "alias_opt",
- /* 195 */ "parenthesized_joined_table",
- /* 196 */ "join_type",
- /* 197 */ "search_condition",
- /* 198 */ "query_specification",
- /* 199 */ "set_quantifier_opt",
- /* 200 */ "select_list",
- /* 201 */ "where_clause_opt",
- /* 202 */ "partition_by_clause_opt",
- /* 203 */ "twindow_clause_opt",
- /* 204 */ "group_by_clause_opt",
- /* 205 */ "having_clause_opt",
- /* 206 */ "select_sublist",
- /* 207 */ "select_item",
- /* 208 */ "fill_opt",
- /* 209 */ "fill_mode",
- /* 210 */ "group_by_list",
- /* 211 */ "query_expression_body",
- /* 212 */ "order_by_clause_opt",
- /* 213 */ "slimit_clause_opt",
- /* 214 */ "limit_clause_opt",
- /* 215 */ "query_primary",
- /* 216 */ "sort_specification_list",
- /* 217 */ "sort_specification",
- /* 218 */ "ordering_specification_opt",
- /* 219 */ "null_ordering_opt",
+ /* 19 */ "ACCOUNT",
+ /* 20 */ "NK_ID",
+ /* 21 */ "PASS",
+ /* 22 */ "NK_STRING",
+ /* 23 */ "ALTER",
+ /* 24 */ "PPS",
+ /* 25 */ "TSERIES",
+ /* 26 */ "STORAGE",
+ /* 27 */ "STREAMS",
+ /* 28 */ "QTIME",
+ /* 29 */ "DBS",
+ /* 30 */ "USERS",
+ /* 31 */ "CONNS",
+ /* 32 */ "STATE",
+ /* 33 */ "USER",
+ /* 34 */ "PRIVILEGE",
+ /* 35 */ "DROP",
+ /* 36 */ "SHOW",
+ /* 37 */ "DNODE",
+ /* 38 */ "PORT",
+ /* 39 */ "NK_INTEGER",
+ /* 40 */ "DNODES",
+ /* 41 */ "NK_IPTOKEN",
+ /* 42 */ "LOCAL",
+ /* 43 */ "QNODE",
+ /* 44 */ "ON",
+ /* 45 */ "QNODES",
+ /* 46 */ "DATABASE",
+ /* 47 */ "DATABASES",
+ /* 48 */ "USE",
+ /* 49 */ "IF",
+ /* 50 */ "NOT",
+ /* 51 */ "EXISTS",
+ /* 52 */ "BLOCKS",
+ /* 53 */ "CACHE",
+ /* 54 */ "CACHELAST",
+ /* 55 */ "COMP",
+ /* 56 */ "DAYS",
+ /* 57 */ "FSYNC",
+ /* 58 */ "MAXROWS",
+ /* 59 */ "MINROWS",
+ /* 60 */ "KEEP",
+ /* 61 */ "PRECISION",
+ /* 62 */ "QUORUM",
+ /* 63 */ "REPLICA",
+ /* 64 */ "TTL",
+ /* 65 */ "WAL",
+ /* 66 */ "VGROUPS",
+ /* 67 */ "SINGLE_STABLE",
+ /* 68 */ "STREAM_MODE",
+ /* 69 */ "RETENTIONS",
+ /* 70 */ "FILE_FACTOR",
+ /* 71 */ "NK_FLOAT",
+ /* 72 */ "TABLE",
+ /* 73 */ "NK_LP",
+ /* 74 */ "NK_RP",
+ /* 75 */ "STABLE",
+ /* 76 */ "TABLES",
+ /* 77 */ "STABLES",
+ /* 78 */ "ADD",
+ /* 79 */ "COLUMN",
+ /* 80 */ "MODIFY",
+ /* 81 */ "RENAME",
+ /* 82 */ "TAG",
+ /* 83 */ "SET",
+ /* 84 */ "NK_EQ",
+ /* 85 */ "USING",
+ /* 86 */ "TAGS",
+ /* 87 */ "NK_DOT",
+ /* 88 */ "NK_COMMA",
+ /* 89 */ "COMMENT",
+ /* 90 */ "BOOL",
+ /* 91 */ "TINYINT",
+ /* 92 */ "SMALLINT",
+ /* 93 */ "INT",
+ /* 94 */ "INTEGER",
+ /* 95 */ "BIGINT",
+ /* 96 */ "FLOAT",
+ /* 97 */ "DOUBLE",
+ /* 98 */ "BINARY",
+ /* 99 */ "TIMESTAMP",
+ /* 100 */ "NCHAR",
+ /* 101 */ "UNSIGNED",
+ /* 102 */ "JSON",
+ /* 103 */ "VARCHAR",
+ /* 104 */ "MEDIUMBLOB",
+ /* 105 */ "BLOB",
+ /* 106 */ "VARBINARY",
+ /* 107 */ "DECIMAL",
+ /* 108 */ "SMA",
+ /* 109 */ "ROLLUP",
+ /* 110 */ "INDEX",
+ /* 111 */ "FULLTEXT",
+ /* 112 */ "FUNCTION",
+ /* 113 */ "INTERVAL",
+ /* 114 */ "TOPIC",
+ /* 115 */ "AS",
+ /* 116 */ "MNODES",
+ /* 117 */ "NK_BOOL",
+ /* 118 */ "NK_VARIABLE",
+ /* 119 */ "BETWEEN",
+ /* 120 */ "IS",
+ /* 121 */ "NULL",
+ /* 122 */ "NK_LT",
+ /* 123 */ "NK_GT",
+ /* 124 */ "NK_LE",
+ /* 125 */ "NK_GE",
+ /* 126 */ "NK_NE",
+ /* 127 */ "LIKE",
+ /* 128 */ "MATCH",
+ /* 129 */ "NMATCH",
+ /* 130 */ "IN",
+ /* 131 */ "FROM",
+ /* 132 */ "JOIN",
+ /* 133 */ "INNER",
+ /* 134 */ "SELECT",
+ /* 135 */ "DISTINCT",
+ /* 136 */ "WHERE",
+ /* 137 */ "PARTITION",
+ /* 138 */ "BY",
+ /* 139 */ "SESSION",
+ /* 140 */ "STATE_WINDOW",
+ /* 141 */ "SLIDING",
+ /* 142 */ "FILL",
+ /* 143 */ "VALUE",
+ /* 144 */ "NONE",
+ /* 145 */ "PREV",
+ /* 146 */ "LINEAR",
+ /* 147 */ "NEXT",
+ /* 148 */ "GROUP",
+ /* 149 */ "HAVING",
+ /* 150 */ "ORDER",
+ /* 151 */ "SLIMIT",
+ /* 152 */ "SOFFSET",
+ /* 153 */ "LIMIT",
+ /* 154 */ "OFFSET",
+ /* 155 */ "ASC",
+ /* 156 */ "DESC",
+ /* 157 */ "NULLS",
+ /* 158 */ "FIRST",
+ /* 159 */ "LAST",
+ /* 160 */ "cmd",
+ /* 161 */ "account_options",
+ /* 162 */ "alter_account_options",
+ /* 163 */ "literal",
+ /* 164 */ "alter_account_option",
+ /* 165 */ "user_name",
+ /* 166 */ "dnode_endpoint",
+ /* 167 */ "dnode_host_name",
+ /* 168 */ "not_exists_opt",
+ /* 169 */ "db_name",
+ /* 170 */ "db_options",
+ /* 171 */ "exists_opt",
+ /* 172 */ "alter_db_options",
+ /* 173 */ "alter_db_option",
+ /* 174 */ "full_table_name",
+ /* 175 */ "column_def_list",
+ /* 176 */ "tags_def_opt",
+ /* 177 */ "table_options",
+ /* 178 */ "multi_create_clause",
+ /* 179 */ "tags_def",
+ /* 180 */ "multi_drop_clause",
+ /* 181 */ "alter_table_clause",
+ /* 182 */ "alter_table_options",
+ /* 183 */ "column_name",
+ /* 184 */ "type_name",
+ /* 185 */ "create_subtable_clause",
+ /* 186 */ "specific_tags_opt",
+ /* 187 */ "literal_list",
+ /* 188 */ "drop_table_clause",
+ /* 189 */ "col_name_list",
+ /* 190 */ "table_name",
+ /* 191 */ "column_def",
+ /* 192 */ "func_name_list",
+ /* 193 */ "alter_table_option",
+ /* 194 */ "col_name",
+ /* 195 */ "func_name",
+ /* 196 */ "function_name",
+ /* 197 */ "index_name",
+ /* 198 */ "index_options",
+ /* 199 */ "func_list",
+ /* 200 */ "duration_literal",
+ /* 201 */ "sliding_opt",
+ /* 202 */ "func",
+ /* 203 */ "expression_list",
+ /* 204 */ "topic_name",
+ /* 205 */ "query_expression",
+ /* 206 */ "table_alias",
+ /* 207 */ "column_alias",
+ /* 208 */ "expression",
+ /* 209 */ "column_reference",
+ /* 210 */ "subquery",
+ /* 211 */ "predicate",
+ /* 212 */ "compare_op",
+ /* 213 */ "in_op",
+ /* 214 */ "in_predicate_value",
+ /* 215 */ "boolean_value_expression",
+ /* 216 */ "boolean_primary",
+ /* 217 */ "common_expression",
+ /* 218 */ "from_clause",
+ /* 219 */ "table_reference_list",
+ /* 220 */ "table_reference",
+ /* 221 */ "table_primary",
+ /* 222 */ "joined_table",
+ /* 223 */ "alias_opt",
+ /* 224 */ "parenthesized_joined_table",
+ /* 225 */ "join_type",
+ /* 226 */ "search_condition",
+ /* 227 */ "query_specification",
+ /* 228 */ "set_quantifier_opt",
+ /* 229 */ "select_list",
+ /* 230 */ "where_clause_opt",
+ /* 231 */ "partition_by_clause_opt",
+ /* 232 */ "twindow_clause_opt",
+ /* 233 */ "group_by_clause_opt",
+ /* 234 */ "having_clause_opt",
+ /* 235 */ "select_sublist",
+ /* 236 */ "select_item",
+ /* 237 */ "fill_opt",
+ /* 238 */ "fill_mode",
+ /* 239 */ "group_by_list",
+ /* 240 */ "query_expression_body",
+ /* 241 */ "order_by_clause_opt",
+ /* 242 */ "slimit_clause_opt",
+ /* 243 */ "limit_clause_opt",
+ /* 244 */ "query_primary",
+ /* 245 */ "sort_specification_list",
+ /* 246 */ "sort_specification",
+ /* 247 */ "ordering_specification_opt",
+ /* 248 */ "null_ordering_opt",
};
#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
@@ -855,261 +943,322 @@ static const char *const yyTokenName[] = {
/* For tracing reduce actions, the names of all rules are required.
*/
static const char *const yyRuleName[] = {
- /* 0 */ "cmd ::= CREATE USER user_name PASS NK_STRING",
- /* 1 */ "cmd ::= ALTER USER user_name PASS NK_STRING",
- /* 2 */ "cmd ::= ALTER USER user_name PRIVILEGE NK_STRING",
- /* 3 */ "cmd ::= DROP USER user_name",
- /* 4 */ "cmd ::= SHOW USERS",
- /* 5 */ "cmd ::= CREATE DNODE dnode_endpoint",
- /* 6 */ "cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER",
- /* 7 */ "cmd ::= DROP DNODE NK_INTEGER",
- /* 8 */ "cmd ::= DROP DNODE dnode_endpoint",
- /* 9 */ "cmd ::= SHOW DNODES",
- /* 10 */ "dnode_endpoint ::= NK_STRING",
- /* 11 */ "dnode_host_name ::= NK_ID",
- /* 12 */ "dnode_host_name ::= NK_IPTOKEN",
- /* 13 */ "cmd ::= CREATE QNODE ON DNODE NK_INTEGER",
- /* 14 */ "cmd ::= DROP QNODE ON DNODE NK_INTEGER",
- /* 15 */ "cmd ::= SHOW QNODES",
- /* 16 */ "cmd ::= CREATE DATABASE not_exists_opt db_name db_options",
- /* 17 */ "cmd ::= DROP DATABASE exists_opt db_name",
- /* 18 */ "cmd ::= SHOW DATABASES",
- /* 19 */ "cmd ::= USE db_name",
- /* 20 */ "cmd ::= ALTER DATABASE db_name db_options",
- /* 21 */ "not_exists_opt ::= IF NOT EXISTS",
- /* 22 */ "not_exists_opt ::=",
- /* 23 */ "exists_opt ::= IF EXISTS",
- /* 24 */ "exists_opt ::=",
- /* 25 */ "db_options ::=",
- /* 26 */ "db_options ::= db_options BLOCKS NK_INTEGER",
- /* 27 */ "db_options ::= db_options CACHE NK_INTEGER",
- /* 28 */ "db_options ::= db_options CACHELAST NK_INTEGER",
- /* 29 */ "db_options ::= db_options COMP NK_INTEGER",
- /* 30 */ "db_options ::= db_options DAYS NK_INTEGER",
- /* 31 */ "db_options ::= db_options FSYNC NK_INTEGER",
- /* 32 */ "db_options ::= db_options MAXROWS NK_INTEGER",
- /* 33 */ "db_options ::= db_options MINROWS NK_INTEGER",
- /* 34 */ "db_options ::= db_options KEEP NK_INTEGER",
- /* 35 */ "db_options ::= db_options PRECISION NK_STRING",
- /* 36 */ "db_options ::= db_options QUORUM NK_INTEGER",
- /* 37 */ "db_options ::= db_options REPLICA NK_INTEGER",
- /* 38 */ "db_options ::= db_options TTL NK_INTEGER",
- /* 39 */ "db_options ::= db_options WAL NK_INTEGER",
- /* 40 */ "db_options ::= db_options VGROUPS NK_INTEGER",
- /* 41 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER",
- /* 42 */ "db_options ::= db_options STREAM_MODE NK_INTEGER",
- /* 43 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options",
- /* 44 */ "cmd ::= CREATE TABLE multi_create_clause",
- /* 45 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options",
- /* 46 */ "cmd ::= DROP TABLE multi_drop_clause",
- /* 47 */ "cmd ::= DROP STABLE exists_opt full_table_name",
- /* 48 */ "cmd ::= SHOW TABLES",
- /* 49 */ "cmd ::= SHOW STABLES",
- /* 50 */ "multi_create_clause ::= create_subtable_clause",
- /* 51 */ "multi_create_clause ::= multi_create_clause create_subtable_clause",
- /* 52 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP",
- /* 53 */ "multi_drop_clause ::= drop_table_clause",
- /* 54 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause",
- /* 55 */ "drop_table_clause ::= exists_opt full_table_name",
- /* 56 */ "specific_tags_opt ::=",
- /* 57 */ "specific_tags_opt ::= NK_LP col_name_list NK_RP",
- /* 58 */ "full_table_name ::= table_name",
- /* 59 */ "full_table_name ::= db_name NK_DOT table_name",
- /* 60 */ "column_def_list ::= column_def",
- /* 61 */ "column_def_list ::= column_def_list NK_COMMA column_def",
- /* 62 */ "column_def ::= column_name type_name",
- /* 63 */ "column_def ::= column_name type_name COMMENT NK_STRING",
- /* 64 */ "type_name ::= BOOL",
- /* 65 */ "type_name ::= TINYINT",
- /* 66 */ "type_name ::= SMALLINT",
- /* 67 */ "type_name ::= INT",
- /* 68 */ "type_name ::= INTEGER",
- /* 69 */ "type_name ::= BIGINT",
- /* 70 */ "type_name ::= FLOAT",
- /* 71 */ "type_name ::= DOUBLE",
- /* 72 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP",
- /* 73 */ "type_name ::= TIMESTAMP",
- /* 74 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP",
- /* 75 */ "type_name ::= TINYINT UNSIGNED",
- /* 76 */ "type_name ::= SMALLINT UNSIGNED",
- /* 77 */ "type_name ::= INT UNSIGNED",
- /* 78 */ "type_name ::= BIGINT UNSIGNED",
- /* 79 */ "type_name ::= JSON",
- /* 80 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP",
- /* 81 */ "type_name ::= MEDIUMBLOB",
- /* 82 */ "type_name ::= BLOB",
- /* 83 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP",
- /* 84 */ "type_name ::= DECIMAL",
- /* 85 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP",
- /* 86 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP",
- /* 87 */ "tags_def_opt ::=",
- /* 88 */ "tags_def_opt ::= tags_def",
- /* 89 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP",
- /* 90 */ "table_options ::=",
- /* 91 */ "table_options ::= table_options COMMENT NK_STRING",
- /* 92 */ "table_options ::= table_options KEEP NK_INTEGER",
- /* 93 */ "table_options ::= table_options TTL NK_INTEGER",
- /* 94 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP",
- /* 95 */ "col_name_list ::= col_name",
- /* 96 */ "col_name_list ::= col_name_list NK_COMMA col_name",
- /* 97 */ "col_name ::= column_name",
- /* 98 */ "cmd ::= CREATE SMA INDEX index_name ON table_name index_options",
- /* 99 */ "cmd ::= CREATE FULLTEXT INDEX index_name ON table_name NK_LP col_name_list NK_RP",
- /* 100 */ "cmd ::= DROP INDEX index_name ON table_name",
- /* 101 */ "index_options ::=",
- /* 102 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt",
- /* 103 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt",
- /* 104 */ "func_list ::= func",
- /* 105 */ "func_list ::= func_list NK_COMMA func",
- /* 106 */ "func ::= function_name NK_LP expression_list NK_RP",
- /* 107 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression",
- /* 108 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name",
- /* 109 */ "cmd ::= DROP TOPIC exists_opt topic_name",
- /* 110 */ "cmd ::= SHOW VGROUPS",
- /* 111 */ "cmd ::= SHOW db_name NK_DOT VGROUPS",
- /* 112 */ "cmd ::= SHOW MNODES",
- /* 113 */ "cmd ::= query_expression",
- /* 114 */ "literal ::= NK_INTEGER",
- /* 115 */ "literal ::= NK_FLOAT",
- /* 116 */ "literal ::= NK_STRING",
- /* 117 */ "literal ::= NK_BOOL",
- /* 118 */ "literal ::= TIMESTAMP NK_STRING",
- /* 119 */ "literal ::= duration_literal",
- /* 120 */ "duration_literal ::= NK_VARIABLE",
- /* 121 */ "literal_list ::= literal",
- /* 122 */ "literal_list ::= literal_list NK_COMMA literal",
- /* 123 */ "db_name ::= NK_ID",
- /* 124 */ "table_name ::= NK_ID",
- /* 125 */ "column_name ::= NK_ID",
- /* 126 */ "function_name ::= NK_ID",
- /* 127 */ "table_alias ::= NK_ID",
- /* 128 */ "column_alias ::= NK_ID",
- /* 129 */ "user_name ::= NK_ID",
- /* 130 */ "index_name ::= NK_ID",
- /* 131 */ "topic_name ::= NK_ID",
- /* 132 */ "expression ::= literal",
- /* 133 */ "expression ::= column_reference",
- /* 134 */ "expression ::= function_name NK_LP expression_list NK_RP",
- /* 135 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
- /* 136 */ "expression ::= subquery",
- /* 137 */ "expression ::= NK_LP expression NK_RP",
- /* 138 */ "expression ::= NK_PLUS expression",
- /* 139 */ "expression ::= NK_MINUS expression",
- /* 140 */ "expression ::= expression NK_PLUS expression",
- /* 141 */ "expression ::= expression NK_MINUS expression",
- /* 142 */ "expression ::= expression NK_STAR expression",
- /* 143 */ "expression ::= expression NK_SLASH expression",
- /* 144 */ "expression ::= expression NK_REM expression",
- /* 145 */ "expression_list ::= expression",
- /* 146 */ "expression_list ::= expression_list NK_COMMA expression",
- /* 147 */ "column_reference ::= column_name",
- /* 148 */ "column_reference ::= table_name NK_DOT column_name",
- /* 149 */ "predicate ::= expression compare_op expression",
- /* 150 */ "predicate ::= expression BETWEEN expression AND expression",
- /* 151 */ "predicate ::= expression NOT BETWEEN expression AND expression",
- /* 152 */ "predicate ::= expression IS NULL",
- /* 153 */ "predicate ::= expression IS NOT NULL",
- /* 154 */ "predicate ::= expression in_op in_predicate_value",
- /* 155 */ "compare_op ::= NK_LT",
- /* 156 */ "compare_op ::= NK_GT",
- /* 157 */ "compare_op ::= NK_LE",
- /* 158 */ "compare_op ::= NK_GE",
- /* 159 */ "compare_op ::= NK_NE",
- /* 160 */ "compare_op ::= NK_EQ",
- /* 161 */ "compare_op ::= LIKE",
- /* 162 */ "compare_op ::= NOT LIKE",
- /* 163 */ "compare_op ::= MATCH",
- /* 164 */ "compare_op ::= NMATCH",
- /* 165 */ "in_op ::= IN",
- /* 166 */ "in_op ::= NOT IN",
- /* 167 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
- /* 168 */ "boolean_value_expression ::= boolean_primary",
- /* 169 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 170 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 171 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 172 */ "boolean_primary ::= predicate",
- /* 173 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 174 */ "common_expression ::= expression",
- /* 175 */ "common_expression ::= boolean_value_expression",
- /* 176 */ "from_clause ::= FROM table_reference_list",
- /* 177 */ "table_reference_list ::= table_reference",
- /* 178 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 179 */ "table_reference ::= table_primary",
- /* 180 */ "table_reference ::= joined_table",
- /* 181 */ "table_primary ::= table_name alias_opt",
- /* 182 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 183 */ "table_primary ::= subquery alias_opt",
- /* 184 */ "table_primary ::= parenthesized_joined_table",
- /* 185 */ "alias_opt ::=",
- /* 186 */ "alias_opt ::= table_alias",
- /* 187 */ "alias_opt ::= AS table_alias",
- /* 188 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 189 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 190 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 191 */ "join_type ::=",
- /* 192 */ "join_type ::= INNER",
- /* 193 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
- /* 194 */ "set_quantifier_opt ::=",
- /* 195 */ "set_quantifier_opt ::= DISTINCT",
- /* 196 */ "set_quantifier_opt ::= ALL",
- /* 197 */ "select_list ::= NK_STAR",
- /* 198 */ "select_list ::= select_sublist",
- /* 199 */ "select_sublist ::= select_item",
- /* 200 */ "select_sublist ::= select_sublist NK_COMMA select_item",
- /* 201 */ "select_item ::= common_expression",
- /* 202 */ "select_item ::= common_expression column_alias",
- /* 203 */ "select_item ::= common_expression AS column_alias",
- /* 204 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 205 */ "where_clause_opt ::=",
- /* 206 */ "where_clause_opt ::= WHERE search_condition",
- /* 207 */ "partition_by_clause_opt ::=",
- /* 208 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
- /* 209 */ "twindow_clause_opt ::=",
- /* 210 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP",
- /* 211 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP",
- /* 212 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
- /* 213 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
- /* 214 */ "sliding_opt ::=",
- /* 215 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
- /* 216 */ "fill_opt ::=",
- /* 217 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 218 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
- /* 219 */ "fill_mode ::= NONE",
- /* 220 */ "fill_mode ::= PREV",
- /* 221 */ "fill_mode ::= NULL",
- /* 222 */ "fill_mode ::= LINEAR",
- /* 223 */ "fill_mode ::= NEXT",
- /* 224 */ "group_by_clause_opt ::=",
- /* 225 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 226 */ "group_by_list ::= expression",
- /* 227 */ "group_by_list ::= group_by_list NK_COMMA expression",
- /* 228 */ "having_clause_opt ::=",
- /* 229 */ "having_clause_opt ::= HAVING search_condition",
- /* 230 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 231 */ "query_expression_body ::= query_primary",
- /* 232 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
- /* 233 */ "query_primary ::= query_specification",
- /* 234 */ "order_by_clause_opt ::=",
- /* 235 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 236 */ "slimit_clause_opt ::=",
- /* 237 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 238 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 239 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 240 */ "limit_clause_opt ::=",
- /* 241 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 242 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 243 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 244 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 245 */ "search_condition ::= common_expression",
- /* 246 */ "sort_specification_list ::= sort_specification",
- /* 247 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 248 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
- /* 249 */ "ordering_specification_opt ::=",
- /* 250 */ "ordering_specification_opt ::= ASC",
- /* 251 */ "ordering_specification_opt ::= DESC",
- /* 252 */ "null_ordering_opt ::=",
- /* 253 */ "null_ordering_opt ::= NULLS FIRST",
- /* 254 */ "null_ordering_opt ::= NULLS LAST",
+ /* 0 */ "cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options",
+ /* 1 */ "cmd ::= ALTER ACCOUNT NK_ID alter_account_options",
+ /* 2 */ "account_options ::=",
+ /* 3 */ "account_options ::= account_options PPS literal",
+ /* 4 */ "account_options ::= account_options TSERIES literal",
+ /* 5 */ "account_options ::= account_options STORAGE literal",
+ /* 6 */ "account_options ::= account_options STREAMS literal",
+ /* 7 */ "account_options ::= account_options QTIME literal",
+ /* 8 */ "account_options ::= account_options DBS literal",
+ /* 9 */ "account_options ::= account_options USERS literal",
+ /* 10 */ "account_options ::= account_options CONNS literal",
+ /* 11 */ "account_options ::= account_options STATE literal",
+ /* 12 */ "alter_account_options ::= alter_account_option",
+ /* 13 */ "alter_account_options ::= alter_account_options alter_account_option",
+ /* 14 */ "alter_account_option ::= PASS literal",
+ /* 15 */ "alter_account_option ::= PPS literal",
+ /* 16 */ "alter_account_option ::= TSERIES literal",
+ /* 17 */ "alter_account_option ::= STORAGE literal",
+ /* 18 */ "alter_account_option ::= STREAMS literal",
+ /* 19 */ "alter_account_option ::= QTIME literal",
+ /* 20 */ "alter_account_option ::= DBS literal",
+ /* 21 */ "alter_account_option ::= USERS literal",
+ /* 22 */ "alter_account_option ::= CONNS literal",
+ /* 23 */ "alter_account_option ::= STATE literal",
+ /* 24 */ "cmd ::= CREATE USER user_name PASS NK_STRING",
+ /* 25 */ "cmd ::= ALTER USER user_name PASS NK_STRING",
+ /* 26 */ "cmd ::= ALTER USER user_name PRIVILEGE NK_STRING",
+ /* 27 */ "cmd ::= DROP USER user_name",
+ /* 28 */ "cmd ::= SHOW USERS",
+ /* 29 */ "cmd ::= CREATE DNODE dnode_endpoint",
+ /* 30 */ "cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER",
+ /* 31 */ "cmd ::= DROP DNODE NK_INTEGER",
+ /* 32 */ "cmd ::= DROP DNODE dnode_endpoint",
+ /* 33 */ "cmd ::= SHOW DNODES",
+ /* 34 */ "cmd ::= ALTER DNODE NK_INTEGER NK_STRING",
+ /* 35 */ "cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING",
+ /* 36 */ "cmd ::= ALTER ALL DNODES NK_STRING",
+ /* 37 */ "cmd ::= ALTER ALL DNODES NK_STRING NK_STRING",
+ /* 38 */ "dnode_endpoint ::= NK_STRING",
+ /* 39 */ "dnode_host_name ::= NK_ID",
+ /* 40 */ "dnode_host_name ::= NK_IPTOKEN",
+ /* 41 */ "cmd ::= ALTER LOCAL NK_STRING",
+ /* 42 */ "cmd ::= ALTER LOCAL NK_STRING NK_STRING",
+ /* 43 */ "cmd ::= CREATE QNODE ON DNODE NK_INTEGER",
+ /* 44 */ "cmd ::= DROP QNODE ON DNODE NK_INTEGER",
+ /* 45 */ "cmd ::= SHOW QNODES",
+ /* 46 */ "cmd ::= CREATE DATABASE not_exists_opt db_name db_options",
+ /* 47 */ "cmd ::= DROP DATABASE exists_opt db_name",
+ /* 48 */ "cmd ::= SHOW DATABASES",
+ /* 49 */ "cmd ::= USE db_name",
+ /* 50 */ "cmd ::= ALTER DATABASE db_name alter_db_options",
+ /* 51 */ "not_exists_opt ::= IF NOT EXISTS",
+ /* 52 */ "not_exists_opt ::=",
+ /* 53 */ "exists_opt ::= IF EXISTS",
+ /* 54 */ "exists_opt ::=",
+ /* 55 */ "db_options ::=",
+ /* 56 */ "db_options ::= db_options BLOCKS NK_INTEGER",
+ /* 57 */ "db_options ::= db_options CACHE NK_INTEGER",
+ /* 58 */ "db_options ::= db_options CACHELAST NK_INTEGER",
+ /* 59 */ "db_options ::= db_options COMP NK_INTEGER",
+ /* 60 */ "db_options ::= db_options DAYS NK_INTEGER",
+ /* 61 */ "db_options ::= db_options FSYNC NK_INTEGER",
+ /* 62 */ "db_options ::= db_options MAXROWS NK_INTEGER",
+ /* 63 */ "db_options ::= db_options MINROWS NK_INTEGER",
+ /* 64 */ "db_options ::= db_options KEEP NK_INTEGER",
+ /* 65 */ "db_options ::= db_options PRECISION NK_STRING",
+ /* 66 */ "db_options ::= db_options QUORUM NK_INTEGER",
+ /* 67 */ "db_options ::= db_options REPLICA NK_INTEGER",
+ /* 68 */ "db_options ::= db_options TTL NK_INTEGER",
+ /* 69 */ "db_options ::= db_options WAL NK_INTEGER",
+ /* 70 */ "db_options ::= db_options VGROUPS NK_INTEGER",
+ /* 71 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER",
+ /* 72 */ "db_options ::= db_options STREAM_MODE NK_INTEGER",
+ /* 73 */ "db_options ::= db_options RETENTIONS NK_STRING",
+ /* 74 */ "db_options ::= db_options FILE_FACTOR NK_FLOAT",
+ /* 75 */ "alter_db_options ::= alter_db_option",
+ /* 76 */ "alter_db_options ::= alter_db_options alter_db_option",
+ /* 77 */ "alter_db_option ::= BLOCKS NK_INTEGER",
+ /* 78 */ "alter_db_option ::= FSYNC NK_INTEGER",
+ /* 79 */ "alter_db_option ::= KEEP NK_INTEGER",
+ /* 80 */ "alter_db_option ::= WAL NK_INTEGER",
+ /* 81 */ "alter_db_option ::= QUORUM NK_INTEGER",
+ /* 82 */ "alter_db_option ::= CACHELAST NK_INTEGER",
+ /* 83 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options",
+ /* 84 */ "cmd ::= CREATE TABLE multi_create_clause",
+ /* 85 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options",
+ /* 86 */ "cmd ::= DROP TABLE multi_drop_clause",
+ /* 87 */ "cmd ::= DROP STABLE exists_opt full_table_name",
+ /* 88 */ "cmd ::= SHOW TABLES",
+ /* 89 */ "cmd ::= SHOW STABLES",
+ /* 90 */ "cmd ::= ALTER TABLE alter_table_clause",
+ /* 91 */ "cmd ::= ALTER STABLE alter_table_clause",
+ /* 92 */ "alter_table_clause ::= full_table_name alter_table_options",
+ /* 93 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name",
+ /* 94 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name",
+ /* 95 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name",
+ /* 96 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name",
+ /* 97 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name",
+ /* 98 */ "alter_table_clause ::= full_table_name DROP TAG column_name",
+ /* 99 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name",
+ /* 100 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name",
+ /* 101 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal",
+ /* 102 */ "multi_create_clause ::= create_subtable_clause",
+ /* 103 */ "multi_create_clause ::= multi_create_clause create_subtable_clause",
+ /* 104 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP",
+ /* 105 */ "multi_drop_clause ::= drop_table_clause",
+ /* 106 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause",
+ /* 107 */ "drop_table_clause ::= exists_opt full_table_name",
+ /* 108 */ "specific_tags_opt ::=",
+ /* 109 */ "specific_tags_opt ::= NK_LP col_name_list NK_RP",
+ /* 110 */ "full_table_name ::= table_name",
+ /* 111 */ "full_table_name ::= db_name NK_DOT table_name",
+ /* 112 */ "column_def_list ::= column_def",
+ /* 113 */ "column_def_list ::= column_def_list NK_COMMA column_def",
+ /* 114 */ "column_def ::= column_name type_name",
+ /* 115 */ "column_def ::= column_name type_name COMMENT NK_STRING",
+ /* 116 */ "type_name ::= BOOL",
+ /* 117 */ "type_name ::= TINYINT",
+ /* 118 */ "type_name ::= SMALLINT",
+ /* 119 */ "type_name ::= INT",
+ /* 120 */ "type_name ::= INTEGER",
+ /* 121 */ "type_name ::= BIGINT",
+ /* 122 */ "type_name ::= FLOAT",
+ /* 123 */ "type_name ::= DOUBLE",
+ /* 124 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP",
+ /* 125 */ "type_name ::= TIMESTAMP",
+ /* 126 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP",
+ /* 127 */ "type_name ::= TINYINT UNSIGNED",
+ /* 128 */ "type_name ::= SMALLINT UNSIGNED",
+ /* 129 */ "type_name ::= INT UNSIGNED",
+ /* 130 */ "type_name ::= BIGINT UNSIGNED",
+ /* 131 */ "type_name ::= JSON",
+ /* 132 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP",
+ /* 133 */ "type_name ::= MEDIUMBLOB",
+ /* 134 */ "type_name ::= BLOB",
+ /* 135 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP",
+ /* 136 */ "type_name ::= DECIMAL",
+ /* 137 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP",
+ /* 138 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP",
+ /* 139 */ "tags_def_opt ::=",
+ /* 140 */ "tags_def_opt ::= tags_def",
+ /* 141 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP",
+ /* 142 */ "table_options ::=",
+ /* 143 */ "table_options ::= table_options COMMENT NK_STRING",
+ /* 144 */ "table_options ::= table_options KEEP NK_INTEGER",
+ /* 145 */ "table_options ::= table_options TTL NK_INTEGER",
+ /* 146 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP",
+ /* 147 */ "table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP",
+ /* 148 */ "alter_table_options ::= alter_table_option",
+ /* 149 */ "alter_table_options ::= alter_table_options alter_table_option",
+ /* 150 */ "alter_table_option ::= COMMENT NK_STRING",
+ /* 151 */ "alter_table_option ::= KEEP NK_INTEGER",
+ /* 152 */ "alter_table_option ::= TTL NK_INTEGER",
+ /* 153 */ "col_name_list ::= col_name",
+ /* 154 */ "col_name_list ::= col_name_list NK_COMMA col_name",
+ /* 155 */ "col_name ::= column_name",
+ /* 156 */ "func_name_list ::= func_name",
+ /* 157 */ "func_name_list ::= func_name_list NK_COMMA col_name",
+ /* 158 */ "func_name ::= function_name",
+ /* 159 */ "cmd ::= CREATE SMA INDEX index_name ON table_name index_options",
+ /* 160 */ "cmd ::= CREATE FULLTEXT INDEX index_name ON table_name NK_LP col_name_list NK_RP",
+ /* 161 */ "cmd ::= DROP INDEX index_name ON table_name",
+ /* 162 */ "index_options ::=",
+ /* 163 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt",
+ /* 164 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt",
+ /* 165 */ "func_list ::= func",
+ /* 166 */ "func_list ::= func_list NK_COMMA func",
+ /* 167 */ "func ::= function_name NK_LP expression_list NK_RP",
+ /* 168 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression",
+ /* 169 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name",
+ /* 170 */ "cmd ::= DROP TOPIC exists_opt topic_name",
+ /* 171 */ "cmd ::= SHOW VGROUPS",
+ /* 172 */ "cmd ::= SHOW db_name NK_DOT VGROUPS",
+ /* 173 */ "cmd ::= SHOW MNODES",
+ /* 174 */ "cmd ::= query_expression",
+ /* 175 */ "literal ::= NK_INTEGER",
+ /* 176 */ "literal ::= NK_FLOAT",
+ /* 177 */ "literal ::= NK_STRING",
+ /* 178 */ "literal ::= NK_BOOL",
+ /* 179 */ "literal ::= TIMESTAMP NK_STRING",
+ /* 180 */ "literal ::= duration_literal",
+ /* 181 */ "duration_literal ::= NK_VARIABLE",
+ /* 182 */ "literal_list ::= literal",
+ /* 183 */ "literal_list ::= literal_list NK_COMMA literal",
+ /* 184 */ "db_name ::= NK_ID",
+ /* 185 */ "table_name ::= NK_ID",
+ /* 186 */ "column_name ::= NK_ID",
+ /* 187 */ "function_name ::= NK_ID",
+ /* 188 */ "table_alias ::= NK_ID",
+ /* 189 */ "column_alias ::= NK_ID",
+ /* 190 */ "user_name ::= NK_ID",
+ /* 191 */ "index_name ::= NK_ID",
+ /* 192 */ "topic_name ::= NK_ID",
+ /* 193 */ "expression ::= literal",
+ /* 194 */ "expression ::= column_reference",
+ /* 195 */ "expression ::= function_name NK_LP expression_list NK_RP",
+ /* 196 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
+ /* 197 */ "expression ::= subquery",
+ /* 198 */ "expression ::= NK_LP expression NK_RP",
+ /* 199 */ "expression ::= NK_PLUS expression",
+ /* 200 */ "expression ::= NK_MINUS expression",
+ /* 201 */ "expression ::= expression NK_PLUS expression",
+ /* 202 */ "expression ::= expression NK_MINUS expression",
+ /* 203 */ "expression ::= expression NK_STAR expression",
+ /* 204 */ "expression ::= expression NK_SLASH expression",
+ /* 205 */ "expression ::= expression NK_REM expression",
+ /* 206 */ "expression_list ::= expression",
+ /* 207 */ "expression_list ::= expression_list NK_COMMA expression",
+ /* 208 */ "column_reference ::= column_name",
+ /* 209 */ "column_reference ::= table_name NK_DOT column_name",
+ /* 210 */ "predicate ::= expression compare_op expression",
+ /* 211 */ "predicate ::= expression BETWEEN expression AND expression",
+ /* 212 */ "predicate ::= expression NOT BETWEEN expression AND expression",
+ /* 213 */ "predicate ::= expression IS NULL",
+ /* 214 */ "predicate ::= expression IS NOT NULL",
+ /* 215 */ "predicate ::= expression in_op in_predicate_value",
+ /* 216 */ "compare_op ::= NK_LT",
+ /* 217 */ "compare_op ::= NK_GT",
+ /* 218 */ "compare_op ::= NK_LE",
+ /* 219 */ "compare_op ::= NK_GE",
+ /* 220 */ "compare_op ::= NK_NE",
+ /* 221 */ "compare_op ::= NK_EQ",
+ /* 222 */ "compare_op ::= LIKE",
+ /* 223 */ "compare_op ::= NOT LIKE",
+ /* 224 */ "compare_op ::= MATCH",
+ /* 225 */ "compare_op ::= NMATCH",
+ /* 226 */ "in_op ::= IN",
+ /* 227 */ "in_op ::= NOT IN",
+ /* 228 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
+ /* 229 */ "boolean_value_expression ::= boolean_primary",
+ /* 230 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 231 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 232 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 233 */ "boolean_primary ::= predicate",
+ /* 234 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 235 */ "common_expression ::= expression",
+ /* 236 */ "common_expression ::= boolean_value_expression",
+ /* 237 */ "from_clause ::= FROM table_reference_list",
+ /* 238 */ "table_reference_list ::= table_reference",
+ /* 239 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 240 */ "table_reference ::= table_primary",
+ /* 241 */ "table_reference ::= joined_table",
+ /* 242 */ "table_primary ::= table_name alias_opt",
+ /* 243 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 244 */ "table_primary ::= subquery alias_opt",
+ /* 245 */ "table_primary ::= parenthesized_joined_table",
+ /* 246 */ "alias_opt ::=",
+ /* 247 */ "alias_opt ::= table_alias",
+ /* 248 */ "alias_opt ::= AS table_alias",
+ /* 249 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 250 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 251 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 252 */ "join_type ::=",
+ /* 253 */ "join_type ::= INNER",
+ /* 254 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
+ /* 255 */ "set_quantifier_opt ::=",
+ /* 256 */ "set_quantifier_opt ::= DISTINCT",
+ /* 257 */ "set_quantifier_opt ::= ALL",
+ /* 258 */ "select_list ::= NK_STAR",
+ /* 259 */ "select_list ::= select_sublist",
+ /* 260 */ "select_sublist ::= select_item",
+ /* 261 */ "select_sublist ::= select_sublist NK_COMMA select_item",
+ /* 262 */ "select_item ::= common_expression",
+ /* 263 */ "select_item ::= common_expression column_alias",
+ /* 264 */ "select_item ::= common_expression AS column_alias",
+ /* 265 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 266 */ "where_clause_opt ::=",
+ /* 267 */ "where_clause_opt ::= WHERE search_condition",
+ /* 268 */ "partition_by_clause_opt ::=",
+ /* 269 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
+ /* 270 */ "twindow_clause_opt ::=",
+ /* 271 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP",
+ /* 272 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP",
+ /* 273 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
+ /* 274 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
+ /* 275 */ "sliding_opt ::=",
+ /* 276 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
+ /* 277 */ "fill_opt ::=",
+ /* 278 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 279 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
+ /* 280 */ "fill_mode ::= NONE",
+ /* 281 */ "fill_mode ::= PREV",
+ /* 282 */ "fill_mode ::= NULL",
+ /* 283 */ "fill_mode ::= LINEAR",
+ /* 284 */ "fill_mode ::= NEXT",
+ /* 285 */ "group_by_clause_opt ::=",
+ /* 286 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 287 */ "group_by_list ::= expression",
+ /* 288 */ "group_by_list ::= group_by_list NK_COMMA expression",
+ /* 289 */ "having_clause_opt ::=",
+ /* 290 */ "having_clause_opt ::= HAVING search_condition",
+ /* 291 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 292 */ "query_expression_body ::= query_primary",
+ /* 293 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
+ /* 294 */ "query_primary ::= query_specification",
+ /* 295 */ "order_by_clause_opt ::=",
+ /* 296 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 297 */ "slimit_clause_opt ::=",
+ /* 298 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 299 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 300 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 301 */ "limit_clause_opt ::=",
+ /* 302 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 303 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 304 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 305 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 306 */ "search_condition ::= common_expression",
+ /* 307 */ "sort_specification_list ::= sort_specification",
+ /* 308 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 309 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
+ /* 310 */ "ordering_specification_opt ::=",
+ /* 311 */ "ordering_specification_opt ::= ASC",
+ /* 312 */ "ordering_specification_opt ::= DESC",
+ /* 313 */ "null_ordering_opt ::=",
+ /* 314 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 315 */ "null_ordering_opt ::= NULLS LAST",
};
#endif /* NDEBUG */
@@ -1236,121 +1385,139 @@ static void yy_destructor(
*/
/********* Begin destructor definitions ***************************************/
/* Default NON-TERMINAL Destructor */
- case 141: /* cmd */
- case 147: /* db_options */
- case 149: /* full_table_name */
- case 152: /* table_options */
- case 156: /* create_subtable_clause */
- case 159: /* drop_table_clause */
- case 162: /* column_def */
- case 165: /* col_name */
- case 167: /* index_options */
- case 169: /* duration_literal */
- case 170: /* sliding_opt */
- case 171: /* func */
- case 175: /* query_expression */
- case 176: /* literal */
- case 179: /* expression */
- case 180: /* column_reference */
- case 181: /* subquery */
- case 182: /* predicate */
- case 185: /* in_predicate_value */
- case 186: /* boolean_value_expression */
- case 187: /* boolean_primary */
- case 188: /* common_expression */
- case 189: /* from_clause */
- case 190: /* table_reference_list */
- case 191: /* table_reference */
- case 192: /* table_primary */
- case 193: /* joined_table */
- case 195: /* parenthesized_joined_table */
- case 197: /* search_condition */
- case 198: /* query_specification */
- case 201: /* where_clause_opt */
- case 203: /* twindow_clause_opt */
- case 205: /* having_clause_opt */
- case 207: /* select_item */
- case 208: /* fill_opt */
- case 211: /* query_expression_body */
- case 213: /* slimit_clause_opt */
- case 214: /* limit_clause_opt */
- case 215: /* query_primary */
- case 217: /* sort_specification */
+ case 160: /* cmd */
+ case 163: /* literal */
+ case 170: /* db_options */
+ case 172: /* alter_db_options */
+ case 174: /* full_table_name */
+ case 177: /* table_options */
+ case 181: /* alter_table_clause */
+ case 182: /* alter_table_options */
+ case 185: /* create_subtable_clause */
+ case 188: /* drop_table_clause */
+ case 191: /* column_def */
+ case 194: /* col_name */
+ case 195: /* func_name */
+ case 198: /* index_options */
+ case 200: /* duration_literal */
+ case 201: /* sliding_opt */
+ case 202: /* func */
+ case 205: /* query_expression */
+ case 208: /* expression */
+ case 209: /* column_reference */
+ case 210: /* subquery */
+ case 211: /* predicate */
+ case 214: /* in_predicate_value */
+ case 215: /* boolean_value_expression */
+ case 216: /* boolean_primary */
+ case 217: /* common_expression */
+ case 218: /* from_clause */
+ case 219: /* table_reference_list */
+ case 220: /* table_reference */
+ case 221: /* table_primary */
+ case 222: /* joined_table */
+ case 224: /* parenthesized_joined_table */
+ case 226: /* search_condition */
+ case 227: /* query_specification */
+ case 230: /* where_clause_opt */
+ case 232: /* twindow_clause_opt */
+ case 234: /* having_clause_opt */
+ case 236: /* select_item */
+ case 237: /* fill_opt */
+ case 240: /* query_expression_body */
+ case 242: /* slimit_clause_opt */
+ case 243: /* limit_clause_opt */
+ case 244: /* query_primary */
+ case 246: /* sort_specification */
{
- nodesDestroyNode((yypminor->yy432));
+ nodesDestroyNode((yypminor->yy26));
}
break;
- case 142: /* user_name */
- case 143: /* dnode_endpoint */
- case 144: /* dnode_host_name */
- case 146: /* db_name */
- case 161: /* table_name */
- case 163: /* column_name */
- case 166: /* index_name */
- case 172: /* function_name */
- case 174: /* topic_name */
- case 177: /* table_alias */
- case 178: /* column_alias */
- case 194: /* alias_opt */
+ case 161: /* account_options */
+ case 162: /* alter_account_options */
+ case 164: /* alter_account_option */
{
}
break;
- case 145: /* not_exists_opt */
- case 148: /* exists_opt */
- case 199: /* set_quantifier_opt */
+ case 165: /* user_name */
+ case 166: /* dnode_endpoint */
+ case 167: /* dnode_host_name */
+ case 169: /* db_name */
+ case 183: /* column_name */
+ case 190: /* table_name */
+ case 196: /* function_name */
+ case 197: /* index_name */
+ case 204: /* topic_name */
+ case 206: /* table_alias */
+ case 207: /* column_alias */
+ case 223: /* alias_opt */
{
}
break;
- case 150: /* column_def_list */
- case 151: /* tags_def_opt */
- case 153: /* multi_create_clause */
- case 154: /* tags_def */
- case 155: /* multi_drop_clause */
- case 157: /* specific_tags_opt */
- case 158: /* literal_list */
- case 160: /* col_name_list */
- case 168: /* func_list */
- case 173: /* expression_list */
- case 200: /* select_list */
- case 202: /* partition_by_clause_opt */
- case 204: /* group_by_clause_opt */
- case 206: /* select_sublist */
- case 210: /* group_by_list */
- case 212: /* order_by_clause_opt */
- case 216: /* sort_specification_list */
-{
- nodesDestroyList((yypminor->yy24));
-}
- break;
- case 164: /* type_name */
+ case 168: /* not_exists_opt */
+ case 171: /* exists_opt */
+ case 228: /* set_quantifier_opt */
{
}
break;
- case 183: /* compare_op */
- case 184: /* in_op */
+ case 173: /* alter_db_option */
+ case 193: /* alter_table_option */
{
}
break;
- case 196: /* join_type */
+ case 175: /* column_def_list */
+ case 176: /* tags_def_opt */
+ case 178: /* multi_create_clause */
+ case 179: /* tags_def */
+ case 180: /* multi_drop_clause */
+ case 186: /* specific_tags_opt */
+ case 187: /* literal_list */
+ case 189: /* col_name_list */
+ case 192: /* func_name_list */
+ case 199: /* func_list */
+ case 203: /* expression_list */
+ case 229: /* select_list */
+ case 231: /* partition_by_clause_opt */
+ case 233: /* group_by_clause_opt */
+ case 235: /* select_sublist */
+ case 239: /* group_by_list */
+ case 241: /* order_by_clause_opt */
+ case 245: /* sort_specification_list */
+{
+ nodesDestroyList((yypminor->yy64));
+}
+ break;
+ case 184: /* type_name */
{
}
break;
- case 209: /* fill_mode */
+ case 212: /* compare_op */
+ case 213: /* in_op */
{
}
break;
- case 218: /* ordering_specification_opt */
+ case 225: /* join_type */
{
}
break;
- case 219: /* null_ordering_opt */
+ case 238: /* fill_mode */
+{
+
+}
+ break;
+ case 247: /* ordering_specification_opt */
+{
+
+}
+ break;
+ case 248: /* null_ordering_opt */
{
}
@@ -1649,261 +1816,322 @@ static const struct {
YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */
signed char nrhs; /* Negative of the number of RHS symbols in the rule */
} yyRuleInfo[] = {
- { 141, -5 }, /* (0) cmd ::= CREATE USER user_name PASS NK_STRING */
- { 141, -5 }, /* (1) cmd ::= ALTER USER user_name PASS NK_STRING */
- { 141, -5 }, /* (2) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
- { 141, -3 }, /* (3) cmd ::= DROP USER user_name */
- { 141, -2 }, /* (4) cmd ::= SHOW USERS */
- { 141, -3 }, /* (5) cmd ::= CREATE DNODE dnode_endpoint */
- { 141, -5 }, /* (6) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
- { 141, -3 }, /* (7) cmd ::= DROP DNODE NK_INTEGER */
- { 141, -3 }, /* (8) cmd ::= DROP DNODE dnode_endpoint */
- { 141, -2 }, /* (9) cmd ::= SHOW DNODES */
- { 143, -1 }, /* (10) dnode_endpoint ::= NK_STRING */
- { 144, -1 }, /* (11) dnode_host_name ::= NK_ID */
- { 144, -1 }, /* (12) dnode_host_name ::= NK_IPTOKEN */
- { 141, -5 }, /* (13) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
- { 141, -5 }, /* (14) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
- { 141, -2 }, /* (15) cmd ::= SHOW QNODES */
- { 141, -5 }, /* (16) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
- { 141, -4 }, /* (17) cmd ::= DROP DATABASE exists_opt db_name */
- { 141, -2 }, /* (18) cmd ::= SHOW DATABASES */
- { 141, -2 }, /* (19) cmd ::= USE db_name */
- { 141, -4 }, /* (20) cmd ::= ALTER DATABASE db_name db_options */
- { 145, -3 }, /* (21) not_exists_opt ::= IF NOT EXISTS */
- { 145, 0 }, /* (22) not_exists_opt ::= */
- { 148, -2 }, /* (23) exists_opt ::= IF EXISTS */
- { 148, 0 }, /* (24) exists_opt ::= */
- { 147, 0 }, /* (25) db_options ::= */
- { 147, -3 }, /* (26) db_options ::= db_options BLOCKS NK_INTEGER */
- { 147, -3 }, /* (27) db_options ::= db_options CACHE NK_INTEGER */
- { 147, -3 }, /* (28) db_options ::= db_options CACHELAST NK_INTEGER */
- { 147, -3 }, /* (29) db_options ::= db_options COMP NK_INTEGER */
- { 147, -3 }, /* (30) db_options ::= db_options DAYS NK_INTEGER */
- { 147, -3 }, /* (31) db_options ::= db_options FSYNC NK_INTEGER */
- { 147, -3 }, /* (32) db_options ::= db_options MAXROWS NK_INTEGER */
- { 147, -3 }, /* (33) db_options ::= db_options MINROWS NK_INTEGER */
- { 147, -3 }, /* (34) db_options ::= db_options KEEP NK_INTEGER */
- { 147, -3 }, /* (35) db_options ::= db_options PRECISION NK_STRING */
- { 147, -3 }, /* (36) db_options ::= db_options QUORUM NK_INTEGER */
- { 147, -3 }, /* (37) db_options ::= db_options REPLICA NK_INTEGER */
- { 147, -3 }, /* (38) db_options ::= db_options TTL NK_INTEGER */
- { 147, -3 }, /* (39) db_options ::= db_options WAL NK_INTEGER */
- { 147, -3 }, /* (40) db_options ::= db_options VGROUPS NK_INTEGER */
- { 147, -3 }, /* (41) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
- { 147, -3 }, /* (42) db_options ::= db_options STREAM_MODE NK_INTEGER */
- { 141, -9 }, /* (43) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
- { 141, -3 }, /* (44) cmd ::= CREATE TABLE multi_create_clause */
- { 141, -9 }, /* (45) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
- { 141, -3 }, /* (46) cmd ::= DROP TABLE multi_drop_clause */
- { 141, -4 }, /* (47) cmd ::= DROP STABLE exists_opt full_table_name */
- { 141, -2 }, /* (48) cmd ::= SHOW TABLES */
- { 141, -2 }, /* (49) cmd ::= SHOW STABLES */
- { 153, -1 }, /* (50) multi_create_clause ::= create_subtable_clause */
- { 153, -2 }, /* (51) multi_create_clause ::= multi_create_clause create_subtable_clause */
- { 156, -9 }, /* (52) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
- { 155, -1 }, /* (53) multi_drop_clause ::= drop_table_clause */
- { 155, -2 }, /* (54) multi_drop_clause ::= multi_drop_clause drop_table_clause */
- { 159, -2 }, /* (55) drop_table_clause ::= exists_opt full_table_name */
- { 157, 0 }, /* (56) specific_tags_opt ::= */
- { 157, -3 }, /* (57) specific_tags_opt ::= NK_LP col_name_list NK_RP */
- { 149, -1 }, /* (58) full_table_name ::= table_name */
- { 149, -3 }, /* (59) full_table_name ::= db_name NK_DOT table_name */
- { 150, -1 }, /* (60) column_def_list ::= column_def */
- { 150, -3 }, /* (61) column_def_list ::= column_def_list NK_COMMA column_def */
- { 162, -2 }, /* (62) column_def ::= column_name type_name */
- { 162, -4 }, /* (63) column_def ::= column_name type_name COMMENT NK_STRING */
- { 164, -1 }, /* (64) type_name ::= BOOL */
- { 164, -1 }, /* (65) type_name ::= TINYINT */
- { 164, -1 }, /* (66) type_name ::= SMALLINT */
- { 164, -1 }, /* (67) type_name ::= INT */
- { 164, -1 }, /* (68) type_name ::= INTEGER */
- { 164, -1 }, /* (69) type_name ::= BIGINT */
- { 164, -1 }, /* (70) type_name ::= FLOAT */
- { 164, -1 }, /* (71) type_name ::= DOUBLE */
- { 164, -4 }, /* (72) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
- { 164, -1 }, /* (73) type_name ::= TIMESTAMP */
- { 164, -4 }, /* (74) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
- { 164, -2 }, /* (75) type_name ::= TINYINT UNSIGNED */
- { 164, -2 }, /* (76) type_name ::= SMALLINT UNSIGNED */
- { 164, -2 }, /* (77) type_name ::= INT UNSIGNED */
- { 164, -2 }, /* (78) type_name ::= BIGINT UNSIGNED */
- { 164, -1 }, /* (79) type_name ::= JSON */
- { 164, -4 }, /* (80) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
- { 164, -1 }, /* (81) type_name ::= MEDIUMBLOB */
- { 164, -1 }, /* (82) type_name ::= BLOB */
- { 164, -4 }, /* (83) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
- { 164, -1 }, /* (84) type_name ::= DECIMAL */
- { 164, -4 }, /* (85) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
- { 164, -6 }, /* (86) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
- { 151, 0 }, /* (87) tags_def_opt ::= */
- { 151, -1 }, /* (88) tags_def_opt ::= tags_def */
- { 154, -4 }, /* (89) tags_def ::= TAGS NK_LP column_def_list NK_RP */
- { 152, 0 }, /* (90) table_options ::= */
- { 152, -3 }, /* (91) table_options ::= table_options COMMENT NK_STRING */
- { 152, -3 }, /* (92) table_options ::= table_options KEEP NK_INTEGER */
- { 152, -3 }, /* (93) table_options ::= table_options TTL NK_INTEGER */
- { 152, -5 }, /* (94) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
- { 160, -1 }, /* (95) col_name_list ::= col_name */
- { 160, -3 }, /* (96) col_name_list ::= col_name_list NK_COMMA col_name */
- { 165, -1 }, /* (97) col_name ::= column_name */
- { 141, -7 }, /* (98) cmd ::= CREATE SMA INDEX index_name ON table_name index_options */
- { 141, -9 }, /* (99) cmd ::= CREATE FULLTEXT INDEX index_name ON table_name NK_LP col_name_list NK_RP */
- { 141, -5 }, /* (100) cmd ::= DROP INDEX index_name ON table_name */
- { 167, 0 }, /* (101) index_options ::= */
- { 167, -9 }, /* (102) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
- { 167, -11 }, /* (103) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
- { 168, -1 }, /* (104) func_list ::= func */
- { 168, -3 }, /* (105) func_list ::= func_list NK_COMMA func */
- { 171, -4 }, /* (106) func ::= function_name NK_LP expression_list NK_RP */
- { 141, -6 }, /* (107) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
- { 141, -6 }, /* (108) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
- { 141, -4 }, /* (109) cmd ::= DROP TOPIC exists_opt topic_name */
- { 141, -2 }, /* (110) cmd ::= SHOW VGROUPS */
- { 141, -4 }, /* (111) cmd ::= SHOW db_name NK_DOT VGROUPS */
- { 141, -2 }, /* (112) cmd ::= SHOW MNODES */
- { 141, -1 }, /* (113) cmd ::= query_expression */
- { 176, -1 }, /* (114) literal ::= NK_INTEGER */
- { 176, -1 }, /* (115) literal ::= NK_FLOAT */
- { 176, -1 }, /* (116) literal ::= NK_STRING */
- { 176, -1 }, /* (117) literal ::= NK_BOOL */
- { 176, -2 }, /* (118) literal ::= TIMESTAMP NK_STRING */
- { 176, -1 }, /* (119) literal ::= duration_literal */
- { 169, -1 }, /* (120) duration_literal ::= NK_VARIABLE */
- { 158, -1 }, /* (121) literal_list ::= literal */
- { 158, -3 }, /* (122) literal_list ::= literal_list NK_COMMA literal */
- { 146, -1 }, /* (123) db_name ::= NK_ID */
- { 161, -1 }, /* (124) table_name ::= NK_ID */
- { 163, -1 }, /* (125) column_name ::= NK_ID */
- { 172, -1 }, /* (126) function_name ::= NK_ID */
- { 177, -1 }, /* (127) table_alias ::= NK_ID */
- { 178, -1 }, /* (128) column_alias ::= NK_ID */
- { 142, -1 }, /* (129) user_name ::= NK_ID */
- { 166, -1 }, /* (130) index_name ::= NK_ID */
- { 174, -1 }, /* (131) topic_name ::= NK_ID */
- { 179, -1 }, /* (132) expression ::= literal */
- { 179, -1 }, /* (133) expression ::= column_reference */
- { 179, -4 }, /* (134) expression ::= function_name NK_LP expression_list NK_RP */
- { 179, -4 }, /* (135) expression ::= function_name NK_LP NK_STAR NK_RP */
- { 179, -1 }, /* (136) expression ::= subquery */
- { 179, -3 }, /* (137) expression ::= NK_LP expression NK_RP */
- { 179, -2 }, /* (138) expression ::= NK_PLUS expression */
- { 179, -2 }, /* (139) expression ::= NK_MINUS expression */
- { 179, -3 }, /* (140) expression ::= expression NK_PLUS expression */
- { 179, -3 }, /* (141) expression ::= expression NK_MINUS expression */
- { 179, -3 }, /* (142) expression ::= expression NK_STAR expression */
- { 179, -3 }, /* (143) expression ::= expression NK_SLASH expression */
- { 179, -3 }, /* (144) expression ::= expression NK_REM expression */
- { 173, -1 }, /* (145) expression_list ::= expression */
- { 173, -3 }, /* (146) expression_list ::= expression_list NK_COMMA expression */
- { 180, -1 }, /* (147) column_reference ::= column_name */
- { 180, -3 }, /* (148) column_reference ::= table_name NK_DOT column_name */
- { 182, -3 }, /* (149) predicate ::= expression compare_op expression */
- { 182, -5 }, /* (150) predicate ::= expression BETWEEN expression AND expression */
- { 182, -6 }, /* (151) predicate ::= expression NOT BETWEEN expression AND expression */
- { 182, -3 }, /* (152) predicate ::= expression IS NULL */
- { 182, -4 }, /* (153) predicate ::= expression IS NOT NULL */
- { 182, -3 }, /* (154) predicate ::= expression in_op in_predicate_value */
- { 183, -1 }, /* (155) compare_op ::= NK_LT */
- { 183, -1 }, /* (156) compare_op ::= NK_GT */
- { 183, -1 }, /* (157) compare_op ::= NK_LE */
- { 183, -1 }, /* (158) compare_op ::= NK_GE */
- { 183, -1 }, /* (159) compare_op ::= NK_NE */
- { 183, -1 }, /* (160) compare_op ::= NK_EQ */
- { 183, -1 }, /* (161) compare_op ::= LIKE */
- { 183, -2 }, /* (162) compare_op ::= NOT LIKE */
- { 183, -1 }, /* (163) compare_op ::= MATCH */
- { 183, -1 }, /* (164) compare_op ::= NMATCH */
- { 184, -1 }, /* (165) in_op ::= IN */
- { 184, -2 }, /* (166) in_op ::= NOT IN */
- { 185, -3 }, /* (167) in_predicate_value ::= NK_LP expression_list NK_RP */
- { 186, -1 }, /* (168) boolean_value_expression ::= boolean_primary */
- { 186, -2 }, /* (169) boolean_value_expression ::= NOT boolean_primary */
- { 186, -3 }, /* (170) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
- { 186, -3 }, /* (171) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
- { 187, -1 }, /* (172) boolean_primary ::= predicate */
- { 187, -3 }, /* (173) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
- { 188, -1 }, /* (174) common_expression ::= expression */
- { 188, -1 }, /* (175) common_expression ::= boolean_value_expression */
- { 189, -2 }, /* (176) from_clause ::= FROM table_reference_list */
- { 190, -1 }, /* (177) table_reference_list ::= table_reference */
- { 190, -3 }, /* (178) table_reference_list ::= table_reference_list NK_COMMA table_reference */
- { 191, -1 }, /* (179) table_reference ::= table_primary */
- { 191, -1 }, /* (180) table_reference ::= joined_table */
- { 192, -2 }, /* (181) table_primary ::= table_name alias_opt */
- { 192, -4 }, /* (182) table_primary ::= db_name NK_DOT table_name alias_opt */
- { 192, -2 }, /* (183) table_primary ::= subquery alias_opt */
- { 192, -1 }, /* (184) table_primary ::= parenthesized_joined_table */
- { 194, 0 }, /* (185) alias_opt ::= */
- { 194, -1 }, /* (186) alias_opt ::= table_alias */
- { 194, -2 }, /* (187) alias_opt ::= AS table_alias */
- { 195, -3 }, /* (188) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
- { 195, -3 }, /* (189) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
- { 193, -6 }, /* (190) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
- { 196, 0 }, /* (191) join_type ::= */
- { 196, -1 }, /* (192) join_type ::= INNER */
- { 198, -9 }, /* (193) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
- { 199, 0 }, /* (194) set_quantifier_opt ::= */
- { 199, -1 }, /* (195) set_quantifier_opt ::= DISTINCT */
- { 199, -1 }, /* (196) set_quantifier_opt ::= ALL */
- { 200, -1 }, /* (197) select_list ::= NK_STAR */
- { 200, -1 }, /* (198) select_list ::= select_sublist */
- { 206, -1 }, /* (199) select_sublist ::= select_item */
- { 206, -3 }, /* (200) select_sublist ::= select_sublist NK_COMMA select_item */
- { 207, -1 }, /* (201) select_item ::= common_expression */
- { 207, -2 }, /* (202) select_item ::= common_expression column_alias */
- { 207, -3 }, /* (203) select_item ::= common_expression AS column_alias */
- { 207, -3 }, /* (204) select_item ::= table_name NK_DOT NK_STAR */
- { 201, 0 }, /* (205) where_clause_opt ::= */
- { 201, -2 }, /* (206) where_clause_opt ::= WHERE search_condition */
- { 202, 0 }, /* (207) partition_by_clause_opt ::= */
- { 202, -3 }, /* (208) partition_by_clause_opt ::= PARTITION BY expression_list */
- { 203, 0 }, /* (209) twindow_clause_opt ::= */
- { 203, -6 }, /* (210) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
- { 203, -4 }, /* (211) twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
- { 203, -6 }, /* (212) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
- { 203, -8 }, /* (213) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
- { 170, 0 }, /* (214) sliding_opt ::= */
- { 170, -4 }, /* (215) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
- { 208, 0 }, /* (216) fill_opt ::= */
- { 208, -4 }, /* (217) fill_opt ::= FILL NK_LP fill_mode NK_RP */
- { 208, -6 }, /* (218) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
- { 209, -1 }, /* (219) fill_mode ::= NONE */
- { 209, -1 }, /* (220) fill_mode ::= PREV */
- { 209, -1 }, /* (221) fill_mode ::= NULL */
- { 209, -1 }, /* (222) fill_mode ::= LINEAR */
- { 209, -1 }, /* (223) fill_mode ::= NEXT */
- { 204, 0 }, /* (224) group_by_clause_opt ::= */
- { 204, -3 }, /* (225) group_by_clause_opt ::= GROUP BY group_by_list */
- { 210, -1 }, /* (226) group_by_list ::= expression */
- { 210, -3 }, /* (227) group_by_list ::= group_by_list NK_COMMA expression */
- { 205, 0 }, /* (228) having_clause_opt ::= */
- { 205, -2 }, /* (229) having_clause_opt ::= HAVING search_condition */
- { 175, -4 }, /* (230) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
- { 211, -1 }, /* (231) query_expression_body ::= query_primary */
- { 211, -4 }, /* (232) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
- { 215, -1 }, /* (233) query_primary ::= query_specification */
- { 212, 0 }, /* (234) order_by_clause_opt ::= */
- { 212, -3 }, /* (235) order_by_clause_opt ::= ORDER BY sort_specification_list */
- { 213, 0 }, /* (236) slimit_clause_opt ::= */
- { 213, -2 }, /* (237) slimit_clause_opt ::= SLIMIT NK_INTEGER */
- { 213, -4 }, /* (238) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
- { 213, -4 }, /* (239) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
- { 214, 0 }, /* (240) limit_clause_opt ::= */
- { 214, -2 }, /* (241) limit_clause_opt ::= LIMIT NK_INTEGER */
- { 214, -4 }, /* (242) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
- { 214, -4 }, /* (243) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
- { 181, -3 }, /* (244) subquery ::= NK_LP query_expression NK_RP */
- { 197, -1 }, /* (245) search_condition ::= common_expression */
- { 216, -1 }, /* (246) sort_specification_list ::= sort_specification */
- { 216, -3 }, /* (247) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
- { 217, -3 }, /* (248) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
- { 218, 0 }, /* (249) ordering_specification_opt ::= */
- { 218, -1 }, /* (250) ordering_specification_opt ::= ASC */
- { 218, -1 }, /* (251) ordering_specification_opt ::= DESC */
- { 219, 0 }, /* (252) null_ordering_opt ::= */
- { 219, -2 }, /* (253) null_ordering_opt ::= NULLS FIRST */
- { 219, -2 }, /* (254) null_ordering_opt ::= NULLS LAST */
+ { 160, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
+ { 160, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
+ { 161, 0 }, /* (2) account_options ::= */
+ { 161, -3 }, /* (3) account_options ::= account_options PPS literal */
+ { 161, -3 }, /* (4) account_options ::= account_options TSERIES literal */
+ { 161, -3 }, /* (5) account_options ::= account_options STORAGE literal */
+ { 161, -3 }, /* (6) account_options ::= account_options STREAMS literal */
+ { 161, -3 }, /* (7) account_options ::= account_options QTIME literal */
+ { 161, -3 }, /* (8) account_options ::= account_options DBS literal */
+ { 161, -3 }, /* (9) account_options ::= account_options USERS literal */
+ { 161, -3 }, /* (10) account_options ::= account_options CONNS literal */
+ { 161, -3 }, /* (11) account_options ::= account_options STATE literal */
+ { 162, -1 }, /* (12) alter_account_options ::= alter_account_option */
+ { 162, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
+ { 164, -2 }, /* (14) alter_account_option ::= PASS literal */
+ { 164, -2 }, /* (15) alter_account_option ::= PPS literal */
+ { 164, -2 }, /* (16) alter_account_option ::= TSERIES literal */
+ { 164, -2 }, /* (17) alter_account_option ::= STORAGE literal */
+ { 164, -2 }, /* (18) alter_account_option ::= STREAMS literal */
+ { 164, -2 }, /* (19) alter_account_option ::= QTIME literal */
+ { 164, -2 }, /* (20) alter_account_option ::= DBS literal */
+ { 164, -2 }, /* (21) alter_account_option ::= USERS literal */
+ { 164, -2 }, /* (22) alter_account_option ::= CONNS literal */
+ { 164, -2 }, /* (23) alter_account_option ::= STATE literal */
+ { 160, -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */
+ { 160, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
+ { 160, -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
+ { 160, -3 }, /* (27) cmd ::= DROP USER user_name */
+ { 160, -2 }, /* (28) cmd ::= SHOW USERS */
+ { 160, -3 }, /* (29) cmd ::= CREATE DNODE dnode_endpoint */
+ { 160, -5 }, /* (30) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
+ { 160, -3 }, /* (31) cmd ::= DROP DNODE NK_INTEGER */
+ { 160, -3 }, /* (32) cmd ::= DROP DNODE dnode_endpoint */
+ { 160, -2 }, /* (33) cmd ::= SHOW DNODES */
+ { 160, -4 }, /* (34) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
+ { 160, -5 }, /* (35) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
+ { 160, -4 }, /* (36) cmd ::= ALTER ALL DNODES NK_STRING */
+ { 160, -5 }, /* (37) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
+ { 166, -1 }, /* (38) dnode_endpoint ::= NK_STRING */
+ { 167, -1 }, /* (39) dnode_host_name ::= NK_ID */
+ { 167, -1 }, /* (40) dnode_host_name ::= NK_IPTOKEN */
+ { 160, -3 }, /* (41) cmd ::= ALTER LOCAL NK_STRING */
+ { 160, -4 }, /* (42) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
+ { 160, -5 }, /* (43) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
+ { 160, -5 }, /* (44) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
+ { 160, -2 }, /* (45) cmd ::= SHOW QNODES */
+ { 160, -5 }, /* (46) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
+ { 160, -4 }, /* (47) cmd ::= DROP DATABASE exists_opt db_name */
+ { 160, -2 }, /* (48) cmd ::= SHOW DATABASES */
+ { 160, -2 }, /* (49) cmd ::= USE db_name */
+ { 160, -4 }, /* (50) cmd ::= ALTER DATABASE db_name alter_db_options */
+ { 168, -3 }, /* (51) not_exists_opt ::= IF NOT EXISTS */
+ { 168, 0 }, /* (52) not_exists_opt ::= */
+ { 171, -2 }, /* (53) exists_opt ::= IF EXISTS */
+ { 171, 0 }, /* (54) exists_opt ::= */
+ { 170, 0 }, /* (55) db_options ::= */
+ { 170, -3 }, /* (56) db_options ::= db_options BLOCKS NK_INTEGER */
+ { 170, -3 }, /* (57) db_options ::= db_options CACHE NK_INTEGER */
+ { 170, -3 }, /* (58) db_options ::= db_options CACHELAST NK_INTEGER */
+ { 170, -3 }, /* (59) db_options ::= db_options COMP NK_INTEGER */
+ { 170, -3 }, /* (60) db_options ::= db_options DAYS NK_INTEGER */
+ { 170, -3 }, /* (61) db_options ::= db_options FSYNC NK_INTEGER */
+ { 170, -3 }, /* (62) db_options ::= db_options MAXROWS NK_INTEGER */
+ { 170, -3 }, /* (63) db_options ::= db_options MINROWS NK_INTEGER */
+ { 170, -3 }, /* (64) db_options ::= db_options KEEP NK_INTEGER */
+ { 170, -3 }, /* (65) db_options ::= db_options PRECISION NK_STRING */
+ { 170, -3 }, /* (66) db_options ::= db_options QUORUM NK_INTEGER */
+ { 170, -3 }, /* (67) db_options ::= db_options REPLICA NK_INTEGER */
+ { 170, -3 }, /* (68) db_options ::= db_options TTL NK_INTEGER */
+ { 170, -3 }, /* (69) db_options ::= db_options WAL NK_INTEGER */
+ { 170, -3 }, /* (70) db_options ::= db_options VGROUPS NK_INTEGER */
+ { 170, -3 }, /* (71) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
+ { 170, -3 }, /* (72) db_options ::= db_options STREAM_MODE NK_INTEGER */
+ { 170, -3 }, /* (73) db_options ::= db_options RETENTIONS NK_STRING */
+ { 170, -3 }, /* (74) db_options ::= db_options FILE_FACTOR NK_FLOAT */
+ { 172, -1 }, /* (75) alter_db_options ::= alter_db_option */
+ { 172, -2 }, /* (76) alter_db_options ::= alter_db_options alter_db_option */
+ { 173, -2 }, /* (77) alter_db_option ::= BLOCKS NK_INTEGER */
+ { 173, -2 }, /* (78) alter_db_option ::= FSYNC NK_INTEGER */
+ { 173, -2 }, /* (79) alter_db_option ::= KEEP NK_INTEGER */
+ { 173, -2 }, /* (80) alter_db_option ::= WAL NK_INTEGER */
+ { 173, -2 }, /* (81) alter_db_option ::= QUORUM NK_INTEGER */
+ { 173, -2 }, /* (82) alter_db_option ::= CACHELAST NK_INTEGER */
+ { 160, -9 }, /* (83) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
+ { 160, -3 }, /* (84) cmd ::= CREATE TABLE multi_create_clause */
+ { 160, -9 }, /* (85) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
+ { 160, -3 }, /* (86) cmd ::= DROP TABLE multi_drop_clause */
+ { 160, -4 }, /* (87) cmd ::= DROP STABLE exists_opt full_table_name */
+ { 160, -2 }, /* (88) cmd ::= SHOW TABLES */
+ { 160, -2 }, /* (89) cmd ::= SHOW STABLES */
+ { 160, -3 }, /* (90) cmd ::= ALTER TABLE alter_table_clause */
+ { 160, -3 }, /* (91) cmd ::= ALTER STABLE alter_table_clause */
+ { 181, -2 }, /* (92) alter_table_clause ::= full_table_name alter_table_options */
+ { 181, -5 }, /* (93) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
+ { 181, -4 }, /* (94) alter_table_clause ::= full_table_name DROP COLUMN column_name */
+ { 181, -5 }, /* (95) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
+ { 181, -5 }, /* (96) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
+ { 181, -5 }, /* (97) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
+ { 181, -4 }, /* (98) alter_table_clause ::= full_table_name DROP TAG column_name */
+ { 181, -5 }, /* (99) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
+ { 181, -5 }, /* (100) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
+ { 181, -6 }, /* (101) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
+ { 178, -1 }, /* (102) multi_create_clause ::= create_subtable_clause */
+ { 178, -2 }, /* (103) multi_create_clause ::= multi_create_clause create_subtable_clause */
+ { 185, -9 }, /* (104) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
+ { 180, -1 }, /* (105) multi_drop_clause ::= drop_table_clause */
+ { 180, -2 }, /* (106) multi_drop_clause ::= multi_drop_clause drop_table_clause */
+ { 188, -2 }, /* (107) drop_table_clause ::= exists_opt full_table_name */
+ { 186, 0 }, /* (108) specific_tags_opt ::= */
+ { 186, -3 }, /* (109) specific_tags_opt ::= NK_LP col_name_list NK_RP */
+ { 174, -1 }, /* (110) full_table_name ::= table_name */
+ { 174, -3 }, /* (111) full_table_name ::= db_name NK_DOT table_name */
+ { 175, -1 }, /* (112) column_def_list ::= column_def */
+ { 175, -3 }, /* (113) column_def_list ::= column_def_list NK_COMMA column_def */
+ { 191, -2 }, /* (114) column_def ::= column_name type_name */
+ { 191, -4 }, /* (115) column_def ::= column_name type_name COMMENT NK_STRING */
+ { 184, -1 }, /* (116) type_name ::= BOOL */
+ { 184, -1 }, /* (117) type_name ::= TINYINT */
+ { 184, -1 }, /* (118) type_name ::= SMALLINT */
+ { 184, -1 }, /* (119) type_name ::= INT */
+ { 184, -1 }, /* (120) type_name ::= INTEGER */
+ { 184, -1 }, /* (121) type_name ::= BIGINT */
+ { 184, -1 }, /* (122) type_name ::= FLOAT */
+ { 184, -1 }, /* (123) type_name ::= DOUBLE */
+ { 184, -4 }, /* (124) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
+ { 184, -1 }, /* (125) type_name ::= TIMESTAMP */
+ { 184, -4 }, /* (126) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
+ { 184, -2 }, /* (127) type_name ::= TINYINT UNSIGNED */
+ { 184, -2 }, /* (128) type_name ::= SMALLINT UNSIGNED */
+ { 184, -2 }, /* (129) type_name ::= INT UNSIGNED */
+ { 184, -2 }, /* (130) type_name ::= BIGINT UNSIGNED */
+ { 184, -1 }, /* (131) type_name ::= JSON */
+ { 184, -4 }, /* (132) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
+ { 184, -1 }, /* (133) type_name ::= MEDIUMBLOB */
+ { 184, -1 }, /* (134) type_name ::= BLOB */
+ { 184, -4 }, /* (135) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
+ { 184, -1 }, /* (136) type_name ::= DECIMAL */
+ { 184, -4 }, /* (137) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
+ { 184, -6 }, /* (138) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+ { 176, 0 }, /* (139) tags_def_opt ::= */
+ { 176, -1 }, /* (140) tags_def_opt ::= tags_def */
+ { 179, -4 }, /* (141) tags_def ::= TAGS NK_LP column_def_list NK_RP */
+ { 177, 0 }, /* (142) table_options ::= */
+ { 177, -3 }, /* (143) table_options ::= table_options COMMENT NK_STRING */
+ { 177, -3 }, /* (144) table_options ::= table_options KEEP NK_INTEGER */
+ { 177, -3 }, /* (145) table_options ::= table_options TTL NK_INTEGER */
+ { 177, -5 }, /* (146) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
+ { 177, -5 }, /* (147) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
+ { 182, -1 }, /* (148) alter_table_options ::= alter_table_option */
+ { 182, -2 }, /* (149) alter_table_options ::= alter_table_options alter_table_option */
+ { 193, -2 }, /* (150) alter_table_option ::= COMMENT NK_STRING */
+ { 193, -2 }, /* (151) alter_table_option ::= KEEP NK_INTEGER */
+ { 193, -2 }, /* (152) alter_table_option ::= TTL NK_INTEGER */
+ { 189, -1 }, /* (153) col_name_list ::= col_name */
+ { 189, -3 }, /* (154) col_name_list ::= col_name_list NK_COMMA col_name */
+ { 194, -1 }, /* (155) col_name ::= column_name */
+ { 192, -1 }, /* (156) func_name_list ::= func_name */
+ { 192, -3 }, /* (157) func_name_list ::= func_name_list NK_COMMA col_name */
+ { 195, -1 }, /* (158) func_name ::= function_name */
+ { 160, -7 }, /* (159) cmd ::= CREATE SMA INDEX index_name ON table_name index_options */
+ { 160, -9 }, /* (160) cmd ::= CREATE FULLTEXT INDEX index_name ON table_name NK_LP col_name_list NK_RP */
+ { 160, -5 }, /* (161) cmd ::= DROP INDEX index_name ON table_name */
+ { 198, 0 }, /* (162) index_options ::= */
+ { 198, -9 }, /* (163) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
+ { 198, -11 }, /* (164) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
+ { 199, -1 }, /* (165) func_list ::= func */
+ { 199, -3 }, /* (166) func_list ::= func_list NK_COMMA func */
+ { 202, -4 }, /* (167) func ::= function_name NK_LP expression_list NK_RP */
+ { 160, -6 }, /* (168) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
+ { 160, -6 }, /* (169) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
+ { 160, -4 }, /* (170) cmd ::= DROP TOPIC exists_opt topic_name */
+ { 160, -2 }, /* (171) cmd ::= SHOW VGROUPS */
+ { 160, -4 }, /* (172) cmd ::= SHOW db_name NK_DOT VGROUPS */
+ { 160, -2 }, /* (173) cmd ::= SHOW MNODES */
+ { 160, -1 }, /* (174) cmd ::= query_expression */
+ { 163, -1 }, /* (175) literal ::= NK_INTEGER */
+ { 163, -1 }, /* (176) literal ::= NK_FLOAT */
+ { 163, -1 }, /* (177) literal ::= NK_STRING */
+ { 163, -1 }, /* (178) literal ::= NK_BOOL */
+ { 163, -2 }, /* (179) literal ::= TIMESTAMP NK_STRING */
+ { 163, -1 }, /* (180) literal ::= duration_literal */
+ { 200, -1 }, /* (181) duration_literal ::= NK_VARIABLE */
+ { 187, -1 }, /* (182) literal_list ::= literal */
+ { 187, -3 }, /* (183) literal_list ::= literal_list NK_COMMA literal */
+ { 169, -1 }, /* (184) db_name ::= NK_ID */
+ { 190, -1 }, /* (185) table_name ::= NK_ID */
+ { 183, -1 }, /* (186) column_name ::= NK_ID */
+ { 196, -1 }, /* (187) function_name ::= NK_ID */
+ { 206, -1 }, /* (188) table_alias ::= NK_ID */
+ { 207, -1 }, /* (189) column_alias ::= NK_ID */
+ { 165, -1 }, /* (190) user_name ::= NK_ID */
+ { 197, -1 }, /* (191) index_name ::= NK_ID */
+ { 204, -1 }, /* (192) topic_name ::= NK_ID */
+ { 208, -1 }, /* (193) expression ::= literal */
+ { 208, -1 }, /* (194) expression ::= column_reference */
+ { 208, -4 }, /* (195) expression ::= function_name NK_LP expression_list NK_RP */
+ { 208, -4 }, /* (196) expression ::= function_name NK_LP NK_STAR NK_RP */
+ { 208, -1 }, /* (197) expression ::= subquery */
+ { 208, -3 }, /* (198) expression ::= NK_LP expression NK_RP */
+ { 208, -2 }, /* (199) expression ::= NK_PLUS expression */
+ { 208, -2 }, /* (200) expression ::= NK_MINUS expression */
+ { 208, -3 }, /* (201) expression ::= expression NK_PLUS expression */
+ { 208, -3 }, /* (202) expression ::= expression NK_MINUS expression */
+ { 208, -3 }, /* (203) expression ::= expression NK_STAR expression */
+ { 208, -3 }, /* (204) expression ::= expression NK_SLASH expression */
+ { 208, -3 }, /* (205) expression ::= expression NK_REM expression */
+ { 203, -1 }, /* (206) expression_list ::= expression */
+ { 203, -3 }, /* (207) expression_list ::= expression_list NK_COMMA expression */
+ { 209, -1 }, /* (208) column_reference ::= column_name */
+ { 209, -3 }, /* (209) column_reference ::= table_name NK_DOT column_name */
+ { 211, -3 }, /* (210) predicate ::= expression compare_op expression */
+ { 211, -5 }, /* (211) predicate ::= expression BETWEEN expression AND expression */
+ { 211, -6 }, /* (212) predicate ::= expression NOT BETWEEN expression AND expression */
+ { 211, -3 }, /* (213) predicate ::= expression IS NULL */
+ { 211, -4 }, /* (214) predicate ::= expression IS NOT NULL */
+ { 211, -3 }, /* (215) predicate ::= expression in_op in_predicate_value */
+ { 212, -1 }, /* (216) compare_op ::= NK_LT */
+ { 212, -1 }, /* (217) compare_op ::= NK_GT */
+ { 212, -1 }, /* (218) compare_op ::= NK_LE */
+ { 212, -1 }, /* (219) compare_op ::= NK_GE */
+ { 212, -1 }, /* (220) compare_op ::= NK_NE */
+ { 212, -1 }, /* (221) compare_op ::= NK_EQ */
+ { 212, -1 }, /* (222) compare_op ::= LIKE */
+ { 212, -2 }, /* (223) compare_op ::= NOT LIKE */
+ { 212, -1 }, /* (224) compare_op ::= MATCH */
+ { 212, -1 }, /* (225) compare_op ::= NMATCH */
+ { 213, -1 }, /* (226) in_op ::= IN */
+ { 213, -2 }, /* (227) in_op ::= NOT IN */
+ { 214, -3 }, /* (228) in_predicate_value ::= NK_LP expression_list NK_RP */
+ { 215, -1 }, /* (229) boolean_value_expression ::= boolean_primary */
+ { 215, -2 }, /* (230) boolean_value_expression ::= NOT boolean_primary */
+ { 215, -3 }, /* (231) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+ { 215, -3 }, /* (232) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+ { 216, -1 }, /* (233) boolean_primary ::= predicate */
+ { 216, -3 }, /* (234) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+ { 217, -1 }, /* (235) common_expression ::= expression */
+ { 217, -1 }, /* (236) common_expression ::= boolean_value_expression */
+ { 218, -2 }, /* (237) from_clause ::= FROM table_reference_list */
+ { 219, -1 }, /* (238) table_reference_list ::= table_reference */
+ { 219, -3 }, /* (239) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+ { 220, -1 }, /* (240) table_reference ::= table_primary */
+ { 220, -1 }, /* (241) table_reference ::= joined_table */
+ { 221, -2 }, /* (242) table_primary ::= table_name alias_opt */
+ { 221, -4 }, /* (243) table_primary ::= db_name NK_DOT table_name alias_opt */
+ { 221, -2 }, /* (244) table_primary ::= subquery alias_opt */
+ { 221, -1 }, /* (245) table_primary ::= parenthesized_joined_table */
+ { 223, 0 }, /* (246) alias_opt ::= */
+ { 223, -1 }, /* (247) alias_opt ::= table_alias */
+ { 223, -2 }, /* (248) alias_opt ::= AS table_alias */
+ { 224, -3 }, /* (249) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+ { 224, -3 }, /* (250) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+ { 222, -6 }, /* (251) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+ { 225, 0 }, /* (252) join_type ::= */
+ { 225, -1 }, /* (253) join_type ::= INNER */
+ { 227, -9 }, /* (254) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+ { 228, 0 }, /* (255) set_quantifier_opt ::= */
+ { 228, -1 }, /* (256) set_quantifier_opt ::= DISTINCT */
+ { 228, -1 }, /* (257) set_quantifier_opt ::= ALL */
+ { 229, -1 }, /* (258) select_list ::= NK_STAR */
+ { 229, -1 }, /* (259) select_list ::= select_sublist */
+ { 235, -1 }, /* (260) select_sublist ::= select_item */
+ { 235, -3 }, /* (261) select_sublist ::= select_sublist NK_COMMA select_item */
+ { 236, -1 }, /* (262) select_item ::= common_expression */
+ { 236, -2 }, /* (263) select_item ::= common_expression column_alias */
+ { 236, -3 }, /* (264) select_item ::= common_expression AS column_alias */
+ { 236, -3 }, /* (265) select_item ::= table_name NK_DOT NK_STAR */
+ { 230, 0 }, /* (266) where_clause_opt ::= */
+ { 230, -2 }, /* (267) where_clause_opt ::= WHERE search_condition */
+ { 231, 0 }, /* (268) partition_by_clause_opt ::= */
+ { 231, -3 }, /* (269) partition_by_clause_opt ::= PARTITION BY expression_list */
+ { 232, 0 }, /* (270) twindow_clause_opt ::= */
+ { 232, -6 }, /* (271) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
+ { 232, -4 }, /* (272) twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
+ { 232, -6 }, /* (273) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+ { 232, -8 }, /* (274) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+ { 201, 0 }, /* (275) sliding_opt ::= */
+ { 201, -4 }, /* (276) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+ { 237, 0 }, /* (277) fill_opt ::= */
+ { 237, -4 }, /* (278) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+ { 237, -6 }, /* (279) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+ { 238, -1 }, /* (280) fill_mode ::= NONE */
+ { 238, -1 }, /* (281) fill_mode ::= PREV */
+ { 238, -1 }, /* (282) fill_mode ::= NULL */
+ { 238, -1 }, /* (283) fill_mode ::= LINEAR */
+ { 238, -1 }, /* (284) fill_mode ::= NEXT */
+ { 233, 0 }, /* (285) group_by_clause_opt ::= */
+ { 233, -3 }, /* (286) group_by_clause_opt ::= GROUP BY group_by_list */
+ { 239, -1 }, /* (287) group_by_list ::= expression */
+ { 239, -3 }, /* (288) group_by_list ::= group_by_list NK_COMMA expression */
+ { 234, 0 }, /* (289) having_clause_opt ::= */
+ { 234, -2 }, /* (290) having_clause_opt ::= HAVING search_condition */
+ { 205, -4 }, /* (291) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+ { 240, -1 }, /* (292) query_expression_body ::= query_primary */
+ { 240, -4 }, /* (293) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+ { 244, -1 }, /* (294) query_primary ::= query_specification */
+ { 241, 0 }, /* (295) order_by_clause_opt ::= */
+ { 241, -3 }, /* (296) order_by_clause_opt ::= ORDER BY sort_specification_list */
+ { 242, 0 }, /* (297) slimit_clause_opt ::= */
+ { 242, -2 }, /* (298) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+ { 242, -4 }, /* (299) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+ { 242, -4 }, /* (300) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+ { 243, 0 }, /* (301) limit_clause_opt ::= */
+ { 243, -2 }, /* (302) limit_clause_opt ::= LIMIT NK_INTEGER */
+ { 243, -4 }, /* (303) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+ { 243, -4 }, /* (304) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+ { 210, -3 }, /* (305) subquery ::= NK_LP query_expression NK_RP */
+ { 226, -1 }, /* (306) search_condition ::= common_expression */
+ { 245, -1 }, /* (307) sort_specification_list ::= sort_specification */
+ { 245, -3 }, /* (308) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+ { 246, -3 }, /* (309) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+ { 247, 0 }, /* (310) ordering_specification_opt ::= */
+ { 247, -1 }, /* (311) ordering_specification_opt ::= ASC */
+ { 247, -1 }, /* (312) ordering_specification_opt ::= DESC */
+ { 248, 0 }, /* (313) null_ordering_opt ::= */
+ { 248, -2 }, /* (314) null_ordering_opt ::= NULLS FIRST */
+ { 248, -2 }, /* (315) null_ordering_opt ::= NULLS LAST */
};
static void yy_accept(yyParser*); /* Forward Declaration */
@@ -1990,794 +2218,964 @@ static YYACTIONTYPE yy_reduce(
*/
/********** Begin reduce actions **********************************************/
YYMINORTYPE yylhsminor;
- case 0: /* cmd ::= CREATE USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy0); }
+ case 0: /* cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
+{ pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
+ yy_destructor(yypParser,161,&yymsp[0].minor);
break;
- case 1: /* cmd ::= ALTER USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy129, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+ case 1: /* cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
+{ pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
+ yy_destructor(yypParser,162,&yymsp[0].minor);
break;
- case 2: /* cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy129, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
+ case 2: /* account_options ::= */
+{ }
break;
- case 3: /* cmd ::= DROP USER user_name */
-{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy129); }
+ case 3: /* account_options ::= account_options PPS literal */
+ case 4: /* account_options ::= account_options TSERIES literal */ yytestcase(yyruleno==4);
+ case 5: /* account_options ::= account_options STORAGE literal */ yytestcase(yyruleno==5);
+ case 6: /* account_options ::= account_options STREAMS literal */ yytestcase(yyruleno==6);
+ case 7: /* account_options ::= account_options QTIME literal */ yytestcase(yyruleno==7);
+ case 8: /* account_options ::= account_options DBS literal */ yytestcase(yyruleno==8);
+ case 9: /* account_options ::= account_options USERS literal */ yytestcase(yyruleno==9);
+ case 10: /* account_options ::= account_options CONNS literal */ yytestcase(yyruleno==10);
+ case 11: /* account_options ::= account_options STATE literal */ yytestcase(yyruleno==11);
+{ yy_destructor(yypParser,161,&yymsp[-2].minor);
+{ }
+ yy_destructor(yypParser,163,&yymsp[0].minor);
+}
break;
- case 4: /* cmd ::= SHOW USERS */
+ case 12: /* alter_account_options ::= alter_account_option */
+{ yy_destructor(yypParser,164,&yymsp[0].minor);
+{ }
+}
+ break;
+ case 13: /* alter_account_options ::= alter_account_options alter_account_option */
+{ yy_destructor(yypParser,162,&yymsp[-1].minor);
+{ }
+ yy_destructor(yypParser,164,&yymsp[0].minor);
+}
+ break;
+ case 14: /* alter_account_option ::= PASS literal */
+ case 15: /* alter_account_option ::= PPS literal */ yytestcase(yyruleno==15);
+ case 16: /* alter_account_option ::= TSERIES literal */ yytestcase(yyruleno==16);
+ case 17: /* alter_account_option ::= STORAGE literal */ yytestcase(yyruleno==17);
+ case 18: /* alter_account_option ::= STREAMS literal */ yytestcase(yyruleno==18);
+ case 19: /* alter_account_option ::= QTIME literal */ yytestcase(yyruleno==19);
+ case 20: /* alter_account_option ::= DBS literal */ yytestcase(yyruleno==20);
+ case 21: /* alter_account_option ::= USERS literal */ yytestcase(yyruleno==21);
+ case 22: /* alter_account_option ::= CONNS literal */ yytestcase(yyruleno==22);
+ case 23: /* alter_account_option ::= STATE literal */ yytestcase(yyruleno==23);
+{ }
+ yy_destructor(yypParser,163,&yymsp[0].minor);
+ break;
+ case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING */
+{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy0); }
+ break;
+ case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy353, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+ break;
+ case 26: /* cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy353, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
+ break;
+ case 27: /* cmd ::= DROP USER user_name */
+{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy353); }
+ break;
+ case 28: /* cmd ::= SHOW USERS */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_USERS_STMT, NULL); }
break;
- case 5: /* cmd ::= CREATE DNODE dnode_endpoint */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy129, NULL); }
+ case 29: /* cmd ::= CREATE DNODE dnode_endpoint */
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy353, NULL); }
break;
- case 6: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy0); }
+ case 30: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy0); }
break;
- case 7: /* cmd ::= DROP DNODE NK_INTEGER */
+ case 31: /* cmd ::= DROP DNODE NK_INTEGER */
{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); }
break;
- case 8: /* cmd ::= DROP DNODE dnode_endpoint */
-{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy129); }
+ case 32: /* cmd ::= DROP DNODE dnode_endpoint */
+{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy353); }
break;
- case 9: /* cmd ::= SHOW DNODES */
+ case 33: /* cmd ::= SHOW DNODES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL); }
break;
- case 10: /* dnode_endpoint ::= NK_STRING */
- case 11: /* dnode_host_name ::= NK_ID */ yytestcase(yyruleno==11);
- case 12: /* dnode_host_name ::= NK_IPTOKEN */ yytestcase(yyruleno==12);
- case 123: /* db_name ::= NK_ID */ yytestcase(yyruleno==123);
- case 124: /* table_name ::= NK_ID */ yytestcase(yyruleno==124);
- case 125: /* column_name ::= NK_ID */ yytestcase(yyruleno==125);
- case 126: /* function_name ::= NK_ID */ yytestcase(yyruleno==126);
- case 127: /* table_alias ::= NK_ID */ yytestcase(yyruleno==127);
- case 128: /* column_alias ::= NK_ID */ yytestcase(yyruleno==128);
- case 129: /* user_name ::= NK_ID */ yytestcase(yyruleno==129);
- case 130: /* index_name ::= NK_ID */ yytestcase(yyruleno==130);
- case 131: /* topic_name ::= NK_ID */ yytestcase(yyruleno==131);
-{ yylhsminor.yy129 = yymsp[0].minor.yy0; }
- yymsp[0].minor.yy129 = yylhsminor.yy129;
+ case 34: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
+{ pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); }
break;
- case 13: /* cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
+ case 35: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
+{ pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-2].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
+ break;
+ case 36: /* cmd ::= ALTER ALL DNODES NK_STRING */
+{ pCxt->pRootNode = createAlterDnodeStmt(pCxt, NULL, &yymsp[0].minor.yy0, NULL); }
+ break;
+ case 37: /* cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
+{ pCxt->pRootNode = createAlterDnodeStmt(pCxt, NULL, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
+ break;
+ case 38: /* dnode_endpoint ::= NK_STRING */
+ case 39: /* dnode_host_name ::= NK_ID */ yytestcase(yyruleno==39);
+ case 40: /* dnode_host_name ::= NK_IPTOKEN */ yytestcase(yyruleno==40);
+ case 184: /* db_name ::= NK_ID */ yytestcase(yyruleno==184);
+ case 185: /* table_name ::= NK_ID */ yytestcase(yyruleno==185);
+ case 186: /* column_name ::= NK_ID */ yytestcase(yyruleno==186);
+ case 187: /* function_name ::= NK_ID */ yytestcase(yyruleno==187);
+ case 188: /* table_alias ::= NK_ID */ yytestcase(yyruleno==188);
+ case 189: /* column_alias ::= NK_ID */ yytestcase(yyruleno==189);
+ case 190: /* user_name ::= NK_ID */ yytestcase(yyruleno==190);
+ case 191: /* index_name ::= NK_ID */ yytestcase(yyruleno==191);
+ case 192: /* topic_name ::= NK_ID */ yytestcase(yyruleno==192);
+{ yylhsminor.yy353 = yymsp[0].minor.yy0; }
+ yymsp[0].minor.yy353 = yylhsminor.yy353;
+ break;
+ case 41: /* cmd ::= ALTER LOCAL NK_STRING */
+{ pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); }
+ break;
+ case 42: /* cmd ::= ALTER LOCAL NK_STRING NK_STRING */
+{ pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
+ break;
+ case 43: /* cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
{ pCxt->pRootNode = createCreateQnodeStmt(pCxt, &yymsp[0].minor.yy0); }
break;
- case 14: /* cmd ::= DROP QNODE ON DNODE NK_INTEGER */
+ case 44: /* cmd ::= DROP QNODE ON DNODE NK_INTEGER */
{ pCxt->pRootNode = createDropQnodeStmt(pCxt, &yymsp[0].minor.yy0); }
break;
- case 15: /* cmd ::= SHOW QNODES */
+ case 45: /* cmd ::= SHOW QNODES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT, NULL); }
break;
- case 16: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy97, &yymsp[-1].minor.yy129, yymsp[0].minor.yy432); }
+ case 46: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
+{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy107, &yymsp[-1].minor.yy353, yymsp[0].minor.yy26); }
break;
- case 17: /* cmd ::= DROP DATABASE exists_opt db_name */
-{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy97, &yymsp[0].minor.yy129); }
+ case 47: /* cmd ::= DROP DATABASE exists_opt db_name */
+{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy107, &yymsp[0].minor.yy353); }
break;
- case 18: /* cmd ::= SHOW DATABASES */
+ case 48: /* cmd ::= SHOW DATABASES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL); }
break;
- case 19: /* cmd ::= USE db_name */
-{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy129); }
+ case 49: /* cmd ::= USE db_name */
+{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy353); }
break;
- case 20: /* cmd ::= ALTER DATABASE db_name db_options */
-{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy129, yymsp[0].minor.yy432); }
+ case 50: /* cmd ::= ALTER DATABASE db_name alter_db_options */
+{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy353, yymsp[0].minor.yy26); }
break;
- case 21: /* not_exists_opt ::= IF NOT EXISTS */
-{ yymsp[-2].minor.yy97 = true; }
+ case 51: /* not_exists_opt ::= IF NOT EXISTS */
+{ yymsp[-2].minor.yy107 = true; }
break;
- case 22: /* not_exists_opt ::= */
- case 24: /* exists_opt ::= */ yytestcase(yyruleno==24);
- case 194: /* set_quantifier_opt ::= */ yytestcase(yyruleno==194);
-{ yymsp[1].minor.yy97 = false; }
+ case 52: /* not_exists_opt ::= */
+ case 54: /* exists_opt ::= */ yytestcase(yyruleno==54);
+ case 255: /* set_quantifier_opt ::= */ yytestcase(yyruleno==255);
+{ yymsp[1].minor.yy107 = false; }
break;
- case 23: /* exists_opt ::= IF EXISTS */
-{ yymsp[-1].minor.yy97 = true; }
+ case 53: /* exists_opt ::= IF EXISTS */
+{ yymsp[-1].minor.yy107 = true; }
break;
- case 25: /* db_options ::= */
-{ yymsp[1].minor.yy432 = createDefaultDatabaseOptions(pCxt); }
+ case 55: /* db_options ::= */
+{ yymsp[1].minor.yy26 = createDefaultDatabaseOptions(pCxt); }
break;
- case 26: /* db_options ::= db_options BLOCKS NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_BLOCKS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 56: /* db_options ::= db_options BLOCKS NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_BLOCKS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 27: /* db_options ::= db_options CACHE NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_CACHE, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 57: /* db_options ::= db_options CACHE NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_CACHE, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 28: /* db_options ::= db_options CACHELAST NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 58: /* db_options ::= db_options CACHELAST NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 29: /* db_options ::= db_options COMP NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 59: /* db_options ::= db_options COMP NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 30: /* db_options ::= db_options DAYS NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 60: /* db_options ::= db_options DAYS NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 31: /* db_options ::= db_options FSYNC NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 61: /* db_options ::= db_options FSYNC NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 32: /* db_options ::= db_options MAXROWS NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 62: /* db_options ::= db_options MAXROWS NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 33: /* db_options ::= db_options MINROWS NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 63: /* db_options ::= db_options MINROWS NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 34: /* db_options ::= db_options KEEP NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_KEEP, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 64: /* db_options ::= db_options KEEP NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_KEEP, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 35: /* db_options ::= db_options PRECISION NK_STRING */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 65: /* db_options ::= db_options PRECISION NK_STRING */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 36: /* db_options ::= db_options QUORUM NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_QUORUM, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 66: /* db_options ::= db_options QUORUM NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_QUORUM, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 37: /* db_options ::= db_options REPLICA NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 67: /* db_options ::= db_options REPLICA NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 38: /* db_options ::= db_options TTL NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_TTL, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 68: /* db_options ::= db_options TTL NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_TTL, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 39: /* db_options ::= db_options WAL NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 69: /* db_options ::= db_options WAL NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 40: /* db_options ::= db_options VGROUPS NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 70: /* db_options ::= db_options VGROUPS NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 41: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_SINGLESTABLE, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 71: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 42: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
-{ yylhsminor.yy432 = setDatabaseOption(pCxt, yymsp[-2].minor.yy432, DB_OPTION_STREAMMODE, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 72: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_STREAM_MODE, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 43: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
- case 45: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==45);
-{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy97, yymsp[-5].minor.yy432, yymsp[-3].minor.yy24, yymsp[-1].minor.yy24, yymsp[0].minor.yy432);}
+ case 73: /* db_options ::= db_options RETENTIONS NK_STRING */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_RETENTIONS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 44: /* cmd ::= CREATE TABLE multi_create_clause */
-{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy24);}
+ case 74: /* db_options ::= db_options FILE_FACTOR NK_FLOAT */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-2].minor.yy26, DB_OPTION_FILE_FACTOR, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 46: /* cmd ::= DROP TABLE multi_drop_clause */
-{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy24); }
+ case 75: /* alter_db_options ::= alter_db_option */
+{ yylhsminor.yy26 = createDefaultAlterDatabaseOptions(pCxt); yylhsminor.yy26 = setDatabaseOption(pCxt, yylhsminor.yy26, yymsp[0].minor.yy443.type, &yymsp[0].minor.yy443.val); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 47: /* cmd ::= DROP STABLE exists_opt full_table_name */
-{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy97, yymsp[0].minor.yy432); }
+ case 76: /* alter_db_options ::= alter_db_options alter_db_option */
+{ yylhsminor.yy26 = setDatabaseOption(pCxt, yymsp[-1].minor.yy26, yymsp[0].minor.yy443.type, &yymsp[0].minor.yy443.val); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 48: /* cmd ::= SHOW TABLES */
+ case 77: /* alter_db_option ::= BLOCKS NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 78: /* alter_db_option ::= FSYNC NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 79: /* alter_db_option ::= KEEP NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = DB_OPTION_KEEP; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 80: /* alter_db_option ::= WAL NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = DB_OPTION_WAL; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 81: /* alter_db_option ::= QUORUM NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 82: /* alter_db_option ::= CACHELAST NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 83: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
+ case 85: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==85);
+{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy107, yymsp[-5].minor.yy26, yymsp[-3].minor.yy64, yymsp[-1].minor.yy64, yymsp[0].minor.yy26); }
+ break;
+ case 84: /* cmd ::= CREATE TABLE multi_create_clause */
+{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy64); }
+ break;
+ case 86: /* cmd ::= DROP TABLE multi_drop_clause */
+{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy64); }
+ break;
+ case 87: /* cmd ::= DROP STABLE exists_opt full_table_name */
+{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy107, yymsp[0].minor.yy26); }
+ break;
+ case 88: /* cmd ::= SHOW TABLES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, NULL); }
break;
- case 49: /* cmd ::= SHOW STABLES */
+ case 89: /* cmd ::= SHOW STABLES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, NULL); }
break;
- case 50: /* multi_create_clause ::= create_subtable_clause */
- case 53: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==53);
- case 60: /* column_def_list ::= column_def */ yytestcase(yyruleno==60);
- case 95: /* col_name_list ::= col_name */ yytestcase(yyruleno==95);
- case 104: /* func_list ::= func */ yytestcase(yyruleno==104);
- case 199: /* select_sublist ::= select_item */ yytestcase(yyruleno==199);
- case 246: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==246);
-{ yylhsminor.yy24 = createNodeList(pCxt, yymsp[0].minor.yy432); }
- yymsp[0].minor.yy24 = yylhsminor.yy24;
+ case 90: /* cmd ::= ALTER TABLE alter_table_clause */
+ case 91: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==91);
+ case 174: /* cmd ::= query_expression */ yytestcase(yyruleno==174);
+{ pCxt->pRootNode = yymsp[0].minor.yy26; }
break;
- case 51: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
- case 54: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==54);
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-1].minor.yy24, yymsp[0].minor.yy432); }
- yymsp[-1].minor.yy24 = yylhsminor.yy24;
+ case 92: /* alter_table_clause ::= full_table_name alter_table_options */
+{ yylhsminor.yy26 = createAlterTableOption(pCxt, yymsp[-1].minor.yy26, yymsp[0].minor.yy26); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 52: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-{ yylhsminor.yy432 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy97, yymsp[-7].minor.yy432, yymsp[-5].minor.yy432, yymsp[-4].minor.yy24, yymsp[-1].minor.yy24); }
- yymsp[-8].minor.yy432 = yylhsminor.yy432;
+ case 93: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
+{ yylhsminor.yy26 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy26, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy353, yymsp[0].minor.yy370); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 55: /* drop_table_clause ::= exists_opt full_table_name */
-{ yylhsminor.yy432 = createDropTableClause(pCxt, yymsp[-1].minor.yy97, yymsp[0].minor.yy432); }
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ case 94: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
+{ yylhsminor.yy26 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy26, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy353); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 56: /* specific_tags_opt ::= */
- case 87: /* tags_def_opt ::= */ yytestcase(yyruleno==87);
- case 207: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==207);
- case 224: /* group_by_clause_opt ::= */ yytestcase(yyruleno==224);
- case 234: /* order_by_clause_opt ::= */ yytestcase(yyruleno==234);
-{ yymsp[1].minor.yy24 = NULL; }
+ case 95: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
+{ yylhsminor.yy26 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy26, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy353, yymsp[0].minor.yy370); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 57: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
-{ yymsp[-2].minor.yy24 = yymsp[-1].minor.yy24; }
+ case 96: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
+{ yylhsminor.yy26 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy26, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 58: /* full_table_name ::= table_name */
-{ yylhsminor.yy432 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy129, NULL); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 97: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
+{ yylhsminor.yy26 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy26, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy353, yymsp[0].minor.yy370); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 59: /* full_table_name ::= db_name NK_DOT table_name */
-{ yylhsminor.yy432 = createRealTableNode(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy129, NULL); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 98: /* alter_table_clause ::= full_table_name DROP TAG column_name */
+{ yylhsminor.yy26 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy26, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy353); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 61: /* column_def_list ::= column_def_list NK_COMMA column_def */
- case 96: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==96);
- case 105: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==105);
- case 200: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==200);
- case 247: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==247);
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-2].minor.yy24, yymsp[0].minor.yy432); }
- yymsp[-2].minor.yy24 = yylhsminor.yy24;
+ case 99: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
+{ yylhsminor.yy26 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy26, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy353, yymsp[0].minor.yy370); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 62: /* column_def ::= column_name type_name */
-{ yylhsminor.yy432 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy129, yymsp[0].minor.yy224, NULL); }
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ case 100: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
+{ yylhsminor.yy26 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy26, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 63: /* column_def ::= column_name type_name COMMENT NK_STRING */
-{ yylhsminor.yy432 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy129, yymsp[-2].minor.yy224, &yymsp[0].minor.yy0); }
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ case 101: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
+{ yylhsminor.yy26 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy26, &yymsp[-2].minor.yy353, yymsp[0].minor.yy26); }
+ yymsp[-5].minor.yy26 = yylhsminor.yy26;
break;
- case 64: /* type_name ::= BOOL */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_BOOL); }
+ case 102: /* multi_create_clause ::= create_subtable_clause */
+ case 105: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==105);
+ case 112: /* column_def_list ::= column_def */ yytestcase(yyruleno==112);
+ case 153: /* col_name_list ::= col_name */ yytestcase(yyruleno==153);
+ case 156: /* func_name_list ::= func_name */ yytestcase(yyruleno==156);
+ case 165: /* func_list ::= func */ yytestcase(yyruleno==165);
+ case 260: /* select_sublist ::= select_item */ yytestcase(yyruleno==260);
+ case 307: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==307);
+{ yylhsminor.yy64 = createNodeList(pCxt, yymsp[0].minor.yy26); }
+ yymsp[0].minor.yy64 = yylhsminor.yy64;
break;
- case 65: /* type_name ::= TINYINT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_TINYINT); }
+ case 103: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
+ case 106: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==106);
+{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-1].minor.yy64, yymsp[0].minor.yy26); }
+ yymsp[-1].minor.yy64 = yylhsminor.yy64;
break;
- case 66: /* type_name ::= SMALLINT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
+ case 104: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
+{ yylhsminor.yy26 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy107, yymsp[-7].minor.yy26, yymsp[-5].minor.yy26, yymsp[-4].minor.yy64, yymsp[-1].minor.yy64); }
+ yymsp[-8].minor.yy26 = yylhsminor.yy26;
break;
- case 67: /* type_name ::= INT */
- case 68: /* type_name ::= INTEGER */ yytestcase(yyruleno==68);
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_INT); }
+ case 107: /* drop_table_clause ::= exists_opt full_table_name */
+{ yylhsminor.yy26 = createDropTableClause(pCxt, yymsp[-1].minor.yy107, yymsp[0].minor.yy26); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 69: /* type_name ::= BIGINT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_BIGINT); }
+ case 108: /* specific_tags_opt ::= */
+ case 139: /* tags_def_opt ::= */ yytestcase(yyruleno==139);
+ case 268: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==268);
+ case 285: /* group_by_clause_opt ::= */ yytestcase(yyruleno==285);
+ case 295: /* order_by_clause_opt ::= */ yytestcase(yyruleno==295);
+{ yymsp[1].minor.yy64 = NULL; }
break;
- case 70: /* type_name ::= FLOAT */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_FLOAT); }
+ case 109: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
+{ yymsp[-2].minor.yy64 = yymsp[-1].minor.yy64; }
break;
- case 71: /* type_name ::= DOUBLE */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
+ case 110: /* full_table_name ::= table_name */
+{ yylhsminor.yy26 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy353, NULL); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 72: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
+ case 111: /* full_table_name ::= db_name NK_DOT table_name */
+{ yylhsminor.yy26 = createRealTableNode(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353, NULL); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 73: /* type_name ::= TIMESTAMP */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
+ case 113: /* column_def_list ::= column_def_list NK_COMMA column_def */
+ case 154: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==154);
+ case 157: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==157);
+ case 166: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==166);
+ case 261: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==261);
+ case 308: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==308);
+{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, yymsp[0].minor.yy26); }
+ yymsp[-2].minor.yy64 = yylhsminor.yy64;
break;
- case 74: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
+ case 114: /* column_def ::= column_name type_name */
+{ yylhsminor.yy26 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy353, yymsp[0].minor.yy370, NULL); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 75: /* type_name ::= TINYINT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
+ case 115: /* column_def ::= column_name type_name COMMENT NK_STRING */
+{ yylhsminor.yy26 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy353, yymsp[-2].minor.yy370, &yymsp[0].minor.yy0); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 76: /* type_name ::= SMALLINT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
+ case 116: /* type_name ::= BOOL */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_BOOL); }
break;
- case 77: /* type_name ::= INT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_UINT); }
+ case 117: /* type_name ::= TINYINT */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_TINYINT); }
break;
- case 78: /* type_name ::= BIGINT UNSIGNED */
-{ yymsp[-1].minor.yy224 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
+ case 118: /* type_name ::= SMALLINT */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
break;
- case 79: /* type_name ::= JSON */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_JSON); }
+ case 119: /* type_name ::= INT */
+ case 120: /* type_name ::= INTEGER */ yytestcase(yyruleno==120);
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_INT); }
break;
- case 80: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
+ case 121: /* type_name ::= BIGINT */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_BIGINT); }
break;
- case 81: /* type_name ::= MEDIUMBLOB */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
+ case 122: /* type_name ::= FLOAT */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_FLOAT); }
break;
- case 82: /* type_name ::= BLOB */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_BLOB); }
+ case 123: /* type_name ::= DOUBLE */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
break;
- case 83: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
+ case 124: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy370 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
break;
- case 84: /* type_name ::= DECIMAL */
-{ yymsp[0].minor.yy224 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+ case 125: /* type_name ::= TIMESTAMP */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
break;
- case 85: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy224 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+ case 126: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy370 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
break;
- case 86: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy224 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+ case 127: /* type_name ::= TINYINT UNSIGNED */
+{ yymsp[-1].minor.yy370 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
break;
- case 88: /* tags_def_opt ::= tags_def */
- case 198: /* select_list ::= select_sublist */ yytestcase(yyruleno==198);
-{ yylhsminor.yy24 = yymsp[0].minor.yy24; }
- yymsp[0].minor.yy24 = yylhsminor.yy24;
+ case 128: /* type_name ::= SMALLINT UNSIGNED */
+{ yymsp[-1].minor.yy370 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
break;
- case 89: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
-{ yymsp[-3].minor.yy24 = yymsp[-1].minor.yy24; }
+ case 129: /* type_name ::= INT UNSIGNED */
+{ yymsp[-1].minor.yy370 = createDataType(TSDB_DATA_TYPE_UINT); }
break;
- case 90: /* table_options ::= */
-{ yymsp[1].minor.yy432 = createDefaultTableOptions(pCxt);}
+ case 130: /* type_name ::= BIGINT UNSIGNED */
+{ yymsp[-1].minor.yy370 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
break;
- case 91: /* table_options ::= table_options COMMENT NK_STRING */
-{ yylhsminor.yy432 = setTableOption(pCxt, yymsp[-2].minor.yy432, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 131: /* type_name ::= JSON */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_JSON); }
break;
- case 92: /* table_options ::= table_options KEEP NK_INTEGER */
-{ yylhsminor.yy432 = setTableOption(pCxt, yymsp[-2].minor.yy432, TABLE_OPTION_KEEP, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 132: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy370 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
break;
- case 93: /* table_options ::= table_options TTL NK_INTEGER */
-{ yylhsminor.yy432 = setTableOption(pCxt, yymsp[-2].minor.yy432, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 133: /* type_name ::= MEDIUMBLOB */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
break;
- case 94: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-{ yylhsminor.yy432 = setTableSmaOption(pCxt, yymsp[-4].minor.yy432, yymsp[-1].minor.yy24); }
- yymsp[-4].minor.yy432 = yylhsminor.yy432;
+ case 134: /* type_name ::= BLOB */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_BLOB); }
break;
- case 97: /* col_name ::= column_name */
-{ yylhsminor.yy432 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy129); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 135: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy370 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
break;
- case 98: /* cmd ::= CREATE SMA INDEX index_name ON table_name index_options */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, &yymsp[-3].minor.yy129, &yymsp[-1].minor.yy129, NULL, yymsp[0].minor.yy432); }
+ case 136: /* type_name ::= DECIMAL */
+{ yymsp[0].minor.yy370 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
break;
- case 99: /* cmd ::= CREATE FULLTEXT INDEX index_name ON table_name NK_LP col_name_list NK_RP */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, &yymsp[-5].minor.yy129, &yymsp[-3].minor.yy129, yymsp[-1].minor.yy24, NULL); }
+ case 137: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
+{ yymsp[-3].minor.yy370 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
break;
- case 100: /* cmd ::= DROP INDEX index_name ON table_name */
-{ pCxt->pRootNode = createDropIndexStmt(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy129); }
+ case 138: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+{ yymsp[-5].minor.yy370 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
break;
- case 101: /* index_options ::= */
- case 205: /* where_clause_opt ::= */ yytestcase(yyruleno==205);
- case 209: /* twindow_clause_opt ::= */ yytestcase(yyruleno==209);
- case 214: /* sliding_opt ::= */ yytestcase(yyruleno==214);
- case 216: /* fill_opt ::= */ yytestcase(yyruleno==216);
- case 228: /* having_clause_opt ::= */ yytestcase(yyruleno==228);
- case 236: /* slimit_clause_opt ::= */ yytestcase(yyruleno==236);
- case 240: /* limit_clause_opt ::= */ yytestcase(yyruleno==240);
-{ yymsp[1].minor.yy432 = NULL; }
+ case 140: /* tags_def_opt ::= tags_def */
+ case 259: /* select_list ::= select_sublist */ yytestcase(yyruleno==259);
+{ yylhsminor.yy64 = yymsp[0].minor.yy64; }
+ yymsp[0].minor.yy64 = yylhsminor.yy64;
break;
- case 102: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-{ yymsp[-8].minor.yy432 = createIndexOption(pCxt, yymsp[-6].minor.yy24, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), NULL, yymsp[0].minor.yy432); }
+ case 141: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
+{ yymsp[-3].minor.yy64 = yymsp[-1].minor.yy64; }
break;
- case 103: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
-{ yymsp[-10].minor.yy432 = createIndexOption(pCxt, yymsp[-8].minor.yy24, releaseRawExprNode(pCxt, yymsp[-4].minor.yy432), releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), yymsp[0].minor.yy432); }
+ case 142: /* table_options ::= */
+{ yymsp[1].minor.yy26 = createDefaultTableOptions(pCxt); }
break;
- case 106: /* func ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy432 = createFunctionNode(pCxt, &yymsp[-3].minor.yy129, yymsp[-1].minor.yy24); }
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ case 143: /* table_options ::= table_options COMMENT NK_STRING */
+{ yylhsminor.yy26 = setTableOption(pCxt, yymsp[-2].minor.yy26, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 107: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy97, &yymsp[-2].minor.yy129, yymsp[0].minor.yy432, NULL); }
+ case 144: /* table_options ::= table_options KEEP NK_INTEGER */
+{ yylhsminor.yy26 = setTableOption(pCxt, yymsp[-2].minor.yy26, TABLE_OPTION_KEEP, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 108: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy97, &yymsp[-2].minor.yy129, NULL, &yymsp[0].minor.yy129); }
+ case 145: /* table_options ::= table_options TTL NK_INTEGER */
+{ yylhsminor.yy26 = setTableOption(pCxt, yymsp[-2].minor.yy26, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 109: /* cmd ::= DROP TOPIC exists_opt topic_name */
-{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy97, &yymsp[0].minor.yy129); }
+ case 146: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
+{ yylhsminor.yy26 = setTableSmaOption(pCxt, yymsp[-4].minor.yy26, yymsp[-1].minor.yy64); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 110: /* cmd ::= SHOW VGROUPS */
+ case 147: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
+{ yylhsminor.yy26 = setTableRollupOption(pCxt, yymsp[-4].minor.yy26, yymsp[-1].minor.yy64); }
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
+ break;
+ case 148: /* alter_table_options ::= alter_table_option */
+{ yylhsminor.yy26 = createDefaultAlterTableOptions(pCxt); yylhsminor.yy26 = setTableOption(pCxt, yylhsminor.yy26, yymsp[0].minor.yy443.type, &yymsp[0].minor.yy443.val); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
+ break;
+ case 149: /* alter_table_options ::= alter_table_options alter_table_option */
+{ yylhsminor.yy26 = setTableOption(pCxt, yymsp[-1].minor.yy26, yymsp[0].minor.yy443.type, &yymsp[0].minor.yy443.val); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
+ break;
+ case 150: /* alter_table_option ::= COMMENT NK_STRING */
+{ yymsp[-1].minor.yy443.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 151: /* alter_table_option ::= KEEP NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 152: /* alter_table_option ::= TTL NK_INTEGER */
+{ yymsp[-1].minor.yy443.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy443.val = yymsp[0].minor.yy0; }
+ break;
+ case 155: /* col_name ::= column_name */
+{ yylhsminor.yy26 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy353); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
+ break;
+ case 158: /* func_name ::= function_name */
+{ yylhsminor.yy26 = createFunctionNode(pCxt, &yymsp[0].minor.yy353, NULL); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
+ break;
+ case 159: /* cmd ::= CREATE SMA INDEX index_name ON table_name index_options */
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, &yymsp[-3].minor.yy353, &yymsp[-1].minor.yy353, NULL, yymsp[0].minor.yy26); }
+ break;
+ case 160: /* cmd ::= CREATE FULLTEXT INDEX index_name ON table_name NK_LP col_name_list NK_RP */
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, &yymsp[-5].minor.yy353, &yymsp[-3].minor.yy353, yymsp[-1].minor.yy64, NULL); }
+ break;
+ case 161: /* cmd ::= DROP INDEX index_name ON table_name */
+{ pCxt->pRootNode = createDropIndexStmt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353); }
+ break;
+ case 162: /* index_options ::= */
+ case 266: /* where_clause_opt ::= */ yytestcase(yyruleno==266);
+ case 270: /* twindow_clause_opt ::= */ yytestcase(yyruleno==270);
+ case 275: /* sliding_opt ::= */ yytestcase(yyruleno==275);
+ case 277: /* fill_opt ::= */ yytestcase(yyruleno==277);
+ case 289: /* having_clause_opt ::= */ yytestcase(yyruleno==289);
+ case 297: /* slimit_clause_opt ::= */ yytestcase(yyruleno==297);
+ case 301: /* limit_clause_opt ::= */ yytestcase(yyruleno==301);
+{ yymsp[1].minor.yy26 = NULL; }
+ break;
+ case 163: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
+{ yymsp[-8].minor.yy26 = createIndexOption(pCxt, yymsp[-6].minor.yy64, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), NULL, yymsp[0].minor.yy26); }
+ break;
+ case 164: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
+{ yymsp[-10].minor.yy26 = createIndexOption(pCxt, yymsp[-8].minor.yy64, releaseRawExprNode(pCxt, yymsp[-4].minor.yy26), releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), yymsp[0].minor.yy26); }
+ break;
+ case 167: /* func ::= function_name NK_LP expression_list NK_RP */
+{ yylhsminor.yy26 = createFunctionNode(pCxt, &yymsp[-3].minor.yy353, yymsp[-1].minor.yy64); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
+ break;
+ case 168: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy107, &yymsp[-2].minor.yy353, yymsp[0].minor.yy26, NULL); }
+ break;
+ case 169: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy107, &yymsp[-2].minor.yy353, NULL, &yymsp[0].minor.yy353); }
+ break;
+ case 170: /* cmd ::= DROP TOPIC exists_opt topic_name */
+{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy107, &yymsp[0].minor.yy353); }
+ break;
+ case 171: /* cmd ::= SHOW VGROUPS */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, NULL); }
break;
- case 111: /* cmd ::= SHOW db_name NK_DOT VGROUPS */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, &yymsp[-2].minor.yy129); }
+ case 172: /* cmd ::= SHOW db_name NK_DOT VGROUPS */
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, &yymsp[-2].minor.yy353); }
break;
- case 112: /* cmd ::= SHOW MNODES */
+ case 173: /* cmd ::= SHOW MNODES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT, NULL); }
break;
- case 113: /* cmd ::= query_expression */
-{ pCxt->pRootNode = yymsp[0].minor.yy432; }
+ case 175: /* literal ::= NK_INTEGER */
+{ yylhsminor.yy26 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 114: /* literal ::= NK_INTEGER */
-{ yylhsminor.yy432 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 176: /* literal ::= NK_FLOAT */
+{ yylhsminor.yy26 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 115: /* literal ::= NK_FLOAT */
-{ yylhsminor.yy432 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 177: /* literal ::= NK_STRING */
+{ yylhsminor.yy26 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 116: /* literal ::= NK_STRING */
-{ yylhsminor.yy432 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 178: /* literal ::= NK_BOOL */
+{ yylhsminor.yy26 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 117: /* literal ::= NK_BOOL */
-{ yylhsminor.yy432 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 179: /* literal ::= TIMESTAMP NK_STRING */
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 118: /* literal ::= TIMESTAMP NK_STRING */
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ case 180: /* literal ::= duration_literal */
+ case 193: /* expression ::= literal */ yytestcase(yyruleno==193);
+ case 194: /* expression ::= column_reference */ yytestcase(yyruleno==194);
+ case 197: /* expression ::= subquery */ yytestcase(yyruleno==197);
+ case 229: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==229);
+ case 233: /* boolean_primary ::= predicate */ yytestcase(yyruleno==233);
+ case 235: /* common_expression ::= expression */ yytestcase(yyruleno==235);
+ case 236: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==236);
+ case 238: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==238);
+ case 240: /* table_reference ::= table_primary */ yytestcase(yyruleno==240);
+ case 241: /* table_reference ::= joined_table */ yytestcase(yyruleno==241);
+ case 245: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==245);
+ case 292: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==292);
+ case 294: /* query_primary ::= query_specification */ yytestcase(yyruleno==294);
+{ yylhsminor.yy26 = yymsp[0].minor.yy26; }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 119: /* literal ::= duration_literal */
- case 132: /* expression ::= literal */ yytestcase(yyruleno==132);
- case 133: /* expression ::= column_reference */ yytestcase(yyruleno==133);
- case 136: /* expression ::= subquery */ yytestcase(yyruleno==136);
- case 168: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==168);
- case 172: /* boolean_primary ::= predicate */ yytestcase(yyruleno==172);
- case 174: /* common_expression ::= expression */ yytestcase(yyruleno==174);
- case 175: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==175);
- case 177: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==177);
- case 179: /* table_reference ::= table_primary */ yytestcase(yyruleno==179);
- case 180: /* table_reference ::= joined_table */ yytestcase(yyruleno==180);
- case 184: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==184);
- case 231: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==231);
- case 233: /* query_primary ::= query_specification */ yytestcase(yyruleno==233);
-{ yylhsminor.yy432 = yymsp[0].minor.yy432; }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 181: /* duration_literal ::= NK_VARIABLE */
+{ yylhsminor.yy26 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 120: /* duration_literal ::= NK_VARIABLE */
-{ yylhsminor.yy432 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 182: /* literal_list ::= literal */
+ case 206: /* expression_list ::= expression */ yytestcase(yyruleno==206);
+{ yylhsminor.yy64 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy26)); }
+ yymsp[0].minor.yy64 = yylhsminor.yy64;
break;
- case 121: /* literal_list ::= literal */
- case 145: /* expression_list ::= expression */ yytestcase(yyruleno==145);
-{ yylhsminor.yy24 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy432)); }
- yymsp[0].minor.yy24 = yylhsminor.yy24;
+ case 183: /* literal_list ::= literal_list NK_COMMA literal */
+ case 207: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==207);
+{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, releaseRawExprNode(pCxt, yymsp[0].minor.yy26)); }
+ yymsp[-2].minor.yy64 = yylhsminor.yy64;
break;
- case 122: /* literal_list ::= literal_list NK_COMMA literal */
- case 146: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==146);
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-2].minor.yy24, releaseRawExprNode(pCxt, yymsp[0].minor.yy432)); }
- yymsp[-2].minor.yy24 = yylhsminor.yy24;
+ case 195: /* expression ::= function_name NK_LP expression_list NK_RP */
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy353, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy353, yymsp[-1].minor.yy64)); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 134: /* expression ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy129, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy129, yymsp[-1].minor.yy24)); }
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ case 196: /* expression ::= function_name NK_LP NK_STAR NK_RP */
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy353, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy353, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 135: /* expression ::= function_name NK_LP NK_STAR NK_RP */
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy129, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy129, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ case 198: /* expression ::= NK_LP expression NK_RP */
+ case 234: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==234);
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy26)); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 137: /* expression ::= NK_LP expression NK_RP */
- case 173: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==173);
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy432)); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
- break;
- case 138: /* expression ::= NK_PLUS expression */
+ case 199: /* expression ::= NK_PLUS expression */
{
- SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy432));
+ SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy26));
}
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 139: /* expression ::= NK_MINUS expression */
+ case 200: /* expression ::= NK_MINUS expression */
{
- SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[0].minor.yy432), NULL));
+ SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[0].minor.yy26), NULL));
}
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 140: /* expression ::= expression NK_PLUS expression */
+ case 201: /* expression ::= expression NK_PLUS expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 141: /* expression ::= expression NK_MINUS expression */
+ case 202: /* expression ::= expression NK_MINUS expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 142: /* expression ::= expression NK_STAR expression */
+ case 203: /* expression ::= expression NK_STAR expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 143: /* expression ::= expression NK_SLASH expression */
+ case 204: /* expression ::= expression NK_SLASH expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 144: /* expression ::= expression NK_REM expression */
+ case 205: /* expression ::= expression NK_REM expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 147: /* column_reference ::= column_name */
-{ yylhsminor.yy432 = createRawExprNode(pCxt, &yymsp[0].minor.yy129, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy129)); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 208: /* column_reference ::= column_name */
+{ yylhsminor.yy26 = createRawExprNode(pCxt, &yymsp[0].minor.yy353, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy353)); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 148: /* column_reference ::= table_name NK_DOT column_name */
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy129, createColumnNode(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy129)); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 209: /* column_reference ::= table_name NK_DOT column_name */
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353, createColumnNode(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353)); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 149: /* predicate ::= expression compare_op expression */
- case 154: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==154);
+ case 210: /* predicate ::= expression compare_op expression */
+ case 215: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==215);
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy260, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy80, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 150: /* predicate ::= expression BETWEEN expression AND expression */
+ case 211: /* predicate ::= expression BETWEEN expression AND expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy432), releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy26), releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-4].minor.yy432 = yylhsminor.yy432;
+ yymsp[-4].minor.yy26 = yylhsminor.yy26;
break;
- case 151: /* predicate ::= expression NOT BETWEEN expression AND expression */
+ case 212: /* predicate ::= expression NOT BETWEEN expression AND expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[-5].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[-5].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-5].minor.yy432 = yylhsminor.yy432;
+ yymsp[-5].minor.yy26 = yylhsminor.yy26;
break;
- case 152: /* predicate ::= expression IS NULL */
+ case 213: /* predicate ::= expression IS NULL */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), NULL));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), NULL));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 153: /* predicate ::= expression IS NOT NULL */
+ case 214: /* predicate ::= expression IS NOT NULL */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy432), NULL));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy26), NULL));
}
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 155: /* compare_op ::= NK_LT */
-{ yymsp[0].minor.yy260 = OP_TYPE_LOWER_THAN; }
+ case 216: /* compare_op ::= NK_LT */
+{ yymsp[0].minor.yy80 = OP_TYPE_LOWER_THAN; }
break;
- case 156: /* compare_op ::= NK_GT */
-{ yymsp[0].minor.yy260 = OP_TYPE_GREATER_THAN; }
+ case 217: /* compare_op ::= NK_GT */
+{ yymsp[0].minor.yy80 = OP_TYPE_GREATER_THAN; }
break;
- case 157: /* compare_op ::= NK_LE */
-{ yymsp[0].minor.yy260 = OP_TYPE_LOWER_EQUAL; }
+ case 218: /* compare_op ::= NK_LE */
+{ yymsp[0].minor.yy80 = OP_TYPE_LOWER_EQUAL; }
break;
- case 158: /* compare_op ::= NK_GE */
-{ yymsp[0].minor.yy260 = OP_TYPE_GREATER_EQUAL; }
+ case 219: /* compare_op ::= NK_GE */
+{ yymsp[0].minor.yy80 = OP_TYPE_GREATER_EQUAL; }
break;
- case 159: /* compare_op ::= NK_NE */
-{ yymsp[0].minor.yy260 = OP_TYPE_NOT_EQUAL; }
+ case 220: /* compare_op ::= NK_NE */
+{ yymsp[0].minor.yy80 = OP_TYPE_NOT_EQUAL; }
break;
- case 160: /* compare_op ::= NK_EQ */
-{ yymsp[0].minor.yy260 = OP_TYPE_EQUAL; }
+ case 221: /* compare_op ::= NK_EQ */
+{ yymsp[0].minor.yy80 = OP_TYPE_EQUAL; }
break;
- case 161: /* compare_op ::= LIKE */
-{ yymsp[0].minor.yy260 = OP_TYPE_LIKE; }
+ case 222: /* compare_op ::= LIKE */
+{ yymsp[0].minor.yy80 = OP_TYPE_LIKE; }
break;
- case 162: /* compare_op ::= NOT LIKE */
-{ yymsp[-1].minor.yy260 = OP_TYPE_NOT_LIKE; }
+ case 223: /* compare_op ::= NOT LIKE */
+{ yymsp[-1].minor.yy80 = OP_TYPE_NOT_LIKE; }
break;
- case 163: /* compare_op ::= MATCH */
-{ yymsp[0].minor.yy260 = OP_TYPE_MATCH; }
+ case 224: /* compare_op ::= MATCH */
+{ yymsp[0].minor.yy80 = OP_TYPE_MATCH; }
break;
- case 164: /* compare_op ::= NMATCH */
-{ yymsp[0].minor.yy260 = OP_TYPE_NMATCH; }
+ case 225: /* compare_op ::= NMATCH */
+{ yymsp[0].minor.yy80 = OP_TYPE_NMATCH; }
break;
- case 165: /* in_op ::= IN */
-{ yymsp[0].minor.yy260 = OP_TYPE_IN; }
+ case 226: /* in_op ::= IN */
+{ yymsp[0].minor.yy80 = OP_TYPE_IN; }
break;
- case 166: /* in_op ::= NOT IN */
-{ yymsp[-1].minor.yy260 = OP_TYPE_NOT_IN; }
+ case 227: /* in_op ::= NOT IN */
+{ yymsp[-1].minor.yy80 = OP_TYPE_NOT_IN; }
break;
- case 167: /* in_predicate_value ::= NK_LP expression_list NK_RP */
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy24)); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 228: /* in_predicate_value ::= NK_LP expression_list NK_RP */
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy64)); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 169: /* boolean_value_expression ::= NOT boolean_primary */
+ case 230: /* boolean_value_expression ::= NOT boolean_primary */
{
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy432), NULL));
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy26), NULL));
}
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 170: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+ case 231: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 171: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+ case 232: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy432);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), releaseRawExprNode(pCxt, yymsp[0].minor.yy432)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy26);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), releaseRawExprNode(pCxt, yymsp[0].minor.yy26)));
}
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 176: /* from_clause ::= FROM table_reference_list */
- case 206: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==206);
- case 229: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==229);
-{ yymsp[-1].minor.yy432 = yymsp[0].minor.yy432; }
+ case 237: /* from_clause ::= FROM table_reference_list */
+ case 267: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==267);
+ case 290: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==290);
+{ yymsp[-1].minor.yy26 = yymsp[0].minor.yy26; }
break;
- case 178: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
-{ yylhsminor.yy432 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy432, yymsp[0].minor.yy432, NULL); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 239: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+{ yylhsminor.yy26 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy26, yymsp[0].minor.yy26, NULL); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 181: /* table_primary ::= table_name alias_opt */
-{ yylhsminor.yy432 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy129, &yymsp[0].minor.yy129); }
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ case 242: /* table_primary ::= table_name alias_opt */
+{ yylhsminor.yy26 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 182: /* table_primary ::= db_name NK_DOT table_name alias_opt */
-{ yylhsminor.yy432 = createRealTableNode(pCxt, &yymsp[-3].minor.yy129, &yymsp[-1].minor.yy129, &yymsp[0].minor.yy129); }
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ case 243: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+{ yylhsminor.yy26 = createRealTableNode(pCxt, &yymsp[-3].minor.yy353, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 183: /* table_primary ::= subquery alias_opt */
-{ yylhsminor.yy432 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy432), &yymsp[0].minor.yy129); }
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ case 244: /* table_primary ::= subquery alias_opt */
+{ yylhsminor.yy26 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy26), &yymsp[0].minor.yy353); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 185: /* alias_opt ::= */
-{ yymsp[1].minor.yy129 = nil_token; }
+ case 246: /* alias_opt ::= */
+{ yymsp[1].minor.yy353 = nil_token; }
break;
- case 186: /* alias_opt ::= table_alias */
-{ yylhsminor.yy129 = yymsp[0].minor.yy129; }
- yymsp[0].minor.yy129 = yylhsminor.yy129;
+ case 247: /* alias_opt ::= table_alias */
+{ yylhsminor.yy353 = yymsp[0].minor.yy353; }
+ yymsp[0].minor.yy353 = yylhsminor.yy353;
break;
- case 187: /* alias_opt ::= AS table_alias */
-{ yymsp[-1].minor.yy129 = yymsp[0].minor.yy129; }
+ case 248: /* alias_opt ::= AS table_alias */
+{ yymsp[-1].minor.yy353 = yymsp[0].minor.yy353; }
break;
- case 188: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
- case 189: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==189);
-{ yymsp[-2].minor.yy432 = yymsp[-1].minor.yy432; }
+ case 249: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+ case 250: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==250);
+{ yymsp[-2].minor.yy26 = yymsp[-1].minor.yy26; }
break;
- case 190: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-{ yylhsminor.yy432 = createJoinTableNode(pCxt, yymsp[-4].minor.yy332, yymsp[-5].minor.yy432, yymsp[-2].minor.yy432, yymsp[0].minor.yy432); }
- yymsp[-5].minor.yy432 = yylhsminor.yy432;
+ case 251: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+{ yylhsminor.yy26 = createJoinTableNode(pCxt, yymsp[-4].minor.yy372, yymsp[-5].minor.yy26, yymsp[-2].minor.yy26, yymsp[0].minor.yy26); }
+ yymsp[-5].minor.yy26 = yylhsminor.yy26;
break;
- case 191: /* join_type ::= */
-{ yymsp[1].minor.yy332 = JOIN_TYPE_INNER; }
+ case 252: /* join_type ::= */
+{ yymsp[1].minor.yy372 = JOIN_TYPE_INNER; }
break;
- case 192: /* join_type ::= INNER */
-{ yymsp[0].minor.yy332 = JOIN_TYPE_INNER; }
+ case 253: /* join_type ::= INNER */
+{ yymsp[0].minor.yy372 = JOIN_TYPE_INNER; }
break;
- case 193: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+ case 254: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
{
- yymsp[-8].minor.yy432 = createSelectStmt(pCxt, yymsp[-7].minor.yy97, yymsp[-6].minor.yy24, yymsp[-5].minor.yy432);
- yymsp[-8].minor.yy432 = addWhereClause(pCxt, yymsp[-8].minor.yy432, yymsp[-4].minor.yy432);
- yymsp[-8].minor.yy432 = addPartitionByClause(pCxt, yymsp[-8].minor.yy432, yymsp[-3].minor.yy24);
- yymsp[-8].minor.yy432 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy432, yymsp[-2].minor.yy432);
- yymsp[-8].minor.yy432 = addGroupByClause(pCxt, yymsp[-8].minor.yy432, yymsp[-1].minor.yy24);
- yymsp[-8].minor.yy432 = addHavingClause(pCxt, yymsp[-8].minor.yy432, yymsp[0].minor.yy432);
+ yymsp[-8].minor.yy26 = createSelectStmt(pCxt, yymsp[-7].minor.yy107, yymsp[-6].minor.yy64, yymsp[-5].minor.yy26);
+ yymsp[-8].minor.yy26 = addWhereClause(pCxt, yymsp[-8].minor.yy26, yymsp[-4].minor.yy26);
+ yymsp[-8].minor.yy26 = addPartitionByClause(pCxt, yymsp[-8].minor.yy26, yymsp[-3].minor.yy64);
+ yymsp[-8].minor.yy26 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy26, yymsp[-2].minor.yy26);
+ yymsp[-8].minor.yy26 = addGroupByClause(pCxt, yymsp[-8].minor.yy26, yymsp[-1].minor.yy64);
+ yymsp[-8].minor.yy26 = addHavingClause(pCxt, yymsp[-8].minor.yy26, yymsp[0].minor.yy26);
}
break;
- case 195: /* set_quantifier_opt ::= DISTINCT */
-{ yymsp[0].minor.yy97 = true; }
+ case 256: /* set_quantifier_opt ::= DISTINCT */
+{ yymsp[0].minor.yy107 = true; }
break;
- case 196: /* set_quantifier_opt ::= ALL */
-{ yymsp[0].minor.yy97 = false; }
+ case 257: /* set_quantifier_opt ::= ALL */
+{ yymsp[0].minor.yy107 = false; }
break;
- case 197: /* select_list ::= NK_STAR */
-{ yymsp[0].minor.yy24 = NULL; }
+ case 258: /* select_list ::= NK_STAR */
+{ yymsp[0].minor.yy64 = NULL; }
break;
- case 201: /* select_item ::= common_expression */
+ case 262: /* select_item ::= common_expression */
{
- SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy432);
- yylhsminor.yy432 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy432), &t);
+ SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy26);
+ yylhsminor.yy26 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy26), &t);
}
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 202: /* select_item ::= common_expression column_alias */
-{ yylhsminor.yy432 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy432), &yymsp[0].minor.yy129); }
- yymsp[-1].minor.yy432 = yylhsminor.yy432;
+ case 263: /* select_item ::= common_expression column_alias */
+{ yylhsminor.yy26 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy26), &yymsp[0].minor.yy353); }
+ yymsp[-1].minor.yy26 = yylhsminor.yy26;
break;
- case 203: /* select_item ::= common_expression AS column_alias */
-{ yylhsminor.yy432 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), &yymsp[0].minor.yy129); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 264: /* select_item ::= common_expression AS column_alias */
+{ yylhsminor.yy26 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), &yymsp[0].minor.yy353); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 204: /* select_item ::= table_name NK_DOT NK_STAR */
-{ yylhsminor.yy432 = createColumnNode(pCxt, &yymsp[-2].minor.yy129, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 265: /* select_item ::= table_name NK_DOT NK_STAR */
+{ yylhsminor.yy26 = createColumnNode(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 208: /* partition_by_clause_opt ::= PARTITION BY expression_list */
- case 225: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==225);
- case 235: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==235);
-{ yymsp[-2].minor.yy24 = yymsp[0].minor.yy24; }
+ case 269: /* partition_by_clause_opt ::= PARTITION BY expression_list */
+ case 286: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==286);
+ case 296: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==296);
+{ yymsp[-2].minor.yy64 = yymsp[0].minor.yy64; }
break;
- case 210: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy432 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy432), &yymsp[-1].minor.yy0); }
+ case 271: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
+{ yymsp[-5].minor.yy26 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy26), &yymsp[-1].minor.yy0); }
break;
- case 211: /* twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
-{ yymsp[-3].minor.yy432 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy432)); }
+ case 272: /* twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
+{ yymsp[-3].minor.yy26 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy26)); }
break;
- case 212: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-5].minor.yy432 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy432), NULL, yymsp[-1].minor.yy432, yymsp[0].minor.yy432); }
+ case 273: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-5].minor.yy26 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy26), NULL, yymsp[-1].minor.yy26, yymsp[0].minor.yy26); }
break;
- case 213: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-7].minor.yy432 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy432), releaseRawExprNode(pCxt, yymsp[-3].minor.yy432), yymsp[-1].minor.yy432, yymsp[0].minor.yy432); }
+ case 274: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-7].minor.yy26 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy26), releaseRawExprNode(pCxt, yymsp[-3].minor.yy26), yymsp[-1].minor.yy26, yymsp[0].minor.yy26); }
break;
- case 215: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-{ yymsp[-3].minor.yy432 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy432); }
+ case 276: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+{ yymsp[-3].minor.yy26 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy26); }
break;
- case 217: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
-{ yymsp[-3].minor.yy432 = createFillNode(pCxt, yymsp[-1].minor.yy294, NULL); }
+ case 278: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+{ yymsp[-3].minor.yy26 = createFillNode(pCxt, yymsp[-1].minor.yy192, NULL); }
break;
- case 218: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-{ yymsp[-5].minor.yy432 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy24)); }
+ case 279: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+{ yymsp[-5].minor.yy26 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy64)); }
break;
- case 219: /* fill_mode ::= NONE */
-{ yymsp[0].minor.yy294 = FILL_MODE_NONE; }
+ case 280: /* fill_mode ::= NONE */
+{ yymsp[0].minor.yy192 = FILL_MODE_NONE; }
break;
- case 220: /* fill_mode ::= PREV */
-{ yymsp[0].minor.yy294 = FILL_MODE_PREV; }
+ case 281: /* fill_mode ::= PREV */
+{ yymsp[0].minor.yy192 = FILL_MODE_PREV; }
break;
- case 221: /* fill_mode ::= NULL */
-{ yymsp[0].minor.yy294 = FILL_MODE_NULL; }
+ case 282: /* fill_mode ::= NULL */
+{ yymsp[0].minor.yy192 = FILL_MODE_NULL; }
break;
- case 222: /* fill_mode ::= LINEAR */
-{ yymsp[0].minor.yy294 = FILL_MODE_LINEAR; }
+ case 283: /* fill_mode ::= LINEAR */
+{ yymsp[0].minor.yy192 = FILL_MODE_LINEAR; }
break;
- case 223: /* fill_mode ::= NEXT */
-{ yymsp[0].minor.yy294 = FILL_MODE_NEXT; }
+ case 284: /* fill_mode ::= NEXT */
+{ yymsp[0].minor.yy192 = FILL_MODE_NEXT; }
break;
- case 226: /* group_by_list ::= expression */
-{ yylhsminor.yy24 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy432))); }
- yymsp[0].minor.yy24 = yylhsminor.yy24;
+ case 287: /* group_by_list ::= expression */
+{ yylhsminor.yy64 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy26))); }
+ yymsp[0].minor.yy64 = yylhsminor.yy64;
break;
- case 227: /* group_by_list ::= group_by_list NK_COMMA expression */
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-2].minor.yy24, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy432))); }
- yymsp[-2].minor.yy24 = yylhsminor.yy24;
+ case 288: /* group_by_list ::= group_by_list NK_COMMA expression */
+{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy26))); }
+ yymsp[-2].minor.yy64 = yylhsminor.yy64;
break;
- case 230: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+ case 291: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
{
- yylhsminor.yy432 = addOrderByClause(pCxt, yymsp[-3].minor.yy432, yymsp[-2].minor.yy24);
- yylhsminor.yy432 = addSlimitClause(pCxt, yylhsminor.yy432, yymsp[-1].minor.yy432);
- yylhsminor.yy432 = addLimitClause(pCxt, yylhsminor.yy432, yymsp[0].minor.yy432);
+ yylhsminor.yy26 = addOrderByClause(pCxt, yymsp[-3].minor.yy26, yymsp[-2].minor.yy64);
+ yylhsminor.yy26 = addSlimitClause(pCxt, yylhsminor.yy26, yymsp[-1].minor.yy26);
+ yylhsminor.yy26 = addLimitClause(pCxt, yylhsminor.yy26, yymsp[0].minor.yy26);
}
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 232: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-{ yylhsminor.yy432 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy432, yymsp[0].minor.yy432); }
- yymsp[-3].minor.yy432 = yylhsminor.yy432;
+ case 293: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+{ yylhsminor.yy26 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy26, yymsp[0].minor.yy26); }
+ yymsp[-3].minor.yy26 = yylhsminor.yy26;
break;
- case 237: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
- case 241: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==241);
-{ yymsp[-1].minor.yy432 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+ case 298: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+ case 302: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==302);
+{ yymsp[-1].minor.yy26 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
break;
- case 238: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
- case 242: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==242);
-{ yymsp[-3].minor.yy432 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+ case 299: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+ case 303: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==303);
+{ yymsp[-3].minor.yy26 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
break;
- case 239: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
- case 243: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==243);
-{ yymsp[-3].minor.yy432 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+ case 300: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+ case 304: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==304);
+{ yymsp[-3].minor.yy26 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
break;
- case 244: /* subquery ::= NK_LP query_expression NK_RP */
-{ yylhsminor.yy432 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy432); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 305: /* subquery ::= NK_LP query_expression NK_RP */
+{ yylhsminor.yy26 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy26); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 245: /* search_condition ::= common_expression */
-{ yylhsminor.yy432 = releaseRawExprNode(pCxt, yymsp[0].minor.yy432); }
- yymsp[0].minor.yy432 = yylhsminor.yy432;
+ case 306: /* search_condition ::= common_expression */
+{ yylhsminor.yy26 = releaseRawExprNode(pCxt, yymsp[0].minor.yy26); }
+ yymsp[0].minor.yy26 = yylhsminor.yy26;
break;
- case 248: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-{ yylhsminor.yy432 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy432), yymsp[-1].minor.yy378, yymsp[0].minor.yy257); }
- yymsp[-2].minor.yy432 = yylhsminor.yy432;
+ case 309: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+{ yylhsminor.yy26 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy26), yymsp[-1].minor.yy32, yymsp[0].minor.yy391); }
+ yymsp[-2].minor.yy26 = yylhsminor.yy26;
break;
- case 249: /* ordering_specification_opt ::= */
-{ yymsp[1].minor.yy378 = ORDER_ASC; }
+ case 310: /* ordering_specification_opt ::= */
+{ yymsp[1].minor.yy32 = ORDER_ASC; }
break;
- case 250: /* ordering_specification_opt ::= ASC */
-{ yymsp[0].minor.yy378 = ORDER_ASC; }
+ case 311: /* ordering_specification_opt ::= ASC */
+{ yymsp[0].minor.yy32 = ORDER_ASC; }
break;
- case 251: /* ordering_specification_opt ::= DESC */
-{ yymsp[0].minor.yy378 = ORDER_DESC; }
+ case 312: /* ordering_specification_opt ::= DESC */
+{ yymsp[0].minor.yy32 = ORDER_DESC; }
break;
- case 252: /* null_ordering_opt ::= */
-{ yymsp[1].minor.yy257 = NULL_ORDER_DEFAULT; }
+ case 313: /* null_ordering_opt ::= */
+{ yymsp[1].minor.yy391 = NULL_ORDER_DEFAULT; }
break;
- case 253: /* null_ordering_opt ::= NULLS FIRST */
-{ yymsp[-1].minor.yy257 = NULL_ORDER_FIRST; }
+ case 314: /* null_ordering_opt ::= NULLS FIRST */
+{ yymsp[-1].minor.yy391 = NULL_ORDER_FIRST; }
break;
- case 254: /* null_ordering_opt ::= NULLS LAST */
-{ yymsp[-1].minor.yy257 = NULL_ORDER_LAST; }
+ case 315: /* null_ordering_opt ::= NULLS LAST */
+{ yymsp[-1].minor.yy391 = NULL_ORDER_LAST; }
break;
default:
break;
@@ -2839,13 +3237,15 @@ static void yy_syntax_error(
ParseCTX_FETCH
#define TOKEN yyminor
/************ Begin %syntax_error code ****************************************/
-
- if(TOKEN.z) {
- generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, TOKEN.z);
- } else {
- generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INCOMPLETE_SQL);
+
+ if (pCxt->valid) {
+ if(TOKEN.z) {
+ generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_SYNTAX_ERROR, TOKEN.z);
+ } else {
+ generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INCOMPLETE_SQL);
+ }
+ pCxt->valid = false;
}
- pCxt->valid = false;
/************ End %syntax_error code ******************************************/
ParseARG_STORE /* Suppress warning about unused %extra_argument variable */
ParseCTX_STORE
diff --git a/source/libs/parser/test/parserAstTest.cpp b/source/libs/parser/test/parserAstTest.cpp
index f4c1bde478..bb2f2539e9 100644
--- a/source/libs/parser/test/parserAstTest.cpp
+++ b/source/libs/parser/test/parserAstTest.cpp
@@ -302,6 +302,13 @@ TEST_F(ParserTest, createUser) {
ASSERT_TRUE(run());
}
+TEST_F(ParserTest, alterAccount) {
+ setDatabase("root", "test");
+
+ bind("alter account ac_wxy pass '123456'");
+ ASSERT_TRUE(run(TSDB_CODE_PAR_EXPRIE_STATEMENT));
+}
+
TEST_F(ParserTest, createDnode) {
setDatabase("root", "test");
@@ -312,6 +319,16 @@ TEST_F(ParserTest, createDnode) {
ASSERT_TRUE(run());
}
+TEST_F(ParserTest, alterDnode) {
+ setDatabase("root", "test");
+
+ bind("alter dnode 1 'resetLog'");
+ ASSERT_TRUE(run());
+
+ bind("alter dnode 1 'debugFlag' '134'");
+ ASSERT_TRUE(run());
+}
+
TEST_F(ParserTest, createDatabase) {
setDatabase("root", "test");
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 76a8fc3bd6..017de7e70d 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -18,13 +18,13 @@
#include "functionMgt.h"
typedef struct SLogicPlanContext {
- int32_t errCode;
- int32_t planNodeId;
- int32_t acctId;
+ SPlanContext* pPlanCxt;
} SLogicPlanContext;
-static SLogicNode* createQueryLogicNode(SLogicPlanContext* pCxt, SNode* pStmt);
-static SLogicNode* createLogicNodeByTable(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable);
+typedef int32_t (*FCreateLogicNode)(SLogicPlanContext*, SSelectStmt*, SLogicNode**);
+
+static int32_t doCreateLogicNodeByTable(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable, SLogicNode** pLogicNode);
+static int32_t createQueryLogicNode(SLogicPlanContext* pCxt, SNode* pStmt, SLogicNode** pLogicNode);
typedef struct SRewriteExprCxt {
int32_t errCode;
@@ -66,7 +66,6 @@ static EDealRes doRewriteExpr(SNode** pNode, void* pContext) {
}
typedef struct SNameExprCxt {
- int32_t planNodeId;
int32_t rewriteId;
} SNameExprCxt;
@@ -76,7 +75,7 @@ static EDealRes doNameExpr(SNode* pNode, void* pContext) {
case QUERY_NODE_LOGIC_CONDITION:
case QUERY_NODE_FUNCTION: {
SNameExprCxt* pCxt = (SNameExprCxt*)pContext;
- sprintf(((SExprNode*)pNode)->aliasName, "#expr_%d_%d", pCxt->planNodeId, pCxt->rewriteId++);
+ sprintf(((SExprNode*)pNode)->aliasName, "#expr_%d", pCxt->rewriteId++);
return DEAL_RES_IGNORE_CHILD;
}
default:
@@ -86,131 +85,194 @@ static EDealRes doNameExpr(SNode* pNode, void* pContext) {
return DEAL_RES_CONTINUE;
}
-static int32_t rewriteExpr(int32_t planNodeId, int32_t rewriteId, SNodeList* pExprs, SSelectStmt* pSelect, ESqlClause clause) {
- SNameExprCxt nameCxt = { .planNodeId = planNodeId, .rewriteId = rewriteId };
+static int32_t rewriteExpr(SNodeList* pExprs, SSelectStmt* pSelect, ESqlClause clause) {
+ static int32_t rewriteId = 1;
+ SNameExprCxt nameCxt = { .rewriteId = rewriteId };
nodesWalkList(pExprs, doNameExpr, &nameCxt);
SRewriteExprCxt cxt = { .errCode = TSDB_CODE_SUCCESS, .pExprs = pExprs };
nodesRewriteSelectStmt(pSelect, clause, doRewriteExpr, &cxt);
return cxt.errCode;
}
-static SLogicNode* pushLogicNode(SLogicPlanContext* pCxt, SLogicNode* pRoot, SLogicNode* pNode) {
- if (TSDB_CODE_SUCCESS != pCxt->errCode) {
- goto error;
- }
-
- if (NULL == pRoot) {
- return pNode;
- }
-
- if (NULL == pNode) {
- return pRoot;
- }
-
- if (NULL == pNode->pChildren) {
- pNode->pChildren = nodesMakeList();
- if (NULL == pNode->pChildren) {
- goto error;
+static int32_t pushLogicNode(SLogicPlanContext* pCxt, SLogicNode** pOldRoot, SLogicNode* pNewRoot) {
+ if (NULL == pNewRoot->pChildren) {
+ pNewRoot->pChildren = nodesMakeList();
+ if (NULL == pNewRoot->pChildren) {
+ return TSDB_CODE_OUT_OF_MEMORY;
}
}
- if (TSDB_CODE_SUCCESS != nodesListAppend(pNode->pChildren, (SNode*)pRoot)) {
- goto error;
+ if (TSDB_CODE_SUCCESS != nodesListAppend(pNewRoot->pChildren, (SNode*)*pOldRoot)) {
+ return TSDB_CODE_OUT_OF_MEMORY;
}
- pRoot->pParent = pNode;
- return pNode;
-error:
- nodesDestroyNode((SNode*)pNode);
- return pRoot;
+
+ (*pOldRoot)->pParent = pNewRoot;
+ *pOldRoot = pNewRoot;
+
+ return TSDB_CODE_SUCCESS;
}
-static SLogicNode* createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SRealTableNode* pRealTable) {
+static int32_t createChildLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, FCreateLogicNode func, SLogicNode** pRoot) {
+ SLogicNode* pNode = NULL;
+ int32_t code = func(pCxt, pSelect, &pNode);
+ if (TSDB_CODE_SUCCESS == code && NULL != pNode) {
+ code = pushLogicNode(pCxt, pRoot, pNode);
+ }
+ if (TSDB_CODE_SUCCESS != code) {
+ nodesDestroyNode(pNode);
+ }
+ return code;
+}
+
+static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SRealTableNode* pRealTable, SLogicNode** pLogicNode) {
SScanLogicNode* pScan = (SScanLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_SCAN);
- CHECK_ALLOC(pScan, NULL);
- pScan->node.id = pCxt->planNodeId++;
+ if (NULL == pScan) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
TSWAP(pScan->pMeta, pRealTable->pMeta, STableMeta*);
TSWAP(pScan->pVgroupList, pRealTable->pVgroupList, SVgroupsInfo*);
-
- // set columns to scan
- SNodeList* pCols = NULL;
- CHECK_CODE(nodesCollectColumns(pSelect, SQL_CLAUSE_FROM, pRealTable->table.tableAlias, &pCols), (SLogicNode*)pScan);
- if (NULL != pCols) {
- pScan->pScanCols = nodesCloneList(pCols);
- CHECK_ALLOC(pScan->pScanCols, (SLogicNode*)pScan);
- }
-
- // set output
- if (NULL != pCols) {
- pScan->node.pTargets = nodesCloneList(pCols);
- CHECK_ALLOC(pScan->node.pTargets, (SLogicNode*)pScan);
- }
-
- pScan->scanType = SCAN_TYPE_TABLE;
+ pScan->scanType = pCxt->pPlanCxt->topicQuery ? SCAN_TYPE_TOPIC : SCAN_TYPE_TABLE;
pScan->scanFlag = MAIN_SCAN;
pScan->scanRange = TSWINDOW_INITIALIZER;
pScan->tableName.type = TSDB_TABLE_NAME_T;
- pScan->tableName.acctId = pCxt->acctId;
+ pScan->tableName.acctId = pCxt->pPlanCxt->acctId;
strcpy(pScan->tableName.dbname, pRealTable->table.dbName);
strcpy(pScan->tableName.tname, pRealTable->table.tableName);
- return (SLogicNode*)pScan;
-}
-
-static SLogicNode* createSubqueryLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, STempTableNode* pTable) {
- SLogicNode* pRoot = createQueryLogicNode(pCxt, pTable->pSubquery);
- CHECK_ALLOC(pRoot, NULL);
- SNode* pNode;
- FOREACH(pNode, pRoot->pTargets) {
- strcpy(((SColumnNode*)pNode)->tableAlias, pTable->table.tableAlias);
+ // set columns to scan
+ SNodeList* pCols = NULL;
+ int32_t code = nodesCollectColumns(pSelect, SQL_CLAUSE_FROM, pRealTable->table.tableAlias, &pCols);
+ if (TSDB_CODE_SUCCESS == code && NULL != pCols) {
+ pScan->pScanCols = nodesCloneList(pCols);
+ if (NULL == pScan) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
}
- return pRoot;
+
+ // set output
+ if (TSDB_CODE_SUCCESS == code && NULL != pCols) {
+ pScan->node.pTargets = nodesCloneList(pCols);
+ if (NULL == pScan) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
+ }
+
+ if (TSDB_CODE_SUCCESS == code) {
+ *pLogicNode = (SLogicNode*)pScan;
+ } else {
+ nodesDestroyNode(pScan);
+ }
+
+ return code;
}
-static SLogicNode* createJoinLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SJoinTableNode* pJoinTable) {
+static int32_t createSubqueryLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, STempTableNode* pTable, SLogicNode** pLogicNode) {
+ int32_t code = createQueryLogicNode(pCxt, pTable->pSubquery, pLogicNode);
+ if (TSDB_CODE_SUCCESS == code) {
+ SNode* pNode;
+ FOREACH(pNode, (*pLogicNode)->pTargets) {
+ strcpy(((SColumnNode*)pNode)->tableAlias, pTable->table.tableAlias);
+ }
+ }
+ return code;
+}
+
+static int32_t createJoinLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SJoinTableNode* pJoinTable, SLogicNode** pLogicNode) {
SJoinLogicNode* pJoin = (SJoinLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_JOIN);
- CHECK_ALLOC(pJoin, NULL);
- pJoin->node.id = pCxt->planNodeId++;
+ if (NULL == pJoin) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
pJoin->joinType = pJoinTable->joinType;
+ int32_t code = TSDB_CODE_SUCCESS;
+
// set left and right node
pJoin->node.pChildren = nodesMakeList();
- CHECK_ALLOC(pJoin->node.pChildren, (SLogicNode*)pJoin);
- SLogicNode* pLeft = createLogicNodeByTable(pCxt, pSelect, pJoinTable->pLeft);
- CHECK_ALLOC(pLeft, (SLogicNode*)pJoin);
- CHECK_CODE(nodesListAppend(pJoin->node.pChildren, (SNode*)pLeft), (SLogicNode*)pJoin);
- SLogicNode* pRight = createLogicNodeByTable(pCxt, pSelect, pJoinTable->pRight);
- CHECK_ALLOC(pRight, (SLogicNode*)pJoin);
- CHECK_CODE(nodesListAppend(pJoin->node.pChildren, (SNode*)pRight), (SLogicNode*)pJoin);
+ if (NULL == pJoin->node.pChildren) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
+
+ SLogicNode* pLeft = NULL;
+ if (TSDB_CODE_SUCCESS == code) {
+ code = doCreateLogicNodeByTable(pCxt, pSelect, pJoinTable->pLeft, &pLeft);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = nodesListStrictAppend(pJoin->node.pChildren, (SNode*)pLeft);
+ }
+ }
+
+ SLogicNode* pRight = NULL;
+ if (TSDB_CODE_SUCCESS == code) {
+ code = doCreateLogicNodeByTable(pCxt, pSelect, pJoinTable->pRight, &pRight);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = nodesListStrictAppend(pJoin->node.pChildren, (SNode*)pRight);
+ }
+ }
// set on conditions
- if (NULL != pJoinTable->pOnCond) {
+ if (TSDB_CODE_SUCCESS == code && NULL != pJoinTable->pOnCond) {
pJoin->pOnConditions = nodesCloneNode(pJoinTable->pOnCond);
- CHECK_ALLOC(pJoin->pOnConditions, (SLogicNode*)pJoin);
+ if (NULL == pJoin->pOnConditions) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
}
// set the output
- pJoin->node.pTargets = nodesCloneList(pLeft->pTargets);
- CHECK_ALLOC(pJoin->node.pTargets, (SLogicNode*)pJoin);
- SNodeList* pTargets = nodesCloneList(pRight->pTargets);
- CHECK_ALLOC(pTargets, (SLogicNode*)pJoin);
- nodesListAppendList(pJoin->node.pTargets, pTargets);
+ if (TSDB_CODE_SUCCESS == code) {
+ pJoin->node.pTargets = nodesCloneList(pLeft->pTargets);
+ if (NULL == pJoin->pOnConditions) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = nodesListStrictAppendList(pJoin->node.pTargets, nodesCloneList(pRight->pTargets));
+ }
+ }
- return (SLogicNode*)pJoin;
+ if (TSDB_CODE_SUCCESS == code) {
+ *pLogicNode = (SLogicNode*)pJoin;
+ } else {
+ nodesDestroyNode(pJoin);
+ }
+
+ return code;
}
-static SLogicNode* createLogicNodeByTable(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable) {
+static int32_t doCreateLogicNodeByTable(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable, SLogicNode** pLogicNode) {
switch (nodeType(pTable)) {
case QUERY_NODE_REAL_TABLE:
- return createScanLogicNode(pCxt, pSelect, (SRealTableNode*)pTable);
+ return createScanLogicNode(pCxt, pSelect, (SRealTableNode*)pTable, pLogicNode);
case QUERY_NODE_TEMP_TABLE:
- return createSubqueryLogicNode(pCxt, pSelect, (STempTableNode*)pTable);
+ return createSubqueryLogicNode(pCxt, pSelect, (STempTableNode*)pTable, pLogicNode);
case QUERY_NODE_JOIN_TABLE:
- return createJoinLogicNode(pCxt, pSelect, (SJoinTableNode*)pTable);
+ return createJoinLogicNode(pCxt, pSelect, (SJoinTableNode*)pTable, pLogicNode);
default:
break;
}
- return NULL;
+ return TSDB_CODE_FAILED;
+}
+
+static int32_t createLogicNodeByTable(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable, SLogicNode** pLogicNode) {
+ SLogicNode* pNode = NULL;
+ int32_t code = doCreateLogicNodeByTable(pCxt, pSelect, pTable, &pNode);
+ if (TSDB_CODE_SUCCESS == code) {
+ pNode->pConditions = nodesCloneNode(pSelect->pWhere);
+ if (NULL != pSelect->pWhere && NULL == pNode->pConditions) {
+ nodesDestroyNode(pNode);
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ *pLogicNode = pNode;
+ }
+ return code;
+}
+
+static SColumnNode* createColumnByExpr(SExprNode* pExpr) {
+ SColumnNode* pCol = nodesMakeNode(QUERY_NODE_COLUMN);
+ if (NULL == pCol) {
+ return NULL;
+ }
+ pCol->node.resType = pExpr->resType;
+ strcpy(pCol->colName, pExpr->aliasName);
+ return pCol;
}
typedef struct SCreateColumnCxt {
@@ -245,197 +307,241 @@ static EDealRes doCreateColumn(SNode* pNode, void* pContext) {
return DEAL_RES_CONTINUE;
}
-static SNodeList* createColumnByRewriteExps(SLogicPlanContext* pCxt, SNodeList* pExprs) {
- SCreateColumnCxt cxt = { .errCode = TSDB_CODE_SUCCESS, .pList = nodesMakeList() };
- CHECK_ALLOC(cxt.pList, NULL);
+static int32_t createColumnByRewriteExps(SLogicPlanContext* pCxt, SNodeList* pExprs, SNodeList** pList) {
+ SCreateColumnCxt cxt = { .errCode = TSDB_CODE_SUCCESS, .pList = (NULL == *pList ? nodesMakeList() : *pList) };
+ if (NULL == cxt.pList) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
nodesWalkList(pExprs, doCreateColumn, &cxt);
if (TSDB_CODE_SUCCESS != cxt.errCode) {
nodesDestroyList(cxt.pList);
- return NULL;
+ return cxt.errCode;
}
- return cxt.pList;
+ if (NULL == *pList) {
+ *pList = cxt.pList;
+ }
+ return cxt.errCode;
}
-static SLogicNode* createAggLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect) {
+static int32_t createAggLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SLogicNode** pLogicNode) {
SNodeList* pAggFuncs = NULL;
- CHECK_CODE(nodesCollectFuncs(pSelect, fmIsAggFunc, &pAggFuncs), NULL);
+ int32_t code = nodesCollectFuncs(pSelect, fmIsAggFunc, &pAggFuncs);
+ if (TSDB_CODE_SUCCESS != code) {
+ return code;
+ }
if (NULL == pAggFuncs && NULL == pSelect->pGroupByList) {
- return NULL;
+ return TSDB_CODE_SUCCESS;
}
SAggLogicNode* pAgg = (SAggLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_AGG);
- CHECK_ALLOC(pAgg, NULL);
- pAgg->node.id = pCxt->planNodeId++;
+ if (NULL == pAgg) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
// set grouyp keys, agg funcs and having conditions
if (NULL != pSelect->pGroupByList) {
pAgg->pGroupKeys = nodesCloneList(pSelect->pGroupByList);
- CHECK_ALLOC(pAgg->pGroupKeys, (SLogicNode*)pAgg);
+ if (NULL == pAgg->pGroupKeys) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
}
- if (NULL != pAggFuncs) {
+
+ if (TSDB_CODE_SUCCESS == code && NULL != pAggFuncs) {
pAgg->pAggFuncs = nodesCloneList(pAggFuncs);
- CHECK_ALLOC(pAgg->pAggFuncs, (SLogicNode*)pAgg);
+ if (NULL == pAgg->pAggFuncs) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
}
// rewrite the expression in subsequent clauses
- CHECK_CODE(rewriteExpr(pAgg->node.id, 1, pAgg->pGroupKeys, pSelect, SQL_CLAUSE_GROUP_BY), (SLogicNode*)pAgg);
- CHECK_CODE(rewriteExpr(pAgg->node.id, 1 + LIST_LENGTH(pAgg->pGroupKeys), pAgg->pAggFuncs, pSelect, SQL_CLAUSE_GROUP_BY), (SLogicNode*)pAgg);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = rewriteExpr(pAgg->pGroupKeys, pSelect, SQL_CLAUSE_GROUP_BY);
+ }
+ if (TSDB_CODE_SUCCESS == code) {
+ code = rewriteExpr(pAgg->pAggFuncs, pSelect, SQL_CLAUSE_GROUP_BY);
+ }
- if (NULL != pSelect->pHaving) {
+ if (TSDB_CODE_SUCCESS == code && NULL != pSelect->pHaving) {
pAgg->node.pConditions = nodesCloneNode(pSelect->pHaving);
- CHECK_ALLOC(pAgg->node.pConditions, (SLogicNode*)pAgg);
+ if (NULL == pAgg->node.pConditions) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
}
// set the output
- pAgg->node.pTargets = nodesMakeList();
- CHECK_ALLOC(pAgg->node.pTargets, (SLogicNode*)pAgg);
- if (NULL != pAgg->pGroupKeys) {
- SNodeList* pTargets = createColumnByRewriteExps(pCxt, pAgg->pGroupKeys);
- CHECK_ALLOC(pAgg->node.pTargets, (SLogicNode*)pAgg);
- nodesListAppendList(pAgg->node.pTargets, pTargets);
+ if (TSDB_CODE_SUCCESS == code && NULL != pAgg->pGroupKeys) {
+ code = createColumnByRewriteExps(pCxt, pAgg->pGroupKeys, &pAgg->node.pTargets);
}
- if (NULL != pAgg->pAggFuncs) {
- SNodeList* pTargets = createColumnByRewriteExps(pCxt, pAgg->pAggFuncs);
- CHECK_ALLOC(pTargets, (SLogicNode*)pAgg);
- nodesListAppendList(pAgg->node.pTargets, pTargets);
+ if (TSDB_CODE_SUCCESS == code && NULL != pAgg->pAggFuncs) {
+ code = createColumnByRewriteExps(pCxt, pAgg->pAggFuncs, &pAgg->node.pTargets);
}
-
- return (SLogicNode*)pAgg;
+
+ if (TSDB_CODE_SUCCESS == code) {
+ *pLogicNode = (SLogicNode*)pAgg;
+ } else {
+ nodesDestroyNode(pAgg);
+ }
+
+ return code;
}
-static SLogicNode* createWindowLogicNodeByInterval(SLogicPlanContext* pCxt, SIntervalWindowNode* pInterval, SSelectStmt* pSelect) {
+static int32_t createWindowLogicNodeByInterval(SLogicPlanContext* pCxt, SIntervalWindowNode* pInterval, SSelectStmt* pSelect, SLogicNode** pLogicNode) {
SWindowLogicNode* pWindow = nodesMakeNode(QUERY_NODE_LOGIC_PLAN_WINDOW);
- CHECK_ALLOC(pWindow, NULL);
- pWindow->node.id = pCxt->planNodeId++;
+ if (NULL == pWindow) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
pWindow->winType = WINDOW_TYPE_INTERVAL;
- //SValueNode* pIntervalNode = (SValueNode*)((SRawExprNode*)(pInterval->pInterval))->pNode;
- SValueNode* pIntervalNode = (SValueNode*)(pInterval->pInterval);
-
- pWindow->interval = pIntervalNode->datum.i;
+ pWindow->interval = ((SValueNode*)pInterval->pInterval)->datum.i;
+ pWindow->intervalUnit = ((SValueNode*)pInterval->pInterval)->unit;
pWindow->offset = (NULL != pInterval->pOffset ? ((SValueNode*)pInterval->pOffset)->datum.i : 0);
pWindow->sliding = (NULL != pInterval->pSliding ? ((SValueNode*)pInterval->pSliding)->datum.i : pWindow->interval);
+ pWindow->slidingUnit = (NULL != pInterval->pSliding ? ((SValueNode*)pInterval->pSliding)->unit : pWindow->intervalUnit);
+
+ int32_t code = TSDB_CODE_SUCCESS;
if (NULL != pInterval->pFill) {
pWindow->pFill = nodesCloneNode(pInterval->pFill);
- CHECK_ALLOC(pWindow->pFill, (SLogicNode*)pWindow);
+ if (NULL == pWindow->pFill) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
}
- SNodeList* pFuncs = NULL;
- CHECK_CODE(nodesCollectFuncs(pSelect, fmIsAggFunc, &pFuncs), NULL);
- if (NULL != pFuncs) {
- pWindow->pFuncs = nodesCloneList(pFuncs);
- CHECK_ALLOC(pWindow->pFuncs, (SLogicNode*)pWindow);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = nodesCollectFuncs(pSelect, fmIsAggFunc, &pWindow->pFuncs);
}
- CHECK_CODE(rewriteExpr(pWindow->node.id, 1, pWindow->pFuncs, pSelect, SQL_CLAUSE_WINDOW), (SLogicNode*)pWindow);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = rewriteExpr(pWindow->pFuncs, pSelect, SQL_CLAUSE_WINDOW);
+ }
- pWindow->node.pTargets = createColumnByRewriteExps(pCxt, pWindow->pFuncs);
- CHECK_ALLOC(pWindow->node.pTargets, (SLogicNode*)pWindow);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = createColumnByRewriteExps(pCxt, pWindow->pFuncs, &pWindow->node.pTargets);
+ }
- return (SLogicNode*)pWindow;
+ if (TSDB_CODE_SUCCESS == code) {
+ *pLogicNode = (SLogicNode*)pWindow;
+ } else {
+ nodesDestroyNode(pWindow);
+ }
+
+ return code;
}
-static SLogicNode* createWindowLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect) {
+static int32_t createWindowLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SLogicNode** pLogicNode) {
if (NULL == pSelect->pWindow) {
- return NULL;
+ return TSDB_CODE_SUCCESS;
}
switch (nodeType(pSelect->pWindow)) {
case QUERY_NODE_INTERVAL_WINDOW:
- return createWindowLogicNodeByInterval(pCxt, (SIntervalWindowNode*)pSelect->pWindow, pSelect);
+ return createWindowLogicNodeByInterval(pCxt, (SIntervalWindowNode*)pSelect->pWindow, pSelect, pLogicNode);
default:
break;
}
- return NULL;
+ return TSDB_CODE_FAILED;
}
-static SNodeList* createColumnByProjections(SLogicPlanContext* pCxt, SNodeList* pExprs) {
+static int32_t createColumnByProjections(SLogicPlanContext* pCxt, SNodeList* pExprs, SNodeList** pCols) {
SNodeList* pList = nodesMakeList();
- CHECK_ALLOC(pList, NULL);
+ if (NULL == pList) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+
SNode* pNode;
- FOREACH(pNode, pExprs) {
- SExprNode* pExpr = (SExprNode*)pNode;
- SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN);
- if (NULL == pCol) {
- goto error;
- }
- pCol->node.resType = pExpr->resType;
- strcpy(pCol->colName, pExpr->aliasName);
- if (TSDB_CODE_SUCCESS != nodesListAppend(pList, (SNode*)pCol)) {
- goto error;
+ FOREACH(pNode, pExprs) {
+ if (TSDB_CODE_SUCCESS != nodesListAppend(pList, createColumnByExpr((SExprNode*)pNode))) {
+ nodesDestroyList(pList);
+ return TSDB_CODE_OUT_OF_MEMORY;
}
}
- return pList;
-error:
- nodesDestroyList(pList);
- return NULL;
+
+ *pCols = pList;
+ return TSDB_CODE_SUCCESS;
}
-static SLogicNode* createProjectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect) {
+static int32_t createProjectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SLogicNode** pLogicNode) {
SProjectLogicNode* pProject = (SProjectLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_PROJECT);
- CHECK_ALLOC(pProject, NULL);
- pProject->node.id = pCxt->planNodeId++;
+ if (NULL == pProject) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+
+ int32_t code = TSDB_CODE_SUCCESS;
pProject->pProjections = nodesCloneList(pSelect->pProjectionList);
+ if (NULL == pProject->pProjections) {
+ code = TSDB_CODE_OUT_OF_MEMORY;
+ }
- pProject->node.pTargets = createColumnByProjections(pCxt,pSelect->pProjectionList);
- CHECK_ALLOC(pProject->node.pTargets, (SLogicNode*)pProject);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = createColumnByProjections(pCxt,pSelect->pProjectionList, &pProject->node.pTargets);
+ }
- return (SLogicNode*)pProject;
+ if (TSDB_CODE_SUCCESS == code) {
+ *pLogicNode = (SLogicNode*)pProject;
+ } else {
+ nodesDestroyNode(pProject);
+ }
+
+ return code;
}
-static SLogicNode* createSelectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect) {
- SLogicNode* pRoot = createLogicNodeByTable(pCxt, pSelect, pSelect->pFromTable);
- if (TSDB_CODE_SUCCESS == pCxt->errCode && NULL != pSelect->pWhere) {
- pRoot->pConditions = nodesCloneNode(pSelect->pWhere);
- CHECK_ALLOC(pRoot->pConditions, pRoot);
+static int32_t createSelectLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, SLogicNode** pLogicNode) {
+ SLogicNode* pRoot = NULL;
+ int32_t code = createLogicNodeByTable(pCxt, pSelect, pSelect->pFromTable, &pRoot);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = createChildLogicNode(pCxt, pSelect, createWindowLogicNode, &pRoot);
}
- if (TSDB_CODE_SUCCESS == pCxt->errCode) {
- pRoot = pushLogicNode(pCxt, pRoot, createWindowLogicNode(pCxt, pSelect));
+ if (TSDB_CODE_SUCCESS == code) {
+ code = createChildLogicNode(pCxt, pSelect, createAggLogicNode, &pRoot);
}
- if (TSDB_CODE_SUCCESS == pCxt->errCode) {
- pRoot = pushLogicNode(pCxt, pRoot, createAggLogicNode(pCxt, pSelect));
+ if (TSDB_CODE_SUCCESS == code) {
+ code = createChildLogicNode(pCxt, pSelect, createProjectLogicNode, &pRoot);
}
- if (TSDB_CODE_SUCCESS == pCxt->errCode) {
- pRoot = pushLogicNode(pCxt, pRoot, createProjectLogicNode(pCxt, pSelect));
+
+ if (TSDB_CODE_SUCCESS == code) {
+ *pLogicNode = pRoot;
+ } else {
+ nodesDestroyNode(pRoot);
}
- return pRoot;
+
+ return code;
}
static int32_t getMsgType(ENodeType sqlType) {
return (QUERY_NODE_CREATE_TABLE_STMT == sqlType || QUERY_NODE_CREATE_MULTI_TABLE_STMT == sqlType) ? TDMT_VND_CREATE_TABLE : TDMT_VND_SUBMIT;
}
-static SLogicNode* createVnodeModifLogicNode(SLogicPlanContext* pCxt, SVnodeModifOpStmt* pStmt) {
- SVnodeModifLogicNode* pModif = (SVnodeModifLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_VNODE_MODIF);
- CHECK_ALLOC(pModif, NULL);
+static int32_t createVnodeModifLogicNode(SLogicPlanContext* pCxt, SVnodeModifOpStmt* pStmt, SLogicNode** pLogicNode) {
+ SVnodeModifLogicNode* pModif = nodesMakeNode(QUERY_NODE_LOGIC_PLAN_VNODE_MODIF);
+ if (NULL == pModif) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
pModif->pDataBlocks = pStmt->pDataBlocks;
pModif->msgType = getMsgType(pStmt->sqlNodeType);
- return (SLogicNode*)pModif;
+ *pLogicNode = (SLogicNode*)pModif;
+ return TSDB_CODE_SUCCESS;
}
-static SLogicNode* createQueryLogicNode(SLogicPlanContext* pCxt, SNode* pStmt) {
+static int32_t createQueryLogicNode(SLogicPlanContext* pCxt, SNode* pStmt, SLogicNode** pLogicNode) {
switch (nodeType(pStmt)) {
case QUERY_NODE_SELECT_STMT:
- return createSelectLogicNode(pCxt, (SSelectStmt*)pStmt);
+ return createSelectLogicNode(pCxt, (SSelectStmt*)pStmt, pLogicNode);
case QUERY_NODE_VNODE_MODIF_STMT:
- return createVnodeModifLogicNode(pCxt, (SVnodeModifOpStmt*)pStmt);
+ return createVnodeModifLogicNode(pCxt, (SVnodeModifOpStmt*)pStmt, pLogicNode);
default:
break;
}
- return NULL; // to avoid compiler error
+ return TSDB_CODE_FAILED;
}
int32_t createLogicPlan(SPlanContext* pCxt, SLogicNode** pLogicNode) {
- SLogicPlanContext cxt = { .errCode = TSDB_CODE_SUCCESS, .planNodeId = 1, .acctId = pCxt->acctId };
- SLogicNode* pRoot = createQueryLogicNode(&cxt, pCxt->pAstRoot);
- if (TSDB_CODE_SUCCESS != cxt.errCode) {
- nodesDestroyNode((SNode*)pRoot);
- return cxt.errCode;
+ SLogicPlanContext cxt = { .pPlanCxt = pCxt };
+ int32_t code = createQueryLogicNode(&cxt, pCxt->pAstRoot, pLogicNode);
+ if (TSDB_CODE_SUCCESS != code) {
+ return code;
}
- *pLogicNode = pRoot;
return TSDB_CODE_SUCCESS;
}
diff --git a/source/libs/planner/src/planPhysiCreater.c b/source/libs/planner/src/planPhysiCreater.c
index 0affd93f4d..ebff05e2b7 100644
--- a/source/libs/planner/src/planPhysiCreater.c
+++ b/source/libs/planner/src/planPhysiCreater.c
@@ -259,15 +259,22 @@ static SPhysiNode* createTableScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* p
return (SPhysiNode*)pTableScan;
}
+static SPhysiNode* createStreamScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan, SScanLogicNode* pScanLogicNode) {
+ SStreamScanPhysiNode* pTableScan = (SStreamScanPhysiNode*)makePhysiNode(pCxt, QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN);
+ CHECK_ALLOC(pTableScan, NULL);
+ CHECK_CODE(initScanPhysiNode(pCxt, pScanLogicNode, (SScanPhysiNode*)pTableScan), (SPhysiNode*)pTableScan);
+ return (SPhysiNode*)pTableScan;
+}
+
static SPhysiNode* createScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubplan, SScanLogicNode* pScanLogicNode) {
switch (pScanLogicNode->scanType) {
case SCAN_TYPE_TAG:
return createTagScanPhysiNode(pCxt, pScanLogicNode);
case SCAN_TYPE_TABLE:
return createTableScanPhysiNode(pCxt, pSubplan, pScanLogicNode);
- case SCAN_TYPE_STABLE:
+ case SCAN_TYPE_TOPIC:
case SCAN_TYPE_STREAM:
- break;
+ return createStreamScanPhysiNode(pCxt, pSubplan, pScanLogicNode);
default:
break;
}
@@ -466,11 +473,20 @@ static SPhysiNode* createProjectPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pC
}
static SPhysiNode* createExchangePhysiNode(SPhysiPlanContext* pCxt, SExchangeLogicNode* pExchangeLogicNode) {
- SExchangePhysiNode* pExchange = (SExchangePhysiNode*)makePhysiNode(pCxt, QUERY_NODE_PHYSICAL_PLAN_EXCHANGE);
- CHECK_ALLOC(pExchange, NULL);
- CHECK_CODE(addDataBlockDesc(pCxt, pExchangeLogicNode->node.pTargets, pExchange->node.pOutputDataBlockDesc), (SPhysiNode*)pExchange);
- pExchange->srcGroupId = pExchangeLogicNode->srcGroupId;
- return (SPhysiNode*)pExchange;
+ if (pCxt->pPlanCxt->streamQuery) {
+ SStreamScanPhysiNode* pScan = (SStreamScanPhysiNode*)makePhysiNode(pCxt, QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN);
+ CHECK_ALLOC(pScan, NULL);
+ pScan->pScanCols = nodesCloneList(pExchangeLogicNode->node.pTargets);
+ CHECK_ALLOC(pScan->pScanCols, (SPhysiNode*)pScan);
+ CHECK_CODE(addDataBlockDesc(pCxt, pExchangeLogicNode->node.pTargets, pScan->node.pOutputDataBlockDesc), (SPhysiNode*)pScan);
+ return (SPhysiNode*)pScan;
+ } else {
+ SExchangePhysiNode* pExchange = (SExchangePhysiNode*)makePhysiNode(pCxt, QUERY_NODE_PHYSICAL_PLAN_EXCHANGE);
+ CHECK_ALLOC(pExchange, NULL);
+ CHECK_CODE(addDataBlockDesc(pCxt, pExchangeLogicNode->node.pTargets, pExchange->node.pOutputDataBlockDesc), (SPhysiNode*)pExchange);
+ pExchange->srcGroupId = pExchangeLogicNode->srcGroupId;
+ return (SPhysiNode*)pExchange;
+ }
}
static SPhysiNode* createIntervalPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChildren, SWindowLogicNode* pWindowLogicNode) {
@@ -608,7 +624,9 @@ static SSubplan* createPhysiSubplan(SPhysiPlanContext* pCxt, SSubLogicPlan* pLog
taosArrayPush(pCxt->pExecNodeList, &pSubplan->execNode);
} else {
pSubplan->pNode = createPhysiNode(pCxt, pSubplan, pLogicSubplan->pNode);
- pSubplan->pDataSink = createDataDispatcher(pCxt, pSubplan->pNode);
+ if (!pCxt->pPlanCxt->streamQuery && !pCxt->pPlanCxt->topicQuery) {
+ pSubplan->pDataSink = createDataDispatcher(pCxt, pSubplan->pNode);
+ }
pSubplan->msgType = TDMT_VND_QUERY;
}
return pSubplan;
diff --git a/source/libs/planner/src/planSpliter.c b/source/libs/planner/src/planSpliter.c
index 1d0cbf22df..c8e0852b46 100644
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
@@ -44,7 +44,8 @@ typedef struct SStsInfo {
} SStsInfo;
static SLogicNode* stsMatchByNode(SLogicNode* pNode) {
- if (QUERY_NODE_LOGIC_PLAN_SCAN == nodeType(pNode) && TSDB_SUPER_TABLE == ((SScanLogicNode*)pNode)->pMeta->tableType) {
+ if (QUERY_NODE_LOGIC_PLAN_SCAN == nodeType(pNode) && TSDB_SUPER_TABLE == ((SScanLogicNode*)pNode)->pMeta->tableType &&
+ SCAN_TYPE_TOPIC != ((SScanLogicNode*)pNode)->scanType) {
return pNode;
}
SNode* pChild;
diff --git a/source/libs/planner/test/plannerTest.cpp b/source/libs/planner/test/plannerTest.cpp
index 8baa64d8fb..ccfdb19885 100644
--- a/source/libs/planner/test/plannerTest.cpp
+++ b/source/libs/planner/test/plannerTest.cpp
@@ -17,6 +17,7 @@
#include
+#include "cmdnodes.h"
#include "parser.h"
#include "planInt.h"
@@ -56,7 +57,8 @@ protected:
const string syntaxTreeStr = toString(query_->pRoot, false);
SLogicNode* pLogicPlan = nullptr;
- SPlanContext cxt = { .queryId = 1, .acctId = 0, .pAstRoot = query_->pRoot };
+ SPlanContext cxt = { .queryId = 1, .acctId = 0 };
+ setPlanContext(query_, &cxt);
code = createLogicPlan(&cxt, &pLogicPlan);
if (code != TSDB_CODE_SUCCESS) {
cout << "sql:[" << cxt_.pSql << "] logic plan code:" << code << ", strerror:" << tstrerror(code) << endl;
@@ -94,6 +96,15 @@ protected:
private:
static const int max_err_len = 1024;
+ void setPlanContext(SQuery* pQuery, SPlanContext* pCxt) {
+ if (QUERY_NODE_CREATE_TOPIC_STMT == nodeType(pQuery->pRoot)) {
+ pCxt->pAstRoot = ((SCreateTopicStmt*)pQuery->pRoot)->pQuery;
+ pCxt->topicQuery = true;
+ } else {
+ pCxt->pAstRoot = pQuery->pRoot;
+ }
+ }
+
void reset() {
memset(&cxt_, 0, sizeof(cxt_));
memset(errMagBuf_, 0, max_err_len);
@@ -173,3 +184,10 @@ TEST_F(PlannerTest, interval) {
bind("SELECT count(*) FROM t1 interval(10s)");
ASSERT_TRUE(run());
}
+
+TEST_F(PlannerTest, createTopic) {
+ setDatabase("root", "test");
+
+ bind("create topic tp as SELECT * FROM st1");
+ ASSERT_TRUE(run());
+}
diff --git a/source/libs/qcom/src/queryUtil.c b/source/libs/qcom/src/queryUtil.c
index 63fbf59c06..b39d3e6e37 100644
--- a/source/libs/qcom/src/queryUtil.c
+++ b/source/libs/qcom/src/queryUtil.c
@@ -155,6 +155,10 @@ int32_t asyncSendMsgToServer(void* pTransporter, SEpSet* epSet, int64_t* pTransp
.ahandle = (void*)pInfo,
.handle = pInfo->msgInfo.handle,
.code = 0};
+ if (pInfo->msgType == TDMT_VND_QUERY || pInfo->msgType == TDMT_VND_FETCH ||
+ pInfo->msgType == TDMT_VND_QUERY_CONTINUE) {
+ rpcMsg.persistHandle = 1;
+ }
assert(pInfo->fp != NULL);
diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c
index 270180e347..e4df93ca47 100644
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
@@ -87,7 +87,10 @@
//
int32_t syncNodeOnAppendEntriesCb(SSyncNode* ths, SyncAppendEntries* pMsg) {
int32_t ret = 0;
- syncAppendEntriesLog2("==syncNodeOnAppendEntriesCb==", pMsg);
+
+ char logBuf[128];
+ snprintf(logBuf, sizeof(logBuf), "==syncNodeOnAppendEntriesCb== term:%lu", ths->pRaftStore->currentTerm);
+ syncAppendEntriesLog2(logBuf, pMsg);
if (pMsg->term > ths->pRaftStore->currentTerm) {
syncNodeUpdateTerm(ths, pMsg->term);
diff --git a/source/libs/sync/src/syncAppendEntriesReply.c b/source/libs/sync/src/syncAppendEntriesReply.c
index 9db9a3e8ac..817974fd26 100644
--- a/source/libs/sync/src/syncAppendEntriesReply.c
+++ b/source/libs/sync/src/syncAppendEntriesReply.c
@@ -37,7 +37,10 @@
//
int32_t syncNodeOnAppendEntriesReplyCb(SSyncNode* ths, SyncAppendEntriesReply* pMsg) {
int32_t ret = 0;
- syncAppendEntriesReplyLog2("==syncNodeOnAppendEntriesReplyCb==", pMsg);
+
+ char logBuf[128];
+ snprintf(logBuf, sizeof(logBuf), "==syncNodeOnAppendEntriesReplyCb== term:%lu", ths->pRaftStore->currentTerm);
+ syncAppendEntriesReplyLog2(logBuf, pMsg);
if (pMsg->term < ths->pRaftStore->currentTerm) {
sTrace("DropStaleResponse, receive term:%" PRIu64 ", current term:%" PRIu64 "", pMsg->term,
diff --git a/source/libs/sync/src/syncCommit.c b/source/libs/sync/src/syncCommit.c
index c75d23d96d..0d4df8e6cf 100644
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
@@ -18,6 +18,7 @@
#include "syncInt.h"
#include "syncRaftLog.h"
#include "syncRaftStore.h"
+#include "syncUtil.h"
// \* Leader i advances its commitIndex.
// \* This is done as a separate step from handling AppendEntries responses,
@@ -49,8 +50,11 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
// update commit index
SyncIndex newCommitIndex = pSyncNode->commitIndex;
for (SyncIndex index = pSyncNode->pLogStore->getLastIndex(pSyncNode->pLogStore); index > pSyncNode->commitIndex;
- ++index) {
- if (syncAgree(pSyncNode, index)) {
+ --index) {
+ bool agree = syncAgree(pSyncNode, index);
+ sTrace("syncMaybeAdvanceCommitIndex syncAgree:%d, index:%ld, pSyncNode->commitIndex:%ld", agree, index,
+ pSyncNode->commitIndex);
+ if (agree) {
// term
SSyncRaftEntry* pEntry = pSyncNode->pLogStore->getEntry(pSyncNode->pLogStore, index);
assert(pEntry != NULL);
@@ -68,6 +72,8 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
SyncIndex beginIndex = pSyncNode->commitIndex + 1;
SyncIndex endIndex = newCommitIndex;
+ sTrace("syncMaybeAdvanceCommitIndex sync commit %ld", newCommitIndex);
+
// update commit index
pSyncNode->commitIndex = newCommitIndex;
@@ -97,14 +103,19 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
}
bool syncAgreeIndex(SSyncNode* pSyncNode, SRaftId* pRaftId, SyncIndex index) {
- SyncIndex matchIndex = syncIndexMgrGetIndex(pSyncNode->pMatchIndex, pRaftId);
-
- // b for debug
- bool b = false;
- if (matchIndex >= index) {
- b = true;
+ // I am leader, I agree
+ if (syncUtilSameId(pRaftId, &(pSyncNode->myRaftId)) && pSyncNode->state == TAOS_SYNC_STATE_LEADER) {
+ return true;
}
- return b;
+
+ // follower agree
+ SyncIndex matchIndex = syncIndexMgrGetIndex(pSyncNode->pMatchIndex, pRaftId);
+ if (matchIndex >= index) {
+ return true;
+ }
+
+ // not agree
+ return false;
}
bool syncAgree(SSyncNode* pSyncNode, SyncIndex index) {
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 6c2ef0c85b..829526512b 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -60,11 +60,14 @@ int64_t syncStart(const SSyncInfo* pSyncInfo) {
int32_t ret = 0;
SSyncNode* pSyncNode = syncNodeOpen(pSyncInfo);
assert(pSyncNode != NULL);
+
+ // todo : return ref id
return ret;
}
void syncStop(int64_t rid) {
- SSyncNode* pSyncNode = NULL; // get pointer from rid
+ // todo : get pointer from rid
+ SSyncNode* pSyncNode = NULL;
syncNodeClose(pSyncNode);
}
@@ -74,8 +77,10 @@ int32_t syncReconfig(int64_t rid, const SSyncCfg* pSyncCfg) {
}
int32_t syncForwardToPeer(int64_t rid, const SRpcMsg* pMsg, bool isWeak) {
- int32_t ret = 0;
- SSyncNode* pSyncNode = NULL; // get pointer from rid
+ int32_t ret = 0;
+
+ // todo : get pointer from rid
+ SSyncNode* pSyncNode = NULL;
if (pSyncNode->state == TAOS_SYNC_STATE_LEADER) {
SyncClientRequest* pSyncMsg = syncClientRequestBuild2(pMsg, 0, isWeak);
SRpcMsg rpcMsg;
@@ -86,13 +91,14 @@ int32_t syncForwardToPeer(int64_t rid, const SRpcMsg* pMsg, bool isWeak) {
} else {
sTrace("syncForwardToPeer not leader, %s", syncUtilState2String(pSyncNode->state));
- ret = -1; // need define err code !!
+ ret = -1; // todo : need define err code !!
}
return ret;
}
ESyncState syncGetMyRole(int64_t rid) {
- SSyncNode* pSyncNode = NULL; // get pointer from rid
+ // todo : get pointer from rid
+ SSyncNode* pSyncNode = NULL;
return pSyncNode->state;
}
@@ -195,7 +201,7 @@ SSyncNode* syncNodeOpen(const SSyncInfo* pSyncInfo) {
// init TLA+ log vars
pSyncNode->pLogStore = logStoreCreate(pSyncNode);
assert(pSyncNode->pLogStore != NULL);
- pSyncNode->commitIndex = 0;
+ pSyncNode->commitIndex = SYNC_INDEX_INVALID;
// init ping timer
pSyncNode->pPingTimer = NULL;
@@ -774,9 +780,6 @@ static int32_t syncNodeOnClientRequestCb(SSyncNode* ths, SyncClientRequest* pMsg
if (ths->state == TAOS_SYNC_STATE_LEADER) {
ths->pLogStore->appendEntry(ths->pLogStore, pEntry);
- // only myself, maybe commit
- syncMaybeAdvanceCommitIndex(ths);
-
// start replicate right now!
syncNodeReplicate(ths);
@@ -791,6 +794,9 @@ static int32_t syncNodeOnClientRequestCb(SSyncNode* ths, SyncClientRequest* pMsg
}
rpcFreeCont(rpcMsg.pCont);
+ // only myself, maybe commit
+ syncMaybeAdvanceCommitIndex(ths);
+
} else {
// pre commit
SRpcMsg rpcMsg;
@@ -798,7 +804,7 @@ static int32_t syncNodeOnClientRequestCb(SSyncNode* ths, SyncClientRequest* pMsg
if (ths->pFsm != NULL) {
if (ths->pFsm->FpPreCommitCb != NULL) {
- ths->pFsm->FpPreCommitCb(ths->pFsm, &rpcMsg, pEntry->index, pEntry->isWeak, -1);
+ ths->pFsm->FpPreCommitCb(ths->pFsm, &rpcMsg, pEntry->index, pEntry->isWeak, -2);
}
}
rpcFreeCont(rpcMsg.pCont);
diff --git a/source/libs/sync/src/syncRequestVote.c b/source/libs/sync/src/syncRequestVote.c
index 062b0244bd..e23748a81e 100644
--- a/source/libs/sync/src/syncRequestVote.c
+++ b/source/libs/sync/src/syncRequestVote.c
@@ -43,7 +43,10 @@
//
int32_t syncNodeOnRequestVoteCb(SSyncNode* ths, SyncRequestVote* pMsg) {
int32_t ret = 0;
- syncRequestVoteLog2("==syncNodeOnRequestVoteCb==", pMsg);
+
+ char logBuf[128];
+ snprintf(logBuf, sizeof(logBuf), "==syncNodeOnRequestVoteCb== term:%lu", ths->pRaftStore->currentTerm);
+ syncRequestVoteLog2(logBuf, pMsg);
if (pMsg->term > ths->pRaftStore->currentTerm) {
syncNodeUpdateTerm(ths, pMsg->term);
diff --git a/source/libs/sync/src/syncRequestVoteReply.c b/source/libs/sync/src/syncRequestVoteReply.c
index 12603bb337..1531f701ff 100644
--- a/source/libs/sync/src/syncRequestVoteReply.c
+++ b/source/libs/sync/src/syncRequestVoteReply.c
@@ -38,7 +38,10 @@
//
int32_t syncNodeOnRequestVoteReplyCb(SSyncNode* ths, SyncRequestVoteReply* pMsg) {
int32_t ret = 0;
- syncRequestVoteReplyLog2("==syncNodeOnRequestVoteReplyCb==", pMsg);
+
+ char logBuf[128];
+ snprintf(logBuf, sizeof(logBuf), "==syncNodeOnRequestVoteReplyCb== term:%lu", ths->pRaftStore->currentTerm);
+ syncRequestVoteReplyLog2(logBuf, pMsg);
if (pMsg->term < ths->pRaftStore->currentTerm) {
sTrace("DropStaleResponse, receive term:%" PRIu64 ", current term:%" PRIu64 "", pMsg->term,
diff --git a/source/libs/sync/test/CMakeLists.txt b/source/libs/sync/test/CMakeLists.txt
index 2821764448..0c7608f902 100644
--- a/source/libs/sync/test/CMakeLists.txt
+++ b/source/libs/sync/test/CMakeLists.txt
@@ -30,6 +30,7 @@ add_executable(syncPingSelfTest "")
add_executable(syncElectTest "")
add_executable(syncEncodeTest "")
add_executable(syncWriteTest "")
+add_executable(syncReplicateTest "")
target_sources(syncTest
@@ -160,6 +161,10 @@ target_sources(syncWriteTest
PRIVATE
"syncWriteTest.cpp"
)
+target_sources(syncReplicateTest
+ PRIVATE
+ "syncReplicateTest.cpp"
+)
target_include_directories(syncTest
@@ -327,6 +332,11 @@ target_include_directories(syncWriteTest
"${CMAKE_SOURCE_DIR}/include/libs/sync"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
+target_include_directories(syncReplicateTest
+ PUBLIC
+ "${CMAKE_SOURCE_DIR}/include/libs/sync"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
target_link_libraries(syncTest
@@ -457,6 +467,10 @@ target_link_libraries(syncWriteTest
sync
gtest_main
)
+target_link_libraries(syncReplicateTest
+ sync
+ gtest_main
+)
enable_testing()
diff --git a/source/libs/sync/test/syncElectTest.cpp b/source/libs/sync/test/syncElectTest.cpp
index 502263cfbf..0e0b57a025 100644
--- a/source/libs/sync/test/syncElectTest.cpp
+++ b/source/libs/sync/test/syncElectTest.cpp
@@ -116,10 +116,9 @@ int main(int argc, char** argv) {
//---------------------------
while (1) {
- sTrace("while 1 sleep, state: %d, %s, electTimerLogicClock:%lu, electTimerLogicClockUser:%lu, electTimerMS:%d",
- gSyncNode->state, syncUtilState2String(gSyncNode->state), gSyncNode->electTimerLogicClock,
+ sTrace("elect sleep, state: %d, %s, term:%lu electTimerLogicClock:%lu, electTimerLogicClockUser:%lu, electTimerMS:%d",
+ gSyncNode->state, syncUtilState2String(gSyncNode->state), gSyncNode->pRaftStore->currentTerm, gSyncNode->electTimerLogicClock,
gSyncNode->electTimerLogicClockUser, gSyncNode->electTimerMS);
- taosMsleep(1000);
}
return 0;
diff --git a/source/libs/sync/test/syncReplicateTest.cpp b/source/libs/sync/test/syncReplicateTest.cpp
new file mode 100644
index 0000000000..6c4fab2425
--- /dev/null
+++ b/source/libs/sync/test/syncReplicateTest.cpp
@@ -0,0 +1,188 @@
+#include
+#include
+#include "syncEnv.h"
+#include "syncIO.h"
+#include "syncInt.h"
+#include "syncMessage.h"
+#include "syncRaftEntry.h"
+#include "syncRaftLog.h"
+#include "syncRaftStore.h"
+#include "syncUtil.h"
+
+void logTest() {
+ sTrace("--- sync log test: trace");
+ sDebug("--- sync log test: debug");
+ sInfo("--- sync log test: info");
+ sWarn("--- sync log test: warn");
+ sError("--- sync log test: error");
+ sFatal("--- sync log test: fatal");
+}
+
+uint16_t ports[] = {7010, 7110, 7210, 7310, 7410};
+int32_t replicaNum = 3;
+int32_t myIndex = 0;
+
+SRaftId ids[TSDB_MAX_REPLICA];
+SSyncInfo syncInfo;
+SSyncFSM * pFsm;
+SWal * pWal;
+SSyncNode *gSyncNode;
+
+void CommitCb(struct SSyncFSM *pFsm, const SRpcMsg *pBuf, SyncIndex index, bool isWeak, int32_t code) {
+ printf("==CommitCb== pFsm:%p, index:%ld, isWeak:%d, code:%d \n", pFsm, index, isWeak, code);
+ syncRpcMsgPrint2((char *)"==CommitCb==", (SRpcMsg *)pBuf);
+}
+
+void PreCommitCb(struct SSyncFSM *pFsm, const SRpcMsg *pBuf, SyncIndex index, bool isWeak, int32_t code) {
+ printf("==PreCommitCb== pFsm:%p, index:%ld, isWeak:%d, code:%d \n", pFsm, index, isWeak, code);
+ syncRpcMsgPrint2((char *)"==PreCommitCb==", (SRpcMsg *)pBuf);
+}
+
+void RollBackCb(struct SSyncFSM *pFsm, const SRpcMsg *pBuf, SyncIndex index, bool isWeak, int32_t code) {
+ printf("==RollBackCb== pFsm:%p, index:%ld, isWeak:%d, code:%d \n", pFsm, index, isWeak, code);
+ syncRpcMsgPrint2((char *)"==RollBackCb==", (SRpcMsg *)pBuf);
+}
+
+void initFsm() {
+ pFsm = (SSyncFSM *)malloc(sizeof(SSyncFSM));
+ pFsm->FpCommitCb = CommitCb;
+ pFsm->FpPreCommitCb = PreCommitCb;
+ pFsm->FpRollBackCb = RollBackCb;
+}
+
+SSyncNode *syncNodeInit() {
+ syncInfo.vgId = 1234;
+ syncInfo.rpcClient = gSyncIO->clientRpc;
+ syncInfo.FpSendMsg = syncIOSendMsg;
+ syncInfo.queue = gSyncIO->pMsgQ;
+ syncInfo.FpEqMsg = syncIOEqMsg;
+ syncInfo.pFsm = pFsm;
+ snprintf(syncInfo.path, sizeof(syncInfo.path), "./replicate_test_%d", myIndex);
+
+ int code = walInit();
+ assert(code == 0);
+ SWalCfg walCfg;
+ memset(&walCfg, 0, sizeof(SWalCfg));
+ walCfg.vgId = syncInfo.vgId;
+ walCfg.fsyncPeriod = 1000;
+ walCfg.retentionPeriod = 1000;
+ walCfg.rollPeriod = 1000;
+ walCfg.retentionSize = 1000;
+ walCfg.segSize = 1000;
+ walCfg.level = TAOS_WAL_FSYNC;
+
+ char tmpdir[128];
+ snprintf(tmpdir, sizeof(tmpdir), "./replicate_test_wal_%d", myIndex);
+ pWal = walOpen(tmpdir, &walCfg);
+ assert(pWal != NULL);
+
+ syncInfo.pWal = pWal;
+
+ SSyncCfg *pCfg = &syncInfo.syncCfg;
+ pCfg->myIndex = myIndex;
+ pCfg->replicaNum = replicaNum;
+
+ for (int i = 0; i < replicaNum; ++i) {
+ pCfg->nodeInfo[i].nodePort = ports[i];
+ snprintf(pCfg->nodeInfo[i].nodeFqdn, sizeof(pCfg->nodeInfo[i].nodeFqdn), "%s", "127.0.0.1");
+ // taosGetFqdn(pCfg->nodeInfo[0].nodeFqdn);
+ }
+
+ SSyncNode *pSyncNode = syncNodeOpen(&syncInfo);
+ assert(pSyncNode != NULL);
+
+ gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing;
+ gSyncIO->FpOnSyncClientRequest = pSyncNode->FpOnClientRequest;
+ gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply;
+ gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote;
+ gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply;
+ gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries;
+ gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply;
+ gSyncIO->FpOnSyncTimeout = pSyncNode->FpOnTimeout;
+ gSyncIO->pSyncNode = pSyncNode;
+
+ return pSyncNode;
+}
+
+SSyncNode *syncInitTest() { return syncNodeInit(); }
+
+void initRaftId(SSyncNode *pSyncNode) {
+ for (int i = 0; i < replicaNum; ++i) {
+ ids[i] = pSyncNode->replicasId[i];
+ char *s = syncUtilRaftId2Str(&ids[i]);
+ printf("raftId[%d] : %s\n", i, s);
+ free(s);
+ }
+}
+
+SRpcMsg *step0(int i) {
+ SRpcMsg *pMsg = (SRpcMsg *)malloc(sizeof(SRpcMsg));
+ memset(pMsg, 0, sizeof(SRpcMsg));
+ pMsg->msgType = 9999;
+ pMsg->contLen = 128;
+ pMsg->pCont = malloc(pMsg->contLen);
+ snprintf((char *)(pMsg->pCont), pMsg->contLen, "value-%u-%d", ports[myIndex], i);
+ return pMsg;
+}
+
+SyncClientRequest *step1(const SRpcMsg *pMsg) {
+ SyncClientRequest *pRetMsg = syncClientRequestBuild2(pMsg, 123, true);
+ return pRetMsg;
+}
+
+int main(int argc, char **argv) {
+ // taosInitLog((char *)"syncTest.log", 100000, 10);
+ tsAsyncLog = 0;
+ sDebugFlag = 143 + 64;
+ void logTest();
+
+ myIndex = 0;
+ if (argc >= 2) {
+ myIndex = atoi(argv[1]);
+ }
+
+ int32_t ret = syncIOStart((char *)"127.0.0.1", ports[myIndex]);
+ assert(ret == 0);
+
+ ret = syncEnvStart();
+ assert(ret == 0);
+
+ taosRemoveDir("./wal_test");
+
+ initFsm();
+
+ gSyncNode = syncInitTest();
+ assert(gSyncNode != NULL);
+ syncNodePrint2((char *)"", gSyncNode);
+
+ initRaftId(gSyncNode);
+
+ for (int i = 0; i < 30; ++i) {
+ // step0
+ SRpcMsg *pMsg0 = step0(i);
+ syncRpcMsgPrint2((char *)"==step0==", pMsg0);
+
+ // step1
+ SyncClientRequest *pMsg1 = step1(pMsg0);
+ syncClientRequestPrint2((char *)"==step1==", pMsg1);
+
+ SyncClientRequest *pSyncClientRequest = pMsg1;
+ SRpcMsg rpcMsg;
+ syncClientRequest2RpcMsg(pSyncClientRequest, &rpcMsg);
+ gSyncNode->FpEqMsg(gSyncNode->queue, &rpcMsg);
+
+ taosMsleep(1000);
+ sTrace("replicate sleep, state: %d, %s, term:%lu electTimerLogicClock:%lu, electTimerLogicClockUser:%lu, electTimerMS:%d",
+ gSyncNode->state, syncUtilState2String(gSyncNode->state), gSyncNode->pRaftStore->currentTerm, gSyncNode->electTimerLogicClock,
+ gSyncNode->electTimerLogicClockUser, gSyncNode->electTimerMS);
+ }
+
+ while (1) {
+ sTrace("replicate sleep, state: %d, %s, term:%lu electTimerLogicClock:%lu, electTimerLogicClockUser:%lu, electTimerMS:%d",
+ gSyncNode->state, syncUtilState2String(gSyncNode->state), gSyncNode->pRaftStore->currentTerm, gSyncNode->electTimerLogicClock,
+ gSyncNode->electTimerLogicClockUser, gSyncNode->electTimerMS);
+ taosMsleep(1000);
+ }
+
+ return 0;
+}
diff --git a/source/libs/tdb/CMakeLists.txt b/source/libs/tdb/CMakeLists.txt
index 3cb5a65572..978649499a 100644
--- a/source/libs/tdb/CMakeLists.txt
+++ b/source/libs/tdb/CMakeLists.txt
@@ -1,10 +1,17 @@
-
-set(TDB_SUBDIRS "db")
-foreach(TDB_SUBDIR ${TDB_SUBDIRS})
- aux_source_directory("src/${TDB_SUBDIR}" TDB_SRC)
-endforeach()
-
-add_library(tdb STATIC ${TDB_SRC})
+# tdb
+add_library(tdb "")
+target_sources(tdb
+ PRIVATE
+ "src/db/tdbPCache.c"
+ "src/db/tdbPager.c"
+ "src/db/tdbUtil.c"
+ "src/db/tdbBtree.c"
+ "src/db/tdbDb.c"
+ "src/db/tdbEnv.c"
+ # "src/db/tdbPage.c"
+ "src/page/tdbPage.c"
+ "src/page/tdbPageL.c"
+)
target_include_directories(
tdb
@@ -17,6 +24,7 @@ target_link_libraries(
PUBLIC util
)
+# for test
if(${BUILD_TEST})
add_subdirectory(test)
endif(${BUILD_TEST})
diff --git a/source/libs/tdb/inc/tdb.h b/source/libs/tdb/inc/tdb.h
index cc0d20ef3c..467e40325e 100644
--- a/source/libs/tdb/inc/tdb.h
+++ b/source/libs/tdb/inc/tdb.h
@@ -22,44 +22,42 @@
extern "C" {
#endif
-typedef struct STDb TDB;
-typedef struct STDbEnv TENV;
-typedef struct STDbCurosr TDBC;
+// typedef struct STDb TDB;
+// typedef struct STDbEnv TENV;
+// typedef struct STDbCurosr TDBC;
-typedef int32_t pgsz_t;
-typedef int32_t cachesz_t;
+// typedef int32_t pgsz_t;
+// typedef int32_t cachesz_t;
-typedef int (*TdbKeyCmprFn)(int keyLen1, const void *pKey1, int keyLen2, const void *pKey2);
+// typedef int (*TdbKeyCmprFn)(int keyLen1, const void *pKey1, int keyLen2, const void *pKey2);
-// TEVN
-int tdbEnvCreate(TENV **ppEnv, const char *rootDir);
-int tdbEnvOpen(TENV *ppEnv);
-int tdbEnvClose(TENV *pEnv);
+// // TEVN
+// int tdbEnvCreate(TENV **ppEnv, const char *rootDir);
+// int tdbEnvOpen(TENV *ppEnv);
+// int tdbEnvClose(TENV *pEnv);
-int tdbEnvSetCache(TENV *pEnv, pgsz_t pgSize, cachesz_t cacheSize);
-pgsz_t tdbEnvGetPageSize(TENV *pEnv);
-cachesz_t tdbEnvGetCacheSize(TENV *pEnv);
+// int tdbEnvSetCache(TENV *pEnv, pgsz_t pgSize, cachesz_t cacheSize);
+// pgsz_t tdbEnvGetPageSize(TENV *pEnv);
+// cachesz_t tdbEnvGetCacheSize(TENV *pEnv);
-int tdbEnvBeginTxn(TENV *pEnv);
-int tdbEnvCommit(TENV *pEnv);
+// int tdbEnvBeginTxn(TENV *pEnv);
+// int tdbEnvCommit(TENV *pEnv);
-// TDB
-int tdbCreate(TDB **ppDb);
-int tdbOpen(TDB *pDb, const char *fname, const char *dbname, TENV *pEnv);
-int tdbClose(TDB *pDb);
-int tdbDrop(TDB *pDb);
+// // TDB
+// int tdbCreate(TDB **ppDb);
+// int tdbOpen(TDB *pDb, const char *fname, const char *dbname, TENV *pEnv);
+// int tdbClose(TDB *pDb);
+// int tdbDrop(TDB *pDb);
-int tdbSetKeyLen(TDB *pDb, int klen);
-int tdbSetValLen(TDB *pDb, int vlen);
-int tdbSetDup(TDB *pDb, int dup);
-int tdbSetCmprFunc(TDB *pDb, TdbKeyCmprFn fn);
-int tdbGetKeyLen(TDB *pDb);
-int tdbGetValLen(TDB *pDb);
-int tdbGetDup(TDB *pDb);
+// int tdbSetKeyLen(TDB *pDb, int klen);
+// int tdbSetValLen(TDB *pDb, int vlen);
+// int tdbSetDup(TDB *pDb, int dup);
+// int tdbSetCmprFunc(TDB *pDb, TdbKeyCmprFn fn);
+// int tdbGetKeyLen(TDB *pDb);
+// int tdbGetValLen(TDB *pDb);
+// int tdbGetDup(TDB *pDb);
-int tdbInsert(TDB *pDb, const void *pKey, int nKey, const void *pData, int nData);
-
-// TDBC
+// int tdbInsert(TDB *pDb, const void *pKey, int nKey, const void *pData, int nData);
#ifdef __cplusplus
}
diff --git a/source/libs/tdb/src/db/tdb.c b/source/libs/tdb/src/db/tdb.c
deleted file mode 100644
index 65d4cf80cc..0000000000
--- a/source/libs/tdb/src/db/tdb.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc.
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-#include "tdbInt.h"
-
-struct STDb {
- char dbname[TDB_MAX_DBNAME_LEN];
- SBTree * pBt; // current access method (may extend)
- SPgFile * pPgFile; // backend page file this DB is using
- TENV * pEnv; // TENV containing the DB
- int klen; // key length if know
- int vlen; // value length if know
- bool dup; // dup mode
- TdbKeyCmprFn cFn; // compare function
-};
-
-struct STDbCurosr {
- SBtCursor *pBtCur;
-};
-
-static int tdbDefaultKeyCmprFn(int keyLen1, const void *pKey1, int keyLen2, const void *pKey2);
-
-int tdbCreate(TDB **ppDb) {
- TDB *pDb;
-
- // create the handle
- pDb = (TDB *)calloc(1, sizeof(*pDb));
- if (pDb == NULL) {
- return -1;
- }
-
- pDb->klen = TDB_VARIANT_LEN;
- pDb->vlen = TDB_VARIANT_LEN;
- pDb->dup = false;
- pDb->cFn = tdbDefaultKeyCmprFn;
-
- *ppDb = pDb;
- return 0;
-}
-
-static int tdbDestroy(TDB *pDb) {
- if (pDb) {
- free(pDb);
- }
- return 0;
-}
-
-int tdbOpen(TDB *pDb, const char *fname, const char *dbname, TENV *pEnv) {
- int ret;
- uint8_t fileid[TDB_FILE_ID_LEN];
- SPgFile * pPgFile;
- SPgCache *pPgCache;
- SBTree * pBt;
- bool fileExist;
- size_t dbNameLen;
- pgno_t dbRootPgno;
- char dbfname[128]; // TODO: make this as a macro or malloc on the heap
-
- ASSERT(pDb != NULL);
- ASSERT(fname != NULL);
- // TODO: Here we simply put an assert here. In the future, make `pEnv`
- // can be set as NULL.
- ASSERT(pEnv != NULL);
-
- // check the DB name
- dbNameLen = 0;
- if (dbname) {
- dbNameLen = strlen(dbname);
- if (dbNameLen >= TDB_MAX_DBNAME_LEN) {
- return -1;
- }
-
- memcpy(pDb->dbname, dbname, dbNameLen);
- }
-
- pDb->dbname[dbNameLen] = '\0';
-
- // get page file from the env, if not opened yet, open it
- pPgFile = NULL;
- snprintf(dbfname, 128, "%s/%s", tdbEnvGetRootDir(pEnv), fname);
- fileExist = taosCheckExistFile(fname);
- if (fileExist) {
- tdbGnrtFileID(dbfname, fileid, false);
- pPgFile = tdbEnvGetPageFile(pEnv, fileid);
- }
-
- if (pPgFile == NULL) {
- ret = pgFileOpen(&pPgFile, dbfname, pEnv);
- if (ret != 0) {
- // TODO: handle error
- return -1;
- }
- }
-
- // TODO: get the root page number from the master DB of the page file
- // tdbGet(&dbRootPgno);
- if (dbRootPgno == 0) {
- // DB not exist, create one
- ret = pgFileAllocatePage(pPgFile, &dbRootPgno);
- if (ret != 0) {
- // TODO: handle error
- }
- // tdbInsert(pPgFile->pMasterDB, dbname, strlen(dbname), &dbRootPgno, sizeof(dbRootPgno));
- }
-
- ASSERT(dbRootPgno > 1);
-
- // pDb->pBt->root = dbRootPgno;
-
- // register
- pDb->pPgFile = pPgFile;
- tdbEnvRgstDB(pEnv, pDb);
- pDb->pEnv = pEnv;
-
- return 0;
-}
-
-int tdbClose(TDB *pDb) {
- if (pDb == NULL) return 0;
- return tdbDestroy(pDb);
-}
-
-int tdbDrop(TDB *pDb) {
- // TODO
- return 0;
-}
-
-int tdbSetKeyLen(TDB *pDb, int klen) {
- // TODO: check `klen`
- pDb->klen = klen;
- return 0;
-}
-
-int tdbSetValLen(TDB *pDb, int vlen) {
- // TODO: check `vlen`
- pDb->vlen = vlen;
- return 0;
-}
-
-int tdbSetDup(TDB *pDb, int dup) {
- if (dup) {
- pDb->dup = true;
- } else {
- pDb->dup = false;
- }
- return 0;
-}
-
-int tdbSetCmprFunc(TDB *pDb, TdbKeyCmprFn fn) {
- if (fn == NULL) {
- return -1;
- } else {
- pDb->cFn = fn;
- }
- return 0;
-}
-
-int tdbGetKeyLen(TDB *pDb) { return pDb->klen; }
-
-int tdbGetValLen(TDB *pDb) { return pDb->vlen; }
-
-int tdbGetDup(TDB *pDb) {
- if (pDb->dup) {
- return 1;
- } else {
- return 0;
- }
-}
-
-int tdbInsert(TDB *pDb, const void *pKey, int nKey, const void *pData, int nData) {
- // TODO
- return 0;
-}
-
-static int tdbDefaultKeyCmprFn(int keyLen1, const void *pKey1, int keyLen2, const void *pKey2) {
- int mlen;
- int cret;
-
- ASSERT(keyLen1 > 0 && keyLen2 > 0 && pKey1 != NULL && pKey2 != NULL);
-
- mlen = keyLen1 < keyLen2 ? keyLen1 : keyLen2;
- cret = memcmp(pKey1, pKey2, mlen);
- if (cret == 0) {
- if (keyLen1 < keyLen2) {
- cret = -1;
- } else if (keyLen1 > keyLen2) {
- cret = 1;
- } else {
- cret = 0;
- }
- }
- return cret;
-}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
index a2520babe5..c6e8c9dca9 100644
--- a/source/libs/tdb/src/db/tdbBtree.c
+++ b/source/libs/tdb/src/db/tdbBtree.c
@@ -15,46 +15,99 @@
#include "tdbInt.h"
-struct SBtCursor {
- SBTree *pBtree;
- pgno_t pgno;
- SPage * pPage; // current page traversing
+#define TDB_BTREE_ROOT 0x1
+#define TDB_BTREE_LEAF 0x2
+
+#define TDB_BTREE_PAGE_IS_ROOT(flags) TDB_FLAG_HAS(flags, TDB_BTREE_ROOT)
+#define TDB_BTREE_PAGE_IS_LEAF(flags) TDB_FLAG_HAS(flags, TDB_BTREE_LEAF)
+#define TDB_BTREE_ASSERT_FLAG(flags) \
+ ASSERT(TDB_FLAG_IS(flags, TDB_BTREE_ROOT) || TDB_FLAG_IS(flags, TDB_BTREE_LEAF) || \
+ TDB_FLAG_IS(flags, TDB_BTREE_ROOT | TDB_BTREE_LEAF) || TDB_FLAG_IS(flags, 0))
+
+struct SBTree {
+ SPgno root;
+ int keyLen;
+ int valLen;
+ SPager *pPager;
+ FKeyComparator kcmpr;
+ u8 fanout;
+ int pageSize;
+ int maxLocal;
+ int minLocal;
+ int maxLeaf;
+ int minLeaf;
+ u8 *pTmp;
};
+typedef struct __attribute__((__packed__)) {
+ SPgno rChild;
+} SBtPageHdr;
+
typedef struct {
- pgno_t pgno;
- pgsz_t offset;
-} SBtIdx;
+ u16 flags;
+ SBTree *pBt;
+} SBtreeZeroPageArg;
-// Btree page header definition
-#pragma pack (push,1)
typedef struct {
- uint8_t flag; // page flag
- int32_t vlen; // value length of current page, TDB_VARIANT_LEN for variant length
- uint16_t nPayloads; // number of total payloads
- pgoff_t freeOff; // free payload offset
- pgsz_t fragSize; // total fragment size
- pgoff_t offPayload; // payload offset
- pgno_t rChildPgno; // right most child page number
-} SBtPgHdr;
-#pragma pack(pop)
+ int kLen;
+ u8 *pKey;
+ int vLen;
+ u8 *pVal;
+ SPgno pgno;
+ u8 *pTmpSpace;
+} SCellDecoder;
-typedef int (*BtreeCmprFn)(const void *, const void *);
+static int tdbBtCursorMoveTo(SBtCursor *pCur, const void *pKey, int kLen, int *pCRst);
+static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2);
+static int tdbBtreeOpenImpl(SBTree *pBt);
+static int tdbBtreeZeroPage(SPage *pPage, void *arg);
+static int tdbBtreeInitPage(SPage *pPage, void *arg);
+static int tdbBtreeEncodeCell(SPage *pPage, const void *pKey, int kLen, const void *pVal, int vLen, SCell *pCell,
+ int *szCell);
+static int tdbBtreeDecodeCell(SPage *pPage, const SCell *pCell, SCellDecoder *pDecoder);
+static int tdbBtreeBalance(SBtCursor *pCur);
-#define BTREE_PAGE_HDR(pPage) NULL /* TODO */
-#define BTREE_PAGE_PAYLOAD_AT(pPage, idx) NULL /*TODO*/
-#define BTREE_PAGE_IS_LEAF(pPage) 0 /* TODO */
-
-static int btreeCreate(SBTree **ppBt);
-static int btreeDestroy(SBTree *pBt);
-static int btreeCursorMoveToChild(SBtCursor *pBtCur, pgno_t pgno);
-
-int btreeOpen(SBTree **ppBt, SPgFile *pPgFile) {
+int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, SBTree **ppBt) {
SBTree *pBt;
int ret;
- ret = btreeCreate(&pBt);
- if (ret != 0) {
+ *ppBt = NULL;
+
+ pBt = (SBTree *)calloc(1, sizeof(*pBt));
+ if (pBt == NULL) {
+ return -1;
+ }
+
+ // pBt->keyLen
+ pBt->keyLen = keyLen;
+ // pBt->valLen
+ pBt->valLen = valLen;
+ // pBt->pPager
+ pBt->pPager = pPager;
+ // pBt->kcmpr
+ pBt->kcmpr = kcmpr ? kcmpr : tdbDefaultKeyCmprFn;
+ // pBt->fanout
+ if (keyLen == TDB_VARIANT_LEN) {
+ pBt->fanout = TDB_DEFAULT_FANOUT;
+ } else {
+ ASSERT(0);
+ // TODO: pBt->fanout = 0;
+ }
+ // pBt->pageSize
+ pBt->pageSize = tdbPagerGetPageSize(pPager);
+ // pBt->maxLocal
+ pBt->maxLocal = (pBt->pageSize - 14) / pBt->fanout;
+ // pBt->minLocal: Should not be allowed smaller than 15, which is [nPayload][nKey][nData]
+ pBt->minLocal = (pBt->pageSize - 14) / pBt->fanout / 2;
+ // pBt->maxLeaf
+ pBt->maxLeaf = pBt->pageSize - 14;
+ // pBt->minLeaf
+ pBt->minLeaf = pBt->minLocal;
+
+ // TODO: pBt->root
+ ret = tdbBtreeOpenImpl(pBt);
+ if (ret < 0) {
+ free(pBt);
return -1;
}
@@ -62,105 +115,828 @@ int btreeOpen(SBTree **ppBt, SPgFile *pPgFile) {
return 0;
}
-int btreeClose(SBTree *pBt) {
+int tdbBtreeClose(SBTree *pBt) {
// TODO
return 0;
}
-static int btreeCreate(SBTree **ppBt) {
+int tdbBtreeCursor(SBtCursor *pCur, SBTree *pBt) {
+ pCur->pBt = pBt;
+ pCur->iPage = -1;
+ pCur->pPage = NULL;
+ pCur->idx = -1;
+
+ return 0;
+}
+
+int tdbBtCursorInsert(SBtCursor *pCur, const void *pKey, int kLen, const void *pVal, int vLen) {
+ int ret;
+ int idx;
+ SPager *pPager;
+ SCell *pCell;
+ int szCell;
+ int cret;
SBTree *pBt;
- pBt = (SBTree *)calloc(1, sizeof(*pBt));
- if (pBt == NULL) {
+ ret = tdbBtCursorMoveTo(pCur, pKey, kLen, &cret);
+ if (ret < 0) {
+ // TODO: handle error
return -1;
}
- // TODO
- return 0;
-}
-
-static int btreeDestroy(SBTree *pBt) {
- if (pBt) {
- free(pBt);
- }
- return 0;
-}
-
-int btreeCursorOpen(SBtCursor *pBtCur, SBTree *pBt) {
- // TODO
- return 0;
-}
-
-int btreeCursorClose(SBtCursor *pBtCur) {
- // TODO
- return 0;
-}
-
-int btreeCursorMoveTo(SBtCursor *pBtCur, int kLen, const void *pKey) {
- SPage * pPage;
- SBtPgHdr * pBtPgHdr;
- SPgFile * pPgFile;
- pgno_t childPgno;
- pgno_t rootPgno;
- int nPayloads;
- void * pPayload;
- BtreeCmprFn cmpFn;
-
- // 1. Move the cursor to the root page
- if (rootPgno == TDB_IVLD_PGNO) {
- // No any data in this btree, just return not found (TODO)
- return 0;
+ if (pCur->idx == -1) {
+ ASSERT(TDB_PAGE_NCELLS(pCur->pPage) == 0);
+ idx = 0;
} else {
- // Load the page from the file by the SPgFile handle
- pPage = pgFileFetch(pPgFile, rootPgno);
-
- pBtCur->pPage = pPage;
- }
-
- // 2. Loop to search over the whole tree
- for (;;) {
- int lidx, ridx, midx, cret;
-
- pPage = pBtCur->pPage;
- pBtPgHdr = BTREE_PAGE_HDR(pPage);
- nPayloads = pBtPgHdr->nPayloads;
-
- // Binary search the page
- lidx = 0;
- ridx = nPayloads - 1;
- midx = (lidx + ridx) >> 1;
- for (;;) {
- // get the payload ptr at midx
- pPayload = BTREE_PAGE_PAYLOAD_AT(pPage, midx);
-
- // the payload and the key
- cret = cmpFn(pKey, pPayload);
-
- if (cret < 0) {
- /* TODO */
- } else if (cret > 0) {
- /* TODO */
- } else {
- /* TODO */
- }
-
- if (lidx > ridx) break;
- midx = (lidx + ridx) >> 1;
- }
- if (BTREE_PAGE_IS_LEAF(pPage)) {
- /* TODO */
- break;
+ if (cret > 0) {
+ idx = pCur->idx + 1;
+ } else if (cret < 0) {
+ idx = pCur->idx;
} else {
/* TODO */
- btreeCursorMoveToChild(pBtCur, childPgno);
+ ASSERT(0);
+ }
+ }
+
+ // TODO: refact code here
+ pBt = pCur->pBt;
+ if (!pBt->pTmp) {
+ pBt->pTmp = (u8 *)malloc(pBt->pageSize);
+ if (pBt->pTmp == NULL) {
+ return -1;
+ }
+ }
+
+ pCell = pBt->pTmp;
+
+ // Encode the cell
+ ret = tdbBtreeEncodeCell(pCur->pPage, pKey, kLen, pVal, vLen, pCell, &szCell);
+ if (ret < 0) {
+ return -1;
+ }
+
+ // Insert the cell to the index
+ ret = tdbPageInsertCell(pCur->pPage, idx, pCell, szCell);
+ if (ret < 0) {
+ return -1;
+ }
+
+ // If page is overflow, balance the tree
+ if (pCur->pPage->nOverflow > 0) {
+ ret = tdbBtreeBalance(pCur);
+ if (ret < 0) {
+ return -1;
}
}
return 0;
}
-static int btreeCursorMoveToChild(SBtCursor *pBtCur, pgno_t pgno) {
- SPgFile *pPgFile;
+static int tdbBtCursorMoveToChild(SBtCursor *pCur, SPgno pgno) {
// TODO
return 0;
-}
\ No newline at end of file
+}
+
+static int tdbBtCursorMoveTo(SBtCursor *pCur, const void *pKey, int kLen, int *pCRst) {
+ int ret;
+ SBTree *pBt;
+ SPager *pPager;
+
+ pBt = pCur->pBt;
+ pPager = pBt->pPager;
+
+ if (pCur->iPage < 0) {
+ ASSERT(pCur->iPage == -1);
+ ASSERT(pCur->idx == -1);
+
+ // Move from the root
+ ret = tdbPagerFetchPage(pPager, pBt->root, &(pCur->pPage), tdbBtreeInitPage, pBt);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ pCur->iPage = 0;
+
+ if (TDB_PAGE_NCELLS(pCur->pPage) == 0) {
+ // Current page is empty
+ ASSERT(TDB_FLAG_IS(TDB_PAGE_FLAGS(pCur->pPage), TDB_BTREE_ROOT | TDB_BTREE_LEAF));
+ return 0;
+ }
+
+ for (;;) {
+ int lidx, ridx, midx, c, nCells;
+ SCell *pCell;
+ SPage *pPage;
+ SCellDecoder cd = {0};
+
+ pPage = pCur->pPage;
+ nCells = TDB_PAGE_NCELLS(pPage);
+ lidx = 0;
+ ridx = nCells - 1;
+
+ ASSERT(nCells > 0);
+
+ for (;;) {
+ if (lidx > ridx) break;
+
+ midx = (lidx + ridx) >> 1;
+
+ pCell = TDB_PAGE_CELL_AT(pPage, midx);
+ ret = tdbBtreeDecodeCell(pPage, pCell, &cd);
+ if (ret < 0) {
+ // TODO: handle error
+ ASSERT(0);
+ return -1;
+ }
+
+ // Compare the key values
+ c = pBt->kcmpr(pKey, kLen, cd.pKey, cd.kLen);
+ if (c < 0) {
+ /* input-key < cell-key */
+ ridx = midx - 1;
+ } else if (c > 0) {
+ /* input-key > cell-key */
+ lidx = midx + 1;
+ } else {
+ /* input-key == cell-key */
+ break;
+ }
+ }
+
+ // Move downward or break
+ u16 flags = TDB_PAGE_FLAGS(pPage);
+ u8 leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+ if (leaf) {
+ pCur->idx = midx;
+ *pCRst = c;
+ break;
+ } else {
+ if (c <= 0) {
+ pCur->idx = midx;
+ tdbBtCursorMoveToChild(pCur, cd.pgno);
+ } else {
+ if (midx == nCells - 1) {
+ /* Move to right-most child */
+ pCur->idx = midx + 1;
+ tdbBtCursorMoveToChild(pCur, ((SBtPageHdr *)(pPage->pAmHdr))->rChild);
+ } else {
+ // TODO: reset cd as uninitialized
+ pCur->idx = midx + 1;
+ pCell = TDB_PAGE_CELL_AT(pPage, midx + 1);
+ tdbBtreeDecodeCell(pPage, pCell, &cd);
+ tdbBtCursorMoveToChild(pCur, cd.pgno);
+ }
+ }
+ }
+ }
+
+ } else {
+ // TODO: Move the cursor from a some position instead of a clear state
+ ASSERT(0);
+ }
+
+ return 0;
+}
+
+static int tdbBtCursorMoveToRoot(SBtCursor *pCur) {
+ SBTree *pBt;
+ SPager *pPager;
+ SPage *pPage;
+ int ret;
+
+ pBt = pCur->pBt;
+ pPager = pBt->pPager;
+
+ // pPage = tdbPagerGet(pPager, pBt->root, true);
+ // if (pPage == NULL) {
+ // // TODO: handle error
+ // }
+
+ // ret = tdbInitBtPage(pPage, &pBtPage);
+ // if (ret < 0) {
+ // // TODO
+ // return 0;
+ // }
+
+ // pCur->pPage = pBtPage;
+ // pCur->iPage = 0;
+
+ return 0;
+}
+
+static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2) {
+ int mlen;
+ int cret;
+
+ ASSERT(keyLen1 > 0 && keyLen2 > 0 && pKey1 != NULL && pKey2 != NULL);
+
+ mlen = keyLen1 < keyLen2 ? keyLen1 : keyLen2;
+ cret = memcmp(pKey1, pKey2, mlen);
+ if (cret == 0) {
+ if (keyLen1 < keyLen2) {
+ cret = -1;
+ } else if (keyLen1 > keyLen2) {
+ cret = 1;
+ } else {
+ cret = 0;
+ }
+ }
+ return cret;
+}
+
+static int tdbBtreeOpenImpl(SBTree *pBt) {
+ // Try to get the root page of the an existing btree
+
+ SPgno pgno;
+ SPage *pPage;
+ int ret;
+
+ {
+ // 1. TODO: Search the main DB to check if the DB exists
+ pgno = 0;
+ }
+
+ if (pgno != 0) {
+ pBt->root = pgno;
+ return 0;
+ }
+
+ // Try to create a new database
+ SBtreeZeroPageArg zArg = {.flags = TDB_BTREE_ROOT | TDB_BTREE_LEAF, .pBt = pBt};
+ ret = tdbPagerNewPage(pBt->pPager, &pgno, &pPage, tdbBtreeZeroPage, &zArg);
+ if (ret < 0) {
+ return -1;
+ }
+
+ // TODO: Unref the page
+
+ ASSERT(pgno != 0);
+ pBt->root = pgno;
+
+ return 0;
+}
+
+static int tdbBtreeInitPage(SPage *pPage, void *arg) {
+ SBTree *pBt;
+ u16 flags;
+ u8 isLeaf;
+
+ pBt = (SBTree *)arg;
+
+ flags = TDB_PAGE_FLAGS(pPage);
+ isLeaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+ if (isLeaf) {
+ pPage->szAmHdr = 0;
+ } else {
+ pPage->szAmHdr = sizeof(SBtPageHdr);
+ }
+ pPage->pPageHdr = pPage->pData;
+ pPage->pAmHdr = pPage->pPageHdr + pPage->pPageMethods->szPageHdr;
+ pPage->pCellIdx = pPage->pAmHdr + pPage->szAmHdr;
+ pPage->pFreeStart = pPage->pCellIdx + pPage->pPageMethods->szOffset * TDB_PAGE_NCELLS(pPage);
+ pPage->pFreeEnd = pPage->pData + TDB_PAGE_CCELLS(pPage);
+ pPage->pPageFtr = (SPageFtr *)(pPage->pData + pPage->pageSize - sizeof(SPageFtr));
+
+ TDB_BTREE_ASSERT_FLAG(flags);
+
+ // Init other fields
+ if (isLeaf) {
+ pPage->kLen = pBt->keyLen;
+ pPage->vLen = pBt->valLen;
+ pPage->maxLocal = pBt->maxLeaf;
+ pPage->minLocal = pBt->minLeaf;
+ } else {
+ pPage->kLen = pBt->keyLen;
+ pPage->vLen = sizeof(SPgno);
+ pPage->maxLocal = pBt->maxLocal;
+ pPage->minLocal = pBt->minLocal;
+ }
+
+ // TODO: need to update the SPage.nFree
+ pPage->nFree = pPage->pFreeEnd - pPage->pFreeStart;
+ pPage->nOverflow = 0;
+
+ return 0;
+}
+
+static int tdbBtreeZeroPage(SPage *pPage, void *arg) {
+ u16 flags;
+ SBTree *pBt;
+
+ flags = ((SBtreeZeroPageArg *)arg)->flags;
+ pBt = ((SBtreeZeroPageArg *)arg)->pBt;
+
+ pPage->pPageHdr = pPage->pData;
+
+ // Init the page header
+ TDB_PAGE_FLAGS_SET(pPage, flags);
+ TDB_PAGE_NCELLS_SET(pPage, 0);
+ TDB_PAGE_CCELLS_SET(pPage, pBt->pageSize - sizeof(SPageFtr));
+ TDB_PAGE_FCELL_SET(pPage, 0);
+ TDB_PAGE_NFREE_SET(pPage, 0);
+
+ tdbBtreeInitPage(pPage, (void *)pBt);
+
+ return 0;
+}
+
+#ifndef TDB_BTREE_BALANCE
+typedef struct {
+ SBTree *pBt;
+ SPage *pParent;
+ int idx;
+ i8 nOld;
+ SPage *pOldPages[3];
+ i8 nNewPages;
+ SPage *pNewPages[5];
+} SBtreeBalanceHelper;
+
+static int tdbBtreeCopyPageContent(SPage *pFrom, SPage *pTo) {
+ int nCells = TDB_PAGE_NCELLS(pFrom);
+ int cCells = TDB_PAGE_CCELLS(pFrom);
+ int fCell = TDB_PAGE_FCELL(pFrom);
+ int nFree = TDB_PAGE_NFREE(pFrom);
+
+ pTo->pFreeStart = pTo->pCellIdx + nCells * pFrom->pPageMethods->szOffset;
+ memcpy(pTo->pCellIdx, pFrom->pCellIdx, nCells * pFrom->pPageMethods->szOffset);
+ pTo->pFreeEnd = (u8 *)pTo->pPageFtr - (u8 *)(pFrom->pPageFtr) + pFrom->pFreeEnd;
+ memcpy(pTo->pFreeEnd, pFrom->pFreeEnd, (u8 *)pFrom->pPageFtr - pFrom->pFreeEnd);
+
+ TDB_PAGE_NCELLS_SET(pTo, nCells);
+ TDB_PAGE_CCELLS_SET(pTo, cCells);
+ TDB_PAGE_FCELL_SET(pTo, fCell);
+ TDB_PAGE_NFREE_SET(pTo, nFree);
+
+ // TODO: update other fields
+
+ return 0;
+}
+
+static int tdbBtreeBalanceDeeper(SBTree *pBt, SPage *pRoot, SPage **ppChild) {
+ SPager *pPager;
+ SPage *pChild;
+ SPgno pgnoChild;
+ int ret;
+ SBtreeZeroPageArg zArg;
+
+ pPager = pRoot->pPager;
+
+ // Allocate a new child page
+ zArg.flags = TDB_BTREE_LEAF;
+ zArg.pBt = pBt;
+ ret = tdbPagerNewPage(pPager, &pgnoChild, &pChild, tdbBtreeZeroPage, &zArg);
+ if (ret < 0) {
+ return -1;
+ }
+
+ // Copy the root page content to the child page
+ ret = tdbBtreeCopyPageContent(pRoot, pChild);
+ if (ret < 0) {
+ return -1;
+ }
+
+ pChild->nOverflow = pRoot->nOverflow;
+ for (int i = 0; i < pChild->nOverflow; i++) {
+ pChild->apOvfl[i] = pRoot->apOvfl[i];
+ pChild->aiOvfl[i] = pRoot->aiOvfl[i];
+ }
+
+ // Reinitialize the root page
+ zArg.flags = TDB_BTREE_ROOT;
+ zArg.pBt = pBt;
+ ret = tdbBtreeZeroPage(pRoot, &zArg);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ((SBtPageHdr *)pRoot->pAmHdr)[0].rChild = pgnoChild;
+
+ *ppChild = pChild;
+ return 0;
+}
+
+static int tdbBtreeBalanceStep1(SBtreeBalanceHelper *pBlh) {
+ int nCells;
+ int i;
+ int idxStart;
+ int nChild;
+ int ret;
+ SPage *pParent;
+ SPgno pgno;
+ SCell *pCell;
+ SCellDecoder cd;
+ SBTree *pBt;
+
+ pParent = pBlh->pParent;
+ nCells = TDB_PAGE_NCELLS(pParent);
+ nChild = nCells + 1;
+ pBt = pBlh->pBt;
+
+ // TODO: ASSERT below needs to be removed
+ ASSERT(pParent->nOverflow == 0);
+ ASSERT(pBlh->idx <= nCells);
+
+ if (nChild < 3) {
+ idxStart = 0;
+ pBlh->nOld = nChild;
+ } else {
+ if (pBlh->idx == 0) {
+ idxStart = 0;
+ } else if (pBlh->idx == nCells) {
+ idxStart = pBlh->idx - 2;
+ } else {
+ idxStart = pBlh->idx - 1;
+ }
+ pBlh->nOld = 3;
+ }
+
+ i = pBlh->nOld - 1;
+
+ if (idxStart + i == nCells) {
+ pgno = ((SBtPageHdr *)(pParent->pAmHdr))[0].rChild;
+ } else {
+ pCell = TDB_PAGE_CELL_AT(pParent, idxStart + i);
+ // TODO: no need to decode the payload part, and even the kLen, vLen part
+ // we only need the pgno part
+ ret = tdbBtreeDecodeCell(pParent, pCell, &cd);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+ pgno = cd.pgno;
+ }
+ for (;;) {
+ ret = tdbPagerFetchPage(pBt->pPager, pgno, &(pBlh->pOldPages[i]), tdbBtreeInitPage, pBt);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ // Loop over
+ if ((i--) == 0) break;
+
+ {
+ // TODO
+ // ASSERT(0);
+ }
+ }
+
+ return 0;
+}
+
+static int tdbBtreeBalanceStep2(SBtreeBalanceHelper *pBlh) {
+#if 0
+ SPage *pPage;
+ int oidx;
+ int cidx;
+ int limit;
+ SCell *pCell;
+
+ for (int i = 0; i < pBlh->nOld; i++) {
+ pPage = pBlh->pOldPages[i];
+ oidx = 0;
+ cidx = 0;
+
+ if (oidx < pPage->nOverflow) {
+ limit = pPage->aiOvfl[oidx];
+ } else {
+ limit = pPage->pPageHdr->nCells;
+ }
+
+ // Loop to copy each cell pointer out
+ for (;;) {
+ if (oidx >= pPage->nOverflow && cidx >= pPage->pPageHdr->nCells) break;
+
+ if (cidx < limit) {
+ // Get local cells
+ pCell = TDB_PAGE_CELL_AT(pPage, cidx);
+ } else if (cidx == limit) {
+ // Get overflow cells
+ pCell = pPage->apOvfl[oidx++];
+
+ if (oidx < pPage->nOverflow) {
+ limit = pPage->aiOvfl[oidx];
+ } else {
+ limit = pPage->pPageHdr->nCells;
+ }
+ } else {
+ ASSERT(0);
+ }
+ }
+
+ {
+ // TODO: Copy divider cells here
+ }
+ }
+
+ /* TODO */
+
+#endif
+ return 0;
+}
+
+static int tdbBtreeBalanceStep3(SBtreeBalanceHelper *pBlh) {
+ // Figure out number of pages needed after balance
+ for (int i = 0; i < pBlh->nOld; i++) {
+ /* TODO */
+ }
+
+ return 0;
+}
+
+static int tdbBtreeBalanceStep4(SBtreeBalanceHelper *pBlh) {
+ // TODO
+ return 0;
+}
+
+static int tdbBtreeBalanceStep5(SBtreeBalanceHelper *pBlh) {
+ // TODO
+ return 0;
+}
+
+static int tdbBtreeBalanceStep6(SBtreeBalanceHelper *pBlh) {
+ // TODO
+ return 0;
+}
+
+static int tdbBtreeBalanceNonRoot(SBTree *pBt, SPage *pParent, int idx) {
+ int ret;
+ SBtreeBalanceHelper blh;
+
+ ASSERT(!TDB_BTREE_PAGE_IS_LEAF(TDB_PAGE_FLAGS(pParent)));
+
+ blh.pBt = pBt;
+ blh.pParent = pParent;
+ blh.idx = idx;
+
+ // Step 1: find two sibling pages and get engough info about the old pages
+ ret = tdbBtreeBalanceStep1(&blh);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ // Step 2: Load all cells on the old page and the divider cells
+ ret = tdbBtreeBalanceStep2(&blh);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ // Step 3: Get the number of pages needed to hold all cells
+ ret = tdbBtreeBalanceStep3(&blh);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ // Step 4: Allocate enough new pages. Reuse old pages as much as possible
+ ret = tdbBtreeBalanceStep4(&blh);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ // Step 5: Insert new divider cells into pParent
+ ret = tdbBtreeBalanceStep5(&blh);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ // Step 6: Update the sibling pages
+ ret = tdbBtreeBalanceStep6(&blh);
+ if (ret < 0) {
+ ASSERT(0);
+ return -1;
+ }
+
+ {
+ // TODO: Reset states
+ }
+
+ {
+ // TODO: Clear resources
+ }
+
+ return 0;
+}
+
+static int tdbBtreeBalance(SBtCursor *pCur) {
+ int iPage;
+ SPage *pParent;
+ SPage *pPage;
+ int ret;
+ u16 flags;
+ u8 leaf;
+ u8 root;
+
+ // Main loop to balance the BTree
+ for (;;) {
+ iPage = pCur->iPage;
+ pPage = pCur->pPage;
+ flags = TDB_PAGE_FLAGS(pPage);
+ leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+ root = TDB_BTREE_PAGE_IS_ROOT(flags);
+
+ // TODO: Get the page free space if not get yet
+ // if (pPage->nFree < 0) {
+ // if (tdbBtreeComputeFreeSpace(pPage) < 0) {
+ // return -1;
+ // }
+ // }
+
+ // when the page is not overflow and not too empty, the balance work
+ // is finished. Just break out the balance loop.
+ if (pPage->nOverflow == 0 /* TODO: && pPage->nFree <= */) {
+ break;
+ }
+
+ if (iPage == 0) {
+ // For the root page, only balance when the page is overfull,
+ // ignore the case of empty
+ if (pPage->nOverflow == 0) break;
+
+ ret = tdbBtreeBalanceDeeper(pCur->pBt, pCur->pPage, &(pCur->pgStack[1]));
+ if (ret < 0) {
+ return -1;
+ }
+
+ pCur->idx = 0;
+ pCur->idxStack[0] = 0;
+ pCur->pgStack[0] = pCur->pPage;
+ pCur->iPage = 1;
+ pCur->pPage = pCur->pgStack[1];
+ } else {
+ // Generalized balance step
+ pParent = pCur->pgStack[iPage - 1];
+
+ ret = tdbBtreeBalanceNonRoot(pCur->pBt, pParent, pCur->idxStack[pCur->iPage - 1]);
+ if (ret < 0) {
+ return -1;
+ }
+
+ pCur->iPage--;
+ pCur->pPage = pCur->pgStack[pCur->iPage];
+ }
+ }
+
+ return 0;
+}
+#endif
+
+#ifndef TDB_BTREE_CELL // =========================================================
+static int tdbBtreeEncodePayload(SPage *pPage, u8 *pPayload, const void *pKey, int kLen, const void *pVal, int vLen,
+ int *szPayload) {
+ int nPayload;
+
+ ASSERT(pKey != NULL);
+
+ if (pVal == NULL) {
+ vLen = 0;
+ }
+
+ nPayload = kLen + vLen;
+ if (nPayload <= pPage->maxLocal) {
+ // General case without overflow
+ memcpy(pPayload, pKey, kLen);
+ if (pVal) {
+ memcpy(pPayload + kLen, pVal, vLen);
+ }
+
+ *szPayload = nPayload;
+ return 0;
+ }
+
+ {
+ // TODO: handle overflow case
+ ASSERT(0);
+ }
+
+ return 0;
+}
+
+static int tdbBtreeEncodeCell(SPage *pPage, const void *pKey, int kLen, const void *pVal, int vLen, SCell *pCell,
+ int *szCell) {
+ u16 flags;
+ u8 leaf;
+ int nHeader;
+ int nPayload;
+ int ret;
+
+ ASSERT(pPage->kLen == TDB_VARIANT_LEN || pPage->kLen == kLen);
+ ASSERT(pPage->vLen == TDB_VARIANT_LEN || pPage->vLen == vLen);
+
+ nPayload = 0;
+ nHeader = 0;
+ flags = TDB_PAGE_FLAGS(pPage);
+ leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+
+ // 1. Encode Header part
+ /* Encode kLen if need */
+ if (pPage->kLen == TDB_VARIANT_LEN) {
+ nHeader += tdbPutVarInt(pCell + nHeader, kLen);
+ }
+
+ /* Encode vLen if need */
+ if (pPage->vLen == TDB_VARIANT_LEN) {
+ nHeader += tdbPutVarInt(pCell + nHeader, vLen);
+ }
+
+ /* Encode SPgno if interior page */
+ if (!leaf) {
+ ASSERT(pPage->vLen == sizeof(SPgno));
+
+ ((SPgno *)(pCell + nHeader))[0] = ((SPgno *)pVal)[0];
+ nHeader = nHeader + sizeof(SPgno);
+ }
+
+ // 2. Encode payload part
+ if (leaf) {
+ ret = tdbBtreeEncodePayload(pPage, pCell + nHeader, pKey, kLen, pVal, vLen, &nPayload);
+ } else {
+ ret = tdbBtreeEncodePayload(pPage, pCell + nHeader, pKey, kLen, NULL, 0, &nPayload);
+ }
+ if (ret < 0) {
+ // TODO: handle error
+ return -1;
+ }
+
+ *szCell = nHeader + nPayload;
+ return 0;
+}
+
+static int tdbBtreeDecodePayload(SPage *pPage, const u8 *pPayload, SCellDecoder *pDecoder) {
+ int nPayload;
+
+ ASSERT(pDecoder->pKey == NULL);
+
+ if (pDecoder->pVal) {
+ nPayload = pDecoder->kLen + pDecoder->vLen;
+ } else {
+ nPayload = pDecoder->kLen;
+ }
+
+ if (nPayload <= pPage->maxLocal) {
+ // General case without overflow
+ pDecoder->pKey = (void *)pPayload;
+ if (!pDecoder->pVal) {
+ pDecoder->pVal = (void *)(pPayload + pDecoder->kLen);
+ }
+ } else {
+ // TODO: handle overflow case
+ ASSERT(0);
+ }
+
+ return 0;
+}
+
+static int tdbBtreeDecodeCell(SPage *pPage, const SCell *pCell, SCellDecoder *pDecoder) {
+ u16 flags;
+ u8 leaf;
+ int nHeader;
+ int ret;
+
+ nHeader = 0;
+ flags = TDB_PAGE_FLAGS(pPage);
+ leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+
+ // Clear the state of decoder
+ pDecoder->kLen = -1;
+ pDecoder->pKey = NULL;
+ pDecoder->vLen = -1;
+ pDecoder->pVal = NULL;
+ pDecoder->pgno = 0;
+
+ // 1. Decode header part
+ if (pPage->kLen == TDB_VARIANT_LEN) {
+ nHeader += tdbGetVarInt(pCell + nHeader, &(pDecoder->kLen));
+ } else {
+ pDecoder->kLen = pPage->kLen;
+ }
+
+ if (pPage->vLen == TDB_VARIANT_LEN) {
+ nHeader += tdbGetVarInt(pCell + nHeader, &(pDecoder->vLen));
+ } else {
+ pDecoder->vLen = pPage->vLen;
+ }
+
+ if (!leaf) {
+ ASSERT(pPage->vLen == sizeof(SPgno));
+
+ pDecoder->pgno = ((SPgno *)(pCell + nHeader))[0];
+ pDecoder->pVal = (u8 *)(&(pDecoder->pgno));
+ nHeader = nHeader + sizeof(SPgno);
+ }
+
+ // 2. Decode payload part
+ ret = tdbBtreeDecodePayload(pPage, pCell + nHeader, pDecoder);
+ if (ret < 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
+#endif
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbDb.c b/source/libs/tdb/src/db/tdbDb.c
new file mode 100644
index 0000000000..00f38a19bb
--- /dev/null
+++ b/source/libs/tdb/src/db/tdbDb.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "tdbInt.h"
+
+struct STDb {
+ STEnv *pEnv;
+ SBTree *pBt;
+};
+
+int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, STDb **ppDb) {
+ STDb *pDb;
+ SPager *pPager;
+ int ret;
+ char fFullName[TDB_FILENAME_LEN];
+ SPage *pPage;
+ SPgno pgno;
+
+ *ppDb = NULL;
+
+ pDb = (STDb *)calloc(1, sizeof(*pDb));
+ if (pDb == NULL) {
+ return -1;
+ }
+
+ // pDb->pEnv
+ pDb->pEnv = pEnv;
+
+ pPager = tdbEnvGetPager(pEnv, fname);
+ if (pPager == NULL) {
+ snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, fname);
+ ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager);
+ if (ret < 0) {
+ return -1;
+ }
+ }
+
+ ASSERT(pPager != NULL);
+
+ // pDb->pBt
+ ret = tdbBtreeOpen(keyLen, valLen, pPager, keyCmprFn, &(pDb->pBt));
+ if (ret < 0) {
+ return -1;
+ }
+
+ *ppDb = pDb;
+ return 0;
+}
+
+int tdbDbClose(STDb *pDb) {
+ // TODO
+ return 0;
+}
+
+int tdbDbDrop(STDb *pDb) {
+ // TODO
+ return 0;
+}
+
+int tdbDbInsert(STDb *pDb, const void *pKey, int keyLen, const void *pVal, int valLen) {
+ SBtCursor btc;
+ SBtCursor *pCur;
+ int ret;
+
+ pCur = &btc;
+ ret = tdbBtreeCursor(pCur, pDb->pBt);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ret = tdbBtCursorInsert(pCur, pKey, keyLen, pVal, valLen);
+ if (ret < 0) {
+ return -1;
+ }
+
+ return 0;
+}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbEnv.c b/source/libs/tdb/src/db/tdbEnv.c
index 30e8fab039..9a4dcdbcd5 100644
--- a/source/libs/tdb/src/db/tdbEnv.c
+++ b/source/libs/tdb/src/db/tdbEnv.c
@@ -15,155 +15,56 @@
#include "tdbInt.h"
-struct STDbEnv {
- char * rootDir; // root directory of the environment
- char * jname; // journal file name
- TdFilePtr jpFile; // journal file fd
- pgsz_t pgSize; // page size
- cachesz_t cacheSize; // total cache size
- STDbList dbList; // TDB List
- SPgFileList pgfList; // SPgFile List
- SPgCache * pPgCache; // page cache
- struct {
-#define TDB_ENV_PGF_HASH_BUCKETS 17
- SPgFileList buckets[TDB_ENV_PGF_HASH_BUCKETS];
- } pgfht; // page file hash table;
-};
-
-#define TDB_ENV_PGF_HASH(fileid) (((uint8_t *)(fileid))[0] + ((uint8_t *)(fileid))[1] + ((uint8_t *)(fileid))[2])
-
-static int tdbEnvDestroy(TENV *pEnv);
-
-int tdbEnvCreate(TENV **ppEnv, const char *rootDir) {
- TENV * pEnv;
- size_t slen;
- size_t jlen;
-
- ASSERT(rootDir != NULL);
+int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv) {
+ STEnv *pEnv;
+ int dsize;
+ int zsize;
+ u8 *pPtr;
+ int ret;
*ppEnv = NULL;
- slen = strlen(rootDir);
- jlen = slen + strlen(TDB_JOURNAL_NAME) + 1;
- pEnv = (TENV *)calloc(1, sizeof(*pEnv) + slen + 1 + jlen + 1);
- if (pEnv == NULL) {
+
+ dsize = strlen(rootDir);
+ zsize = sizeof(*pEnv) + dsize * 2 + strlen(TDB_JOURNAL_NAME) + 3;
+
+ pPtr = (uint8_t *)calloc(1, zsize);
+ if (pPtr == NULL) {
return -1;
}
- pEnv->rootDir = (char *)(&pEnv[1]);
- pEnv->jname = pEnv->rootDir + slen + 1;
- pEnv->jpFile = NULL;
- pEnv->pgSize = TDB_DEFAULT_PGSIZE;
- pEnv->cacheSize = TDB_DEFAULT_CACHE_SIZE;
+ pEnv = (STEnv *)pPtr;
+ pPtr += sizeof(*pEnv);
+ // pEnv->rootDir
+ pEnv->rootDir = pPtr;
+ memcpy(pEnv->rootDir, rootDir, dsize);
+ pEnv->rootDir[dsize] = '\0';
+ pPtr = pPtr + dsize + 1;
+ // pEnv->jfname
+ pEnv->jfname = pPtr;
+ memcpy(pEnv->jfname, rootDir, dsize);
+ pEnv->jfname[dsize] = '/';
+ memcpy(pEnv->jfname + dsize + 1, TDB_JOURNAL_NAME, strlen(TDB_JOURNAL_NAME));
+ pEnv->jfname[dsize + 1 + strlen(TDB_JOURNAL_NAME)] = '\0';
- memcpy(pEnv->rootDir, rootDir, slen);
- pEnv->rootDir[slen] = '\0';
- sprintf(pEnv->jname, "%s/%s", rootDir, TDB_JOURNAL_NAME);
+ pEnv->jfd = -1;
- TD_DLIST_INIT(&(pEnv->dbList));
- TD_DLIST_INIT(&(pEnv->pgfList));
+ ret = tdbPCacheOpen(pageSize, cacheSize, &(pEnv->pCache));
+ if (ret < 0) {
+ return -1;
+ }
- /* TODO */
+ mkdir(rootDir, 0755);
*ppEnv = pEnv;
return 0;
}
-int tdbEnvOpen(TENV *pEnv) {
- SPgCache *pPgCache;
- int ret;
-
- ASSERT(pEnv != NULL);
-
- /* TODO: here we do not need to create the root directory, more
- * work should be done here
- */
- mkdir(pEnv->rootDir, 0755);
-
- ret = pgCacheOpen(&pPgCache, pEnv);
- if (ret != 0) {
- goto _err;
- }
-
- pEnv->pPgCache = pPgCache;
- return 0;
-
-_err:
- return -1;
-}
-
-int tdbEnvClose(TENV *pEnv) {
- if (pEnv == NULL) return 0;
- pgCacheClose(pEnv->pPgCache);
- tdbEnvDestroy(pEnv);
- return 0;
-}
-
-int tdbEnvSetCache(TENV *pEnv, pgsz_t pgSize, cachesz_t cacheSize) {
- if (!TDB_IS_PGSIZE_VLD(pgSize) || cacheSize / pgSize < 10) {
- return -1;
- }
-
- /* TODO */
-
- pEnv->pgSize = pgSize;
- pEnv->cacheSize = cacheSize;
-
- return 0;
-}
-
-pgsz_t tdbEnvGetPageSize(TENV *pEnv) { return pEnv->pgSize; }
-
-cachesz_t tdbEnvGetCacheSize(TENV *pEnv) { return pEnv->cacheSize; }
-
-SPgFile *tdbEnvGetPageFile(TENV *pEnv, const uint8_t fileid[]) {
- SPgFileList *pBucket;
- SPgFile * pPgFile;
-
- pBucket = pEnv->pgfht.buckets + (TDB_ENV_PGF_HASH(fileid) % TDB_ENV_PGF_HASH_BUCKETS); // TODO
- for (pPgFile = TD_DLIST_HEAD(pBucket); pPgFile != NULL; pPgFile = TD_DLIST_NODE_NEXT_WITH_FIELD(pPgFile, envHash)) {
- if (memcmp(fileid, pPgFile->fileid, TDB_FILE_ID_LEN) == 0) break;
- };
-
- return pPgFile;
-}
-
-SPgCache *tdbEnvGetPgCache(TENV *pEnv) { return pEnv->pPgCache; }
-
-static int tdbEnvDestroy(TENV *pEnv) {
+int tdbEnvClose(STEnv *pEnv) {
// TODO
return 0;
}
-int tdbEnvBeginTxn(TENV *pEnv) {
- pEnv->jpFile = taosOpenFile(pEnv->jname, TD_FILE_CTEATE | TD_FILE_WRITE | TD_FILE_READ);
- if (pEnv->jpFile == NULL) {
- return -1;
- }
-
- return 0;
-}
-
-int tdbEnvCommit(TENV *pEnv) {
- /* TODO */
- taosCloseFile(&pEnv->jpFile);
- pEnv->jpFile = NULL;
- return 0;
-}
-
-const char *tdbEnvGetRootDir(TENV *pEnv) { return pEnv->rootDir; }
-
-int tdbEnvRgstPageFile(TENV *pEnv, SPgFile *pPgFile) {
- SPgFileList *pBucket;
-
- TD_DLIST_APPEND_WITH_FIELD(&(pEnv->pgfList), pPgFile, envPgfList);
-
- pBucket = pEnv->pgfht.buckets + (TDB_ENV_PGF_HASH(pPgFile->fileid) % TDB_ENV_PGF_HASH_BUCKETS); // TODO
- TD_DLIST_APPEND_WITH_FIELD(pBucket, pPgFile, envHash);
-
- return 0;
-}
-
-int tdbEnvRgstDB(TENV *pEnv, TDB *pDb) {
+SPager *tdbEnvGetPager(STEnv *pEnv, const char *fname) {
// TODO
- return 0;
+ return NULL;
}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c
new file mode 100644
index 0000000000..29f7395cbc
--- /dev/null
+++ b/source/libs/tdb/src/db/tdbPCache.c
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+#include "tdbInt.h"
+
+struct SPCache {
+ int pageSize;
+ int cacheSize;
+ pthread_mutex_t mutex;
+ int nFree;
+ SPage *pFree;
+ int nPage;
+ int nHash;
+ SPage **pgHash;
+ int nRecyclable;
+ SPage lru;
+};
+
+#define PCACHE_PAGE_HASH(pPgid) \
+ ({ \
+ u32 *t = (u32 *)((pPgid)->fileid); \
+ t[0] + t[1] + t[2] + t[3] + t[4] + t[5] + (pPgid)->pgno; \
+ })
+#define PAGE_IS_PINNED(pPage) ((pPage)->pLruNext == NULL)
+
+// For page ref
+#define TDB_INIT_PAGE_REF(pPage) ((pPage)->nRef = 0)
+#if 0
+#define TDB_REF_PAGE(pPage) (++(pPage)->nRef)
+#define TDB_UNREF_PAGE(pPage) (--(pPage)->nRef)
+#define TDB_GET_PAGE_REF(pPage) ((pPage)->nRef)
+#else
+#define TDB_REF_PAGE(pPage) atomic_add_fetch_32(&((pPage)->nRef), 1)
+#define TDB_UNREF_PAGE(pPage) atomic_sub_fetch_32(&((pPage)->nRef), 1)
+#define TDB_GET_PAGE_REF(pPage) atomic_load_32(&((pPage)->nRef))
+#endif
+
+static int tdbPCacheOpenImpl(SPCache *pCache);
+static void tdbPCacheInitLock(SPCache *pCache);
+static void tdbPCacheClearLock(SPCache *pCache);
+static void tdbPCacheLock(SPCache *pCache);
+static void tdbPCacheUnlock(SPCache *pCache);
+static bool tdbPCacheLocked(SPCache *pCache);
+static SPage *tdbPCacheFetchImpl(SPCache *pCache, const SPgid *pPgid, bool alcNewPage);
+static void tdbPCachePinPage(SPage *pPage);
+static void tdbPCacheRemovePageFromHash(SPage *pPage);
+static void tdbPCacheAddPageToHash(SPage *pPage);
+static void tdbPCacheUnpinPage(SPage *pPage);
+static void *tdbOsMalloc(void *arg, size_t size);
+static void tdbOsFree(void *arg, void *ptr);
+
+int tdbPCacheOpen(int pageSize, int cacheSize, SPCache **ppCache) {
+ SPCache *pCache;
+ void *pPtr;
+ SPage *pPgHdr;
+
+ pCache = (SPCache *)calloc(1, sizeof(*pCache));
+ if (pCache == NULL) {
+ return -1;
+ }
+
+ pCache->pageSize = pageSize;
+ pCache->cacheSize = cacheSize;
+
+ if (tdbPCacheOpenImpl(pCache) < 0) {
+ free(pCache);
+ return -1;
+ }
+
+ *ppCache = pCache;
+ return 0;
+}
+
+int tdbPCacheClose(SPCache *pCache) {
+ /* TODO */
+ return 0;
+}
+
+SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage) {
+ SPage *pPage;
+
+ tdbPCacheLock(pCache);
+
+ pPage = tdbPCacheFetchImpl(pCache, pPgid, alcNewPage);
+ if (pPage) {
+ TDB_REF_PAGE(pPage);
+ }
+
+ tdbPCacheUnlock(pCache);
+
+ return pPage;
+}
+
+void tdbPCacheRelease(SPage *pPage) {
+ i32 nRef;
+
+ nRef = TDB_UNREF_PAGE(pPage);
+ ASSERT(nRef >= 0);
+
+ if (nRef == 0) {
+ if (1 /*TODO: page still clean*/) {
+ tdbPCacheUnpinPage(pPage);
+ } else {
+ // TODO
+ ASSERT(0);
+ }
+ }
+}
+
+static void tdbPCacheInitLock(SPCache *pCache) { pthread_mutex_init(&(pCache->mutex), NULL); }
+
+static void tdbPCacheClearLock(SPCache *pCache) { pthread_mutex_destroy(&(pCache->mutex)); }
+
+static void tdbPCacheLock(SPCache *pCache) { pthread_mutex_lock(&(pCache->mutex)); }
+
+static void tdbPCacheUnlock(SPCache *pCache) { pthread_mutex_unlock(&(pCache->mutex)); }
+
+static bool tdbPCacheLocked(SPCache *pCache) {
+ assert(0);
+ // TODO
+ return true;
+}
+
+static SPage *tdbPCacheFetchImpl(SPCache *pCache, const SPgid *pPgid, bool alcNewPage) {
+ SPage *pPage;
+
+ // 1. Search the hash table
+ pPage = pCache->pgHash[PCACHE_PAGE_HASH(pPgid) % pCache->nHash];
+ while (pPage) {
+ if (TDB_IS_SAME_PAGE(&(pPage->pgid), pPgid)) break;
+ pPage = pPage->pHashNext;
+ }
+
+ if (pPage || !alcNewPage) {
+ if (pPage) {
+ tdbPCachePinPage(pPage);
+ }
+ return pPage;
+ }
+
+ // 2. Try to allocate a new page from the free list
+ if (pCache->pFree) {
+ pPage = pCache->pFree;
+ pCache->pFree = pPage->pFreeNext;
+ pCache->nFree--;
+ pPage->pLruNext = NULL;
+ }
+
+ // 3. Try to Recycle a page
+ if (!pPage && !pCache->lru.pLruPrev->isAnchor) {
+ pPage = pCache->lru.pLruPrev;
+ tdbPCacheRemovePageFromHash(pPage);
+ tdbPCachePinPage(pPage);
+ }
+
+ // 4. Try a stress allocation (TODO)
+
+ // 5. Page here are just created from a free list
+ // or by recycling or allocated streesly,
+ // need to initialize it
+ if (pPage) {
+ memcpy(&(pPage->pgid), pPgid, sizeof(*pPgid));
+ pPage->pLruNext = NULL;
+ pPage->pPager = NULL;
+ tdbPCacheAddPageToHash(pPage);
+ }
+
+ return pPage;
+}
+
+static void tdbPCachePinPage(SPage *pPage) {
+ SPCache *pCache;
+
+ pCache = pPage->pCache;
+ if (!PAGE_IS_PINNED(pPage)) {
+ pPage->pLruPrev->pLruNext = pPage->pLruNext;
+ pPage->pLruNext->pLruPrev = pPage->pLruPrev;
+ pPage->pLruNext = NULL;
+
+ pCache->nRecyclable--;
+ }
+}
+
+static void tdbPCacheUnpinPage(SPage *pPage) {
+ SPCache *pCache;
+ i32 nRef;
+
+ pCache = pPage->pCache;
+
+ tdbPCacheLock(pCache);
+
+ nRef = TDB_GET_PAGE_REF(pPage);
+ ASSERT(nRef >= 0);
+ if (nRef == 0) {
+ // Add the page to LRU list
+ ASSERT(pPage->pLruNext == NULL);
+
+ pPage->pLruPrev = &(pCache->lru);
+ pPage->pLruNext = pCache->lru.pLruNext;
+ pCache->lru.pLruNext->pLruPrev = pPage;
+ pCache->lru.pLruNext = pPage;
+ }
+
+ pCache->nRecyclable++;
+
+ tdbPCacheUnlock(pCache);
+}
+
+static void tdbPCacheRemovePageFromHash(SPage *pPage) {
+ SPCache *pCache;
+ SPage **ppPage;
+ int h;
+
+ pCache = pPage->pCache;
+ h = PCACHE_PAGE_HASH(&(pPage->pgid));
+ for (ppPage = &(pCache->pgHash[h % pCache->nHash]); *ppPage != pPage; ppPage = &((*ppPage)->pHashNext))
+ ;
+ ASSERT(*ppPage == pPage);
+ *ppPage = pPage->pHashNext;
+
+ pCache->nPage--;
+}
+
+static void tdbPCacheAddPageToHash(SPage *pPage) {
+ SPCache *pCache;
+ int h;
+
+ pCache = pPage->pCache;
+ h = PCACHE_PAGE_HASH(&(pPage->pgid)) % pCache->nHash;
+
+ pPage->pHashNext = pCache->pgHash[h];
+ pCache->pgHash[h] = pPage;
+
+ pCache->nPage++;
+}
+
+static int tdbPCacheOpenImpl(SPCache *pCache) {
+ SPage *pPage;
+ u8 *pPtr;
+ int tsize;
+ int ret;
+
+ tdbPCacheInitLock(pCache);
+
+ // Open the free list
+ pCache->nFree = 0;
+ pCache->pFree = NULL;
+ for (int i = 0; i < pCache->cacheSize; i++) {
+ ret = tdbPageCreate(pCache->pageSize, &pPage, tdbOsMalloc, NULL);
+ if (ret < 0) {
+ // TODO: handle error
+ return -1;
+ }
+
+ // pPage->pgid = 0;
+ pPage->isAnchor = 0;
+ pPage->isLocalPage = 1;
+ pPage->pCache = pCache;
+ TDB_INIT_PAGE_REF(pPage);
+ pPage->pHashNext = NULL;
+ pPage->pLruNext = NULL;
+ pPage->pLruPrev = NULL;
+ pPage->pDirtyNext = NULL;
+
+ pPage->pFreeNext = pCache->pFree;
+ pCache->pFree = pPage;
+ pCache->nFree++;
+ }
+
+ // Open the hash table
+ pCache->nPage = 0;
+ pCache->nHash = pCache->cacheSize;
+ pCache->pgHash = (SPage **)calloc(pCache->nHash, sizeof(SPage *));
+ if (pCache->pgHash == NULL) {
+ // TODO
+ return -1;
+ }
+
+ // Open LRU list
+ pCache->nRecyclable = 0;
+ pCache->lru.isAnchor = 1;
+ pCache->lru.pLruNext = &(pCache->lru);
+ pCache->lru.pLruPrev = &(pCache->lru);
+
+ return 0;
+}
+
+int tdbPCacheGetPageSize(SPCache *pCache) { return pCache->pageSize; }
+
+static void *tdbOsMalloc(void *arg, size_t size) {
+ void *ptr;
+
+ ptr = malloc(size);
+
+ return ptr;
+}
+
+static void tdbOsFree(void *arg, void *ptr) { free(ptr); }
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbPage.c b/source/libs/tdb/src/db/tdbPage.c
new file mode 100644
index 0000000000..df158de756
--- /dev/null
+++ b/source/libs/tdb/src/db/tdbPage.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "tdbInt.h"
+
+typedef struct __attribute__((__packed__)) {
+ u8 szCell[2];
+ u8 nxOffset[2];
+} SFreeCell;
+
+typedef struct __attribute__((__packed__)) {
+ u8 szCell[3];
+ u8 nxOffset[3];
+} SFreeCellL;
+
+/* For small page */
+#define TDB_SPAGE_FREE_CELL_SIZE_PTR(PCELL) (((SFreeCell *)(PCELL))->szCell)
+#define TDB_SPAGE_FREE_CELL_NXOFFSET_PTR(PCELL) (((SFreeCell *)(PCELL))->nxOffset)
+
+#define TDB_SPAGE_FREE_CELL_SIZE(PCELL) ((u16 *)TDB_SPAGE_FREE_CELL_SIZE_PTR(PCELL))[0]
+#define TDB_SPAGE_FREE_CELL_NXOFFSET(PCELL) ((u16 *)TDB_SPAGE_FREE_CELL_NXOFFSET_PTR(PCELL))[0]
+
+#define TDB_SPAGE_FREE_CELL_SIZE_SET(PCELL, SIZE) (TDB_SPAGE_FREE_CELL_SIZE(PCELL) = (SIZE))
+#define TDB_SPAGE_FREE_CELL_NXOFFSET_SET(PCELL, OFFSET) (TDB_SPAGE_FREE_CELL_NXOFFSET(PCELL) = (OFFSET))
+
+/* For large page */
+#define TDB_LPAGE_FREE_CELL_SIZE_PTR(PCELL) (((SFreeCellL *)(PCELL))->szCell)
+#define TDB_LPAGE_FREE_CELL_NXOFFSET_PTR(PCELL) (((SFreeCellL *)(PCELL))->nxOffset)
+
+#define TDB_LPAGE_FREE_CELL_SIZE(PCELL) TDB_GET_U24(TDB_LPAGE_FREE_CELL_SIZE_PTR(PCELL))
+#define TDB_LPAGE_FREE_CELL_NXOFFSET(PCELL) TDB_GET_U24(TDB_LPAGE_FREE_CELL_NXOFFSET_PTR(PCELL))
+
+#define TDB_LPAGE_FREE_CELL_SIZE_SET(PCELL, SIZE) TDB_PUT_U24(TDB_LPAGE_FREE_CELL_SIZE_PTR(PCELL), SIZE)
+#define TDB_LPAGE_FREE_CELL_NXOFFSET_SET(PCELL, OFFSET) TDB_PUT_U24(TDB_LPAGE_FREE_CELL_NXOFFSET_PTR(PCELL), OFFSET)
+
+/* For page */
+#define TDB_PAGE_FREE_CELL_SIZE_PTR(PPAGE, PCELL) \
+ (TDB_IS_LARGE_PAGE(pPage) ? TDB_LPAGE_FREE_CELL_SIZE_PTR(PCELL) : TDB_SPAGE_FREE_CELL_SIZE_PTR(PCELL))
+#define TDB_PAGE_FREE_CELL_NXOFFSET_PTR(PPAGE, PCELL) \
+ (TDB_IS_LARGE_PAGE(pPage) ? TDB_LPAGE_FREE_CELL_NXOFFSET_PTR(PCELL) : TDB_SPAGE_FREE_CELL_NXOFFSET_PTR(PCELL))
+
+#define TDB_PAGE_FREE_CELL_SIZE(PPAGE, PCELL) \
+ (TDB_IS_LARGE_PAGE(pPage) ? TDB_LPAGE_FREE_CELL_SIZE(PCELL) : TDB_SPAGE_FREE_CELL_SIZE(PCELL))
+#define TDB_PAGE_FREE_CELL_NXOFFSET(PPAGE, PCELL) \
+ (TDB_IS_LARGE_PAGE(pPage) ? TDB_LPAGE_FREE_CELL_NXOFFSET(PCELL) : TDB_SPAGE_FREE_CELL_NXOFFSET(PCELL))
+
+#define TDB_PAGE_FREE_CELL_SIZE_SET(PPAGE, PCELL, SIZE) \
+ do { \
+ if (TDB_IS_LARGE_PAGE(PPAGE)) { \
+ TDB_LPAGE_FREE_CELL_SIZE_SET(PCELL, SIZE); \
+ } else { \
+ TDB_SPAGE_FREE_CELL_SIZE_SET(PCELL, SIZE); \
+ } \
+ } while (0)
+#define TDB_PAGE_FREE_CELL_NXOFFSET_SET(PPAGE, PCELL, OFFSET) \
+ do { \
+ if (TDB_IS_LARGE_PAGE(PPAGE)) { \
+ TDB_LPAGE_FREE_CELL_NXOFFSET_SET(PCELL, OFFSET); \
+ } else { \
+ TDB_SPAGE_FREE_CELL_NXOFFSET_SET(PCELL, OFFSET); \
+ } \
+ } while (0)
+
+static int tdbPageAllocate(SPage *pPage, int size, SCell **ppCell);
+static int tdbPageDefragment(SPage *pPage);
+
+int tdbPageCreate(int pageSize, SPage **ppPage, void *(*xMalloc)(void *, size_t), void *arg) {
+ SPage *pPage;
+ u8 *ptr;
+ int size;
+
+ ASSERT(TDB_IS_PGSIZE_VLD(pageSize));
+
+ *ppPage = NULL;
+ size = pageSize + sizeof(*pPage);
+
+ ptr = (u8 *)((*xMalloc)(arg, size));
+ if (pPage == NULL) {
+ return -1;
+ }
+
+ memset(ptr, 0, size);
+ pPage = (SPage *)(ptr + pageSize);
+
+ pPage->pData = ptr;
+ pPage->pageSize = pageSize;
+ if (pageSize < 65536) {
+ pPage->szOffset = 2;
+ pPage->szPageHdr = sizeof(SPageHdr);
+ pPage->szFreeCell = sizeof(SFreeCell);
+ } else {
+ pPage->szOffset = 3;
+ pPage->szPageHdr = sizeof(SPageHdrL);
+ pPage->szFreeCell = sizeof(SFreeCellL);
+ }
+ TDB_INIT_PAGE_LOCK(pPage);
+
+ /* TODO */
+
+ *ppPage = pPage;
+ return 0;
+}
+
+int tdbPageDestroy(SPage *pPage, void (*xFree)(void *arg, void *ptr), void *arg) {
+ u8 *ptr;
+
+ ptr = pPage->pData;
+ (*xFree)(arg, ptr);
+
+ return 0;
+}
+
+int tdbPageInsertCell(SPage *pPage, int idx, SCell *pCell, int szCell) {
+ int ret;
+ SCell *pTarget;
+ u8 *pTmp;
+ int j;
+
+ if (pPage->nOverflow || szCell + pPage->szOffset > pPage->nFree) {
+ // TODO: need to figure out if pCell may be used by outside of this function
+ j = pPage->nOverflow++;
+
+ pPage->apOvfl[j] = pCell;
+ pPage->aiOvfl[j] = idx;
+ } else {
+ ret = tdbPageAllocate(pPage, szCell, &pTarget);
+ if (ret < 0) {
+ return -1;
+ }
+
+ memcpy(pTarget, pCell, szCell);
+ pTmp = pPage->pCellIdx + idx * pPage->szOffset;
+ memmove(pTmp + pPage->szOffset, pTmp, pPage->pFreeStart - pTmp - pPage->szOffset);
+ TDB_PAGE_CELL_OFFSET_AT_SET(pPage, idx, pTarget - pPage->pData);
+ TDB_PAGE_NCELLS_SET(pPage, TDB_PAGE_NCELLS(pPage) + 1);
+ }
+
+ return 0;
+}
+
+int tdbPageDropCell(SPage *pPage, int idx) {
+ // TODO
+ return 0;
+}
+
+static int tdbPageAllocate(SPage *pPage, int size, SCell **ppCell) {
+ SCell *pCell;
+ SFreeCell *pFreeCell;
+ u8 *pOffset;
+ int ret;
+
+ ASSERT(pPage->nFree > size + pPage->szOffset);
+
+ pCell = NULL;
+ *ppCell = NULL;
+
+ // 1. Try to allocate from the free space area
+ if (pPage->pFreeEnd - pPage->pFreeStart > size + pPage->szOffset) {
+ pPage->pFreeEnd -= size;
+ pPage->pFreeStart += pPage->szOffset;
+ pCell = pPage->pFreeEnd;
+ }
+
+ // 2. Try to allocate from the page free list
+ if ((pCell == NULL) && (pPage->pFreeEnd - pPage->pFreeStart >= pPage->szOffset) && TDB_PAGE_FCELL(pPage)) {
+ int szCell;
+ int nxOffset;
+
+ pCell = pPage->pData + TDB_PAGE_FCELL(pPage);
+ pOffset = TDB_IS_LARGE_PAGE(pPage) ? ((SPageHdrL *)(pPage->pPageHdr))[0].fCell
+ : (u8 *)&(((SPageHdr *)(pPage->pPageHdr))[0].fCell);
+ szCell = TDB_PAGE_FREE_CELL_SIZE(pPage, pCell);
+ nxOffset = TDB_PAGE_FREE_CELL_NXOFFSET(pPage, pCell);
+
+ for (;;) {
+ // Find a cell
+ if (szCell >= size) {
+ if (szCell - size >= pPage->szFreeCell) {
+ SCell *pTmpCell = pCell + size;
+
+ TDB_PAGE_FREE_CELL_SIZE_SET(pPage, pTmpCell, szCell - size);
+ TDB_PAGE_FREE_CELL_NXOFFSET_SET(pPage, pTmpCell, nxOffset);
+ // TODO: *pOffset = pTmpCell - pPage->pData;
+ } else {
+ TDB_PAGE_NFREE_SET(pPage, TDB_PAGE_NFREE(pPage) + szCell - size);
+ // TODO: *pOffset = nxOffset;
+ }
+ break;
+ }
+
+ // Not find a cell yet
+ if (nxOffset > 0) {
+ pCell = pPage->pData + nxOffset;
+ pOffset = TDB_PAGE_FREE_CELL_NXOFFSET_PTR(pPage, pCell);
+ szCell = TDB_PAGE_FREE_CELL_SIZE(pPage, pCell);
+ nxOffset = TDB_PAGE_FREE_CELL_NXOFFSET(pPage, pCell);
+ continue;
+ } else {
+ pCell = NULL;
+ break;
+ }
+ }
+
+ if (pCell) {
+ pPage->pFreeStart = pPage->pFreeStart + pPage->szOffset;
+ }
+ }
+
+ // 3. Try to dfragment and allocate again
+ if (pCell == NULL) {
+ ret = tdbPageDefragment(pPage);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ASSERT(pPage->pFreeEnd - pPage->pFreeStart > size + pPage->szOffset);
+ ASSERT(pPage->nFree == pPage->pFreeEnd - pPage->pFreeStart);
+
+ // Allocate from the free space area again
+ pPage->pFreeEnd -= size;
+ pPage->pFreeStart += pPage->szOffset;
+ pCell = pPage->pFreeEnd;
+ }
+
+ ASSERT(pCell != NULL);
+
+ pPage->nFree = pPage->nFree - size - pPage->szOffset;
+ *ppCell = pCell;
+ return 0;
+}
+
+static int tdbPageFree(SPage *pPage, int idx, SCell *pCell, int size) {
+ // TODO
+ return 0;
+}
+
+static int tdbPageDefragment(SPage *pPage) {
+ // TODO
+ ASSERT(0);
+ return 0;
+}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c
new file mode 100644
index 0000000000..ac0bc15e1d
--- /dev/null
+++ b/source/libs/tdb/src/db/tdbPager.c
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "tdbInt.h"
+
+struct SPager {
+ char *dbFileName;
+ char *jFileName;
+ int pageSize;
+ uint8_t fid[TDB_FILE_ID_LEN];
+ int fd;
+ int jfd;
+ SPCache *pCache;
+ SPgno dbFileSize;
+ SPgno dbOrigSize;
+ int nDirty;
+ SPage *pDirty;
+ SPage *pDirtyTail;
+ u8 inTran;
+};
+
+typedef struct __attribute__((__packed__)) {
+ u8 hdrString[16];
+ u16 pageSize;
+ SPgno freePage;
+ u32 nFreePages;
+ u8 reserved[102];
+} SFileHdr;
+
+TDB_STATIC_ASSERT(sizeof(SFileHdr) == 128, "Size of file header is not correct");
+
+#define TDB_PAGE_INITIALIZED(pPage) ((pPage)->pPager != NULL)
+
+static int tdbPagerReadPage(SPager *pPager, SPage *pPage);
+static int tdbPagerAllocPage(SPager *pPager, SPgno *ppgno);
+static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage *, void *), void *arg);
+
+int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager) {
+ uint8_t *pPtr;
+ SPager *pPager;
+ int fsize;
+ int zsize;
+ int ret;
+
+ *ppPager = NULL;
+
+ fsize = strlen(fileName);
+ zsize = sizeof(*pPager) /* SPager */
+ + fsize + 1 /* dbFileName */
+ + fsize + 8 + 1; /* jFileName */
+ pPtr = (uint8_t *)calloc(1, zsize);
+ if (pPtr == NULL) {
+ return -1;
+ }
+
+ pPager = (SPager *)pPtr;
+ pPtr += sizeof(*pPager);
+ // pPager->dbFileName
+ pPager->dbFileName = (char *)pPtr;
+ memcpy(pPager->dbFileName, fileName, fsize);
+ pPager->dbFileName[fsize] = '\0';
+ pPtr += fsize + 1;
+ // pPager->jFileName
+ pPager->jFileName = (char *)pPtr;
+ memcpy(pPager->jFileName, fileName, fsize);
+ memcpy(pPager->jFileName + fsize, "-journal", 8);
+ pPager->jFileName[fsize + 8] = '\0';
+ // pPager->pCache
+ pPager->pCache = pCache;
+
+ pPager->fd = open(pPager->dbFileName, O_RDWR | O_CREAT, 0755);
+ if (pPager->fd < 0) {
+ return -1;
+ }
+
+ ret = tdbGnrtFileID(pPager->dbFileName, pPager->fid, false);
+ if (ret < 0) {
+ return -1;
+ }
+
+ pPager->jfd = -1;
+ pPager->pageSize = tdbPCacheGetPageSize(pCache);
+
+ *ppPager = pPager;
+ return 0;
+}
+
+int tdbPagerClose(SPager *pPager) {
+ // TODO
+ return 0;
+}
+
+int tdbPagerOpenDB(SPager *pPager, SPgno *ppgno, bool toCreate) {
+ SPgno pgno;
+ SPage *pPage;
+ int ret;
+
+ {
+ // TODO: try to search the main DB to get the page number
+ pgno = 0;
+ }
+
+ // if (pgno == 0 && toCreate) {
+ // ret = tdbPagerAllocPage(pPager, &pPage, &pgno);
+ // if (ret < 0) {
+ // return -1;
+ // }
+
+ // // TODO: Need to zero the page
+
+ // ret = tdbPagerWrite(pPager, pPage);
+ // if (ret < 0) {
+ // return -1;
+ // }
+ // }
+
+ *ppgno = pgno;
+ return 0;
+}
+
+int tdbPagerWrite(SPager *pPager, SPage *pPage) {
+ int ret;
+
+ if (pPager->inTran == 0) {
+ ret = tdbPagerBegin(pPager);
+ if (ret < 0) {
+ return -1;
+ }
+ }
+
+ if (pPage->isDirty == 0) {
+ pPage->isDirty = 1;
+ // TODO: add the page to the dirty list
+
+ // TODO: write the page to the journal
+ if (1 /*actually load from the file*/) {
+ }
+ }
+ return 0;
+}
+
+int tdbPagerBegin(SPager *pPager) {
+ if (pPager->inTran) {
+ return 0;
+ }
+
+ // Open the journal
+ pPager->jfd = open(pPager->jFileName, O_RDWR | O_CREAT, 0755);
+ if (pPager->jfd < 0) {
+ return -1;
+ }
+
+ // TODO: write the size of the file
+
+ pPager->inTran = 1;
+
+ return 0;
+}
+
+int tdbPagerCommit(SPager *pPager) {
+ // TODO
+ return 0;
+}
+
+static int tdbPagerReadPage(SPager *pPager, SPage *pPage) {
+ i64 offset;
+ int ret;
+
+ ASSERT(memcmp(pPager->fid, pPage->pgid.fileid, TDB_FILE_ID_LEN) == 0);
+
+ offset = (pPage->pgid.pgno - 1) * (i64)(pPager->pageSize);
+ ret = tdbPRead(pPager->fd, pPage->pData, pPager->pageSize, offset);
+ if (ret < 0) {
+ // TODO: handle error
+ return -1;
+ }
+ return 0;
+}
+
+int tdbPagerGetPageSize(SPager *pPager) { return pPager->pageSize; }
+
+int tdbPagerFetchPage(SPager *pPager, SPgno pgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg) {
+ SPage *pPage;
+ SPgid pgid;
+ int ret;
+
+ // Fetch a page container from the page cache
+ memcpy(&pgid, pPager->fid, TDB_FILE_ID_LEN);
+ pgid.pgno = pgno;
+ pPage = tdbPCacheFetch(pPager->pCache, &pgid, 1);
+ if (pPage == NULL) {
+ return -1;
+ }
+
+ // Initialize the page if need
+ if (!TDB_PAGE_INITIALIZED(pPage)) {
+ ret = tdbPagerInitPage(pPager, pPage, initPage, arg);
+ if (ret < 0) {
+ return -1;
+ }
+ }
+
+ ASSERT(TDB_PAGE_INITIALIZED(pPage));
+ ASSERT(pPage->pPager == pPager);
+
+ *ppPage = pPage;
+ return 0;
+}
+
+int tdbPagerNewPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg) {
+ int ret;
+ SPage *pPage;
+ SPgid pgid;
+
+ // Allocate a page number
+ ret = tdbPagerAllocPage(pPager, ppgno);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ASSERT(*ppgno != 0);
+
+ // Fetch a page container from the page cache
+ memcpy(&pgid, pPager->fid, TDB_FILE_ID_LEN);
+ pgid.pgno = *ppgno;
+ pPage = tdbPCacheFetch(pPager->pCache, &pgid, 1);
+ if (pPage == NULL) {
+ return -1;
+ }
+
+ ASSERT(!TDB_PAGE_INITIALIZED(pPage));
+
+ // Initialize the page if need
+ ret = tdbPagerInitPage(pPager, pPage, initPage, arg);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ASSERT(TDB_PAGE_INITIALIZED(pPage));
+ ASSERT(pPage->pPager == pPager);
+
+ *ppPage = pPage;
+ return 0;
+}
+
+static int tdbPagerAllocFreePage(SPager *pPager, SPgno *ppgno) {
+ // TODO: Allocate a page from the free list
+ return 0;
+}
+
+static int tdbPagerAllocNewPage(SPager *pPager, SPgno *ppgno) {
+ *ppgno = ++pPager->dbFileSize;
+ return 0;
+}
+
+static int tdbPagerAllocPage(SPager *pPager, SPgno *ppgno) {
+ int ret;
+
+ *ppgno = 0;
+
+ // Try to allocate from the free list of the pager
+ ret = tdbPagerAllocFreePage(pPager, ppgno);
+ if (ret < 0) {
+ return -1;
+ }
+
+ if (*ppgno != 0) return 0;
+
+ // Allocate the page by extending the pager
+ ret = tdbPagerAllocNewPage(pPager, ppgno);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ASSERT(*ppgno != 0);
+
+ return 0;
+}
+
+static int tdbPagerInitPage(SPager *pPager, SPage *pPage, int (*initPage)(SPage *, void *), void *arg) {
+ int ret;
+ int lcode;
+ int nLoops;
+
+ lcode = TDB_TRY_LOCK_PAGE(pPage);
+ if (lcode == P_LOCK_SUCC) {
+ if (TDB_PAGE_INITIALIZED(pPage)) {
+ TDB_UNLOCK_PAGE(pPage);
+ return 0;
+ }
+
+ ret = (*initPage)(pPage, arg);
+ if (ret < 0) {
+ TDB_UNLOCK_PAGE(pPage);
+ return -1;
+ }
+
+ pPage->pPager = pPager;
+
+ TDB_UNLOCK_PAGE(pPage);
+ } else if (lcode == P_LOCK_BUSY) {
+ nLoops = 0;
+ for (;;) {
+ if (TDB_PAGE_INITIALIZED(pPage)) break;
+ nLoops++;
+ if (nLoops > 1000) {
+ sched_yield();
+ nLoops = 0;
+ }
+ }
+ } else {
+ return -1;
+ }
+
+ return 0;
+}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbPgCache.c b/source/libs/tdb/src/db/tdbPgCache.c
deleted file mode 100644
index ef3f79410a..0000000000
--- a/source/libs/tdb/src/db/tdbPgCache.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc.
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-#include "tdbInt.h"
-
-typedef TD_DLIST(SPage) SPgList;
-struct SPgCache {
- TENV * pEnv; // TENV containing this page cache
- pgsz_t pgsize;
- int32_t npage;
- SPage **pages;
- SPgList freeList;
- SPgList lru;
- struct {
- int32_t nbucket;
- SPgList *buckets;
- } pght; // page hash table
-};
-
-static void pgCachePinPage(SPage *pPage);
-static void pgCacheUnpinPage(SPage *pPage);
-
-int pgCacheOpen(SPgCache **ppPgCache, TENV *pEnv) {
- SPgCache *pPgCache;
- SPage * pPage;
- void * pData;
- pgsz_t pgSize;
- cachesz_t cacheSize;
- int32_t npage;
- int32_t nbucket;
- size_t msize;
-
- *ppPgCache = NULL;
- pgSize = tdbEnvGetPageSize(pEnv);
- cacheSize = tdbEnvGetCacheSize(pEnv);
- npage = cacheSize / pgSize;
- nbucket = npage;
- msize = sizeof(*pPgCache) + sizeof(SPage *) * npage + sizeof(SPgList) * nbucket;
-
- // Allocate the handle
- pPgCache = (SPgCache *)calloc(1, msize);
- if (pPgCache == NULL) {
- return -1;
- }
-
- // Init the handle
- pPgCache->pEnv = pEnv;
- pPgCache->pgsize = pgSize;
- pPgCache->npage = npage;
- pPgCache->pages = (SPage **)(&pPgCache[1]);
- pPgCache->pght.nbucket = nbucket;
- pPgCache->pght.buckets = (SPgList *)(&(pPgCache->pages[npage]));
-
- TD_DLIST_INIT(&(pPgCache->freeList));
-
- for (int32_t i = 0; i < npage; i++) {
- pData = malloc(pgSize + sizeof(SPage));
- if (pData == NULL) {
- return -1;
- // TODO: handle error
- }
-
- pPage = POINTER_SHIFT(pData, pgSize);
-
- pPage->pgid = TDB_IVLD_PGID;
- pPage->frameid = i;
- pPage->pData = pData;
-
- // add current page to the page cache
- pPgCache->pages[i] = pPage;
- TD_DLIST_APPEND_WITH_FIELD(&(pPgCache->freeList), pPage, freeNode);
- }
-
-#if 0
- for (int32_t i = 0; i < nbucket; i++) {
- TD_DLIST_INIT(pPgCache->pght.buckets + i);
- }
-#endif
-
- *ppPgCache = pPgCache;
- return 0;
-}
-
-int pgCacheClose(SPgCache *pPgCache) {
- SPage *pPage;
- if (pPgCache) {
- for (int32_t i = 0; i < pPgCache->npage; i++) {
- pPage = pPgCache->pages[i];
- tfree(pPage->pData);
- }
-
- free(pPgCache);
- }
-
- return 0;
-}
-
-#define PG_CACHE_HASH(fileid, pgno) (((uint64_t *)(fileid))[0] + ((uint64_t *)(fileid))[1] + ((uint64_t *)(fileid))[2] + (pgno))
-
-SPage *pgCacheFetch(SPgCache *pPgCache, pgid_t pgid) {
- SPage * pPage;
- SPgFile *pPgFile;
- SPgList *pBucket;
-
- // 1. Search the page hash table SPgCache.pght
- pBucket = pPgCache->pght.buckets + (PG_CACHE_HASH(pgid.fileid, pgid.pgno) % pPgCache->pght.nbucket);
- pPage = TD_DLIST_HEAD(pBucket);
- while (pPage && tdbCmprPgId(&(pPage->pgid), &pgid)) {
- pPage = TD_DLIST_NODE_NEXT_WITH_FIELD(pPage, pghtNode);
- }
-
- if (pPage) {
- // Page is found, pin the page and return the page
- pgCachePinPage(pPage);
- return pPage;
- }
-
- // 2. Check the free list
- pPage = TD_DLIST_HEAD(&(pPgCache->freeList));
- if (pPage) {
- TD_DLIST_POP_WITH_FIELD(&(pPgCache->freeList), pPage, freeNode);
- pgCachePinPage(pPage);
- return pPage;
- }
-
- // 3. Try to recycle a page from the LRU list
- pPage = TD_DLIST_HEAD(&(pPgCache->lru));
- if (pPage) {
- TD_DLIST_POP_WITH_FIELD(&(pPgCache->lru), pPage, lruNode);
- // TODO: remove from the hash table
- pgCachePinPage(pPage);
- return pPage;
- }
-
- // 4. If a memory allocator is set, try to allocate from the allocator (TODO)
-
- return NULL;
-}
-
-int pgCacheRelease(SPage *pPage) {
- // TODO
- return 0;
-}
-
-static void pgCachePinPage(SPage *pPage) {
- // TODO
-}
-
-static void pgCacheUnpinPage(SPage *pPage) {
- // TODO
-}
-
-#if 0
-// Exposed handle
-typedef struct TDB_MPOOL TDB_MPOOL;
-typedef struct TDB_MPFILE TDB_MPFILE;
-
-typedef TD_DLIST_NODE(pg_t) pg_free_dlist_node_t, pg_hash_dlist_node_t;
-typedef struct pg_t {
- SRWLatch rwLatch;
- frame_id_t frameid;
- pgid_t pgid;
- uint8_t dirty;
- uint8_t rbit;
- int32_t pinRef;
- pg_free_dlist_node_t free;
- pg_hash_dlist_node_t hash;
- void * p;
-} pg_t;
-
-typedef TD_DLIST(pg_t) pg_list_t;
-typedef struct {
- SRWLatch latch;
- TD_DLIST(TDB_MPFILE);
-} mpf_bucket_t;
-struct TDB_MPOOL {
- int64_t cachesize;
- pgsz_t pgsize;
- int32_t npages;
- pg_t * pages;
- pg_list_t freeList;
- frame_id_t clockHand;
- struct {
- int32_t nbucket;
- pg_list_t *hashtab;
- } pgtab; // page table, hash
- struct {
-#define MPF_HASH_BUCKETS 16
- mpf_bucket_t buckets[MPF_HASH_BUCKETS];
- } mpfht; // MPF hash table. MPFs using this MP will be put in this hash table
-};
-
-#define MP_PAGE_AT(mp, idx) (mp)->pages[idx]
-
-typedef TD_DLIST_NODE(TDB_MPFILE) td_mpf_dlist_node_t;
-struct TDB_MPFILE {
- char * fname; // file name
- int fd; // fd
- uint8_t fileid[TDB_FILE_ID_LEN]; // file ID
- TDB_MPOOL * mp; // underlying memory pool
- td_mpf_dlist_node_t node;
-};
-
-/*=================================================== Exposed apis ==================================================*/
-// TDB_MPOOL
-int tdbMPoolOpen(TDB_MPOOL **mpp, uint64_t cachesize, pgsz_t pgsize);
-int tdbMPoolClose(TDB_MPOOL *mp);
-int tdbMPoolSync(TDB_MPOOL *mp);
-
-// TDB_MPFILE
-int tdbMPoolFileOpen(TDB_MPFILE **mpfp, const char *fname, TDB_MPOOL *mp);
-int tdbMPoolFileClose(TDB_MPFILE *mpf);
-int tdbMPoolFileNewPage(TDB_MPFILE *mpf, pgno_t *pgno, void *addr);
-int tdbMPoolFileFreePage(TDB_MPOOL *mpf, pgno_t *pgno, void *addr);
-int tdbMPoolFileGetPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr);
-int tdbMPoolFilePutPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr);
-int tdbMPoolFileSync(TDB_MPFILE *mpf);
-
-static void tdbMPoolRegFile(TDB_MPOOL *mp, TDB_MPFILE *mpf);
-static void tdbMPoolUnregFile(TDB_MPOOL *mp, TDB_MPFILE *mpf);
-static TDB_MPFILE *tdbMPoolGetFile(TDB_MPOOL *mp, uint8_t *fileid);
-static int tdbMPoolFileReadPage(TDB_MPFILE *mpf, pgno_t pgno, void *p);
-static int tdbMPoolFileWritePage(TDB_MPFILE *mpf, pgno_t pgno, const void *p);
-static void tdbMPoolClockEvictPage(TDB_MPOOL *mp, pg_t **pagepp);
-
-int tdbMPoolOpen(TDB_MPOOL **mpp, uint64_t cachesize, pgsz_t pgsize) {
- TDB_MPOOL *mp = NULL;
- size_t tsize;
- pg_t * pagep;
-
- // check parameters
- if (!TDB_IS_PGSIZE_VLD(pgsize)) {
- tdbError("invalid page size");
- return -1;
- }
-
- // allocate handle
- mp = (TDB_MPOOL *)calloc(1, sizeof(*mp));
- if (mp == NULL) {
- tdbError("failed to malloc memory pool handle");
- goto _err;
- }
-
- // initialize the handle
- mp->cachesize = cachesize;
- mp->pgsize = pgsize;
- mp->npages = cachesize / pgsize;
- mp->clockHand = 0;
-
- TD_DLIST_INIT(&mp->freeList);
-
- mp->pages = (pg_t *)calloc(mp->npages, sizeof(pg_t));
- if (mp->pages == NULL) {
- tdbError("failed to malloc memory pool pages");
- goto _err;
- }
-
- for (frame_id_t i = 0; i < mp->npages; i++) {
- mp->pages[i].p = malloc(pgsize);
- if (mp->pages[i].p == NULL) {
- goto _err;
- }
-
- taosInitRWLatch(&mp->pages[i].rwLatch);
- mp->pages[i].frameid = i;
- mp->pages[i].pgid = TDB_IVLD_PGID;
-
- // add new page to the free list
- TD_DLIST_APPEND_WITH_FIELD(&(mp->freeList), &(mp->pages[i]), free);
- }
-
-#define PGTAB_FACTOR 1.0
- mp->pgtab.nbucket = mp->npages / PGTAB_FACTOR;
- mp->pgtab.hashtab = (pg_list_t *)calloc(mp->pgtab.nbucket, sizeof(pg_list_t));
- if (mp->pgtab.hashtab == NULL) {
- tdbError("failed to malloc memory pool hash table");
- goto _err;
- }
-
- // return
- *mpp = mp;
- return 0;
-
-_err:
- tdbMPoolClose(mp);
- *mpp = NULL;
- return -1;
-}
-
-int tdbMPoolClose(TDB_MPOOL *mp) {
- if (mp) {
- tfree(mp->pgtab.hashtab);
- if (mp->pages) {
- for (int i = 0; i < mp->npages; i++) {
- tfree(mp->pages[i].p);
- }
-
- free(mp->pages);
- }
-
- free(mp);
- }
- return 0;
-}
-
-int tdbMPoolFileOpen(TDB_MPFILE **mpfp, const char *fname, TDB_MPOOL *mp) {
- TDB_MPFILE *mpf;
-
- if ((mpf = (TDB_MPFILE *)calloc(1, sizeof(*mpf))) == NULL) {
- return -1;
- }
-
- mpf->fd = -1;
-
- if ((mpf->fname = strdup(fname)) == NULL) {
- goto _err;
- }
-
- if ((mpf->fd = open(fname, O_CREAT | O_RDWR, 0755)) < 0) {
- goto _err;
- }
-
- if (tdbGnrtFileID(fname, mpf->fileid, false) < 0) {
- goto _err;
- }
-
- // Register current MPF to MP
- tdbMPoolRegFile(mp, mpf);
-
- *mpfp = mpf;
- return 0;
-
-_err:
- tdbMPoolFileClose(mpf);
- *mpfp = NULL;
- return -1;
-}
-
-int tdbMPoolFileClose(TDB_MPFILE *mpf) {
- if (mpf) {
- if (mpf->fd > 0) {
- close(mpf->fd);
- }
- tfree(mpf->fname);
- free(mpf);
- }
- return 0;
-}
-
-#define MPF_GET_PAGE_BUCKETID(fileid, pgno, nbuckets) \
- ({ \
- uint64_t *tmp = (uint64_t *)fileid; \
- (tmp[0] + tmp[1] + tmp[2] + (pgno)) % (nbuckets); \
- })
-
-int tdbMPoolFileNewPage(TDB_MPFILE *mpf, pgno_t *pgno, void *addr) {
- // TODO
- return 0;
-}
-
-int tdbMPoolFileFreePage(TDB_MPOOL *mpf, pgno_t *pgno, void *addr) {
- // TODO
- return 0;
-}
-
-int tdbMPoolFileGetPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr) {
- pg_t * pagep;
- TDB_MPOOL *mp;
- pg_list_t *pglist;
-
- mp = mpf->mp;
-
- // check if the page already in pool
- pglist = mp->pgtab.hashtab + MPF_GET_PAGE_BUCKETID(mpf->fileid, pgno, mp->pgtab.nbucket);
- pagep = TD_DLIST_HEAD(pglist);
- while (pagep) {
- if (memcmp(mpf->fileid, pagep->pgid.fileid, TDB_FILE_ID_LEN) == 0 && pgno == pagep->pgid.pgno) {
- break;
- }
-
- pagep = TD_DLIST_NODE_NEXT_WITH_FIELD(pagep, hash);
- }
-
- if (pagep) {
- // page is found
- // todo: pin the page and return
- *(void **)addr = pagep->p;
- return 0;
- }
-
- // page not found
- pagep = TD_DLIST_HEAD(&mp->freeList);
- if (pagep) {
- // has free page
- TD_DLIST_POP_WITH_FIELD(&(mp->freeList), pagep, free);
- } else {
- // no free page available
- tdbMPoolClockEvictPage(mp, &pagep);
- if (pagep) {
- if (pagep->dirty) {
- // TODO: Handle dirty page eviction
- }
- }
- }
-
- if (pagep == NULL) {
- // no available container page
- return -1;
- }
-
- // load page from the disk if a container page is available
- // TODO: load the page from the disk
- if (tdbMPoolFileReadPage(mpf, pgno, pagep->p) < 0) {
- return -1;
- }
-
- memcpy(pagep->pgid.fileid, mpf->fileid, TDB_FILE_ID_LEN);
- pagep->pgid.pgno = pgno;
- pagep->dirty = 0;
- pagep->pinRef = 1;
-
- // add current page to page table
- TD_DLIST_APPEND_WITH_FIELD(pglist, pagep, hash);
-
- return 0;
-}
-
-int tdbMPoolFilePutPage(TDB_MPFILE *mpf, pgno_t pgno, void *addr) {
- // TODO
- return 0;
-}
-
-#define MPF_GET_BUCKETID(fileid) \
- ({ \
- uint64_t *tmp = (uint64_t *)fileid; \
- (tmp[0] + tmp[1] + tmp[2]) % MPF_HASH_BUCKETS; \
- })
-
-static void tdbMPoolRegFile(TDB_MPOOL *mp, TDB_MPFILE *mpf) {
- mpf_bucket_t *bktp;
-
- bktp = mp->mpfht.buckets + MPF_GET_BUCKETID(mpf->fileid);
-
- taosWLockLatch(&(bktp->latch));
-
- TD_DLIST_APPEND_WITH_FIELD(bktp, mpf, node);
-
- taosWUnLockLatch(&(bktp->latch));
-
- mpf->mp = mp;
-}
-
-static TDB_MPFILE *tdbMPoolGetFile(TDB_MPOOL *mp, uint8_t *fileid) {
- TDB_MPFILE * mpf = NULL;
- mpf_bucket_t *bktp;
-
- bktp = mp->mpfht.buckets + MPF_GET_BUCKETID(fileid);
-
- taosRLockLatch(&(bktp->latch));
-
- mpf = TD_DLIST_HEAD(bktp);
- while (mpf) {
- if (memcmp(fileid, mpf->fileid, TDB_FILE_ID_LEN) == 0) {
- break;
- }
-
- mpf = TD_DLIST_NODE_NEXT_WITH_FIELD(mpf, node);
- }
-
- taosRUnLockLatch(&(bktp->latch));
-
- return mpf;
-}
-
-static void tdbMPoolUnregFile(TDB_MPOOL *mp, TDB_MPFILE *mpf) {
- mpf_bucket_t *bktp;
- TDB_MPFILE * tmpf;
-
- if (mpf->mp == NULL) return;
-
- ASSERT(mpf->mp == mp);
-
- bktp = mp->mpfht.buckets + MPF_GET_BUCKETID(mpf->fileid);
-
- taosWLockLatch(&(bktp->latch));
-
- tmpf = TD_DLIST_HEAD(bktp);
-
- while (tmpf) {
- if (memcmp(mpf->fileid, tmpf->fileid, TDB_FILE_ID_LEN) == 0) {
- TD_DLIST_POP_WITH_FIELD(bktp, tmpf, node);
- break;
- }
-
- tmpf = TD_DLIST_NODE_NEXT_WITH_FIELD(tmpf, node);
- }
-
- taosWUnLockLatch(&(bktp->latch));
-
- ASSERT(tmpf == mpf);
-}
-
-static int tdbMPoolFileReadPage(TDB_MPFILE *mpf, pgno_t pgno, void *p) {
- pgsz_t pgsize;
- TDB_MPOOL *mp;
- off_t offset;
- size_t rsize;
-
- mp = mpf->mp;
- pgsize = mp->pgsize;
- offset = pgno * pgsize;
-
- // TODO: use loop to read all data
- rsize = pread(mpf->fd, p, pgsize, offset);
- // TODO: error handle
-
- return 0;
-}
-
-static int tdbMPoolFileWritePage(TDB_MPFILE *mpf, pgno_t pgno, const void *p) {
- pgsz_t pgsize;
- TDB_MPOOL *mp;
- off_t offset;
-
- mp = mpf->mp;
- pgsize = mp->pgsize;
- offset = pgno * pgsize;
-
- lseek(mpf->fd, offset, SEEK_SET);
- // TODO: handle error
-
- write(mpf->fd, p, pgsize);
- // TODO: handle error
-
- return 0;
-}
-
-static void tdbMPoolClockEvictPage(TDB_MPOOL *mp, pg_t **pagepp) {
- pg_t * pagep;
- frame_id_t och;
-
- *pagepp = NULL;
- och = mp->clockHand;
-
- do {
- pagep = mp->pages + mp->clockHand;
- mp->clockHand = (mp->clockHand + 1) % mp->npages;
-
- if (pagep->pinRef == 0) {
- if (pagep->rbit == 1) {
- pagep->rbit = 0;
- } else {
- break;
- }
- }
-
- if (mp->clockHand == och) {
- return;
- }
- } while (1);
-
- *pagepp = pagep;
-}
-
-#endif
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbPgFile.c b/source/libs/tdb/src/db/tdbPgFile.c
deleted file mode 100644
index 12f062ebf7..0000000000
--- a/source/libs/tdb/src/db/tdbPgFile.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc.
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-#include "tdbInt.h"
-
-typedef struct SPage1 {
- char magic[64];
- pgno_t mdbRootPgno; // master DB root page number
- pgno_t freePgno; // free list page number
- uint32_t nFree; // number of free pages
-} SPage1;
-
-typedef struct SFreePage {
- /* TODO */
-} SFreePage;
-
-TDB_STATIC_ASSERT(sizeof(SPage1) <= TDB_MIN_PGSIZE, "TDB Page1 definition too large");
-
-static int pgFileRead(SPgFile *pPgFile, pgno_t pgno, uint8_t *pData);
-
-int pgFileOpen(SPgFile **ppPgFile, const char *fname, TENV *pEnv) {
- SPgFile * pPgFile;
- SPgCache *pPgCache;
- size_t fnameLen;
- pgno_t fsize;
-
- *ppPgFile = NULL;
-
- // create the handle
- fnameLen = strlen(fname);
- pPgFile = (SPgFile *)calloc(1, sizeof(*pPgFile) + fnameLen + 1);
- if (pPgFile == NULL) {
- return -1;
- }
-
- ASSERT(pEnv != NULL);
-
- // init the handle
- pPgFile->fname = (char *)(&(pPgFile[1]));
- memcpy(pPgFile->fname, fname, fnameLen);
- pPgFile->fname[fnameLen] = '\0';
- pPgFile->pFile = NULL;
-
- pPgFile->pFile = taosOpenFile(fname, TD_FILE_CTEATE | TD_FILE_WRITE | TD_FILE_READ);
- if (pPgFile->pFile == NULL) {
- // TODO: handle error
- return -1;
- }
-
- tdbGnrtFileID(fname, pPgFile->fileid, false);
- tdbGetFileSize(fname, tdbEnvGetPageSize(pEnv), &fsize);
-
- pPgFile->fsize = fsize;
- pPgFile->lsize = fsize;
-
- if (pPgFile->fsize == 0) {
- // A created file
- pgno_t pgno;
- pgid_t pgid;
-
- pgFileAllocatePage(pPgFile, &pgno);
-
- ASSERT(pgno == 1);
-
- memcpy(pgid.fileid, pPgFile->fileid, TDB_FILE_ID_LEN);
- pgid.pgno = pgno;
-
- pgCacheFetch(pPgCache, pgid);
- // Need to allocate the first page as a description page
- } else {
- // An existing file
- }
-
- /* TODO: other open operations */
-
- // add the page file to the environment
- tdbEnvRgstPageFile(pEnv, pPgFile);
- pPgFile->pEnv = pEnv;
-
- *ppPgFile = pPgFile;
- return 0;
-}
-
-int pgFileClose(SPgFile *pPgFile) {
- if (pPgFile) {
- if (pPgFile->pFile != NULL) {
- taosCloseFile(&pPgFile->pFile);
- }
-
- tfree(pPgFile->fname);
- free(pPgFile);
- }
-
- return 0;
-}
-
-SPage *pgFileFetch(SPgFile *pPgFile, pgno_t pgno) {
- SPgCache *pPgCache;
- SPage * pPage;
- pgid_t pgid;
-
- // 1. Fetch from the page cache
- // pgCacheFetch(pPgCache, pgid);
-
- // 2. If only get a page frame, no content, maybe
- // need to load from the file
- if (1 /*page not initialized*/) {
- if (pgno < pPgFile->fsize) {
- // load the page content from the disk
- // ?? How about the freed pages ??
- } else {
- // zero the page, make the page as a empty
- // page with zero records.
- }
- }
-
-#if 0
- pPgCache = pPgFile->pPgCache;
- pPage = NULL;
- memcpy(pgid.fileid, pPgFile->fileid, TDB_FILE_ID_LEN);
- pgid.pgno = pgno;
-
- if (pgno > pPgFile->pgFileSize) {
- // TODO
- } else {
- pPage = pgCacheFetch(pPgCache, pgid);
- if (1 /*Page is cached, no need to load from file*/) {
- return pPage;
- } else {
- // TODO: handle error
- if (pgFileRead(pPgFile, pgno, (void *)pPage) < 0) {
- // todoerr
- }
- return pPage;
- }
- }
-#endif
-
- return pPage;
-}
-
-int pgFileRelease(SPage *pPage) {
- pgCacheRelease(pPage);
- return 0;
-}
-
-int pgFileWrite(SPage *pPage) {
- // TODO
- return 0;
-}
-
-int pgFileAllocatePage(SPgFile *pPgFile, pgno_t *pPgno) {
- pgno_t pgno;
- SPage1 * pPage1;
- SPgCache *pPgCache;
- pgid_t pgid;
- SPage * pPage;
-
- if (pPgFile->lsize == 0) {
- pgno = ++(pPgFile->lsize);
- } else {
- if (0) {
- // TODO: allocate from the free list
- pPage = pgCacheFetch(pPgCache, pgid);
-
- if (pPage1->nFree > 0) {
- // TODO
- } else {
- pgno = ++(pPgFile->lsize);
- }
- } else {
- pgno = ++(pPgFile->lsize);
- }
- }
-
- *pPgno = pgno;
- return 0;
-}
-
-static int pgFileRead(SPgFile *pPgFile, pgno_t pgno, uint8_t *pData) {
- pgsz_t pgSize;
- ssize_t rsize;
- uint8_t *pTData;
- size_t szToRead;
-
-#if 0
-
- // pgSize = ; (TODO)
- pTData = pData;
- szToRead = pgSize;
- for (; szToRead > 0;) {
- rsize = pread(pPgFile->pFile, pTData, szToRead, pgno * pgSize);
- if (rsize < 0) {
- if (errno == EINTR) {
- continue;
- } else {
- return -1;
- }
- } else if (rsize == 0) {
- return -1;
- }
-
- szToRead -= rsize;
- pTData += rsize;
- }
-#endif
-
- return 0;
-}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbUtil.c b/source/libs/tdb/src/db/tdbUtil.c
index 237a39e47d..b5373be9dd 100644
--- a/source/libs/tdb/src/db/tdbUtil.c
+++ b/source/libs/tdb/src/db/tdbUtil.c
@@ -51,7 +51,8 @@ int tdbGnrtFileID(const char *fname, uint8_t *fileid, bool unique) {
// return access(pathname, flags);
// }
-int tdbGetFileSize(const char *fname, pgsz_t pgSize, pgno_t *pSize) {
+int tdbGetFileSize(const char *fname, int pgSize, SPgno *pSize) {
+ struct stat st;
int ret;
int64_t file_size = 0;
ret = taosStatFile(fname, &file_size, NULL);
@@ -63,4 +64,29 @@ int tdbGetFileSize(const char *fname, pgsz_t pgSize, pgno_t *pSize) {
*pSize = file_size / pgSize;
return 0;
+}
+
+int tdbPRead(int fd, void *pData, int count, i64 offset) {
+ void *pBuf;
+ int nbytes;
+ i64 ioffset;
+ int iread;
+
+ pBuf = pData;
+ nbytes = count;
+ ioffset = offset;
+ while (nbytes > 0) {
+ iread = pread(fd, pBuf, nbytes, ioffset);
+ if (iread < 0) {
+ /* TODO */
+ } else if (iread == 0) {
+ return (count - iread);
+ }
+
+ nbytes = nbytes - iread;
+ pBuf = (void *)((u8 *)pBuf + iread);
+ ioffset += iread;
+ }
+
+ return count;
}
\ No newline at end of file
diff --git a/source/libs/tdb/src/inc/tdbBtree.h b/source/libs/tdb/src/inc/tdbBtree.h
index 94af3331ba..c1fe77c22e 100644
--- a/source/libs/tdb/src/inc/tdbBtree.h
+++ b/source/libs/tdb/src/inc/tdbBtree.h
@@ -23,20 +23,21 @@ extern "C" {
typedef struct SBTree SBTree;
typedef struct SBtCursor SBtCursor;
-// SBTree
-int btreeOpen(SBTree **ppBt, SPgFile *pPgFile);
-int btreeClose(SBTree *pBt);
-
-// SBtCursor
-int btreeCursorOpen(SBtCursor *pBtCur, SBTree *pBt);
-int btreeCursorClose(SBtCursor *pBtCur);
-int btreeCursorMoveTo(SBtCursor *pBtCur, int kLen, const void *pKey);
-int btreeCursorNext(SBtCursor *pBtCur);
-
-struct SBTree {
- pgno_t root;
+struct SBtCursor {
+ SBTree *pBt;
+ i8 iPage;
+ SPage *pPage;
+ int idx;
+ int idxStack[BTREE_MAX_DEPTH + 1];
+ SPage *pgStack[BTREE_MAX_DEPTH + 1];
+ void *pBuf;
};
+int tdbBtreeOpen(int keyLen, int valLen, SPager *pFile, FKeyComparator kcmpr, SBTree **ppBt);
+int tdbBtreeClose(SBTree *pBt);
+int tdbBtreeCursor(SBtCursor *pCur, SBTree *pBt);
+int tdbBtCursorInsert(SBtCursor *pCur, const void *pKey, int kLen, const void *pVal, int vLen);
+
#ifdef __cplusplus
}
#endif
diff --git a/source/libs/tdb/src/inc/tdbDb.h b/source/libs/tdb/src/inc/tdbDb.h
new file mode 100644
index 0000000000..06ea74a83e
--- /dev/null
+++ b/source/libs/tdb/src/inc/tdbDb.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#ifndef _TD_TDB_DB_H_
+#define _TD_TDB_DB_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct STDb STDb;
+
+int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, STDb **ppDb);
+int tdbDbClose(STDb *pDb);
+int tdbDbDrop(STDb *pDb);
+int tdbDbInsert(STDb *pDb, const void *pKey, int keyLen, const void *pVal, int valLen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_TDB_DB_H_*/
\ No newline at end of file
diff --git a/source/libs/tdb/src/inc/tdbEnv.h b/source/libs/tdb/src/inc/tdbEnv.h
index 6cb5c7a2cd..959b963a07 100644
--- a/source/libs/tdb/src/inc/tdbEnv.h
+++ b/source/libs/tdb/src/inc/tdbEnv.h
@@ -20,11 +20,17 @@
extern "C" {
#endif
-const char* tdbEnvGetRootDir(TENV* pEnv);
-SPgFile* tdbEnvGetPageFile(TENV* pEnv, const uint8_t fileid[]);
-SPgCache* tdbEnvGetPgCache(TENV* pEnv);
-int tdbEnvRgstPageFile(TENV* pEnv, SPgFile* pPgFile);
-int tdbEnvRgstDB(TENV* pEnv, TDB* pDb);
+typedef struct STEnv {
+ char * rootDir;
+ char * jfname;
+ int jfd;
+ SPCache *pCache;
+} STEnv;
+
+int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv);
+int tdbEnvClose(STEnv *pEnv);
+
+SPager *tdbEnvGetPager(STEnv *pEnv, const char *fname);
#ifdef __cplusplus
}
diff --git a/source/libs/tdb/src/inc/tdbInt.h b/source/libs/tdb/src/inc/tdbInt.h
index ac42e15002..5902a6a716 100644
--- a/source/libs/tdb/src/inc/tdbInt.h
+++ b/source/libs/tdb/src/inc/tdbInt.h
@@ -19,16 +19,33 @@
#include "tlist.h"
#include "tlockfree.h"
-#include "tdb.h"
+// #include "tdb.h"
#ifdef __cplusplus
extern "C" {
#endif
-typedef struct SPgFile SPgFile;
+typedef int8_t i8;
+typedef int16_t i16;
+typedef int32_t i32;
+typedef int64_t i64;
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
-// pgno_t
-typedef int32_t pgno_t;
+// p must be u8 *
+#define TDB_GET_U24(p) ((p)[0] * 65536 + *(u16 *)((p) + 1))
+#define TDB_PUT_U24(p, v) \
+ do { \
+ int tv = (v); \
+ (p)[2] = tv & 0xff; \
+ (p)[1] = (tv >> 8) & 0xff; \
+ (p)[0] = (tv >> 16) & 0xff; \
+ } while (0)
+
+// SPgno
+typedef u32 SPgno;
#define TDB_IVLD_PGNO ((pgno_t)0)
// fileid
@@ -37,8 +54,8 @@ typedef int32_t pgno_t;
// pgid_t
typedef struct {
uint8_t fileid[TDB_FILE_ID_LEN];
- pgno_t pgno;
-} pgid_t;
+ SPgno pgno;
+} pgid_t, SPgid;
#define TDB_IVLD_PGID (pgid_t){0, TDB_IVLD_PGNO};
@@ -61,18 +78,14 @@ static FORCE_INLINE int tdbCmprPgId(const void *p1, const void *p2) {
}
}
-// framd_id_t
-typedef int32_t frame_id_t;
+#define TDB_IS_SAME_PAGE(pPgid1, pPgid2) (tdbCmprPgId(pPgid1, pPgid2) == 0)
// pgsz_t
-#define TDB_MIN_PGSIZE 512
-#define TDB_MAX_PGSIZE 65536
-#define TDB_DEFAULT_PGSIZE 4096
+#define TDB_MIN_PGSIZE 512 // 512B
+#define TDB_MAX_PGSIZE 16777216 // 16M
+#define TDB_DEFAULT_PGSIZE 4096
#define TDB_IS_PGSIZE_VLD(s) (((s) >= TDB_MIN_PGSIZE) && ((s) <= TDB_MAX_PGSIZE))
-// pgoff_t
-typedef pgsz_t pgoff_t;
-
// cache
#define TDB_DEFAULT_CACHE_SIZE (256 * 4096) // 1M
@@ -100,7 +113,7 @@ typedef TD_DLIST_NODE(SPgFile) SPgFileListNode;
} \
} while (0)
-#define TDB_VARIANT_LEN (int)-1
+#define TDB_VARIANT_LEN ((int)-1)
// page payload format
// + + [key] + [value]
@@ -115,18 +128,40 @@ typedef TD_DLIST_NODE(SPgFile) SPgFileListNode;
/* TODO */ \
} while (0)
+typedef int (*FKeyComparator)(const void *pKey1, int kLen1, const void *pKey2, int kLen2);
+
#define TDB_JOURNAL_NAME "tdb.journal"
+#define TDB_FILENAME_LEN 128
+
+#define TDB_DEFAULT_FANOUT 6
+
+#define BTREE_MAX_DEPTH 20
+
+#define TDB_FLAG_IS(flags, flag) ((flags) == (flag))
+#define TDB_FLAG_HAS(flags, flag) (((flags) & (flag)) != 0)
+#define TDB_FLAG_NO(flags, flag) ((flags) & (flag) == 0)
+#define TDB_FLAG_ADD(flags, flag) ((flags) |= (flag))
+#define TDB_FLAG_REMOVE(flags, flag) ((flags) &= (~(flag)))
+
+typedef struct SPager SPager;
+typedef struct SPCache SPCache;
+typedef struct SPage SPage;
+
#include "tdbUtil.h"
+#include "tdbPCache.h"
+
+#include "tdbPager.h"
+
#include "tdbBtree.h"
-#include "tdbPgCache.h"
-
-#include "tdbPgFile.h"
-
#include "tdbEnv.h"
+#include "tdbDb.h"
+
+#include "tdbPage.h"
+
#ifdef __cplusplus
}
#endif
diff --git a/source/libs/tdb/src/inc/tdbPgCache.h b/source/libs/tdb/src/inc/tdbPCache.h
similarity index 56%
rename from source/libs/tdb/src/inc/tdbPgCache.h
rename to source/libs/tdb/src/inc/tdbPCache.h
index c25ef27c10..ff4f1acbb6 100644
--- a/source/libs/tdb/src/inc/tdbPgCache.h
+++ b/source/libs/tdb/src/inc/tdbPCache.h
@@ -20,26 +20,25 @@
extern "C" {
#endif
-typedef struct SPgCache SPgCache;
-typedef struct SPage SPage;
+#define TDB_PCACHE_PAGE \
+ u8 isAnchor; \
+ u8 isLocalPage; \
+ u8 isDirty; \
+ i32 nRef; \
+ SPCache *pCache; \
+ SPage *pFreeNext; \
+ SPage *pHashNext; \
+ SPage *pLruNext; \
+ SPage *pLruPrev; \
+ SPage *pDirtyNext; \
+ SPager *pPager; \
+ SPgid pgid;
-// SPgCache
-int pgCacheOpen(SPgCache **ppPgCache, TENV *pEnv);
-int pgCacheClose(SPgCache *pPgCache);
-
-SPage *pgCacheFetch(SPgCache *pPgCache, pgid_t pgid);
-int pgCacheRelease(SPage *pPage);
-
-// SPage
-typedef TD_DLIST_NODE(SPage) SPgListNode;
-struct SPage {
- pgid_t pgid; // page id
- frame_id_t frameid; // frame id
- uint8_t * pData; // real data
- SPgListNode freeNode; // for SPgCache.freeList
- SPgListNode pghtNode; // for pght
- SPgListNode lruNode; // for LRU
-};
+int tdbPCacheOpen(int pageSize, int cacheSize, SPCache **ppCache);
+int tdbPCacheClose(SPCache *pCache);
+SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage);
+void tdbPCacheRelease(SPage *pPage);
+int tdbPCacheGetPageSize(SPCache *pCache);
#ifdef __cplusplus
}
diff --git a/source/libs/tdb/src/inc/tdbPage.h b/source/libs/tdb/src/inc/tdbPage.h
new file mode 100644
index 0000000000..6479574abe
--- /dev/null
+++ b/source/libs/tdb/src/inc/tdbPage.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#ifndef _TDB_PAGE_H_
+#define _TDB_PAGE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef u8 SCell;
+
+// PAGE APIS implemented
+typedef struct {
+ int szOffset;
+ int szPageHdr;
+ int szFreeCell;
+ // flags
+ u16 (*getFlags)(SPage *);
+ void (*setFlags)(SPage *, u16);
+ // cell number
+ int (*getCellNum)(SPage *);
+ void (*setCellNum)(SPage *, int);
+ // cell content offset
+ int (*getCellBody)(SPage *);
+ void (*setCellBody)(SPage *, int);
+ // first free cell offset (0 means no free cells)
+ int (*getCellFree)(SPage *);
+ void (*setCellFree)(SPage *, int);
+ // total free bytes
+ int (*getFreeBytes)(SPage *);
+ void (*setFreeBytes)(SPage *, int);
+ // cell offset at idx
+ int (*getCellOffset)(SPage *, int);
+ void (*setCellOffset)(SPage *, int, int);
+} SPageMethods;
+
+// Page footer
+typedef struct __attribute__((__packed__)) {
+ u8 cksm[4];
+} SPageFtr;
+
+struct SPage {
+ pthread_spinlock_t lock;
+ u8 *pData;
+ int pageSize;
+ SPageMethods *pPageMethods;
+ // Fields below used by pager and am
+ u8 szAmHdr;
+ u8 *pPageHdr;
+ u8 *pAmHdr;
+ u8 *pCellIdx;
+ u8 *pFreeStart;
+ u8 *pFreeEnd;
+ SPageFtr *pPageFtr;
+ int kLen; // key length of the page, -1 for unknown
+ int vLen; // value length of the page, -1 for unknown
+ int nFree;
+ int maxLocal;
+ int minLocal;
+ int nOverflow;
+ SCell *apOvfl[4];
+ int aiOvfl[4];
+ // Fields used by SPCache
+ TDB_PCACHE_PAGE
+};
+
+/* For page */
+#define TDB_PAGE_FLAGS(pPage) (*(pPage)->pPageMethods->getFlags)(pPage)
+#define TDB_PAGE_NCELLS(pPage) (*(pPage)->pPageMethods->getCellNum)(pPage)
+#define TDB_PAGE_CCELLS(pPage) (*(pPage)->pPageMethods->getCellBody)(pPage)
+#define TDB_PAGE_FCELL(pPage) (*(pPage)->pPageMethods->getCellFree)(pPage)
+#define TDB_PAGE_NFREE(pPage) (*(pPage)->pPageMethods->getFreeBytes)(pPage)
+#define TDB_PAGE_CELL_OFFSET_AT(pPage, idx) (*(pPage)->pPageMethods->getCellOffset)(pPage, idx)
+
+#define TDB_PAGE_FLAGS_SET(pPage, FLAGS) (*(pPage)->pPageMethods->setFlags)(pPage, FLAGS)
+#define TDB_PAGE_NCELLS_SET(pPage, NCELLS) (*(pPage)->pPageMethods->setCellNum)(pPage, NCELLS)
+#define TDB_PAGE_CCELLS_SET(pPage, CCELLS) (*(pPage)->pPageMethods->setCellBody)(pPage, CCELLS)
+#define TDB_PAGE_FCELL_SET(pPage, FCELL) (*(pPage)->pPageMethods->setCellFree)(pPage, FCELL)
+#define TDB_PAGE_NFREE_SET(pPage, NFREE) (*(pPage)->pPageMethods->setFreeBytes)(pPage, NFREE)
+#define TDB_PAGE_CELL_OFFSET_AT_SET(pPage, idx, OFFSET) (*(pPage)->pPageMethods->setCellOffset)(pPage, idx, OFFSET)
+
+#define TDB_PAGE_OFFSET_SIZE(pPage) ((pPage)->pPageMethods->szOffset)
+
+#define TDB_PAGE_CELL_AT(pPage, idx) ((pPage)->pData + TDB_PAGE_CELL_OFFSET_AT(pPage, idx))
+
+// For page lock
+#define P_LOCK_SUCC 0
+#define P_LOCK_BUSY 1
+#define P_LOCK_FAIL -1
+
+#define TDB_INIT_PAGE_LOCK(pPage) pthread_spin_init(&((pPage)->lock), 0)
+#define TDB_DESTROY_PAGE_LOCK(pPage) pthread_spin_destroy(&((pPage)->lock))
+#define TDB_LOCK_PAGE(pPage) pthread_spin_lock(&((pPage)->lock))
+#define TDB_UNLOCK_PAGE(pPage) pthread_spin_unlock(&((pPage)->lock))
+#define TDB_TRY_LOCK_PAGE(pPage) \
+ ({ \
+ int ret; \
+ if (pthread_spin_trylock(&((pPage)->lock)) == 0) { \
+ ret = P_LOCK_SUCC; \
+ } else if (errno == EBUSY) { \
+ ret = P_LOCK_BUSY; \
+ } else { \
+ ret = P_LOCK_FAIL; \
+ } \
+ ret; \
+ })
+
+// APIs
+int tdbPageCreate(int pageSize, SPage **ppPage, void *(*xMalloc)(void *, size_t), void *arg);
+int tdbPageDestroy(SPage *pPage, void (*xFree)(void *arg, void *ptr), void *arg);
+int tdbPageInsertCell(SPage *pPage, int idx, SCell *pCell, int szCell);
+int tdbPageDropCell(SPage *pPage, int idx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TDB_PAGE_H_*/
\ No newline at end of file
diff --git a/source/libs/tdb/src/inc/tdbPager.h b/source/libs/tdb/src/inc/tdbPager.h
new file mode 100644
index 0000000000..e4ed8552fd
--- /dev/null
+++ b/source/libs/tdb/src/inc/tdbPager.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#ifndef _TDB_PAGER_H_
+#define _TDB_PAGER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager);
+int tdbPagerClose(SPager *pPager);
+int tdbPagerOpenDB(SPager *pPager, SPgno *ppgno, bool toCreate);
+int tdbPagerWrite(SPager *pPager, SPage *pPage);
+int tdbPagerBegin(SPager *pPager);
+int tdbPagerCommit(SPager *pPager);
+int tdbPagerGetPageSize(SPager *pPager);
+int tdbPagerFetchPage(SPager *pPager, SPgno pgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg);
+int tdbPagerNewPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TDB_PAGER_H_*/
\ No newline at end of file
diff --git a/source/libs/tdb/src/inc/tdbPgFile.h b/source/libs/tdb/src/inc/tdbPgFile.h
deleted file mode 100644
index 0a8c277479..0000000000
--- a/source/libs/tdb/src/inc/tdbPgFile.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc.
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-#ifndef _TD_PAGE_FILE_H_
-#define _TD_PAGE_FILE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack (push,1)
-typedef struct {
- char hdrInfo[16]; // info string
- pgsz_t szPage; // page size of current file
- int32_t cno; // commit number counter
- pgno_t freePgno; // freelist page number
- uint8_t resv[100]; // reserved space
-} SPgFileHdr;
-#pragma pack(pop)
-
-#define TDB_PG_FILE_HDR_SIZE 128
-
-TDB_STATIC_ASSERT(sizeof(SPgFileHdr) == TDB_PG_FILE_HDR_SIZE, "Page file header size if not 128");
-
-struct SPgFile {
- TENV * pEnv; // env containing this page file
- char * fname; // backend file name
- uint8_t fileid[TDB_FILE_ID_LEN]; // file id
- pgno_t lsize; // page file logical size (for count)
- pgno_t fsize; // real file size on disk (for rollback)
- TdFilePtr pFile;
- SPgFileListNode envHash;
- SPgFileListNode envPgfList;
-};
-
-int pgFileOpen(SPgFile **ppPgFile, const char *fname, TENV *pEnv);
-int pgFileClose(SPgFile *pPgFile);
-
-SPage *pgFileFetch(SPgFile *pPgFile, pgno_t pgno);
-int pgFileRelease(SPage *pPage);
-
-int pgFileWrite(SPage *pPage);
-int pgFileAllocatePage(SPgFile *pPgFile, pgno_t *pPgno);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_PAGE_FILE_H_*/
\ No newline at end of file
diff --git a/source/libs/tdb/src/inc/tdbUtil.h b/source/libs/tdb/src/inc/tdbUtil.h
index ca05790f77..8aaded933a 100644
--- a/source/libs/tdb/src/inc/tdbUtil.h
+++ b/source/libs/tdb/src/inc/tdbUtil.h
@@ -35,7 +35,48 @@ int tdbGnrtFileID(const char *fname, uint8_t *fileid, bool unique);
// #define TDB_W_OK 0x4
// int tdbCheckFileAccess(const char *pathname, int mode);
-int tdbGetFileSize(const char *fname, pgsz_t pgSize, pgno_t *pSize);
+int tdbGetFileSize(const char *fname, int pgSize, SPgno *pSize);
+
+int tdbPRead(int fd, void *pData, int count, i64 offset);
+
+static inline int tdbPutVarInt(u8 *p, int v) {
+ int n = 0;
+
+ for (;;) {
+ if (v <= 0x7f) {
+ p[n++] = v;
+ break;
+ }
+
+ p[n++] = (v & 0x7f) | 0x80;
+ v >>= 7;
+ }
+
+ ASSERT(n < 6);
+
+ return n;
+}
+
+static inline int tdbGetVarInt(const u8 *p, int *v) {
+ int n = 0;
+ int tv = 0;
+
+ for (;;) {
+ if (p[n] <= 0x7f) {
+ tv = (tv << 7) | p[n];
+ n++;
+ break;
+ }
+
+ tv = (tv << 7) | (p[n] & 0x7f);
+ n++;
+ }
+
+ ASSERT(n < 6);
+
+ *v = tv;
+ return n;
+}
#ifdef __cplusplus
}
diff --git a/source/libs/tdb/src/page/tdbPage.c b/source/libs/tdb/src/page/tdbPage.c
new file mode 100644
index 0000000000..4ec3a895e7
--- /dev/null
+++ b/source/libs/tdb/src/page/tdbPage.c
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "tdbInt.h"
+
+extern SPageMethods pageMethods;
+extern SPageMethods pageLargeMethods;
+
+typedef struct __attribute__((__packed__)) {
+ u16 szCell;
+ u16 nxOffset;
+} SFreeCell;
+
+static int tdbPageAllocate(SPage *pPage, int size, SCell **ppCell);
+static int tdbPageDefragment(SPage *pPage);
+
+int tdbPageCreate(int pageSize, SPage **ppPage, void *(*xMalloc)(void *, size_t), void *arg) {
+ SPage *pPage;
+ u8 *ptr;
+ int size;
+
+ ASSERT(TDB_IS_PGSIZE_VLD(pageSize));
+
+ *ppPage = NULL;
+ size = pageSize + sizeof(*pPage);
+
+ ptr = (u8 *)((*xMalloc)(arg, size));
+ if (pPage == NULL) {
+ return -1;
+ }
+
+ memset(ptr, 0, size);
+ pPage = (SPage *)(ptr + pageSize);
+
+ pPage->pData = ptr;
+ pPage->pageSize = pageSize;
+ if (pageSize < 65536) {
+ pPage->pPageMethods = &pageMethods;
+ } else {
+ pPage->pPageMethods = &pageLargeMethods;
+ }
+ TDB_INIT_PAGE_LOCK(pPage);
+
+ /* TODO */
+
+ *ppPage = pPage;
+ return 0;
+}
+
+int tdbPageDestroy(SPage *pPage, void (*xFree)(void *arg, void *ptr), void *arg) {
+ u8 *ptr;
+
+ ptr = pPage->pData;
+ (*xFree)(arg, ptr);
+
+ return 0;
+}
+
+int tdbPageInsertCell(SPage *pPage, int idx, SCell *pCell, int szCell) {
+ int ret;
+ SCell *pTarget;
+ u8 *pTmp;
+ int j;
+
+ if (pPage->nOverflow || szCell + TDB_PAGE_OFFSET_SIZE(pPage) > pPage->nFree) {
+ // TODO: need to figure out if pCell may be used by outside of this function
+ j = pPage->nOverflow++;
+
+ pPage->apOvfl[j] = pCell;
+ pPage->aiOvfl[j] = idx;
+ } else {
+ ret = tdbPageAllocate(pPage, szCell, &pTarget);
+ if (ret < 0) {
+ return -1;
+ }
+
+ memcpy(pTarget, pCell, szCell);
+ pTmp = pPage->pCellIdx + idx * TDB_PAGE_OFFSET_SIZE(pPage);
+ memmove(pTmp + TDB_PAGE_OFFSET_SIZE(pPage), pTmp, pPage->pFreeStart - pTmp - TDB_PAGE_OFFSET_SIZE(pPage));
+ TDB_PAGE_CELL_OFFSET_AT_SET(pPage, idx, pTarget - pPage->pData);
+ TDB_PAGE_NCELLS_SET(pPage, TDB_PAGE_NCELLS(pPage) + 1);
+ }
+
+ return 0;
+}
+
+int tdbPageDropCell(SPage *pPage, int idx) {
+ // TODO
+ return 0;
+}
+
+static int tdbPageAllocate(SPage *pPage, int size, SCell **ppCell) {
+ SCell *pCell;
+ SFreeCell *pFreeCell;
+ u8 *pOffset;
+ int ret;
+
+ ASSERT(pPage->nFree > size + TDB_PAGE_OFFSET_SIZE(pPage));
+
+ pCell = NULL;
+ *ppCell = NULL;
+
+ // 1. Try to allocate from the free space area
+ if (pPage->pFreeEnd - pPage->pFreeStart > size + TDB_PAGE_OFFSET_SIZE(pPage)) {
+ pPage->pFreeEnd -= size;
+ pPage->pFreeStart += TDB_PAGE_OFFSET_SIZE(pPage);
+ pCell = pPage->pFreeEnd;
+ }
+
+ // 2. Try to allocate from the page free list
+ if ((pCell == NULL) && (pPage->pFreeEnd - pPage->pFreeStart >= TDB_PAGE_OFFSET_SIZE(pPage)) &&
+ TDB_PAGE_FCELL(pPage)) {
+#if 0
+ int szCell;
+ int nxOffset;
+
+ pCell = pPage->pData + TDB_PAGE_FCELL(pPage);
+ pOffset = TDB_IS_LARGE_PAGE(pPage) ? ((SPageHdrL *)(pPage->pPageHdr))[0].fCell
+ : (u8 *)&(((SPageHdr *)(pPage->pPageHdr))[0].fCell);
+ szCell = TDB_PAGE_FREE_CELL_SIZE(pPage, pCell);
+ nxOffset = TDB_PAGE_FREE_CELL_NXOFFSET(pPage, pCell);
+
+ for (;;) {
+ // Find a cell
+ if (szCell >= size) {
+ if (szCell - size >= pPage->szFreeCell) {
+ SCell *pTmpCell = pCell + size;
+
+ TDB_PAGE_FREE_CELL_SIZE_SET(pPage, pTmpCell, szCell - size);
+ TDB_PAGE_FREE_CELL_NXOFFSET_SET(pPage, pTmpCell, nxOffset);
+ // TODO: *pOffset = pTmpCell - pPage->pData;
+ } else {
+ TDB_PAGE_NFREE_SET(pPage, TDB_PAGE_NFREE(pPage) + szCell - size);
+ // TODO: *pOffset = nxOffset;
+ }
+ break;
+ }
+
+ // Not find a cell yet
+ if (nxOffset > 0) {
+ pCell = pPage->pData + nxOffset;
+ pOffset = TDB_PAGE_FREE_CELL_NXOFFSET_PTR(pPage, pCell);
+ szCell = TDB_PAGE_FREE_CELL_SIZE(pPage, pCell);
+ nxOffset = TDB_PAGE_FREE_CELL_NXOFFSET(pPage, pCell);
+ continue;
+ } else {
+ pCell = NULL;
+ break;
+ }
+ }
+
+ if (pCell) {
+ pPage->pFreeStart = pPage->pFreeStart + pPage->szOffset;
+ }
+#endif
+ }
+
+ // 3. Try to dfragment and allocate again
+ if (pCell == NULL) {
+ ret = tdbPageDefragment(pPage);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ASSERT(pPage->pFreeEnd - pPage->pFreeStart > size + TDB_PAGE_OFFSET_SIZE(pPage));
+ ASSERT(pPage->nFree == pPage->pFreeEnd - pPage->pFreeStart);
+
+ // Allocate from the free space area again
+ pPage->pFreeEnd -= size;
+ pPage->pFreeStart += TDB_PAGE_OFFSET_SIZE(pPage);
+ pCell = pPage->pFreeEnd;
+ }
+
+ ASSERT(pCell != NULL);
+
+ pPage->nFree = pPage->nFree - size - TDB_PAGE_OFFSET_SIZE(pPage);
+ *ppCell = pCell;
+ return 0;
+}
+
+static int tdbPageFree(SPage *pPage, int idx, SCell *pCell, int size) {
+ // TODO
+ return 0;
+}
+
+static int tdbPageDefragment(SPage *pPage) {
+ // TODO
+ ASSERT(0);
+ return 0;
+}
+
+/* ---------------------------------------------------------------------------------------------------------- */
+typedef struct __attribute__((__packed__)) {
+ u16 flags;
+ u16 cellNum;
+ u16 cellBody;
+ u16 cellFree;
+ u16 nFree;
+} SPageHdr;
+
+// flags
+static inline u16 getPageFlags(SPage *pPage) { return ((SPageHdr *)(pPage->pPageHdr))[0].flags; }
+static inline void setPageFlags(SPage *pPage, u16 flags) { ((SPageHdr *)(pPage->pPageHdr))[0].flags = flags; }
+
+// cellNum
+static inline int getPageCellNum(SPage *pPage) { return ((SPageHdr *)(pPage->pPageHdr))[0].cellNum; }
+static inline void setPageCellNum(SPage *pPage, int cellNum) {
+ ASSERT(cellNum < 65536);
+ ((SPageHdr *)(pPage->pPageHdr))[0].cellNum = (u16)cellNum;
+}
+
+// cellBody
+static inline int getPageCellBody(SPage *pPage) { return ((SPageHdr *)(pPage->pPageHdr))[0].cellBody; }
+static inline void setPageCellBody(SPage *pPage, int cellBody) {
+ ASSERT(cellBody < 65536);
+ ((SPageHdr *)(pPage->pPageHdr))[0].cellBody = (u16)cellBody;
+}
+
+// cellFree
+static inline int getPageCellFree(SPage *pPage) { return ((SPageHdr *)(pPage->pPageHdr))[0].cellFree; }
+static inline void setPageCellFree(SPage *pPage, int cellFree) {
+ ASSERT(cellFree < 65536);
+ ((SPageHdr *)(pPage->pPageHdr))[0].cellFree = (u16)cellFree;
+}
+
+// nFree
+static inline int getPageNFree(SPage *pPage) { return ((SPageHdr *)(pPage->pPageHdr))[0].nFree; }
+static inline void setPageNFree(SPage *pPage, int nFree) {
+ ASSERT(nFree < 65536);
+ ((SPageHdr *)(pPage->pPageHdr))[0].nFree = (u16)nFree;
+}
+
+// cell offset
+static inline int getPageCellOffset(SPage *pPage, int idx) {
+ ASSERT(idx >= 0 && idx < getPageCellNum(pPage));
+ return ((u16 *)pPage->pCellIdx)[idx];
+}
+
+static inline void setPageCellOffset(SPage *pPage, int idx, int offset) {
+ ASSERT(offset < 65536);
+ ((u16 *)pPage->pCellIdx)[idx] = (u16)offset;
+}
+
+SPageMethods pageMethods = {
+ 2, // szOffset
+ sizeof(SPageHdr), // szPageHdr
+ sizeof(SFreeCell), // szFreeCell
+ getPageFlags, // getPageFlags
+ setPageFlags, // setFlagsp
+ getPageCellNum, // getCellNum
+ setPageCellNum, // setCellNum
+ getPageCellBody, // getCellBody
+ setPageCellBody, // setCellBody
+ getPageCellFree, // getCellFree
+ setPageCellFree, // setCellFree
+ getPageNFree, // getFreeBytes
+ setPageNFree, // setFreeBytes
+ getPageCellOffset, // getCellOffset
+ setPageCellOffset // setCellOffset
+};
\ No newline at end of file
diff --git a/source/libs/tdb/src/page/tdbPageL.c b/source/libs/tdb/src/page/tdbPageL.c
new file mode 100644
index 0000000000..e7c60118d2
--- /dev/null
+++ b/source/libs/tdb/src/page/tdbPageL.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+#include "tdbInt.h"
+
+typedef struct __attribute__((__packed__)) {
+ u16 flags;
+ u8 cellNum[3];
+ u8 cellBody[3];
+ u8 cellFree[3];
+ u8 nFree[3];
+} SPageHdrL;
+
+typedef struct __attribute__((__packed__)) {
+ u8 szCell[3];
+ u8 nxOffset[3];
+} SFreeCellL;
+
+// flags
+static inline u16 getPageFlags(SPage *pPage) { return ((SPageHdrL *)(pPage->pPageHdr))[0].flags; }
+static inline void setPageFlags(SPage *pPage, u16 flags) { ((SPageHdrL *)(pPage->pPageHdr))[0].flags = flags; }
+
+// cellNum
+static inline int getPageCellNum(SPage *pPage) { return TDB_GET_U24(((SPageHdrL *)(pPage->pPageHdr))[0].cellNum); }
+static inline void setPageCellNum(SPage *pPage, int cellNum) {
+ TDB_PUT_U24(((SPageHdrL *)(pPage->pPageHdr))[0].cellNum, cellNum);
+}
+
+// cellBody
+static inline int getPageCellBody(SPage *pPage) { return TDB_GET_U24(((SPageHdrL *)(pPage->pPageHdr))[0].cellBody); }
+static inline void setPageCellBody(SPage *pPage, int cellBody) {
+ TDB_PUT_U24(((SPageHdrL *)(pPage->pPageHdr))[0].cellBody, cellBody);
+}
+
+// cellFree
+static inline int getPageCellFree(SPage *pPage) { return TDB_GET_U24(((SPageHdrL *)(pPage->pPageHdr))[0].cellFree); }
+static inline void setPageCellFree(SPage *pPage, int cellFree) {
+ TDB_PUT_U24(((SPageHdrL *)(pPage->pPageHdr))[0].cellFree, cellFree);
+}
+
+// nFree
+static inline int getPageNFree(SPage *pPage) { return TDB_GET_U24(((SPageHdrL *)(pPage->pPageHdr))[0].nFree); }
+static inline void setPageNFree(SPage *pPage, int nFree) {
+ TDB_PUT_U24(((SPageHdrL *)(pPage->pPageHdr))[0].nFree, nFree);
+}
+
+// cell offset
+static inline int getPageCellOffset(SPage *pPage, int idx) {
+ ASSERT(idx >= 0 && idx < getPageCellNum(pPage));
+ return TDB_GET_U24(pPage->pCellIdx + 3 * idx);
+}
+
+static inline void setPageCellOffset(SPage *pPage, int idx, int offset) {
+ TDB_PUT_U24(pPage->pCellIdx + 3 * idx, offset);
+}
+
+SPageMethods pageLargeMethods = {
+ 3, // szOffset
+ sizeof(SPageHdrL), // szPageHdr
+ sizeof(SFreeCellL), // szFreeCell
+ getPageFlags, // getPageFlags
+ setPageFlags, // setFlagsp
+ getPageCellNum, // getCellNum
+ setPageCellNum, // setCellNum
+ getPageCellBody, // getCellBody
+ setPageCellBody, // setCellBody
+ getPageCellFree, // getCellFree
+ setPageCellFree, // setCellFree
+ getPageNFree, // getFreeBytes
+ setPageNFree, // setFreeBytes
+ getPageCellOffset, // getCellOffset
+ setPageCellOffset // setCellOffset
+};
\ No newline at end of file
diff --git a/source/libs/tdb/test/tdbTest.cpp b/source/libs/tdb/test/tdbTest.cpp
index ad550c7804..c3cc922f32 100644
--- a/source/libs/tdb/test/tdbTest.cpp
+++ b/source/libs/tdb/test/tdbTest.cpp
@@ -1,68 +1,39 @@
#include
-#include "tdb.h"
+#include "tdbInt.h"
TEST(tdb_test, simple_test) {
- TENV * pEnv;
- TDB * pDb1, *pDb2, *pDb3;
- pgsz_t pgSize = 1024;
- cachesz_t cacheSize = 10240;
+ int ret;
+ STEnv *pEnv;
+ STDb *pDb;
- // ENV
- GTEST_ASSERT_EQ(tdbEnvCreate(&pEnv, "./testtdb"), 0);
+ // Open Env
+ ret = tdbEnvOpen("tdb", 1024, 20, &pEnv);
+ GTEST_ASSERT_EQ(ret, 0);
- GTEST_ASSERT_EQ(tdbEnvSetCache(pEnv, pgSize, cacheSize), 0);
+ // Create a database
+ ret = tdbDbOpen("db.db", TDB_VARIANT_LEN, TDB_VARIANT_LEN, NULL, pEnv, &pDb);
+ GTEST_ASSERT_EQ(ret, 0);
- GTEST_ASSERT_EQ(tdbEnvGetCacheSize(pEnv), cacheSize);
+ { // Insert some data
+ char key[64];
+ char val[64];
- GTEST_ASSERT_EQ(tdbEnvGetPageSize(pEnv), pgSize);
+ for (int i = 1; i <= 1000; i++) {
+ sprintf(key, "key%d", i);
+ sprintf(val, "value%d", i);
+ ret = tdbDbInsert(pDb, key, strlen(key), val, strlen(val));
+ GTEST_ASSERT_EQ(ret, 0);
+ }
+ }
- GTEST_ASSERT_EQ(tdbEnvOpen(pEnv), 0);
+ ret = tdbDbDrop(pDb);
+ GTEST_ASSERT_EQ(ret, 0);
-#if 1
- // DB
- GTEST_ASSERT_EQ(tdbCreate(&pDb1), 0);
+ // Close a database
+ tdbDbClose(pDb);
- // GTEST_ASSERT_EQ(tdbSetKeyLen(pDb1, 8), 0);
-
- // GTEST_ASSERT_EQ(tdbGetKeyLen(pDb1), 8);
-
- // GTEST_ASSERT_EQ(tdbSetValLen(pDb1, 3), 0);
-
- // GTEST_ASSERT_EQ(tdbGetValLen(pDb1), 3);
-
- // GTEST_ASSERT_EQ(tdbSetDup(pDb1, 1), 0);
-
- // GTEST_ASSERT_EQ(tdbGetDup(pDb1), 1);
-
- // GTEST_ASSERT_EQ(tdbSetCmprFunc(pDb1, NULL), 0);
-
- tdbEnvBeginTxn(pEnv);
-
- GTEST_ASSERT_EQ(tdbOpen(pDb1, "db.db", "db1", pEnv), 0);
-
- // char *key = "key1";
- // char *val = "value1";
- // tdbInsert(pDb1, (void *)key, strlen(key), (void *)val, strlen(val));
-
- tdbEnvCommit(pEnv);
-
-#if 0
- // Insert
-
- // Query
-
- // Delete
-
- // Query
-#endif
-
- // GTEST_ASSERT_EQ(tdbOpen(&pDb2, "db.db", "db2", pEnv), 0);
- // GTEST_ASSERT_EQ(tdbOpen(&pDb3, "index.db", NULL, pEnv), 0);
- // tdbClose(pDb3);
- // tdbClose(pDb2);
- tdbClose(pDb1);
-#endif
-
- tdbEnvClose(pEnv);
+ // Close Env
+ ret = tdbEnvClose(pEnv);
+ GTEST_ASSERT_EQ(ret, 0);
}
\ No newline at end of file
diff --git a/source/libs/tfs/src/tfs.c b/source/libs/tfs/src/tfs.c
index 0781be4b9d..94f70d795a 100644
--- a/source/libs/tfs/src/tfs.c
+++ b/source/libs/tfs/src/tfs.c
@@ -204,7 +204,8 @@ void tfsDirname(const STfsFile *pFile, char *dest) {
void tfsAbsoluteName(STfs *pTfs, SDiskID diskId, const char *rname, char *aname) {
STfsDisk *pDisk = TFS_DISK_AT(pTfs, diskId);
- snprintf(aname, TMPNAME_LEN, "%s%s%s", pDisk->path, TD_DIRSEP, rname);
+
+ snprintf(aname, TSDB_FILENAME_LEN, "%s%s%s", pDisk->path, TD_DIRSEP, rname);
}
int32_t tfsRemoveFile(const STfsFile *pFile) { return taosRemoveFile(pFile->aname); }
diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h
index 8ea65b193d..c861ed350e 100644
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@@ -14,6 +14,10 @@
*/
#ifdef USE_UV
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include
#include "lz4.h"
#include "os.h"
@@ -121,24 +125,21 @@ typedef struct {
} SRpcReqContext;
typedef SRpcMsg STransMsg;
+typedef SRpcCtx STransCtx;
+typedef SRpcCtxVal STransCtxVal;
typedef SRpcInfo STrans;
typedef SRpcConnInfo STransHandleInfo;
typedef struct {
- SEpSet epSet; // ip list provided by app
- void* ahandle; // handle provided by app
- tmsg_t msgType; // message type
- uint8_t* pCont; // content provided by app
- int32_t contLen; // content length
- // int32_t code; // error code
- // int16_t numOfTry; // number of try for different servers
- // int8_t oldInUse; // server EP inUse passed by app
- // int8_t redirect; // flag to indicate redirect
+ SEpSet epSet; // ip list provided by app
+ void* ahandle; // handle provided by app
+ tmsg_t msgType; // message type
int8_t connType; // connection type cli/srv
int64_t rid; // refId returned by taosAddRef
- STransMsg* pRsp; // for synchronous API
- tsem_t* pSem; // for synchronous API
+ STransCtx appCtx; //
+ STransMsg* pRsp; // for synchronous API
+ tsem_t* pSem; // for synchronous API
int hThrdIdx;
char* ip;
@@ -150,11 +151,12 @@ typedef struct {
typedef struct {
char version : 4; // RPC version
- char comp : 4; // compression algorithm, 0:no compression 1:lz4
- char resflag : 2; // reserved bits
- char spi : 1; // security parameter index
+ char comp : 2; // compression algorithm, 0:no compression 1:lz4
+ char noResp : 2; // noResp bits, 0: resp, 1: resp
+ char persist : 2; // persist handle,0: no persit, 1: persist handle
+ char release : 2;
char secured : 2;
- char encrypt : 3; // encrypt algorithm, 0: no encryption
+ char spi : 2;
uint32_t code; // del later
uint32_t msgType;
@@ -179,6 +181,9 @@ typedef struct {
#pragma pack(pop)
+typedef enum { Normal, Quit, Release, Register } STransMsgType;
+typedef enum { ConnNormal, ConnAcquire, ConnRelease, ConnBroken } ConnStatus;
+
#define container_of(ptr, type, member) ((type*)((char*)(ptr)-offsetof(type, member)))
#define RPC_RESERVE_SIZE (sizeof(STranConnCtx))
@@ -255,9 +260,10 @@ void transUnrefCliHandle(void* handle);
void transReleaseCliHandle(void* handle);
void transReleaseSrvHandle(void* handle);
-void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* pMsg);
+void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* pMsg, STransCtx* pCtx);
void transSendRecv(void* shandle, const char* ip, uint32_t port, STransMsg* pMsg, STransMsg* pRsp);
-void transSendResponse(const STransMsg* pMsg);
+void transSendResponse(const STransMsg* msg);
+void transRegisterMsg(const STransMsg* msg);
int transGetConnInfo(void* thandle, STransHandleInfo* pInfo);
void* transInitServer(uint32_t ip, uint32_t port, char* label, int numOfThreads, void* fp, void* shandle);
@@ -266,4 +272,14 @@ void* transInitClient(uint32_t ip, uint32_t port, char* label, int numOfThreads,
void transCloseClient(void* arg);
void transCloseServer(void* arg);
+void transCtxInit(STransCtx* ctx);
+void transCtxDestroy(STransCtx* ctx);
+void transCtxClear(STransCtx* ctx);
+void transCtxMerge(STransCtx* dst, STransCtx* src);
+void* transCtxDumpVal(STransCtx* ctx, int32_t key);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/source/libs/transport/inc/transportInt.h b/source/libs/transport/inc/transportInt.h
index e739380467..1395408960 100644
--- a/source/libs/transport/inc/transportInt.h
+++ b/source/libs/transport/inc/transportInt.h
@@ -63,9 +63,6 @@ typedef struct {
void (*cfp)(void* parent, SRpcMsg*, SEpSet*);
int (*afp)(void* parent, char* user, char* spi, char* encrypt, char* secret, char* ckey);
- bool (*pfp)(void* parent, tmsg_t msgType);
- void* (*mfp)(void* parent, tmsg_t msgType);
- bool (*efp)(void* parent, tmsg_t msgType);
int32_t refCount;
void* parent;
diff --git a/source/libs/transport/src/trans.c b/source/libs/transport/src/trans.c
index 2cab03f133..317f80c48d 100644
--- a/source/libs/transport/src/trans.c
+++ b/source/libs/transport/src/trans.c
@@ -39,9 +39,6 @@ void* rpcOpen(const SRpcInit* pInit) {
// register callback handle
pRpc->cfp = pInit->cfp;
pRpc->afp = pInit->afp;
- pRpc->pfp = pInit->pfp;
- pRpc->mfp = pInit->mfp;
- pRpc->efp = pInit->efp;
if (pInit->connType == TAOS_CONN_SERVER) {
pRpc->numOfThreads = pInit->numOfThreads > TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS : pInit->numOfThreads;
@@ -121,7 +118,12 @@ void rpcCancelRequest(int64_t rid) { return; }
void rpcSendRequest(void* shandle, const SEpSet* pEpSet, SRpcMsg* pMsg, int64_t* pRid) {
char* ip = (char*)(pEpSet->eps[pEpSet->inUse].fqdn);
uint32_t port = pEpSet->eps[pEpSet->inUse].port;
- transSendRequest(shandle, ip, port, pMsg);
+ transSendRequest(shandle, ip, port, pMsg, NULL);
+}
+void rpcSendRequestWithCtx(void* shandle, const SEpSet* pEpSet, SRpcMsg* pMsg, int64_t* pRid, SRpcCtx* pCtx) {
+ char* ip = (char*)(pEpSet->eps[pEpSet->inUse].fqdn);
+ uint32_t port = pEpSet->eps[pEpSet->inUse].port;
+ transSendRequest(shandle, ip, port, pMsg, pCtx);
}
void rpcSendRecv(void* shandle, SEpSet* pEpSet, SRpcMsg* pMsg, SRpcMsg* pRsp) {
char* ip = (char*)(pEpSet->eps[pEpSet->inUse].fqdn);
@@ -142,6 +144,7 @@ void rpcUnrefHandle(void* handle, int8_t type) {
(*taosUnRefHandle[type])(handle);
}
+void rpcRegisterBrokenLinkArg(SRpcMsg* msg) { rpcSendResponse(msg); }
void rpcReleaseHandle(void* handle, int8_t type) {
assert(type == TAOS_CONN_SERVER || type == TAOS_CONN_CLIENT);
(*transReleaseHandle[type])(handle);
diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index df35b8d67b..46658e9352 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -17,11 +17,6 @@
#include "transComm.h"
-// Normal(default): send/recv msg
-// Quit: quit rpc inst
-// Release: release handle to rpc inst
-typedef enum { Normal, Quit, Release } SCliMsgType;
-
typedef struct SCliConn {
T_REF_DECLARE()
uv_connect_t connReq;
@@ -35,8 +30,10 @@ typedef struct SCliConn {
uint64_t expireTime;
int hThrdIdx;
bool broken; // link broken or not
+ STransCtx ctx;
- int persist; //
+ ConnStatus status; //
+ int release; // 1: release
// spi configure
char spi;
char secured;
@@ -55,7 +52,7 @@ typedef struct SCliMsg {
STransMsg msg;
queue q;
uint64_t st;
- SCliMsgType type;
+ STransMsgType type;
} SCliMsg;
typedef struct SCliThrdObj {
@@ -113,10 +110,12 @@ static void cliSend(SCliConn* pConn);
static void cliHandleResp(SCliConn* conn);
// handle except about conn
static void cliHandleExcept(SCliConn* conn);
+
// handle req from app
static void cliHandleReq(SCliMsg* pMsg, SCliThrdObj* pThrd);
static void cliHandleQuit(SCliMsg* pMsg, SCliThrdObj* pThrd);
static void cliHandleRelease(SCliMsg* pMsg, SCliThrdObj* pThrd);
+static void (*cliAsyncHandle[])(SCliMsg* pMsg, SCliThrdObj* pThrd) = {cliHandleReq, cliHandleQuit, cliHandleRelease};
static void cliSendQuit(SCliThrdObj* thrd);
static void destroyUserdata(STransMsg* userdata);
@@ -133,11 +132,26 @@ static void destroyThrdObj(SCliThrdObj* pThrd);
#define CONN_PERSIST_TIME(para) (para * 1000 * 10)
#define CONN_GET_HOST_THREAD(conn) (conn ? ((SCliConn*)conn)->hostThrd : NULL)
#define CONN_GET_INST_LABEL(conn) (((STrans*)(((SCliThrdObj*)(conn)->hostThrd)->pTransInst))->label)
+#define CONN_SHOULD_RELEASE(conn, head) \
+ do { \
+ if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) { \
+ conn->status = ConnRelease; \
+ transClearBuffer(&conn->readBuf); \
+ transFreeMsg(transContFromHead((char*)head)); \
+ tDebug("cli conn %p receive release request", conn); \
+ if (T_REF_VAL_GET(conn) == 1) { \
+ SCliThrdObj* thrd = conn->hostThrd; \
+ addConnToPool(thrd->pool, conn); \
+ } \
+ return; \
+ } \
+ } while (0)
+
#define CONN_HANDLE_THREAD_QUIT(conn, thrd) \
do { \
if (thrd->quit) { \
cliHandleExcept(conn); \
- goto _RETURE; \
+ return; \
} \
} while (0)
@@ -145,20 +159,22 @@ static void destroyThrdObj(SCliThrdObj* pThrd);
do { \
if (conn->broken) { \
cliHandleExcept(conn); \
- goto _RETURE; \
+ return; \
} \
- } while (0);
+ } while (0)
#define CONN_SET_PERSIST_BY_APP(conn) \
do { \
- if (conn->persist == false) { \
- conn->persist = true; \
+ if (conn->status == ConnNormal) { \
+ conn->status = ConnAcquire; \
transRefCliHandle(conn); \
} \
} while (0)
-#define CONN_NO_PERSIST_BY_APP(conn) ((conn)->persist == false)
+#define CONN_NO_PERSIST_BY_APP(conn) ((conn)->status == ConnNormal && T_REF_VAL_GET(conn) == 1)
#define REQUEST_NO_RESP(msg) ((msg)->noResp == 1)
+#define REQUEST_PERSIS_HANDLE(msg) ((msg)->persistHandle == 1)
+#define REQUEST_RELEASE_HANDLE(cmsg) ((cmsg)->type == Release)
static void* cliWorkThread(void* arg);
@@ -177,7 +193,6 @@ void cliHandleResp(SCliConn* conn) {
STransMsgHead* pHead = (STransMsgHead*)(conn->readBuf.buf);
pHead->code = htonl(pHead->code);
pHead->msgLen = htonl(pHead->msgLen);
-
STransMsg transMsg = {0};
transMsg.contLen = transContLenFromMsg(pHead->msgLen);
transMsg.pCont = transContFromHead((char*)pHead);
@@ -185,6 +200,8 @@ void cliHandleResp(SCliConn* conn) {
transMsg.msgType = pHead->msgType;
transMsg.ahandle = NULL;
+ CONN_SHOULD_RELEASE(conn, pHead);
+
SCliMsg* pMsg = NULL;
if (taosArrayGetSize(conn->cliMsgs) > 0) {
pMsg = taosArrayGetP(conn->cliMsgs, 0);
@@ -193,16 +210,15 @@ void cliHandleResp(SCliConn* conn) {
STransConnCtx* pCtx = pMsg ? pMsg->ctx : NULL;
if (pMsg == NULL && !CONN_NO_PERSIST_BY_APP(conn)) {
- transMsg.ahandle = pTransInst->mfp ? (*pTransInst->mfp)(pTransInst->parent, transMsg.msgType) : NULL;
+ transMsg.ahandle = transCtxDumpVal(&conn->ctx, transMsg.msgType);
} else {
transMsg.ahandle = pCtx ? pCtx->ahandle : NULL;
}
// buf's mem alread translated to transMsg.pCont
transClearBuffer(&conn->readBuf);
- if (pTransInst->pfp != NULL && (*pTransInst->pfp)(pTransInst->parent, transMsg.msgType)) {
+ if (!CONN_NO_PERSIST_BY_APP(conn)) {
transMsg.handle = conn;
- CONN_SET_PERSIST_BY_APP(conn);
tDebug("%s cli conn %p ref by app", CONN_GET_INST_LABEL(conn), conn);
}
@@ -241,6 +257,8 @@ void cliHandleResp(SCliConn* conn) {
if (!uv_is_active((uv_handle_t*)&pThrd->timer) && pTransInst->idleTime > 0) {
// uv_timer_start((uv_timer_t*)&pThrd->timer, cliTimeoutCb, CONN_PERSIST_TIME(pRpc->idleTime) / 2, 0);
}
+_RETURN:
+ return;
}
void cliHandleExcept(SCliConn* pConn) {
@@ -268,7 +286,7 @@ void cliHandleExcept(SCliConn* pConn) {
transMsg.ahandle = NULL;
if (pMsg == NULL && !CONN_NO_PERSIST_BY_APP(pConn)) {
- transMsg.ahandle = pTransInst->mfp ? (*pTransInst->mfp)(pTransInst->parent, transMsg.msgType) : NULL;
+ transMsg.ahandle = transCtxDumpVal(&pConn->ctx, transMsg.msgType);
} else {
transMsg.ahandle = pCtx ? pCtx->ahandle : NULL;
}
@@ -359,6 +377,7 @@ static SCliConn* getConnFromPool(void* pool, char* ip, uint32_t port) {
static void addConnToPool(void* pool, SCliConn* conn) {
char key[128] = {0};
+ transCtxDestroy(&conn->ctx);
tstrncpy(key, conn->ip, strlen(conn->ip));
tstrncpy(key + strlen(key), (char*)(&conn->port), sizeof(conn->port));
tTrace("cli conn %p added to conn pool, read buf cap: %d", conn, conn->readBuf.cap);
@@ -367,15 +386,16 @@ static void addConnToPool(void* pool, SCliConn* conn) {
conn->expireTime = taosGetTimestampMs() + CONN_PERSIST_TIME(pTransInst->idleTime);
SConnList* plist = taosHashGet((SHashObj*)pool, key, strlen(key));
+ conn->status = ConnNormal;
// list already create before
assert(plist != NULL);
+ taosArrayClear(conn->cliMsgs);
QUEUE_PUSH(&plist->conn, &conn->conn);
+ assert(!QUEUE_IS_EMPTY(&plist->conn));
}
static void cliAllocRecvBufferCb(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) {
SCliConn* conn = handle->data;
SConnBuffer* pBuf = &conn->readBuf;
- // avoid conn
- QUEUE_REMOVE(&conn->conn);
transAllocBuffer(pBuf, buf);
}
static void cliRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) {
@@ -401,6 +421,7 @@ static void cliRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) {
// ref http://docs.libuv.org/en/v1.x/stream.html?highlight=uv_read_start#c.uv_read_cb
// nread might be 0, which does not indicate an error or EOF. This is equivalent to EAGAIN or EWOULDBLOCK under
// read(2).
+ tTrace("%s cli conn %p read empty", CONN_GET_INST_LABEL(conn), conn);
return;
}
if (nread < 0) {
@@ -420,16 +441,16 @@ static SCliConn* cliCreateConn(SCliThrdObj* pThrd) {
conn->writeReq.data = conn;
conn->connReq.data = conn;
conn->cliMsgs = taosArrayInit(2, sizeof(void*));
-
QUEUE_INIT(&conn->conn);
conn->hostThrd = pThrd;
- conn->persist = false;
- conn->broken = false;
+ conn->status = ConnNormal;
+ conn->broken = 0;
transRefCliHandle(conn);
return conn;
}
static void cliDestroyConn(SCliConn* conn, bool clear) {
tTrace("%s cli conn %p remove from conn pool", CONN_GET_INST_LABEL(conn), conn);
+
QUEUE_REMOVE(&conn->conn);
if (clear) {
uv_close((uv_handle_t*)conn->stream, cliDestroy);
@@ -439,6 +460,7 @@ static void cliDestroy(uv_handle_t* handle) {
SCliConn* conn = handle->data;
free(conn->ip);
free(conn->stream);
+ transCtxDestroy(&conn->ctx);
taosArrayDestroy(conn->cliMsgs);
tTrace("%s cli conn %p destroy successfully", CONN_GET_INST_LABEL(conn), conn);
free(conn);
@@ -490,7 +512,10 @@ void cliSend(SCliConn* pConn) {
STrans* pTransInst = pThrd->pTransInst;
STransMsg* pMsg = (STransMsg*)(&pCliMsg->msg);
-
+ if (pMsg->pCont == 0) {
+ pMsg->pCont = (void*)rpcMallocCont(0);
+ pMsg->contLen = 0;
+ }
STransMsgHead* pHead = transHeadFromCont(pMsg->pCont);
int msgLen = transMsgLenFromCont(pMsg->contLen);
@@ -513,20 +538,25 @@ void cliSend(SCliConn* pConn) {
msgLen += sizeof(STransUserMsg);
}
- pHead->resflag = REQUEST_NO_RESP(pMsg) ? 1 : 0;
+ pHead->noResp = REQUEST_NO_RESP(pMsg) ? 1 : 0;
+
+ pHead->persist = REQUEST_PERSIS_HANDLE(pMsg) ? 1 : 0;
pHead->msgType = pMsg->msgType;
pHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
+ pHead->release = REQUEST_RELEASE_HANDLE(pCliMsg) ? 1 : 0;
uv_buf_t wb = uv_buf_init((char*)pHead, msgLen);
tDebug("%s cli conn %p %s is send to %s:%d, local info %s:%d", CONN_GET_INST_LABEL(pConn), pConn,
TMSG_INFO(pHead->msgType), taosInetNtoa(pConn->addr.sin_addr), ntohs(pConn->addr.sin_port),
taosInetNtoa(pConn->locaddr.sin_addr), ntohs(pConn->locaddr.sin_port));
+ if (pHead->persist == 1) {
+ CONN_SET_PERSIST_BY_APP(pConn);
+ }
+
pConn->writeReq.data = pConn;
uv_write(&pConn->writeReq, (uv_stream_t*)pConn->stream, &wb, 1, cliSendCb);
- return;
-_RETURE:
return;
}
@@ -562,22 +592,14 @@ static void cliHandleQuit(SCliMsg* pMsg, SCliThrdObj* pThrd) {
}
static void cliHandleRelease(SCliMsg* pMsg, SCliThrdObj* pThrd) {
SCliConn* conn = pMsg->msg.handle;
- tDebug("%s cli conn %p release to inst", CONN_GET_INST_LABEL(conn), conn);
+ tDebug("%s cli conn %p start to release to inst", CONN_GET_INST_LABEL(conn), conn);
- while (taosArrayGetSize(conn->cliMsgs) > 0) {
- SCliMsg* pMsg = taosArrayGetP(conn->cliMsgs, 0);
- destroyCmsg(pMsg);
- taosArrayRemove(conn->cliMsgs, 0);
- }
-
- transDestroyBuffer(&conn->readBuf);
- if (conn->persist && T_REF_VAL_GET(conn) >= 2) {
- conn->persist = false;
- transUnrefCliHandle(conn);
- addConnToPool(pThrd->pool, conn);
- } else {
- transUnrefCliHandle(conn);
+ transUnrefCliHandle(conn);
+ taosArrayPush(conn->cliMsgs, &pMsg);
+ if (taosArrayGetSize(conn->cliMsgs) >= 2) {
+ return; // send one by one
}
+ cliSend(conn);
}
SCliConn* cliGetConn(SCliMsg* pMsg, SCliThrdObj* pThrd) {
@@ -592,6 +614,8 @@ SCliConn* cliGetConn(SCliMsg* pMsg, SCliThrdObj* pThrd) {
conn = getConnFromPool(pThrd->pool, pCtx->ip, pCtx->port);
if (conn != NULL) {
tTrace("%s cli conn %p get from conn pool", CONN_GET_INST_LABEL(conn), conn);
+ } else {
+ tTrace("not found conn in conn pool %p", pThrd->pool);
}
}
return conn;
@@ -609,10 +633,12 @@ void cliHandleReq(SCliMsg* pMsg, SCliThrdObj* pThrd) {
if (conn != NULL) {
conn->hThrdIdx = pCtx->hThrdIdx;
+ transCtxMerge(&conn->ctx, &pCtx->appCtx);
if (taosArrayGetSize(conn->cliMsgs) > 0) {
taosArrayPush(conn->cliMsgs, &pMsg);
return;
}
+
taosArrayPush(conn->cliMsgs, &pMsg);
transDestroyBuffer(&conn->readBuf);
cliSend(conn);
@@ -652,14 +678,10 @@ static void cliAsyncCb(uv_async_t* handle) {
QUEUE_REMOVE(h);
SCliMsg* pMsg = QUEUE_DATA(h, SCliMsg, q);
-
- if (pMsg->type == Normal) {
- cliHandleReq(pMsg, pThrd);
- } else if (pMsg->type == Quit) {
- cliHandleQuit(pMsg, pThrd);
- } else if (pMsg->type == Release) {
- cliHandleRelease(pMsg, pThrd);
+ if (pMsg == NULL) {
+ continue;
}
+ (*cliAsyncHandle[pMsg->type])(pMsg, pThrd);
count++;
}
if (count >= 2) {
@@ -802,13 +824,13 @@ void transReleaseCliHandle(void* handle) {
STransMsg tmsg = {.handle = handle};
SCliMsg* cmsg = calloc(1, sizeof(SCliMsg));
- cmsg->type = Release;
cmsg->msg = tmsg;
+ cmsg->type = Release;
transSendAsync(thrd->asyncPool, &cmsg->q);
}
-void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* pMsg) {
+void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* pMsg, STransCtx* ctx) {
STrans* pTransInst = (STrans*)shandle;
int index = CONN_HOST_THREAD_INDEX((SCliConn*)pMsg->handle);
if (index == -1) {
@@ -818,7 +840,7 @@ void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* p
if (transCompressMsg(pMsg->pCont, pMsg->contLen, &flen)) {
// imp later
}
- tDebug("send request at thread:%d %p", index, pMsg);
+ tDebug("send request at thread:%d %p, dst: %s:%d", index, pMsg, ip, port);
STransConnCtx* pCtx = calloc(1, sizeof(STransConnCtx));
pCtx->ahandle = pMsg->ahandle;
pCtx->msgType = pMsg->msgType;
@@ -826,6 +848,10 @@ void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* p
pCtx->port = port;
pCtx->hThrdIdx = index;
+ if (ctx != NULL) {
+ pCtx->appCtx = *ctx;
+ }
+
assert(pTransInst->connType == TAOS_CONN_CLIENT);
// atomic or not
@@ -833,10 +859,12 @@ void transSendRequest(void* shandle, const char* ip, uint32_t port, STransMsg* p
cliMsg->ctx = pCtx;
cliMsg->msg = *pMsg;
cliMsg->st = taosGetTimestampUs();
+ cliMsg->type = Normal;
SCliThrdObj* thrd = ((SCliObj*)pTransInst->tcphandle)->pThreadObj[index];
transSendAsync(thrd->asyncPool, &(cliMsg->q));
}
+
void transSendRecv(void* shandle, const char* ip, uint32_t port, STransMsg* pReq, STransMsg* pRsp) {
STrans* pTransInst = (STrans*)shandle;
int index = CONN_HOST_THREAD_INDEX(pReq->handle);
@@ -858,6 +886,7 @@ void transSendRecv(void* shandle, const char* ip, uint32_t port, STransMsg* pReq
cliMsg->ctx = pCtx;
cliMsg->msg = *pReq;
cliMsg->st = taosGetTimestampUs();
+ cliMsg->type = Normal;
SCliThrdObj* thrd = ((SCliObj*)pTransInst->tcphandle)->pThreadObj[index];
transSendAsync(thrd->asyncPool, &(cliMsg->q));
diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c
index 7123593a33..2c90efc3aa 100644
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@@ -155,9 +155,9 @@ bool transReadComplete(SConnBuffer* connBuf) {
}
return false;
}
-int transPackMsg(STransMsgHead* msgHead, bool sercured, bool auth) {return 0;}
+int transPackMsg(STransMsgHead* msgHead, bool sercured, bool auth) { return 0; }
-int transUnpackMsg(STransMsgHead* msgHead) {return 0;}
+int transUnpackMsg(STransMsgHead* msgHead) { return 0; }
int transDestroyBuffer(SConnBuffer* buf) {
if (buf->cap > 0) {
tfree(buf->buf);
@@ -224,4 +224,56 @@ int transSendAsync(SAsyncPool* pool, queue* q) {
return uv_async_send(async);
}
+void transCtxInit(STransCtx* ctx) {
+ // init transCtx
+ ctx->args = taosHashInit(2, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UINT), true, HASH_NO_LOCK);
+}
+void transCtxDestroy(STransCtx* ctx) {
+ if (ctx->args == NULL) {
+ return;
+ }
+
+ STransCtxVal* iter = taosHashIterate(ctx->args, NULL);
+ while (iter) {
+ iter->free(iter->val);
+ iter = taosHashIterate(ctx->args, iter);
+ }
+ taosHashCleanup(ctx->args);
+}
+
+void transCtxMerge(STransCtx* dst, STransCtx* src) {
+ if (dst->args == NULL) {
+ dst->args = src->args;
+ src->args = NULL;
+ return;
+ }
+ void* key = NULL;
+ size_t klen = 0;
+ void* iter = taosHashIterate(src->args, NULL);
+ while (iter) {
+ STransCtxVal* sVal = (STransCtxVal*)iter;
+ key = taosHashGetKey(sVal, &klen);
+
+ STransCtxVal* dVal = taosHashGet(dst->args, key, klen);
+ if (dVal) {
+ dVal->free(dVal->val);
+ }
+ taosHashPut(dst->args, key, klen, sVal, sizeof(*sVal));
+ iter = taosHashIterate(src->args, iter);
+ }
+ taosHashCleanup(src->args);
+}
+void* transCtxDumpVal(STransCtx* ctx, int32_t key) {
+ if (ctx->args == NULL) {
+ return NULL;
+ }
+ STransCtxVal* cVal = taosHashGet(ctx->args, (const void*)&key, sizeof(key));
+ if (cVal == NULL) {
+ return NULL;
+ }
+ char* ret = calloc(1, cVal->len);
+ memcpy(ret, (char*)cVal->val, cVal->len);
+ return (void*)ret;
+}
+
#endif
diff --git a/source/libs/transport/src/transSrv.c b/source/libs/transport/src/transSrv.c
index 73d836319f..063088aeb4 100644
--- a/source/libs/transport/src/transSrv.c
+++ b/source/libs/transport/src/transSrv.c
@@ -17,6 +17,12 @@
#include "transComm.h"
+typedef struct {
+ int notifyCount; //
+ int init; // init or not
+ STransMsg msg;
+} SSrvRegArg;
+
typedef struct SSrvConn {
T_REF_DECLARE()
uv_tcp_t* pTcp;
@@ -33,8 +39,10 @@ typedef struct SSrvConn {
void* hostThrd;
SArray* srvMsgs;
- bool broken; // conn broken;
+ SSrvRegArg regArg;
+ bool broken; // conn broken;
+ ConnStatus status;
struct sockaddr_in addr;
struct sockaddr_in locaddr;
@@ -47,18 +55,18 @@ typedef struct SSrvConn {
} SSrvConn;
typedef struct SSrvMsg {
- SSrvConn* pConn;
- STransMsg msg;
- queue q;
+ SSrvConn* pConn;
+ STransMsg msg;
+ queue q;
+ STransMsgType type;
} SSrvMsg;
typedef struct SWorkThrdObj {
- pthread_t thread;
- uv_pipe_t* pipe;
- uv_os_fd_t fd;
- uv_loop_t* loop;
- SAsyncPool* asyncPool;
-
+ pthread_t thread;
+ uv_pipe_t* pipe;
+ uv_os_fd_t fd;
+ uv_loop_t* loop;
+ SAsyncPool* asyncPool;
queue msg;
pthread_mutex_t msgMtx;
@@ -85,6 +93,27 @@ typedef struct SServerObj {
static const char* notify = "a";
+#define CONN_SHOULD_RELEASE(conn, head) \
+ do { \
+ if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) { \
+ conn->status = ConnRelease; \
+ transClearBuffer(&conn->readBuf); \
+ transFreeMsg(transContFromHead((char*)head)); \
+ tTrace("server conn %p received release request", conn); \
+ \
+ STransMsg tmsg = {.handle = (void*)conn, .code = 0}; \
+ SSrvMsg* srvMsg = calloc(1, sizeof(SSrvMsg)); \
+ srvMsg->msg = tmsg; \
+ srvMsg->type = Release; \
+ srvMsg->pConn = conn; \
+ taosArrayPush(conn->srvMsgs, &srvMsg); \
+ if (taosArrayGetSize(conn->srvMsgs) > 1) { \
+ return; \
+ } \
+ uvStartSendRespInternal(srvMsg); \
+ return; \
+ } \
+ } while (0)
// refactor later
static int transAddAuthPart(SSrvConn* pConn, char* msg, int msgLen);
@@ -113,6 +142,13 @@ static void destroySmsg(SSrvMsg* smsg);
static SSrvConn* createConn(void* hThrd);
static void destroyConn(SSrvConn* conn, bool clear /*clear handle or not*/);
+static void uvHandleQuit(SSrvMsg* msg, SWorkThrdObj* thrd);
+static void uvHandleRelease(SSrvMsg* msg, SWorkThrdObj* thrd);
+static void uvHandleSendResp(SSrvMsg* msg, SWorkThrdObj* thrd);
+static void uvHandleRegister(SSrvMsg* msg, SWorkThrdObj* thrd);
+static void (*transAsyncHandle[])(SSrvMsg* msg, SWorkThrdObj* thrd) = {uvHandleSendResp, uvHandleQuit, uvHandleRelease,
+ uvHandleRegister};
+
static void uvDestroyConn(uv_handle_t* handle);
// server and worker thread
@@ -217,9 +253,10 @@ static void uvHandleReq(SSrvConn* pConn) {
if (pHead->secured == 1) {
pHead->msgLen -= sizeof(STransUserMsg);
}
- //
}
+ CONN_SHOULD_RELEASE(pConn, pHead);
+
STransMsg transMsg;
transMsg.contLen = transContLenFromMsg(pHead->msgLen);
transMsg.pCont = pHead->content;
@@ -230,24 +267,32 @@ static void uvHandleReq(SSrvConn* pConn) {
transClearBuffer(&pConn->readBuf);
pConn->inType = pHead->msgType;
-
- if (pHead->resflag == 0) {
+ if (pConn->status == ConnNormal) {
+ if (pHead->persist == 1) {
+ pConn->status = ConnAcquire;
+ transRefSrvHandle(pConn);
+ }
+ }
+ if (pConn->status == ConnNormal && pHead->noResp == 0) {
transRefSrvHandle(pConn);
- transMsg.handle = pConn;
tDebug("server conn %p %s received from %s:%d, local info: %s:%d, msg size: %d", pConn, TMSG_INFO(transMsg.msgType),
taosInetNtoa(pConn->addr.sin_addr), ntohs(pConn->addr.sin_port), taosInetNtoa(pConn->locaddr.sin_addr),
ntohs(pConn->locaddr.sin_port), transMsg.contLen);
} else {
- tDebug("server conn %p %s received from %s:%d, local info: %s:%d, msg size: %d, no resp ", pConn,
+ tDebug("server conn %p %s received from %s:%d, local info: %s:%d, msg size: %d, resp:%d ", pConn,
TMSG_INFO(transMsg.msgType), taosInetNtoa(pConn->addr.sin_addr), ntohs(pConn->addr.sin_port),
- taosInetNtoa(pConn->locaddr.sin_addr), ntohs(pConn->locaddr.sin_port), transMsg.contLen);
+ taosInetNtoa(pConn->locaddr.sin_addr), ntohs(pConn->locaddr.sin_port), transMsg.contLen, pHead->noResp);
+ // no ref here
+ }
+
+ if (pHead->noResp == 0) {
+ transMsg.handle = pConn;
}
STrans* pTransInst = (STrans*)p->shandle;
(*pTransInst->cfp)(pTransInst->parent, &transMsg, NULL);
// uv_timer_start(&pConn->pTimer, uvHandleActivityTimeout, pRpc->idleTime * 10000, 0);
// auth
- // validate msg type
}
void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
@@ -272,11 +317,13 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
tError("server conn %p read error: %s", conn, uv_err_name(nread));
if (nread < 0) {
conn->broken = true;
- uvNotifyLinkBrokenToApp(conn);
-
- // STrans* pTransInst = conn->pTransInst;
- // if (pTransInst->efp != NULL && (pTransInst->efp)(NULL, conn->inType)) {
- //}
+ if (conn->status == ConnAcquire) {
+ if (conn->regArg.init) {
+ STrans* pTransInst = conn->pTransInst;
+ (*pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);
+ memset(&conn->regArg, 0, sizeof(conn->regArg));
+ }
+ }
transUnrefSrvHandle(conn);
}
}
@@ -301,8 +348,22 @@ void uvOnSendCb(uv_write_t* req, int status) {
SSrvMsg* msg = taosArrayGetP(conn->srvMsgs, 0);
tTrace("server conn %p sending msg size: %d", conn, (int)taosArrayGetSize(conn->srvMsgs));
taosArrayRemove(conn->srvMsgs, 0);
+ if (msg->type == Release && conn->status != ConnNormal) {
+ conn->status = ConnNormal;
+ transUnrefSrvHandle(conn);
+ } else if (msg->type == Register && conn->status == ConnAcquire) {
+ conn->regArg.notifyCount = 0;
+ conn->regArg.init = 1;
+ conn->regArg.msg = msg->msg;
+ if (conn->broken) {
+ STrans* pTransInst = conn->pTransInst;
+ (pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);
+ memset(&conn->regArg, 0, sizeof(conn->regArg));
+ }
+ free(msg);
+ return;
+ }
destroySmsg(msg);
-
// send second data, just use for push
if (taosArrayGetSize(conn->srvMsgs) > 0) {
tTrace("resent server conn %p sending msg size: %d", conn, (int)taosArrayGetSize(conn->srvMsgs));
@@ -312,7 +373,7 @@ void uvOnSendCb(uv_write_t* req, int status) {
}
} else {
tError("server conn %p failed to write data, %s", conn, uv_err_name(status));
- conn->broken = false;
+ conn->broken = true;
transUnrefSrvHandle(conn);
}
}
@@ -339,6 +400,7 @@ static void uvPrepareSendData(SSrvMsg* smsg, uv_buf_t* wb) {
pHead->secured = pMsg->code == 0 ? 1 : 0; //
pHead->msgType = smsg->pConn->inType + 1;
+ pHead->release = smsg->type == Release ? 1 : 0;
pHead->code = htonl(pMsg->code);
// add more info
char* msg = (char*)pHead;
@@ -368,13 +430,16 @@ static void uvStartSendResp(SSrvMsg* smsg) {
SSrvConn* pConn = smsg->pConn;
if (pConn->broken == true) {
+ // persist by
transUnrefSrvHandle(pConn);
return;
}
- transUnrefSrvHandle(pConn);
+ if (pConn->status == ConnNormal) {
+ transUnrefSrvHandle(pConn);
+ }
if (taosArrayGetSize(pConn->srvMsgs) > 0) {
- tDebug("server conn %p push data to client %s:%d, local info: %s:%d", pConn, taosInetNtoa(pConn->addr.sin_addr),
+ tDebug("server conn %p send data to client %s:%d, local info: %s:%d", pConn, taosInetNtoa(pConn->addr.sin_addr),
ntohs(pConn->addr.sin_port), taosInetNtoa(pConn->locaddr.sin_addr), ntohs(pConn->locaddr.sin_port));
taosArrayPush(pConn->srvMsgs, &smsg);
return;
@@ -384,16 +449,6 @@ static void uvStartSendResp(SSrvMsg* smsg) {
return;
}
-static void uvNotifyLinkBrokenToApp(SSrvConn* conn) {
- STrans* pTransInst = conn->pTransInst;
- if (pTransInst->efp != NULL && (*pTransInst->efp)(NULL, conn->inType) && T_REF_VAL_GET(conn) >= 2) {
- STransMsg transMsg = {0};
- transMsg.msgType = conn->inType;
- transMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL;
- // transRefSrvHandle(conn);
- (*pTransInst->cfp)(pTransInst->parent, &transMsg, 0);
- }
-}
static void destroySmsg(SSrvMsg* smsg) {
if (smsg == NULL) {
return;
@@ -408,6 +463,9 @@ static void destroyAllConn(SWorkThrdObj* pThrd) {
QUEUE_INIT(h);
SSrvConn* c = QUEUE_DATA(h, SSrvConn, queue);
+ while (T_REF_VAL_GET(c) >= 2) {
+ transUnrefSrvHandle(c);
+ }
transUnrefSrvHandle(c);
}
}
@@ -431,20 +489,7 @@ void uvWorkerAsyncCb(uv_async_t* handle) {
tError("unexcept occurred, continue");
continue;
}
- if (msg->pConn == NULL) {
- free(msg);
- bool noConn = QUEUE_IS_EMPTY(&pThrd->conn);
- if (noConn == true) {
- uv_loop_close(pThrd->loop);
- uv_stop(pThrd->loop);
- } else {
- destroyAllConn(pThrd);
- // uv_loop_close(pThrd->loop);
- pThrd->quit = true;
- }
- } else {
- uvStartSendResp(msg);
- }
+ (*transAsyncHandle[msg->type])(msg, pThrd);
}
}
static void uvAcceptAsyncCb(uv_async_t* async) {
@@ -632,7 +677,9 @@ static SSrvConn* createConn(void* hThrd) {
pConn->srvMsgs = taosArrayInit(2, sizeof(void*)); //
tTrace("conn %p created", pConn);
+ memset(&pConn->regArg, 0, sizeof(pConn->regArg));
pConn->broken = false;
+ pConn->status = ConnNormal;
transRefSrvHandle(pConn);
return pConn;
@@ -748,7 +795,57 @@ End:
transCloseServer(srv);
return NULL;
}
+void uvHandleQuit(SSrvMsg* msg, SWorkThrdObj* thrd) {
+ if (QUEUE_IS_EMPTY(&thrd->conn)) {
+ uv_loop_close(thrd->loop);
+ uv_stop(thrd->loop);
+ } else {
+ destroyAllConn(thrd);
+ thrd->quit = true;
+ }
+ free(msg);
+}
+void uvHandleRelease(SSrvMsg* msg, SWorkThrdObj* thrd) {
+ // release handle to rpc init
+ SSrvConn* conn = msg->pConn;
+ if (conn->status == ConnAcquire) {
+ taosArrayPush(conn->srvMsgs, &msg);
+ if (taosArrayGetSize(conn->srvMsgs) > 1) {
+ return;
+ }
+ uvStartSendRespInternal(msg);
+ return;
+ } else if (conn->status == ConnRelease) {
+ // already release by server app, do nothing
+ } else if (conn->status == ConnNormal) {
+ // no nothing
+ // user should not call this rpcRelease handle;
+ }
+ free(msg);
+}
+void uvHandleSendResp(SSrvMsg* msg, SWorkThrdObj* thrd) {
+ // send msg to client
+ uvStartSendResp(msg);
+}
+void uvHandleRegister(SSrvMsg* msg, SWorkThrdObj* thrd) {
+ SSrvConn* conn = msg->pConn;
+ if (conn->status == ConnAcquire) {
+ if (taosArrayGetSize(conn->srvMsgs) > 0) {
+ taosArrayPush(conn->srvMsgs, &msg);
+ return;
+ }
+ conn->regArg.notifyCount = 0;
+ conn->regArg.init = 1;
+ conn->regArg.msg = msg->msg;
+ if (conn->broken) {
+ STrans* pTransInst = conn->pTransInst;
+ (*pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);
+ memset(&conn->regArg, 0, sizeof(conn->regArg));
+ }
+ free(msg);
+ }
+}
void destroyWorkThrd(SWorkThrdObj* pThrd) {
if (pThrd == NULL) {
return;
@@ -759,10 +856,10 @@ void destroyWorkThrd(SWorkThrdObj* pThrd) {
free(pThrd);
}
void sendQuitToWorkThrd(SWorkThrdObj* pThrd) {
- SSrvMsg* srvMsg = calloc(1, sizeof(SSrvMsg));
+ SSrvMsg* msg = calloc(1, sizeof(SSrvMsg));
+ msg->type = Quit;
tDebug("server send quit msg to work thread");
-
- transSendAsync(pThrd->asyncPool, &srvMsg->q);
+ transSendAsync(pThrd->asyncPool, &msg->q);
}
void transCloseServer(void* arg) {
@@ -813,8 +910,21 @@ void transUnrefSrvHandle(void* handle) {
}
void transReleaseSrvHandle(void* handle) {
- // do nothing currently
- //
+ if (handle == NULL) {
+ return;
+ }
+ SSrvConn* pConn = handle;
+ SWorkThrdObj* pThrd = pConn->hostThrd;
+
+ STransMsg tmsg = {.handle = handle, .code = 0};
+
+ SSrvMsg* srvMsg = calloc(1, sizeof(SSrvMsg));
+ srvMsg->msg = tmsg;
+ srvMsg->type = Release;
+ srvMsg->pConn = pConn;
+
+ tTrace("server conn %p start to release", pConn);
+ transSendAsync(pThrd->asyncPool, &srvMsg->q);
}
void transSendResponse(const STransMsg* pMsg) {
if (pMsg->handle == NULL) {
@@ -826,6 +936,21 @@ void transSendResponse(const STransMsg* pMsg) {
SSrvMsg* srvMsg = calloc(1, sizeof(SSrvMsg));
srvMsg->pConn = pConn;
srvMsg->msg = *pMsg;
+ srvMsg->type = Normal;
+ tTrace("server conn %p start to send resp", pConn);
+ transSendAsync(pThrd->asyncPool, &srvMsg->q);
+}
+void transRegisterMsg(const STransMsg* msg) {
+ if (msg->handle == NULL) {
+ return;
+ }
+ SSrvConn* pConn = msg->handle;
+ SWorkThrdObj* pThrd = pConn->hostThrd;
+
+ SSrvMsg* srvMsg = calloc(1, sizeof(SSrvMsg));
+ srvMsg->pConn = pConn;
+ srvMsg->msg = *msg;
+ srvMsg->type = Register;
tTrace("server conn %p start to send resp", pConn);
transSendAsync(pThrd->asyncPool, &srvMsg->q);
}
diff --git a/source/libs/transport/test/transUT.cc b/source/libs/transport/test/transUT.cc
index ec89d695a2..490437ac0d 100644
--- a/source/libs/transport/test/transUT.cc
+++ b/source/libs/transport/test/transUT.cc
@@ -30,29 +30,8 @@ const char *ckey = "ckey";
class Server;
int port = 7000;
// server process
-
-static bool cliPersistHandle(void *parent, tmsg_t msgType) {
- // client persist handle
- return msgType == 2 || msgType == 4;
-}
-
-typedef struct CbArgs {
- tmsg_t msgType;
-} CbArgs;
-
-static void *ConstructArgForSpecificMsgType(void *parent, tmsg_t msgType) {
- if (msgType == 1 || msgType == 2) {
- CbArgs *args = (CbArgs *)calloc(1, sizeof(CbArgs));
- args->msgType = msgType;
- return args;
- }
- return NULL;
-}
// server except
-static bool handleExcept(void *parent, tmsg_t msgType) {
- //
- return msgType == TDMT_VND_QUERY || msgType == TDMT_VND_FETCH_RSP || msgType == TDMT_VND_RES_READY_RSP;
-}
+
typedef void (*CB)(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet);
static void processContinueSend(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet);
@@ -91,23 +70,6 @@ class Client {
rpcClose(this->transCli);
this->transCli = NULL;
}
- void SetPersistFP(bool (*pfp)(void *parent, tmsg_t msgType)) {
- rpcClose(this->transCli);
- rpcInit_.pfp = pfp;
- this->transCli = rpcOpen(&rpcInit_);
- }
- void SetConstructFP(void *(*mfp)(void *parent, tmsg_t msgType)) {
- rpcClose(this->transCli);
- rpcInit_.mfp = mfp;
- this->transCli = rpcOpen(&rpcInit_);
- }
- void SetPAndMFp(bool (*pfp)(void *parent, tmsg_t msgType), void *(*mfp)(void *parent, tmsg_t msgType)) {
- rpcClose(this->transCli);
-
- rpcInit_.pfp = pfp;
- rpcInit_.mfp = mfp;
- this->transCli = rpcOpen(&rpcInit_);
- }
void SendAndRecv(SRpcMsg *req, SRpcMsg *resp) {
SEpSet epSet = {0};
@@ -126,7 +88,6 @@ class Client {
SendAndRecv(req, resp);
}
- void SendWithHandle(SRpcMsg *req, SRpcMsg *resp) {}
void SemWait() { tsem_wait(&this->sem); }
void SemPost() { tsem_post(&this->sem); }
void Reset() {}
@@ -149,7 +110,6 @@ class Server {
rpcInit_.label = (char *)label;
rpcInit_.numOfThreads = 5;
rpcInit_.cfp = processReq;
- rpcInit_.efp = NULL;
rpcInit_.user = (char *)user;
rpcInit_.secret = (char *)secret;
rpcInit_.ckey = (char *)ckey;
@@ -160,17 +120,17 @@ class Server {
this->transSrv = rpcOpen(&this->rpcInit_);
taosMsleep(1000);
}
+ void SetSrvContinueSend(CB cb) {
+ this->Stop();
+ rpcInit_.cfp = cb;
+ this->Start();
+ }
void Stop() {
if (this->transSrv == NULL) return;
rpcClose(this->transSrv);
this->transSrv = NULL;
}
- void SetExceptFp(bool (*efp)(void *parent, tmsg_t msgType)) {
- this->Stop();
- rpcInit_.efp = efp;
- this->Start();
- }
- void SetSrvContinueSend(void (*cfp)(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet)) {
+ void SetSrvSend(void (*cfp)(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet)) {
this->Stop();
rpcInit_.cfp = cfp;
this->Start();
@@ -198,9 +158,6 @@ static void processReq(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
}
static void processContinueSend(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) {
- for (int i = 0; i < 9; i++) {
- rpcRefHandle(pMsg->handle, TAOS_CONN_SERVER);
- }
for (int i = 0; i < 10; i++) {
SRpcMsg rpcMsg = {0};
rpcMsg.pCont = rpcMallocCont(100);
@@ -262,23 +219,7 @@ class TransObj {
//
srv->Stop();
}
- void SetCliPersistFp(bool (*pfp)(void *parent, tmsg_t msgType)) {
- // do nothing
- cli->SetPersistFP(pfp);
- }
- void SetCliMFp(void *(*mfp)(void *parent, tmsg_t msgType)) {
- // do nothing
- cli->SetConstructFP(mfp);
- }
- void SetCliMAndPFp(bool (*pfp)(void *parent, tmsg_t msgType), void *(*mfp)(void *parent, tmsg_t msgType)) {
- // do nothing
- cli->SetPAndMFp(pfp, mfp);
- }
// call when link broken, and notify query or fetch stop
- void SetSrvExceptFp(bool (*efp)(void *parent, tmsg_t msgType)) {
- ////////
- srv->SetExceptFp(efp);
- }
void SetSrvContinueSend(void (*cfp)(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet)) {
///////
srv->SetSrvContinueSend(cfp);
@@ -315,7 +256,7 @@ class TransEnv : public ::testing::Test {
};
TEST_F(TransEnv, 01sendAndRec) {
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 10; i++) {
SRpcMsg req = {0}, resp = {0};
req.msgType = 0;
req.pCont = rpcMallocCont(10);
@@ -358,51 +299,53 @@ TEST_F(TransEnv, clientUserDefined) {
}
TEST_F(TransEnv, cliPersistHandle) {
- tr->SetCliPersistFp(cliPersistHandle);
SRpcMsg resp = {0};
+ void * handle = NULL;
for (int i = 0; i < 10; i++) {
- SRpcMsg req = {.handle = resp.handle, .noResp = 0};
+ SRpcMsg req = {.handle = resp.handle, .persistHandle = 1};
req.msgType = 1;
req.pCont = rpcMallocCont(10);
req.contLen = 10;
tr->cliSendAndRecv(&req, &resp);
- if (i == 5) {
- std::cout << "stop server" << std::endl;
- tr->StopSrv();
- }
- if (i >= 6) {
- EXPECT_TRUE(resp.code != 0);
- }
- }
- //////////////////
-}
-
-TEST_F(TransEnv, cliReleaseHandle) {
- tr->SetCliPersistFp(cliPersistHandle);
-
- SRpcMsg resp = {0};
- for (int i = 0; i < 10; i++) {
- SRpcMsg req = {.handle = resp.handle};
- req.msgType = 1;
- req.pCont = rpcMallocCont(10);
- req.contLen = 10;
- tr->cliSendAndRecvNoHandle(&req, &resp);
// if (i == 5) {
// std::cout << "stop server" << std::endl;
// tr->StopSrv();
//}
// if (i >= 6) {
+ // EXPECT_TRUE(resp.code != 0);
+ //}
+ handle = resp.handle;
+ }
+ rpcReleaseHandle(handle, TAOS_CONN_CLIENT);
+ for (int i = 0; i < 10; i++) {
+ SRpcMsg req = {0};
+ req.msgType = 1;
+ req.pCont = rpcMallocCont(10);
+ req.contLen = 10;
+ tr->cliSendAndRecv(&req, &resp);
+ }
+
+ taosMsleep(1000);
+ //////////////////
+}
+
+TEST_F(TransEnv, cliReleaseHandle) {
+ SRpcMsg resp = {0};
+ for (int i = 0; i < 10; i++) {
+ SRpcMsg req = {.handle = resp.handle, .persistHandle = 1};
+ req.msgType = 1;
+ req.pCont = rpcMallocCont(10);
+ req.contLen = 10;
+ tr->cliSendAndRecvNoHandle(&req, &resp);
EXPECT_TRUE(resp.code == 0);
//}
}
//////////////////
}
TEST_F(TransEnv, cliReleaseHandleExcept) {
- tr->SetCliPersistFp(cliPersistHandle);
-
SRpcMsg resp = {0};
for (int i = 0; i < 10; i++) {
- SRpcMsg req = {.handle = resp.handle};
+ SRpcMsg req = {.handle = resp.handle, .persistHandle = 1};
req.msgType = 1;
req.pCont = rpcMallocCont(10);
req.contLen = 10;
@@ -426,12 +369,12 @@ TEST_F(TransEnv, srvContinueSend) {
req.contLen = 10;
tr->cliSendAndRecv(&req, &resp);
}
- taosMsleep(2000);
+ taosMsleep(1000);
}
TEST_F(TransEnv, srvPersistHandleExcept) {
tr->SetSrvContinueSend(processContinueSend);
- tr->SetCliPersistFp(cliPersistHandle);
+ // tr->SetCliPersistFp(cliPersistHandle);
SRpcMsg resp = {0};
for (int i = 0; i < 5; i++) {
SRpcMsg req = {.handle = resp.handle};
@@ -450,7 +393,6 @@ TEST_F(TransEnv, srvPersistHandleExcept) {
}
TEST_F(TransEnv, cliPersistHandleExcept) {
tr->SetSrvContinueSend(processContinueSend);
- tr->SetCliPersistFp(cliPersistHandle);
SRpcMsg resp = {0};
for (int i = 0; i < 5; i++) {
SRpcMsg req = {.handle = resp.handle};
@@ -471,11 +413,7 @@ TEST_F(TransEnv, cliPersistHandleExcept) {
TEST_F(TransEnv, multiCliPersistHandleExcept) {
// conn broken
}
-TEST_F(TransEnv, queryExcept) {
- tr->SetSrvExceptFp(handleExcept);
-
- // query and conn is broken
-}
+TEST_F(TransEnv, queryExcept) {}
TEST_F(TransEnv, noResp) {
SRpcMsg resp = {0};
for (int i = 0; i < 5; i++) {
diff --git a/source/libs/transport/test/transportTests.cc b/source/libs/transport/test/transportTests.cc
index 53910aa30c..1f8c8e8ff2 100644
--- a/source/libs/transport/test/transportTests.cc
+++ b/source/libs/transport/test/transportTests.cc
@@ -136,4 +136,98 @@ TEST_F(QueueEnv, testIter) {
assert(result.size() == vals.size());
}
+class TransCtxEnv : public ::testing::Test {
+ protected:
+ virtual void SetUp() {
+ ctx = (STransCtx *)calloc(1, sizeof(STransCtx));
+ transCtxInit(ctx);
+ // TODO
+ }
+ virtual void TearDown() {
+ transCtxDestroy(ctx);
+ // formate
+ }
+ STransCtx *ctx;
+};
+
+TEST_F(TransCtxEnv, mergeTest) {
+ int key = 1;
+ {
+ STransCtx *src = (STransCtx *)calloc(1, sizeof(STransCtx));
+ transCtxInit(src);
+ {
+ STransCtxVal val1 = {.val = NULL, .len = 0, .free = free};
+ val1.val = malloc(12);
+ val1.len = 12;
+
+ taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
+ key++;
+ }
+ {
+ STransCtxVal val1 = {.val = NULL, .len = 0, .free = free};
+ val1.val = malloc(12);
+ val1.len = 12;
+ taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
+ key++;
+ }
+ transCtxMerge(ctx, src);
+ free(src);
+ }
+ EXPECT_EQ(2, taosHashGetSize(ctx->args));
+ {
+ STransCtx *src = (STransCtx *)calloc(1, sizeof(STransCtx));
+ transCtxInit(src);
+ {
+ STransCtxVal val1 = {.val = NULL, .len = 0, .free = free};
+ val1.val = malloc(12);
+ val1.len = 12;
+
+ taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
+ key++;
+ }
+ {
+ STransCtxVal val1 = {.val = NULL, .len = 0, .free = free};
+ val1.val = malloc(12);
+ val1.len = 12;
+ taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
+ key++;
+ }
+ transCtxMerge(ctx, src);
+ free(src);
+ }
+ std::string val("Hello");
+ EXPECT_EQ(4, taosHashGetSize(ctx->args));
+ {
+ key = 1;
+ STransCtx *src = (STransCtx *)calloc(1, sizeof(STransCtx));
+ transCtxInit(src);
+ {
+ STransCtxVal val1 = {.val = NULL, .len = 0, .free = free};
+ val1.val = calloc(1, 11);
+ memcpy(val1.val, val.c_str(), val.size());
+ val1.len = 11;
+
+ taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
+ key++;
+ }
+ {
+ STransCtxVal val1 = {.val = NULL, .len = 0, .free = free};
+ val1.val = calloc(1, 11);
+ memcpy(val1.val, val.c_str(), val.size());
+ val1.len = 11;
+ taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
+ key++;
+ }
+ transCtxMerge(ctx, src);
+ free(src);
+ }
+ EXPECT_EQ(4, taosHashGetSize(ctx->args));
+
+ char *skey = (char *)transCtxDumpVal(ctx, 1);
+ EXPECT_EQ(0, strcmp(skey, val.c_str()));
+ free(skey);
+
+ skey = (char *)transCtxDumpVal(ctx, 2);
+ EXPECT_EQ(0, strcmp(skey, val.c_str()));
+}
#endif
diff --git a/source/os/src/osString.c b/source/os/src/osString.c
index 07108ce34f..d3d1ab5dda 100644
--- a/source/os/src/osString.c
+++ b/source/os/src/osString.c
@@ -15,10 +15,8 @@
#define ALLOW_FORBID_FUNC
#define _DEFAULT_SOURCE
+#include
#include "os.h"
-// #include "tdef.h"
-// #include
-// #include
#ifndef DISALLOW_NCHAR_WITHOUT_ICONV
#include "iconv.h"
@@ -32,14 +30,6 @@ int64_t taosStr2int64(const char *str) {
return strtoll(str, &endptr, 10);
}
-bool taosCheckNcharValid(void) {
-#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
- return false;
-#else
- return true;
-#endif
-}
-
int32_t tasoUcs4Compare(TdUcs4 *f1_ucs4, TdUcs4 *f2_ucs4, int32_t bytes) {
for (int32_t i = 0; i < bytes; i += sizeof(TdUcs4)) {
int32_t f1 = *(int32_t *)((char *)f1_ucs4 + i);
@@ -77,11 +67,13 @@ int32_t tasoUcs4Compare(TdUcs4 *f1_ucs4, TdUcs4 *f2_ucs4, int32_t bytes) {
TdUcs4* tasoUcs4Copy(TdUcs4 *target_ucs4, TdUcs4 *source_ucs4, int32_t len_ucs4) {
- memcpy(target_ucs4, source_ucs4, len_ucs4*sizeof(TdUcs4));
+ assert(malloc_usable_size(target_ucs4)>=len_ucs4*sizeof(TdUcs4));
+ return memcpy(target_ucs4, source_ucs4, len_ucs4*sizeof(TdUcs4));
}
int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
+ printf("Nchar cannot be read and written without iconv, please install iconv library and recompile TDengine.\n");
return -1;
#else
iconv_t cd = iconv_open(tsCharset, DEFAULT_UNICODE_ENCODEC);
@@ -99,6 +91,7 @@ int32_t taosUcs4ToMbs(TdUcs4 *ucs4, int32_t ucs4_max_len, char *mbs) {
bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4_max_len, int32_t *len) {
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
+ printf("Nchar cannot be read and written without iconv, please install iconv library and recompile TDengine.\n");
return -1;
#else
memset(ucs4, 0, ucs4_max_len);
@@ -124,7 +117,8 @@ bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4
bool taosValidateEncodec(const char *encodec) {
#ifdef DISALLOW_NCHAR_WITHOUT_ICONV
- return false;
+ printf("Nchar cannot be read and written without iconv, please install iconv library and recompile TDengine.\n");
+ return true;
#else
iconv_t cd = iconv_open(encodec, DEFAULT_UNICODE_ENCODEC);
if (cd == (iconv_t)(-1)) {
@@ -164,341 +158,3 @@ int32_t taosMbsToWchars(TdWchar *pWchars, const char *pStrs, int32_t size) { ret
int32_t taosWcharToMb(char *pStr, TdWchar wchar) { return wctomb(pStr, wchar); }
int32_t taosWcharsToMbs(char *pStrs, TdWchar *pWchars, int32_t size) { return wcstombs(pStrs, pWchars, size); }
-
-// #ifdef USE_LIBICONV
-// #include "iconv.h"
-
-// int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs) {
-// iconv_t cd = iconv_open(tsCharset, DEFAULT_UNICODE_ENCODEC);
-// size_t ucs4_input_len = ucs4_max_len;
-// size_t outLen = ucs4_max_len;
-// if (iconv(cd, (char **)&ucs4, &ucs4_input_len, &mbs, &outLen) == -1) {
-// iconv_close(cd);
-// return -1;
-// }
-
-// iconv_close(cd);
-// return (int32_t)(ucs4_max_len - outLen);
-// }
-
-// bool taosMbsToUcs4(char *mbs, size_t mbsLength, char *ucs4, int32_t ucs4_max_len, int32_t *len) {
-// memset(ucs4, 0, ucs4_max_len);
-// iconv_t cd = iconv_open(DEFAULT_UNICODE_ENCODEC, tsCharset);
-// size_t ucs4_input_len = mbsLength;
-// size_t outLeft = ucs4_max_len;
-// if (iconv(cd, &mbs, &ucs4_input_len, &ucs4, &outLeft) == -1) {
-// iconv_close(cd);
-// return false;
-// }
-
-// iconv_close(cd);
-// if (len != NULL) {
-// *len = (int32_t)(ucs4_max_len - outLeft);
-// if (*len < 0) {
-// return false;
-// }
-// }
-
-// return true;
-// }
-
-// bool taosValidateEncodec(const char *encodec) {
-// iconv_t cd = iconv_open(encodec, DEFAULT_UNICODE_ENCODEC);
-// if (cd == (iconv_t)(-1)) {
-// return false;
-// }
-
-// iconv_close(cd);
-// return true;
-// }
-
-// #else
-
-// int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs) {
-// mbstate_t state = {0};
-// int32_t len = (int32_t)wcsnrtombs(NULL, (const wchar_t **)&ucs4, ucs4_max_len / 4, 0, &state);
-// if (len < 0) {
-// return -1;
-// }
-
-// memset(&state, 0, sizeof(state));
-// len = wcsnrtombs(mbs, (const wchar_t **)&ucs4, ucs4_max_len / 4, (size_t)len, &state);
-// if (len < 0) {
-// return -1;
-// }
-
-// return len;
-// }
-
-// bool taosMbsToUcs4(const char *mbs, size_t mbsLength, char *ucs4, int32_t ucs4_max_len, int32_t *len) {
-// memset(ucs4, 0, ucs4_max_len);
-// mbstate_t state = {0};
-// int32_t retlen = mbsnrtowcs((wchar_t *)ucs4, (const char **)&mbs, mbsLength, ucs4_max_len / 4, &state);
-// *len = retlen;
-
-// return retlen >= 0;
-// }
-
-// bool taosValidateEncodec(const char *encodec) {
-// return true;
-// }
-
-// #endif
-
-// #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
-
-// /*
-// * windows implementation
-// */
-
-// #ifdef HAVE_CONFIG_H
-// #include
-// #endif
-
-// #include
-// #include
-// #include
-// #include
-// #include
-
-// #if STDC_HEADERS
-// #include
-// #else
-// char *malloc(), *realloc();
-// #endif
-
-// /* Always add at least this many bytes when extending the buffer. */
-// #define MIN_CHUNK 64
-
-// /* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-// + OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
-// malloc (or NULL), pointing to *N characters of space. It is realloc'd
-// as necessary. Return the number of characters read (not including the
-// null terminator), or -1 on error or EOF. On a -1 return, the caller
-// should check feof(), if not then errno has been set to indicate
-// the error. */
-
-// int32_t getstr(char **lineptr, size_t *n, FILE *stream, char terminator, int32_t offset) {
-// int32_t nchars_avail; /* Allocated but unused chars in *LINEPTR. */
-// char * read_pos; /* Where we're reading into *LINEPTR. */
-// int32_t ret;
-
-// if (!lineptr || !n || !stream) {
-// errno = EINVAL;
-// return -1;
-// }
-
-// if (!*lineptr) {
-// *n = MIN_CHUNK;
-// *lineptr = malloc(*n);
-// if (!*lineptr) {
-// errno = ENOMEM;
-// return -1;
-// }
-// }
-
-// nchars_avail = (int32_t)(*n - offset);
-// read_pos = *lineptr + offset;
-
-// for (;;) {
-// int32_t save_errno;
-// register int32_t c = getc(stream);
-
-// save_errno = errno;
-
-// /* We always want at least one char left in the buffer, since we
-// always (unless we get an error while reading the first char)
-// NUL-terminate the line buffer. */
-
-// assert((*lineptr + *n) == (read_pos + nchars_avail));
-// if (nchars_avail < 2) {
-// if (*n > MIN_CHUNK)
-// *n *= 2;
-// else
-// *n += MIN_CHUNK;
-
-// nchars_avail = (int32_t)(*n + *lineptr - read_pos);
-// char* lineptr1 = realloc(*lineptr, *n);
-// if (!lineptr1) {
-// errno = ENOMEM;
-// return -1;
-// }
-// *lineptr = lineptr1;
-
-// read_pos = *n - nchars_avail + *lineptr;
-// assert((*lineptr + *n) == (read_pos + nchars_avail));
-// }
-
-// if (ferror(stream)) {
-// /* Might like to return partial line, but there is no
-// place for us to store errno. And we don't want to just
-// lose errno. */
-// errno = save_errno;
-// return -1;
-// }
-
-// if (c == EOF) {
-// /* Return partial line, if any. */
-// if (read_pos == *lineptr)
-// return -1;
-// else
-// break;
-// }
-
-// *read_pos++ = c;
-// nchars_avail--;
-
-// if (c == terminator) /* Return the line. */
-// break;
-// }
-
-// /* Done - NUL terminate and return the number of chars read. */
-// *read_pos = '\0';
-
-// ret = (int32_t)(read_pos - (*lineptr + offset));
-// return ret;
-// }
-
-// int32_t tgetline(char **lineptr, size_t *n, FILE *stream) { return getstr(lineptr, n, stream, '\n', 0); }
-
-
-// /*
-// * Get next token from string *stringp, where tokens are possibly-empty
-// * strings separated by characters from delim.
-// *
-// * Writes NULs into the string at *stringp to end tokens.
-// * delim need not remain constant from call to call.
-// * On return, *stringp points past the last NUL written (if there might
-// * be further tokens), or is NULL (if there are definitely no moretokens).
-// *
-// * If *stringp is NULL, strsep returns NULL.
-// */
-// char *strsep(char **stringp, const char *delim) {
-// char * s;
-// const char *spanp;
-// int32_t c, sc;
-// char *tok;
-// if ((s = *stringp) == NULL)
-// return (NULL);
-// for (tok = s;;) {
-// c = *s++;
-// spanp = delim;
-// do {
-// if ((sc = *spanp++) == c) {
-// if (c == 0)
-// s = NULL;
-// else
-// s[-1] = 0;
-// *stringp = s;
-// return (tok);
-// }
-// } while (sc != 0);
-// }
-// /* NOTREACHED */
-// }
-
-// char *getpass(const char *prefix) {
-// static char passwd[TSDB_PASSWORD_LEN] = {0};
-// memset(passwd, 0, TSDB_PASSWORD_LEN);
-// //printf("%s", prefix);
-
-// int32_t index = 0;
-// char ch;
-// while (index < TSDB_PASSWORD_LEN) {
-// ch = getch();
-// if (ch == '\n' || ch == '\r') {
-// break;
-// } else {
-// passwd[index++] = ch;
-// }
-// }
-
-// return passwd;
-// }
-
-// int32_t twcslen(const wchar_t *wcs) {
-// int32_t *wstr = (int32_t *)wcs;
-// if (NULL == wstr) {
-// return 0;
-// }
-
-// int32_t n = 0;
-// while (1) {
-// if (0 == *wstr++) {
-// break;
-// }
-// n++;
-// }
-
-// return n;
-// }
-// int32_t tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int32_t bytes) {
-// for (int32_t i = 0; i < bytes; i += TSDB_NCHAR_SIZE) {
-// int32_t f1 = *(int32_t *)((char *)f1_ucs4 + i);
-// int32_t f2 = *(int32_t *)((char *)f2_ucs4 + i);
-
-// if ((f1 == 0 && f2 != 0) || (f1 != 0 && f2 == 0)) {
-// return f1 - f2;
-// } else if (f1 == 0 && f2 == 0) {
-// return 0;
-// }
-
-// if (f1 != f2) {
-// return f1 - f2;
-// }
-// }
-
-// return 0;
-
-// #if 0
-// int32_t ucs4_max_len = bytes + 4;
-// char *f1_mbs = calloc(bytes, 1);
-// char *f2_mbs = calloc(bytes, 1);
-// if (taosUcs4ToMbs(f1_ucs4, ucs4_max_len, f1_mbs) < 0) {
-// return -1;
-// }
-// if (taosUcs4ToMbs(f2_ucs4, ucs4_max_len, f2_mbs) < 0) {
-// return -1;
-// }
-// int32_t ret = strcmp(f1_mbs, f2_mbs);
-// free(f1_mbs);
-// free(f2_mbs);
-// return ret;
-// #endif
-// }
-
-// /* Copy memory to memory until the specified number of bytes
-// has been copied, return pointer to following byte.
-// Overlap is NOT handled correctly. */
-// void *mempcpy(void *dest, const void *src, size_t len) {
-// return (char*)memcpy(dest, src, len) + len;
-// }
-
-// /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
-// char *stpcpy (char *dest, const char *src) {
-// size_t len = strlen (src);
-// return (char*)memcpy(dest, src, len + 1) + len;
-// }
-
-// /* Copy no more than N characters of SRC to DEST, returning the address of
-// the terminating '\0' in DEST, if any, or else DEST + N. */
-// char *stpncpy (char *dest, const char *src, size_t n) {
-// size_t size = strnlen (src, n);
-// memcpy (dest, src, size);
-// dest += size;
-// if (size == n)
-// return dest;
-// return memset (dest, '\0', n - size);
-// }
-
-// #else
-
-// /*
-// * linux and darwin implementation
-// */
-
-// int32_t tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int32_t bytes, int8_t ncharSize) {
-// return wcsncmp((wchar_t *)f1_ucs4, (wchar_t *)f2_ucs4, bytes / ncharSize);
-// }
-
-// #endif
diff --git a/source/os/src/osTimezone.c b/source/os/src/osTimezone.c
index 864a60b706..dd34d77b23 100644
--- a/source/os/src/osTimezone.c
+++ b/source/os/src/osTimezone.c
@@ -48,16 +48,11 @@
void taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight) {
if (inTimezone == NULL || inTimezone[0] == 0) return;
-#ifdef WINDOWS
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
char winStr[TD_LOCALE_LEN * 2];
sprintf(winStr, "TZ=%s", inTimezone);
putenv(winStr);
-#else
- setenv("TZ", inTimezone, 1);
-#endif
tzset();
-
- /*
* get CURRENT time zone.
* system current time zone is affected by daylight saving time(DST)
*
@@ -75,15 +70,34 @@ void taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *ou
int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR);
tz += daylight;
-
/*
* format:
* (CST, +0800)
* (BST, +0100)
*/
+ sprintf(outTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
+ *outDaylight = daylight;
+
+#elif defined(_TD_DARWIN_64)
+
+ setenv("TZ", inTimezone, 1);
+ tzset();
+ int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR);
+ tz += daylight;
sprintf(outTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
*outDaylight = daylight;
+
+#else
+ setenv("TZ", inTimezone, 1);
+ tzset();
+ int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR);
+ tz += daylight;
+ sprintf(outTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
+ *outDaylight = daylight;
+
+#endif
+
}
void taosGetSystemTimezone(char *outTimezone) {
diff --git a/source/util/src/tjson.c b/source/util/src/tjson.c
index 0a4a1a07a6..a85da8cbbf 100644
--- a/source/util/src/tjson.c
+++ b/source/util/src/tjson.c
@@ -202,9 +202,16 @@ int32_t tjsonGetUBigIntValue(const SJson* pJson, const char* pName, uint64_t* pV
return (errno == ERANGE||errno == EINVAL) ? TSDB_CODE_FAILED:TSDB_CODE_SUCCESS;
}
+int32_t tjsonGetUIntValue(const SJson* pJson, const char* pName, uint32_t* pVal) {
+ uint64_t val = 0;
+ int32_t code = tjsonGetUBigIntValue(pJson, pName, &val);
+ *pVal = val;
+ return code;
+}
+
int32_t tjsonGetUTinyIntValue(const SJson* pJson, const char* pName, uint8_t* pVal) {
uint64_t val = 0;
- int32_t code = tjsonGetUBigIntValue(pJson, pName, &val);
+ int32_t code = tjsonGetUBigIntValue(pJson, pName, &val);
*pVal = val;
return code;
}
@@ -239,6 +246,22 @@ int32_t tjsonToObject(const SJson* pJson, const char* pName, FToObject func, voi
return func(pJsonObj, pObj);
}
+int32_t tjsonMakeObject(const SJson* pJson, const char* pName, FToObject func, void** pObj, int32_t objSize) {
+ if (objSize <= 0) {
+ return TSDB_CODE_SUCCESS;
+ }
+
+ SJson* pJsonObj = tjsonGetObjectItem(pJson, pName);
+ if (NULL == pJsonObj) {
+ return TSDB_CODE_FAILED;
+ }
+ *pObj = calloc(1, objSize);
+ if (NULL == *pObj) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ return func(pJsonObj, *pObj);
+}
+
int32_t tjsonToArray(const SJson* pJson, const char* pName, FToObject func, void* pArray, int32_t itemSize) {
const cJSON* jArray = tjsonGetObjectItem(pJson, pName);
int32_t size = (NULL == jArray ? 0 : tjsonGetArraySize(jArray));
diff --git a/tests/script/tsim/insert/basic0.sim b/tests/script/tsim/insert/basic0.sim
index eb4780caac..6c24662be7 100644
--- a/tests/script/tsim/insert/basic0.sim
+++ b/tests/script/tsim/insert/basic0.sim
@@ -26,9 +26,10 @@ endi
print =============== create child table
sql create table ct1 using stb tags(1000)
sql create table ct2 using stb tags(2000)
+sql create table ct3 using stb tags(3000)
sql show tables
-if $rows != 2 then
+if $rows != 3 then
return -1
endi
@@ -45,6 +46,8 @@ sql insert into ct2 values(now+1s, 11, 2.1, 3.1)(now+2s, 12, 2.2, 3.2)(now+3s, 1
sql_error insert into ct1 values(now+4s, -14, -2.4, -3.4) ct2 values(now+4s, -14, -2.4, -3.4)
sql_error insert into ct1 values(now+5s, -15, -2.5, -3.5)(now+6s, -16, -2.6, -3.6) ct2 values(now+5s, -15, -2.5, -3.5)(now+6s, -16, -2.6, -3.6)
+sql insert into ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
+
#===================================================================
#===================================================================
print =============== query data from child table
diff --git a/tests/script/tsim/query/interval-offset.sim b/tests/script/tsim/query/interval-offset.sim
new file mode 100644
index 0000000000..08a10f26e4
--- /dev/null
+++ b/tests/script/tsim/query/interval-offset.sim
@@ -0,0 +1,305 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 500
+sql connect
+
+print =============== create database
+sql drop database d0 -x step1
+step1:
+sql create database d0
+sql show databases
+if $rows != 1 then
+ return -1
+endi
+
+sql use d0
+
+print =============== create super table and child table
+sql create table stb (ts timestamp, tbcol int) tags (t1 int)
+sql show stables
+print $rows $data00 $data01 $data02
+if $rows != 1 then
+ return -1
+endi
+
+sql create table ct1 using stb tags ( 1 )
+sql create table ct2 using stb tags ( 2 )
+sql show tables
+print $rows $data00 $data10 $data20
+if $rows != 2 then
+ return -1
+endi
+
+print =============== insert data into child table
+sql insert into ct1 values ( '2022-01-01 01:01:01.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:06.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:10.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:16.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:20.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:26.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:30.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:36.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:40.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:46.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:50.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:01:56.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:00.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:06.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:10.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:16.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:20.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:26.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:30.000', 1 )
+sql insert into ct1 values ( '2022-01-01 01:02:36.000', 1 )
+
+sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct1 interval(10s, 2s)
+print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct1 interval(10s, 2s)
+print ===> $rows $data00 $data01 $data02 $data03 $data04
+if $rows != 10 then
+ return -1
+endi
+if $data00 != 2 then
+ return -1
+endi
+if $data04 != 2 then
+ return -1
+endi
+
+sql insert into ct2 values ( '2022-01-01 01:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-01 12:00:01.000', 2 )
+sql insert into ct2 values ( '2022-01-01 23:00:01.000', 3 )
+sql insert into ct2 values ( '2022-01-02 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-03 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-04 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-05 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-06 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-07 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-08 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-09 10:00:01.000', 1 )
+sql insert into ct2 values ( '2022-01-10 10:00:01.000', 1 )
+
+sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct2 interval(1d, 2h)
+print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct2 interval(1d, 2w)
+print ===> rows0: $data00 $data01 $data02 $data03 $data04
+print ===> rows1: $data10 $data11 $data12 $data13 $data14
+print ===> rows2: $data20 $data21 $data22 $data23 $data24
+if $rows != 11 then
+ return -1
+endi
+if $data00 != 1 then
+ return -1
+endi
+if $data10 != 2 then
+ return -1
+endi
+
+return
+
+sql select count(*) from car interval(1n, 10d) order by ts desc
+# tdSql.checkData(0, 1, 1)
+# tdSql.checkData(1, 1, 2)
+# tdSql.checkData(2, 1, 3)
+# tdSql.checkData(3, 1, 3)
+# tdSql.checkData(4, 1, 6)
+# tdSql.checkData(5, 1, 1)
+# tdSql.checkData(6, 1, 1)
+#
+sql select count(*) from car interval(2n, 5d)
+# tdSql.checkData(0, 1, 1)
+# tdSql.checkData(1, 1, 1)
+# tdSql.checkData(2, 1, 6)
+# tdSql.checkData(3, 1, 6)
+# tdSql.checkData(4, 1, 3)
+
+sql select count(*) from car interval(2n) order by ts desc
+# tdSql.checkData(0, 1, 3)
+# tdSql.checkData(1, 1, 6)
+# tdSql.checkData(2, 1, 6)
+# tdSql.checkData(3, 1, 1)
+# tdSql.checkData(4, 1, 1)
+#
+sql select count(*) from car interval(1y, 1n)
+# tdSql.checkData(0, 1, 1)
+# tdSql.checkData(1, 1, 8)
+# tdSql.checkData(2, 1, 8)
+#
+sql select count(*) from car interval(1y, 2n)
+# tdSql.checkData(0, 1, 1)
+# tdSql.checkData(1, 1, 11)
+# tdSql.checkData(2, 1, 5)
+
+sql select count(*) from car where ts > '2019-05-14 00:00:00' interval(1y, 5d)
+# tdSql.checkData(0, 1, 6)
+# tdSql.checkData(1, 1, 9)
+
+
+
+
+
+
+
+
+
+
+
+
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+print ====== start create child tables and insert data
+$i = 0
+while $i < $tbNum
+ $tb = $tbPrefix . $i
+ sql create table $tb using $mt tags( $i )
+
+ $x = 0
+ while $x < $rowNum
+ $cc = $x * 60000
+ $ms = 1601481600000 + $cc
+
+ sql insert into $tb values ($ms , $x )
+ $x = $x + 1
+ endw
+
+ $i = $i + 1
+endw
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
+print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
+print ===> $rows $data01 $data05
+if $rows != $rowNum then
+ return -1
+endi
+if $data00 != 1 then
+ return -1
+endi
+if $data04 != 1 then
+ return -1
+endi
+
+#print =============== step3
+#$cc = 4 * 60000
+#$ms = 1601481600000 + $cc
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb where ts <= $ms interval(1m)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb where ts <= $ms interval(1m)
+#print ===> $rows $data01 $data05
+#if $rows != 5 then
+# return -1
+#endi
+#if $data00 != 1 then
+# return -1
+#endi
+#if $data04 != 1 then
+# return -1
+#endi
+
+#print =============== step4
+#$cc = 40 * 60000
+#$ms = 1601481600000 + $cc
+
+#$cc = 1 * 60000
+#$ms2 = 1601481600000 - $cc
+
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb where ts <= $ms and ts > $ms2 interval(1m)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb where ts <= $ms and ts > $ms2 interval(1m)
+#print ===> $rows $data01 $data05
+#if $rows != 20 then
+# return -1
+#endi
+#if $data00 != 1 then
+# return -1
+#endi
+#if $data04 != 1 then
+# return -1
+#endi
+
+#print =============== step5
+#$cc = 40 * 60000
+#$ms = 1601481600000 + $cc
+
+#$cc = 1 * 60000
+#$ms2 = 1601481600000 - $cc
+
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb where ts <= $ms and ts > $ms2 interval(1m) fill(value,0)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb where ts <= $ms and ts > $ms2 interval(1m) fill(value,0)
+#print ===> $rows $data21 $data25
+#if $rows != 42 then
+# return -1
+#endi
+#if $data20 != 1 then
+# return -1
+#endi
+#if $data24 != 1 then
+# return -1
+#endi
+
+#print =============== step6
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
+#print ===> $rows $data11
+#if $rows != 20 then
+# return -1
+#endi
+#if $data11 != 10 then
+# return -1
+#endi
+
+#print =============== step7
+#$cc = 4 * 60000
+#$ms = 1601481600000 + $cc
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt where ts <= $ms interval(1m)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt where ts <= $ms interval(1m)
+#print ===> $rows $data11
+#if $rows != 5 then
+# return -1
+#endi
+#if $data11 != 10 then
+# return -1
+#endi
+
+#print =============== step8
+#$cc = 40 * 60000
+#$ms1 = 1601481600000 + $cc
+#
+#$cc = 1 * 60000
+#$ms2 = 1601481600000 - $cc
+#
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt where ts <= $ms1 and ts > $ms2 interval(1m)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt where ts <= $ms1 and ts > $ms2 interval(1m)
+#print ===> $rows $data11
+#if $rows != 20 then
+# return -1
+#endi
+#if $data11 != 10 then
+# return -1
+#endi
+#
+#print =============== step9
+#$cc = 40 * 60000
+#$ms1 = 1601481600000 + $cc
+#
+#$cc = 1 * 60000
+#$ms2 = 1601481600000 - $cc
+#
+#sql select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
+#print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
+#print ===> $rows $data11
+#if $rows != 42 then
+# return -1
+#endi
+#if $data11 != 10 then
+# return -1
+#endi
+
+print =============== clear
+#sql drop database $db
+#sql show databases
+#if $rows != 0 then
+# return -1
+#endi
+
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/query/interval.sim b/tests/script/tsim/query/interval.sim
index 47be71bdc6..6dd0a9537e 100644
--- a/tests/script/tsim/query/interval.sim
+++ b/tests/script/tsim/query/interval.sim
@@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c wal -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
+sleep 500
sql connect
$dbPrefix = m_in_db