diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 51e1e996dc..acb99caffc 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -1,12 +1,30 @@
-aux_source_directory(src TMQ_DEMO_SRC)
+add_executable(tmq "")
+add_executable(tstream "")
 
-add_executable(tmq ${TMQ_DEMO_SRC})
-target_link_libraries(
-    tmq taos
+target_sources(tmq
+    PRIVATE
+    "src/tmq.c"
 )
-target_include_directories(
-    tmq
+
+target_sources(tstream
+    PRIVATE
+    "src/tstream.c"
+)
+target_link_libraries(tmq
+    taos
+)
+
+target_link_libraries(tstream
+    taos
+)
+
+target_include_directories(tmq
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+
+target_include_directories(tstream
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
 SET_TARGET_PROPERTIES(tmq PROPERTIES OUTPUT_NAME tmq)
+SET_TARGET_PROPERTIES(tstream PROPERTIES OUTPUT_NAME tstream)
diff --git a/example/src/tstream.c b/example/src/tstream.c
new file mode 100644
index 0000000000..62d94b041d
--- /dev/null
+++ b/example/src/tstream.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include "taos.h"
+
+int32_t init_env() {
+  TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
+  if (pConn == NULL) {
+    return -1;
+  }
+
+  TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 1");
+  if (taos_errno(pRes) != 0) {
+    printf("error in create db, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "use abc1");
+  if (taos_errno(pRes) != 0) {
+    printf("error in use db, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, k int) tags(a int)");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create table if not exists tu1 using st1 tags(1)");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create child table tu1, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  pRes = taos_query(pConn, "create table if not exists tu2 using st1 tags(2)");
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create child table tu2, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+  return 0;
+}
+
+int32_t create_stream() {
+  printf("create topic\n");
+  TAOS_RES* pRes;
+  TAOS*     pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
+  if (pConn == NULL) {
+    return -1;
+  }
+
+  pRes = taos_query(pConn, "use abc1");
+  if (taos_errno(pRes) != 0) {
+    printf("error in use db, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+
+  const char* sql = "select ts,k from tu1";
+  pRes = tmq_create_stream(pConn, "stream1", "out1", sql);
+  if (taos_errno(pRes) != 0) {
+    printf("failed to create stream out1, reason:%s\n", taos_errstr(pRes));
+    return -1;
+  }
+  taos_free_result(pRes);
+  taos_close(pConn);
+  return 0;
+}
+
+int main(int argc, char* argv[]) {
+  int code;
+  if (argc > 1) {
+    printf("env init\n");
+    code = init_env();
+  }
+  create_stream();
+#if 0
+  tmq_t*      tmq = build_consumer();
+  tmq_list_t* topic_list = build_topic_list();
+  /*perf_loop(tmq, topic_list);*/
+  /*basic_consume_loop(tmq, topic_list);*/
+  sync_consume_loop(tmq, topic_list);
+#endif
+}
diff --git a/include/client/taos.h b/include/client/taos.h
index da24136d80..82f0635612 100644
--- a/include/client/taos.h
+++ b/include/client/taos.h
@@ -214,7 +214,6 @@ typedef void(tmq_commit_cb(tmq_t *, tmq_resp_err_t, tmq_topic_vgroup_list_t *, v
 DLL_EXPORT tmq_list_t *tmq_list_new();
 DLL_EXPORT int32_t     tmq_list_append(tmq_list_t *, const char *);
 
-DLL_EXPORT TAOS_RES   *tmq_create_topic(TAOS *taos, const char *name, const char *sql, int sqlLen);
 DLL_EXPORT tmq_t      *tmq_consumer_new(void *conn, tmq_conf_t *conf, char *errstr, int32_t errstrLen);
 DLL_EXPORT void        tmq_message_destroy(tmq_message_t *tmq_message);
 DLL_EXPORT const char *tmq_err2str(tmq_resp_err_t);
@@ -258,7 +257,12 @@ int32_t tmqGetSkipLogNum(tmq_message_t *tmq_message);
 DLL_EXPORT TAOS_ROW tmq_get_row(tmq_message_t *message);
 DLL_EXPORT char    *tmq_get_topic_name(tmq_message_t *message);
 
-/* ---------------------- OTHER ---------------------------- */
+/* --------------------TMPORARY INTERFACE FOR TESTING--------------------- */
+DLL_EXPORT TAOS_RES *tmq_create_topic(TAOS *taos, const char *name, const char *sql, int sqlLen);
+
+DLL_EXPORT TAOS_RES *tmq_create_stream(TAOS *taos, const char *streamName, const char *tbName, const char *sql);
+
+/* -------------------------------- OTHER -------------------------------- */
 typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB *tsub, TAOS_RES *res, void *param, int code);
 
 DLL_EXPORT int taos_stmt_affected_rows(TAOS_STMT *stmt);
diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index 297f0c34e6..c91efc3ce2 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -91,6 +91,9 @@ void*   blockDataDestroy(SSDataBlock* pBlock);
 int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock);
 void*   tDecodeDataBlock(const void* buf, SSDataBlock* pBlock);
 
+int32_t tEncodeDataBlocks(void** buf, const SArray* blocks);
+void*   tDecodeDataBlocks(const void* buf, SArray* blocks);
+
 static FORCE_INLINE void blockDestroyInner(SSDataBlock* pBlock) {
   // WARNING: do not use info.numOfCols,
   // sometimes info.numOfCols != array size
diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 0eeff31d1c..583496a4c6 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -1363,28 +1363,48 @@ typedef struct {
   int64_t  tuid;
 } SDDropTopicReq;
 
+typedef struct {
+  float    xFilesFactor;
+  int8_t   delayUnit;
+  int8_t   nFuncIds;
+  int32_t* pFuncIds;
+  int64_t  delay;
+} SRSmaParam;
+
 typedef struct SVCreateTbReq {
   int64_t  ver;  // use a general definition
   char*    dbFName;
   char*    name;
   uint32_t ttl;
   uint32_t keep;
-  uint8_t  type;
+  union {
+    uint8_t info;
+    struct {
+      uint8_t rollup : 1;  // 1 means rollup sma
+      uint8_t type : 7;
+    };
+  };
   union {
     struct {
-      tb_uid_t suid;
-      uint32_t nCols;
-      SSchema* pSchema;
-      uint32_t nTagCols;
-      SSchema* pTagSchema;
+      tb_uid_t    suid;
+      uint32_t    nCols;
+      SSchema*    pSchema;
+      uint32_t    nTagCols;
+      SSchema*    pTagSchema;
+      col_id_t    nBSmaCols;
+      col_id_t*   pBSmaCols;
+      SRSmaParam* pRSmaParam;
     } stbCfg;
     struct {
       tb_uid_t suid;
       SKVRow   pTag;
     } ctbCfg;
     struct {
-      uint32_t nCols;
-      SSchema* pSchema;
+      uint32_t    nCols;
+      SSchema*    pSchema;
+      col_id_t    nBSmaCols;
+      col_id_t*   pBSmaCols;
+      SRSmaParam* pRSmaParam;
     } ntbCfg;
   };
 } SVCreateTbReq, SVUpdateTbReq;
@@ -2294,20 +2314,22 @@ enum {
 
 typedef struct {
   void* inputHandle;
-  void* executor[4];
-} SStreamTaskParRunner;
+  void* executor;
+} SStreamRunner;
 
 typedef struct {
   int64_t streamId;
   int32_t taskId;
   int32_t level;
   int8_t  status;
-  int8_t  pipeEnd;
-  int8_t  parallel;
+  int8_t  pipeSource;
+  int8_t  pipeSink;
+  int8_t  numOfRunners;
+  int8_t  parallelizable;
   SEpSet  NextOpEp;
   char*   qmsg;
   // not applied to encoder and decoder
-  SStreamTaskParRunner runner;
+  SStreamRunner runner[8];
   // void*                executor;
   // void*   stateStore;
   //  storage handle
@@ -2339,7 +2361,7 @@ typedef struct {
 
 typedef struct {
   SStreamExecMsgHead head;
-  // TODO: other info needed by task
+  SArray*            data;  // SArray<SSDataBlock>
 } SStreamTaskExecReq;
 
 typedef struct {
diff --git a/include/common/trow.h b/include/common/trow.h
index 47edf6f1ad..4ae5a2277d 100644
--- a/include/common/trow.h
+++ b/include/common/trow.h
@@ -968,10 +968,14 @@ static FORCE_INLINE int32_t tdGetColDataOfRow(SCellVal *pVal, SDataCol *pCol, in
 #endif
     return TSDB_CODE_SUCCESS;
   }
-  if (tdGetBitmapValType(pCol->pBitmap, row, &(pVal->valType)) < 0) {
+
+  if (TD_COL_ROWS_NORM(pCol)) {
+    pVal->valType = TD_VTYPE_NORM;
+  } else if (tdGetBitmapValType(pCol->pBitmap, row, &(pVal->valType)) < 0) {
     return terrno;
   }
-  if (TD_COL_ROWS_NORM(pCol) || tdValTypeIsNorm(pVal->valType)) {
+
+  if (tdValTypeIsNorm(pVal->valType)) {
     if (IS_VAR_DATA_TYPE(pCol->type)) {
       pVal->val = POINTER_SHIFT(pCol->pData, pCol->dataOff[row]);
     } else {
diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h
index 0bd0ef9c88..4ad7e2dfc2 100644
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -34,16 +34,16 @@ typedef struct SReadHandle {
   void* config;
 } SReadHandle;
 
-#define STREAM_DATA_TYPE_SUBMIT_BLOCK     0x1u
-#define STREAM_DATA_TYPE_SSDATA_BLOCK     0x2u
-
- /**
-  * Create the exec task for streaming mode
-  * @param pMsg
-  * @param streamReadHandle
-  * @return
-  */
-qTaskInfo_t qCreateStreamExecTaskInfo(void *msg, void* streamReadHandle);
+#define STREAM_DATA_TYPE_SUBMIT_BLOCK 0x1
+#define STREAM_DATA_TYPE_SSDATA_BLOCK 0x2
+  
+/**
+ * Create the exec task for streaming mode
+ * @param pMsg
+ * @param streamReadHandle
+ * @return
+ */
+qTaskInfo_t qCreateStreamExecTaskInfo(void* msg, void* streamReadHandle);
 
 /**
  * Set the input data block for the stream scan.
@@ -64,16 +64,17 @@ int32_t qSetStreamInput(qTaskInfo_t tinfo, const void* input, int32_t type);
  */
 int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, SArray* tableIdList, bool isAdd);
 
- /**
-  * Create the exec task object according to task json
-  * @param readHandle
-  * @param vgId
-  * @param pTaskInfoMsg
-  * @param pTaskInfo
-  * @param qId
-  * @return
-  */
-int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, struct SSubplan* pPlan, qTaskInfo_t* pTaskInfo, DataSinkHandle* handle);
+/**
+ * Create the exec task object according to task json
+ * @param readHandle
+ * @param vgId
+ * @param pTaskInfoMsg
+ * @param pTaskInfo
+ * @param qId
+ * @return
+ */
+int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, struct SSubplan* pPlan,
+                        qTaskInfo_t* pTaskInfo, DataSinkHandle* handle);
 
 /**
  * The main task execution function, including query on both table and multiple tables,
@@ -83,7 +84,7 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
  * @param handle
  * @return
  */
-int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t *useconds);
+int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t* useconds);
 
 /**
  * Retrieve the produced results information, if current query is not paused or completed,
@@ -146,7 +147,8 @@ int32_t qGetQualifiedTableIdList(void* pTableList, const char* tagCond, int32_t
  * @param numOfIndex
  * @return
  */
-//int32_t qCreateTableGroupByGroupExpr(SArray* pTableIdList, TSKEY skey, STableGroupInfo groupInfo, SColIndex* groupByIndex, int32_t numOfIndex);
+// int32_t qCreateTableGroupByGroupExpr(SArray* pTableIdList, TSKEY skey, STableGroupInfo groupInfo, SColIndex*
+// groupByIndex, int32_t numOfIndex);
 
 /**
  * Update the table id list of a given query.
@@ -169,19 +171,19 @@ void* qOpenTaskMgmt(int32_t vgId);
  * broadcast the close information and wait for all query stop.
  * @param pExecutor
  */
-void  qTaskMgmtNotifyClosing(void* pExecutor);
+void qTaskMgmtNotifyClosing(void* pExecutor);
 
 /**
  * Re-open the query handle management module when opening the vnode again.
  * @param pExecutor
  */
-void  qQueryMgmtReOpen(void *pExecutor);
+void qQueryMgmtReOpen(void* pExecutor);
 
 /**
  * Close query mgmt and clean up resources.
  * @param pExecutor
  */
-void  qCleanupTaskMgmt(void* pExecutor);
+void qCleanupTaskMgmt(void* pExecutor);
 
 /**
  * Add the query into the query mgmt object
@@ -190,7 +192,7 @@ void  qCleanupTaskMgmt(void* pExecutor);
  * @param qInfo
  * @return
  */
-void** qRegisterTask(void* pMgmt, uint64_t qId, void *qInfo);
+void** qRegisterTask(void* pMgmt, uint64_t qId, void* qInfo);
 
 /**
  * acquire the query handle according to the key from query mgmt object.
diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index b0cb4e1116..d05ad06a66 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -471,8 +471,8 @@ TAOS_RES* tmq_create_stream(TAOS* taos, const char* streamName, const char* tbNa
   }
   sqlLen = strlen(sql);
 
-  if (strlen(streamName) >= TSDB_TABLE_NAME_LEN) {
-    tscError("stream name too long, max length:%d", TSDB_TABLE_NAME_LEN - 1);
+  if (strlen(tbName) >= TSDB_TABLE_NAME_LEN) {
+    tscError("output tb name too long, max length:%d", TSDB_TABLE_NAME_LEN - 1);
     terrno = TSDB_CODE_TSC_INVALID_INPUT;
     goto _return;
   }
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index eea143cd47..67e7333597 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1304,3 +1304,26 @@ void* tDecodeDataBlock(const void* buf, SSDataBlock* pBlock) {
   }
   return (void*)buf;
 }
+
+int32_t tEncodeDataBlocks(void** buf, const SArray* blocks) {
+  int32_t tlen = 0;
+  int32_t sz = taosArrayGetSize(blocks);
+  tlen += taosEncodeFixedI32(buf, sz);
+
+  for (int32_t i = 0; i < sz; i++) {
+    SSDataBlock* pBlock = taosArrayGet(blocks, i);
+    tlen += tEncodeDataBlock(buf, pBlock);
+  }
+
+  return tlen;
+}
+
+void* tDecodeDataBlocks(const void* buf, SArray* blocks) {
+  int32_t sz;
+  buf = taosDecodeFixedI32(buf, &sz);
+  for (int32_t i = 0; i < sz; i++) {
+    SSDataBlock pBlock = {0};
+    buf = tDecodeDataBlock(buf, &pBlock);
+  }
+  return (void*)buf;
+}
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index cea07316eb..1ea00566f4 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -290,7 +290,7 @@ int32_t tSerializeSVCreateTbReq(void **buf, SVCreateTbReq *pReq) {
   tlen += taosEncodeString(buf, pReq->name);
   tlen += taosEncodeFixedU32(buf, pReq->ttl);
   tlen += taosEncodeFixedU32(buf, pReq->keep);
-  tlen += taosEncodeFixedU8(buf, pReq->type);
+  tlen += taosEncodeFixedU8(buf, pReq->info);
 
   switch (pReq->type) {
     case TD_SUPER_TABLE:
@@ -309,6 +309,20 @@ int32_t tSerializeSVCreateTbReq(void **buf, SVCreateTbReq *pReq) {
         tlen += taosEncodeFixedI32(buf, pReq->stbCfg.pTagSchema[i].bytes);
         tlen += taosEncodeString(buf, pReq->stbCfg.pTagSchema[i].name);
       }
+      tlen += taosEncodeFixedI16(buf, pReq->stbCfg.nBSmaCols);
+      for (col_id_t i = 0; i < pReq->stbCfg.nBSmaCols; ++i) {
+        tlen += taosEncodeFixedI16(buf, pReq->stbCfg.pBSmaCols[i]);
+      }
+      if(pReq->rollup && NULL != pReq->stbCfg.pRSmaParam) {
+        SRSmaParam *param = pReq->stbCfg.pRSmaParam;
+        tlen += taosEncodeFixedU32(buf, (uint32_t)param->xFilesFactor);
+        tlen += taosEncodeFixedI8(buf, param->delayUnit);
+        tlen += taosEncodeFixedI8(buf, param->nFuncIds);
+        for(int8_t i=0; i< param->nFuncIds; ++i) {
+          tlen += taosEncodeFixedI32(buf, param->pFuncIds[i]);
+        }
+        tlen += taosEncodeFixedI64(buf, param->delay);
+      }
       break;
     case TD_CHILD_TABLE:
       tlen += taosEncodeFixedI64(buf, pReq->ctbCfg.suid);
@@ -322,6 +336,20 @@ int32_t tSerializeSVCreateTbReq(void **buf, SVCreateTbReq *pReq) {
         tlen += taosEncodeFixedI32(buf, pReq->ntbCfg.pSchema[i].bytes);
         tlen += taosEncodeString(buf, pReq->ntbCfg.pSchema[i].name);
       }
+      tlen += taosEncodeFixedI16(buf, pReq->stbCfg.nBSmaCols);
+      for (col_id_t i = 0; i < pReq->stbCfg.nBSmaCols; ++i) {
+        tlen += taosEncodeFixedI16(buf, pReq->stbCfg.pBSmaCols[i]);
+      }
+      if(pReq->rollup && NULL != pReq->stbCfg.pRSmaParam) {
+        SRSmaParam *param = pReq->stbCfg.pRSmaParam;
+        tlen += taosEncodeFixedU32(buf, (uint32_t)param->xFilesFactor);
+        tlen += taosEncodeFixedI8(buf, param->delayUnit);
+        tlen += taosEncodeFixedI8(buf, param->nFuncIds);
+        for(int8_t i=0; i< param->nFuncIds; ++i) {
+          tlen += taosEncodeFixedI32(buf, param->pFuncIds[i]);
+        }
+        tlen += taosEncodeFixedI64(buf, param->delay);
+      }
       break;
     default:
       ASSERT(0);
@@ -335,7 +363,7 @@ void *tDeserializeSVCreateTbReq(void *buf, SVCreateTbReq *pReq) {
   buf = taosDecodeString(buf, &(pReq->name));
   buf = taosDecodeFixedU32(buf, &(pReq->ttl));
   buf = taosDecodeFixedU32(buf, &(pReq->keep));
-  buf = taosDecodeFixedU8(buf, &(pReq->type));
+  buf = taosDecodeFixedU8(buf, &(pReq->info));
 
   switch (pReq->type) {
     case TD_SUPER_TABLE:
@@ -356,6 +384,32 @@ void *tDeserializeSVCreateTbReq(void *buf, SVCreateTbReq *pReq) {
         buf = taosDecodeFixedI32(buf, &pReq->stbCfg.pTagSchema[i].bytes);
         buf = taosDecodeStringTo(buf, pReq->stbCfg.pTagSchema[i].name);
       }
+      buf = taosDecodeFixedI16(buf, &(pReq->stbCfg.nBSmaCols));
+      if(pReq->stbCfg.nBSmaCols > 0) {
+        pReq->stbCfg.pBSmaCols = (col_id_t *)malloc(pReq->stbCfg.nBSmaCols * sizeof(col_id_t));
+        for (col_id_t i = 0; i < pReq->stbCfg.nBSmaCols; ++i) {
+          buf = taosDecodeFixedI16(buf, pReq->stbCfg.pBSmaCols + i);
+        }
+      } else {
+        pReq->stbCfg.pBSmaCols = NULL;
+      }
+      if(pReq->rollup) {
+        pReq->stbCfg.pRSmaParam = (SRSmaParam *)malloc(sizeof(SRSmaParam));
+        SRSmaParam *param = pReq->stbCfg.pRSmaParam;
+        buf = taosDecodeFixedU32(buf, (uint32_t*)&param->xFilesFactor);
+        buf = taosDecodeFixedI8(buf, &param->delayUnit);
+        buf = taosDecodeFixedI8(buf, &param->nFuncIds);
+        if(param->nFuncIds > 0) {
+          for (int8_t i = 0; i< param->nFuncIds; ++i) {
+            buf = taosDecodeFixedI32(buf, param->pFuncIds + i);
+          }
+        } else {
+          param->pFuncIds = NULL;
+        }
+        buf = taosDecodeFixedI64(buf, &param->delay);
+      } else {
+        pReq->stbCfg.pRSmaParam = NULL;
+      }
       break;
     case TD_CHILD_TABLE:
       buf = taosDecodeFixedI64(buf, &pReq->ctbCfg.suid);
@@ -370,6 +424,32 @@ void *tDeserializeSVCreateTbReq(void *buf, SVCreateTbReq *pReq) {
         buf = taosDecodeFixedI32(buf, &pReq->ntbCfg.pSchema[i].bytes);
         buf = taosDecodeStringTo(buf, pReq->ntbCfg.pSchema[i].name);
       }
+      buf = taosDecodeFixedI16(buf, &(pReq->stbCfg.nBSmaCols));
+      if(pReq->stbCfg.nBSmaCols > 0) {
+        pReq->stbCfg.pBSmaCols = (col_id_t *)malloc(pReq->stbCfg.nBSmaCols * sizeof(col_id_t));
+        for (col_id_t i = 0; i < pReq->stbCfg.nBSmaCols; ++i) {
+          buf = taosDecodeFixedI16(buf, pReq->stbCfg.pBSmaCols + i);
+        }
+      } else {
+        pReq->stbCfg.pBSmaCols = NULL;
+      }
+      if(pReq->rollup) {
+        pReq->stbCfg.pRSmaParam = (SRSmaParam *)malloc(sizeof(SRSmaParam));
+        SRSmaParam *param = pReq->stbCfg.pRSmaParam;
+        buf = taosDecodeFixedU32(buf, (uint32_t*)&param->xFilesFactor);
+        buf = taosDecodeFixedI8(buf, &param->delayUnit);
+        buf = taosDecodeFixedI8(buf, &param->nFuncIds);
+        if(param->nFuncIds > 0) {
+          for (int8_t i = 0; i< param->nFuncIds; ++i) {
+            buf = taosDecodeFixedI32(buf, param->pFuncIds + i);
+          }
+        } else {
+          param->pFuncIds = NULL;
+        }
+        buf = taosDecodeFixedI64(buf, &param->delay);
+      } else {
+        pReq->stbCfg.pRSmaParam = NULL;
+      }
       break;
     default:
       ASSERT(0);
@@ -2797,8 +2877,8 @@ int32_t tEncodeSStreamTask(SCoder *pEncoder, const SStreamTask *pTask) {
   if (tEncodeI32(pEncoder, pTask->taskId) < 0) return -1;
   if (tEncodeI32(pEncoder, pTask->level) < 0) return -1;
   if (tEncodeI8(pEncoder, pTask->status) < 0) return -1;
-  if (tEncodeI8(pEncoder, pTask->pipeEnd) < 0) return -1;
-  if (tEncodeI8(pEncoder, pTask->parallel) < 0) return -1;
+  if (tEncodeI8(pEncoder, pTask->pipeSink) < 0) return -1;
+  // if (tEncodeI8(pEncoder, pTask->numOfRunners) < 0) return -1;
   if (tEncodeSEpSet(pEncoder, &pTask->NextOpEp) < 0) return -1;
   if (tEncodeCStr(pEncoder, pTask->qmsg) < 0) return -1;
   tEndEncode(pEncoder);
@@ -2811,8 +2891,8 @@ int32_t tDecodeSStreamTask(SCoder *pDecoder, SStreamTask *pTask) {
   if (tDecodeI32(pDecoder, &pTask->taskId) < 0) return -1;
   if (tDecodeI32(pDecoder, &pTask->level) < 0) return -1;
   if (tDecodeI8(pDecoder, &pTask->status) < 0) return -1;
-  if (tDecodeI8(pDecoder, &pTask->pipeEnd) < 0) return -1;
-  if (tDecodeI8(pDecoder, &pTask->parallel) < 0) return -1;
+  if (tDecodeI8(pDecoder, &pTask->pipeSink) < 0) return -1;
+  // if (tDecodeI8(pDecoder, &pTask->numOfRunners) < 0) return -1;
   if (tDecodeSEpSet(pDecoder, &pTask->NextOpEp) < 0) return -1;
   if (tDecodeCStrAlloc(pDecoder, &pTask->qmsg) < 0) return -1;
   tEndDecode(pDecoder);
diff --git a/source/dnode/mgmt/mnode/src/mmMsg.c b/source/dnode/mgmt/mnode/src/mmMsg.c
index 8445e73787..56a580ed93 100644
--- a/source/dnode/mgmt/mnode/src/mmMsg.c
+++ b/source/dnode/mgmt/mnode/src/mmMsg.c
@@ -149,5 +149,4 @@ void mmInitMsgHandles(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_VND_CREATE_STB_RSP, (NodeMsgFp)mmProcessWriteMsg, 0);
   dndSetMsgHandle(pWrapper, TDMT_VND_ALTER_STB_RSP, (NodeMsgFp)mmProcessWriteMsg, 0);
   dndSetMsgHandle(pWrapper, TDMT_VND_DROP_STB_RSP, (NodeMsgFp)mmProcessWriteMsg, 0);
-  dndSetMsgHandle(pWrapper, TDMT_VND_TASK_DEPLOY, (NodeMsgFp)mmProcessWriteMsg, 0);
 }
diff --git a/source/dnode/mgmt/vnode/src/vmInt.c b/source/dnode/mgmt/vnode/src/vmInt.c
index a324c60618..746fcd4855 100644
--- a/source/dnode/mgmt/vnode/src/vmInt.c
+++ b/source/dnode/mgmt/vnode/src/vmInt.c
@@ -343,7 +343,7 @@ void vmGetMgmtFp(SMgmtWrapper *pWrapper) {
   mgmtFp.requiredFp = vmRequire;
 
   vmInitMsgHandles(pWrapper);
-  pWrapper->name = "vnodes";
+  pWrapper->name = "vnode";
   pWrapper->fp = mgmtFp;
 }
 
diff --git a/source/dnode/mgmt/vnode/src/vmMsg.c b/source/dnode/mgmt/vnode/src/vmMsg.c
index e4a4cfcd9f..d4af82b382 100644
--- a/source/dnode/mgmt/vnode/src/vmMsg.c
+++ b/source/dnode/mgmt/vnode/src/vmMsg.c
@@ -274,6 +274,7 @@ void vmInitMsgHandles(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_VND_MQ_REB, (NodeMsgFp)vmProcessWriteMsg, 0);
   dndSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CUR, (NodeMsgFp)vmProcessFetchMsg, 0);
   dndSetMsgHandle(pWrapper, TDMT_VND_CONSUME, (NodeMsgFp)vmProcessFetchMsg, 0);
+  dndSetMsgHandle(pWrapper, TDMT_VND_TASK_DEPLOY, (NodeMsgFp)vmProcessWriteMsg, 0);
   dndSetMsgHandle(pWrapper, TDMT_VND_QUERY_HEARTBEAT, (NodeMsgFp)vmProcessFetchMsg, 0);
   dndSetMsgHandle(pWrapper, TDMT_VND_TASK_EXEC, (NodeMsgFp)vmProcessFetchMsg, 0);
 
diff --git a/source/dnode/mnode/impl/inc/mndSnode.h b/source/dnode/mnode/impl/inc/mndSnode.h
index 8d64879605..180f18a6dd 100644
--- a/source/dnode/mnode/impl/inc/mndSnode.h
+++ b/source/dnode/mnode/impl/inc/mndSnode.h
@@ -24,6 +24,7 @@ extern "C" {
 
 int32_t mndInitSnode(SMnode *pMnode);
 void    mndCleanupSnode(SMnode *pMnode);
+SEpSet  mndAcquireEpFromSnode(SMnode *pMnode, const SSnodeObj *pSnode);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mnode/impl/src/mndScheduler.c b/source/dnode/mnode/impl/src/mndScheduler.c
index c28c0d76c4..b95574ea41 100644
--- a/source/dnode/mnode/impl/src/mndScheduler.c
+++ b/source/dnode/mnode/impl/src/mndScheduler.c
@@ -20,6 +20,7 @@
 #include "mndMnode.h"
 #include "mndOffset.h"
 #include "mndShow.h"
+#include "mndSnode.h"
 #include "mndStb.h"
 #include "mndStream.h"
 #include "mndSubscribe.h"
@@ -31,7 +32,7 @@
 #include "tname.h"
 #include "tuuid.h"
 
-int32_t mndPersistTaskDeployReq(STrans* pTrans, SStreamTask* pTask, const SEpSet* pEpSet) {
+int32_t mndPersistTaskDeployReq(STrans* pTrans, SStreamTask* pTask, const SEpSet* pEpSet, tmsg_t type) {
   SCoder encoder;
   tCoderInit(&encoder, TD_LITTLE_ENDIAN, NULL, 0, TD_ENCODER);
   tEncodeSStreamTask(&encoder, pTask);
@@ -52,7 +53,7 @@ int32_t mndPersistTaskDeployReq(STrans* pTrans, SStreamTask* pTask, const SEpSet
   memcpy(&action.epSet, pEpSet, sizeof(SEpSet));
   action.pCont = buf;
   action.contLen = tlen;
-  action.msgType = TDMT_SND_TASK_DEPLOY;
+  action.msgType = type;
   if (mndTransAppendRedoAction(pTrans, &action) != 0) {
     rpcFreeCont(buf);
     return -1;
@@ -69,12 +70,27 @@ int32_t mndAssignTaskToVg(SMnode* pMnode, STrans* pTrans, SStreamTask* pTask, SS
     terrno = TSDB_CODE_QRY_INVALID_INPUT;
     return -1;
   }
-  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet);
+  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet, TDMT_VND_TASK_DEPLOY);
   return 0;
 }
 
+SSnodeObj* mndSchedFetchSnode(SMnode* pMnode) {
+  SSnodeObj* pObj = NULL;
+  pObj = sdbFetch(pMnode->pSdb, SDB_SNODE, NULL, (void**)&pObj);
+  return pObj;
+}
+
 int32_t mndAssignTaskToSnode(SMnode* pMnode, STrans* pTrans, SStreamTask* pTask, SSubplan* plan,
                              const SSnodeObj* pSnode) {
+  int32_t msgLen;
+  plan->execNode.nodeId = pSnode->id;
+  plan->execNode.epSet = mndAcquireEpFromSnode(pMnode, pSnode);
+
+  if (qSubPlanToString(plan, &pTask->qmsg, &msgLen) < 0) {
+    terrno = TSDB_CODE_QRY_INVALID_INPUT;
+    return -1;
+  }
+  mndPersistTaskDeployReq(pTrans, pTask, &plan->execNode.epSet, TDMT_SND_TASK_DEPLOY);
   return 0;
 }
 
@@ -113,8 +129,8 @@ int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
         // send to vnode
 
         SStreamTask* pTask = streamTaskNew(pStream->uid, level);
+        pTask->pipeSink = level == totLevel - 1 ? 1 : 0;
         // TODO: set to
-        pTask->parallel = 4;
         if (mndAssignTaskToVg(pMnode, pTrans, pTask, plan, pVgroup) < 0) {
           sdbRelease(pSdb, pVgroup);
           qDestroyQueryPlan(pPlan);
@@ -122,34 +138,20 @@ int32_t mndScheduleStream(SMnode* pMnode, STrans* pTrans, SStreamObj* pStream) {
         }
         taosArrayPush(taskOneLevel, pTask);
       }
-
-    } else if (plan->subplanType == SUBPLAN_TYPE_SCAN) {
-      // duplicatable
-
-      int32_t parallel = 0;
-      // if no snode, parallel set to fetch thread num in vnode
-
-      // if has snode, set to shared thread num in snode
-      parallel = SND_SHARED_THREAD_NUM;
-
-      SStreamTask* pTask = streamTaskNew(pStream->uid, level);
-      pTask->parallel = parallel;
-      // TODO:get snode id and ep
-      if (mndAssignTaskToVg(pMnode, pTrans, pTask, plan, pVgroup) < 0) {
-        sdbRelease(pSdb, pVgroup);
-        qDestroyQueryPlan(pPlan);
-        return -1;
-      }
-      taosArrayPush(taskOneLevel, pTask);
     } else {
-      // not duplicatable
       SStreamTask* pTask = streamTaskNew(pStream->uid, level);
-
-      // TODO: get snode
-      if (mndAssignTaskToVg(pMnode, pTrans, pTask, plan, pVgroup) < 0) {
-        sdbRelease(pSdb, pVgroup);
-        qDestroyQueryPlan(pPlan);
-        return -1;
+      pTask->pipeSink = level == totLevel - 1 ? 1 : 0;
+      SSnodeObj* pSnode = mndSchedFetchSnode(pMnode);
+      if (pSnode != NULL) {
+        if (mndAssignTaskToSnode(pMnode, pTrans, pTask, plan, pSnode) < 0) {
+          sdbRelease(pSdb, pSnode);
+          qDestroyQueryPlan(pPlan);
+          return -1;
+        }
+        sdbRelease(pMnode->pSdb, pSnode);
+      } else {
+        // TODO: assign to one vg
+        ASSERT(0);
       }
       taosArrayPush(taskOneLevel, pTask);
     }
diff --git a/source/dnode/mnode/impl/src/mndSnode.c b/source/dnode/mnode/impl/src/mndSnode.c
index dda02fecf2..f01b143fbc 100644
--- a/source/dnode/mnode/impl/src/mndSnode.c
+++ b/source/dnode/mnode/impl/src/mndSnode.c
@@ -60,6 +60,15 @@ int32_t mndInitSnode(SMnode *pMnode) {
 
 void mndCleanupSnode(SMnode *pMnode) {}
 
+SEpSet mndAcquireEpFromSnode(SMnode *pMnode, const SSnodeObj *pSnode) {
+  SEpSet epSet;
+  memcpy(epSet.eps->fqdn, pSnode->pDnode->fqdn, 128);
+  epSet.eps->port = pSnode->pDnode->port;
+  epSet.numOfEps = 1;
+  epSet.inUse = 0;
+  return epSet;
+}
+
 static SSnodeObj *mndAcquireSnode(SMnode *pMnode, int32_t snodeId) {
   SSnodeObj *pObj = sdbAcquire(pMnode->pSdb, SDB_SNODE, &snodeId);
   if (pObj == NULL && terrno == TSDB_CODE_SDB_OBJ_NOT_THERE) {
diff --git a/source/dnode/snode/src/snode.c b/source/dnode/snode/src/snode.c
index 147f44b260..afa5930821 100644
--- a/source/dnode/snode/src/snode.c
+++ b/source/dnode/snode/src/snode.c
@@ -57,8 +57,8 @@ void sndMetaDelete(SStreamMeta *pMeta) {
 }
 
 int32_t sndMetaDeployTask(SStreamMeta *pMeta, SStreamTask *pTask) {
-  for (int i = 0; i < pTask->parallel; i++) {
-    pTask->runner.executor[i] = qCreateStreamExecTaskInfo(pTask->qmsg, NULL);
+  for (int i = 0; i < pTask->numOfRunners; i++) {
+    pTask->runner[i].executor = qCreateStreamExecTaskInfo(pTask->qmsg, NULL);
   }
   return taosHashPut(pMeta->pHash, &pTask->taskId, sizeof(int32_t), pTask, sizeof(void *));
 }
diff --git a/source/dnode/vnode/inc/tq.h b/source/dnode/vnode/inc/tq.h
deleted file mode 100644
index 6391eaffea..0000000000
--- a/source/dnode/vnode/inc/tq.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TQ_H_
-#define _TQ_H_
-
-#include "executor.h"
-#include "meta.h"
-#include "taoserror.h"
-#include "tcommon.h"
-#include "tmallocator.h"
-#include "tmsg.h"
-#include "trpc.h"
-#include "ttimer.h"
-#include "tutil.h"
-#include "vnode.h"
-#include "wal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct STQ STQ;
-
-// memory allocator provided by vnode
-typedef struct {
-  SMemAllocatorFactory* pAllocatorFactory;
-  SMemAllocator*        pAllocator;
-} STqMemRef;
-
-// init once
-int  tqInit();
-void tqCleanUp();
-
-// open in each vnode
-STQ* tqOpen(const char* path, SWal* pWal, SMeta* pMeta, STqCfg* tqConfig, SMemAllocatorFactory* allocFac);
-void tqClose(STQ*);
-
-// required by vnode
-int tqPushMsg(STQ*, void* msg, tmsg_t msgType, int64_t version);
-int tqCommit(STQ*);
-
-int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg);
-int32_t tqProcessSetConnReq(STQ* pTq, char* msg);
-int32_t tqProcessRebReq(STQ* pTq, char* msg);
-int32_t tqProcessTaskExec(STQ* pTq, SRpcMsg* msg);
-
-int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TQ_H_*/
diff --git a/source/dnode/vnode/src/inc/tqInt.h b/source/dnode/vnode/src/inc/tqInt.h
index 9b21cf92ce..4d4bb12a21 100644
--- a/source/dnode/vnode/src/inc/tqInt.h
+++ b/source/dnode/vnode/src/inc/tqInt.h
@@ -18,8 +18,8 @@
 
 #include "meta.h"
 #include "tlog.h"
-#include "tq.h"
 #include "tqPush.h"
+#include "vnd.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -153,6 +153,11 @@ typedef struct {
   FTqDelete      pDeleter;
 } STqMetaStore;
 
+typedef struct {
+  SMemAllocatorFactory* pAllocatorFactory;
+  SMemAllocator*        pAllocator;
+} STqMemRef;
+
 struct STQ {
   // the collection of groups
   // the handle of meta kvstore
diff --git a/source/dnode/vnode/src/inc/tsdbLog.h b/source/dnode/vnode/src/inc/tsdbLog.h
index 56dc8ab2a0..3afe628198 100644
--- a/source/dnode/vnode/src/inc/tsdbLog.h
+++ b/source/dnode/vnode/src/inc/tsdbLog.h
@@ -24,12 +24,12 @@ extern "C" {
 
 extern int32_t tsdbDebugFlag;
 
-#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}     while(0)
-#define tsdbError(...) do { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}     while(0)
-#define tsdbWarn(...)  do { if (tsdbDebugFlag & DEBUG_WARN)  { taosPrintLog("TDB WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}      while(0)
-#define tsdbInfo(...)  do { if (tsdbDebugFlag & DEBUG_INFO)  { taosPrintLog("TDB ", DEBUG_INFO, 255, __VA_ARGS__); }}           while(0)
-#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", DEBUG_DEBUG, tsdbDebugFlag, __VA_ARGS__); }} while(0)
-#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", DEBUG_TRACE, tsdbDebugFlag, __VA_ARGS__); }} while(0)
+#define tsdbFatal(...) do { if (tsdbDebugFlag & DEBUG_FATAL) { taosPrintLog("TSDB FATAL ", DEBUG_FATAL, 255, __VA_ARGS__); }}     while(0)
+#define tsdbError(...) do { if (tsdbDebugFlag & DEBUG_ERROR) { taosPrintLog("TSDB ERROR ", DEBUG_ERROR, 255, __VA_ARGS__); }}     while(0)
+#define tsdbWarn(...)  do { if (tsdbDebugFlag & DEBUG_WARN)  { taosPrintLog("TSDB WARN ", DEBUG_WARN, 255, __VA_ARGS__); }}      while(0)
+#define tsdbInfo(...)  do { if (tsdbDebugFlag & DEBUG_INFO)  { taosPrintLog("TSDB ", DEBUG_INFO, 255, __VA_ARGS__); }}           while(0)
+#define tsdbDebug(...) do { if (tsdbDebugFlag & DEBUG_DEBUG) { taosPrintLog("TSDB ", DEBUG_DEBUG, tsdbDebugFlag, __VA_ARGS__); }} while(0)
+#define tsdbTrace(...) do { if (tsdbDebugFlag & DEBUG_TRACE) { taosPrintLog("TSDB ", DEBUG_TRACE, tsdbDebugFlag, __VA_ARGS__); }} while(0)
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/vnode/src/inc/vnd.h b/source/dnode/vnode/src/inc/vnd.h
index c911f95e4a..ed9aad9277 100644
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
@@ -23,7 +23,6 @@
 #include "tlist.h"
 #include "tlockfree.h"
 #include "tmacro.h"
-#include "tq.h"
 #include "wal.h"
 
 #include "vnode.h"
@@ -34,6 +33,8 @@
 extern "C" {
 #endif
 
+typedef struct STQ STQ;
+
 typedef struct SVState   SVState;
 typedef struct SVBufPool SVBufPool;
 
@@ -171,6 +172,25 @@ void*           vmaMalloc(SVMemAllocator* pVMA, uint64_t size);
 void            vmaFree(SVMemAllocator* pVMA, void* ptr);
 bool            vmaIsFull(SVMemAllocator* pVMA);
 
+// init once
+int  tqInit();
+void tqCleanUp();
+
+// open in each vnode
+STQ* tqOpen(const char* path, SWal* pWal, SMeta* pMeta, STqCfg* tqConfig, SMemAllocatorFactory* allocFac);
+void tqClose(STQ*);
+
+// required by vnode
+int tqPushMsg(STQ*, void* msg, tmsg_t msgType, int64_t version);
+int tqCommit(STQ*);
+
+int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg);
+int32_t tqProcessSetConnReq(STQ* pTq, char* msg);
+int32_t tqProcessRebReq(STQ* pTq, char* msg);
+int32_t tqProcessTaskExec(STQ* pTq, SRpcMsg* msg);
+
+int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/vnode/src/meta/metaBDBImpl.c b/source/dnode/vnode/src/meta/metaBDBImpl.c
index 3eb9a480ac..2dd8386d7a 100644
--- a/source/dnode/vnode/src/meta/metaBDBImpl.c
+++ b/source/dnode/vnode/src/meta/metaBDBImpl.c
@@ -507,7 +507,7 @@ static int metaEncodeTbInfo(void **buf, STbCfg *pTbCfg) {
   tsize += taosEncodeString(buf, pTbCfg->name);
   tsize += taosEncodeFixedU32(buf, pTbCfg->ttl);
   tsize += taosEncodeFixedU32(buf, pTbCfg->keep);
-  tsize += taosEncodeFixedU8(buf, pTbCfg->type);
+  tsize += taosEncodeFixedU8(buf, pTbCfg->info);
 
   if (pTbCfg->type == META_SUPER_TABLE) {
     SSchemaWrapper sw = {.nCols = pTbCfg->stbCfg.nTagCols, .pSchema = pTbCfg->stbCfg.pTagSchema};
@@ -527,7 +527,7 @@ static void *metaDecodeTbInfo(void *buf, STbCfg *pTbCfg) {
   buf = taosDecodeString(buf, &(pTbCfg->name));
   buf = taosDecodeFixedU32(buf, &(pTbCfg->ttl));
   buf = taosDecodeFixedU32(buf, &(pTbCfg->keep));
-  buf = taosDecodeFixedU8(buf, &(pTbCfg->type));
+  buf = taosDecodeFixedU8(buf, &(pTbCfg->info));
 
   if (pTbCfg->type == META_SUPER_TABLE) {
     SSchemaWrapper sw;
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 87c670a4e9..3af79ca461 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -70,6 +70,46 @@ void tqClose(STQ* pTq) {
 
 int tqPushMsg(STQ* pTq, void* msg, tmsg_t msgType, int64_t version) {
   if (msgType != TDMT_VND_SUBMIT) return 0;
+
+  void* pIter = NULL;
+
+  while (1) {
+    pIter = taosHashIterate(pTq->pStreamTasks, pIter);
+    if (pIter == NULL) break;
+    SStreamTask* pTask = (SStreamTask*)pIter;
+    if (!pTask->pipeSource) continue;
+
+    int32_t workerId = 0;
+    void*   exec = pTask->runner[workerId].executor;
+    qSetStreamInput(exec, msg, STREAM_DATA_TYPE_SUBMIT_BLOCK);
+    SArray* pRes = taosArrayInit(0, sizeof(SSDataBlock));
+    while (1) {
+      SSDataBlock* output;
+      uint64_t     ts;
+      if (qExecTask(exec, &output, &ts) < 0) {
+        ASSERT(false);
+      }
+      if (output == NULL) {
+        break;
+      }
+      taosArrayPush(pRes, output);
+    }
+    if (pTask->pipeSink) {
+      // write back
+    } else {
+      int32_t tlen = sizeof(SStreamExecMsgHead) + tEncodeDataBlocks(NULL, pRes);
+      void*   buf = rpcMallocCont(tlen);
+      if (buf == NULL) {
+        return -1;
+      }
+      void* abuf = POINTER_SHIFT(buf, sizeof(SStreamExecMsgHead));
+      tEncodeDataBlocks(abuf, pRes);
+      // serialize
+      // to next level
+    }
+  }
+
+#if 0
   void* pIter = taosHashIterate(pTq->tqPushMgr->pHash, NULL);
   while (pIter != NULL) {
     STqPusher* pusher = *(STqPusher**)pIter;
@@ -97,6 +137,7 @@ int tqPushMsg(STQ* pTq, void* msg, tmsg_t msgType, int64_t version) {
   // if handle waiting, launch query and response to consumer
   //
   // if no waiting handle, return
+#endif
   return 0;
 }
 
@@ -420,6 +461,21 @@ int32_t tqProcessSetConnReq(STQ* pTq, char* msg) {
   return 0;
 }
 
+int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask, int32_t parallel) {
+  ASSERT(parallel <= 8);
+  pTask->numOfRunners = parallel;
+  for (int32_t i = 0; i < parallel; i++) {
+    STqReadHandle* pReadHandle = tqInitSubmitMsgScanner(pTq->pVnodeMeta);
+    SReadHandle    handle = {
+           .reader = pReadHandle,
+           .meta = pTq->pVnodeMeta,
+    };
+    pTask->runner[i].inputHandle = pReadHandle;
+    pTask->runner[i].executor = qCreateStreamExecTaskInfo(pTask->qmsg, &handle);
+  }
+  return 0;
+}
+
 int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen) {
   SStreamTask* pTask = malloc(sizeof(SStreamTask));
   if (pTask == NULL) {
@@ -430,12 +486,118 @@ int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen) {
   tDecodeSStreamTask(&decoder, pTask);
   tCoderClear(&decoder);
 
+  tqExpandTask(pTq, pTask, 8);
   taosHashPut(pTq->pStreamTasks, &pTask->taskId, sizeof(int32_t), pTask, sizeof(SStreamTask));
 
   return 0;
 }
 
+static char* formatTimestamp(char* buf, int64_t val, int precision) {
+  time_t  tt;
+  int32_t ms = 0;
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    tt = (time_t)(val / 1000000000);
+    ms = val % 1000000000;
+  } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+    tt = (time_t)(val / 1000000);
+    ms = val % 1000000;
+  } else {
+    tt = (time_t)(val / 1000);
+    ms = val % 1000;
+  }
+
+  /* comment out as it make testcases like select_with_tags.sim fail.
+    but in windows, this may cause the call to localtime crash if tt < 0,
+    need to find a better solution.
+    if (tt < 0) {
+      tt = 0;
+    }
+    */
+
+#ifdef WINDOWS
+  if (tt < 0) tt = 0;
+#endif
+  if (tt <= 0 && ms < 0) {
+    tt--;
+    if (precision == TSDB_TIME_PRECISION_NANO) {
+      ms += 1000000000;
+    } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+      ms += 1000000;
+    } else {
+      ms += 1000;
+    }
+  }
+
+  struct tm* ptm = localtime(&tt);
+  size_t     pos = strftime(buf, 35, "%Y-%m-%d %H:%M:%S", ptm);
+
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    sprintf(buf + pos, ".%09d", ms);
+  } else if (precision == TSDB_TIME_PRECISION_MICRO) {
+    sprintf(buf + pos, ".%06d", ms);
+  } else {
+    sprintf(buf + pos, ".%03d", ms);
+  }
+
+  return buf;
+}
+void tqDebugShowSSData(SArray* dataBlocks) {
+  char    pBuf[128];
+  int32_t sz = taosArrayGetSize(dataBlocks);
+  for (int32_t i = 0; i < sz; i++) {
+    SSDataBlock* pDataBlock = taosArrayGet(dataBlocks, i);
+    int32_t      colNum = pDataBlock->info.numOfCols;
+    int32_t      rows = pDataBlock->info.rows;
+    for (int32_t j = 0; j < rows; j++) {
+      printf("|");
+      for (int32_t k = 0; k < colNum; k++) {
+        SColumnInfoData* pColInfoData = taosArrayGet(pDataBlock->pDataBlock, k);
+        void*            var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes);
+        switch (pColInfoData->info.type) {
+          case TSDB_DATA_TYPE_TIMESTAMP:
+            formatTimestamp(pBuf, *(uint64_t*)var, TSDB_TIME_PRECISION_MILLI);
+            printf(" %25s |", pBuf);
+            break;
+          case TSDB_DATA_TYPE_INT:
+          case TSDB_DATA_TYPE_UINT:
+            printf(" %15u |", *(uint32_t*)var);
+            break;
+        }
+      }
+      printf("\n");
+    }
+  }
+}
+
 int32_t tqProcessTaskExec(STQ* pTq, SRpcMsg* msg) {
-  //
+  SStreamTaskExecReq* pReq = msg->pCont;
+
+  int32_t taskId = pReq->head.streamTaskId;
+  int32_t workerType = pReq->head.workerType;
+
+  SStreamTask* pTask = taosHashGet(pTq->pStreamTasks, &taskId, sizeof(int32_t));
+  // assume worker id is 1
+  int32_t workerId = 1;
+  void*   exec = pTask->runner[workerId].executor;
+  int32_t sz = taosArrayGetSize(pReq->data);
+  printf("input data:\n");
+  tqDebugShowSSData(pReq->data);
+  SArray* pRes = taosArrayInit(0, sizeof(void*));
+  for (int32_t i = 0; i < sz; i++) {
+    SSDataBlock* input = taosArrayGet(pReq->data, i);
+    SSDataBlock* output;
+    uint64_t     ts;
+    qSetStreamInput(exec, input, STREAM_DATA_TYPE_SSDATA_BLOCK);
+    if (qExecTask(exec, &output, &ts) < 0) {
+      ASSERT(0);
+    }
+    if (output == NULL) {
+      break;
+    }
+    taosArrayPush(pRes, &output);
+  }
+  printf("output data:\n");
+  tqDebugShowSSData(pRes);
+
   return 0;
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
index f6827eaae1..9619ac036e 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
@@ -727,9 +727,9 @@ static int tsdbLoadBlockDataColsImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *
       }
 
       ASSERT(pBlockCol->colId == pDataCol->colId);
-      // set the bitmap
-      pDataCol->bitmap = pBlockCol->bitmap;
     }
+    // set the bitmap
+    pDataCol->bitmap = pBlockCol->bitmap;
 
     if (tsdbLoadColData(pReadh, pDFile, pBlock, pBlockCol, pDataCol) < 0) return -1;
   }
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index 7ab435bdae..2f5f94b55f 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -14,6 +14,7 @@
  */
 
 #include "vnodeQuery.h"
+#include "executor.h"
 #include "vnd.h"
 
 static int32_t vnodeGetTableList(SVnode *pVnode, SRpcMsg *pMsg);
diff --git a/source/dnode/vnode/src/vnd/vnodeWrite.c b/source/dnode/vnode/src/vnd/vnodeWrite.c
index c3f53b6b91..ade9adb1e1 100644
--- a/source/dnode/vnode/src/vnd/vnodeWrite.c
+++ b/source/dnode/vnode/src/vnd/vnodeWrite.c
@@ -13,12 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tq.h"
 #include "vnd.h"
 
 void vnodeProcessWMsgs(SVnode *pVnode, SArray *pMsgs) {
   SNodeMsg *pMsg;
-  SRpcMsg *pRpc;
+  SRpcMsg  *pRpc;
 
   for (int i = 0; i < taosArrayGetSize(pMsgs); i++) {
     pMsg = *(SNodeMsg **)taosArrayGet(pMsgs, i);
diff --git a/source/dnode/vnode/test/tqSerializerTest.cpp b/source/dnode/vnode/test/tqSerializerTest.cpp
deleted file mode 100644
index 0d76322c17..0000000000
--- a/source/dnode/vnode/test/tqSerializerTest.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <gtest/gtest.h>
-#include <cstring>
-#include <iostream>
-#include <queue>
-
-#include "tq.h"
-
-using namespace std;
-
-TEST(TqSerializerTest, basicTest) {
-  TqGroupHandle* gHandle = (TqGroupHandle*)malloc(sizeof(TqGroupHandle));
-  
-}
diff --git a/source/dnode/vnode/test/tsdbSmaTest.cpp b/source/dnode/vnode/test/tsdbSmaTest.cpp
index b9bf432a72..3c51ad5d71 100644
--- a/source/dnode/vnode/test/tsdbSmaTest.cpp
+++ b/source/dnode/vnode/test/tsdbSmaTest.cpp
@@ -33,6 +33,61 @@ int main(int argc, char **argv) {
   return RUN_ALL_TESTS();
 }
 
+TEST(testCase, unionEncodeDecodeTest) {
+  typedef struct {
+    union {
+      uint8_t info;
+      struct {
+        uint8_t rollup : 1;  // 1 means rollup sma
+        uint8_t type : 7;
+      };
+    };
+    col_id_t  nBSmaCols;
+    col_id_t* pBSmaCols;
+  } SUnionTest;
+
+  SUnionTest sut = {0};
+  sut.rollup = 1;
+  sut.type = 1;
+
+  sut.nBSmaCols = 2;
+  sut.pBSmaCols = (col_id_t*)malloc(sut.nBSmaCols * sizeof(col_id_t));
+  for (col_id_t i = 0; i < sut.nBSmaCols; ++i) {
+    sut.pBSmaCols[i] = i + 100;
+  }
+
+  void* buf = malloc(1024);
+  void *  pBuf = buf;
+  int32_t tlen = 0;
+  tlen += taosEncodeFixedU8(&buf, sut.info);
+  tlen += taosEncodeFixedI16(&buf, sut.nBSmaCols);
+  for (col_id_t i = 0; i < sut.nBSmaCols; ++i) {
+    tlen += taosEncodeFixedI16(&buf, sut.pBSmaCols[i]);
+  }
+
+  SUnionTest dut = {0};
+  pBuf = taosDecodeFixedU8(pBuf, &dut.info);
+  pBuf = taosDecodeFixedI16(pBuf, &dut.nBSmaCols);
+  if(dut.nBSmaCols > 0) {
+    dut.pBSmaCols = (col_id_t*)malloc(dut.nBSmaCols * sizeof(col_id_t));
+    for(col_id_t i=0; i < dut.nBSmaCols; ++i) {
+      pBuf = taosDecodeFixedI16(pBuf, dut.pBSmaCols + i);
+    }
+  } else {
+    dut.pBSmaCols = NULL;
+  }
+
+  printf("sut.rollup=%" PRIu8 ", type=%" PRIu8 ", info=%" PRIu8 "\n", sut.rollup, sut.type, sut.info);
+  printf("dut.rollup=%" PRIu8 ", type=%" PRIu8 ", info=%" PRIu8 "\n", dut.rollup, dut.type, dut.info);
+
+  ASSERT_EQ(sut.rollup, dut.rollup);
+  ASSERT_EQ(sut.type, dut.type);
+  ASSERT_EQ(sut.nBSmaCols, dut.nBSmaCols);
+  for (col_id_t i = 0; i< sut.nBSmaCols; ++i) {
+    ASSERT_EQ(*(col_id_t*)(sut.pBSmaCols + i), sut.pBSmaCols[i]);
+    ASSERT_EQ(*(col_id_t*)(sut.pBSmaCols + i), dut.pBSmaCols[i]);
+  }
+}
 #if 1
 TEST(testCase, tSma_Meta_Encode_Decode_Test) {
   // encode
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index e6cdbcf10f..19100d7560 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -16,7 +16,7 @@
 #include "executor.h"
 #include "executorimpl.h"
 #include "planner.h"
-#include "tq.h"
+#include "vnode.h"
 
 static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, int32_t type, char* id) {
   ASSERT(pOperator != NULL);
@@ -52,9 +52,8 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, int32_t t
 
       SSDataBlock* pDataBlock = input;
       pInfo->pRes->info = pDataBlock->info;
-      for(int32_t i = 0; i < pInfo->pRes->info.numOfCols; ++i) {
-        pInfo->pRes->pDataBlock = pDataBlock->pDataBlock;
-      }
+      taosArrayClear(pInfo->pRes->pDataBlock);
+      taosArrayAddAll(pInfo->pRes->pDataBlock, pDataBlock->pDataBlock);
 
       // set current block valid.
       pInfo->blockValid = true;
@@ -121,7 +120,7 @@ int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, SArray* tableIdList, bool isA
 
   // traverse to the streamscan node to add this table id
   SOperatorInfo* pInfo = pTaskInfo->pRoot;
-  while(pInfo->operatorType != QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN) {
+  while (pInfo->operatorType != QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN) {
     pInfo = pInfo->pDownstream[0];
   }
 
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 059c505aa3..e927b577de 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -4721,6 +4721,7 @@ static SSDataBlock* doStreamBlockScan(SOperatorInfo *pOperator, bool* newgroup)
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
   SStreamBlockScanInfo* pInfo = pOperator->info;
 
+
   pTaskInfo->code = pOperator->_openFn(pOperator);
   if (pTaskInfo->code != TSDB_CODE_SUCCESS) {
     return NULL;
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 563d3213da..4bb5556814 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -349,10 +349,31 @@ literal(A) ::= duration_literal(B).
 
 duration_literal(A) ::= NK_VARIABLE(B).                                           { A = createRawExprNode(pCxt, &B, createDurationValueNode(pCxt, &B)); }
 
+signed(A) ::= NK_INTEGER(B).                                                      { A = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); }
+signed(A) ::= NK_PLUS NK_INTEGER(B).                                              { A = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); }
+signed(A) ::= NK_MINUS(B) NK_INTEGER(C).                                          { 
+                                                                                    SToken t = B;
+                                                                                    t.n = (C.z + C.n) - B.z;
+                                                                                    A = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
+                                                                                  }
+signed(A) ::= NK_FLOAT(B).                                                        { A = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &B); }
+signed(A) ::= NK_PLUS NK_FLOAT(B).                                                { A = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &B); }
+signed(A) ::= NK_MINUS(B) NK_FLOAT(C).                                            { 
+                                                                                    SToken t = B;
+                                                                                    t.n = (C.z + C.n) - B.z;
+                                                                                    A = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
+                                                                                  }
+
+signed_literal(A) ::= signed(B).                                                  { A = B; }
+signed_literal(A) ::= NK_STRING(B).                                               { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
+signed_literal(A) ::= NK_BOOL(B).                                                 { A = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &B); }
+signed_literal(A) ::= TIMESTAMP NK_STRING(B).                                     { A = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &B); }
+signed_literal(A) ::= duration_literal(B).                                        { A = releaseRawExprNode(pCxt, B); }
+
 %type literal_list                                                                { SNodeList* }
 %destructor literal_list                                                          { nodesDestroyList($$); }
-literal_list(A) ::= literal(B).                                                   { A = createNodeList(pCxt, releaseRawExprNode(pCxt, B)); }
-literal_list(A) ::= literal_list(B) NK_COMMA literal(C).                          { A = addNodeToList(pCxt, B, releaseRawExprNode(pCxt, C)); }
+literal_list(A) ::= signed_literal(B).                                            { A = createNodeList(pCxt, B); }
+literal_list(A) ::= literal_list(B) NK_COMMA signed_literal(C).                   { A = addNodeToList(pCxt, B, C); }
 
 /************************************************ names and identifiers ***********************************************/
 %type db_name                                                                     { SToken }
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 60247935be..100fc3f107 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -348,7 +348,7 @@ static EDealRes translateColumn(STranslateContext* pCxt, SColumnNode* pCol) {
 
 static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) {
   if (pVal->isDuration) {
-    if (parseAbsoluteDuration(pVal->literal, strlen(pVal->literal), &pVal->datum.i, &pVal->unit, pVal->node.resType.precision) != TSDB_CODE_SUCCESS) {
+    if (parseNatualDuration(pVal->literal, strlen(pVal->literal), &pVal->datum.i, &pVal->unit, pVal->node.resType.precision) != TSDB_CODE_SUCCESS) {
       return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, pVal->literal);
     }
   } else {
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index 8125b807c3..50c29e095f 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -99,24 +99,24 @@
 #endif
 /************* Begin control #defines *****************************************/
 #define YYCODETYPE unsigned short int
-#define YYNOCODE 256
+#define YYNOCODE 258
 #define YYACTIONTYPE unsigned short int
 #define ParseTOKENTYPE  SToken 
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  SNodeList* yy24;
-  int32_t yy68;
   ENullOrder yy73;
-  EJoinType yy84;
-  EOrder yy130;
-  EOperatorType yy252;
-  SAlterOption yy285;
-  bool yy345;
-  EFillMode yy358;
-  SNode* yy360;
-  SDataType yy400;
-  SToken yy417;
+  SNodeList* yy136;
+  SNode* yy140;
+  EJoinType yy144;
+  SToken yy149;
+  EOrder yy158;
+  int32_t yy160;
+  SAlterOption yy233;
+  SDataType yy256;
+  EFillMode yy306;
+  EOperatorType yy320;
+  bool yy497;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -131,17 +131,17 @@ typedef union {
 #define ParseCTX_PARAM
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
-#define YYNSTATE             424
-#define YYNRULE              326
+#define YYNSTATE             427
+#define YYNRULE              337
 #define YYNTOKEN             163
-#define YY_MAX_SHIFT         423
-#define YY_MIN_SHIFTREDUCE   645
-#define YY_MAX_SHIFTREDUCE   970
-#define YY_ERROR_ACTION      971
-#define YY_ACCEPT_ACTION     972
-#define YY_NO_ACTION         973
-#define YY_MIN_REDUCE        974
-#define YY_MAX_REDUCE        1299
+#define YY_MAX_SHIFT         426
+#define YY_MIN_SHIFTREDUCE   659
+#define YY_MAX_SHIFTREDUCE   995
+#define YY_ERROR_ACTION      996
+#define YY_ACCEPT_ACTION     997
+#define YY_NO_ACTION         998
+#define YY_MIN_REDUCE        999
+#define YY_MAX_REDUCE        1335
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -208,387 +208,398 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (1215)
+#define YY_ACTTAB_COUNT (1269)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */  1017,  357,  357,  105, 1192,  986,  263, 1075, 1278,  109,
- /*    10 */    42,  341, 1067,   31,   29,   27,   26,   25,   20,   89,
- /*    20 */  1116, 1277, 1078, 1078,  356, 1276,  325, 1073,   31,   29,
- /*    30 */    27,   26,   25, 1063,  314,   77,  912,  356,   76,   75,
- /*    40 */    74,   73,   72,   71,   70,   69,   68,   92,  207,  408,
- /*    50 */   407,  406,  405,  404,  403,  402,  401,  400,  399,  398,
- /*    60 */   397,  396,  395,  394,  393,  392,  391,  390,  975,   24,
- /*    70 */   167,   90,  853,   31,   29,   27,   26,   25,  302,  839,
- /*    80 */   876,  114, 1224, 1225, 1192, 1229,  356,   10,  264,   77,
- /*    90 */    98,  341,   76,   75,   74,   73,   72,   71,   70,   69,
- /*   100 */    68,  244,   31,   29,   27,   26,   25,  285,  207,  280,
- /*   110 */   106, 1045,  284, 1123,  318,  283,  877,  281,  357,  220,
- /*   120 */   282,  416,  415,  354, 1121,   23,  228,  205,  871,  872,
- /*   130 */   873,  874,  875,  879,  880,  881,   10, 1236,  908, 1078,
- /*   140 */   876,  755,  379,  378,  377,  759,  376,  761,  762,  375,
- /*   150 */   764,  372,  423,  770,  369,  772,  773,  366,  363,  104,
- /*   160 */  1177,   31,   29,   27,   26,   25,  183, 1081,  832,   88,
- /*   170 */   911,  239,   57,   30,   28,  412,  877,  182, 1143, 1145,
- /*   180 */  1192,  230,   53,  832,  830,   23,  228,  341,  871,  872,
- /*   190 */   873,  874,  875,  879,  880,  881,  118,  343,  843,  830,
- /*   200 */   277, 1164,   59,  118,  276,  178,  329, 1171,   12,   60,
- /*   210 */  1178, 1181, 1217,  252,  831, 1177,  206, 1213,  344, 1169,
- /*   220 */   190,  233,  234,  131, 1152,  192,  111,  278, 1278,  831,
- /*   230 */   104,    1,  269,  841,  130, 1192,  353,  191, 1080,  357,
- /*   240 */   420,  117,  328,  185,   65, 1276, 1108,  123,  966,  967,
- /*   250 */   305,  273,  343,  146,  313,  420, 1164,  122,  121,   43,
- /*   260 */  1078,  118,  128, 1069,   61, 1178, 1181, 1217,  833,  836,
- /*   270 */  1166,  223, 1213,  112,  238, 1177, 1166,  320,  315,   30,
- /*   280 */    28,  913,  104,  833,  836,  163,   58,  230,  389,  832,
- /*   290 */  1080,  306, 1244, 1177,  221, 1192,   93,  997,  118,  162,
- /*   300 */   236, 1056,  328, 1070, 1164,  830,  127,   63,  325,  878,
- /*   310 */   125, 1164,  343, 1192,   12,  319, 1164, 1164,   21,   42,
- /*   320 */   341, 1177, 1054,   51,   61, 1178, 1181, 1217,  882,   92,
- /*   330 */   343,  223, 1213,  112, 1164,  831, 1074,    1, 1164,  118,
- /*   340 */  1071, 1192,   61, 1178, 1181, 1217,  333,  264,  341,  223,
- /*   350 */  1213, 1290, 1245,   90, 1177,  682,  136,  681,  343,  134,
- /*   360 */  1251,  420, 1164,  115, 1224, 1225,  996, 1229,  389, 1231,
- /*   370 */    61, 1178, 1181, 1217, 1192,  683,  937,  223, 1213, 1290,
- /*   380 */   842,  341, 1177, 1123,  840,  241, 1228,  357, 1274,  833,
- /*   390 */   836,  343,  355,  104, 1144, 1164,  310,  935,  936,  938,
- /*   400 */   939, 1080, 1192,   61, 1178, 1181, 1217, 1164, 1078,  341,
- /*   410 */   223, 1213, 1290,  299,    9,    8,   30,   28,  334,  343,
- /*   420 */  1177, 1235,  382, 1164,  230, 1055,  832, 1231,  329,   30,
- /*   430 */    28,  195, 1178, 1181, 1053, 1123,  995,  230,  357,  832,
- /*   440 */  1192,  235,  830,  180, 1227,  325, 1121,  341,  844, 1065,
- /*   450 */  1278,   12,  920,  300, 1123,  830, 1177,  343,  841, 1078,
- /*   460 */   240, 1164, 1061,  117,  229, 1121,   92, 1276,  357,  201,
- /*   470 */  1178, 1181,  831,   65,    1, 1278, 1192, 1164,  994,  993,
- /*   480 */   279,  381,  386,  341,  889,  831,  385,    7,  117, 1078,
- /*   490 */    90,  386, 1276,  343, 1177,  385,  987, 1164,  420,  327,
- /*   500 */   113, 1224, 1225, 1140, 1229,   62, 1178, 1181, 1217,  387,
- /*   510 */   120,  420, 1216, 1213, 1192,  325, 1231,  311,  387, 1164,
- /*   520 */  1164,  341,   27,   26,   25, 1046,  833,  836,  384,  383,
- /*   530 */  1123,  343,  992, 1226,  991, 1164,   92,  384,  383,  833,
- /*   540 */   836, 1122,  344,   62, 1178, 1181, 1217,  357, 1153,  149,
- /*   550 */   339, 1213,  242,  164,  118,  329,   30,   28,  342,  990,
- /*   560 */    90,    9,    8,  989,  230,  988,  832, 1167, 1078,  985,
- /*   570 */   160, 1224,  324, 1164,  323, 1164, 1177, 1278,  984,   30,
- /*   580 */    28,  681,  830,   30,   28,  332, 1117,  230,  983,  832,
- /*   590 */   117,  230,  839,  832, 1276, 1177, 1192,  271, 1013,  245,
- /*   600 */  1164,  982,  257,  341, 1164,  830, 1164,  981, 1164,  830,
- /*   610 */  1164,  258,  831,  343,    7, 1192,  934, 1164,  980, 1164,
- /*   620 */   286,    6,  341,  979,  157,  107, 1178, 1181,   78, 1164,
- /*   630 */   138,  214,  343,  137, 1008,  831, 1164,    7,  420,  831,
- /*   640 */   140,    1, 1164,  139,   62, 1178, 1181, 1217, 1164,  340,
- /*   650 */  1177,  978, 1214,  277, 1006,  977,  288,  276,  336, 1164,
- /*   660 */   297,  420,  330, 1291, 1164,  420,  833,  836,  972,  215,
- /*   670 */  1192,  213,  212,  295,  275, 1177,  291,  341,  256,  974,
- /*   680 */   278,  251,  250,  249,  248,  247,  154,  343,  270,  833,
- /*   690 */   836, 1164, 1164,  833,  836, 1192, 1164, 1247,  152,  200,
- /*   700 */  1178, 1181,  341,   87,   86,   85,   84,   83,   82,   81,
- /*   710 */    80,   79,  343, 1177,  908,  142, 1164,  243,  141,  307,
- /*   720 */   326, 1193,  969,  970,  201, 1178, 1181,  166,  868,  883,
- /*   730 */   321, 1177,  337, 1192,    2,  331,  850,  825,  839, 1278,
- /*   740 */   341,   32, 1142,  172,  119,  253, 1177,  349,   32,   32,
- /*   750 */   343, 1192,  117,  177, 1164,  170, 1276, 1177,  341,   95,
- /*   760 */   254,  255,  107, 1178, 1181,   96, 1192,  748,  343,  246,
- /*   770 */   847,  259, 1164,  341,  743,  227,  776, 1192,  124,   98,
- /*   780 */   201, 1178, 1181,  343,  341,  260,   78, 1164,  361, 1177,
- /*   790 */   231,  780, 1177,  261,  343,  201, 1178, 1181, 1164,  846,
- /*   800 */  1292,  786,  785,   96,  265,  262,  199, 1178, 1181, 1192,
- /*   810 */    22,   41, 1192,   97,   98,   99,  341, 1177,  129,  341,
- /*   820 */    31,   29,   27,   26,   25,  845,  343,   96, 1177,  343,
- /*   830 */  1164,  272,  274, 1164, 1068,  133, 1064, 1192,  202, 1178,
- /*   840 */  1181,  193, 1178, 1181,  341,  135,  100,  101, 1192,   67,
- /*   850 */  1066,  219,  145, 1062,  343,  341, 1177,  102, 1164,  103,
- /*   860 */   304, 1177,  303,  301,  844,  343,  203, 1178, 1181, 1164,
- /*   870 */   312, 1248, 1177, 1258,  836,  309, 1192,  194, 1178, 1181,
- /*   880 */   347, 1192,  150,  341, 1257,    5,  153,  222,  341,  322,
- /*   890 */   908,   91, 1192,  343, 1238,  156,  308, 1164,  343,  341,
- /*   900 */  1177,    4, 1164,  843, 1232,  204, 1178, 1181,  110,  343,
- /*   910 */  1189, 1178, 1181, 1164,   33,  224,  338,  159, 1177,  335,
- /*   920 */  1192, 1188, 1178, 1181,  158,   17,  345,  341, 1199, 1151,
- /*   930 */  1293,  346,  350, 1177, 1275,  165, 1150,  343, 1192,  232,
- /*   940 */   351, 1164,  174,  352, 1177,  341,  184,   50,   52, 1187,
- /*   950 */  1178, 1181, 1079, 1192,  186,  343,  181,  359,  419, 1164,
- /*   960 */   341,  196,  188,  197, 1192,  189, 1158,  210, 1178, 1181,
- /*   970 */   343,  341,  290,  808, 1164, 1135, 1177, 1134,   94, 1177,
- /*   980 */  1133,  343,  209, 1178, 1181, 1164, 1132,  298, 1131, 1130,
- /*   990 */  1129, 1128,  810,  211, 1178, 1181, 1192, 1020, 1127, 1192,
- /*  1000 */  1126,  144, 1125,  341,  293, 1124,  341, 1019, 1157,  287,
- /*  1010 */  1148, 1057,  143,  343,  126,  694,  343, 1164, 1018, 1016,
- /*  1020 */  1164,  266,  268,  267, 1005,  208, 1178, 1181,  198, 1178,
- /*  1030 */  1181, 1004, 1001, 1059,   66,  132,  789,   38, 1058,  791,
- /*  1040 */    37,   31,   29,   27,   26,   25,  285,  790,  280, 1014,
- /*  1050 */   723,  284,  216,  722,  283,  721,  281, 1009,  720,  282,
- /*  1060 */   719,  718,  217, 1007,  289,  218,  292, 1000,  294,  999,
- /*  1070 */   296,   64, 1156, 1155,   36, 1147,   44,  147,  148,    3,
- /*  1080 */    14,   15,   32,  316,  151,   34,   39,  933,   11,   47,
- /*  1090 */     8,  108,  348, 1146,  955,  869,  155,  954,  927,  225,
- /*  1100 */   853,  176,  959,  958,  226,   45,  973,  926,  973,  973,
- /*  1110 */   973,   46,  973,  175,  973,  905,  973,  973,  904,  973,
- /*  1120 */   317, 1169,  973,  973,  960,   19,  973,  360,  237,  973,
- /*  1130 */   364,  851,  161,  169,  754,   35,  116,  367,   16,  931,
- /*  1140 */   168,   13,  370,  373,   18,  973,  171,  173,   48,   49,
- /*  1150 */   782, 1015, 1003,   40, 1002,  714,  706,  777,  774,  784,
- /*  1160 */    53,  362,  973, 1168,  179,  358,  365,  783,  771,  765,
- /*  1170 */   368,  371,  388,  763,  692,  713,  374,  712,  711,  710,
- /*  1180 */   709,  708,  707,  705,  410,  704,   54,  703,  702,   55,
- /*  1190 */   769,  768,   56,  998,  701,  700,  699,  698,  380,  767,
- /*  1200 */   715,  417,  697,  409,  766,  411,  413,  414,  418,  973,
- /*  1210 */   834,  187,  421,  973,  422,
+ /*     0 */  1042, 1201,  221,   43,   24,  167,  359, 1197, 1203, 1092,
+ /*    10 */   246,  265,   89,   31,   29,   27,   26,   25,   20, 1201,
+ /*    20 */  1098,   27,   26,   25, 1081, 1197, 1202, 1103,   31,   29,
+ /*    30 */    27,   26,   25,  358,  997,   78,  205,  866,   77,   76,
+ /*    40 */    75,   74,   73,   72,   71,   70,   69, 1088,  207,  411,
+ /*    50 */   410,  409,  408,  407,  406,  405,  404,  403,  402,  401,
+ /*    60 */   400,  399,  398,  397,  396,  395,  394,  393, 1000,  105,
+ /*    70 */   266, 1011,  878,   31,   29,   27,   26,   25, 1228,  131,
+ /*    80 */   901,  346,  111,  245,  233,  343, 1213, 1177,  271,   78,
+ /*    90 */   130,   22,   77,   76,   75,   74,   73,   72,   71,   70,
+ /*   100 */    69,   31,   29,   27,   26,   25, 1228, 1314,  207,  287,
+ /*   110 */   316,  282,  266,  343,  286,   44,  902,  285,  128,  283,
+ /*   120 */   117,  342,  284,  345, 1312,   23,  228, 1189,  896,  897,
+ /*   130 */   898,  899,  900,  904,  905,  906, 1079,  200, 1214, 1217,
+ /*   140 */   901,  769,  382,  381,  380,  773,  379,  775,  776,  378,
+ /*   150 */   778,  375,  109,  784,  372,  786,  787,  369,  366, 1148,
+ /*   160 */  1213,  846,  127, 1141,  301,  220,  125,   43,  323,  185,
+ /*   170 */  1146,  358, 1133,   30,   28,  938,  902,  844,  254,  238,
+ /*   180 */  1228,  230,  392,  846, 1099,   23,  228,  343,  896,  897,
+ /*   190 */   898,  899,  900,  904,  905,  906, 1201,  345,  358,  844,
+ /*   200 */   893, 1189, 1197, 1202,  302,  359,  331,  845,   12,  118,
+ /*   210 */    66,   61, 1214, 1217, 1253, 1213,  962,  275,  206, 1249,
+ /*   220 */  1165,   10,  122,  121,   30,   28, 1103,  120, 1314,  845,
+ /*   230 */  1314,    1,  230,  423,  846, 1228,  312,  960,  961,  963,
+ /*   240 */   964,  117,  330,  117, 1213, 1312,  241, 1312,   10,  321,
+ /*   250 */   844,  334,  345, 1168, 1170,  423, 1189,  346,  696,   12,
+ /*   260 */   695,  847,  850, 1178, 1228,  359,   62, 1214, 1217, 1253,
+ /*   270 */    66,  330,  279,  223, 1249,  112,  278,  281,  697,  327,
+ /*   280 */   845,  345,    1,  847,  850, 1189, 1103,  163,  118,    9,
+ /*   290 */     8,   59, 1213,  308, 1280,   62, 1214, 1217, 1253,  280,
+ /*   300 */    92,   93,  223, 1249,  112, 1314,  423,  327, 1095,  106,
+ /*   310 */  1070,  903, 1228,   31,   29,   27,   26,   25, 1313,  343,
+ /*   320 */    21, 1213, 1312, 1281,  392, 1267,   90,  868,   92,  345,
+ /*   330 */   907,  419,  418, 1189,  847,  850,  114, 1260, 1261,  867,
+ /*   340 */  1265, 1228, 1264,   62, 1214, 1217, 1253,  331,  343,  118,
+ /*   350 */   223, 1249, 1326,  695,   90, 1094, 1213,  864,  345,  914,
+ /*   360 */  1228, 1287, 1189,  865,  160, 1260,  326,  343,  325,  273,
+ /*   370 */   234, 1314,   62, 1214, 1217, 1253, 1228,  359,  104,  223,
+ /*   380 */  1249, 1326, 1100,  343,  117, 1213, 1105,  385, 1312, 1022,
+ /*   390 */  1310, 1090,  320,  345,   30,   28, 1189, 1189, 1103, 1021,
+ /*   400 */  1267,  333,  230,  104,  846, 1228, 1080,   62, 1214, 1217,
+ /*   410 */  1253, 1106,  343, 1148,  223, 1249, 1326, 1263,  359,  235,
+ /*   420 */   844, 1148,  345,  356, 1146, 1271, 1189,  242,  162,   12,
+ /*   430 */  1189,  331, 1146,   30,   28, 1012,  195, 1214, 1217, 1103,
+ /*   440 */  1189,  230, 1213,  846,  190, 1020, 1019, 1018,  136,  192,
+ /*   450 */   845,  134,    1, 1038,  315, 1314,   30,   28,  344,  844,
+ /*   460 */     6,  191, 1228,  389,  230, 1213,  846,  388,  117,  343,
+ /*   470 */  1017,  123, 1312, 1148,  118,  288,  423,  322,  317,  345,
+ /*   480 */  1016, 1015,  844, 1189, 1169, 1228, 1189, 1189, 1189,  845,
+ /*   490 */   390,    7,  343,   63, 1214, 1217, 1253, 1148,  869, 1086,
+ /*   500 */  1252, 1249,  345, 1045,  847,  850, 1189,  945, 1147,  387,
+ /*   510 */   386, 1189,  845,  866,    7,  423,   63, 1214, 1217, 1253,
+ /*   520 */   240, 1189, 1189,  341, 1249,   30,   28,  299,  104,   30,
+ /*   530 */    28,   64,  384,  230,  338,  846, 1105,  230,  423,  846,
+ /*   540 */   297, 1213, 1267,  847,  850,  999,   31,   29,   27,   26,
+ /*   550 */    25,  844,  287,  933,  282,  844, 1014,  286,  118, 1262,
+ /*   560 */   285, 1228,  283,  118, 1213,  284,  847,  850,  343,   87,
+ /*   570 */    86,   85,   84,   83,   82,   81,   80,   79,  345,  864,
+ /*   580 */  1033,  845, 1189,    7, 1228,  845,  247,    1, 1071,  259,
+ /*   590 */  1013,  343,  107, 1214, 1217,  937,  426, 1189,  260,  149,
+ /*   600 */  1213,  345,  290,  164,  359, 1189,  243,  423,  339,  357,
+ /*   610 */   183,  423,  304,   88,  104,   63, 1214, 1217, 1253,  415,
+ /*   620 */  1228,  182, 1105, 1250,   98, 1103, 1010,  343,  313,  332,
+ /*   630 */  1327, 1189, 1031, 1009, 1008,  847,  850,  345,  359,  847,
+ /*   640 */   850, 1189, 1142,  180,  229,  359,   60, 1007, 1006,  178,
+ /*   650 */   244,  201, 1214, 1217,  293, 1005,  157, 1004, 1213, 1103,
+ /*   660 */  1272,  933, 1229, 1213,  272,  258, 1103, 1189,  253,  252,
+ /*   670 */   251,  250,  249,  335, 1189, 1189, 1003,  853, 1228,  138,
+ /*   680 */   355, 1213,  137, 1228,  140,  343, 1213,  139, 1189, 1189,
+ /*   690 */   343,  852,  991,  992,  307,  345, 1189,  146, 1189, 1189,
+ /*   700 */   345, 1228,  309,  327, 1189,  328, 1228,  856,  343,  201,
+ /*   710 */  1214, 1217, 1002,  343,  107, 1214, 1217, 1189,  345,    9,
+ /*   720 */     8,  855, 1189,  345,   92,  227,  864, 1189, 1213,  936,
+ /*   730 */   231, 1213,  201, 1214, 1217, 1283, 1213,  201, 1214, 1217,
+ /*   740 */    31,   29,   27,   26,   25,  336,  327, 1167, 1228,   52,
+ /*   750 */    90, 1228, 1328, 1189,  166,  343, 1228, 1078,  343,  329,
+ /*   760 */   113, 1260, 1261,  343, 1265,  345, 1096,   92,  345, 1189,
+ /*   770 */     2,  119, 1189,  345, 1213,  142,  256, 1189,  141,  199,
+ /*   780 */  1214, 1217,  202, 1214, 1217,  959,  154,  193, 1214, 1217,
+ /*   790 */   248,  255,  257,   90, 1228,  261, 1213,   41,  152,  878,
+ /*   800 */   908,  343, 1213,  115, 1260, 1261,  872, 1265,  994,  995,
+ /*   810 */   262,  345,   32,  263,  389, 1189, 1228,  124,  388,  871,
+ /*   820 */   875,   58, 1228,  343,   42,  203, 1214, 1217, 1207,  343,
+ /*   830 */  1213,   54,   32,  345,  839,  264, 1213, 1189,  267,  345,
+ /*   840 */  1205,  390,  129, 1189,  274,  870,   32,  194, 1214, 1217,
+ /*   850 */  1228,  276,   68,  204, 1214, 1217, 1228,  343,  172, 1093,
+ /*   860 */   387,  386,  219,  343, 1213,  133,  351,  345,  177, 1089,
+ /*   870 */   170, 1189,  135,  345,  762,  100,  101, 1189,   95, 1091,
+ /*   880 */    96, 1225, 1214, 1217, 1228, 1087,   98, 1224, 1214, 1217,
+ /*   890 */   757,  343, 1213,  102,  790,  794,  103,  800, 1213,  799,
+ /*   900 */   306,  345,   41,  303,  145, 1189,  364,   96,   99,   97,
+ /*   910 */   305,   98, 1228,  869,  314, 1223, 1214, 1217, 1228,  343,
+ /*   920 */    96, 1284,  349, 1294,  150,  343,  311,  850, 1293,  345,
+ /*   930 */   153,  222, 1213, 1189,    5,  345,  324,  110, 1274, 1189,
+ /*   940 */  1213,  310,  156,  210, 1214, 1217,  237,  236,    4,  209,
+ /*   950 */  1214, 1217, 1228,  933,   91,  868,  858, 1268,   33,  343,
+ /*   960 */  1228,  159,  158,  340, 1311,  224, 1329,  343, 1213,  345,
+ /*   970 */   337,  165,  851, 1189,  292,  214,   17,  345, 1235, 1176,
+ /*   980 */   347, 1189,  348,  211, 1214, 1217,  352, 1175, 1228,  300,
+ /*   990 */   232,  208, 1214, 1217,  353,  343,  354,  279,   51,  174,
+ /*  1000 */   184,  278,  854,  144, 1104,  345,  295,   53,  186, 1189,
+ /*  1010 */   362,  289,  181,  215,  143,  213,  212,  422,  277,  198,
+ /*  1020 */  1214, 1217,  196,  197,  280,  188,  189, 1183,  360,  822,
+ /*  1030 */  1160, 1159,   94, 1158, 1157, 1156, 1155, 1154, 1153,   40,
+ /*  1040 */   824, 1152,   39, 1151, 1150, 1149, 1044, 1182, 1173,  126,
+ /*  1050 */  1082,  708, 1043, 1041,  268,  269,  859,  850,  270, 1030,
+ /*  1060 */  1029, 1026, 1084,   67,  132, 1083,  805,  804, 1039, 1034,
+ /*  1070 */   737,  803, 1032, 1025, 1024, 1181,   65,  736,  735,  216,
+ /*  1080 */   734, 1180,   36, 1172,   45,  217,  218,  148,  296,  733,
+ /*  1090 */     3,   32,  732,  298,  291,   14,  294,  151,   15,   34,
+ /*  1100 */    37,   11,   48,  319, 1205,    8,   19,  161,  894,  350,
+ /*  1110 */   147,  176,  998,  998,  998,  998,  998,  318, 1171,  998,
+ /*  1120 */   783,  998,  998,  998,  998,  998,  998,  998,  998,  980,
+ /*  1130 */   979,  225,  984,  983,  226,  998,  998,  998,  998,  998,
+ /*  1140 */   998,  958,  998,  175,  998,  998,  108,  155,  998,  952,
+ /*  1150 */    46,  998,  860,  951,   47,  768,  930,  929,  998,  985,
+ /*  1160 */   998,  998,  998,  998,  998,  998,  998,  998,  998,   13,
+ /*  1170 */    35,  116,  876,   16,   18,  998,  169,  956,  171,  168,
+ /*  1180 */    49,  173,   50,  998, 1204,  363,  239,   54,  367,   38,
+ /*  1190 */  1040,  179,  370,  373,  998,  998,  998,  998,  376,  998,
+ /*  1200 */   998,  796,  998,  791,  365,  998,  788,  728,  720,  998,
+ /*  1210 */   420,  848,  361,  785,  368,  798,  797,  782,  998,  998,
+ /*  1220 */   727,  371,  998,  998,  779,  726,   55,  374,  706,  777,
+ /*  1230 */   391,  725,  724, 1028,  414, 1027, 1023,  723,  413,  998,
+ /*  1240 */   377,  998,  722,  721,   56,   57,  719,  718,  187,  729,
+ /*  1250 */   421,  717,  716,  715,  714,  713,  712,  383,  424,  711,
+ /*  1260 */   412,  425,  998,  416,  417,  998,  998,  781,  780,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */     0,  172,  172,  165,  186,  167,  177,  177,  234,  185,
- /*    10 */   174,  193,  187,   12,   13,   14,   15,   16,    2,  183,
- /*    20 */   196,  247,  193,  193,   20,  251,  172,  191,   12,   13,
- /*    30 */    14,   15,   16,  187,  216,   21,    4,   20,   24,   25,
- /*    40 */    26,   27,   28,   29,   30,   31,   32,  193,   47,   49,
+ /*     0 */     0,  207,  190,  174,  221,  222,  172,  213,  214,  187,
+ /*    10 */   172,  177,  183,   12,   13,   14,   15,   16,    2,  207,
+ /*    20 */   191,   14,   15,   16,    0,  213,  214,  193,   12,   13,
+ /*    30 */    14,   15,   16,   20,  163,   21,  198,   20,   24,   25,
+ /*    40 */    26,   27,   28,   29,   30,   31,   32,  187,   47,   49,
  /*    50 */    50,   51,   52,   53,   54,   55,   56,   57,   58,   59,
- /*    60 */    60,   61,   62,   63,   64,   65,   66,   67,    0,  219,
- /*    70 */   220,  217,   71,   12,   13,   14,   15,   16,   71,   20,
- /*    80 */    79,  227,  228,  229,  186,  231,   20,   70,   46,   21,
- /*    90 */    83,  193,   24,   25,   26,   27,   28,   29,   30,   31,
- /*   100 */    32,  172,   12,   13,   14,   15,   16,   49,   47,   51,
- /*   110 */   175,  176,   54,  186,  216,   57,  115,   59,  172,  192,
- /*   120 */    62,  169,  170,  177,  197,  124,  125,  198,  127,  128,
- /*   130 */   129,  130,  131,  132,  133,  134,   70,  135,  136,  193,
+ /*    60 */    60,   61,   62,   63,   64,   65,   66,   67,    0,  165,
+ /*    70 */    46,  167,   71,   12,   13,   14,   15,   16,  186,   33,
+ /*    80 */    79,  203,   36,  212,  206,  193,  166,  209,   42,   21,
+ /*    90 */    44,    2,   24,   25,   26,   27,   28,   29,   30,   31,
+ /*   100 */    32,   12,   13,   14,   15,   16,  186,  236,   47,   49,
+ /*   110 */   218,   51,   46,  193,   54,   69,  115,   57,   72,   59,
+ /*   120 */   249,   47,   62,  203,  253,  124,  125,  207,  127,  128,
+ /*   130 */   129,  130,  131,  132,  133,  134,    0,  217,  218,  219,
  /*   140 */    79,   85,   86,   87,   88,   89,   90,   91,   92,   93,
- /*   150 */    94,   95,   19,   97,   98,   99,  100,  101,  102,  186,
- /*   160 */   166,   12,   13,   14,   15,   16,   33,  194,   22,   36,
- /*   170 */   138,  195,   70,   12,   13,   42,  115,   44,  202,  203,
- /*   180 */   186,   20,   80,   22,   38,  124,  125,  193,  127,  128,
- /*   190 */   129,  130,  131,  132,  133,  134,  137,  203,   20,   38,
- /*   200 */    57,  207,   69,  137,   61,   72,  212,   70,   47,  215,
- /*   210 */   216,  217,  218,   63,   68,  166,  222,  223,  203,   82,
- /*   220 */    18,  206,  178,   33,  209,   23,   36,   84,  234,   68,
- /*   230 */   186,   70,   42,   20,   44,  186,  103,   35,  194,  172,
- /*   240 */    94,  247,  193,  179,  177,  251,  182,   45,  158,  159,
- /*   250 */   117,  184,  203,  120,  119,   94,  207,  107,  108,   69,
- /*   260 */   193,  137,   72,  166,  215,  216,  217,  218,  122,  123,
- /*   270 */   166,  222,  223,  224,  178,  166,  166,  142,  143,   12,
- /*   280 */    13,   14,  186,  122,  123,  236,  171,   20,   46,   22,
- /*   290 */   194,  242,  243,  166,  190,  186,  181,  166,  137,  121,
- /*   300 */   190,    0,  193,  188,  207,   38,  116,  105,  172,  115,
- /*   310 */   120,  207,  203,  186,   47,   20,  207,  207,  124,  174,
- /*   320 */   193,  166,    0,  171,  215,  216,  217,  218,  134,  193,
- /*   330 */   203,  222,  223,  224,  207,   68,  191,   70,  207,  137,
- /*   340 */   188,  186,  215,  216,  217,  218,   83,   46,  193,  222,
- /*   350 */   223,  224,  243,  217,  166,   20,   74,   22,  203,   77,
- /*   360 */   233,   94,  207,  227,  228,  229,  166,  231,   46,  213,
- /*   370 */   215,  216,  217,  218,  186,   40,  126,  222,  223,  224,
- /*   380 */    20,  193,  166,  186,   20,  178,  230,  172,  233,  122,
- /*   390 */   123,  203,  177,  186,  197,  207,  146,  147,  148,  149,
- /*   400 */   150,  194,  186,  215,  216,  217,  218,  207,  193,  193,
- /*   410 */   222,  223,  224,  172,    1,    2,   12,   13,  155,  203,
- /*   420 */   166,  233,   81,  207,   20,    0,   22,  213,  212,   12,
- /*   430 */    13,  215,  216,  217,    0,  186,  166,   20,  172,   22,
- /*   440 */   186,  192,   38,  177,  230,  172,  197,  193,   20,  187,
- /*   450 */   234,   47,   14,  212,  186,   38,  166,  203,   20,  193,
- /*   460 */   192,  207,  187,  247,  210,  197,  193,  251,  172,  215,
- /*   470 */   216,  217,   68,  177,   70,  234,  186,  207,  166,  166,
- /*   480 */   184,  187,   57,  193,   71,   68,   61,   70,  247,  193,
- /*   490 */   217,   57,  251,  203,  166,   61,  167,  207,   94,  226,
- /*   500 */   227,  228,  229,  193,  231,  215,  216,  217,  218,   84,
- /*   510 */   200,   94,  222,  223,  186,  172,  213,  245,   84,  207,
- /*   520 */   207,  193,   14,   15,   16,  176,  122,  123,  103,  104,
- /*   530 */   186,  203,  166,  230,  166,  207,  193,  103,  104,  122,
- /*   540 */   123,  197,  203,  215,  216,  217,  218,  172,  209,  121,
- /*   550 */   222,  223,  177,  254,  137,  212,   12,   13,   14,  166,
- /*   560 */   217,    1,    2,  166,   20,  166,   22,  166,  193,  166,
- /*   570 */   227,  228,  229,  207,  231,  207,  166,  234,  166,   12,
- /*   580 */    13,   22,   38,   12,   13,    3,  196,   20,  166,   22,
- /*   590 */   247,   20,   20,   22,  251,  166,  186,   38,    0,   27,
- /*   600 */   207,  166,   30,  193,  207,   38,  207,  166,  207,   38,
- /*   610 */   207,   39,   68,  203,   70,  186,   71,  207,  166,  207,
- /*   620 */    22,   43,  193,  166,  239,  215,  216,  217,   83,  207,
- /*   630 */    74,   35,  203,   77,    0,   68,  207,   70,   94,   68,
- /*   640 */    74,   70,  207,   77,  215,  216,  217,  218,  207,   47,
- /*   650 */   166,  166,  223,   57,    0,  166,   22,   61,   83,  207,
- /*   660 */    21,   94,  252,  253,  207,   94,  122,  123,  163,   73,
- /*   670 */   186,   75,   76,   34,   78,  166,   22,  193,  106,    0,
- /*   680 */    84,  109,  110,  111,  112,  113,   71,  203,  169,  122,
- /*   690 */   123,  207,  207,  122,  123,  186,  207,  214,   83,  215,
- /*   700 */   216,  217,  193,   24,   25,   26,   27,   28,   29,   30,
- /*   710 */    31,   32,  203,  166,  136,   74,  207,  212,   77,  210,
- /*   720 */   232,  186,  161,  162,  215,  216,  217,  248,  126,   71,
- /*   730 */   246,  166,  157,  186,  235,  153,   71,   71,   20,  234,
- /*   740 */   193,   83,  172,   71,  114,  199,  166,   71,   83,   83,
- /*   750 */   203,  186,  247,   71,  207,   83,  251,  166,  193,   83,
- /*   760 */   115,  199,  215,  216,  217,   83,  186,   71,  203,  201,
- /*   770 */    20,  172,  207,  193,   71,  210,   71,  186,  174,   83,
- /*   780 */   215,  216,  217,  203,  193,  211,   83,  207,   83,  166,
- /*   790 */   210,   71,  166,  193,  203,  215,  216,  217,  207,   20,
- /*   800 */   253,   71,   71,   83,  172,  204,  215,  216,  217,  186,
- /*   810 */     2,  174,  186,   83,   83,   71,  193,  166,  174,  193,
- /*   820 */    12,   13,   14,   15,   16,   20,  203,   83,  166,  203,
- /*   830 */   207,  168,  186,  207,  186,  186,  186,  186,  215,  216,
- /*   840 */   217,  215,  216,  217,  193,  186,  186,  186,  186,  172,
- /*   850 */   186,  168,  171,  186,  203,  193,  166,  186,  207,  186,
- /*   860 */   204,  166,  193,  211,   20,  203,  215,  216,  217,  207,
- /*   870 */   145,  214,  166,  244,  123,  207,  186,  215,  216,  217,
- /*   880 */   144,  186,  208,  193,  244,  152,  208,  207,  193,  151,
- /*   890 */   136,  193,  186,  203,  241,  240,  140,  207,  203,  193,
- /*   900 */   166,  139,  207,   20,  213,  215,  216,  217,  238,  203,
- /*   910 */   215,  216,  217,  207,  114,  160,  156,  225,  166,  154,
- /*   920 */   186,  215,  216,  217,  237,   70,  207,  193,  221,  208,
- /*   930 */   255,  207,  118,  166,  250,  249,  208,  203,  186,  207,
- /*   940 */   205,  207,  193,  204,  166,  193,  182,  171,   70,  215,
- /*   950 */   216,  217,  193,  186,  172,  203,  171,  189,  168,  207,
- /*   960 */   193,  180,  173,  180,  186,  164,    0,  215,  216,  217,
- /*   970 */   203,  193,    4,   82,  207,    0,  166,    0,  114,  166,
- /*   980 */     0,  203,  215,  216,  217,  207,    0,   19,    0,    0,
- /*   990 */     0,    0,   22,  215,  216,  217,  186,    0,    0,  186,
- /*  1000 */     0,   33,    0,  193,   36,    0,  193,    0,    0,   41,
- /*  1010 */     0,    0,   44,  203,   43,   48,  203,  207,    0,    0,
- /*  1020 */   207,   38,   43,   36,    0,  215,  216,  217,  215,  216,
- /*  1030 */   217,    0,    0,    0,   79,   77,   22,   69,    0,   38,
- /*  1040 */    72,   12,   13,   14,   15,   16,   49,   38,   51,    0,
- /*  1050 */    38,   54,   22,   38,   57,   38,   59,    0,   38,   62,
- /*  1060 */    38,   38,   22,    0,   39,   22,   38,    0,   22,    0,
- /*  1070 */    22,   20,    0,    0,  121,    0,   70,   43,  116,   83,
- /*  1080 */   141,  141,   83,   38,   71,  135,   83,   71,  141,    4,
- /*  1090 */     2,   70,  119,    0,   38,  126,   70,   38,   71,   38,
- /*  1100 */    71,  116,   38,   38,   38,   70,  256,   71,  256,  256,
- /*  1110 */   256,   70,  256,   43,  256,   71,  256,  256,   71,  256,
- /*  1120 */    83,   82,  256,  256,   71,   83,  256,   38,   38,  256,
- /*  1130 */    38,   71,   82,   71,   22,   83,   82,   38,   83,   71,
- /*  1140 */    82,   70,   38,   38,   70,  256,   70,   70,   70,   70,
- /*  1150 */    22,    0,    0,   70,    0,   22,   22,   71,   71,   38,
- /*  1160 */    80,   70,  256,   82,   82,   81,   70,   38,   71,   71,
- /*  1170 */    70,   70,   47,   71,   48,   38,   70,   38,   38,   38,
- /*  1180 */    38,   38,   38,   38,   36,   38,   70,   38,   38,   70,
- /*  1190 */    96,   96,   70,    0,   38,   38,   38,   38,   84,   96,
- /*  1200 */    68,   22,   38,   38,   96,   43,   38,   37,   21,  256,
- /*  1210 */    22,   22,   21,  256,   20,  256,  256,  256,  256,  256,
- /*  1220 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1230 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1240 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1250 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1260 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1270 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1280 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1290 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1300 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1310 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1320 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1330 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1340 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1350 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1360 */   256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
- /*  1370 */   256,  256,  256,  256,  256,  256,  256,  256,
+ /*   150 */    94,   95,  185,   97,   98,   99,  100,  101,  102,  186,
+ /*   160 */   166,   22,  116,  196,  172,  192,  120,  174,  248,  179,
+ /*   170 */   197,   20,  182,   12,   13,   14,  115,   38,   63,  190,
+ /*   180 */   186,   20,   46,   22,  191,  124,  125,  193,  127,  128,
+ /*   190 */   129,  130,  131,  132,  133,  134,  207,  203,   20,   38,
+ /*   200 */   126,  207,  213,  214,  212,  172,  212,   68,   47,  137,
+ /*   210 */   177,  217,  218,  219,  220,  166,  126,  184,  224,  225,
+ /*   220 */   193,   70,  107,  108,   12,   13,  193,  200,  236,   68,
+ /*   230 */   236,   70,   20,   94,   22,  186,  146,  147,  148,  149,
+ /*   240 */   150,  249,  193,  249,  166,  253,  195,  253,   70,   20,
+ /*   250 */    38,    3,  203,  202,  203,   94,  207,  203,   20,   47,
+ /*   260 */    22,  122,  123,  209,  186,  172,  217,  218,  219,  220,
+ /*   270 */   177,  193,   57,  224,  225,  226,   61,  184,   40,  172,
+ /*   280 */    68,  203,   70,  122,  123,  207,  193,  238,  137,    1,
+ /*   290 */     2,  171,  166,  244,  245,  217,  218,  219,  220,   84,
+ /*   300 */   193,  181,  224,  225,  226,  236,   94,  172,  188,  175,
+ /*   310 */   176,  115,  186,   12,   13,   14,   15,   16,  249,  193,
+ /*   320 */   124,  166,  253,  245,   46,  215,  219,   20,  193,  203,
+ /*   330 */   134,  169,  170,  207,  122,  123,  229,  230,  231,   20,
+ /*   340 */   233,  186,  232,  217,  218,  219,  220,  212,  193,  137,
+ /*   350 */   224,  225,  226,   22,  219,  166,  166,   20,  203,   71,
+ /*   360 */   186,  235,  207,   20,  229,  230,  231,  193,  233,   38,
+ /*   370 */   178,  236,  217,  218,  219,  220,  186,  172,  186,  224,
+ /*   380 */   225,  226,  177,  193,  249,  166,  194,   81,  253,  166,
+ /*   390 */   235,  187,  218,  203,   12,   13,  207,  207,  193,  166,
+ /*   400 */   215,  153,   20,  186,   22,  186,    0,  217,  218,  219,
+ /*   410 */   220,  194,  193,  186,  224,  225,  226,  232,  172,  192,
+ /*   420 */    38,  186,  203,  177,  197,  235,  207,  192,  121,   47,
+ /*   430 */   207,  212,  197,   12,   13,  167,  217,  218,  219,  193,
+ /*   440 */   207,   20,  166,   22,   18,  166,  166,  166,   74,   23,
+ /*   450 */    68,   77,   70,    0,  119,  236,   12,   13,   14,   38,
+ /*   460 */    43,   35,  186,   57,   20,  166,   22,   61,  249,  193,
+ /*   470 */   166,   45,  253,  186,  137,   22,   94,  142,  143,  203,
+ /*   480 */   166,  166,   38,  207,  197,  186,  207,  207,  207,   68,
+ /*   490 */    84,   70,  193,  217,  218,  219,  220,  186,   20,  187,
+ /*   500 */   224,  225,  203,    0,  122,  123,  207,   14,  197,  103,
+ /*   510 */   104,  207,   68,   20,   70,   94,  217,  218,  219,  220,
+ /*   520 */   178,  207,  207,  224,  225,   12,   13,   21,  186,   12,
+ /*   530 */    13,  105,  187,   20,   83,   22,  194,   20,   94,   22,
+ /*   540 */    34,  166,  215,  122,  123,    0,   12,   13,   14,   15,
+ /*   550 */    16,   38,   49,  136,   51,   38,  166,   54,  137,  232,
+ /*   560 */    57,  186,   59,  137,  166,   62,  122,  123,  193,   24,
+ /*   570 */    25,   26,   27,   28,   29,   30,   31,   32,  203,   20,
+ /*   580 */     0,   68,  207,   70,  186,   68,   27,   70,  176,   30,
+ /*   590 */   166,  193,  217,  218,  219,    4,   19,  207,   39,  121,
+ /*   600 */   166,  203,   22,  256,  172,  207,  178,   94,  157,  177,
+ /*   610 */    33,   94,   71,   36,  186,  217,  218,  219,  220,   42,
+ /*   620 */   186,   44,  194,  225,   83,  193,  166,  193,  247,  254,
+ /*   630 */   255,  207,    0,  166,  166,  122,  123,  203,  172,  122,
+ /*   640 */   123,  207,  196,  177,  210,  172,   69,  166,  166,   72,
+ /*   650 */   177,  217,  218,  219,   22,  166,  241,  166,  166,  193,
+ /*   660 */   135,  136,  186,  166,  169,  106,  193,  207,  109,  110,
+ /*   670 */   111,  112,  113,   83,  207,  207,  166,   38,  186,   74,
+ /*   680 */   103,  166,   77,  186,   74,  193,  166,   77,  207,  207,
+ /*   690 */   193,   38,  158,  159,  117,  203,  207,  120,  207,  207,
+ /*   700 */   203,  186,  210,  172,  207,  234,  186,   68,  193,  217,
+ /*   710 */   218,  219,  166,  193,  217,  218,  219,  207,  203,    1,
+ /*   720 */     2,   68,  207,  203,  193,  210,   20,  207,  166,  138,
+ /*   730 */   210,  166,  217,  218,  219,  216,  166,  217,  218,  219,
+ /*   740 */    12,   13,   14,   15,   16,  155,  172,  172,  186,  171,
+ /*   750 */   219,  186,  255,  207,  250,  193,  186,    0,  193,  228,
+ /*   760 */   229,  230,  231,  193,  233,  203,  188,  193,  203,  207,
+ /*   770 */   237,  114,  207,  203,  166,   74,  115,  207,   77,  217,
+ /*   780 */   218,  219,  217,  218,  219,   71,   71,  217,  218,  219,
+ /*   790 */   201,  199,  199,  219,  186,  172,  166,   83,   83,   71,
+ /*   800 */    71,  193,  166,  229,  230,  231,   20,  233,  161,  162,
+ /*   810 */   211,  203,   83,  193,   57,  207,  186,  174,   61,   20,
+ /*   820 */    71,   70,  186,  193,  174,  217,  218,  219,   70,  193,
+ /*   830 */   166,   80,   83,  203,   71,  204,  166,  207,  172,  203,
+ /*   840 */    82,   84,  174,  207,  168,   20,   83,  217,  218,  219,
+ /*   850 */   186,  186,  172,  217,  218,  219,  186,  193,   71,  186,
+ /*   860 */   103,  104,  168,  193,  166,  186,   71,  203,   71,  186,
+ /*   870 */    83,  207,  186,  203,   71,  186,  186,  207,   83,  186,
+ /*   880 */    83,  217,  218,  219,  186,  186,   83,  217,  218,  219,
+ /*   890 */    71,  193,  166,  186,   71,   71,  186,   71,  166,   71,
+ /*   900 */   204,  203,   83,  211,  171,  207,   83,   83,   71,   83,
+ /*   910 */   193,   83,  186,   20,  145,  217,  218,  219,  186,  193,
+ /*   920 */    83,  216,  144,  246,  208,  193,  207,  123,  246,  203,
+ /*   930 */   208,  207,  166,  207,  152,  203,  151,  240,  243,  207,
+ /*   940 */   166,  140,  242,  217,  218,  219,   12,   13,  139,  217,
+ /*   950 */   218,  219,  186,  136,  193,   20,   22,  215,  114,  193,
+ /*   960 */   186,  227,  239,  156,  252,  160,  257,  193,  166,  203,
+ /*   970 */   154,  251,   38,  207,    4,   35,   70,  203,  223,  208,
+ /*   980 */   207,  207,  207,  217,  218,  219,  118,  208,  186,   19,
+ /*   990 */   207,  217,  218,  219,  205,  193,  204,   57,  171,  193,
+ /*  1000 */   182,   61,   68,   33,  193,  203,   36,   70,  172,  207,
+ /*  1010 */   189,   41,  171,   73,   44,   75,   76,  168,   78,  217,
+ /*  1020 */   218,  219,  180,  180,   84,  173,  164,    0,   94,   82,
+ /*  1030 */     0,    0,  114,    0,    0,    0,    0,    0,    0,   69,
+ /*  1040 */    22,    0,   72,    0,    0,    0,    0,    0,    0,   43,
+ /*  1050 */     0,   48,    0,    0,   38,   36,  122,  123,   43,    0,
+ /*  1060 */     0,    0,    0,   79,   77,    0,   38,   38,    0,    0,
+ /*  1070 */    38,   22,    0,    0,    0,    0,   20,   38,   38,   22,
+ /*  1080 */    38,    0,  121,    0,   70,   22,   22,  116,   22,   38,
+ /*  1090 */    83,   83,   38,   22,   39,  141,   38,   71,  141,  135,
+ /*  1100 */    83,  141,    4,   83,   82,    2,   83,   82,  126,  119,
+ /*  1110 */    43,  116,  258,  258,  258,  258,  258,   38,    0,  258,
+ /*  1120 */    96,  258,  258,  258,  258,  258,  258,  258,  258,   38,
+ /*  1130 */    38,   38,   38,   38,   38,  258,  258,  258,  258,  258,
+ /*  1140 */   258,   71,  258,   43,  258,  258,   70,   70,  258,   71,
+ /*  1150 */    70,  258,   22,   71,   70,   22,   71,   71,  258,   71,
+ /*  1160 */   258,  258,  258,  258,  258,  258,  258,  258,  258,   70,
+ /*  1170 */    83,   82,   71,   83,   70,  258,   71,   71,   70,   82,
+ /*  1180 */    70,   70,   70,  258,   82,   38,   38,   80,   38,   70,
+ /*  1190 */     0,   82,   38,   38,  258,  258,  258,  258,   38,  258,
+ /*  1200 */   258,   22,  258,   71,   70,  258,   71,   22,   22,  258,
+ /*  1210 */    22,   22,   81,   71,   70,   38,   38,   96,  258,  258,
+ /*  1220 */    38,   70,  258,  258,   71,   38,   70,   70,   48,   71,
+ /*  1230 */    47,   38,   38,    0,   43,    0,    0,   38,   36,  258,
+ /*  1240 */    70,  258,   38,   38,   70,   70,   38,   38,   22,   68,
+ /*  1250 */    21,   38,   38,   38,   38,   38,   38,   84,   21,   38,
+ /*  1260 */    38,   20,  258,   38,   37,  258,  258,   96,   96,  258,
+ /*  1270 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1280 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1290 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1300 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1310 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1320 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1330 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1340 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1350 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1360 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1370 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1380 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1390 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1400 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1410 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1420 */   258,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+ /*  1430 */   258,  258,
 };
-#define YY_SHIFT_COUNT    (423)
+#define YY_SHIFT_COUNT    (426)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (1194)
+#define YY_SHIFT_MAX      (1241)
 static const unsigned short int yy_shift_ofst[] = {
- /*     0 */   202,  161,  267,  404,  404,  404,  404,  417,  404,  404,
- /*    10 */    66,  567,  571,  544,  567,  567,  567,  567,  567,  567,
- /*    20 */   567,  567,  567,  567,  567,  567,  567,  567,  567,  567,
- /*    30 */   567,  567,  567,   17,   17,   17,   59,    4,    4,  146,
- /*    40 */   146,    4,    4,   42,  213,  295,  295,  124,  360,  213,
- /*    50 */     4,    4,  213,    4,  213,  360,  213,  213,    4,  242,
- /*    60 */     1,   61,   61,  572,   14,  596,  146,   58,  146,  146,
- /*    70 */   146,  146,  146,  146,  146,  146,  146,  146,  146,  146,
- /*    80 */   146,  146,  146,  146,  146,  146,  146,  146,  335,  301,
- /*    90 */   178,  178,  178,  322,  364,  360,  213,  213,  213,  341,
- /*   100 */    56,   56,   56,   56,   56,   68,  997,   90,  250,  143,
- /*   110 */   135,  559,  428,    2,  578,    2,  438,  582,   32,  718,
- /*   120 */   630,  645,  645,  718,  750,   42,  364,  779,   42,  718,
- /*   130 */    42,  805,  213,  213,  213,  213,  213,  213,  213,  213,
- /*   140 */   213,  213,  213,  718,  805,  750,  242,  364,  779,  844,
- /*   150 */   725,  736,  751,  725,  736,  751,  733,  738,  756,  762,
- /*   160 */   754,  364,  883,  800,  755,  760,  765,  855,  213,  736,
- /*   170 */   751,  751,  736,  751,  814,  364,  779,  341,  242,  364,
- /*   180 */   878,  718,  242,  805, 1215, 1215, 1215, 1215,    0,  679,
- /*   190 */   133,  190,  968,   16,  808, 1029,  425,  434,  149,  149,
- /*   200 */   149,  149,  149,  149,  149,  150,  413,  194,  508,  508,
- /*   210 */   508,  508,  282,  556,  566,  641,  598,  634,  654,  639,
- /*   220 */     7,  545,  615,  560,  561,  263,  575,  658,  602,  665,
- /*   230 */   137,  666,  672,  676,  682,  696,  703,  705,  720,  730,
- /*   240 */   731,  744,  102,  966,  891,  975,  977,  864,  980,  986,
- /*   250 */   988,  989,  990,  991,  970,  998, 1000, 1002, 1005, 1007,
- /*   260 */  1008, 1010,  971, 1011,  967, 1018, 1019,  983,  987,  979,
- /*   270 */  1024, 1031, 1032, 1033,  955,  958, 1001, 1009, 1014, 1038,
- /*   280 */  1012, 1015, 1017, 1020, 1022, 1023, 1049, 1030, 1057, 1040,
- /*   290 */  1025, 1063, 1043, 1028, 1067, 1046, 1069, 1048, 1051, 1072,
- /*   300 */  1073,  953, 1075, 1006, 1034,  962,  996,  999,  939, 1013,
- /*   310 */  1003, 1016, 1021, 1026, 1027, 1035, 1036, 1045, 1037, 1039,
- /*   320 */  1041, 1042,  940, 1044, 1047, 1050,  950, 1052, 1054, 1053,
- /*   330 */  1055,  947, 1085, 1056, 1059, 1061, 1064, 1065, 1066, 1088,
- /*   340 */   969, 1058, 1060, 1071, 1074, 1062, 1068, 1076, 1077,  973,
- /*   350 */  1078, 1093, 1070,  985, 1079, 1080, 1081, 1082, 1083, 1084,
- /*   360 */  1086, 1089, 1090, 1091, 1087, 1092, 1096, 1097, 1099, 1100,
- /*   370 */  1098, 1104, 1101, 1102, 1105, 1106, 1094, 1095, 1103, 1108,
- /*   380 */  1112, 1114, 1116, 1119, 1122, 1121, 1129, 1128, 1126, 1125,
- /*   390 */  1132, 1133, 1137, 1139, 1140, 1141, 1142, 1143, 1144, 1134,
- /*   400 */  1145, 1147, 1149, 1150, 1156, 1157, 1158, 1159, 1164, 1151,
- /*   410 */  1165, 1148, 1162, 1152, 1168, 1170, 1154, 1193, 1179, 1187,
- /*   420 */  1188, 1189, 1191, 1194,
+ /*     0 */   426,  212,  161,  382,  382,  382,  382,  421,  382,  382,
+ /*    10 */   151,  513,  517,  444,  513,  513,  513,  513,  513,  513,
+ /*    20 */   513,  513,  513,  513,  513,  513,  513,  513,  513,  513,
+ /*    30 */   513,  513,  513,  178,  178,  178,  337,  934,  934,   13,
+ /*    40 */    13,  934,   13,   13,   66,   17,  229,  229,   72,  319,
+ /*    50 */    17,   13,   13,   17,   13,   17,  319,   17,   17,   13,
+ /*    60 */   278,    1,   61,   61,  559,   14,  940,  139,   60,  139,
+ /*    70 */   139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
+ /*    80 */   139,  139,  139,  139,  139,  139,  139,  139,  238,   24,
+ /*    90 */   307,  307,  307,  136,  343,  319,   17,   17,   17,  306,
+ /*   100 */    56,   56,   56,   56,   56,   68,  503,  534,   90,  215,
+ /*   110 */   335,  331,  478,  525,  417,  525,  493,  248,  591,  706,
+ /*   120 */   657,  661,  661,  706,  786,   66,  343,  799,   66,  706,
+ /*   130 */    66,  825,   17,   17,   17,   17,   17,   17,   17,   17,
+ /*   140 */    17,   17,   17,  706,  825,  786,  278,  343,  799,  893,
+ /*   150 */   769,  778,  804,  769,  778,  804,  782,  785,  801,  809,
+ /*   160 */   817,  343,  935,  844,  805,  807,  816,  906,   17,  778,
+ /*   170 */   804,  804,  778,  804,  868,  343,  799,  306,  278,  343,
+ /*   180 */   937,  706,  278,  825, 1269, 1269, 1269, 1269,    0,  545,
+ /*   190 */   577,   46,  970,   16,   89,  728,  406,  757,  301,  301,
+ /*   200 */   301,  301,  301,  301,  301,  115,  288,  196,    7,    7,
+ /*   210 */     7,    7,  374,  605,  610,  701,  453,  580,  632,  506,
+ /*   220 */   541,  714,  715,  718,  647,  590,  451,  729,   74,  749,
+ /*   230 */   758,  763,  787,  795,  797,  803,  639,  653,  819,  823,
+ /*   240 */   824,  826,  828,  837,  751, 1027,  947, 1030, 1031,  918,
+ /*   250 */  1033, 1034, 1035, 1036, 1037, 1038, 1018, 1041, 1043, 1044,
+ /*   260 */  1045, 1046, 1047, 1048, 1006, 1050, 1003, 1052, 1053, 1016,
+ /*   270 */  1019, 1015, 1059, 1060, 1061, 1062,  984,  987, 1028, 1029,
+ /*   280 */  1049, 1065, 1032, 1039, 1040, 1042, 1051, 1054, 1068, 1057,
+ /*   290 */  1069, 1063, 1055, 1072, 1064, 1058, 1073, 1066, 1074, 1071,
+ /*   300 */  1056, 1075, 1081,  961, 1083, 1014, 1067,  971, 1007, 1008,
+ /*   310 */   954, 1026, 1017, 1070, 1076, 1077, 1078, 1080, 1082, 1079,
+ /*   320 */  1020, 1022, 1084, 1023,  957, 1085, 1086, 1025,  964, 1087,
+ /*   330 */  1089, 1088, 1090,  960, 1098, 1091, 1092, 1093, 1094, 1095,
+ /*   340 */  1096, 1103,  982, 1097, 1101, 1099, 1104, 1105, 1106, 1108,
+ /*   350 */  1111,  990, 1110, 1118, 1100,  995, 1112, 1107, 1102, 1109,
+ /*   360 */  1130, 1119, 1131, 1132, 1147, 1148, 1134, 1135, 1150, 1144,
+ /*   370 */  1142, 1154, 1151, 1153, 1155, 1157, 1158, 1160, 1170, 1024,
+ /*   380 */  1121, 1171, 1172, 1133, 1173, 1156, 1174, 1175, 1177, 1178,
+ /*   390 */  1179, 1180, 1183, 1181, 1185, 1182, 1187, 1193, 1194, 1199,
+ /*   400 */  1204, 1205, 1186, 1208, 1209, 1213, 1214, 1215, 1216, 1217,
+ /*   410 */  1218, 1221, 1190, 1222, 1202, 1191, 1233, 1225, 1227, 1235,
+ /*   420 */  1236, 1188, 1229, 1189, 1226, 1237, 1241,
 };
 #define YY_REDUCE_COUNT (187)
-#define YY_REDUCE_MIN   (-226)
-#define YY_REDUCE_MAX   (813)
+#define YY_REDUCE_MIN   (-217)
+#define YY_REDUCE_MAX   (862)
 static const short yy_reduce_ofst[] = {
- /*     0 */   505,   -6,   49,  109,  127,  155,  188,  216,  290,  328,
- /*    10 */   343,  410,  429,  254,  509,  484,  547,  565,  580,  591,
- /*    20 */   623,  626,  651,  662,  690,  695,  706,  734,  752,  767,
- /*    30 */   778,  810,  813,  273, -146,  136,  241,   67,  296,  104,
- /*    40 */   110, -171, -170, -164,  -73, -182, -102, -226,   15,   44,
- /*    50 */   -54,  215,  249,  266,   96,  -24,  268,  207,  375,  115,
- /*    60 */  -150, -150, -150,  -71, -162, -176,   97,  -65,  131,  200,
- /*    70 */   270,  312,  313,  366,  368,  393,  397,  399,  401,  403,
- /*    80 */   412,  422,  435,  441,  452,  457,  485,  489,  -48,  145,
- /*    90 */   156,  214,  303,  152,  310,  339,  -27,  197,  344,   64,
- /*   100 */  -175, -154,  262,  275,  294,  329,  349,  299,  272,  390,
- /*   110 */   385,  519,  483,  488,  488,  488,  535,  479,  499,  570,
- /*   120 */   568,  546,  562,  599,  574,  604,  600,  601,  637,  632,
- /*   130 */   644,  663,  646,  648,  649,  650,  659,  660,  661,  664,
- /*   140 */   667,  671,  673,  677,  683,  652,  681,  669,  656,  657,
- /*   150 */   629,  674,  668,  640,  678,  680,  653,  655,  670,  687,
- /*   160 */   488,  698,  691,  692,  675,  684,  686,  707,  535,  721,
- /*   170 */   719,  724,  728,  732,  735,  749,  739,  764,  776,  759,
- /*   180 */   768,  782,  785,  790,  781,  783,  789,  801,
+ /*     0 */  -129,   -6,   49,   78,  126,  155,  190,  219,  276,  299,
+ /*    10 */   135,  375,  398,  434,  492,  -80,  497,  515,  520,  562,
+ /*    20 */   565,  570,  608,  630,  636,  664,  670,  698,  726,  732,
+ /*    30 */   766,  774,  802,  531,  107,  574,   -8, -188,  -11,   33,
+ /*    40 */    93, -206, -166,  205, -171,  -27, -108,  174,   69, -122,
+ /*    50 */   192,  246,  432,  227,  466,  342,   51,  235,  428,  473,
+ /*    60 */   120, -217, -217, -217, -162,  -96,  -33,  189,  134,  223,
+ /*    70 */   233,  279,  280,  281,  304,  314,  315,  390,  424,  460,
+ /*    80 */   467,  468,  481,  482,  489,  491,  510,  546,  162,   -7,
+ /*    90 */   110,  185,  327,  578,   27,   54,  217,  287,  311,  -10,
+ /*   100 */  -178, -140,  204,  312,  345,  268,  412,  347,  381,  446,
+ /*   110 */   415,  495,  519,  471,  471,  471,  476,  504,  533,  575,
+ /*   120 */   589,  592,  593,  623,  599,  643,  620,  631,  650,  666,
+ /*   130 */   668,  676,  665,  673,  679,  683,  686,  689,  690,  693,
+ /*   140 */   699,  707,  710,  680,  694,  692,  733,  717,  696,  705,
+ /*   150 */   677,  716,  719,  682,  722,  724,  695,  700,  697,  723,
+ /*   160 */   471,  761,  742,  734,  709,  712,  720,  755,  476,  771,
+ /*   170 */   773,  775,  779,  783,  789,  806,  792,  818,  827,  811,
+ /*   180 */   821,  836,  841,  849,  842,  843,  852,  862,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*    10 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*    20 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*    30 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*    40 */   971,  971,  971, 1024,  971,  971,  971,  971,  971,  971,
- /*    50 */   971,  971,  971,  971,  971,  971,  971,  971,  971, 1022,
- /*    60 */   971, 1219,  971, 1136,  971,  971,  971,  971,  971,  971,
- /*    70 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*    80 */   971,  971,  971,  971,  971,  971,  971,  971,  971, 1024,
- /*    90 */  1230, 1230, 1230, 1022,  971,  971,  971,  971,  971, 1107,
- /*   100 */   971,  971,  971,  971,  971,  971,  971, 1294,  971, 1060,
- /*   110 */  1254,  971, 1246, 1222, 1236, 1223,  971, 1279, 1239,  971,
- /*   120 */  1141, 1138, 1138,  971,  971, 1024,  971,  971, 1024,  971,
- /*   130 */  1024,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   140 */   971,  971,  971,  971,  971,  971, 1022,  971,  971,  971,
- /*   150 */  1261, 1259,  971, 1261, 1259,  971, 1273, 1269, 1252, 1250,
- /*   160 */  1236,  971,  971,  971, 1297, 1285, 1281,  971,  971, 1259,
- /*   170 */   971,  971, 1259,  971, 1149,  971,  971,  971, 1022,  971,
- /*   180 */  1076,  971, 1022,  971, 1110, 1110, 1025,  976,  971,  971,
- /*   190 */   971,  971,  971,  971,  971,  971,  971,  971, 1191, 1272,
- /*   200 */  1271, 1190, 1196, 1195, 1194,  971,  971,  971, 1185, 1186,
- /*   210 */  1184, 1183,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   220 */   971,  971,  971, 1220,  971, 1282, 1286,  971,  971,  971,
- /*   230 */  1170,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   240 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   250 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   260 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   270 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   280 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   290 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   300 */   971,  971,  971,  971,  971,  971, 1243, 1253,  971,  971,
- /*   310 */   971,  971,  971,  971,  971,  971,  971,  971,  971, 1170,
- /*   320 */   971, 1270,  971, 1229, 1225,  971,  971, 1221,  971,  971,
- /*   330 */  1280,  971,  971,  971,  971,  971,  971,  971,  971, 1215,
- /*   340 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   350 */   971,  971,  971,  971,  971,  971, 1169,  971,  971,  971,
- /*   360 */   971,  971,  971, 1104,  971,  971,  971,  971,  971,  971,
- /*   370 */   971,  971,  971,  971,  971,  971, 1089, 1087, 1086, 1085,
- /*   380 */   971, 1082,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   390 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   400 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   410 */   971,  971,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   420 */   971,  971,  971,  971,
+ /*     0 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*    10 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*    20 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*    30 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*    40 */   996,  996,  996,  996, 1049,  996,  996,  996,  996,  996,
+ /*    50 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*    60 */  1047,  996, 1255,  996, 1161,  996,  996,  996,  996,  996,
+ /*    70 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*    80 */   996,  996,  996,  996,  996,  996,  996,  996,  996, 1049,
+ /*    90 */  1266, 1266, 1266, 1047,  996,  996,  996,  996,  996, 1132,
+ /*   100 */   996,  996,  996,  996,  996,  996,  996, 1330,  996, 1085,
+ /*   110 */  1290,  996, 1282, 1258, 1272, 1259,  996, 1315, 1275,  996,
+ /*   120 */  1166, 1163, 1163,  996,  996, 1049,  996,  996, 1049,  996,
+ /*   130 */  1049,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   140 */   996,  996,  996,  996,  996,  996, 1047,  996,  996,  996,
+ /*   150 */  1297, 1295,  996, 1297, 1295,  996, 1309, 1305, 1288, 1286,
+ /*   160 */  1272,  996,  996,  996, 1333, 1321, 1317,  996,  996, 1295,
+ /*   170 */   996,  996, 1295,  996, 1174,  996,  996,  996, 1047,  996,
+ /*   180 */  1101,  996, 1047,  996, 1135, 1135, 1050, 1001,  996,  996,
+ /*   190 */   996,  996,  996,  996,  996,  996,  996,  996, 1227, 1308,
+ /*   200 */  1307, 1226, 1232, 1231, 1230,  996,  996,  996, 1221, 1222,
+ /*   210 */  1220, 1219,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   220 */   996,  996,  996, 1256,  996, 1318, 1322,  996,  996,  996,
+ /*   230 */  1206,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   240 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   250 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   260 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   270 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   280 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   290 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   300 */   996,  996,  996,  996,  996,  996,  996,  996, 1279, 1289,
+ /*   310 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   320 */   996, 1206,  996, 1306,  996, 1265, 1261,  996,  996, 1257,
+ /*   330 */   996,  996, 1316,  996,  996,  996,  996,  996,  996,  996,
+ /*   340 */   996, 1251,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   350 */   996,  996,  996,  996,  996,  996,  996,  996, 1205,  996,
+ /*   360 */   996,  996,  996,  996,  996,  996, 1129,  996,  996,  996,
+ /*   370 */   996,  996,  996,  996,  996,  996,  996,  996,  996, 1114,
+ /*   380 */  1112, 1111, 1110,  996, 1107,  996,  996,  996,  996,  996,
+ /*   390 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   400 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   410 */   996,  996,  996,  996,  996,  996,  996,  996,  996,  996,
+ /*   420 */   996,  996,  996,  996,  996,  996,  996,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -908,49 +919,51 @@ static const char *const yyTokenName[] = {
   /*  210 */ "expression_list",
   /*  211 */ "topic_name",
   /*  212 */ "query_expression",
-  /*  213 */ "table_alias",
-  /*  214 */ "column_alias",
-  /*  215 */ "expression",
-  /*  216 */ "column_reference",
-  /*  217 */ "subquery",
-  /*  218 */ "predicate",
-  /*  219 */ "compare_op",
-  /*  220 */ "in_op",
-  /*  221 */ "in_predicate_value",
-  /*  222 */ "boolean_value_expression",
-  /*  223 */ "boolean_primary",
-  /*  224 */ "common_expression",
-  /*  225 */ "from_clause",
-  /*  226 */ "table_reference_list",
-  /*  227 */ "table_reference",
-  /*  228 */ "table_primary",
-  /*  229 */ "joined_table",
-  /*  230 */ "alias_opt",
-  /*  231 */ "parenthesized_joined_table",
-  /*  232 */ "join_type",
-  /*  233 */ "search_condition",
-  /*  234 */ "query_specification",
-  /*  235 */ "set_quantifier_opt",
-  /*  236 */ "select_list",
-  /*  237 */ "where_clause_opt",
-  /*  238 */ "partition_by_clause_opt",
-  /*  239 */ "twindow_clause_opt",
-  /*  240 */ "group_by_clause_opt",
-  /*  241 */ "having_clause_opt",
-  /*  242 */ "select_sublist",
-  /*  243 */ "select_item",
-  /*  244 */ "fill_opt",
-  /*  245 */ "fill_mode",
-  /*  246 */ "group_by_list",
-  /*  247 */ "query_expression_body",
-  /*  248 */ "order_by_clause_opt",
-  /*  249 */ "slimit_clause_opt",
-  /*  250 */ "limit_clause_opt",
-  /*  251 */ "query_primary",
-  /*  252 */ "sort_specification_list",
-  /*  253 */ "sort_specification",
-  /*  254 */ "ordering_specification_opt",
-  /*  255 */ "null_ordering_opt",
+  /*  213 */ "signed",
+  /*  214 */ "signed_literal",
+  /*  215 */ "table_alias",
+  /*  216 */ "column_alias",
+  /*  217 */ "expression",
+  /*  218 */ "column_reference",
+  /*  219 */ "subquery",
+  /*  220 */ "predicate",
+  /*  221 */ "compare_op",
+  /*  222 */ "in_op",
+  /*  223 */ "in_predicate_value",
+  /*  224 */ "boolean_value_expression",
+  /*  225 */ "boolean_primary",
+  /*  226 */ "common_expression",
+  /*  227 */ "from_clause",
+  /*  228 */ "table_reference_list",
+  /*  229 */ "table_reference",
+  /*  230 */ "table_primary",
+  /*  231 */ "joined_table",
+  /*  232 */ "alias_opt",
+  /*  233 */ "parenthesized_joined_table",
+  /*  234 */ "join_type",
+  /*  235 */ "search_condition",
+  /*  236 */ "query_specification",
+  /*  237 */ "set_quantifier_opt",
+  /*  238 */ "select_list",
+  /*  239 */ "where_clause_opt",
+  /*  240 */ "partition_by_clause_opt",
+  /*  241 */ "twindow_clause_opt",
+  /*  242 */ "group_by_clause_opt",
+  /*  243 */ "having_clause_opt",
+  /*  244 */ "select_sublist",
+  /*  245 */ "select_item",
+  /*  246 */ "fill_opt",
+  /*  247 */ "fill_mode",
+  /*  248 */ "group_by_list",
+  /*  249 */ "query_expression_body",
+  /*  250 */ "order_by_clause_opt",
+  /*  251 */ "slimit_clause_opt",
+  /*  252 */ "limit_clause_opt",
+  /*  253 */ "query_primary",
+  /*  254 */ "sort_specification_list",
+  /*  255 */ "sort_specification",
+  /*  256 */ "ordering_specification_opt",
+  /*  257 */ "null_ordering_opt",
 };
 #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
 
@@ -1150,140 +1163,151 @@ static const char *const yyRuleName[] = {
  /* 189 */ "literal ::= TIMESTAMP NK_STRING",
  /* 190 */ "literal ::= duration_literal",
  /* 191 */ "duration_literal ::= NK_VARIABLE",
- /* 192 */ "literal_list ::= literal",
- /* 193 */ "literal_list ::= literal_list NK_COMMA literal",
- /* 194 */ "db_name ::= NK_ID",
- /* 195 */ "table_name ::= NK_ID",
- /* 196 */ "column_name ::= NK_ID",
- /* 197 */ "function_name ::= NK_ID",
- /* 198 */ "table_alias ::= NK_ID",
- /* 199 */ "column_alias ::= NK_ID",
- /* 200 */ "user_name ::= NK_ID",
- /* 201 */ "index_name ::= NK_ID",
- /* 202 */ "topic_name ::= NK_ID",
- /* 203 */ "expression ::= literal",
- /* 204 */ "expression ::= column_reference",
- /* 205 */ "expression ::= function_name NK_LP expression_list NK_RP",
- /* 206 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
- /* 207 */ "expression ::= subquery",
- /* 208 */ "expression ::= NK_LP expression NK_RP",
- /* 209 */ "expression ::= NK_PLUS expression",
- /* 210 */ "expression ::= NK_MINUS expression",
- /* 211 */ "expression ::= expression NK_PLUS expression",
- /* 212 */ "expression ::= expression NK_MINUS expression",
- /* 213 */ "expression ::= expression NK_STAR expression",
- /* 214 */ "expression ::= expression NK_SLASH expression",
- /* 215 */ "expression ::= expression NK_REM expression",
- /* 216 */ "expression_list ::= expression",
- /* 217 */ "expression_list ::= expression_list NK_COMMA expression",
- /* 218 */ "column_reference ::= column_name",
- /* 219 */ "column_reference ::= table_name NK_DOT column_name",
- /* 220 */ "predicate ::= expression compare_op expression",
- /* 221 */ "predicate ::= expression BETWEEN expression AND expression",
- /* 222 */ "predicate ::= expression NOT BETWEEN expression AND expression",
- /* 223 */ "predicate ::= expression IS NULL",
- /* 224 */ "predicate ::= expression IS NOT NULL",
- /* 225 */ "predicate ::= expression in_op in_predicate_value",
- /* 226 */ "compare_op ::= NK_LT",
- /* 227 */ "compare_op ::= NK_GT",
- /* 228 */ "compare_op ::= NK_LE",
- /* 229 */ "compare_op ::= NK_GE",
- /* 230 */ "compare_op ::= NK_NE",
- /* 231 */ "compare_op ::= NK_EQ",
- /* 232 */ "compare_op ::= LIKE",
- /* 233 */ "compare_op ::= NOT LIKE",
- /* 234 */ "compare_op ::= MATCH",
- /* 235 */ "compare_op ::= NMATCH",
- /* 236 */ "in_op ::= IN",
- /* 237 */ "in_op ::= NOT IN",
- /* 238 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
- /* 239 */ "boolean_value_expression ::= boolean_primary",
- /* 240 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 241 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 242 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 243 */ "boolean_primary ::= predicate",
- /* 244 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 245 */ "common_expression ::= expression",
- /* 246 */ "common_expression ::= boolean_value_expression",
- /* 247 */ "from_clause ::= FROM table_reference_list",
- /* 248 */ "table_reference_list ::= table_reference",
- /* 249 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 250 */ "table_reference ::= table_primary",
- /* 251 */ "table_reference ::= joined_table",
- /* 252 */ "table_primary ::= table_name alias_opt",
- /* 253 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 254 */ "table_primary ::= subquery alias_opt",
- /* 255 */ "table_primary ::= parenthesized_joined_table",
- /* 256 */ "alias_opt ::=",
- /* 257 */ "alias_opt ::= table_alias",
- /* 258 */ "alias_opt ::= AS table_alias",
- /* 259 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 260 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 261 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 262 */ "join_type ::=",
- /* 263 */ "join_type ::= INNER",
- /* 264 */ "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",
- /* 265 */ "set_quantifier_opt ::=",
- /* 266 */ "set_quantifier_opt ::= DISTINCT",
- /* 267 */ "set_quantifier_opt ::= ALL",
- /* 268 */ "select_list ::= NK_STAR",
- /* 269 */ "select_list ::= select_sublist",
- /* 270 */ "select_sublist ::= select_item",
- /* 271 */ "select_sublist ::= select_sublist NK_COMMA select_item",
- /* 272 */ "select_item ::= common_expression",
- /* 273 */ "select_item ::= common_expression column_alias",
- /* 274 */ "select_item ::= common_expression AS column_alias",
- /* 275 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 276 */ "where_clause_opt ::=",
- /* 277 */ "where_clause_opt ::= WHERE search_condition",
- /* 278 */ "partition_by_clause_opt ::=",
- /* 279 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
- /* 280 */ "twindow_clause_opt ::=",
- /* 281 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP",
- /* 282 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP",
- /* 283 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
- /* 284 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
- /* 285 */ "sliding_opt ::=",
- /* 286 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
- /* 287 */ "fill_opt ::=",
- /* 288 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 289 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
- /* 290 */ "fill_mode ::= NONE",
- /* 291 */ "fill_mode ::= PREV",
- /* 292 */ "fill_mode ::= NULL",
- /* 293 */ "fill_mode ::= LINEAR",
- /* 294 */ "fill_mode ::= NEXT",
- /* 295 */ "group_by_clause_opt ::=",
- /* 296 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 297 */ "group_by_list ::= expression",
- /* 298 */ "group_by_list ::= group_by_list NK_COMMA expression",
- /* 299 */ "having_clause_opt ::=",
- /* 300 */ "having_clause_opt ::= HAVING search_condition",
- /* 301 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 302 */ "query_expression_body ::= query_primary",
- /* 303 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
- /* 304 */ "query_primary ::= query_specification",
- /* 305 */ "order_by_clause_opt ::=",
- /* 306 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 307 */ "slimit_clause_opt ::=",
- /* 308 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 309 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 310 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 311 */ "limit_clause_opt ::=",
- /* 312 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 313 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 314 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 315 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 316 */ "search_condition ::= common_expression",
- /* 317 */ "sort_specification_list ::= sort_specification",
- /* 318 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 319 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
- /* 320 */ "ordering_specification_opt ::=",
- /* 321 */ "ordering_specification_opt ::= ASC",
- /* 322 */ "ordering_specification_opt ::= DESC",
- /* 323 */ "null_ordering_opt ::=",
- /* 324 */ "null_ordering_opt ::= NULLS FIRST",
- /* 325 */ "null_ordering_opt ::= NULLS LAST",
+ /* 192 */ "signed ::= NK_INTEGER",
+ /* 193 */ "signed ::= NK_PLUS NK_INTEGER",
+ /* 194 */ "signed ::= NK_MINUS NK_INTEGER",
+ /* 195 */ "signed ::= NK_FLOAT",
+ /* 196 */ "signed ::= NK_PLUS NK_FLOAT",
+ /* 197 */ "signed ::= NK_MINUS NK_FLOAT",
+ /* 198 */ "signed_literal ::= signed",
+ /* 199 */ "signed_literal ::= NK_STRING",
+ /* 200 */ "signed_literal ::= NK_BOOL",
+ /* 201 */ "signed_literal ::= TIMESTAMP NK_STRING",
+ /* 202 */ "signed_literal ::= duration_literal",
+ /* 203 */ "literal_list ::= signed_literal",
+ /* 204 */ "literal_list ::= literal_list NK_COMMA signed_literal",
+ /* 205 */ "db_name ::= NK_ID",
+ /* 206 */ "table_name ::= NK_ID",
+ /* 207 */ "column_name ::= NK_ID",
+ /* 208 */ "function_name ::= NK_ID",
+ /* 209 */ "table_alias ::= NK_ID",
+ /* 210 */ "column_alias ::= NK_ID",
+ /* 211 */ "user_name ::= NK_ID",
+ /* 212 */ "index_name ::= NK_ID",
+ /* 213 */ "topic_name ::= NK_ID",
+ /* 214 */ "expression ::= literal",
+ /* 215 */ "expression ::= column_reference",
+ /* 216 */ "expression ::= function_name NK_LP expression_list NK_RP",
+ /* 217 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
+ /* 218 */ "expression ::= subquery",
+ /* 219 */ "expression ::= NK_LP expression NK_RP",
+ /* 220 */ "expression ::= NK_PLUS expression",
+ /* 221 */ "expression ::= NK_MINUS expression",
+ /* 222 */ "expression ::= expression NK_PLUS expression",
+ /* 223 */ "expression ::= expression NK_MINUS expression",
+ /* 224 */ "expression ::= expression NK_STAR expression",
+ /* 225 */ "expression ::= expression NK_SLASH expression",
+ /* 226 */ "expression ::= expression NK_REM expression",
+ /* 227 */ "expression_list ::= expression",
+ /* 228 */ "expression_list ::= expression_list NK_COMMA expression",
+ /* 229 */ "column_reference ::= column_name",
+ /* 230 */ "column_reference ::= table_name NK_DOT column_name",
+ /* 231 */ "predicate ::= expression compare_op expression",
+ /* 232 */ "predicate ::= expression BETWEEN expression AND expression",
+ /* 233 */ "predicate ::= expression NOT BETWEEN expression AND expression",
+ /* 234 */ "predicate ::= expression IS NULL",
+ /* 235 */ "predicate ::= expression IS NOT NULL",
+ /* 236 */ "predicate ::= expression in_op in_predicate_value",
+ /* 237 */ "compare_op ::= NK_LT",
+ /* 238 */ "compare_op ::= NK_GT",
+ /* 239 */ "compare_op ::= NK_LE",
+ /* 240 */ "compare_op ::= NK_GE",
+ /* 241 */ "compare_op ::= NK_NE",
+ /* 242 */ "compare_op ::= NK_EQ",
+ /* 243 */ "compare_op ::= LIKE",
+ /* 244 */ "compare_op ::= NOT LIKE",
+ /* 245 */ "compare_op ::= MATCH",
+ /* 246 */ "compare_op ::= NMATCH",
+ /* 247 */ "in_op ::= IN",
+ /* 248 */ "in_op ::= NOT IN",
+ /* 249 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
+ /* 250 */ "boolean_value_expression ::= boolean_primary",
+ /* 251 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 252 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 253 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 254 */ "boolean_primary ::= predicate",
+ /* 255 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 256 */ "common_expression ::= expression",
+ /* 257 */ "common_expression ::= boolean_value_expression",
+ /* 258 */ "from_clause ::= FROM table_reference_list",
+ /* 259 */ "table_reference_list ::= table_reference",
+ /* 260 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 261 */ "table_reference ::= table_primary",
+ /* 262 */ "table_reference ::= joined_table",
+ /* 263 */ "table_primary ::= table_name alias_opt",
+ /* 264 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 265 */ "table_primary ::= subquery alias_opt",
+ /* 266 */ "table_primary ::= parenthesized_joined_table",
+ /* 267 */ "alias_opt ::=",
+ /* 268 */ "alias_opt ::= table_alias",
+ /* 269 */ "alias_opt ::= AS table_alias",
+ /* 270 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 271 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 272 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 273 */ "join_type ::=",
+ /* 274 */ "join_type ::= INNER",
+ /* 275 */ "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",
+ /* 276 */ "set_quantifier_opt ::=",
+ /* 277 */ "set_quantifier_opt ::= DISTINCT",
+ /* 278 */ "set_quantifier_opt ::= ALL",
+ /* 279 */ "select_list ::= NK_STAR",
+ /* 280 */ "select_list ::= select_sublist",
+ /* 281 */ "select_sublist ::= select_item",
+ /* 282 */ "select_sublist ::= select_sublist NK_COMMA select_item",
+ /* 283 */ "select_item ::= common_expression",
+ /* 284 */ "select_item ::= common_expression column_alias",
+ /* 285 */ "select_item ::= common_expression AS column_alias",
+ /* 286 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 287 */ "where_clause_opt ::=",
+ /* 288 */ "where_clause_opt ::= WHERE search_condition",
+ /* 289 */ "partition_by_clause_opt ::=",
+ /* 290 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
+ /* 291 */ "twindow_clause_opt ::=",
+ /* 292 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP",
+ /* 293 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP",
+ /* 294 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
+ /* 295 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
+ /* 296 */ "sliding_opt ::=",
+ /* 297 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
+ /* 298 */ "fill_opt ::=",
+ /* 299 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 300 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
+ /* 301 */ "fill_mode ::= NONE",
+ /* 302 */ "fill_mode ::= PREV",
+ /* 303 */ "fill_mode ::= NULL",
+ /* 304 */ "fill_mode ::= LINEAR",
+ /* 305 */ "fill_mode ::= NEXT",
+ /* 306 */ "group_by_clause_opt ::=",
+ /* 307 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 308 */ "group_by_list ::= expression",
+ /* 309 */ "group_by_list ::= group_by_list NK_COMMA expression",
+ /* 310 */ "having_clause_opt ::=",
+ /* 311 */ "having_clause_opt ::= HAVING search_condition",
+ /* 312 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 313 */ "query_expression_body ::= query_primary",
+ /* 314 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
+ /* 315 */ "query_primary ::= query_specification",
+ /* 316 */ "order_by_clause_opt ::=",
+ /* 317 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 318 */ "slimit_clause_opt ::=",
+ /* 319 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 320 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 321 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 322 */ "limit_clause_opt ::=",
+ /* 323 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 324 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 325 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 326 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 327 */ "search_condition ::= common_expression",
+ /* 328 */ "sort_specification_list ::= sort_specification",
+ /* 329 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 330 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
+ /* 331 */ "ordering_specification_opt ::=",
+ /* 332 */ "ordering_specification_opt ::= ASC",
+ /* 333 */ "ordering_specification_opt ::= DESC",
+ /* 334 */ "null_ordering_opt ::=",
+ /* 335 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 336 */ "null_ordering_opt ::= NULLS LAST",
 };
 #endif /* NDEBUG */
 
@@ -1432,34 +1456,36 @@ static void yy_destructor(
     case 208: /* sliding_opt */
     case 209: /* func */
     case 212: /* query_expression */
-    case 215: /* expression */
-    case 216: /* column_reference */
-    case 217: /* subquery */
-    case 218: /* predicate */
-    case 221: /* in_predicate_value */
-    case 222: /* boolean_value_expression */
-    case 223: /* boolean_primary */
-    case 224: /* common_expression */
-    case 225: /* from_clause */
-    case 226: /* table_reference_list */
-    case 227: /* table_reference */
-    case 228: /* table_primary */
-    case 229: /* joined_table */
-    case 231: /* parenthesized_joined_table */
-    case 233: /* search_condition */
-    case 234: /* query_specification */
-    case 237: /* where_clause_opt */
-    case 239: /* twindow_clause_opt */
-    case 241: /* having_clause_opt */
-    case 243: /* select_item */
-    case 244: /* fill_opt */
-    case 247: /* query_expression_body */
-    case 249: /* slimit_clause_opt */
-    case 250: /* limit_clause_opt */
-    case 251: /* query_primary */
-    case 253: /* sort_specification */
+    case 213: /* signed */
+    case 214: /* signed_literal */
+    case 217: /* expression */
+    case 218: /* column_reference */
+    case 219: /* subquery */
+    case 220: /* predicate */
+    case 223: /* in_predicate_value */
+    case 224: /* boolean_value_expression */
+    case 225: /* boolean_primary */
+    case 226: /* common_expression */
+    case 227: /* from_clause */
+    case 228: /* table_reference_list */
+    case 229: /* table_reference */
+    case 230: /* table_primary */
+    case 231: /* joined_table */
+    case 233: /* parenthesized_joined_table */
+    case 235: /* search_condition */
+    case 236: /* query_specification */
+    case 239: /* where_clause_opt */
+    case 241: /* twindow_clause_opt */
+    case 243: /* having_clause_opt */
+    case 245: /* select_item */
+    case 246: /* fill_opt */
+    case 249: /* query_expression_body */
+    case 251: /* slimit_clause_opt */
+    case 252: /* limit_clause_opt */
+    case 253: /* query_primary */
+    case 255: /* sort_specification */
 {
- nodesDestroyNode((yypminor->yy360)); 
+ nodesDestroyNode((yypminor->yy140)); 
 }
       break;
     case 164: /* account_options */
@@ -1478,16 +1504,16 @@ static void yy_destructor(
     case 203: /* function_name */
     case 204: /* index_name */
     case 211: /* topic_name */
-    case 213: /* table_alias */
-    case 214: /* column_alias */
-    case 230: /* alias_opt */
+    case 215: /* table_alias */
+    case 216: /* column_alias */
+    case 232: /* alias_opt */
 {
  
 }
       break;
     case 171: /* not_exists_opt */
     case 174: /* exists_opt */
-    case 235: /* set_quantifier_opt */
+    case 237: /* set_quantifier_opt */
 {
  
 }
@@ -1509,15 +1535,15 @@ static void yy_destructor(
     case 195: /* func_name_list */
     case 206: /* func_list */
     case 210: /* expression_list */
-    case 236: /* select_list */
-    case 238: /* partition_by_clause_opt */
-    case 240: /* group_by_clause_opt */
-    case 242: /* select_sublist */
-    case 246: /* group_by_list */
-    case 248: /* order_by_clause_opt */
-    case 252: /* sort_specification_list */
+    case 238: /* select_list */
+    case 240: /* partition_by_clause_opt */
+    case 242: /* group_by_clause_opt */
+    case 244: /* select_sublist */
+    case 248: /* group_by_list */
+    case 250: /* order_by_clause_opt */
+    case 254: /* sort_specification_list */
 {
- nodesDestroyList((yypminor->yy24)); 
+ nodesDestroyList((yypminor->yy136)); 
 }
       break;
     case 187: /* type_name */
@@ -1525,28 +1551,28 @@ static void yy_destructor(
  
 }
       break;
-    case 219: /* compare_op */
-    case 220: /* in_op */
+    case 221: /* compare_op */
+    case 222: /* in_op */
 {
  
 }
       break;
-    case 232: /* join_type */
+    case 234: /* join_type */
 {
  
 }
       break;
-    case 245: /* fill_mode */
+    case 247: /* fill_mode */
 {
  
 }
       break;
-    case 254: /* ordering_specification_opt */
+    case 256: /* ordering_specification_opt */
 {
  
 }
       break;
-    case 255: /* null_ordering_opt */
+    case 257: /* null_ordering_opt */
 {
  
 }
@@ -2037,140 +2063,151 @@ static const struct {
   {  166,   -2 }, /* (189) literal ::= TIMESTAMP NK_STRING */
   {  166,   -1 }, /* (190) literal ::= duration_literal */
   {  207,   -1 }, /* (191) duration_literal ::= NK_VARIABLE */
-  {  190,   -1 }, /* (192) literal_list ::= literal */
-  {  190,   -3 }, /* (193) literal_list ::= literal_list NK_COMMA literal */
-  {  172,   -1 }, /* (194) db_name ::= NK_ID */
-  {  193,   -1 }, /* (195) table_name ::= NK_ID */
-  {  186,   -1 }, /* (196) column_name ::= NK_ID */
-  {  203,   -1 }, /* (197) function_name ::= NK_ID */
-  {  213,   -1 }, /* (198) table_alias ::= NK_ID */
-  {  214,   -1 }, /* (199) column_alias ::= NK_ID */
-  {  168,   -1 }, /* (200) user_name ::= NK_ID */
-  {  204,   -1 }, /* (201) index_name ::= NK_ID */
-  {  211,   -1 }, /* (202) topic_name ::= NK_ID */
-  {  215,   -1 }, /* (203) expression ::= literal */
-  {  215,   -1 }, /* (204) expression ::= column_reference */
-  {  215,   -4 }, /* (205) expression ::= function_name NK_LP expression_list NK_RP */
-  {  215,   -4 }, /* (206) expression ::= function_name NK_LP NK_STAR NK_RP */
-  {  215,   -1 }, /* (207) expression ::= subquery */
-  {  215,   -3 }, /* (208) expression ::= NK_LP expression NK_RP */
-  {  215,   -2 }, /* (209) expression ::= NK_PLUS expression */
-  {  215,   -2 }, /* (210) expression ::= NK_MINUS expression */
-  {  215,   -3 }, /* (211) expression ::= expression NK_PLUS expression */
-  {  215,   -3 }, /* (212) expression ::= expression NK_MINUS expression */
-  {  215,   -3 }, /* (213) expression ::= expression NK_STAR expression */
-  {  215,   -3 }, /* (214) expression ::= expression NK_SLASH expression */
-  {  215,   -3 }, /* (215) expression ::= expression NK_REM expression */
-  {  210,   -1 }, /* (216) expression_list ::= expression */
-  {  210,   -3 }, /* (217) expression_list ::= expression_list NK_COMMA expression */
-  {  216,   -1 }, /* (218) column_reference ::= column_name */
-  {  216,   -3 }, /* (219) column_reference ::= table_name NK_DOT column_name */
-  {  218,   -3 }, /* (220) predicate ::= expression compare_op expression */
-  {  218,   -5 }, /* (221) predicate ::= expression BETWEEN expression AND expression */
-  {  218,   -6 }, /* (222) predicate ::= expression NOT BETWEEN expression AND expression */
-  {  218,   -3 }, /* (223) predicate ::= expression IS NULL */
-  {  218,   -4 }, /* (224) predicate ::= expression IS NOT NULL */
-  {  218,   -3 }, /* (225) predicate ::= expression in_op in_predicate_value */
-  {  219,   -1 }, /* (226) compare_op ::= NK_LT */
-  {  219,   -1 }, /* (227) compare_op ::= NK_GT */
-  {  219,   -1 }, /* (228) compare_op ::= NK_LE */
-  {  219,   -1 }, /* (229) compare_op ::= NK_GE */
-  {  219,   -1 }, /* (230) compare_op ::= NK_NE */
-  {  219,   -1 }, /* (231) compare_op ::= NK_EQ */
-  {  219,   -1 }, /* (232) compare_op ::= LIKE */
-  {  219,   -2 }, /* (233) compare_op ::= NOT LIKE */
-  {  219,   -1 }, /* (234) compare_op ::= MATCH */
-  {  219,   -1 }, /* (235) compare_op ::= NMATCH */
-  {  220,   -1 }, /* (236) in_op ::= IN */
-  {  220,   -2 }, /* (237) in_op ::= NOT IN */
-  {  221,   -3 }, /* (238) in_predicate_value ::= NK_LP expression_list NK_RP */
-  {  222,   -1 }, /* (239) boolean_value_expression ::= boolean_primary */
-  {  222,   -2 }, /* (240) boolean_value_expression ::= NOT boolean_primary */
-  {  222,   -3 }, /* (241) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-  {  222,   -3 }, /* (242) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-  {  223,   -1 }, /* (243) boolean_primary ::= predicate */
-  {  223,   -3 }, /* (244) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
-  {  224,   -1 }, /* (245) common_expression ::= expression */
-  {  224,   -1 }, /* (246) common_expression ::= boolean_value_expression */
-  {  225,   -2 }, /* (247) from_clause ::= FROM table_reference_list */
-  {  226,   -1 }, /* (248) table_reference_list ::= table_reference */
-  {  226,   -3 }, /* (249) table_reference_list ::= table_reference_list NK_COMMA table_reference */
-  {  227,   -1 }, /* (250) table_reference ::= table_primary */
-  {  227,   -1 }, /* (251) table_reference ::= joined_table */
-  {  228,   -2 }, /* (252) table_primary ::= table_name alias_opt */
-  {  228,   -4 }, /* (253) table_primary ::= db_name NK_DOT table_name alias_opt */
-  {  228,   -2 }, /* (254) table_primary ::= subquery alias_opt */
-  {  228,   -1 }, /* (255) table_primary ::= parenthesized_joined_table */
-  {  230,    0 }, /* (256) alias_opt ::= */
-  {  230,   -1 }, /* (257) alias_opt ::= table_alias */
-  {  230,   -2 }, /* (258) alias_opt ::= AS table_alias */
-  {  231,   -3 }, /* (259) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-  {  231,   -3 }, /* (260) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
-  {  229,   -6 }, /* (261) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-  {  232,    0 }, /* (262) join_type ::= */
-  {  232,   -1 }, /* (263) join_type ::= INNER */
-  {  234,   -9 }, /* (264) 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 */
-  {  235,    0 }, /* (265) set_quantifier_opt ::= */
-  {  235,   -1 }, /* (266) set_quantifier_opt ::= DISTINCT */
-  {  235,   -1 }, /* (267) set_quantifier_opt ::= ALL */
-  {  236,   -1 }, /* (268) select_list ::= NK_STAR */
-  {  236,   -1 }, /* (269) select_list ::= select_sublist */
-  {  242,   -1 }, /* (270) select_sublist ::= select_item */
-  {  242,   -3 }, /* (271) select_sublist ::= select_sublist NK_COMMA select_item */
-  {  243,   -1 }, /* (272) select_item ::= common_expression */
-  {  243,   -2 }, /* (273) select_item ::= common_expression column_alias */
-  {  243,   -3 }, /* (274) select_item ::= common_expression AS column_alias */
-  {  243,   -3 }, /* (275) select_item ::= table_name NK_DOT NK_STAR */
-  {  237,    0 }, /* (276) where_clause_opt ::= */
-  {  237,   -2 }, /* (277) where_clause_opt ::= WHERE search_condition */
-  {  238,    0 }, /* (278) partition_by_clause_opt ::= */
-  {  238,   -3 }, /* (279) partition_by_clause_opt ::= PARTITION BY expression_list */
-  {  239,    0 }, /* (280) twindow_clause_opt ::= */
-  {  239,   -6 }, /* (281) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
-  {  239,   -4 }, /* (282) twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
-  {  239,   -6 }, /* (283) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-  {  239,   -8 }, /* (284) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-  {  208,    0 }, /* (285) sliding_opt ::= */
-  {  208,   -4 }, /* (286) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-  {  244,    0 }, /* (287) fill_opt ::= */
-  {  244,   -4 }, /* (288) fill_opt ::= FILL NK_LP fill_mode NK_RP */
-  {  244,   -6 }, /* (289) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-  {  245,   -1 }, /* (290) fill_mode ::= NONE */
-  {  245,   -1 }, /* (291) fill_mode ::= PREV */
-  {  245,   -1 }, /* (292) fill_mode ::= NULL */
-  {  245,   -1 }, /* (293) fill_mode ::= LINEAR */
-  {  245,   -1 }, /* (294) fill_mode ::= NEXT */
-  {  240,    0 }, /* (295) group_by_clause_opt ::= */
-  {  240,   -3 }, /* (296) group_by_clause_opt ::= GROUP BY group_by_list */
-  {  246,   -1 }, /* (297) group_by_list ::= expression */
-  {  246,   -3 }, /* (298) group_by_list ::= group_by_list NK_COMMA expression */
-  {  241,    0 }, /* (299) having_clause_opt ::= */
-  {  241,   -2 }, /* (300) having_clause_opt ::= HAVING search_condition */
-  {  212,   -4 }, /* (301) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
-  {  247,   -1 }, /* (302) query_expression_body ::= query_primary */
-  {  247,   -4 }, /* (303) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-  {  251,   -1 }, /* (304) query_primary ::= query_specification */
-  {  248,    0 }, /* (305) order_by_clause_opt ::= */
-  {  248,   -3 }, /* (306) order_by_clause_opt ::= ORDER BY sort_specification_list */
-  {  249,    0 }, /* (307) slimit_clause_opt ::= */
-  {  249,   -2 }, /* (308) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-  {  249,   -4 }, /* (309) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-  {  249,   -4 }, /* (310) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  250,    0 }, /* (311) limit_clause_opt ::= */
-  {  250,   -2 }, /* (312) limit_clause_opt ::= LIMIT NK_INTEGER */
-  {  250,   -4 }, /* (313) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-  {  250,   -4 }, /* (314) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  217,   -3 }, /* (315) subquery ::= NK_LP query_expression NK_RP */
-  {  233,   -1 }, /* (316) search_condition ::= common_expression */
-  {  252,   -1 }, /* (317) sort_specification_list ::= sort_specification */
-  {  252,   -3 }, /* (318) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-  {  253,   -3 }, /* (319) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-  {  254,    0 }, /* (320) ordering_specification_opt ::= */
-  {  254,   -1 }, /* (321) ordering_specification_opt ::= ASC */
-  {  254,   -1 }, /* (322) ordering_specification_opt ::= DESC */
-  {  255,    0 }, /* (323) null_ordering_opt ::= */
-  {  255,   -2 }, /* (324) null_ordering_opt ::= NULLS FIRST */
-  {  255,   -2 }, /* (325) null_ordering_opt ::= NULLS LAST */
+  {  213,   -1 }, /* (192) signed ::= NK_INTEGER */
+  {  213,   -2 }, /* (193) signed ::= NK_PLUS NK_INTEGER */
+  {  213,   -2 }, /* (194) signed ::= NK_MINUS NK_INTEGER */
+  {  213,   -1 }, /* (195) signed ::= NK_FLOAT */
+  {  213,   -2 }, /* (196) signed ::= NK_PLUS NK_FLOAT */
+  {  213,   -2 }, /* (197) signed ::= NK_MINUS NK_FLOAT */
+  {  214,   -1 }, /* (198) signed_literal ::= signed */
+  {  214,   -1 }, /* (199) signed_literal ::= NK_STRING */
+  {  214,   -1 }, /* (200) signed_literal ::= NK_BOOL */
+  {  214,   -2 }, /* (201) signed_literal ::= TIMESTAMP NK_STRING */
+  {  214,   -1 }, /* (202) signed_literal ::= duration_literal */
+  {  190,   -1 }, /* (203) literal_list ::= signed_literal */
+  {  190,   -3 }, /* (204) literal_list ::= literal_list NK_COMMA signed_literal */
+  {  172,   -1 }, /* (205) db_name ::= NK_ID */
+  {  193,   -1 }, /* (206) table_name ::= NK_ID */
+  {  186,   -1 }, /* (207) column_name ::= NK_ID */
+  {  203,   -1 }, /* (208) function_name ::= NK_ID */
+  {  215,   -1 }, /* (209) table_alias ::= NK_ID */
+  {  216,   -1 }, /* (210) column_alias ::= NK_ID */
+  {  168,   -1 }, /* (211) user_name ::= NK_ID */
+  {  204,   -1 }, /* (212) index_name ::= NK_ID */
+  {  211,   -1 }, /* (213) topic_name ::= NK_ID */
+  {  217,   -1 }, /* (214) expression ::= literal */
+  {  217,   -1 }, /* (215) expression ::= column_reference */
+  {  217,   -4 }, /* (216) expression ::= function_name NK_LP expression_list NK_RP */
+  {  217,   -4 }, /* (217) expression ::= function_name NK_LP NK_STAR NK_RP */
+  {  217,   -1 }, /* (218) expression ::= subquery */
+  {  217,   -3 }, /* (219) expression ::= NK_LP expression NK_RP */
+  {  217,   -2 }, /* (220) expression ::= NK_PLUS expression */
+  {  217,   -2 }, /* (221) expression ::= NK_MINUS expression */
+  {  217,   -3 }, /* (222) expression ::= expression NK_PLUS expression */
+  {  217,   -3 }, /* (223) expression ::= expression NK_MINUS expression */
+  {  217,   -3 }, /* (224) expression ::= expression NK_STAR expression */
+  {  217,   -3 }, /* (225) expression ::= expression NK_SLASH expression */
+  {  217,   -3 }, /* (226) expression ::= expression NK_REM expression */
+  {  210,   -1 }, /* (227) expression_list ::= expression */
+  {  210,   -3 }, /* (228) expression_list ::= expression_list NK_COMMA expression */
+  {  218,   -1 }, /* (229) column_reference ::= column_name */
+  {  218,   -3 }, /* (230) column_reference ::= table_name NK_DOT column_name */
+  {  220,   -3 }, /* (231) predicate ::= expression compare_op expression */
+  {  220,   -5 }, /* (232) predicate ::= expression BETWEEN expression AND expression */
+  {  220,   -6 }, /* (233) predicate ::= expression NOT BETWEEN expression AND expression */
+  {  220,   -3 }, /* (234) predicate ::= expression IS NULL */
+  {  220,   -4 }, /* (235) predicate ::= expression IS NOT NULL */
+  {  220,   -3 }, /* (236) predicate ::= expression in_op in_predicate_value */
+  {  221,   -1 }, /* (237) compare_op ::= NK_LT */
+  {  221,   -1 }, /* (238) compare_op ::= NK_GT */
+  {  221,   -1 }, /* (239) compare_op ::= NK_LE */
+  {  221,   -1 }, /* (240) compare_op ::= NK_GE */
+  {  221,   -1 }, /* (241) compare_op ::= NK_NE */
+  {  221,   -1 }, /* (242) compare_op ::= NK_EQ */
+  {  221,   -1 }, /* (243) compare_op ::= LIKE */
+  {  221,   -2 }, /* (244) compare_op ::= NOT LIKE */
+  {  221,   -1 }, /* (245) compare_op ::= MATCH */
+  {  221,   -1 }, /* (246) compare_op ::= NMATCH */
+  {  222,   -1 }, /* (247) in_op ::= IN */
+  {  222,   -2 }, /* (248) in_op ::= NOT IN */
+  {  223,   -3 }, /* (249) in_predicate_value ::= NK_LP expression_list NK_RP */
+  {  224,   -1 }, /* (250) boolean_value_expression ::= boolean_primary */
+  {  224,   -2 }, /* (251) boolean_value_expression ::= NOT boolean_primary */
+  {  224,   -3 }, /* (252) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+  {  224,   -3 }, /* (253) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+  {  225,   -1 }, /* (254) boolean_primary ::= predicate */
+  {  225,   -3 }, /* (255) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+  {  226,   -1 }, /* (256) common_expression ::= expression */
+  {  226,   -1 }, /* (257) common_expression ::= boolean_value_expression */
+  {  227,   -2 }, /* (258) from_clause ::= FROM table_reference_list */
+  {  228,   -1 }, /* (259) table_reference_list ::= table_reference */
+  {  228,   -3 }, /* (260) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+  {  229,   -1 }, /* (261) table_reference ::= table_primary */
+  {  229,   -1 }, /* (262) table_reference ::= joined_table */
+  {  230,   -2 }, /* (263) table_primary ::= table_name alias_opt */
+  {  230,   -4 }, /* (264) table_primary ::= db_name NK_DOT table_name alias_opt */
+  {  230,   -2 }, /* (265) table_primary ::= subquery alias_opt */
+  {  230,   -1 }, /* (266) table_primary ::= parenthesized_joined_table */
+  {  232,    0 }, /* (267) alias_opt ::= */
+  {  232,   -1 }, /* (268) alias_opt ::= table_alias */
+  {  232,   -2 }, /* (269) alias_opt ::= AS table_alias */
+  {  233,   -3 }, /* (270) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+  {  233,   -3 }, /* (271) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+  {  231,   -6 }, /* (272) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+  {  234,    0 }, /* (273) join_type ::= */
+  {  234,   -1 }, /* (274) join_type ::= INNER */
+  {  236,   -9 }, /* (275) 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 */
+  {  237,    0 }, /* (276) set_quantifier_opt ::= */
+  {  237,   -1 }, /* (277) set_quantifier_opt ::= DISTINCT */
+  {  237,   -1 }, /* (278) set_quantifier_opt ::= ALL */
+  {  238,   -1 }, /* (279) select_list ::= NK_STAR */
+  {  238,   -1 }, /* (280) select_list ::= select_sublist */
+  {  244,   -1 }, /* (281) select_sublist ::= select_item */
+  {  244,   -3 }, /* (282) select_sublist ::= select_sublist NK_COMMA select_item */
+  {  245,   -1 }, /* (283) select_item ::= common_expression */
+  {  245,   -2 }, /* (284) select_item ::= common_expression column_alias */
+  {  245,   -3 }, /* (285) select_item ::= common_expression AS column_alias */
+  {  245,   -3 }, /* (286) select_item ::= table_name NK_DOT NK_STAR */
+  {  239,    0 }, /* (287) where_clause_opt ::= */
+  {  239,   -2 }, /* (288) where_clause_opt ::= WHERE search_condition */
+  {  240,    0 }, /* (289) partition_by_clause_opt ::= */
+  {  240,   -3 }, /* (290) partition_by_clause_opt ::= PARTITION BY expression_list */
+  {  241,    0 }, /* (291) twindow_clause_opt ::= */
+  {  241,   -6 }, /* (292) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
+  {  241,   -4 }, /* (293) twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
+  {  241,   -6 }, /* (294) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+  {  241,   -8 }, /* (295) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+  {  208,    0 }, /* (296) sliding_opt ::= */
+  {  208,   -4 }, /* (297) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+  {  246,    0 }, /* (298) fill_opt ::= */
+  {  246,   -4 }, /* (299) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+  {  246,   -6 }, /* (300) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+  {  247,   -1 }, /* (301) fill_mode ::= NONE */
+  {  247,   -1 }, /* (302) fill_mode ::= PREV */
+  {  247,   -1 }, /* (303) fill_mode ::= NULL */
+  {  247,   -1 }, /* (304) fill_mode ::= LINEAR */
+  {  247,   -1 }, /* (305) fill_mode ::= NEXT */
+  {  242,    0 }, /* (306) group_by_clause_opt ::= */
+  {  242,   -3 }, /* (307) group_by_clause_opt ::= GROUP BY group_by_list */
+  {  248,   -1 }, /* (308) group_by_list ::= expression */
+  {  248,   -3 }, /* (309) group_by_list ::= group_by_list NK_COMMA expression */
+  {  243,    0 }, /* (310) having_clause_opt ::= */
+  {  243,   -2 }, /* (311) having_clause_opt ::= HAVING search_condition */
+  {  212,   -4 }, /* (312) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+  {  249,   -1 }, /* (313) query_expression_body ::= query_primary */
+  {  249,   -4 }, /* (314) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+  {  253,   -1 }, /* (315) query_primary ::= query_specification */
+  {  250,    0 }, /* (316) order_by_clause_opt ::= */
+  {  250,   -3 }, /* (317) order_by_clause_opt ::= ORDER BY sort_specification_list */
+  {  251,    0 }, /* (318) slimit_clause_opt ::= */
+  {  251,   -2 }, /* (319) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+  {  251,   -4 }, /* (320) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+  {  251,   -4 }, /* (321) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  252,    0 }, /* (322) limit_clause_opt ::= */
+  {  252,   -2 }, /* (323) limit_clause_opt ::= LIMIT NK_INTEGER */
+  {  252,   -4 }, /* (324) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+  {  252,   -4 }, /* (325) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  219,   -3 }, /* (326) subquery ::= NK_LP query_expression NK_RP */
+  {  235,   -1 }, /* (327) search_condition ::= common_expression */
+  {  254,   -1 }, /* (328) sort_specification_list ::= sort_specification */
+  {  254,   -3 }, /* (329) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+  {  255,   -3 }, /* (330) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+  {  256,    0 }, /* (331) ordering_specification_opt ::= */
+  {  256,   -1 }, /* (332) ordering_specification_opt ::= ASC */
+  {  256,   -1 }, /* (333) ordering_specification_opt ::= DESC */
+  {  257,    0 }, /* (334) null_ordering_opt ::= */
+  {  257,   -2 }, /* (335) null_ordering_opt ::= NULLS FIRST */
+  {  257,   -2 }, /* (336) null_ordering_opt ::= NULLS LAST */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -2307,28 +2344,28 @@ static YYACTIONTYPE yy_reduce(
   yy_destructor(yypParser,166,&yymsp[0].minor);
         break;
       case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy0); }
         break;
       case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy417, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy149, 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.yy417, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy149, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
         break;
       case 27: /* cmd ::= DROP USER user_name */
-{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy149); }
         break;
       case 28: /* cmd ::= CREATE DNODE dnode_endpoint */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy417, NULL); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy149, NULL); }
         break;
       case 29: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy0); }
         break;
       case 30: /* cmd ::= DROP DNODE NK_INTEGER */
 { pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 31: /* cmd ::= DROP DNODE dnode_endpoint */
-{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy149); }
         break;
       case 32: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
 { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); }
@@ -2345,17 +2382,17 @@ static YYACTIONTYPE yy_reduce(
       case 36: /* dnode_endpoint ::= NK_STRING */
       case 37: /* dnode_host_name ::= NK_ID */ yytestcase(yyruleno==37);
       case 38: /* dnode_host_name ::= NK_IPTOKEN */ yytestcase(yyruleno==38);
-      case 194: /* db_name ::= NK_ID */ yytestcase(yyruleno==194);
-      case 195: /* table_name ::= NK_ID */ yytestcase(yyruleno==195);
-      case 196: /* column_name ::= NK_ID */ yytestcase(yyruleno==196);
-      case 197: /* function_name ::= NK_ID */ yytestcase(yyruleno==197);
-      case 198: /* table_alias ::= NK_ID */ yytestcase(yyruleno==198);
-      case 199: /* column_alias ::= NK_ID */ yytestcase(yyruleno==199);
-      case 200: /* user_name ::= NK_ID */ yytestcase(yyruleno==200);
-      case 201: /* index_name ::= NK_ID */ yytestcase(yyruleno==201);
-      case 202: /* topic_name ::= NK_ID */ yytestcase(yyruleno==202);
-{ yylhsminor.yy417 = yymsp[0].minor.yy0; }
-  yymsp[0].minor.yy417 = yylhsminor.yy417;
+      case 205: /* db_name ::= NK_ID */ yytestcase(yyruleno==205);
+      case 206: /* table_name ::= NK_ID */ yytestcase(yyruleno==206);
+      case 207: /* column_name ::= NK_ID */ yytestcase(yyruleno==207);
+      case 208: /* function_name ::= NK_ID */ yytestcase(yyruleno==208);
+      case 209: /* table_alias ::= NK_ID */ yytestcase(yyruleno==209);
+      case 210: /* column_alias ::= NK_ID */ yytestcase(yyruleno==210);
+      case 211: /* user_name ::= NK_ID */ yytestcase(yyruleno==211);
+      case 212: /* index_name ::= NK_ID */ yytestcase(yyruleno==212);
+      case 213: /* topic_name ::= NK_ID */ yytestcase(yyruleno==213);
+{ yylhsminor.yy149 = yymsp[0].minor.yy0; }
+  yymsp[0].minor.yy149 = yylhsminor.yy149;
         break;
       case 39: /* cmd ::= ALTER LOCAL NK_STRING */
 { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); }
@@ -2370,190 +2407,190 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createDropQnodeStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 43: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy345, &yymsp[-1].minor.yy417, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy497, &yymsp[-1].minor.yy149, yymsp[0].minor.yy140); }
         break;
       case 44: /* cmd ::= DROP DATABASE exists_opt db_name */
-{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy345, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy497, &yymsp[0].minor.yy149); }
         break;
       case 45: /* cmd ::= USE db_name */
-{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy149); }
         break;
       case 46: /* cmd ::= ALTER DATABASE db_name alter_db_options */
-{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy417, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy149, yymsp[0].minor.yy140); }
         break;
       case 47: /* not_exists_opt ::= IF NOT EXISTS */
-{ yymsp[-2].minor.yy345 = true; }
+{ yymsp[-2].minor.yy497 = true; }
         break;
       case 48: /* not_exists_opt ::= */
       case 50: /* exists_opt ::= */ yytestcase(yyruleno==50);
-      case 265: /* set_quantifier_opt ::= */ yytestcase(yyruleno==265);
-{ yymsp[1].minor.yy345 = false; }
+      case 276: /* set_quantifier_opt ::= */ yytestcase(yyruleno==276);
+{ yymsp[1].minor.yy497 = false; }
         break;
       case 49: /* exists_opt ::= IF EXISTS */
-{ yymsp[-1].minor.yy345 = true; }
+{ yymsp[-1].minor.yy497 = true; }
         break;
       case 51: /* db_options ::= */
-{ yymsp[1].minor.yy360 = createDefaultDatabaseOptions(pCxt); }
+{ yymsp[1].minor.yy140 = createDefaultDatabaseOptions(pCxt); }
         break;
       case 52: /* db_options ::= db_options BLOCKS NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_BLOCKS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_BLOCKS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 53: /* db_options ::= db_options CACHE NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_CACHE, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_CACHE, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 54: /* db_options ::= db_options CACHELAST NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 55: /* db_options ::= db_options COMP NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 56: /* db_options ::= db_options DAYS NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 57: /* db_options ::= db_options FSYNC NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 58: /* db_options ::= db_options MAXROWS NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 59: /* db_options ::= db_options MINROWS NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 60: /* db_options ::= db_options KEEP NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_KEEP, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_KEEP, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 61: /* db_options ::= db_options PRECISION NK_STRING */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 62: /* db_options ::= db_options QUORUM NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_QUORUM, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_QUORUM, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 63: /* db_options ::= db_options REPLICA NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 64: /* db_options ::= db_options TTL NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_TTL, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_TTL, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 65: /* db_options ::= db_options WAL NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 66: /* db_options ::= db_options VGROUPS NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 67: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 68: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_STREAM_MODE, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_STREAM_MODE, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 69: /* db_options ::= db_options RETENTIONS NK_STRING */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_RETENTIONS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_RETENTIONS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 70: /* db_options ::= db_options FILE_FACTOR NK_FLOAT */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-2].minor.yy360, DB_OPTION_FILE_FACTOR, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-2].minor.yy140, DB_OPTION_FILE_FACTOR, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 71: /* alter_db_options ::= alter_db_option */
-{ yylhsminor.yy360 = createDefaultAlterDatabaseOptions(pCxt); yylhsminor.yy360 = setDatabaseOption(pCxt, yylhsminor.yy360, yymsp[0].minor.yy285.type, &yymsp[0].minor.yy285.val); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createDefaultAlterDatabaseOptions(pCxt); yylhsminor.yy140 = setDatabaseOption(pCxt, yylhsminor.yy140, yymsp[0].minor.yy233.type, &yymsp[0].minor.yy233.val); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 72: /* alter_db_options ::= alter_db_options alter_db_option */
-{ yylhsminor.yy360 = setDatabaseOption(pCxt, yymsp[-1].minor.yy360, yymsp[0].minor.yy285.type, &yymsp[0].minor.yy285.val); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setDatabaseOption(pCxt, yymsp[-1].minor.yy140, yymsp[0].minor.yy233.type, &yymsp[0].minor.yy233.val); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 73: /* alter_db_option ::= BLOCKS NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 74: /* alter_db_option ::= FSYNC NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 75: /* alter_db_option ::= KEEP NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = DB_OPTION_KEEP; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = DB_OPTION_KEEP; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 76: /* alter_db_option ::= WAL NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = DB_OPTION_WAL; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = DB_OPTION_WAL; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 77: /* alter_db_option ::= QUORUM NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 78: /* alter_db_option ::= CACHELAST NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 79: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
       case 81: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==81);
-{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy345, yymsp[-5].minor.yy360, yymsp[-3].minor.yy24, yymsp[-1].minor.yy24, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy497, yymsp[-5].minor.yy140, yymsp[-3].minor.yy136, yymsp[-1].minor.yy136, yymsp[0].minor.yy140); }
         break;
       case 80: /* cmd ::= CREATE TABLE multi_create_clause */
-{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy24); }
+{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy136); }
         break;
       case 82: /* cmd ::= DROP TABLE multi_drop_clause */
-{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy24); }
+{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy136); }
         break;
       case 83: /* cmd ::= DROP STABLE exists_opt full_table_name */
-{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy345, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy497, yymsp[0].minor.yy140); }
         break;
       case 84: /* cmd ::= ALTER TABLE alter_table_clause */
       case 85: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==85);
       case 184: /* cmd ::= query_expression */ yytestcase(yyruleno==184);
-{ pCxt->pRootNode = yymsp[0].minor.yy360; }
+{ pCxt->pRootNode = yymsp[0].minor.yy140; }
         break;
       case 86: /* alter_table_clause ::= full_table_name alter_table_options */
-{ yylhsminor.yy360 = createAlterTableOption(pCxt, yymsp[-1].minor.yy360, yymsp[0].minor.yy360); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableOption(pCxt, yymsp[-1].minor.yy140, yymsp[0].minor.yy140); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 87: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-{ yylhsminor.yy360 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy360, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy417, yymsp[0].minor.yy400); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy140, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy149, yymsp[0].minor.yy256); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 88: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
-{ yylhsminor.yy360 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy360, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy417); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy140, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy149); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
         break;
       case 89: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-{ yylhsminor.yy360 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy360, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy417, yymsp[0].minor.yy400); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy140, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy149, yymsp[0].minor.yy256); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 90: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-{ yylhsminor.yy360 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy360, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy417, &yymsp[0].minor.yy417); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy140, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy149, &yymsp[0].minor.yy149); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 91: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-{ yylhsminor.yy360 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy360, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy417, yymsp[0].minor.yy400); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy140, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy149, yymsp[0].minor.yy256); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 92: /* alter_table_clause ::= full_table_name DROP TAG column_name */
-{ yylhsminor.yy360 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy360, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy417); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy140, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy149); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
         break;
       case 93: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-{ yylhsminor.yy360 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy360, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy417, yymsp[0].minor.yy400); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy140, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy149, yymsp[0].minor.yy256); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 94: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-{ yylhsminor.yy360 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy360, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy417, &yymsp[0].minor.yy417); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy140, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy149, &yymsp[0].minor.yy149); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 95: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
-{ yylhsminor.yy360 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy360, &yymsp[-2].minor.yy417, yymsp[0].minor.yy360); }
-  yymsp[-5].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy140, &yymsp[-2].minor.yy149, yymsp[0].minor.yy140); }
+  yymsp[-5].minor.yy140 = yylhsminor.yy140;
         break;
       case 96: /* multi_create_clause ::= create_subtable_clause */
       case 99: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==99);
@@ -2561,177 +2598,179 @@ static YYACTIONTYPE yy_reduce(
       case 147: /* col_name_list ::= col_name */ yytestcase(yyruleno==147);
       case 169: /* func_name_list ::= func_name */ yytestcase(yyruleno==169);
       case 178: /* func_list ::= func */ yytestcase(yyruleno==178);
-      case 270: /* select_sublist ::= select_item */ yytestcase(yyruleno==270);
-      case 317: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==317);
-{ yylhsminor.yy24 = createNodeList(pCxt, yymsp[0].minor.yy360); }
-  yymsp[0].minor.yy24 = yylhsminor.yy24;
+      case 203: /* literal_list ::= signed_literal */ yytestcase(yyruleno==203);
+      case 281: /* select_sublist ::= select_item */ yytestcase(yyruleno==281);
+      case 328: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==328);
+{ yylhsminor.yy136 = createNodeList(pCxt, yymsp[0].minor.yy140); }
+  yymsp[0].minor.yy136 = yylhsminor.yy136;
         break;
       case 97: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
       case 100: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==100);
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-1].minor.yy24, yymsp[0].minor.yy360); }
-  yymsp[-1].minor.yy24 = yylhsminor.yy24;
+{ yylhsminor.yy136 = addNodeToList(pCxt, yymsp[-1].minor.yy136, yymsp[0].minor.yy140); }
+  yymsp[-1].minor.yy136 = yylhsminor.yy136;
         break;
       case 98: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-{ yylhsminor.yy360 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy345, yymsp[-7].minor.yy360, yymsp[-5].minor.yy360, yymsp[-4].minor.yy24, yymsp[-1].minor.yy24); }
-  yymsp[-8].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy497, yymsp[-7].minor.yy140, yymsp[-5].minor.yy140, yymsp[-4].minor.yy136, yymsp[-1].minor.yy136); }
+  yymsp[-8].minor.yy140 = yylhsminor.yy140;
         break;
       case 101: /* drop_table_clause ::= exists_opt full_table_name */
-{ yylhsminor.yy360 = createDropTableClause(pCxt, yymsp[-1].minor.yy345, yymsp[0].minor.yy360); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createDropTableClause(pCxt, yymsp[-1].minor.yy497, yymsp[0].minor.yy140); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 102: /* specific_tags_opt ::= */
       case 133: /* tags_def_opt ::= */ yytestcase(yyruleno==133);
-      case 278: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==278);
-      case 295: /* group_by_clause_opt ::= */ yytestcase(yyruleno==295);
-      case 305: /* order_by_clause_opt ::= */ yytestcase(yyruleno==305);
-{ yymsp[1].minor.yy24 = NULL; }
+      case 289: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==289);
+      case 306: /* group_by_clause_opt ::= */ yytestcase(yyruleno==306);
+      case 316: /* order_by_clause_opt ::= */ yytestcase(yyruleno==316);
+{ yymsp[1].minor.yy136 = NULL; }
         break;
       case 103: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
-{ yymsp[-2].minor.yy24 = yymsp[-1].minor.yy24; }
+{ yymsp[-2].minor.yy136 = yymsp[-1].minor.yy136; }
         break;
       case 104: /* full_table_name ::= table_name */
-{ yylhsminor.yy360 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy417, NULL); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy149, NULL); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 105: /* full_table_name ::= db_name NK_DOT table_name */
-{ yylhsminor.yy360 = createRealTableNode(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy417, NULL); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRealTableNode(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy149, NULL); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 107: /* column_def_list ::= column_def_list NK_COMMA column_def */
       case 148: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==148);
       case 170: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==170);
       case 179: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==179);
-      case 271: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==271);
-      case 318: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==318);
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-2].minor.yy24, yymsp[0].minor.yy360); }
-  yymsp[-2].minor.yy24 = yylhsminor.yy24;
+      case 204: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==204);
+      case 282: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==282);
+      case 329: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==329);
+{ yylhsminor.yy136 = addNodeToList(pCxt, yymsp[-2].minor.yy136, yymsp[0].minor.yy140); }
+  yymsp[-2].minor.yy136 = yylhsminor.yy136;
         break;
       case 108: /* column_def ::= column_name type_name */
-{ yylhsminor.yy360 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy417, yymsp[0].minor.yy400, NULL); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy149, yymsp[0].minor.yy256, NULL); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 109: /* column_def ::= column_name type_name COMMENT NK_STRING */
-{ yylhsminor.yy360 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy417, yymsp[-2].minor.yy400, &yymsp[0].minor.yy0); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy149, yymsp[-2].minor.yy256, &yymsp[0].minor.yy0); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
         break;
       case 110: /* type_name ::= BOOL */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_BOOL); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_BOOL); }
         break;
       case 111: /* type_name ::= TINYINT */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_TINYINT); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_TINYINT); }
         break;
       case 112: /* type_name ::= SMALLINT */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
         break;
       case 113: /* type_name ::= INT */
       case 114: /* type_name ::= INTEGER */ yytestcase(yyruleno==114);
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_INT); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_INT); }
         break;
       case 115: /* type_name ::= BIGINT */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_BIGINT); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_BIGINT); }
         break;
       case 116: /* type_name ::= FLOAT */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_FLOAT); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_FLOAT); }
         break;
       case 117: /* type_name ::= DOUBLE */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
         break;
       case 118: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy400 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy256 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
         break;
       case 119: /* type_name ::= TIMESTAMP */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
         break;
       case 120: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy400 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy256 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
         break;
       case 121: /* type_name ::= TINYINT UNSIGNED */
-{ yymsp[-1].minor.yy400 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
+{ yymsp[-1].minor.yy256 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
         break;
       case 122: /* type_name ::= SMALLINT UNSIGNED */
-{ yymsp[-1].minor.yy400 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
+{ yymsp[-1].minor.yy256 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
         break;
       case 123: /* type_name ::= INT UNSIGNED */
-{ yymsp[-1].minor.yy400 = createDataType(TSDB_DATA_TYPE_UINT); }
+{ yymsp[-1].minor.yy256 = createDataType(TSDB_DATA_TYPE_UINT); }
         break;
       case 124: /* type_name ::= BIGINT UNSIGNED */
-{ yymsp[-1].minor.yy400 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
+{ yymsp[-1].minor.yy256 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
         break;
       case 125: /* type_name ::= JSON */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_JSON); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_JSON); }
         break;
       case 126: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy400 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy256 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
         break;
       case 127: /* type_name ::= MEDIUMBLOB */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
         break;
       case 128: /* type_name ::= BLOB */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_BLOB); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_BLOB); }
         break;
       case 129: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy400 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy256 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
         break;
       case 130: /* type_name ::= DECIMAL */
-{ yymsp[0].minor.yy400 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[0].minor.yy256 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 131: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy400 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-3].minor.yy256 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 132: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy400 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-5].minor.yy256 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 134: /* tags_def_opt ::= tags_def */
-      case 269: /* select_list ::= select_sublist */ yytestcase(yyruleno==269);
-{ yylhsminor.yy24 = yymsp[0].minor.yy24; }
-  yymsp[0].minor.yy24 = yylhsminor.yy24;
+      case 280: /* select_list ::= select_sublist */ yytestcase(yyruleno==280);
+{ yylhsminor.yy136 = yymsp[0].minor.yy136; }
+  yymsp[0].minor.yy136 = yylhsminor.yy136;
         break;
       case 135: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
-{ yymsp[-3].minor.yy24 = yymsp[-1].minor.yy24; }
+{ yymsp[-3].minor.yy136 = yymsp[-1].minor.yy136; }
         break;
       case 136: /* table_options ::= */
-{ yymsp[1].minor.yy360 = createDefaultTableOptions(pCxt); }
+{ yymsp[1].minor.yy140 = createDefaultTableOptions(pCxt); }
         break;
       case 137: /* table_options ::= table_options COMMENT NK_STRING */
-{ yylhsminor.yy360 = setTableOption(pCxt, yymsp[-2].minor.yy360, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setTableOption(pCxt, yymsp[-2].minor.yy140, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 138: /* table_options ::= table_options KEEP NK_INTEGER */
-{ yylhsminor.yy360 = setTableOption(pCxt, yymsp[-2].minor.yy360, TABLE_OPTION_KEEP, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setTableOption(pCxt, yymsp[-2].minor.yy140, TABLE_OPTION_KEEP, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 139: /* table_options ::= table_options TTL NK_INTEGER */
-{ yylhsminor.yy360 = setTableOption(pCxt, yymsp[-2].minor.yy360, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setTableOption(pCxt, yymsp[-2].minor.yy140, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
       case 140: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-{ yylhsminor.yy360 = setTableSmaOption(pCxt, yymsp[-4].minor.yy360, yymsp[-1].minor.yy24); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setTableSmaOption(pCxt, yymsp[-4].minor.yy140, yymsp[-1].minor.yy136); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 141: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
-{ yylhsminor.yy360 = setTableRollupOption(pCxt, yymsp[-4].minor.yy360, yymsp[-1].minor.yy24); }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setTableRollupOption(pCxt, yymsp[-4].minor.yy140, yymsp[-1].minor.yy136); }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
         break;
       case 142: /* alter_table_options ::= alter_table_option */
-{ yylhsminor.yy360 = createDefaultAlterTableOptions(pCxt); yylhsminor.yy360 = setTableOption(pCxt, yylhsminor.yy360, yymsp[0].minor.yy285.type, &yymsp[0].minor.yy285.val); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createDefaultAlterTableOptions(pCxt); yylhsminor.yy140 = setTableOption(pCxt, yylhsminor.yy140, yymsp[0].minor.yy233.type, &yymsp[0].minor.yy233.val); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 143: /* alter_table_options ::= alter_table_options alter_table_option */
-{ yylhsminor.yy360 = setTableOption(pCxt, yymsp[-1].minor.yy360, yymsp[0].minor.yy285.type, &yymsp[0].minor.yy285.val); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = setTableOption(pCxt, yymsp[-1].minor.yy140, yymsp[0].minor.yy233.type, &yymsp[0].minor.yy233.val); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 144: /* alter_table_option ::= COMMENT NK_STRING */
-{ yymsp[-1].minor.yy285.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 145: /* alter_table_option ::= KEEP NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 146: /* alter_table_option ::= TTL NK_INTEGER */
-{ yymsp[-1].minor.yy285.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy285.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy233.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy233.val = yymsp[0].minor.yy0; }
         break;
       case 149: /* col_name ::= column_name */
-{ yylhsminor.yy360 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy417); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy149); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 150: /* cmd ::= SHOW DNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL, NULL); }
@@ -2743,13 +2782,13 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL, NULL); }
         break;
       case 153: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy360, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy140, yymsp[0].minor.yy140); }
         break;
       case 154: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy360, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy140, yymsp[0].minor.yy140); }
         break;
       case 155: /* cmd ::= SHOW db_name_cond_opt VGROUPS */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy360, NULL); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy140, NULL); }
         break;
       case 156: /* cmd ::= SHOW MNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT, NULL, NULL); }
@@ -2764,484 +2803,525 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT, NULL, NULL); }
         break;
       case 160: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy360, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy140, yymsp[0].minor.yy140); }
         break;
       case 161: /* cmd ::= SHOW STREAMS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT, NULL, NULL); }
         break;
       case 162: /* db_name_cond_opt ::= */
       case 167: /* from_db_opt ::= */ yytestcase(yyruleno==167);
-{ yymsp[1].minor.yy360 = createDefaultDatabaseCondValue(pCxt); }
+{ yymsp[1].minor.yy140 = createDefaultDatabaseCondValue(pCxt); }
         break;
       case 163: /* db_name_cond_opt ::= db_name NK_DOT */
-{ yylhsminor.yy360 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy417); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy149); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 164: /* like_pattern_opt ::= */
       case 175: /* index_options ::= */ yytestcase(yyruleno==175);
-      case 276: /* where_clause_opt ::= */ yytestcase(yyruleno==276);
-      case 280: /* twindow_clause_opt ::= */ yytestcase(yyruleno==280);
-      case 285: /* sliding_opt ::= */ yytestcase(yyruleno==285);
-      case 287: /* fill_opt ::= */ yytestcase(yyruleno==287);
-      case 299: /* having_clause_opt ::= */ yytestcase(yyruleno==299);
-      case 307: /* slimit_clause_opt ::= */ yytestcase(yyruleno==307);
-      case 311: /* limit_clause_opt ::= */ yytestcase(yyruleno==311);
-{ yymsp[1].minor.yy360 = NULL; }
+      case 287: /* where_clause_opt ::= */ yytestcase(yyruleno==287);
+      case 291: /* twindow_clause_opt ::= */ yytestcase(yyruleno==291);
+      case 296: /* sliding_opt ::= */ yytestcase(yyruleno==296);
+      case 298: /* fill_opt ::= */ yytestcase(yyruleno==298);
+      case 310: /* having_clause_opt ::= */ yytestcase(yyruleno==310);
+      case 318: /* slimit_clause_opt ::= */ yytestcase(yyruleno==318);
+      case 322: /* limit_clause_opt ::= */ yytestcase(yyruleno==322);
+{ yymsp[1].minor.yy140 = NULL; }
         break;
       case 165: /* like_pattern_opt ::= LIKE NK_STRING */
-{ yymsp[-1].minor.yy360 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
         break;
       case 166: /* table_name_cond ::= table_name */
-{ yylhsminor.yy360 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy417); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy149); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 168: /* from_db_opt ::= FROM db_name */
-{ yymsp[-1].minor.yy360 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy417); }
+{ yymsp[-1].minor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy149); }
         break;
       case 171: /* func_name ::= function_name */
-{ yylhsminor.yy360 = createFunctionNode(pCxt, &yymsp[0].minor.yy417, NULL); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createFunctionNode(pCxt, &yymsp[0].minor.yy149, NULL); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 172: /* cmd ::= CREATE SMA INDEX index_name ON table_name index_options */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, &yymsp[-3].minor.yy417, &yymsp[-1].minor.yy417, NULL, yymsp[0].minor.yy360); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, &yymsp[-3].minor.yy149, &yymsp[-1].minor.yy149, NULL, yymsp[0].minor.yy140); }
         break;
       case 173: /* 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.yy417, &yymsp[-3].minor.yy417, yymsp[-1].minor.yy24, NULL); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, &yymsp[-5].minor.yy149, &yymsp[-3].minor.yy149, yymsp[-1].minor.yy136, NULL); }
         break;
       case 174: /* cmd ::= DROP INDEX index_name ON table_name */
-{ pCxt->pRootNode = createDropIndexStmt(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createDropIndexStmt(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy149); }
         break;
       case 176: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-{ yymsp[-8].minor.yy360 = createIndexOption(pCxt, yymsp[-6].minor.yy24, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), NULL, yymsp[0].minor.yy360); }
+{ yymsp[-8].minor.yy140 = createIndexOption(pCxt, yymsp[-6].minor.yy136, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), NULL, yymsp[0].minor.yy140); }
         break;
       case 177: /* 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.yy360 = createIndexOption(pCxt, yymsp[-8].minor.yy24, releaseRawExprNode(pCxt, yymsp[-4].minor.yy360), releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), yymsp[0].minor.yy360); }
+{ yymsp[-10].minor.yy140 = createIndexOption(pCxt, yymsp[-8].minor.yy136, releaseRawExprNode(pCxt, yymsp[-4].minor.yy140), releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), yymsp[0].minor.yy140); }
         break;
       case 180: /* func ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy360 = createFunctionNode(pCxt, &yymsp[-3].minor.yy417, yymsp[-1].minor.yy24); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createFunctionNode(pCxt, &yymsp[-3].minor.yy149, yymsp[-1].minor.yy136); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
         break;
       case 181: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy345, &yymsp[-2].minor.yy417, yymsp[0].minor.yy360, NULL); }
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy497, &yymsp[-2].minor.yy149, yymsp[0].minor.yy140, NULL); }
         break;
       case 182: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy345, &yymsp[-2].minor.yy417, NULL, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy497, &yymsp[-2].minor.yy149, NULL, &yymsp[0].minor.yy149); }
         break;
       case 183: /* cmd ::= DROP TOPIC exists_opt topic_name */
-{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy345, &yymsp[0].minor.yy417); }
+{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy497, &yymsp[0].minor.yy149); }
         break;
       case 185: /* literal ::= NK_INTEGER */
-{ yylhsminor.yy360 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 186: /* literal ::= NK_FLOAT */
-{ yylhsminor.yy360 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 187: /* literal ::= NK_STRING */
-{ yylhsminor.yy360 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 188: /* literal ::= NK_BOOL */
-{ yylhsminor.yy360 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 189: /* literal ::= TIMESTAMP NK_STRING */
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
       case 190: /* literal ::= duration_literal */
-      case 203: /* expression ::= literal */ yytestcase(yyruleno==203);
-      case 204: /* expression ::= column_reference */ yytestcase(yyruleno==204);
-      case 207: /* expression ::= subquery */ yytestcase(yyruleno==207);
-      case 239: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==239);
-      case 243: /* boolean_primary ::= predicate */ yytestcase(yyruleno==243);
-      case 245: /* common_expression ::= expression */ yytestcase(yyruleno==245);
-      case 246: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==246);
-      case 248: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==248);
-      case 250: /* table_reference ::= table_primary */ yytestcase(yyruleno==250);
-      case 251: /* table_reference ::= joined_table */ yytestcase(yyruleno==251);
-      case 255: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==255);
-      case 302: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==302);
-      case 304: /* query_primary ::= query_specification */ yytestcase(yyruleno==304);
-{ yylhsminor.yy360 = yymsp[0].minor.yy360; }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+      case 198: /* signed_literal ::= signed */ yytestcase(yyruleno==198);
+      case 214: /* expression ::= literal */ yytestcase(yyruleno==214);
+      case 215: /* expression ::= column_reference */ yytestcase(yyruleno==215);
+      case 218: /* expression ::= subquery */ yytestcase(yyruleno==218);
+      case 250: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==250);
+      case 254: /* boolean_primary ::= predicate */ yytestcase(yyruleno==254);
+      case 256: /* common_expression ::= expression */ yytestcase(yyruleno==256);
+      case 257: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==257);
+      case 259: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==259);
+      case 261: /* table_reference ::= table_primary */ yytestcase(yyruleno==261);
+      case 262: /* table_reference ::= joined_table */ yytestcase(yyruleno==262);
+      case 266: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==266);
+      case 313: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==313);
+      case 315: /* query_primary ::= query_specification */ yytestcase(yyruleno==315);
+{ yylhsminor.yy140 = yymsp[0].minor.yy140; }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
       case 191: /* duration_literal ::= NK_VARIABLE */
-{ yylhsminor.yy360 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+{ yylhsminor.yy140 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
-      case 192: /* literal_list ::= literal */
-      case 216: /* expression_list ::= expression */ yytestcase(yyruleno==216);
-{ yylhsminor.yy24 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy360)); }
-  yymsp[0].minor.yy24 = yylhsminor.yy24;
+      case 192: /* signed ::= NK_INTEGER */
+{ yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
-      case 193: /* literal_list ::= literal_list NK_COMMA literal */
-      case 217: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==217);
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-2].minor.yy24, releaseRawExprNode(pCxt, yymsp[0].minor.yy360)); }
-  yymsp[-2].minor.yy24 = yylhsminor.yy24;
+      case 193: /* signed ::= NK_PLUS NK_INTEGER */
+{ yymsp[-1].minor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
-      case 205: /* expression ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy417, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy417, yymsp[-1].minor.yy24)); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 206: /* expression ::= function_name NK_LP NK_STAR NK_RP */
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy417, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy417, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 208: /* expression ::= NK_LP expression NK_RP */
-      case 244: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==244);
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy360)); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 209: /* expression ::= NK_PLUS expression */
-{
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy360));
-                                                                                  }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 210: /* expression ::= NK_MINUS expression */
-{
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[0].minor.yy360), NULL));
-                                                                                  }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 211: /* expression ::= expression NK_PLUS expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); 
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 212: /* expression ::= expression NK_MINUS expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); 
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 213: /* expression ::= expression NK_STAR expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); 
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 214: /* expression ::= expression NK_SLASH expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); 
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 215: /* expression ::= expression NK_REM expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); 
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 218: /* column_reference ::= column_name */
-{ yylhsminor.yy360 = createRawExprNode(pCxt, &yymsp[0].minor.yy417, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy417)); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 219: /* column_reference ::= table_name NK_DOT column_name */
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy417, createColumnNode(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy417)); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 220: /* predicate ::= expression compare_op expression */
-      case 225: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==225);
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy252, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360)));
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 221: /* predicate ::= expression BETWEEN expression AND expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy360), releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360)));
-                                                                                  }
-  yymsp[-4].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 222: /* predicate ::= expression NOT BETWEEN expression AND expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[-5].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360)));
-                                                                                  }
-  yymsp[-5].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 223: /* predicate ::= expression IS NULL */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), NULL));
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 224: /* predicate ::= expression IS NOT NULL */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy360), NULL));
-                                                                                  }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 226: /* compare_op ::= NK_LT */
-{ yymsp[0].minor.yy252 = OP_TYPE_LOWER_THAN; }
-        break;
-      case 227: /* compare_op ::= NK_GT */
-{ yymsp[0].minor.yy252 = OP_TYPE_GREATER_THAN; }
-        break;
-      case 228: /* compare_op ::= NK_LE */
-{ yymsp[0].minor.yy252 = OP_TYPE_LOWER_EQUAL; }
-        break;
-      case 229: /* compare_op ::= NK_GE */
-{ yymsp[0].minor.yy252 = OP_TYPE_GREATER_EQUAL; }
-        break;
-      case 230: /* compare_op ::= NK_NE */
-{ yymsp[0].minor.yy252 = OP_TYPE_NOT_EQUAL; }
-        break;
-      case 231: /* compare_op ::= NK_EQ */
-{ yymsp[0].minor.yy252 = OP_TYPE_EQUAL; }
-        break;
-      case 232: /* compare_op ::= LIKE */
-{ yymsp[0].minor.yy252 = OP_TYPE_LIKE; }
-        break;
-      case 233: /* compare_op ::= NOT LIKE */
-{ yymsp[-1].minor.yy252 = OP_TYPE_NOT_LIKE; }
-        break;
-      case 234: /* compare_op ::= MATCH */
-{ yymsp[0].minor.yy252 = OP_TYPE_MATCH; }
-        break;
-      case 235: /* compare_op ::= NMATCH */
-{ yymsp[0].minor.yy252 = OP_TYPE_NMATCH; }
-        break;
-      case 236: /* in_op ::= IN */
-{ yymsp[0].minor.yy252 = OP_TYPE_IN; }
-        break;
-      case 237: /* in_op ::= NOT IN */
-{ yymsp[-1].minor.yy252 = OP_TYPE_NOT_IN; }
-        break;
-      case 238: /* in_predicate_value ::= NK_LP expression_list NK_RP */
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy24)); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 240: /* boolean_value_expression ::= NOT boolean_primary */
-{
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy360), NULL));
-                                                                                  }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 241: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360)));
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 242: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-{
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy360);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), releaseRawExprNode(pCxt, yymsp[0].minor.yy360)));
-                                                                                  }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 247: /* from_clause ::= FROM table_reference_list */
-      case 277: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==277);
-      case 300: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==300);
-{ yymsp[-1].minor.yy360 = yymsp[0].minor.yy360; }
-        break;
-      case 249: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
-{ yylhsminor.yy360 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy360, yymsp[0].minor.yy360, NULL); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 252: /* table_primary ::= table_name alias_opt */
-{ yylhsminor.yy360 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy417, &yymsp[0].minor.yy417); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 253: /* table_primary ::= db_name NK_DOT table_name alias_opt */
-{ yylhsminor.yy360 = createRealTableNode(pCxt, &yymsp[-3].minor.yy417, &yymsp[-1].minor.yy417, &yymsp[0].minor.yy417); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 254: /* table_primary ::= subquery alias_opt */
-{ yylhsminor.yy360 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy360), &yymsp[0].minor.yy417); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 256: /* alias_opt ::= */
-{ yymsp[1].minor.yy417 = nil_token;  }
-        break;
-      case 257: /* alias_opt ::= table_alias */
-{ yylhsminor.yy417 = yymsp[0].minor.yy417; }
-  yymsp[0].minor.yy417 = yylhsminor.yy417;
-        break;
-      case 258: /* alias_opt ::= AS table_alias */
-{ yymsp[-1].minor.yy417 = yymsp[0].minor.yy417; }
-        break;
-      case 259: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-      case 260: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==260);
-{ yymsp[-2].minor.yy360 = yymsp[-1].minor.yy360; }
-        break;
-      case 261: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-{ yylhsminor.yy360 = createJoinTableNode(pCxt, yymsp[-4].minor.yy84, yymsp[-5].minor.yy360, yymsp[-2].minor.yy360, yymsp[0].minor.yy360); }
-  yymsp[-5].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 262: /* join_type ::= */
-{ yymsp[1].minor.yy84 = JOIN_TYPE_INNER; }
-        break;
-      case 263: /* join_type ::= INNER */
-{ yymsp[0].minor.yy84 = JOIN_TYPE_INNER; }
-        break;
-      case 264: /* 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 194: /* signed ::= NK_MINUS NK_INTEGER */
 { 
-                                                                                    yymsp[-8].minor.yy360 = createSelectStmt(pCxt, yymsp[-7].minor.yy345, yymsp[-6].minor.yy24, yymsp[-5].minor.yy360);
-                                                                                    yymsp[-8].minor.yy360 = addWhereClause(pCxt, yymsp[-8].minor.yy360, yymsp[-4].minor.yy360);
-                                                                                    yymsp[-8].minor.yy360 = addPartitionByClause(pCxt, yymsp[-8].minor.yy360, yymsp[-3].minor.yy24);
-                                                                                    yymsp[-8].minor.yy360 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy360, yymsp[-2].minor.yy360);
-                                                                                    yymsp[-8].minor.yy360 = addGroupByClause(pCxt, yymsp[-8].minor.yy360, yymsp[-1].minor.yy24);
-                                                                                    yymsp[-8].minor.yy360 = addHavingClause(pCxt, yymsp[-8].minor.yy360, yymsp[0].minor.yy360);
+                                                                                    SToken t = yymsp[-1].minor.yy0;
+                                                                                    t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
+                                                                                    yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
                                                                                   }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
-      case 266: /* set_quantifier_opt ::= DISTINCT */
-{ yymsp[0].minor.yy345 = true; }
+      case 195: /* signed ::= NK_FLOAT */
+{ yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
-      case 267: /* set_quantifier_opt ::= ALL */
-{ yymsp[0].minor.yy345 = false; }
+      case 196: /* signed ::= NK_PLUS NK_FLOAT */
+{ yymsp[-1].minor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
         break;
-      case 268: /* select_list ::= NK_STAR */
-{ yymsp[0].minor.yy24 = NULL; }
-        break;
-      case 272: /* select_item ::= common_expression */
-{
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy360);
-                                                                                    yylhsminor.yy360 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy360), &t);
-                                                                                  }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 273: /* select_item ::= common_expression column_alias */
-{ yylhsminor.yy360 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy360), &yymsp[0].minor.yy417); }
-  yymsp[-1].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 274: /* select_item ::= common_expression AS column_alias */
-{ yylhsminor.yy360 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), &yymsp[0].minor.yy417); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 275: /* select_item ::= table_name NK_DOT NK_STAR */
-{ yylhsminor.yy360 = createColumnNode(pCxt, &yymsp[-2].minor.yy417, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
-        break;
-      case 279: /* partition_by_clause_opt ::= PARTITION BY expression_list */
-      case 296: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==296);
-      case 306: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==306);
-{ yymsp[-2].minor.yy24 = yymsp[0].minor.yy24; }
-        break;
-      case 281: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy360 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy360), &yymsp[-1].minor.yy0); }
-        break;
-      case 282: /* twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
-{ yymsp[-3].minor.yy360 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy360)); }
-        break;
-      case 283: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-5].minor.yy360 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy360), NULL, yymsp[-1].minor.yy360, yymsp[0].minor.yy360); }
-        break;
-      case 284: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-7].minor.yy360 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy360), releaseRawExprNode(pCxt, yymsp[-3].minor.yy360), yymsp[-1].minor.yy360, yymsp[0].minor.yy360); }
-        break;
-      case 286: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-{ yymsp[-3].minor.yy360 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy360); }
-        break;
-      case 288: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
-{ yymsp[-3].minor.yy360 = createFillNode(pCxt, yymsp[-1].minor.yy358, NULL); }
-        break;
-      case 289: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-{ yymsp[-5].minor.yy360 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy24)); }
-        break;
-      case 290: /* fill_mode ::= NONE */
-{ yymsp[0].minor.yy358 = FILL_MODE_NONE; }
-        break;
-      case 291: /* fill_mode ::= PREV */
-{ yymsp[0].minor.yy358 = FILL_MODE_PREV; }
-        break;
-      case 292: /* fill_mode ::= NULL */
-{ yymsp[0].minor.yy358 = FILL_MODE_NULL; }
-        break;
-      case 293: /* fill_mode ::= LINEAR */
-{ yymsp[0].minor.yy358 = FILL_MODE_LINEAR; }
-        break;
-      case 294: /* fill_mode ::= NEXT */
-{ yymsp[0].minor.yy358 = FILL_MODE_NEXT; }
-        break;
-      case 297: /* group_by_list ::= expression */
-{ yylhsminor.yy24 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); }
-  yymsp[0].minor.yy24 = yylhsminor.yy24;
-        break;
-      case 298: /* group_by_list ::= group_by_list NK_COMMA expression */
-{ yylhsminor.yy24 = addNodeToList(pCxt, yymsp[-2].minor.yy24, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy360))); }
-  yymsp[-2].minor.yy24 = yylhsminor.yy24;
-        break;
-      case 301: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+      case 197: /* signed ::= NK_MINUS NK_FLOAT */
 { 
-                                                                                    yylhsminor.yy360 = addOrderByClause(pCxt, yymsp[-3].minor.yy360, yymsp[-2].minor.yy24);
-                                                                                    yylhsminor.yy360 = addSlimitClause(pCxt, yylhsminor.yy360, yymsp[-1].minor.yy360);
-                                                                                    yylhsminor.yy360 = addLimitClause(pCxt, yylhsminor.yy360, yymsp[0].minor.yy360);
+                                                                                    SToken t = yymsp[-1].minor.yy0;
+                                                                                    t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
+                                                                                    yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
                                                                                   }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
-      case 303: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-{ yylhsminor.yy360 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy360, yymsp[0].minor.yy360); }
-  yymsp[-3].minor.yy360 = yylhsminor.yy360;
+      case 199: /* signed_literal ::= NK_STRING */
+{ yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
-      case 308: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
-      case 312: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==312);
-{ yymsp[-1].minor.yy360 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+      case 200: /* signed_literal ::= NK_BOOL */
+{ yylhsminor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
-      case 309: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-      case 313: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==313);
-{ yymsp[-3].minor.yy360 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+      case 201: /* signed_literal ::= TIMESTAMP NK_STRING */
+{ yymsp[-1].minor.yy140 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
         break;
-      case 310: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-      case 314: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==314);
-{ yymsp[-3].minor.yy360 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+      case 202: /* signed_literal ::= duration_literal */
+      case 327: /* search_condition ::= common_expression */ yytestcase(yyruleno==327);
+{ yylhsminor.yy140 = releaseRawExprNode(pCxt, yymsp[0].minor.yy140); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
         break;
-      case 315: /* subquery ::= NK_LP query_expression NK_RP */
-{ yylhsminor.yy360 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy360); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+      case 216: /* expression ::= function_name NK_LP expression_list NK_RP */
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy149, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy149, yymsp[-1].minor.yy136)); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
         break;
-      case 316: /* search_condition ::= common_expression */
-{ yylhsminor.yy360 = releaseRawExprNode(pCxt, yymsp[0].minor.yy360); }
-  yymsp[0].minor.yy360 = yylhsminor.yy360;
+      case 217: /* expression ::= function_name NK_LP NK_STAR NK_RP */
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy149, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy149, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
         break;
-      case 319: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-{ yylhsminor.yy360 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy360), yymsp[-1].minor.yy130, yymsp[0].minor.yy73); }
-  yymsp[-2].minor.yy360 = yylhsminor.yy360;
+      case 219: /* expression ::= NK_LP expression NK_RP */
+      case 255: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==255);
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy140)); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
-      case 320: /* ordering_specification_opt ::= */
-{ yymsp[1].minor.yy130 = ORDER_ASC; }
+      case 220: /* expression ::= NK_PLUS expression */
+{
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy140));
+                                                                                  }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
-      case 321: /* ordering_specification_opt ::= ASC */
-{ yymsp[0].minor.yy130 = ORDER_ASC; }
+      case 221: /* expression ::= NK_MINUS expression */
+{
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[0].minor.yy140), NULL));
+                                                                                  }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
         break;
-      case 322: /* ordering_specification_opt ::= DESC */
-{ yymsp[0].minor.yy130 = ORDER_DESC; }
+      case 222: /* expression ::= expression NK_PLUS expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); 
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
         break;
-      case 323: /* null_ordering_opt ::= */
+      case 223: /* expression ::= expression NK_MINUS expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); 
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 224: /* expression ::= expression NK_STAR expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); 
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 225: /* expression ::= expression NK_SLASH expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); 
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 226: /* expression ::= expression NK_REM expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); 
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 227: /* expression_list ::= expression */
+{ yylhsminor.yy136 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy140)); }
+  yymsp[0].minor.yy136 = yylhsminor.yy136;
+        break;
+      case 228: /* expression_list ::= expression_list NK_COMMA expression */
+{ yylhsminor.yy136 = addNodeToList(pCxt, yymsp[-2].minor.yy136, releaseRawExprNode(pCxt, yymsp[0].minor.yy140)); }
+  yymsp[-2].minor.yy136 = yylhsminor.yy136;
+        break;
+      case 229: /* column_reference ::= column_name */
+{ yylhsminor.yy140 = createRawExprNode(pCxt, &yymsp[0].minor.yy149, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy149)); }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 230: /* column_reference ::= table_name NK_DOT column_name */
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy149, createColumnNode(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy149)); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 231: /* predicate ::= expression compare_op expression */
+      case 236: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==236);
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy320, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140)));
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 232: /* predicate ::= expression BETWEEN expression AND expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy140), releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140)));
+                                                                                  }
+  yymsp[-4].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 233: /* predicate ::= expression NOT BETWEEN expression AND expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[-5].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140)));
+                                                                                  }
+  yymsp[-5].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 234: /* predicate ::= expression IS NULL */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), NULL));
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 235: /* predicate ::= expression IS NOT NULL */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy140), NULL));
+                                                                                  }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 237: /* compare_op ::= NK_LT */
+{ yymsp[0].minor.yy320 = OP_TYPE_LOWER_THAN; }
+        break;
+      case 238: /* compare_op ::= NK_GT */
+{ yymsp[0].minor.yy320 = OP_TYPE_GREATER_THAN; }
+        break;
+      case 239: /* compare_op ::= NK_LE */
+{ yymsp[0].minor.yy320 = OP_TYPE_LOWER_EQUAL; }
+        break;
+      case 240: /* compare_op ::= NK_GE */
+{ yymsp[0].minor.yy320 = OP_TYPE_GREATER_EQUAL; }
+        break;
+      case 241: /* compare_op ::= NK_NE */
+{ yymsp[0].minor.yy320 = OP_TYPE_NOT_EQUAL; }
+        break;
+      case 242: /* compare_op ::= NK_EQ */
+{ yymsp[0].minor.yy320 = OP_TYPE_EQUAL; }
+        break;
+      case 243: /* compare_op ::= LIKE */
+{ yymsp[0].minor.yy320 = OP_TYPE_LIKE; }
+        break;
+      case 244: /* compare_op ::= NOT LIKE */
+{ yymsp[-1].minor.yy320 = OP_TYPE_NOT_LIKE; }
+        break;
+      case 245: /* compare_op ::= MATCH */
+{ yymsp[0].minor.yy320 = OP_TYPE_MATCH; }
+        break;
+      case 246: /* compare_op ::= NMATCH */
+{ yymsp[0].minor.yy320 = OP_TYPE_NMATCH; }
+        break;
+      case 247: /* in_op ::= IN */
+{ yymsp[0].minor.yy320 = OP_TYPE_IN; }
+        break;
+      case 248: /* in_op ::= NOT IN */
+{ yymsp[-1].minor.yy320 = OP_TYPE_NOT_IN; }
+        break;
+      case 249: /* in_predicate_value ::= NK_LP expression_list NK_RP */
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy136)); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 251: /* boolean_value_expression ::= NOT boolean_primary */
+{
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy140), NULL));
+                                                                                  }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 252: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140)));
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 253: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+{
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy140);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), releaseRawExprNode(pCxt, yymsp[0].minor.yy140)));
+                                                                                  }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 258: /* from_clause ::= FROM table_reference_list */
+      case 288: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==288);
+      case 311: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==311);
+{ yymsp[-1].minor.yy140 = yymsp[0].minor.yy140; }
+        break;
+      case 260: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+{ yylhsminor.yy140 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy140, yymsp[0].minor.yy140, NULL); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 263: /* table_primary ::= table_name alias_opt */
+{ yylhsminor.yy140 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy149, &yymsp[0].minor.yy149); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 264: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+{ yylhsminor.yy140 = createRealTableNode(pCxt, &yymsp[-3].minor.yy149, &yymsp[-1].minor.yy149, &yymsp[0].minor.yy149); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 265: /* table_primary ::= subquery alias_opt */
+{ yylhsminor.yy140 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy140), &yymsp[0].minor.yy149); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 267: /* alias_opt ::= */
+{ yymsp[1].minor.yy149 = nil_token;  }
+        break;
+      case 268: /* alias_opt ::= table_alias */
+{ yylhsminor.yy149 = yymsp[0].minor.yy149; }
+  yymsp[0].minor.yy149 = yylhsminor.yy149;
+        break;
+      case 269: /* alias_opt ::= AS table_alias */
+{ yymsp[-1].minor.yy149 = yymsp[0].minor.yy149; }
+        break;
+      case 270: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+      case 271: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==271);
+{ yymsp[-2].minor.yy140 = yymsp[-1].minor.yy140; }
+        break;
+      case 272: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+{ yylhsminor.yy140 = createJoinTableNode(pCxt, yymsp[-4].minor.yy144, yymsp[-5].minor.yy140, yymsp[-2].minor.yy140, yymsp[0].minor.yy140); }
+  yymsp[-5].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 273: /* join_type ::= */
+{ yymsp[1].minor.yy144 = JOIN_TYPE_INNER; }
+        break;
+      case 274: /* join_type ::= INNER */
+{ yymsp[0].minor.yy144 = JOIN_TYPE_INNER; }
+        break;
+      case 275: /* 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.yy140 = createSelectStmt(pCxt, yymsp[-7].minor.yy497, yymsp[-6].minor.yy136, yymsp[-5].minor.yy140);
+                                                                                    yymsp[-8].minor.yy140 = addWhereClause(pCxt, yymsp[-8].minor.yy140, yymsp[-4].minor.yy140);
+                                                                                    yymsp[-8].minor.yy140 = addPartitionByClause(pCxt, yymsp[-8].minor.yy140, yymsp[-3].minor.yy136);
+                                                                                    yymsp[-8].minor.yy140 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy140, yymsp[-2].minor.yy140);
+                                                                                    yymsp[-8].minor.yy140 = addGroupByClause(pCxt, yymsp[-8].minor.yy140, yymsp[-1].minor.yy136);
+                                                                                    yymsp[-8].minor.yy140 = addHavingClause(pCxt, yymsp[-8].minor.yy140, yymsp[0].minor.yy140);
+                                                                                  }
+        break;
+      case 277: /* set_quantifier_opt ::= DISTINCT */
+{ yymsp[0].minor.yy497 = true; }
+        break;
+      case 278: /* set_quantifier_opt ::= ALL */
+{ yymsp[0].minor.yy497 = false; }
+        break;
+      case 279: /* select_list ::= NK_STAR */
+{ yymsp[0].minor.yy136 = NULL; }
+        break;
+      case 283: /* select_item ::= common_expression */
+{
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy140);
+                                                                                    yylhsminor.yy140 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy140), &t);
+                                                                                  }
+  yymsp[0].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 284: /* select_item ::= common_expression column_alias */
+{ yylhsminor.yy140 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy140), &yymsp[0].minor.yy149); }
+  yymsp[-1].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 285: /* select_item ::= common_expression AS column_alias */
+{ yylhsminor.yy140 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), &yymsp[0].minor.yy149); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 286: /* select_item ::= table_name NK_DOT NK_STAR */
+{ yylhsminor.yy140 = createColumnNode(pCxt, &yymsp[-2].minor.yy149, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 290: /* partition_by_clause_opt ::= PARTITION BY expression_list */
+      case 307: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==307);
+      case 317: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==317);
+{ yymsp[-2].minor.yy136 = yymsp[0].minor.yy136; }
+        break;
+      case 292: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA NK_INTEGER NK_RP */
+{ yymsp[-5].minor.yy140 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy140), &yymsp[-1].minor.yy0); }
+        break;
+      case 293: /* twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
+{ yymsp[-3].minor.yy140 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy140)); }
+        break;
+      case 294: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-5].minor.yy140 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy140), NULL, yymsp[-1].minor.yy140, yymsp[0].minor.yy140); }
+        break;
+      case 295: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-7].minor.yy140 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy140), releaseRawExprNode(pCxt, yymsp[-3].minor.yy140), yymsp[-1].minor.yy140, yymsp[0].minor.yy140); }
+        break;
+      case 297: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+{ yymsp[-3].minor.yy140 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy140); }
+        break;
+      case 299: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+{ yymsp[-3].minor.yy140 = createFillNode(pCxt, yymsp[-1].minor.yy306, NULL); }
+        break;
+      case 300: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+{ yymsp[-5].minor.yy140 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy136)); }
+        break;
+      case 301: /* fill_mode ::= NONE */
+{ yymsp[0].minor.yy306 = FILL_MODE_NONE; }
+        break;
+      case 302: /* fill_mode ::= PREV */
+{ yymsp[0].minor.yy306 = FILL_MODE_PREV; }
+        break;
+      case 303: /* fill_mode ::= NULL */
+{ yymsp[0].minor.yy306 = FILL_MODE_NULL; }
+        break;
+      case 304: /* fill_mode ::= LINEAR */
+{ yymsp[0].minor.yy306 = FILL_MODE_LINEAR; }
+        break;
+      case 305: /* fill_mode ::= NEXT */
+{ yymsp[0].minor.yy306 = FILL_MODE_NEXT; }
+        break;
+      case 308: /* group_by_list ::= expression */
+{ yylhsminor.yy136 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); }
+  yymsp[0].minor.yy136 = yylhsminor.yy136;
+        break;
+      case 309: /* group_by_list ::= group_by_list NK_COMMA expression */
+{ yylhsminor.yy136 = addNodeToList(pCxt, yymsp[-2].minor.yy136, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy140))); }
+  yymsp[-2].minor.yy136 = yylhsminor.yy136;
+        break;
+      case 312: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+{ 
+                                                                                    yylhsminor.yy140 = addOrderByClause(pCxt, yymsp[-3].minor.yy140, yymsp[-2].minor.yy136);
+                                                                                    yylhsminor.yy140 = addSlimitClause(pCxt, yylhsminor.yy140, yymsp[-1].minor.yy140);
+                                                                                    yylhsminor.yy140 = addLimitClause(pCxt, yylhsminor.yy140, yymsp[0].minor.yy140);
+                                                                                  }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 314: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+{ yylhsminor.yy140 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy140, yymsp[0].minor.yy140); }
+  yymsp[-3].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 319: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+      case 323: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==323);
+{ yymsp[-1].minor.yy140 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+        break;
+      case 320: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+      case 324: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==324);
+{ yymsp[-3].minor.yy140 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+        break;
+      case 321: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+      case 325: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==325);
+{ yymsp[-3].minor.yy140 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+        break;
+      case 326: /* subquery ::= NK_LP query_expression NK_RP */
+{ yylhsminor.yy140 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy140); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 330: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+{ yylhsminor.yy140 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy140), yymsp[-1].minor.yy158, yymsp[0].minor.yy73); }
+  yymsp[-2].minor.yy140 = yylhsminor.yy140;
+        break;
+      case 331: /* ordering_specification_opt ::= */
+{ yymsp[1].minor.yy158 = ORDER_ASC; }
+        break;
+      case 332: /* ordering_specification_opt ::= ASC */
+{ yymsp[0].minor.yy158 = ORDER_ASC; }
+        break;
+      case 333: /* ordering_specification_opt ::= DESC */
+{ yymsp[0].minor.yy158 = ORDER_DESC; }
+        break;
+      case 334: /* null_ordering_opt ::= */
 { yymsp[1].minor.yy73 = NULL_ORDER_DEFAULT; }
         break;
-      case 324: /* null_ordering_opt ::= NULLS FIRST */
+      case 335: /* null_ordering_opt ::= NULLS FIRST */
 { yymsp[-1].minor.yy73 = NULL_ORDER_FIRST; }
         break;
-      case 325: /* null_ordering_opt ::= NULLS LAST */
+      case 336: /* null_ordering_opt ::= NULLS LAST */
 { yymsp[-1].minor.yy73 = NULL_ORDER_LAST; }
         break;
       default: