diff --git a/docs/en/12-taos-sql/05-insert.md b/docs/en/12-taos-sql/05-insert.md
index 462e7fc0ae..32227a2214 100644
--- a/docs/en/12-taos-sql/05-insert.md
+++ b/docs/en/12-taos-sql/05-insert.md
@@ -1,7 +1,7 @@
 ---
 title: Insert
 sidebar_label: Insert
-description: This document describes how to insert data into TDengine.
+description: This document describes the SQL commands and syntax for inserting data into TDengine.
 ---
 
 ## Syntax
diff --git a/docs/en/12-taos-sql/13-tmq.md b/docs/en/12-taos-sql/13-tmq.md
index d14b6da2d3..16dc9efd62 100644
--- a/docs/en/12-taos-sql/13-tmq.md
+++ b/docs/en/12-taos-sql/13-tmq.md
@@ -1,5 +1,5 @@
 ---
-title: Data Subscription
+title: Data Subscription SQL Reference
 sidebar_label: Data Subscription
 description: This document describes the SQL statements related to the data subscription component of TDengine.
 ---
diff --git a/docs/en/12-taos-sql/14-stream.md b/docs/en/12-taos-sql/14-stream.md
index e1bf18c854..c41839390f 100644
--- a/docs/en/12-taos-sql/14-stream.md
+++ b/docs/en/12-taos-sql/14-stream.md
@@ -1,5 +1,5 @@
 ---
-title: Stream Processing
+title: Stream Processing SQL Reference
 sidebar_label: Stream Processing
 description: This document describes the SQL statements related to the stream processing component of TDengine.
 ---
diff --git a/docs/en/12-taos-sql/26-udf.md b/docs/en/12-taos-sql/26-udf.md
index f86b535927..dec9ca217d 100644
--- a/docs/en/12-taos-sql/26-udf.md
+++ b/docs/en/12-taos-sql/26-udf.md
@@ -1,5 +1,5 @@
 ---
-title: User-Defined Functions (UDF)
+title: User-Defined Functions (UDF) SQL Reference
 sidebar_label: User-Defined Functions
 description: This document describes the SQL statements related to user-defined functions (UDF) in TDengine.
 ---
diff --git a/docs/en/14-reference/07-tdinsight/index.md b/docs/en/14-reference/07-tdinsight/index.md
index cada05d738..1bc983262e 100644
--- a/docs/en/14-reference/07-tdinsight/index.md
+++ b/docs/en/14-reference/07-tdinsight/index.md
@@ -1,5 +1,5 @@
 ---
-title: TDinsight - Grafana-based Zero-Dependency Monitoring Solution for TDengine
+title: TDinsight
 sidebar_label: TDinsight
 description: This document describes TDinsight, a monitoring solution for TDengine.
 ---
diff --git a/docs/en/25-application/01-telegraf.md b/docs/en/25-application/01-telegraf.md
index a6db826fa3..f8784e9ab9 100644
--- a/docs/en/25-application/01-telegraf.md
+++ b/docs/en/25-application/01-telegraf.md
@@ -1,5 +1,5 @@
 ---
-title: Quickly Build IT DevOps Visualization System with TDengine + Telegraf + Grafana
+title: IT Visualization with TDengine + Telegraf + Grafana
 sidebar_label: TDengine + Telegraf + Grafana
 description: This document describes how to create an IT visualization system by integrating TDengine with Telegraf and Grafana.
 ---
diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 290c90fde9..d13cc1405b 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -268,7 +268,7 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq2** pReq, const SSDataBlock* pData
 
 bool  alreadyAddGroupId(char* ctbName);
 bool  isAutoTableName(char* ctbName);
-void  buildCtbNameAddGroupId(char* ctbName, uint64_t groupId);
+void  buildCtbNameAddGroupId(const char* stbName, char* ctbName, uint64_t groupId);
 char* buildCtbNameByGroupId(const char* stbName, uint64_t groupId);
 int32_t buildCtbNameByGroupIdImpl(const char* stbName, uint64_t groupId, char* pBuf);
 
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index 5f3761d7b7..e7c6491b9d 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -61,7 +61,7 @@ typedef struct SStreamTask   SStreamTask;
 typedef struct SStreamQueue  SStreamQueue;
 typedef struct SStreamTaskSM SStreamTaskSM;
 
-#define SSTREAM_TASK_VER                  3
+#define SSTREAM_TASK_VER                  4
 #define SSTREAM_TASK_INCOMPATIBLE_VER     1
 #define SSTREAM_TASK_NEED_CONVERT_VER     2
 #define SSTREAM_TASK_SUBTABLE_CHANGED_VER 3
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index d2164b024b..e748cce643 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -2188,10 +2188,14 @@ _end:
   return TSDB_CODE_SUCCESS;
 }
 
-void buildCtbNameAddGroupId(char* ctbName, uint64_t groupId) {
+void  buildCtbNameAddGroupId(const char* stbName, char* ctbName, uint64_t groupId){
   char tmp[TSDB_TABLE_NAME_LEN] = {0};
-  snprintf(tmp, TSDB_TABLE_NAME_LEN, "_%" PRIu64, groupId);
-  ctbName[TSDB_TABLE_NAME_LEN - strlen(tmp) - 1] = 0;  // put groupId to the end
+  if (stbName == NULL){
+    snprintf(tmp, TSDB_TABLE_NAME_LEN, "_%"PRIu64, groupId);
+  }else{
+    snprintf(tmp, TSDB_TABLE_NAME_LEN, "_%s_%"PRIu64, stbName, groupId);
+  }
+  ctbName[TSDB_TABLE_NAME_LEN - strlen(tmp) - 1] = 0;  // put stbname + groupId to the end
   strcat(ctbName, tmp);
 }
 
@@ -2201,6 +2205,7 @@ bool isAutoTableName(char* ctbName) { return (strlen(ctbName) == 34 && ctbName[0
 
 bool alreadyAddGroupId(char* ctbName) {
   size_t len = strlen(ctbName);
+  if (len == 0) return false;
   size_t _location = len - 1;
   while (_location > 0) {
     if (ctbName[_location] < '0' || ctbName[_location] > '9') {
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index f0010d9a1d..3fd8d53885 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -51,8 +51,8 @@
 
 #define ENCODESQL()                                                        \
   do {                                                                     \
+    if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1;                 \
     if (pReq->sqlLen > 0 && pReq->sql != NULL) {                           \
-      if (tEncodeI32(&encoder, pReq->sqlLen) < 0) return -1;               \
       if (tEncodeBinary(&encoder, pReq->sql, pReq->sqlLen) < 0) return -1; \
     }                                                                      \
   } while (0)
@@ -3025,7 +3025,7 @@ int32_t tSerializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq) {
 
   ENCODESQL();
 
-  if (tEncodeI32(&encoder, pReq->withArbitrator) < 0) return -1;
+  if (tEncodeI8(&encoder, pReq->withArbitrator) < 0) return -1;
 
   tEndEncode(&encoder);
 
@@ -3140,7 +3140,7 @@ int32_t tSerializeSAlterDbReq(void *buf, int32_t bufLen, SAlterDbReq *pReq) {
   if (tEncodeI32(&encoder, pReq->walRetentionSize) < 0) return -1;
   if (tEncodeI32(&encoder, pReq->keepTimeOffset) < 0) return -1;
   ENCODESQL();
-  if (tEncodeI32(&encoder, pReq->withArbitrator) < 0) return -1;
+  if (tEncodeI8(&encoder, pReq->withArbitrator) < 0) return -1;
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
diff --git a/source/dnode/mnode/impl/inc/mndArbGroup.h b/source/dnode/mnode/impl/inc/mndArbGroup.h
index ed852cf581..fcd11310e7 100644
--- a/source/dnode/mnode/impl/inc/mndArbGroup.h
+++ b/source/dnode/mnode/impl/inc/mndArbGroup.h
@@ -35,6 +35,7 @@ int32_t mndSetCreateArbGroupRedoLogs(STrans *pTrans, SArbGroup *pGroup);
 int32_t mndSetCreateArbGroupUndoLogs(STrans *pTrans, SArbGroup *pGroup);
 int32_t mndSetCreateArbGroupCommitLogs(STrans *pTrans, SArbGroup *pGroup);
 
+int32_t mndSetDropArbGroupPrepareLogs(STrans *pTrans, SArbGroup *pGroup);
 int32_t mndSetDropArbGroupCommitLogs(STrans *pTrans, SArbGroup *pGroup);
 
 bool mndUpdateArbGroupByHeartBeat(SArbGroup *pGroup, SVArbHbRspMember *pRspMember, int64_t nowMs, int32_t dnodeId,
diff --git a/source/dnode/mnode/impl/src/mndArbGroup.c b/source/dnode/mnode/impl/src/mndArbGroup.c
index e056e698f3..92ab5274e4 100644
--- a/source/dnode/mnode/impl/src/mndArbGroup.c
+++ b/source/dnode/mnode/impl/src/mndArbGroup.c
@@ -260,6 +260,14 @@ int32_t mndSetCreateArbGroupCommitLogs(STrans *pTrans, SArbGroup *pGroup) {
   return 0;
 }
 
+int32_t mndSetDropArbGroupPrepareLogs(STrans *pTrans, SArbGroup *pGroup) {
+  SSdbRaw *pRedoRaw = mndArbGroupActionEncode(pGroup);
+  if (pRedoRaw == NULL) return -1;
+  if (mndTransAppendPrepareLog(pTrans, pRedoRaw) != 0) return -1;
+  if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING) != 0) return -1;
+  return 0;
+}
+
 static int32_t mndSetDropArbGroupRedoLogs(STrans *pTrans, SArbGroup *pGroup) {
   SSdbRaw *pRedoRaw = mndArbGroupActionEncode(pGroup);
   if (pRedoRaw == NULL) return -1;
@@ -535,10 +543,10 @@ static int32_t mndProcessArbCheckSyncTimer(SRpcMsg *pReq) {
     int32_t vgId = arbGroupDup.vgId;
     int64_t nowMs = taosGetTimestampMs();
 
-    bool    member0IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 0, nowMs);
-    bool    member1IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 1, nowMs);
-    SArbAssignedLeader* pAssignedLeader = &arbGroupDup.assignedLeader;
-    int32_t currentAssignedDnodeId = pAssignedLeader->dnodeId;
+    bool                member0IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 0, nowMs);
+    bool                member1IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 1, nowMs);
+    SArbAssignedLeader *pAssignedLeader = &arbGroupDup.assignedLeader;
+    int32_t             currentAssignedDnodeId = pAssignedLeader->dnodeId;
 
     // 1. has assigned && is sync => send req
     if (currentAssignedDnodeId != 0 && arbGroupDup.isSync == true) {
@@ -667,9 +675,16 @@ static int32_t mndProcessArbUpdateGroupReq(SRpcMsg *pReq) {
   memcpy(newGroup.assignedLeader.token, req.assignedLeader.token, TSDB_ARB_TOKEN_SIZE);
   newGroup.version = req.version;
 
-  SMnode *pMnode = pReq->info.node;
+  SMnode    *pMnode = pReq->info.node;
+  SArbGroup *pOldGroup = sdbAcquire(pMnode->pSdb, SDB_ARBGROUP, &newGroup.vgId);
+  if (!pOldGroup) {
+    mInfo("vgId:%d, arb skip to update arbgroup, since no obj found", newGroup.vgId);
+    return 0;
+  }
+  sdbRelease(pMnode->pSdb, pOldGroup);
+
   if (mndArbGroupUpdateTrans(pMnode, &newGroup) != 0) {
-    mError("vgId:%d, arb failed to update arbgroup, since %s", req.vgId, terrstr());
+    mError("vgId:%d, arb failed to update arbgroup, since %s", newGroup.vgId, terrstr());
     ret = -1;
   }
 
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index a1f3a24661..527105a7b8 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -1209,6 +1209,25 @@ static int32_t mndSetDropDbPrepareLogs(SMnode *pMnode, STrans *pTrans, SDbObj *p
   if (mndTransAppendPrepareLog(pTrans, pRedoRaw) != 0) return -1;
   if (sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING) != 0) return -1;
 
+  SSdb *pSdb = pMnode->pSdb;
+  void *pIter = NULL;
+
+  while (1) {
+    SArbGroup *pArbGroup = NULL;
+    pIter = sdbFetch(pSdb, SDB_ARBGROUP, pIter, (void **)&pArbGroup);
+    if (pIter == NULL) break;
+
+    if (pArbGroup->dbUid == pDb->uid) {
+      if (mndSetDropArbGroupPrepareLogs(pTrans,pArbGroup) != 0) {
+        sdbCancelFetch(pSdb, pIter);
+        sdbRelease(pSdb, pArbGroup);
+        return -1;
+      }
+    }
+
+    sdbRelease(pSdb, pArbGroup);
+  }
+
   return 0;
 }
 
diff --git a/source/dnode/mnode/impl/src/mndDef.c b/source/dnode/mnode/impl/src/mndDef.c
index 3f69c7def3..091edc6ab0 100644
--- a/source/dnode/mnode/impl/src/mndDef.c
+++ b/source/dnode/mnode/impl/src/mndDef.c
@@ -72,7 +72,9 @@ int32_t tEncodeSStreamObj(SEncoder *pEncoder, const SStreamObj *pObj) {
     if (tEncodeI32(pEncoder, innerSz) < 0) return -1;
     for (int32_t j = 0; j < innerSz; j++) {
       SStreamTask *pTask = taosArrayGetP(pArray, j);
-      pTask->ver = SSTREAM_TASK_VER;
+      if (pTask->ver < SSTREAM_TASK_SUBTABLE_CHANGED_VER){
+        pTask->ver = SSTREAM_TASK_VER;
+      }
       if (tEncodeStreamTask(pEncoder, pTask) < 0) return -1;
     }
   }
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 7ee1b36916..79c62df766 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -1104,14 +1104,16 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
       } else if (createReq.tagVer > 0 || createReq.colVer > 0) {
         int32_t tagDelta = createReq.tagVer - pStb->tagVer;
         int32_t colDelta = createReq.colVer - pStb->colVer;
-        int32_t verDelta = tagDelta + colDelta;
         mInfo("stb:%s, already exist while create, input tagVer:%d colVer:%d, exist tagVer:%d colVer:%d",
               createReq.name, createReq.tagVer, createReq.colVer, pStb->tagVer, pStb->colVer);
         if (tagDelta <= 0 && colDelta <= 0) {
           mInfo("stb:%s, schema version is not incremented and nothing needs to be done", createReq.name);
           code = 0;
           goto _OVER;
-        } else if ((tagDelta == 1 || colDelta == 1) && (verDelta == 1)) {
+        } else if ((tagDelta == 1 && colDelta == 0) ||
+                   (tagDelta == 0 && colDelta == 1) ||
+                   (pStb->colVer == 1 && createReq.colVer > 1) ||
+                   (pStb->tagVer == 1 && createReq.tagVer > 1)) {
           isAlter = true;
           mInfo("stb:%s, schema version is only increased by 1 number, do alter operation", createReq.name);
         } else {
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 9c86ecdbdd..de9f626b78 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -475,7 +475,9 @@ int32_t mndPersistTaskDeployReq(STrans *pTrans, SStreamTask *pTask) {
   SEncoder encoder;
   tEncoderInit(&encoder, NULL, 0);
 
-  pTask->ver = SSTREAM_TASK_VER;
+  if (pTask->ver < SSTREAM_TASK_SUBTABLE_CHANGED_VER){
+    pTask->ver = SSTREAM_TASK_VER;
+  }
   tEncodeStreamTask(&encoder, pTask);
 
   int32_t size = encoder.pos;
@@ -2194,41 +2196,60 @@ int32_t mndProcessStreamReqCheckpoint(SRpcMsg *pReq) {
 
   SStreamObj *pStream = mndGetStreamObj(pMnode, req.streamId);
   if (pStream == NULL) {
-    mError("failed to find the stream:0x%" PRIx64 " not handle the checkpoint req", req.streamId);
-    terrno = TSDB_CODE_MND_STREAM_NOT_EXIST;
-    taosThreadMutexUnlock(&execInfo.lock);
+    mWarn("failed to find the stream:0x%" PRIx64 ", not handle the checkpoint req, try to acquire in buf", req.streamId);
 
-    return -1;
+    // not in meta-store yet, try to acquire the task in exec buffer
+    // the checkpoint req arrives too soon before the completion of the create stream trans.
+    STaskId id = {.streamId = req.streamId, .taskId = req.taskId};
+    void* p = taosHashGet(execInfo.pTaskMap, &id, sizeof(id));
+    if (p == NULL) {
+      mError("failed to find the stream:0x%" PRIx64 " in buf, not handle the checkpoint req", req.streamId);
+      terrno = TSDB_CODE_MND_STREAM_NOT_EXIST;
+      taosThreadMutexUnlock(&execInfo.lock);
+      return -1;
+    } else {
+      mDebug("s-task:0x%" PRIx64 "-0x%x in buf not in mnode/meta, create stream trans may not complete yet",
+             req.streamId, req.taskId);
+    }
   }
 
-  int32_t  numOfTasks = mndGetNumOfStreamTasks(pStream);
+  int32_t numOfTasks = (pStream == NULL)? 0: mndGetNumOfStreamTasks(pStream);
+
   SArray **pReqTaskList = (SArray **)taosHashGet(execInfo.pTransferStateStreams, &req.streamId, sizeof(req.streamId));
   if (pReqTaskList == NULL) {
     SArray *pList = taosArrayInit(4, sizeof(int32_t));
-    doAddTaskId(pList, req.taskId, pStream->uid, numOfTasks);
+    doAddTaskId(pList, req.taskId, req.streamId, numOfTasks);
     taosHashPut(execInfo.pTransferStateStreams, &req.streamId, sizeof(int64_t), &pList, sizeof(void *));
 
     pReqTaskList = (SArray **)taosHashGet(execInfo.pTransferStateStreams, &req.streamId, sizeof(req.streamId));
   } else {
-    doAddTaskId(*pReqTaskList, req.taskId, pStream->uid, numOfTasks);
+    doAddTaskId(*pReqTaskList, req.taskId, req.streamId, numOfTasks);
   }
 
   int32_t total = taosArrayGetSize(*pReqTaskList);
   if (total == numOfTasks) {  // all tasks has send the reqs
     int64_t checkpointId = mndStreamGenChkpId(pMnode);
-    mDebug("stream:0x%" PRIx64 " all tasks req, start checkpointId:%" PRId64, pStream->uid, checkpointId);
+    mInfo("stream:0x%" PRIx64 " all tasks req checkpoint, start checkpointId:%" PRId64, req.streamId, checkpointId);
 
-    // TODO:handle error
-    int32_t code = mndProcessStreamCheckpointTrans(pMnode, pStream, checkpointId, 0, false);
+    if (pStream != NULL) { // TODO:handle error
+      int32_t code = mndProcessStreamCheckpointTrans(pMnode, pStream, checkpointId, 0, false);
+    } else {
+      // todo: wait for the create stream trans completed, and launch the checkpoint trans
+      // SStreamObj *pStream = mndGetStreamObj(pMnode, req.streamId);
+      // sleep(500ms)
+    }
 
     // remove this entry
     taosHashRemove(execInfo.pTransferStateStreams, &req.streamId, sizeof(int64_t));
 
     int32_t numOfStreams = taosHashGetSize(execInfo.pTransferStateStreams);
-    mDebug("stream:0x%" PRIx64 " removed, remain streams:%d fill-history not completed", pStream->uid, numOfStreams);
+    mDebug("stream:0x%" PRIx64 " removed, remain streams:%d fill-history not completed", req.streamId, numOfStreams);
+  }
+
+  if (pStream != NULL) {
+    mndReleaseStream(pMnode, pStream);
   }
 
-  mndReleaseStream(pMnode, pStream);
   taosThreadMutexUnlock(&execInfo.lock);
 
   {
diff --git a/source/dnode/vnode/src/meta/metaSnapshot.c b/source/dnode/vnode/src/meta/metaSnapshot.c
index e86ed3b657..5850e794fa 100644
--- a/source/dnode/vnode/src/meta/metaSnapshot.c
+++ b/source/dnode/vnode/src/meta/metaSnapshot.c
@@ -79,6 +79,7 @@ int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
   int32_t     nKey = 0;
   int32_t     nData = 0;
   STbDbKey    key;
+  SMetaInfo   info;
 
   *ppData = NULL;
   for (;;) {
@@ -91,7 +92,8 @@ int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
       goto _exit;
     }
 
-    if (key.version < pReader->sver) {
+    if (key.version < pReader->sver  //
+        || metaGetInfo(pReader->pMeta, key.uid, &info, NULL) == TSDB_CODE_NOT_FOUND) {
       tdbTbcMoveToNext(pReader->pTbc);
       continue;
     }
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 141fe88339..3a321fef79 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -101,10 +101,7 @@ int32_t tqInitialize(STQ* pTq) {
     return -1;
   }
 
-  if (streamMetaLoadAllTasks(pTq->pStreamMeta) < 0) {
-    return -1;
-  }
-
+  /*int32_t code = */streamMetaLoadAllTasks(pTq->pStreamMeta);
   return 0;
 }
 
diff --git a/source/dnode/vnode/src/tq/tqSink.c b/source/dnode/vnode/src/tq/tqSink.c
index ade7958f8a..7f5ddf4f1e 100644
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@@ -71,8 +71,8 @@ int32_t tqBuildDeleteReq(STQ* pTq, const char* stbFullName, const SSDataBlock* p
     if (varTbName != NULL && varTbName != (void*)-1) {
       name = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN);
       memcpy(name, varDataVal(varTbName), varDataLen(varTbName));
-      if (newSubTableRule && !isAutoTableName(name) && !alreadyAddGroupId(name) && groupId != 0) {
-        buildCtbNameAddGroupId(name, groupId);
+      if (newSubTableRule && !isAutoTableName(name) && !alreadyAddGroupId(name) && groupId != 0 && stbFullName) {
+        buildCtbNameAddGroupId(stbFullName, name, groupId);
       }
     } else if (stbFullName) {
       name = buildCtbNameByGroupId(stbFullName, groupId);
@@ -182,10 +182,10 @@ void setCreateTableMsgTableName(SVCreateTbReq* pCreateTableReq, SSDataBlock* pDa
                                 int64_t gid, bool newSubTableRule) {
   if (pDataBlock->info.parTbName[0]) {
     if (newSubTableRule && !isAutoTableName(pDataBlock->info.parTbName) &&
-        !alreadyAddGroupId(pDataBlock->info.parTbName) && gid != 0) {
+        !alreadyAddGroupId(pDataBlock->info.parTbName) && gid != 0 && stbFullName) {
       pCreateTableReq->name = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN);
       strcpy(pCreateTableReq->name, pDataBlock->info.parTbName);
-      buildCtbNameAddGroupId(pCreateTableReq->name, gid);
+      buildCtbNameAddGroupId(stbFullName, pCreateTableReq->name, gid);
 //      tqDebug("gen name from:%s", pDataBlock->info.parTbName);
     } else {
       pCreateTableReq->name = taosStrdup(pDataBlock->info.parTbName);
@@ -672,10 +672,14 @@ int32_t setDstTableDataUid(SVnode* pVnode, SStreamTask* pTask, SSDataBlock* pDat
       memset(dstTableName, 0, TSDB_TABLE_NAME_LEN);
       buildCtbNameByGroupIdImpl(stbFullName, groupId, dstTableName);
     } else {
-      if (pTask->ver >= SSTREAM_TASK_SUBTABLE_CHANGED_VER && pTask->subtableWithoutMd5 != 1 &&
-          !isAutoTableName(dstTableName) && !alreadyAddGroupId(dstTableName) && groupId != 0) {
+      if (pTask->subtableWithoutMd5 != 1 && !isAutoTableName(dstTableName) &&
+          !alreadyAddGroupId(dstTableName) && groupId != 0) {
         tqDebug("s-task:%s append groupId:%" PRId64 " for generated dstTable:%s", id, groupId, dstTableName);
-        buildCtbNameAddGroupId(dstTableName, groupId);
+        if(pTask->ver == SSTREAM_TASK_SUBTABLE_CHANGED_VER){
+          buildCtbNameAddGroupId(NULL, dstTableName, groupId);
+        }else if(pTask->ver > SSTREAM_TASK_SUBTABLE_CHANGED_VER && stbFullName) {
+          buildCtbNameAddGroupId(stbFullName, dstTableName, groupId);
+        }
       }
     }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 2b8de9aff3..201425cf89 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -695,8 +695,8 @@ SColVal *tsdbRowIterNext(STSDBRowIter *pIter) {
       return &pIter->cv;
     }
 
-    if (pIter->iColData < pIter->pRow->pBlockData->nColData) {
-      tColDataGetValue(&pIter->pRow->pBlockData->aColData[pIter->iColData], pIter->pRow->iRow, &pIter->cv);
+    if (pIter->iColData <= pIter->pRow->pBlockData->nColData) {
+      tColDataGetValue(&pIter->pRow->pBlockData->aColData[pIter->iColData - 1], pIter->pRow->iRow, &pIter->cv);
       ++pIter->iColData;
       return &pIter->cv;
     } else {
diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index 69a90f03ed..a5e27e1910 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
@@ -879,7 +879,7 @@ static int32_t sysTableGetGeomText(char* iGeom, int32_t nGeom, char** output, in
   char*   outputWKT = NULL;
 
   if (nGeom == 0) {
-    if (!(*output = strdup(""))) code = TSDB_CODE_OUT_OF_MEMORY;
+    if (!(*output = taosStrdup(""))) code = TSDB_CODE_OUT_OF_MEMORY;
     *nOutput = 0;
     return code;
   }
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 7a69866f0e..2c60c1261b 100755
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -758,16 +758,52 @@ insert_query(A) ::= INSERT INTO full_table_name(C) query_or_subquery(B).
 
 /************************************************ tags_literal *************************************************************/
 tags_literal(A) ::= NK_INTEGER(B).                                                { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &B, NULL); }
+tags_literal(A) ::= NK_INTEGER(B) NK_PLUS duration_literal(C).                    {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_INTEGER(B) NK_MINUS duration_literal(C).                   {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_PLUS(B) NK_INTEGER(C).                                     {
                                                                                     SToken t = B;
                                                                                     t.n = (C.z + C.n) - B.z;
                                                                                     A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &t, NULL);
                                                                                   }
+tags_literal(A) ::= NK_PLUS(B) NK_INTEGER NK_PLUS duration_literal(C).            {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_PLUS(B) NK_INTEGER NK_MINUS duration_literal(C).           {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_MINUS(B) NK_INTEGER(C).                                    {
                                                                                     SToken t = B;
                                                                                     t.n = (C.z + C.n) - B.z;
                                                                                     A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &t, NULL);
                                                                                   }
+tags_literal(A) ::= NK_MINUS(B) NK_INTEGER NK_PLUS duration_literal(C).           {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_MINUS(B) NK_INTEGER NK_MINUS duration_literal(C).          {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_FLOAT(B).                                                  { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &B, NULL); }
 tags_literal(A) ::= NK_PLUS(B) NK_FLOAT(C).                                       {
                                                                                     SToken t = B;
@@ -781,29 +817,113 @@ tags_literal(A) ::= NK_MINUS(B) NK_FLOAT(C).
                                                                                   }
 
 tags_literal(A) ::= NK_BIN(B).                                                    { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &B, NULL); }
+tags_literal(A) ::= NK_BIN(B) NK_PLUS duration_literal(C).                        {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_BIN(B) NK_MINUS duration_literal(C).                       {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_PLUS(B) NK_BIN(C).                                         {
                                                                                     SToken t = B;
                                                                                     t.n = (C.z + C.n) - B.z;
                                                                                     A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &t, NULL);
                                                                                   }
+tags_literal(A) ::= NK_PLUS(B) NK_BIN NK_PLUS duration_literal(C).                {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_PLUS(B) NK_BIN NK_MINUS duration_literal(C).               {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_MINUS(B) NK_BIN(C).                                        {
                                                                                     SToken t = B;
                                                                                     t.n = (C.z + C.n) - B.z;
                                                                                     A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &t, NULL);
                                                                                   }
+tags_literal(A) ::= NK_MINUS(B) NK_BIN NK_PLUS duration_literal(C).               {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_MINUS(B) NK_BIN NK_MINUS duration_literal(C).              {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_HEX(B).                                                    { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &B, NULL); }
+tags_literal(A) ::= NK_HEX(B) NK_PLUS duration_literal(C).                        {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_HEX(B) NK_MINUS duration_literal(C).                       {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_PLUS(B) NK_HEX(C).                                         {
                                                                                     SToken t = B;
                                                                                     t.n = (C.z + C.n) - B.z;
                                                                                     A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &t, NULL);
                                                                                   }
+tags_literal(A) ::= NK_PLUS(B) NK_HEX NK_PLUS duration_literal(C).                {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_PLUS(B) NK_HEX NK_MINUS duration_literal(C).               {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_MINUS(B) NK_HEX(C).                                        {
                                                                                     SToken t = B;
                                                                                     t.n = (C.z + C.n) - B.z;
                                                                                     A = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &t, NULL);
                                                                                   }
+tags_literal(A) ::= NK_MINUS(B) NK_HEX NK_PLUS duration_literal(C).               {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_MINUS(B) NK_HEX NK_MINUS duration_literal(C).              {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 
 tags_literal(A) ::= NK_STRING(B).                                                 { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B, NULL); }
+tags_literal(A) ::= NK_STRING(B) NK_PLUS duration_literal(C).                     {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
+tags_literal(A) ::= NK_STRING(B) NK_MINUS duration_literal(C).                    {
+                                                                                    SToken l = B;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, C);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    A = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, C);
+                                                                                  }
 tags_literal(A) ::= NK_BOOL(B).                                                   { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &B, NULL); }
 tags_literal(A) ::= NULL(B).                                                      { A = createRawValueNode(pCxt, TSDB_DATA_TYPE_NULL, &B, NULL); }
 
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index 3dae58c907..2c1826a3ff 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -495,18 +495,18 @@ typedef union {
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
 #define YYFALLBACK 1
-#define YYNSTATE             865
-#define YYNRULE              676
-#define YYNRULE_WITH_ACTION  676
+#define YYNSTATE             895
+#define YYNRULE              696
+#define YYNRULE_WITH_ACTION  696
 #define YYNTOKEN             355
-#define YY_MAX_SHIFT         864
-#define YY_MIN_SHIFTREDUCE   1290
-#define YY_MAX_SHIFTREDUCE   1965
-#define YY_ERROR_ACTION      1966
-#define YY_ACCEPT_ACTION     1967
-#define YY_NO_ACTION         1968
-#define YY_MIN_REDUCE        1969
-#define YY_MAX_REDUCE        2644
+#define YY_MAX_SHIFT         894
+#define YY_MIN_SHIFTREDUCE   1330
+#define YY_MAX_SHIFTREDUCE   2025
+#define YY_ERROR_ACTION      2026
+#define YY_ACCEPT_ACTION     2027
+#define YY_NO_ACTION         2028
+#define YY_MIN_REDUCE        2029
+#define YY_MAX_REDUCE        2724
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -575,317 +575,317 @@ typedef union {
 *********** Begin parsing tables **********************************************/
 #define YY_ACTTAB_COUNT (3107)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   795,  475,   37,  311,  714,  575,  474, 2615,  576, 2012,
- /*    10 */  2299,  429,   47,   45, 1887, 2402, 2148,  186,  427,  166,
- /*    20 */   420, 1970, 1727,  726,  147,  713,  205, 2161, 2297,  751,
- /*    30 */  2616,  715, 2248, 2150, 1752, 1813, 2055, 1725,  580,  391,
- /*    40 */  2299, 2279,  128, 2443,  577,  127,  126,  125,  124,  123,
- /*    50 */   122,  121,  120,  119,  685,  423,  729, 2615, 2296,  751,
- /*    60 */  1753, 1337,   40,   39,  709, 1808,   46,   44,   43,   42,
- /*    70 */    41,   19,  426,  406, 2346, 2621,  205,  708, 1733,  763,
- /*    80 */  2616,  715, 2213,  768, 2461, 1335, 1336,   40,   39,  389,
- /*    90 */   426,   46,   44,   43,   42,   41, 2409, 2211,  746,  583,
- /*   100 */   664,  768,  576, 2012,  861, 2461,  175,   15,  763,  836,
- /*   110 */   835,  834,  833,  438, 2098,  832,  831,  152,  826,  825,
- /*   120 */   824,  823,  822,  821,  820,  151,  814,  813,  812,  437,
- /*   130 */   436,  809,  808,  807,  185,  184,  806,  303, 2542,  725,
- /*   140 */  2442,  139,  724, 2480, 2615, 1815, 1816,  115, 2444,  750,
- /*   150 */  2446, 2447,  745,  174,  768, 2347,  424, 2403,  345,  188,
- /*   160 */   161, 2534,  713,  205,  173,  416, 2530, 2616,  715,  572,
- /*   170 */   707,  714, 2161,   62, 2615,  343,   75,  668,  570,   74,
- /*   180 */   207,  566,  562, 1787, 1797, 1530, 1531, 1931, 2564,  372,
- /*   190 */  1814, 1817,  713,  205, 1330,   50,  518, 2616,  715,  459,
- /*   200 */   517,  238,  557,  555,  552, 1728,  431, 1726,  516, 2206,
- /*   210 */  2208,   40,   39, 1337,  426,   46,   44,   43,   42,   41,
- /*   220 */   176,  669, 1981,  128, 2619,  768,  127,  126,  125,  124,
- /*   230 */   123,  122,  121,  120,  119,   54, 1332, 1335, 1336, 1731,
- /*   240 */  1732, 1784,   62, 1786, 1789, 1790, 1791, 1792, 1793, 1794,
- /*   250 */  1795, 1796,  742,  766,  765, 1807, 1809, 1810, 1811, 1812,
- /*   260 */     2,   47,   45, 1969,  819,  763,  369, 2120, 1750,  420,
- /*   270 */   473, 1727,  472,  240,  381,  525,  482,  578,  545, 2020,
- /*   280 */   764, 2159,   63,  544, 1813, 1784, 1725,  137,  136,  135,
- /*   290 */   134,  133,  132,  131,  130,  129,  585, 2338,   33,  505,
- /*   300 */   210,  546,  471,  591,   40,   39,  370,  507,   46,   44,
- /*   310 */    43,   42,   41, 2620, 1808, 1752, 2615,  485, 1842,  242,
- /*   320 */    19,  542,  540,  578,  371, 2020, 1755, 1733,  219, 2213,
- /*   330 */   463, 2370,   85,   84,  478, 2619,  415,  218,  113, 2616,
- /*   340 */  2618,   40,   39,  307, 2211,   46,   44,   43,   42,   41,
- /*   350 */   470,  468,   50,  861,  392,  150,   15,  465,  461, 1495,
- /*   360 */  1891,  368,  198, 2151,  457,  493, 1752,  454,  450,  446,
- /*   370 */   443,  471,  186,  665, 2200, 1486,  793,  792,  791, 1490,
- /*   380 */   790, 1492, 1493,  789,  786, 1843, 1501,  783, 1503, 1504,
- /*   390 */   780,  777,  774, 1339, 1815, 1816, 2280, 2286, 2265, 1751,
- /*   400 */   533,  532,  531,  530,  529,  524,  523,  522,  521,  375,
- /*   410 */   435,  434,  307,  511,  510,  509,  508,  502,  501,  500,
- /*   420 */   595,  495,  494,  390,   66,  726,  147,  486, 1590, 1591,
- /*   430 */  1920,   96, 1787, 1797, 1609, 1734, 2373,   40,   39, 1814,
- /*   440 */  1817,   46,   44,   43,   42,   41,  315,  316,  393, 1756,
- /*   450 */  1752,  314,   35,  666, 1728, 1753, 1726, 2154,   40,   39,
- /*   460 */   726,  147,   46,   44,   43,   42,   41,   36,  418, 1837,
- /*   470 */  1838, 1839, 1840, 1841, 1845, 1846, 1847, 1848, 1602, 1603,
- /*   480 */   701,  700, 1918, 1919, 1921, 1922, 1923,  448, 1731, 1732,
- /*   490 */  1784,  305, 1786, 1789, 1790, 1791, 1792, 1793, 1794, 1795,
- /*   500 */  1796,  742,  766,  765, 1807, 1809, 1810, 1811, 1812,    2,
- /*   510 */    12,   47,   45, 2443,  275, 1356, 2213, 1355,  274,  420,
- /*   520 */   717, 1727,  307,  425,   62, 2620,  747,   62, 2615, 1788,
- /*   530 */  1962, 2211,  143,  258, 1813,  816, 1725,   62,  644,  204,
- /*   540 */  2542, 2543, 2443,  145, 2547,  764, 2159, 2619,   12,  181,
- /*   550 */  1357, 2616, 2617,  656, 2461,  729,   14,   13,  612,  608,
- /*   560 */   604,  600,  212,  257, 1808,   55, 2409, 1912,  746,  273,
- /*   570 */    19,   51,  704,  728,  203, 2542, 2543, 1733,  145, 2547,
- /*   580 */  1622, 1623, 1913, 2461,  287,  647,  669, 1785,   99,  764,
- /*   590 */  2159,  378,  641,  639,  404, 2409,  657,  746, 2620,  270,
- /*   600 */   818, 1992, 1823,  861,   97, 1737,   15,  255, 1752,  138,
- /*   610 */  2442, 1707, 2549, 2480,  201, 1755,  618,  115, 2444,  750,
- /*   620 */  2446, 2447,  745, 1911,  768, 1621, 1624,  149,  101,  157,
- /*   630 */  2505, 2534,  764, 2159,  154,  416, 2530, 1961, 2546, 2442,
- /*   640 */    71, 2351, 2480,   70, 1815, 1816,  115, 2444,  750, 2446,
- /*   650 */  2447,  745,  138,  768, 2409,  764, 2159, 1706,  188,  623,
- /*   660 */  2534,  671, 2338, 1856,  416, 2530,  710,  705,  698,  694,
- /*   670 */  1757,  764, 2159,   40,   39,  479,  245,   46,   44,   43,
- /*   680 */    42,   41, 1787, 1797, 1991,  254,  247, 2565, 1884, 1814,
- /*   690 */  1817,  480,  252,  589,  307,  655,  277,  307,   29, 1356,
- /*   700 */  1495, 1355, 2135, 1955, 1728,  536, 1726,  307,  592, 1666,
- /*   710 */   653,  244,  651,  272,  271,  805, 1486,  793,  792,  791,
- /*   720 */  1490,  790, 1492, 1493,  789,  786, 1990, 1501,  783, 1503,
- /*   730 */  1504,  780,  777,  774, 1357,  726,  147, 2409, 1731, 1732,
- /*   740 */  1784,  307, 1786, 1789, 1790, 1791, 1792, 1793, 1794, 1795,
- /*   750 */  1796,  742,  766,  765, 1807, 1809, 1810, 1811, 1812,    2,
- /*   760 */    47,   45, 1818, 2443,  593, 2292,  491, 2275,  420,  230,
- /*   770 */  1727, 1788,  805, 1932,  497, 2275,  747, 1989, 2022, 2409,
- /*   780 */   305, 1710,  276, 1813, 2213, 1725,   46,   44,   43,   42,
- /*   790 */    41,  430, 2443,  148,  535,  229, 2505,  764, 2159, 2211,
- /*   800 */  1733,  637,  636,  635, 2461,  747, 2136, 2572,  627,  144,
- /*   810 */   631, 1713, 1716, 1808,  630,  221, 2409,  499,  746,  629,
- /*   820 */   634,  399,  398,  223, 1967,  628, 1733, 1709,  624, 1785,
- /*   830 */  2409, 1727, 2023, 2461,   40,   39,  764, 2159,   46,   44,
- /*   840 */    43,   42,   41, 1844,  622, 2409, 1725,  746,  621,  206,
- /*   850 */  2542, 2543,  861,  145, 2547,   48,  512, 1712, 1715, 1988,
- /*   860 */  2442, 1675, 1676, 2480, 2443, 1987, 1437,  115, 2444,  750,
- /*   870 */  2446, 2447,  745, 2232,  768,  764, 2159,  744,   12, 2635,
- /*   880 */    10, 2534,  764, 2159,  854,  416, 2530, 1733,  664, 2442,
- /*   890 */  2207, 2208, 2480, 1815, 1816,  513,  115, 2444,  750, 2446,
- /*   900 */  2447,  745,  514,  768,  441, 2461, 2382, 1439, 2635,  440,
- /*   910 */  2534,  796, 2409,  861,  416, 2530, 1752, 2409, 2409,  746,
- /*   920 */   764, 2159,   40,   39,  330,   34,   46,   44,   43,   42,
- /*   930 */    41, 1787, 1797,  684, 1903, 1849,  764, 2159, 1814, 1817,
- /*   940 */   594, 2144,  405, 2346,  803,  163,  162,  800,  799,  798,
- /*   950 */   160, 1359, 1360, 1728, 2146, 1726, 2156,  685, 2419,  685,
- /*   960 */  2615, 2442, 2615, 1883, 2480,   43,   42,   41,  361, 2444,
- /*   970 */   750, 2446, 2447,  745,  743,  768,  734, 2499, 2621,  205,
- /*   980 */  2621,  205, 2423, 2616,  715, 2616,  715, 1731, 1732, 1784,
- /*   990 */   107, 1786, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796,
- /*  1000 */   742,  766,  765, 1807, 1809, 1810, 1811, 1812,    2,   47,
- /*  1010 */    45,  225, 2443, 2383, 1728, 2152, 1726,  420, 2419, 1727,
- /*  1020 */  1986,  527, 2275,  764, 2159,  747, 2142, 2585,  662, 2425,
- /*  1030 */  2427,  417, 1813, 2134, 1725,  520,  519,  764, 2159,  173,
- /*  1040 */   768, 2443, 2423,  278, 1985,  614,  613, 2162, 1731, 1732,
- /*  1050 */   616,  615,   91, 2461,  747,   90,  696,  286,  764, 2159,
- /*  1060 */   764, 2159, 1808,  764, 2159, 2409,  685,  746,   60, 2615,
- /*  1070 */   228,  764, 2159, 2409,  797, 1733,  682, 2204,  732, 1788,
- /*  1080 */   319,  685, 2461,  761, 2615,  764, 2159, 2621,  205, 2425,
- /*  1090 */  2428,  762, 2616,  715, 2409,    9,  746, 2409,  429,  172,
- /*  1100 */   768,  861, 2621,  205,   48,  326,  173, 2616,  715, 2442,
- /*  1110 */  2549, 1756, 2480, 2443, 2161, 1756,  115, 2444,  750, 2446,
- /*  1120 */  2447,  745,  199,  768,   89, 1449,  747, 1756, 2635, 2213,
- /*  1130 */  2534,  764, 2159, 1984,  416, 2530, 2545, 1785, 2442, 2549,
- /*  1140 */  1448, 2480, 1815, 1816,  733,  115, 2444,  750, 2446, 2447,
- /*  1150 */   745,  433,  768,  670, 2461,  730, 1752, 2635,  735, 2534,
- /*  1160 */  2506, 1983,  432,  416, 2530, 2544, 2409,  737,  746, 2506,
- /*  1170 */   173,  803,  163,  162,  800,  799,  798,  160, 2161,   96,
- /*  1180 */  1787, 1797,  633,  632, 2213, 1453, 2409, 1814, 1817,  397,
- /*  1190 */   396,    3,  803,  163,  162,  800,  799,  798,  160,  759,
- /*  1200 */  1452,  625, 1728,   53, 1726, 2155,  685,  547,  685, 2615,
- /*  1210 */  2442, 2615, 1980, 2480, 2409,  718, 1979,  178, 2444,  750,
- /*  1220 */  2446, 2447,  745, 1736,  768, 1434, 1978, 2621,  205, 2621,
- /*  1230 */   205,  283, 2616,  715, 2616,  715, 1731, 1732, 1784,  100,
- /*  1240 */  1786, 1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796,  742,
- /*  1250 */   766,  765, 1807, 1809, 1810, 1811, 1812,    2,   47,   45,
- /*  1260 */  2443,  395,  394, 1977,  620, 2409,  420,  549, 1727, 2409,
- /*  1270 */  1650,  716, 2636,  747, 1976, 2608,  196, 1975, 2258, 2409,
- /*  1280 */   200, 1813, 1974, 1725, 1973, 1972,  801, 2213,  622, 2204,
- /*  1290 */  2443,   77,  621,  830,  828,  802,  339,  154, 2204, 2190,
- /*  1300 */   140, 2461, 2212,  747,  626, 2553, 1997,  856, 2137, 2554,
- /*  1310 */  1876, 1808,   87, 2409,  263,  746, 2409,  261,  265,  267,
- /*  1320 */   489,  264,  266,  269, 1733, 2042,  268, 2409, 1432, 1876,
- /*  1330 */  2409, 2461, 1757, 2040, 2031, 2409, 1757, 2409, 2409, 2029,
- /*  1340 */   659,  153,  658, 2409,  692,  746,   88,  638, 1757,   49,
- /*  1350 */   861,   49,  189,   15,  741,  640,  642, 2442, 2430,  721,
- /*  1360 */  2480,  645, 1964, 1965,  115, 2444,  750, 2446, 2447,  745,
- /*  1370 */  2099,  768, 1673,  161,   14,   13, 2635, 1785, 2534,  435,
- /*  1380 */   434,  740,  416, 2530,   64,   49,   49, 2442, 1982, 1741,
- /*  1390 */  2480, 1815, 1816, 1739,  115, 2444,  750, 2446, 2447,  745,
- /*  1400 */  1735,  768, 1813,  313, 1734,   76, 2635,  159, 2534,  161,
- /*  1410 */   325,  324,  416, 2530,  112, 2443, 2432, 1392, 2578, 1907,
- /*  1420 */   810,  300,  811,  109, 1917,  702, 1916,  292,  747, 1787,
- /*  1430 */  1797,  294, 1808,  142, 2462,   73, 1814, 1817,  772,  159,
- /*  1440 */  2284,  161, 2096,  141, 1411, 1733, 1409, 2095,  731, 2013,
- /*  1450 */   159, 1728, 2568, 1726, 2058,  699, 2461,  407, 1393, 1850,
- /*  1460 */  1798, 1619,  411,  706,  753, 2285,  439, 2019, 2409,  678,
- /*  1470 */   746,  739, 2201, 2569, 2579,  727,  302,  299,  317,  306,
- /*  1480 */   756,    5,  321,  719, 1479, 1731, 1732, 1784, 2121, 1786,
- /*  1490 */  1789, 1790, 1791, 1792, 1793, 1794, 1795, 1796,  742,  766,
- /*  1500 */   765, 1807, 1809, 1810, 1811, 1812,    2,  374,  373,  442,
- /*  1510 */   338,  447, 2442, 1508, 1512, 2480, 1519, 1717, 1517,  115,
- /*  1520 */  2444,  750, 2446, 2447,  745,  164,  768,  637,  636,  635,
- /*  1530 */  1813, 2509, 1705, 2534,  627,  144,  631,  416, 2530, 2443,
- /*  1540 */   630,  387,  455,  456, 1760,  629,  634,  399,  398, 1834,
- /*  1550 */   466,  628,  747,  467,  624,  214,  213,  469,  216, 1643,
- /*  1560 */  1808,  333, 1750, 2443,  483, 1751,  490,  227,  492,  496,
- /*  1570 */  1738,  498, 1742,  538, 1737,  528,  747,  503,  526,  534,
- /*  1580 */  2461,  515, 2277,  537,  539,  550,  551,  548,  232,  233,
- /*  1590 */   553,  554, 2409,  235,  746,  556,  558, 1758,  573, 2443,
- /*  1600 */     4,  574,  581,  582, 2461, 1753, 1745, 1747,  584,  243,
- /*  1610 */    93,  246,  747,  586, 1759,  587, 2409, 1761,  746,  249,
- /*  1620 */   766,  765, 1807, 1809, 1810, 1811, 1812,  588,  590,  722,
- /*  1630 */   251, 1762,   94,   95,  256,  596, 2442,  617,  117, 2480,
- /*  1640 */  2461, 2293,  661,  115, 2444,  750, 2446, 2447,  745,  619,
- /*  1650 */   768, 2149, 2409,  648,  746, 2507,  260, 2534, 2145,  262,
- /*  1660 */  2442,  416, 2530, 2480,  649,  167,  663,  115, 2444,  750,
- /*  1670 */  2446, 2447,  745, 2360,  768,  168, 2147,  365, 2143,  736,
- /*  1680 */   169, 2534,  170, 2357, 2356,  416, 2530,   98, 1754,  279,
- /*  1690 */  2339,  155,  334,  673,  284,  672, 2442,  677,  680, 2480,
- /*  1700 */  1718,  282, 1708,  116, 2444,  750, 2446, 2447,  745,  689,
- /*  1710 */   768,  679,  703,  674,  754, 2584, 2443, 2534,  289, 2583,
- /*  1720 */  2556, 2533, 2530,  291,    8,  712,  688,  180,  293,  747,
- /*  1730 */   690,  295, 1711, 1714, 1719,  296,  687,  298,  412,  723,
- /*  1740 */  2638,  720, 2614,  297, 1876, 1755, 2443, 2550,  766,  765,
- /*  1750 */  1807, 1809, 1810, 1811, 1812,  146, 1881, 2461,  192,  747,
- /*  1760 */   301, 1879,  308,  208,    1,   61,  156, 2515,  752, 2409,
- /*  1770 */   335,  746, 2307, 2306,  336, 2305,  422,  757,  158,  758,
- /*  1780 */   106,  108,  337, 2160,  770,  340, 2401, 2461, 2400, 2443,
- /*  1790 */  2205,  328,  855, 1314,  858,  364,  344,  352,  860, 2409,
- /*  1800 */   165,  746,  747,  342,  363,   52,  353, 2381,  385, 2380,
- /*  1810 */  2379,   82,  386, 2442, 2374,  444, 2480,  445, 1698, 1699,
- /*  1820 */   116, 2444,  750, 2446, 2447,  745,  211,  768,  449, 2372,
- /*  1830 */  2461,  451,  452,  453, 2534, 1697, 2371,  388,  738, 2530,
- /*  1840 */  2369,  458, 2409,  748,  746, 2368, 2480, 2367,  460, 2443,
- /*  1850 */   116, 2444,  750, 2446, 2447,  745,  462,  768, 2366,  464,
- /*  1860 */  1686, 2343,  747,  215, 2534, 2342,  217, 1646,  380, 2530,
- /*  1870 */    83, 2443, 1645, 2320, 2319, 2318,  476,  477, 2317, 2316,
- /*  1880 */  2267,  481, 1589, 2264,  747,  484, 2442, 2263, 2257, 2480,
- /*  1890 */  2461,  487,  488,  177, 2444,  750, 2446, 2447,  745, 2254,
- /*  1900 */   768,  220, 2409, 2253,  746,   86, 2252, 2251, 2256, 2255,
- /*  1910 */  2250,  222, 2461,  224,  504, 2244,  506, 2242, 2241, 2240,
- /*  1920 */  2239, 2262, 2238, 2237, 2409, 2249,  746, 2247, 2246, 2245,
- /*  1930 */  2236, 2260, 2243, 2235, 2234,  686, 2575, 2233, 2231, 2230,
- /*  1940 */  2229, 2228, 2227, 2226,  226, 2225, 2442,   92, 2224, 2480,
- /*  1950 */  2223, 2443, 2222,  116, 2444,  750, 2446, 2447,  745, 2221,
- /*  1960 */   768, 2261, 2259, 2220,  747, 2219, 1595, 2534, 2442, 2218,
- /*  1970 */   231, 2480, 2531,  541, 2216,  177, 2444,  750, 2446, 2447,
- /*  1980 */   745, 2443,  768, 2217, 2215,  543, 2214, 2061, 1450, 1454,
- /*  1990 */  1446,  234, 2461,  559,  747, 2060,  376, 2059, 2057, 2443,
- /*  2000 */   236,  377, 2054, 2053, 2409,  560,  746,  563,  564, 2046,
- /*  2010 */   561,  568,  747,  565,  237,  567, 2033,  569, 2576,  571,
- /*  2020 */  2008,  239, 2461,   79,  187, 1338,  409, 2007, 2429, 2443,
- /*  2030 */  2341, 2337, 2327,  241, 2409, 2315,  746,  197,  579,  250,
- /*  2040 */  2461,   80,  747,  248, 2314,  253, 2291, 2138, 2442, 1385,
- /*  2050 */  2056, 2480, 2409, 2052,  746,  362, 2444,  750, 2446, 2447,
- /*  2060 */   745,  597,  768,  598,  599, 2050,  601,  603,  602, 2048,
- /*  2070 */  2461,  605,  606, 2045,  410,  607,  609,  610, 2442,  611,
- /*  2080 */  2028, 2480, 2409, 2026,  746,  355, 2444,  750, 2446, 2447,
- /*  2090 */   745, 2027,  768, 2025, 2004, 2140, 2442, 1524, 1523, 2480,
- /*  2100 */    72, 2139,  643,  362, 2444,  750, 2446, 2447,  745, 2443,
- /*  2110 */   768, 1436, 2043,  259, 1435, 1433, 1431, 2041, 1430, 1429,
- /*  2120 */   827, 1428,  744, 1427, 2032,  829, 2442, 1424, 2443, 2480,
- /*  2130 */  1422,  711,  400,  178, 2444,  750, 2446, 2447,  745, 1423,
- /*  2140 */   768,  747,  401, 1421,  402, 2030, 2443,  403,  646, 2003,
- /*  2150 */  2461, 2002, 2001,  650, 2000,  652, 1999,  654,  118,  747,
- /*  2160 */  1684,   28, 2409, 1680,  746, 1682, 1679, 2340,   67, 2461,
- /*  2170 */  1670, 2336, 1654,  665, 1652, 2326, 1656,   56, 2313,  281,
- /*  2180 */   171, 2409,  675,  746, 2312, 2620,  681, 2461, 2637,   57,
- /*  2190 */   676,   20, 1631, 1630,  285,   30,   17, 1934,  691, 2409,
- /*  2200 */   408,  746,  683,  419,  288,  693, 2442, 1908,  667, 2480,
- /*  2210 */   697,  290,    6,  361, 2444,  750, 2446, 2447,  745,  695,
- /*  2220 */   768,  421, 2500,    7,   21, 2442,  864,   22, 2480, 1915,
- /*  2230 */   191,   65,  362, 2444,  750, 2446, 2447,  745,  179,  768,
- /*  2240 */   190,   31,  332, 2442, 1902,  202, 2480, 2430, 2443,   81,
- /*  2250 */   362, 2444,  750, 2446, 2447,  745,   32,  768,  195,   24,
- /*  2260 */   304,  747,   23, 1954, 1949, 1955, 1948,  852,  848,  844,
- /*  2270 */   840, 2443,  329,  413, 1873, 1953, 1952,  414, 1872,   59,
- /*  2280 */   182, 2311, 2290,  102,  747,  103,   25,   13, 1825, 2461,
- /*  2290 */    58, 1824, 1743, 1800,   38,   18, 1835, 1799,   11,  183,
- /*  2300 */    16, 2409,   26,  746,  193, 2443, 1777, 1769,  749,   27,
- /*  2310 */  2289,  312, 2461,  114, 1910,  194,  322,  318,  747,   69,
- /*  2320 */   104,  755,  105,  323, 2409,  109,  746,  320, 2485,  771,
- /*  2330 */   769, 2443, 2484,  428,  775,  778,  781,  784, 1802,  767,
- /*  2340 */    68,  787, 1509, 1506,  747,  660, 2461, 1500, 2480,  773,
- /*  2350 */   760, 2443,  357, 2444,  750, 2446, 2447,  745, 2409,  768,
- /*  2360 */   746,  776,  794,  779,  747, 1505, 1502,  782, 2442, 1496,
- /*  2370 */   785, 2480, 2461, 1494,  788,  347, 2444,  750, 2446, 2447,
- /*  2380 */   745, 1499,  768, 1485, 2409,  327,  746,  110, 1514, 1498,
- /*  2390 */   111, 1518, 2461,   78,  310, 1383, 1497,  804, 1418, 1415,
- /*  2400 */  1414,  309, 2442,  815, 2409, 2480,  746, 1413, 1412,  346,
- /*  2410 */  2444,  750, 2446, 2447,  745, 1410,  768, 1408, 1407, 1406,
- /*  2420 */   280, 1444, 1443,  817,  209, 1404, 1403, 1402, 2442, 1401,
- /*  2430 */  1400, 2480, 1399, 2443, 1398,  348, 2444,  750, 2446, 2447,
- /*  2440 */   745, 1438,  768, 1440, 1389, 1395,  747, 1394, 2442, 1391,
- /*  2450 */  1390, 2480, 1388, 2051,  837,  354, 2444,  750, 2446, 2447,
- /*  2460 */   745,  839,  768, 2443, 2049,  838,  841,  842,  843, 2047,
- /*  2470 */   845,  846,  847, 2044, 2461,  849,  747,  851,  850, 2024,
- /*  2480 */   853, 2443, 1327, 1998, 1315,  857, 2409,  331,  746,  859,
- /*  2490 */  1968, 1968, 1729,  341,  747,  862,  863, 1968, 1968, 1968,
- /*  2500 */  1968, 1968, 1968, 1968, 2461, 1968, 1968, 1968, 1968, 1968,
- /*  2510 */  1968, 1968, 1968, 1968, 1968, 1968, 2409, 1968,  746, 1968,
- /*  2520 */  1968, 1968, 2461, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2530 */  2442, 1968, 1968, 2480, 2409, 1968,  746,  358, 2444,  750,
- /*  2540 */  2446, 2447,  745, 1968,  768, 1968, 1968, 1968, 1968, 1968,
- /*  2550 */  1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2560 */  2442, 1968, 2443, 2480, 1968, 1968, 1968,  349, 2444,  750,
- /*  2570 */  2446, 2447,  745, 1968,  768,  747, 1968, 1968, 2442, 1968,
- /*  2580 */  2443, 2480, 1968, 1968, 1968,  359, 2444,  750, 2446, 2447,
- /*  2590 */   745, 1968,  768,  747, 1968, 2443, 1968, 1968, 1968, 1968,
- /*  2600 */  1968, 1968, 1968, 2461, 1968, 1968, 1968, 1968,  747, 1968,
- /*  2610 */  2443, 1968, 1968, 1968, 1968, 2409, 1968,  746, 1968, 1968,
- /*  2620 */  1968, 2461, 1968,  747, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2630 */  1968, 1968, 1968, 2409, 1968,  746, 2461, 1968, 1968, 1968,
- /*  2640 */  1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 2409, 1968,
- /*  2650 */   746, 2461, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 2442,
- /*  2660 */  1968, 1968, 2480, 2409, 1968,  746,  350, 2444,  750, 2446,
- /*  2670 */  2447,  745, 1968,  768, 1968, 1968, 1968, 2442, 1968, 1968,
- /*  2680 */  2480, 1968, 1968, 2443,  360, 2444,  750, 2446, 2447,  745,
- /*  2690 */  1968,  768, 2442, 1968, 1968, 2480,  747, 1968, 1968,  351,
- /*  2700 */  2444,  750, 2446, 2447,  745, 1968,  768, 2442, 1968, 2443,
- /*  2710 */  2480, 1968, 1968, 1968,  366, 2444,  750, 2446, 2447,  745,
- /*  2720 */  1968,  768,  747, 1968, 2461, 1968, 1968, 1968, 1968, 1968,
- /*  2730 */  1968, 2443, 1968, 1968, 1968, 1968, 2409, 1968,  746, 1968,
- /*  2740 */  1968, 1968, 1968, 1968,  747, 1968, 1968, 1968, 1968, 1968,
- /*  2750 */  2461, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2760 */  1968, 1968, 2409, 1968,  746, 1968, 1968, 1968, 1968, 2443,
- /*  2770 */  1968, 1968, 2461, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2780 */  2442, 1968,  747, 2480, 2409, 1968,  746,  367, 2444,  750,
- /*  2790 */  2446, 2447,  745, 1968,  768, 1968, 1968, 1968, 1968, 1968,
- /*  2800 */  1968, 1968, 1968, 1968, 1968, 1968, 2442, 1968, 1968, 2480,
- /*  2810 */  2461, 1968, 1968, 2455, 2444,  750, 2446, 2447,  745, 1968,
- /*  2820 */   768, 1968, 2409, 1968,  746, 1968, 1968, 1968, 2442, 1968,
- /*  2830 */  1968, 2480, 1968, 1968, 1968, 2454, 2444,  750, 2446, 2447,
- /*  2840 */   745, 1968,  768, 1968, 1968, 2443, 1968, 1968, 1968, 1968,
- /*  2850 */  1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,  747, 1968,
- /*  2860 */  1968, 1968, 1968, 1968, 1968, 1968, 2442, 1968, 1968, 2480,
- /*  2870 */  1968, 1968, 1968, 2453, 2444,  750, 2446, 2447,  745, 1968,
- /*  2880 */   768, 2443, 1968, 1968, 1968, 1968, 2461, 1968, 1968, 1968,
- /*  2890 */  1968, 1968, 1968, 1968,  747, 1968, 1968, 1968, 2409, 1968,
- /*  2900 */   746, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2910 */  1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 2443,
- /*  2920 */  1968, 1968, 2461, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2930 */  1968, 1968,  747, 1968, 2409, 1968,  746, 1968, 1968, 1968,
- /*  2940 */  1968, 1968, 2442, 1968, 1968, 2480, 1968, 1968, 1968,  382,
- /*  2950 */  2444,  750, 2446, 2447,  745, 1968,  768, 1968, 1968, 1968,
- /*  2960 */  2461, 1968, 2443, 1968, 1968, 1968, 1968, 1968, 1968, 1968,
- /*  2970 */  1968, 1968, 2409, 1968,  746,  747, 1968, 1968, 2442, 1968,
- /*  2980 */  2443, 2480, 1968, 1968, 1968,  383, 2444,  750, 2446, 2447,
- /*  2990 */   745, 1968,  768,  747, 1968, 2443, 1968, 1968, 1968, 1968,
- /*  3000 */  1968, 1968, 1968, 2461, 1968, 1968, 1968, 1968,  747, 1968,
- /*  3010 */  1968, 1968, 1968, 1968, 1968, 2409, 2442,  746, 1968, 2480,
- /*  3020 */  1968, 2461, 1968,  379, 2444,  750, 2446, 2447,  745, 1968,
- /*  3030 */   768, 1968, 1968, 2409, 1968,  746, 2461, 1968, 1968, 1968,
- /*  3040 */  1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 2409, 1968,
- /*  3050 */   746, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 1968, 2442,
- /*  3060 */  1968, 1968, 2480, 1968, 1968, 1968,  384, 2444,  750, 2446,
- /*  3070 */  2447,  745, 1968,  768, 1968, 1968, 1968,  748, 1968, 1968,
- /*  3080 */  2480, 1968, 1968, 1968,  357, 2444,  750, 2446, 2447,  745,
- /*  3090 */  1968,  768, 2442, 1968, 1968, 2480, 1968, 1968, 1968,  356,
- /*  3100 */  2444,  750, 2446, 2447,  745, 1968,  768,
+ /*     0 */   825,  505,   37,  311,  744,  605,  504, 2695,  606, 2072,
+ /*    10 */  2359,  459,   47,   45, 1947, 2482, 2208,  186,  457,  166,
+ /*    20 */   440, 2030, 1787,  756,  147,  743,  205, 2221, 2357,  781,
+ /*    30 */  2696,  745, 2308, 2210, 1812, 1873, 2115, 1785,  610,  411,
+ /*    40 */  2359, 2339,  128, 2523,  607,  127,  126,  125,  124,  123,
+ /*    50 */   122,  121,  120,  119,  715,  443,  759, 2695, 2356,  781,
+ /*    60 */  1813, 1377,   40,   39,  739, 1868,   46,   44,   43,   42,
+ /*    70 */    41,   19,  446,  426, 2406, 2701,  205,  738, 1793,  793,
+ /*    80 */  2696,  745, 2273,  798, 2541, 1375, 1376,   40,   39,  409,
+ /*    90 */   446,   46,   44,   43,   42,   41, 2489, 2271,  776,  613,
+ /*   100 */   694,  798,  606, 2072,  891, 2541,  175,   15,  793,  866,
+ /*   110 */   865,  864,  863,  468, 2158,  862,  861,  152,  856,  855,
+ /*   120 */   854,  853,  852,  851,  850,  151,  844,  843,  842,  467,
+ /*   130 */   466,  839,  838,  837,  185,  184,  836,  303, 2622,  755,
+ /*   140 */  2522,  139,  754, 2560, 2695, 1875, 1876,  115, 2524,  780,
+ /*   150 */  2526, 2527,  775,  174,  798, 2407,  444, 2483,  365,  188,
+ /*   160 */   161, 2614,  743,  205,  173,  436, 2610, 2696,  745,  602,
+ /*   170 */   737,  744, 2221,   62, 2695,  363,   75,  698,  600,   74,
+ /*   180 */   207,  596,  592, 1847, 1857, 1570, 1571, 1991, 2644,  392,
+ /*   190 */  1874, 1877,  743,  205, 1370,   50,  548, 2696,  745,  489,
+ /*   200 */   547,  238,  587,  585,  582, 1788,  461, 1786,  546, 2266,
+ /*   210 */  2268,   40,   39, 1377,  446,   46,   44,   43,   42,   41,
+ /*   220 */   176,  699, 2041,  128, 2699,  798,  127,  126,  125,  124,
+ /*   230 */   123,  122,  121,  120,  119,   54, 1372, 1375, 1376, 1791,
+ /*   240 */  1792, 1844,   62, 1846, 1849, 1850, 1851, 1852, 1853, 1854,
+ /*   250 */  1855, 1856,  772,  796,  795, 1867, 1869, 1870, 1871, 1872,
+ /*   260 */     2,   47,   45, 2029,  849,  793,  389, 2180, 1810,  440,
+ /*   270 */   503, 1787,  502,  240,  401,  555,  512,  608,  575, 2080,
+ /*   280 */   794, 2219,   63,  574, 1873, 1844, 1785,  137,  136,  135,
+ /*   290 */   134,  133,  132,  131,  130,  129,  615, 2398,   33,  535,
+ /*   300 */   210,  576,  501,  621,   40,   39,  390,  537,   46,   44,
+ /*   310 */    43,   42,   41, 2700, 1868, 1812, 2695,  515, 1902,  242,
+ /*   320 */    19,  572,  570,  608,  391, 2080, 1815, 1793,  219, 2273,
+ /*   330 */   493, 2430,   85,   84,  508, 2699,  435,  218,  113, 2696,
+ /*   340 */  2698,   40,   39,  307, 2271,   46,   44,   43,   42,   41,
+ /*   350 */   500,  498,   50,  891,  412,  150,   15,  495,  491, 1535,
+ /*   360 */  1951,  388,  198, 2211,  487,  523, 1812,  484,  480,  476,
+ /*   370 */   473,  501,  186,  695, 2260, 1526,  823,  822,  821, 1530,
+ /*   380 */   820, 1532, 1533,  819,  816, 1903, 1541,  813, 1543, 1544,
+ /*   390 */   810,  807,  804, 1379, 1875, 1876, 2340, 2346, 2325, 1811,
+ /*   400 */   563,  562,  561,  560,  559,  554,  553,  552,  551,  395,
+ /*   410 */   465,  464,  307,  541,  540,  539,  538,  532,  531,  530,
+ /*   420 */   625,  525,  524,  410,   66,  756,  147,  516, 1630, 1631,
+ /*   430 */  1980,   96, 1847, 1857, 1649, 1794, 2433,   40,   39, 1874,
+ /*   440 */  1877,   46,   44,   43,   42,   41,  315,  316,  413, 1816,
+ /*   450 */  1812,  314,   35,  696, 1788, 1813, 1786, 2214,   40,   39,
+ /*   460 */   756,  147,   46,   44,   43,   42,   41,   36,  438, 1897,
+ /*   470 */  1898, 1899, 1900, 1901, 1905, 1906, 1907, 1908, 1642, 1643,
+ /*   480 */   731,  730, 1978, 1979, 1981, 1982, 1983,  478, 1791, 1792,
+ /*   490 */  1844,  305, 1846, 1849, 1850, 1851, 1852, 1853, 1854, 1855,
+ /*   500 */  1856,  772,  796,  795, 1867, 1869, 1870, 1871, 1872,    2,
+ /*   510 */    12,   47,   45, 2523,  275, 1396, 2273, 1395,  274,  440,
+ /*   520 */   747, 1787,  307,  445,   62, 2700,  777,   62, 2695, 1848,
+ /*   530 */  2022, 2271,  143,  258, 1873,  846, 1785,   62,  674,  204,
+ /*   540 */  2622, 2623, 2523,  145, 2627,  794, 2219, 2699,   12,  181,
+ /*   550 */  1397, 2696, 2697,  686, 2541,  759,   14,   13,  642,  638,
+ /*   560 */   634,  630,  212,  257, 1868,   55, 2489, 1972,  776,  273,
+ /*   570 */    19,   51,  734,  758,  203, 2622, 2623, 1793,  145, 2627,
+ /*   580 */  1662, 1663, 1973, 2541,  287,  677,  699, 1845,   99,  794,
+ /*   590 */  2219,  398,  671,  669,  424, 2489,  687,  776, 2700,  270,
+ /*   600 */   848, 2052, 1883,  891,   97, 1797,   15,  255, 1812,  138,
+ /*   610 */  2522,  452, 2629, 2560,  201, 1815,  648,  115, 2524,  780,
+ /*   620 */  2526, 2527,  775, 1971,  798, 1661, 1664,  149,  101,  157,
+ /*   630 */  2585, 2614,  794, 2219,  154,  436, 2610, 2021, 2626, 2522,
+ /*   640 */    71, 2411, 2560,   70, 1875, 1876,  115, 2524,  780, 2526,
+ /*   650 */  2527,  775,  138,  798, 2489,  794, 2219,  455,  188,  653,
+ /*   660 */  2614,  701, 2398, 1916,  436, 2610,  740,  735,  728,  724,
+ /*   670 */  1817,  794, 2219,   40,   39,  509,  245,   46,   44,   43,
+ /*   680 */    42,   41, 1847, 1857, 2051,  254,  247, 2645, 1944, 1874,
+ /*   690 */  1877,  510,  252,  619,  307,  685,  277,  307,   29, 1396,
+ /*   700 */  1535, 1395, 2195, 2015, 1788,  566, 1786,  307,  622, 1706,
+ /*   710 */   683,  244,  681,  272,  271,  835, 1526,  823,  822,  821,
+ /*   720 */  1530,  820, 1532, 1533,  819,  816, 2050, 1541,  813, 1543,
+ /*   730 */  1544,  810,  807,  804, 1397,  756,  147, 2489, 1791, 1792,
+ /*   740 */  1844,  307, 1846, 1849, 1850, 1851, 1852, 1853, 1854, 1855,
+ /*   750 */  1856,  772,  796,  795, 1867, 1869, 1870, 1871, 1872,    2,
+ /*   760 */    47,   45, 1878, 2523,  623, 2352,  521, 2335,  440,  230,
+ /*   770 */  1787, 1848,  835, 1992,  527, 2335,  777, 2049, 2082, 2489,
+ /*   780 */   305, 1756,  276, 1873, 2273, 1785,   46,   44,   43,   42,
+ /*   790 */    41,  460, 2523,  148,  565,  229, 2585,  794, 2219, 2271,
+ /*   800 */  1793,  667,  666,  665, 2541,  777, 2196, 2652,  657,  144,
+ /*   810 */   661,  451,  450, 1868,  660,  221, 2489,  529,  776,  659,
+ /*   820 */   664,  419,  418,  223, 2027,  658, 1793, 1755,  654, 1845,
+ /*   830 */  2489, 1787, 2083, 2541,   40,   39,  794, 2219,   46,   44,
+ /*   840 */    43,   42,   41, 1904,  652, 2489, 1785,  776,  651,  206,
+ /*   850 */  2622, 2623,  891,  145, 2627,   48,  542,  454,  453, 2048,
+ /*   860 */  2522, 1715, 1716, 2560, 2523, 2047, 1477,  115, 2524,  780,
+ /*   870 */  2526, 2527,  775, 2292,  798,  794, 2219,  774,   12, 2715,
+ /*   880 */    10, 2614,  794, 2219,  884,  436, 2610, 1793,  694, 2522,
+ /*   890 */  2267, 2268, 2560, 1875, 1876,  543,  115, 2524,  780, 2526,
+ /*   900 */  2527,  775,  544,  798,  471, 2541, 2442, 1479, 2715,  470,
+ /*   910 */  2614,  826, 2489,  891,  436, 2610, 1812, 2489, 2489,  776,
+ /*   920 */   794, 2219,   40,   39,  350,   34,   46,   44,   43,   42,
+ /*   930 */    41, 1847, 1857,  714, 1963, 1909,  794, 2219, 1874, 1877,
+ /*   940 */   624, 2204,  425, 2406,  833,  163,  162,  830,  829,  828,
+ /*   950 */   160, 1399, 1400, 1788, 2206, 1786, 2216,  715, 2499,  715,
+ /*   960 */  2695, 2522, 2695, 1943, 2560,   43,   42,   41,  381, 2524,
+ /*   970 */   780, 2526, 2527,  775,  773,  798,  764, 2579, 2701,  205,
+ /*   980 */  2701,  205, 2503, 2696,  745, 2696,  745, 1791, 1792, 1844,
+ /*   990 */   107, 1846, 1849, 1850, 1851, 1852, 1853, 1854, 1855, 1856,
+ /*  1000 */   772,  796,  795, 1867, 1869, 1870, 1871, 1872,    2,   47,
+ /*  1010 */    45,  225, 2523, 2443, 1788, 2212, 1786,  440, 2499, 1787,
+ /*  1020 */  2046,  557, 2335,  794, 2219,  777, 2202, 2665,  692, 2505,
+ /*  1030 */  2507,  437, 1873, 2194, 1785,  550,  549,  794, 2219,  173,
+ /*  1040 */   798, 2523, 2503,  278, 2045,  644,  643, 2222, 1791, 1792,
+ /*  1050 */   646,  645,   91, 2541,  777,   90,  726,  286,  794, 2219,
+ /*  1060 */   794, 2219, 1868,  794, 2219, 2489,  715,  776,   60, 2695,
+ /*  1070 */   228,  794, 2219, 2489,  827, 1793,  712, 2264,  762, 1848,
+ /*  1080 */   319,  715, 2541,  791, 2695,  794, 2219, 2701,  205, 2505,
+ /*  1090 */  2508,  792, 2696,  745, 2489,    9,  776, 2489,  459,  172,
+ /*  1100 */   798,  891, 2701,  205,   48,  346,  173, 2696,  745, 2522,
+ /*  1110 */  2629, 1816, 2560, 2523, 2221, 1816,  115, 2524,  780, 2526,
+ /*  1120 */  2527,  775,  199,  798,   89, 1489,  777, 1816, 2715, 2273,
+ /*  1130 */  2614,  794, 2219, 2044,  436, 2610, 2625, 1845, 2522, 2629,
+ /*  1140 */  1488, 2560, 1875, 1876,  763,  115, 2524,  780, 2526, 2527,
+ /*  1150 */   775,  463,  798,  700, 2541,  760, 1812, 2715,  765, 2614,
+ /*  1160 */  2586, 2043,  462,  436, 2610, 2624, 2489,  767,  776, 2586,
+ /*  1170 */   173,  833,  163,  162,  830,  829,  828,  160, 2221,   96,
+ /*  1180 */  1847, 1857,  663,  662, 2273, 1493, 2489, 1874, 1877,  417,
+ /*  1190 */   416,    3,  833,  163,  162,  830,  829,  828,  160,  789,
+ /*  1200 */  1492,  655, 1788,   53, 1786, 2215,  715,  577,  715, 2695,
+ /*  1210 */  2522, 2695, 2040, 2560, 2489,  748, 2039,  178, 2524,  780,
+ /*  1220 */  2526, 2527,  775, 1796,  798, 1474, 2038, 2701,  205, 2701,
+ /*  1230 */   205,  283, 2696,  745, 2696,  745, 1791, 1792, 1844,  100,
+ /*  1240 */  1846, 1849, 1850, 1851, 1852, 1853, 1854, 1855, 1856,  772,
+ /*  1250 */   796,  795, 1867, 1869, 1870, 1871, 1872,    2,   47,   45,
+ /*  1260 */  2523,  415,  414, 2037,  650, 2489,  440,  579, 1787, 2489,
+ /*  1270 */  1690,  746, 2716,  777, 2036, 2688,  196, 2035, 2318, 2489,
+ /*  1280 */   200, 1873, 2034, 1785, 2033, 2032,  831, 2273,  652, 2264,
+ /*  1290 */  2523,   77,  651,  860,  858,  832,  359,  154, 2264, 2250,
+ /*  1300 */   140, 2541, 2272,  777,  656, 2633, 2057,  886, 2197, 2634,
+ /*  1310 */  1936, 1868,   87, 2489,  263,  776, 2489,  261,  265,  267,
+ /*  1320 */   519,  264,  266,  269, 1793, 2102,  268, 2489, 1472, 1936,
+ /*  1330 */  2489, 2541, 1817, 2100, 2091, 2489, 1817, 2489, 2489, 2089,
+ /*  1340 */   689,  153,  688, 2489,  722,  776,   88,  668, 1817,   49,
+ /*  1350 */   891,   49,  189,   15,  771,  670,  672, 2522, 2510,  751,
+ /*  1360 */  2560,  675, 2024, 2025,  115, 2524,  780, 2526, 2527,  775,
+ /*  1370 */  2159,  798, 1713,  161,   14,   13, 2715, 1845, 2614,  465,
+ /*  1380 */   464,  770,  436, 2610,   64,   49,   49, 2522, 2042, 1801,
+ /*  1390 */  2560, 1875, 1876, 1799,  115, 2524,  780, 2526, 2527,  775,
+ /*  1400 */  1795,  798, 1873,  313, 1794,   76, 2715,  159, 2614,  161,
+ /*  1410 */   325,  324,  436, 2610,  840, 2523, 2512,  327,  326, 1967,
+ /*  1420 */   329,  328,  331,  330, 1977, 2658, 1976,  292,  777, 1847,
+ /*  1430 */  1857,  841, 1868,  333,  332,   73, 1874, 1877, 1451,  335,
+ /*  1440 */   334,  337,  336,  112,  732, 1793,  339,  338,  761,  341,
+ /*  1450 */   340, 1788,  109, 1786, 2118, 1449, 2541,  300,  294, 1910,
+ /*  1460 */  1858, 1659,  343,  342,  345,  344,  802,  142, 2489,  159,
+ /*  1470 */   776,  769, 1432, 2542, 2156,  161, 2155, 2073,  317, 2344,
+ /*  1480 */   786,  141,  321,  749, 1519, 1791, 1792, 1844, 2648, 1846,
+ /*  1490 */  1849, 1850, 1851, 1852, 1853, 1854, 1855, 1856,  772,  796,
+ /*  1500 */   795, 1867, 1869, 1870, 1871, 1872,    2,  394,  393,  159,
+ /*  1510 */   358,  729, 2522, 1433,  431, 2560,  736,  447,  427,  115,
+ /*  1520 */  2524,  780, 2526, 2527,  775,  783,  798,  667,  666,  665,
+ /*  1530 */  1873, 2589,  456, 2614,  657,  144,  661,  436, 2610, 2523,
+ /*  1540 */   660, 1548,  469, 2079, 1552,  659,  664,  419,  418, 1894,
+ /*  1550 */  1559,  658,  777, 2345,  654, 2261, 1557,  708, 2649, 2659,
+ /*  1560 */  1868,  757,  302, 2523,  299,  306, 2181,    5,  472,  477,
+ /*  1570 */  1798,  407, 1802,  485, 1797, 1820,  777,  486,  497,  496,
+ /*  1580 */  2541,  214,  213, 1683,  164,  499,  216,  353, 1810,  513,
+ /*  1590 */  1811,  520, 2489,  227,  776,  522,  526,  568,  528, 2523,
+ /*  1600 */   533,  545,  564,  556, 2541, 2337, 1805, 1807,  567,  558,
+ /*  1610 */   569,  580,  777,  581,  578,  232, 2489,  233,  776,  583,
+ /*  1620 */   796,  795, 1867, 1869, 1870, 1871, 1872,  235,  586,  752,
+ /*  1630 */   584,  588, 1818,  603,    4,  604, 2522,  611,  612, 2560,
+ /*  1640 */  2541,  614,  243,  115, 2524,  780, 2526, 2527,  775, 1813,
+ /*  1650 */   798,   93, 2489,  616,  776, 2587,  246, 2614, 1819, 1821,
+ /*  1660 */  2522,  436, 2610, 2560,  617,  618, 1822,  115, 2524,  780,
+ /*  1670 */  2526, 2527,  775,  249,  798,  620,  251, 2353,   94,  766,
+ /*  1680 */    95, 2614,  626,  256,  647,  436, 2610,  649, 2209,  260,
+ /*  1690 */   117,  678, 2205,  679,  262,  167, 2522,  168,  385, 2560,
+ /*  1700 */  1778, 2207, 1754,  116, 2524,  780, 2526, 2527,  775,  691,
+ /*  1710 */   798, 2420, 2203,  169,  170,   98, 2523, 2614, 2417,  279,
+ /*  1720 */   693, 2613, 2610,  354,  155, 1814, 2399,  703, 2416,  777,
+ /*  1730 */   704,  702,  449,  448, 1779,  710,  707,  284,  719,  733,
+ /*  1740 */   784,  709, 2664, 2663, 2636,    8, 2523,  742,  796,  795,
+ /*  1750 */  1867, 1869, 1870, 1871, 1872,  293,  720, 2541,  289,  777,
+ /*  1760 */   291,  180,  718,  295,  717,  282,  432, 2718,  753, 2489,
+ /*  1770 */   296,  776, 2694,  298,  750,  297, 1936,  146,  301, 1815,
+ /*  1780 */  1941, 1939,   61,  192,  308, 2630,  156, 2541,  782, 2523,
+ /*  1790 */   355,  356, 2367, 2366, 2365,  442,  788,  787,  357, 2489,
+ /*  1800 */     1,  776,  777,  158, 2481,  106, 2480, 2595, 2476, 2220,
+ /*  1810 */  2475, 2467, 1354, 2522,  108, 2466, 2560,  800,  348,  885,
+ /*  1820 */   116, 2524,  780, 2526, 2527,  775,   52,  798, 2458, 2441,
+ /*  1830 */  2541, 2457,  888,  208, 2614, 2473, 2472,  165,  768, 2610,
+ /*  1840 */   890, 2464, 2489,  778,  776,  360, 2560, 2440,  364, 2523,
+ /*  1850 */   116, 2524,  780, 2526, 2527,  775, 2463,  798, 2452,  362,
+ /*  1860 */   384, 2439,  777,   82, 2614, 2434, 2451, 2470,  400, 2610,
+ /*  1870 */  2469, 2523,  372, 2461, 2460, 2449,  405,  383, 2448, 2446,
+ /*  1880 */  2445, 2265,  373,  474,  777,  475, 2522,  406, 1738, 2560,
+ /*  1890 */  2541, 1739,  211,  177, 2524,  780, 2526, 2527,  775,  479,
+ /*  1900 */   798, 2432, 2489,  481,  776,  482,  483, 1737, 2431,  408,
+ /*  1910 */  2429,  488, 2541,  490, 2427,  492, 2426,  494, 1726, 2403,
+ /*  1920 */  2402,  215,  217, 1686, 2489, 2428,  776,   83, 1685, 2380,
+ /*  1930 */  2379, 2378,  506,  507, 2377,  716, 2655, 2376,  511, 2327,
+ /*  1940 */  1629, 2324,  514, 2323, 2317,  518, 2522,  220,  517, 2560,
+ /*  1950 */  2314, 2523, 2313,  116, 2524,  780, 2526, 2527,  775, 2312,
+ /*  1960 */   798, 2311,   86, 2316,  777, 2315, 2310, 2614, 2522, 2309,
+ /*  1970 */   222, 2560, 2611,  224, 2304,  177, 2524,  780, 2526, 2527,
+ /*  1980 */   775, 2523,  798, 2307, 2306, 2305,  534,  536, 2302, 2301,
+ /*  1990 */  2300, 2299, 2541,   92,  777, 2322, 2298, 2297, 2296, 2523,
+ /*  2000 */  2320, 2303, 2295, 2294, 2489, 2293,  776, 2291, 2290, 2289,
+ /*  2010 */  2288, 2287,  777, 2286, 2285, 2284,  226, 2283, 2656, 2282,
+ /*  2020 */  2281, 2321, 2541, 2319, 2280, 2279,  429, 2278, 1635, 2523,
+ /*  2030 */  2277,  231,  571, 2276, 2489,  573,  776, 2275, 2274, 2121,
+ /*  2040 */  2541,  234,  777, 2120, 1490,  236, 2119,  237, 2522,  396,
+ /*  2050 */  1494, 2560, 2489, 2117,  776,  382, 2524,  780, 2526, 2527,
+ /*  2060 */   775, 2114,  798, 1486, 2113, 2106,  397, 2093,  589,  590,
+ /*  2070 */  2541,  591,  593,  597,  430,  250,  595, 2068, 2522,  601,
+ /*  2080 */   187, 2560, 2489,  594,  776,  375, 2524,  780, 2526, 2527,
+ /*  2090 */   775,  598,  798,  599,  239, 1378, 2522,   79, 2067, 2560,
+ /*  2100 */   241, 2509,   80,  382, 2524,  780, 2526, 2527,  775, 2523,
+ /*  2110 */   798,  197,  609, 2401, 2397, 2387, 2375, 2374,  253, 2351,
+ /*  2120 */   248, 2198,  774,  627,  628,  629, 2522, 2116, 2523, 2560,
+ /*  2130 */  1425,  741, 2112,  178, 2524,  780, 2526, 2527,  775, 2110,
+ /*  2140 */   798,  777,  632,  631,  633, 2108, 2523,  635,  636,  637,
+ /*  2150 */  2541, 2105,  640,  641, 2088,  639, 2086, 2087, 2085,  777,
+ /*  2160 */  2064, 2200, 2489,   72,  776, 1564, 1563,  259, 2199, 2541,
+ /*  2170 */  1476, 1475, 1473, 1471, 1470, 1469,  857, 1468, 1467,  859,
+ /*  2180 */  2103, 2489, 2101,  776, 1464, 1463, 1462, 2541, 2717, 1461,
+ /*  2190 */  2092,  420,  421,  422, 2090,  673,  423, 2063, 2062, 2489,
+ /*  2200 */   676,  776, 2061,  439,  680, 2060, 2522,  684,  697, 2560,
+ /*  2210 */   682, 2059,  118,  381, 2524,  780, 2526, 2527,  775,   28,
+ /*  2220 */   798,  441, 2580, 1720, 1722, 2522,  894, 2400, 2560,   56,
+ /*  2230 */  1719,   67,  382, 2524,  780, 2526, 2527,  775, 1724,  798,
+ /*  2240 */   695, 2396,  352, 2522, 1710,  281, 2560, 1692, 2523, 2386,
+ /*  2250 */   382, 2524,  780, 2526, 2527,  775,   57,  798,  195,  706,
+ /*  2260 */  1694,  777, 1696, 2373,  171,  705, 2372,  882,  878,  874,
+ /*  2270 */   870, 2523,  349,  285, 1671, 1670,  711, 2700,   20,  713,
+ /*  2280 */  1994,  721,   30,  288,  777, 1968,   17,  428,  723, 2541,
+ /*  2290 */     6,  290,    7,  725,  727,   21,  179,   22,  191,   65,
+ /*  2300 */   202, 2489,  190,  776, 2510, 2523,   32, 1975,   31,   24,
+ /*  2310 */   304, 1962, 2541,  114, 2014,   81,  322, 2015,  777, 2009,
+ /*  2320 */  2008,  433, 2013,   23, 2489, 2012,  776,   18,  434, 1933,
+ /*  2330 */    59, 2523, 1932, 2371,   58,  182, 2350,  102,   25, 1885,
+ /*  2340 */   103,   11,   13, 1803,  777,  690, 2541, 1895, 2560,  183,
+ /*  2350 */   790, 2523,  377, 2524,  780, 2526, 2527,  775, 2489,  798,
+ /*  2360 */   776, 1884, 1860,  193,  777,   38, 1837, 1859, 2522, 2349,
+ /*  2370 */   104, 2560, 2541,  779,   16,  367, 2524,  780, 2526, 2527,
+ /*  2380 */   775,  323,  798, 1829, 2489,   26,  776,   27,  109,  312,
+ /*  2390 */   801,  458, 2541,  805,  310, 1970,  194,  318,  808,   69,
+ /*  2400 */   320,  309, 2522,  785, 2489, 2560,  776, 1862,  105,  366,
+ /*  2410 */  2524,  780, 2526, 2527,  775, 2565,  798, 2564,  797,   68,
+ /*  2420 */   280,  799,  811, 1549,  803,  814, 1546,  806, 2522,  817,
+ /*  2430 */  1545, 2560, 1542, 2523,  809,  368, 2524,  780, 2526, 2527,
+ /*  2440 */   775,  812,  798, 1536,  815,  818,  777, 1534, 2522, 1540,
+ /*  2450 */   110, 2560,  347, 1539, 1558,  374, 2524,  780, 2526, 2527,
+ /*  2460 */   775, 1538,  798, 2523, 1525,  824,  111,   78, 1554, 1423,
+ /*  2470 */   834, 1537, 1458, 1455, 2541, 1454,  777, 1453, 1452, 1450,
+ /*  2480 */  1448, 2523, 1447, 1484, 1446,  845, 2489, 1483,  776,  209,
+ /*  2490 */   847, 1444, 1443, 1441,  777, 1442, 1440, 1439, 1438, 1480,
+ /*  2500 */  1478, 1435, 1434, 1431, 2541, 1430, 1429, 1428, 2111,  867,
+ /*  2510 */  2109,  869,  871,  868, 2107,  875, 2489, 2104,  776,  873,
+ /*  2520 */   879,  877, 2541,  881,  872,  876, 2084,  880,  883, 1367,
+ /*  2530 */  2522, 2058,  887, 2560, 2489, 1355,  776,  378, 2524,  780,
+ /*  2540 */  2526, 2527,  775,  351,  798,  889, 2028, 1789,  893,  361,
+ /*  2550 */   892, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2560 */  2522, 2028, 2523, 2560, 2028, 2028, 2028,  369, 2524,  780,
+ /*  2570 */  2526, 2527,  775, 2028,  798,  777, 2028, 2028, 2522, 2028,
+ /*  2580 */  2523, 2560, 2028, 2028, 2028,  379, 2524,  780, 2526, 2527,
+ /*  2590 */   775, 2028,  798,  777, 2028, 2523, 2028, 2028, 2028, 2028,
+ /*  2600 */  2028, 2028, 2028, 2541, 2028, 2028, 2028, 2028,  777, 2028,
+ /*  2610 */  2523, 2028, 2028, 2028, 2028, 2489, 2028,  776, 2028, 2028,
+ /*  2620 */  2028, 2541, 2028,  777, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2630 */  2028, 2028, 2028, 2489, 2028,  776, 2541, 2028, 2028, 2028,
+ /*  2640 */  2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2489, 2028,
+ /*  2650 */   776, 2541, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2522,
+ /*  2660 */  2028, 2028, 2560, 2489, 2028,  776,  370, 2524,  780, 2526,
+ /*  2670 */  2527,  775, 2028,  798, 2028, 2028, 2028, 2522, 2028, 2028,
+ /*  2680 */  2560, 2028, 2028, 2523,  380, 2524,  780, 2526, 2527,  775,
+ /*  2690 */  2028,  798, 2522, 2028, 2028, 2560,  777, 2028, 2028,  371,
+ /*  2700 */  2524,  780, 2526, 2527,  775, 2028,  798, 2522, 2028, 2523,
+ /*  2710 */  2560, 2028, 2028, 2028,  386, 2524,  780, 2526, 2527,  775,
+ /*  2720 */  2028,  798,  777, 2028, 2541, 2028, 2028, 2028, 2028, 2028,
+ /*  2730 */  2028, 2523, 2028, 2028, 2028, 2028, 2489, 2028,  776, 2028,
+ /*  2740 */  2028, 2028, 2028, 2028,  777, 2028, 2028, 2028, 2028, 2028,
+ /*  2750 */  2541, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2760 */  2028, 2028, 2489, 2028,  776, 2028, 2028, 2028, 2028, 2523,
+ /*  2770 */  2028, 2028, 2541, 2028, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2780 */  2522, 2028,  777, 2560, 2489, 2028,  776,  387, 2524,  780,
+ /*  2790 */  2526, 2527,  775, 2028,  798, 2028, 2028, 2028, 2028, 2028,
+ /*  2800 */  2028, 2028, 2028, 2028, 2028, 2028, 2522, 2028, 2028, 2560,
+ /*  2810 */  2541, 2028, 2028, 2535, 2524,  780, 2526, 2527,  775, 2028,
+ /*  2820 */   798, 2028, 2489, 2028,  776, 2028, 2028, 2028, 2522, 2028,
+ /*  2830 */  2028, 2560, 2028, 2028, 2028, 2534, 2524,  780, 2526, 2527,
+ /*  2840 */   775, 2028,  798, 2028, 2028, 2523, 2028, 2028, 2028, 2028,
+ /*  2850 */  2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028,  777, 2028,
+ /*  2860 */  2028, 2028, 2028, 2028, 2028, 2028, 2522, 2028, 2028, 2560,
+ /*  2870 */  2028, 2028, 2028, 2533, 2524,  780, 2526, 2527,  775, 2028,
+ /*  2880 */   798, 2523, 2028, 2028, 2028, 2028, 2541, 2028, 2028, 2028,
+ /*  2890 */  2028, 2028, 2028, 2028,  777, 2028, 2028, 2028, 2489, 2028,
+ /*  2900 */   776, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2910 */  2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2523,
+ /*  2920 */  2028, 2028, 2541, 2028, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2930 */  2028, 2028,  777, 2028, 2489, 2028,  776, 2028, 2028, 2028,
+ /*  2940 */  2028, 2028, 2522, 2028, 2028, 2560, 2028, 2028, 2028,  402,
+ /*  2950 */  2524,  780, 2526, 2527,  775, 2028,  798, 2028, 2028, 2028,
+ /*  2960 */  2541, 2028, 2523, 2028, 2028, 2028, 2028, 2028, 2028, 2028,
+ /*  2970 */  2028, 2028, 2489, 2028,  776,  777, 2028, 2028, 2522, 2028,
+ /*  2980 */  2523, 2560, 2028, 2028, 2028,  403, 2524,  780, 2526, 2527,
+ /*  2990 */   775, 2028,  798,  777, 2028, 2523, 2028, 2028, 2028, 2028,
+ /*  3000 */  2028, 2028, 2028, 2541, 2028, 2028, 2028, 2028,  777, 2028,
+ /*  3010 */  2028, 2028, 2028, 2028, 2028, 2489, 2522,  776, 2028, 2560,
+ /*  3020 */  2028, 2541, 2028,  399, 2524,  780, 2526, 2527,  775, 2028,
+ /*  3030 */   798, 2028, 2028, 2489, 2028,  776, 2541, 2028, 2028, 2028,
+ /*  3040 */  2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2489, 2028,
+ /*  3050 */   776, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2028, 2522,
+ /*  3060 */  2028, 2028, 2560, 2028, 2028, 2028,  404, 2524,  780, 2526,
+ /*  3070 */  2527,  775, 2028,  798, 2028, 2028, 2028,  778, 2028, 2028,
+ /*  3080 */  2560, 2028, 2028, 2028,  377, 2524,  780, 2526, 2527,  775,
+ /*  3090 */  2028,  798, 2522, 2028, 2028, 2560, 2028, 2028, 2028,  376,
+ /*  3100 */  2524,  780, 2526, 2527,  775, 2028,  798,
 };
 static const YYCODETYPE yy_lookahead[] = {
  /*     0 */   400,  435,  477,  478,  488,  365,  440,  491,  368,  369,
@@ -1029,121 +1029,121 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  1380 */    13,   71,  480,  481,   33,   33,   33,  455,  359,   22,
  /*  1390 */   458,  145,  146,  207,  462,  463,  464,  465,  466,  467,
  /*  1400 */    37,  469,   35,   33,   37,   33,  474,   33,  476,   33,
- /*  1410 */    12,   13,  480,  481,  107,  358,  107,   37,  424,  108,
- /*  1420 */    13,  518,   13,  116,  108,  507,  108,  108,  371,  183,
- /*  1430 */   184,  500,   65,  374,  399,   33,  190,  191,   33,   33,
- /*  1440 */   424,   33,  387,   33,   37,   78,   37,  387,  108,  369,
- /*  1450 */    33,  205,  424,  207,    0,  506,  399,  434,   78,  108,
- /*  1460 */   108,  108,  506,  506,  506,  424,  374,  371,  411,  442,
- /*  1470 */   413,  104,  410,  424,  424,  490,  511,  482,  108,  493,
- /*  1480 */   108,  280,  108,  301,  108,  239,  240,  241,  389,  243,
+ /*  1410 */    12,   13,  480,  481,   13,  358,  107,   12,   13,  108,
+ /*  1420 */    12,   13,   12,   13,  108,  424,  108,  108,  371,  183,
+ /*  1430 */   184,   13,   65,   12,   13,   33,  190,  191,   37,   12,
+ /*  1440 */    13,   12,   13,  107,  507,   78,   12,   13,  108,   12,
+ /*  1450 */    13,  205,  116,  207,    0,   37,  399,  518,  500,  108,
+ /*  1460 */   108,  108,   12,   13,   12,   13,   33,  374,  411,   33,
+ /*  1470 */   413,  104,   37,  399,  387,   33,  387,  369,  108,  424,
+ /*  1480 */   108,   33,  108,  301,  108,  239,  240,  241,  424,  243,
  /*  1490 */   244,  245,  246,  247,  248,  249,  250,  251,  252,  253,
- /*  1500 */   254,  255,  256,  257,  258,  259,  260,   12,   13,  436,
- /*  1510 */   108,   51,  455,  108,  108,  458,  108,   22,  108,  462,
- /*  1520 */   463,  464,  465,  466,  467,  108,  469,   73,   74,   75,
+ /*  1500 */   254,  255,  256,  257,  258,  259,  260,   12,   13,   33,
+ /*  1510 */   108,  506,  455,   78,  506,  458,  506,   22,  434,  462,
+ /*  1520 */   463,  464,  465,  466,  467,  506,  469,   73,   74,   75,
  /*  1530 */    35,  474,   37,  476,   80,   81,   82,  480,  481,  358,
- /*  1540 */    86,  457,   42,  456,   20,   91,   92,   93,   94,  239,
- /*  1550 */   220,   97,  371,  447,  100,  379,  452,  447,  379,  203,
- /*  1560 */    65,  438,   20,  358,  370,   20,  371,   45,  420,  371,
- /*  1570 */   207,  420,  205,  182,  207,  420,  371,  417,  371,  417,
- /*  1580 */   399,  370,  370,  417,  417,  105,  383,  103,  382,  370,
- /*  1590 */   102,  381,  411,  370,  413,  370,  370,   20,  363,  358,
- /*  1600 */    50,  367,  363,  367,  399,   20,  239,  240,  447,  379,
- /*  1610 */   379,  379,  371,  413,   20,  372,  411,   20,  413,  379,
- /*  1620 */   253,  254,  255,  256,  257,  258,  259,  437,  372,  303,
- /*  1630 */   379,   20,  379,  379,  379,  370,  455,  363,  370,  458,
- /*  1640 */   399,  427,  224,  462,  463,  464,  465,  466,  467,  399,
- /*  1650 */   469,  399,  411,  361,  413,  474,  399,  476,  399,  399,
- /*  1660 */   455,  480,  481,  458,  361,  399,  451,  462,  463,  464,
- /*  1670 */   465,  466,  467,  411,  469,  399,  399,  363,  399,  474,
- /*  1680 */   399,  476,  399,  411,  411,  480,  481,  107,   20,  377,
- /*  1690 */   446,  449,  447,  211,  377,  210,  455,  413,  370,  458,
- /*  1700 */   205,  443,  207,  462,  463,  464,  465,  466,  467,  411,
- /*  1710 */   469,  436,  288,  444,  287,  499,  358,  476,  429,  499,
- /*  1720 */   502,  480,  481,  429,  296,  196,  297,  499,  501,  371,
- /*  1730 */   298,  498,  237,  238,  239,  497,  281,  436,  305,  302,
- /*  1740 */   519,  300,  513,  496,  276,   20,  358,  461,  253,  254,
- /*  1750 */   255,  256,  257,  258,  259,  371,  117,  399,  372,  371,
- /*  1760 */   512,  278,  377,  492,  494,  107,  377,  479,  411,  411,
- /*  1770 */   429,  413,  411,  411,  429,  411,  411,  188,  377,  425,
- /*  1780 */   377,  107,  395,  371,  403,  370,  411,  399,  411,  358,
- /*  1790 */   411,  377,   38,   22,  360,  448,  356,  393,  363,  411,
- /*  1800 */   364,  413,  371,  378,  393,  439,  393,    0,  430,    0,
- /*  1810 */     0,   45,  430,  455,    0,   37,  458,  230,   37,   37,
- /*  1820 */   462,  463,  464,  465,  466,  467,   37,  469,  230,    0,
- /*  1830 */   399,   37,   37,  230,  476,   37,    0,  230,  480,  481,
- /*  1840 */     0,   37,  411,  455,  413,    0,  458,    0,   37,  358,
- /*  1850 */   462,  463,  464,  465,  466,  467,   22,  469,    0,   37,
- /*  1860 */   225,    0,  371,  213,  476,    0,  213,  207,  480,  481,
- /*  1870 */   214,  358,  205,    0,    0,    0,  201,  200,    0,    0,
- /*  1880 */   150,   49,   49,    0,  371,   37,  455,    0,    0,  458,
- /*  1890 */   399,   37,   51,  462,  463,  464,  465,  466,  467,    0,
- /*  1900 */   469,   49,  411,    0,  413,   45,    0,    0,    0,    0,
- /*  1910 */     0,   49,  399,  168,   37,    0,  168,    0,    0,    0,
- /*  1920 */     0,    0,    0,    0,  411,    0,  413,    0,    0,    0,
- /*  1930 */     0,    0,    0,    0,    0,  504,  505,    0,    0,    0,
- /*  1940 */     0,    0,    0,    0,   49,    0,  455,   45,    0,  458,
+ /*  1540 */    86,  108,  374,  371,  108,   91,   92,   93,   94,  239,
+ /*  1550 */   108,   97,  371,  424,  100,  410,  108,  442,  424,  424,
+ /*  1560 */    65,  490,  511,  358,  482,  493,  389,  280,  436,   51,
+ /*  1570 */   207,  457,  205,   42,  207,   20,  371,  456,  447,  220,
+ /*  1580 */   399,  379,  452,  203,  108,  447,  379,  438,   20,  370,
+ /*  1590 */    20,  371,  411,   45,  413,  420,  371,  182,  420,  358,
+ /*  1600 */   417,  370,  417,  371,  399,  370,  239,  240,  417,  420,
+ /*  1610 */   417,  105,  371,  383,  103,  382,  411,  370,  413,  102,
+ /*  1620 */   253,  254,  255,  256,  257,  258,  259,  370,  370,  303,
+ /*  1630 */   381,  370,   20,  363,   50,  367,  455,  363,  367,  458,
+ /*  1640 */   399,  447,  379,  462,  463,  464,  465,  466,  467,   20,
+ /*  1650 */   469,  379,  411,  413,  413,  474,  379,  476,   20,   20,
+ /*  1660 */   455,  480,  481,  458,  372,  437,   20,  462,  463,  464,
+ /*  1670 */   465,  466,  467,  379,  469,  372,  379,  427,  379,  474,
+ /*  1680 */   379,  476,  370,  379,  363,  480,  481,  399,  399,  399,
+ /*  1690 */   370,  361,  399,  361,  399,  399,  455,  399,  363,  458,
+ /*  1700 */   205,  399,  207,  462,  463,  464,  465,  466,  467,  224,
+ /*  1710 */   469,  411,  399,  399,  399,  107,  358,  476,  411,  377,
+ /*  1720 */   451,  480,  481,  447,  449,   20,  446,  211,  411,  371,
+ /*  1730 */   444,  210,  237,  238,  239,  370,  413,  377,  411,  288,
+ /*  1740 */   287,  436,  499,  499,  502,  296,  358,  196,  253,  254,
+ /*  1750 */   255,  256,  257,  258,  259,  501,  298,  399,  429,  371,
+ /*  1760 */   429,  499,  297,  498,  281,  443,  305,  519,  302,  411,
+ /*  1770 */   497,  413,  513,  436,  300,  496,  276,  371,  512,   20,
+ /*  1780 */   117,  278,  107,  372,  377,  461,  377,  399,  411,  358,
+ /*  1790 */   429,  429,  411,  411,  411,  411,  425,  188,  395,  411,
+ /*  1800 */   494,  413,  371,  377,  411,  377,  411,  479,  411,  371,
+ /*  1810 */   411,  411,   22,  455,  107,  411,  458,  403,  377,   38,
+ /*  1820 */   462,  463,  464,  465,  466,  467,  439,  469,  411,    0,
+ /*  1830 */   399,  411,  360,  492,  476,  411,  411,  364,  480,  481,
+ /*  1840 */   363,  411,  411,  455,  413,  370,  458,    0,  356,  358,
+ /*  1850 */   462,  463,  464,  465,  466,  467,  411,  469,  411,  378,
+ /*  1860 */   448,    0,  371,   45,  476,    0,  411,  411,  480,  481,
+ /*  1870 */   411,  358,  393,  411,  411,  411,  430,  393,  411,  411,
+ /*  1880 */   411,  411,  393,   37,  371,  230,  455,  430,   37,  458,
+ /*  1890 */   399,   37,   37,  462,  463,  464,  465,  466,  467,  230,
+ /*  1900 */   469,    0,  411,   37,  413,   37,  230,   37,    0,  230,
+ /*  1910 */     0,   37,  399,   37,    0,   22,    0,   37,  225,    0,
+ /*  1920 */     0,  213,  213,  207,  411,    0,  413,  214,  205,    0,
+ /*  1930 */     0,    0,  201,  200,    0,  504,  505,    0,   49,  150,
+ /*  1940 */    49,    0,   37,    0,    0,   51,  455,   49,   37,  458,
  /*  1950 */     0,  358,    0,  462,  463,  464,  465,  466,  467,    0,
- /*  1960 */   469,    0,    0,    0,  371,    0,   22,  476,  455,    0,
- /*  1970 */   150,  458,  481,  149,    0,  462,  463,  464,  465,  466,
- /*  1980 */   467,  358,  469,    0,    0,  148,    0,    0,   22,   22,
- /*  1990 */    37,   65,  399,   37,  371,    0,   50,    0,    0,  358,
- /*  2000 */    65,   50,    0,    0,  411,   51,  413,   37,   51,    0,
- /*  2010 */    42,   51,  371,   42,   65,   37,    0,   42,  505,   37,
- /*  2020 */     0,   45,  399,   42,   33,   14,  433,    0,   49,  358,
- /*  2030 */     0,    0,    0,   43,  411,    0,  413,   49,   49,  196,
- /*  2040 */   399,   42,  371,   42,    0,   49,    0,    0,  455,   72,
- /*  2050 */     0,  458,  411,    0,  413,  462,  463,  464,  465,  466,
- /*  2060 */   467,   37,  469,   51,   42,    0,   37,   42,   51,    0,
- /*  2070 */   399,   37,   51,    0,  433,   42,   37,   51,  455,   42,
- /*  2080 */     0,  458,  411,    0,  413,  462,  463,  464,  465,  466,
- /*  2090 */   467,    0,  469,    0,    0,    0,  455,   37,   22,  458,
- /*  2100 */   115,    0,   53,  462,  463,  464,  465,  466,  467,  358,
- /*  2110 */   469,   37,    0,  113,   37,   37,   37,    0,   37,   37,
- /*  2120 */    33,   37,  371,   37,    0,   33,  455,   37,  358,  458,
- /*  2130 */    22,  508,   22,  462,  463,  464,  465,  466,  467,   37,
- /*  2140 */   469,  371,   22,   37,   22,    0,  358,   22,   37,    0,
- /*  2150 */   399,    0,    0,   37,    0,   37,    0,   22,   20,  371,
- /*  2160 */   108,  107,  411,   37,  413,   37,   37,    0,  107,  399,
- /*  2170 */   119,    0,   22,  118,   37,    0,  212,  185,    0,   49,
- /*  2180 */   208,  411,   22,  413,    0,    3,  192,  399,  517,  185,
- /*  2190 */   185,   33,  185,  185,  188,  107,  282,  108,   37,  411,
- /*  2200 */    37,  413,  192,  433,  107,  107,  455,  108,    1,  458,
- /*  2210 */   103,  108,   50,  462,  463,  464,  465,  466,  467,  105,
- /*  2220 */   469,  433,  471,   50,   33,  455,   19,   33,  458,  108,
- /*  2230 */    33,    3,  462,  463,  464,  465,  466,  467,  107,  469,
- /*  2240 */   107,  107,   35,  455,  108,   49,  458,   49,  358,  107,
- /*  2250 */   462,  463,  464,  465,  466,  467,   33,  469,   51,   33,
- /*  2260 */    49,  371,  282,  108,   37,  108,   37,   60,   61,   62,
- /*  2270 */    63,  358,   65,   37,  108,   37,   37,   37,  108,   33,
- /*  2280 */    49,    0,    0,  107,  371,   42,   33,    2,  105,  399,
- /*  2290 */   275,  105,   22,  108,  107,  282,  239,  108,  262,   49,
- /*  2300 */   107,  411,  107,  413,   49,  358,   22,  108,  242,  107,
- /*  2310 */     0,  108,  399,  106,  108,  107,  109,  107,  371,  107,
- /*  2320 */    42,  189,  107,   49,  411,  116,  413,  187,  107,   37,
- /*  2330 */   117,  358,  107,   37,   37,   37,   37,   37,  108,  107,
- /*  2340 */   107,   37,  108,  108,  371,  455,  399,  130,  458,  107,
+ /*  1960 */   469,    0,   45,    0,  371,    0,    0,  476,  455,    0,
+ /*  1970 */    49,  458,  481,  168,    0,  462,  463,  464,  465,  466,
+ /*  1980 */   467,  358,  469,    0,    0,    0,   37,  168,    0,    0,
+ /*  1990 */     0,    0,  399,   45,  371,    0,    0,    0,    0,  358,
+ /*  2000 */     0,    0,    0,    0,  411,    0,  413,    0,    0,    0,
+ /*  2010 */     0,    0,  371,    0,    0,    0,   49,    0,  505,    0,
+ /*  2020 */     0,    0,  399,    0,    0,    0,  433,    0,   22,  358,
+ /*  2030 */     0,  150,  149,    0,  411,  148,  413,    0,    0,    0,
+ /*  2040 */   399,   65,  371,    0,   22,   65,    0,   65,  455,   50,
+ /*  2050 */    22,  458,  411,    0,  413,  462,  463,  464,  465,  466,
+ /*  2060 */   467,    0,  469,   37,    0,    0,   50,    0,   37,   51,
+ /*  2070 */   399,   42,   37,   37,  433,  196,   42,    0,  455,   37,
+ /*  2080 */    33,  458,  411,   51,  413,  462,  463,  464,  465,  466,
+ /*  2090 */   467,   51,  469,   42,   45,   14,  455,   42,    0,  458,
+ /*  2100 */    43,   49,   42,  462,  463,  464,  465,  466,  467,  358,
+ /*  2110 */   469,   49,   49,    0,    0,    0,    0,    0,   49,    0,
+ /*  2120 */    42,    0,  371,   37,   51,   42,  455,    0,  358,  458,
+ /*  2130 */    72,  508,    0,  462,  463,  464,  465,  466,  467,    0,
+ /*  2140 */   469,  371,   51,   37,   42,    0,  358,   37,   51,   42,
+ /*  2150 */   399,    0,   51,   42,    0,   37,    0,    0,    0,  371,
+ /*  2160 */     0,    0,  411,  115,  413,   37,   22,  113,    0,  399,
+ /*  2170 */    37,   37,   37,   37,   37,   37,   33,   37,   37,   33,
+ /*  2180 */     0,  411,    0,  413,   37,   37,   22,  399,  517,   37,
+ /*  2190 */     0,   22,   22,   22,    0,   53,   22,    0,    0,  411,
+ /*  2200 */    37,  413,    0,  433,   37,    0,  455,   22,    1,  458,
+ /*  2210 */    37,    0,   20,  462,  463,  464,  465,  466,  467,  107,
+ /*  2220 */   469,  433,  471,   37,   37,  455,   19,    0,  458,  185,
+ /*  2230 */    37,  107,  462,  463,  464,  465,  466,  467,  108,  469,
+ /*  2240 */   118,    0,   35,  455,  119,   49,  458,   37,  358,    0,
+ /*  2250 */   462,  463,  464,  465,  466,  467,  185,  469,   51,  185,
+ /*  2260 */    22,  371,  212,    0,  208,   22,    0,   60,   61,   62,
+ /*  2270 */    63,  358,   65,  188,  185,  185,  192,    3,   33,  192,
+ /*  2280 */   108,   37,  107,  107,  371,  108,  282,   37,  107,  399,
+ /*  2290 */    50,  108,   50,  105,  103,   33,  107,   33,   33,    3,
+ /*  2300 */    49,  411,  107,  413,   49,  358,   33,  108,  107,   33,
+ /*  2310 */    49,  108,  399,  106,  108,  107,  109,  108,  371,   37,
+ /*  2320 */    37,   37,   37,  282,  411,   37,  413,  282,   37,  108,
+ /*  2330 */    33,  358,  108,    0,  275,   49,    0,  107,   33,  105,
+ /*  2340 */    42,  262,    2,   22,  371,  455,  399,  239,  458,   49,
  /*  2350 */   143,  358,  462,  463,  464,  465,  466,  467,  411,  469,
- /*  2360 */   413,  107,  118,  107,  371,  108,  108,  107,  455,  108,
- /*  2370 */   107,  458,  399,  108,  107,  462,  463,  464,  465,  466,
- /*  2380 */   467,  130,  469,  119,  411,   33,  413,  107,   22,  130,
- /*  2390 */   107,   37,  399,  107,  187,   72,  130,   71,   37,   37,
- /*  2400 */    37,  194,  455,  101,  411,  458,  413,   37,   37,  462,
- /*  2410 */   463,  464,  465,  466,  467,   37,  469,   37,   37,   37,
- /*  2420 */   213,   78,   78,  101,   33,   37,   37,   37,  455,   22,
- /*  2430 */    37,  458,   37,  358,   37,  462,  463,  464,  465,  466,
- /*  2440 */   467,   37,  469,   78,   22,   37,  371,   37,  455,   37,
- /*  2450 */    37,  458,   37,    0,   37,  462,  463,  464,  465,  466,
- /*  2460 */   467,   42,  469,  358,    0,   51,   37,   51,   42,    0,
- /*  2470 */    37,   51,   42,    0,  399,   37,  371,   42,   51,    0,
- /*  2480 */    37,  358,   37,    0,   22,   33,  411,   22,  413,   21,
- /*  2490 */   520,  520,   22,   22,  371,   21,   20,  520,  520,  520,
- /*  2500 */   520,  520,  520,  520,  399,  520,  520,  520,  520,  520,
- /*  2510 */   520,  520,  520,  520,  520,  520,  411,  520,  413,  520,
- /*  2520 */   520,  520,  399,  520,  520,  520,  520,  520,  520,  520,
- /*  2530 */   455,  520,  520,  458,  411,  520,  413,  462,  463,  464,
- /*  2540 */   465,  466,  467,  520,  469,  520,  520,  520,  520,  520,
- /*  2550 */   520,  520,  520,  520,  520,  520,  520,  520,  520,  520,
+ /*  2360 */   413,  105,  108,   49,  371,  107,   22,  108,  455,    0,
+ /*  2370 */    42,  458,  399,  242,  107,  462,  463,  464,  465,  466,
+ /*  2380 */   467,   49,  469,  108,  411,  107,  413,  107,  116,  108,
+ /*  2390 */    37,   37,  399,   37,  187,  108,  107,  107,   37,  107,
+ /*  2400 */   187,  194,  455,  189,  411,  458,  413,  108,  107,  462,
+ /*  2410 */   463,  464,  465,  466,  467,  107,  469,  107,  107,  107,
+ /*  2420 */   213,  117,   37,  108,  107,   37,  108,  107,  455,   37,
+ /*  2430 */   108,  458,  108,  358,  107,  462,  463,  464,  465,  466,
+ /*  2440 */   467,  107,  469,  108,  107,  107,  371,  108,  455,  130,
+ /*  2450 */   107,  458,   33,  130,   37,  462,  463,  464,  465,  466,
+ /*  2460 */   467,  130,  469,  358,  119,  118,  107,  107,   22,   72,
+ /*  2470 */    71,  130,   37,   37,  399,   37,  371,   37,   37,   37,
+ /*  2480 */    37,  358,   37,   78,   37,  101,  411,   78,  413,   33,
+ /*  2490 */   101,   37,   37,   22,  371,   37,   37,   37,   37,   78,
+ /*  2500 */    37,   37,   37,   37,  399,   37,   22,   37,    0,   37,
+ /*  2510 */     0,   42,   37,   51,    0,   37,  411,    0,  413,   42,
+ /*  2520 */    37,   42,  399,   42,   51,   51,    0,   51,   37,   37,
+ /*  2530 */   455,    0,   33,  458,  411,   22,  413,  462,  463,  464,
+ /*  2540 */   465,  466,  467,   22,  469,   21,  520,   22,   20,   22,
+ /*  2550 */    21,  520,  520,  520,  520,  520,  520,  520,  520,  520,
  /*  2560 */   455,  520,  358,  458,  520,  520,  520,  462,  463,  464,
  /*  2570 */   465,  466,  467,  520,  469,  371,  520,  520,  455,  520,
  /*  2580 */   358,  458,  520,  520,  520,  462,  463,  464,  465,  466,
@@ -1236,9 +1236,9 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  3450 */   355,  355,  355,  355,  355,  355,  355,  355,  355,  355,
  /*  3460 */   355,  355,
 };
-#define YY_SHIFT_COUNT    (864)
+#define YY_SHIFT_COUNT    (894)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (2483)
+#define YY_SHIFT_MAX      (2531)
 static const unsigned short int yy_shift_ofst[] = {
  /*     0 */   135,    0,  249,    0,  499,  499,  499,  499,  499,  499,
  /*    10 */   499,  499,  499,  499,  499,  499,  748,  997,  997, 1246,
@@ -1261,74 +1261,77 @@ static const unsigned short int yy_shift_ofst[] = {
  /*   180 */   383,  495,  346,  588,  398,  398, 1091,   38, 1095,  545,
  /*   190 */   545,  545,  883,  896,  545,  679, 1107,  379,  706, 1061,
  /*   200 */  1107, 1107, 1136, 1034, 1053,  221, 1034, 1158,  684,  522,
- /*   210 */  1201, 1460, 1500, 1524, 1330,  350, 1524,  350, 1356, 1542,
- /*   220 */  1545, 1522, 1545, 1522, 1391, 1542, 1545, 1542, 1522, 1391,
- /*   230 */  1391, 1391, 1480, 1484, 1542, 1488, 1542, 1542, 1542, 1577,
- /*   240 */  1550, 1577, 1550, 1524,  350,  350, 1585,  350, 1594, 1597,
- /*   250 */   350, 1594,  350, 1611,  350,  350, 1542,  350, 1577,   14,
+ /*   210 */  1287, 1518, 1531, 1555, 1359,  350, 1555,  350, 1380, 1568,
+ /*   220 */  1570, 1548, 1570, 1548, 1415, 1568, 1570, 1568, 1548, 1415,
+ /*   230 */  1415, 1415, 1506, 1511, 1568, 1517, 1568, 1568, 1568, 1612,
+ /*   240 */  1584, 1612, 1584, 1555,  350,  350, 1629,  350, 1638, 1639,
+ /*   250 */   350, 1638,  350, 1646,  350,  350, 1568,  350, 1612,   14,
  /*   260 */    14,   14,   14,   14,   14,   14,   14,   14,   14,   14,
- /*   270 */  1542,  890,  890, 1577,  722,  722,  722, 1418, 1580, 1524,
- /*   280 */   645, 1668, 1482, 1485, 1585,  645, 1201, 1542,  722, 1424,
- /*   290 */  1427, 1424, 1427, 1428, 1529, 1424, 1432, 1429, 1455, 1201,
- /*   300 */  1433, 1437, 1441, 1468, 1545, 1725, 1639, 1483, 1594,  645,
- /*   310 */   645, 1658, 1427,  722,  722,  722,  722, 1427,  722, 1589,
- /*   320 */   645,  794,  645, 1545,  722,  722, 1674,  722, 1542,  645,
- /*   330 */  1771, 1754, 1577, 3107, 3107, 3107, 3107, 3107, 3107, 3107,
- /*   340 */  3107, 3107,   36,  498,  263,  534,  665,   79,  826,  296,
- /*   350 */   450,  914,  806, 1033,   54,   54,   54,   54,   54,   54,
- /*   360 */    54,   54,   54, 1054,  374,  674,  774,  774,  130,  946,
- /*   370 */    32,  618,  118,  574,  620,  873, 1103, 1163,  643,  951,
- /*   380 */   555,  661,  951,  951,  951,  307,  307,  436,  331,  127,
- /*   390 */  1278, 1267, 1174, 1308, 1204, 1208, 1209, 1213, 1188, 1291,
- /*   400 */  1325, 1333, 1334, 1339, 1119,  601, 1264,  519, 1311, 1316,
- /*   410 */  1318, 1319, 1217, 1182, 1326, 1340, 1373, 1351, 1310, 1352,
- /*   420 */  1309, 1353, 1370, 1372, 1374, 1376, 1398, 1402, 1405, 1406,
- /*   430 */  1408, 1410, 1417, 1307, 1186, 1363, 1407, 1409, 1380,  832,
- /*   440 */  1807, 1809, 1810, 1766, 1814, 1778, 1587, 1781, 1782, 1789,
- /*   450 */  1598, 1829, 1794, 1795, 1603, 1798, 1836, 1607, 1840, 1804,
- /*   460 */  1845, 1811, 1847, 1834, 1858, 1822, 1635, 1861, 1650, 1865,
- /*   470 */  1653, 1656, 1660, 1667, 1873, 1874, 1875, 1675, 1677, 1878,
- /*   480 */  1879, 1730, 1832, 1833, 1883, 1848, 1887, 1888, 1854, 1841,
- /*   490 */  1899, 1852, 1903, 1860, 1906, 1907, 1908, 1862, 1909, 1910,
- /*   500 */  1925, 1927, 1928, 1929, 1745, 1877, 1915, 1748, 1917, 1918,
- /*   510 */  1919, 1920, 1921, 1922, 1923, 1930, 1931, 1932, 1933, 1934,
- /*   520 */  1937, 1938, 1939, 1940, 1941, 1942, 1943, 1895, 1945, 1902,
- /*   530 */  1948, 1950, 1952, 1959, 1961, 1962, 1963, 1965, 1944, 1969,
- /*   540 */  1820, 1983, 1824, 1974, 1837, 1984, 1986, 1966, 1946, 1967,
- /*   550 */  1951, 1987, 1926, 1953, 1995, 1935, 1997, 1949, 1998, 2002,
- /*   560 */  1956, 1954, 1968, 2003, 1970, 1957, 1971, 2009, 1978, 1960,
- /*   570 */  1975, 2016, 1982, 2020, 1976, 1981, 1991, 1979, 1988, 2011,
- /*   580 */  1989, 2027, 1990, 1999, 2030, 2031, 2032, 2035, 2001, 1843,
- /*   590 */  2044, 1979, 1996, 2046, 2047, 1977, 2050, 2053, 2024, 2012,
- /*   600 */  2022, 2065, 2029, 2017, 2025, 2069, 2034, 2021, 2033, 2073,
- /*   610 */  2039, 2026, 2037, 2080, 2083, 2091, 2093, 2094, 2095, 1985,
- /*   620 */  2000, 2060, 2076, 2101, 2074, 2077, 2078, 2079, 2081, 2082,
- /*   630 */  2084, 2086, 2087, 2092, 2090, 2102, 2108, 2106, 2112, 2110,
- /*   640 */  2117, 2120, 2124, 2122, 2049, 2145, 2125, 2111, 2149, 2151,
- /*   650 */  2152, 2116, 2154, 2118, 2156, 2135, 2138, 2126, 2128, 2129,
- /*   660 */  2052, 2054, 2167, 1992, 2055, 2051, 2061, 1964, 1979, 2130,
- /*   670 */  2171, 2004, 2137, 2150, 2175, 1972, 2160, 2005, 2006, 2178,
- /*   680 */  2184, 2007, 1994, 2008, 2010, 2182, 2158, 1914, 2088, 2089,
- /*   690 */  2097, 2099, 2161, 2163, 2098, 2162, 2114, 2173, 2107, 2103,
- /*   700 */  2191, 2194, 2121, 2131, 2133, 2134, 2136, 2197, 2196, 2198,
- /*   710 */  2142, 2223, 1980, 2155, 2157, 2228, 2226, 2013, 2227, 2229,
- /*   720 */  2236, 2238, 2239, 2240, 2166, 2170, 2211, 2015, 2246, 2231,
- /*   730 */  2281, 2282, 2176, 2243, 2253, 2183, 2036, 2186, 2285, 2270,
- /*   740 */  2057, 2185, 2187, 2189, 2250, 2193, 2195, 2255, 2199, 2284,
- /*   750 */  2066, 2202, 2203, 2206, 2208, 2210, 2132, 2212, 2310, 2278,
- /*   760 */  2140, 2215, 2209, 1979, 2274, 2221, 2225, 2230, 2232, 2233,
- /*   770 */  2213, 2234, 2292, 2296, 2242, 2235, 2297, 2254, 2257, 2298,
- /*   780 */  2256, 2258, 2299, 2260, 2261, 2300, 2263, 2265, 2304, 2267,
- /*   790 */  2217, 2251, 2259, 2266, 2264, 2244, 2280, 2352, 2283, 2354,
- /*   800 */  2286, 2352, 2352, 2366, 2323, 2326, 2361, 2362, 2363, 2370,
- /*   810 */  2371, 2378, 2380, 2381, 2382, 2343, 2302, 2344, 2322, 2391,
- /*   820 */  2388, 2389, 2390, 2407, 2393, 2395, 2397, 2365, 2087, 2404,
- /*   830 */  2092, 2408, 2410, 2412, 2413, 2422, 2415, 2453, 2417, 2414,
- /*   840 */  2419, 2464, 2429, 2416, 2426, 2469, 2433, 2420, 2430, 2473,
- /*   850 */  2438, 2427, 2435, 2479, 2443, 2445, 2483, 2462, 2452, 2465,
- /*   860 */  2468, 2470, 2471, 2474, 2476,
+ /*   270 */  1568,  890,  890, 1612,  722,  722,  722, 1485, 1608, 1555,
+ /*   280 */   645, 1705, 1516, 1521, 1629,  645, 1287, 1568,  722, 1451,
+ /*   290 */  1453, 1451, 1453, 1449, 1551, 1451, 1458, 1465, 1483, 1287,
+ /*   300 */  1461, 1466, 1474, 1500, 1570, 1759, 1663, 1503, 1638,  645,
+ /*   310 */   645, 1675, 1453,  722,  722,  722,  722, 1453,  722, 1609,
+ /*   320 */   645,  794,  645, 1570,  722,  722,  722,  722,  722,  722,
+ /*   330 */   722,  722,  722,  722,  722,  722,  722,  722,  722,  722,
+ /*   340 */   722,  722,  722,  722,  722,  722, 1707,  722, 1568,  645,
+ /*   350 */  1790, 1781, 1612, 3107, 3107, 3107, 3107, 3107, 3107, 3107,
+ /*   360 */  3107, 3107,   36,  498,  263,  534,  665,   79,  826,  296,
+ /*   370 */   450,  914,  806, 1033,   54,   54,   54,   54,   54,   54,
+ /*   380 */    54,   54,   54, 1054,  374,  674,  774,  774,  130,  946,
+ /*   390 */    32,  618,  118,  574,  620,  873, 1103, 1163,  643,  951,
+ /*   400 */   555,  661,  951,  951,  951,  307,  307,  436,  331,  127,
+ /*   410 */  1278, 1267, 1174, 1308, 1204, 1208, 1209, 1213, 1188, 1291,
+ /*   420 */  1325, 1333, 1334, 1339, 1119,  601, 1264,  519, 1311, 1316,
+ /*   430 */  1318, 1319, 1217, 1182, 1326, 1340, 1373, 1351, 1310, 1352,
+ /*   440 */  1309, 1353, 1370, 1372, 1374, 1376, 1398, 1405, 1408, 1410,
+ /*   450 */  1421, 1427, 1429, 1434, 1437, 1450, 1452, 1402, 1433, 1436,
+ /*   460 */  1442, 1448, 1476, 1336, 1186, 1363, 1401, 1418, 1435,  832,
+ /*   470 */  1829, 1847, 1861, 1818, 1865, 1846, 1655, 1851, 1854, 1855,
+ /*   480 */  1669, 1901, 1866, 1868, 1676, 1870, 1908, 1679, 1910, 1874,
+ /*   490 */  1925, 1876, 1914, 1893, 1916, 1880, 1693, 1919, 1708, 1920,
+ /*   500 */  1709, 1713, 1716, 1723, 1929, 1930, 1931, 1731, 1733, 1934,
+ /*   510 */  1937, 1789, 1889, 1891, 1941, 1905, 1943, 1944, 1911, 1894,
+ /*   520 */  1950, 1898, 1952, 1917, 1959, 1961, 1963, 1921, 1965, 1966,
+ /*   530 */  1969, 1983, 1984, 1985, 1805, 1949, 1974, 1819, 1988, 1989,
+ /*   540 */  1990, 1991, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
+ /*   550 */  2005, 2007, 2008, 2009, 2010, 2011, 2013, 1967, 2014, 1948,
+ /*   560 */  2015, 2017, 2019, 2020, 2021, 2023, 2024, 2025, 2006, 2027,
+ /*   570 */  1881, 2030, 1883, 2033, 1887, 2037, 2038, 2022, 1999, 2028,
+ /*   580 */  2016, 2039, 1976, 2026, 2043, 1980, 2046, 1982, 2053, 2061,
+ /*   590 */  2031, 2018, 2029, 2064, 2035, 2032, 2034, 2065, 2036, 2040,
+ /*   600 */  2051, 2067, 2042, 2077, 2049, 2055, 2047, 2052, 2062, 2081,
+ /*   610 */  2063, 2098, 2057, 2060, 2113, 2114, 2115, 2116, 2078, 1879,
+ /*   620 */  2117, 2052, 2069, 2119, 2121, 2058, 2127, 2132, 2086, 2073,
+ /*   630 */  2083, 2139, 2106, 2091, 2102, 2145, 2110, 2097, 2107, 2151,
+ /*   640 */  2118, 2101, 2111, 2154, 2156, 2157, 2158, 2160, 2161, 2048,
+ /*   650 */  2054, 2128, 2144, 2168, 2133, 2134, 2135, 2136, 2137, 2138,
+ /*   660 */  2140, 2141, 2143, 2146, 2147, 2148, 2164, 2152, 2180, 2169,
+ /*   670 */  2182, 2170, 2190, 2171, 2142, 2194, 2174, 2163, 2197, 2198,
+ /*   680 */  2202, 2167, 2205, 2173, 2211, 2185, 2192, 2186, 2187, 2193,
+ /*   690 */  2130, 2112, 2227, 2044, 2122, 2125, 2124, 2050, 2052, 2196,
+ /*   700 */  2241, 2071, 2210, 2238, 2249, 2056, 2243, 2074, 2085, 2263,
+ /*   710 */  2266, 2089, 2084, 2090, 2087, 2274, 2245, 2004, 2175, 2172,
+ /*   720 */  2176, 2177, 2244, 2250, 2181, 2240, 2188, 2242, 2191, 2183,
+ /*   730 */  2262, 2264, 2199, 2189, 2195, 2201, 2203, 2265, 2251, 2255,
+ /*   740 */  2208, 2273, 2041, 2206, 2209, 2296, 2276, 2045, 2282, 2283,
+ /*   750 */  2284, 2285, 2288, 2291, 2221, 2224, 2261, 2059, 2297, 2286,
+ /*   760 */  2333, 2336, 2230, 2298, 2305, 2234, 2079, 2256, 2340, 2321,
+ /*   770 */  2108, 2254, 2258, 2259, 2300, 2267, 2278, 2314, 2275, 2344,
+ /*   780 */  2131, 2280, 2281, 2287, 2289, 2290, 2214, 2292, 2369, 2328,
+ /*   790 */  2213, 2301, 2272, 2052, 2332, 2308, 2310, 2299, 2311, 2312,
+ /*   800 */  2304, 2315, 2353, 2354, 2317, 2318, 2356, 2320, 2322, 2361,
+ /*   810 */  2327, 2324, 2385, 2334, 2335, 2388, 2337, 2339, 2392, 2338,
+ /*   820 */  2319, 2323, 2331, 2341, 2345, 2347, 2343, 2419, 2359, 2417,
+ /*   830 */  2360, 2419, 2419, 2446, 2397, 2399, 2435, 2436, 2438, 2440,
+ /*   840 */  2441, 2442, 2443, 2445, 2447, 2405, 2384, 2409, 2389, 2456,
+ /*   850 */  2454, 2455, 2458, 2471, 2459, 2460, 2461, 2421, 2143, 2463,
+ /*   860 */  2146, 2464, 2465, 2466, 2468, 2484, 2470, 2508, 2472, 2462,
+ /*   870 */  2469, 2510, 2475, 2473, 2477, 2514, 2478, 2474, 2479, 2517,
+ /*   880 */  2483, 2476, 2481, 2526, 2491, 2492, 2531, 2513, 2499, 2521,
+ /*   890 */  2524, 2525, 2527, 2529, 2528,
 };
-#define YY_REDUCE_COUNT (341)
+#define YY_REDUCE_COUNT (361)
 #define YY_REDUCE_MIN   (-484)
 #define YY_REDUCE_MAX   (2637)
 static const short yy_reduce_ofst[] = {
@@ -1349,113 +1352,118 @@ static const short yy_reduce_ofst[] = {
  /*   140 */   -27,  478,  670,  675,  798,  151,  649,  678,  685,  694,
  /*   150 */   613, -122,  909,  800, -299,  246,  730,  321,  785,  640,
  /*   160 */   666,  888,  878,  887,  904,  945, -400, -384,  541,  554,
- /*   170 */   626,  831,  954, -400,  681,  982, 1029,  994,  903,  918,
- /*   180 */   931, 1059, 1035, 1035, 1055, 1060, 1016, 1080, 1028,  949,
- /*   190 */   956,  957, 1023, 1035,  958, 1092, 1041, 1096, 1062, 1027,
- /*   200 */  1049, 1050, 1035,  985,  985,  965,  985,  995,  986, 1099,
- /*   210 */  1073, 1084, 1087, 1106, 1104, 1176, 1110, 1179, 1123, 1194,
- /*   220 */  1195, 1148, 1198, 1151, 1160, 1211, 1207, 1212, 1155, 1162,
- /*   230 */  1166, 1167, 1203, 1206, 1219, 1210, 1223, 1225, 1226, 1235,
- /*   240 */  1234, 1239, 1236, 1161, 1230, 1231, 1200, 1232, 1243, 1190,
- /*   250 */  1240, 1256, 1251, 1214, 1253, 1254, 1265, 1255, 1274, 1250,
- /*   260 */  1252, 1257, 1259, 1260, 1266, 1276, 1277, 1279, 1281, 1283,
- /*   270 */  1268, 1292, 1303, 1314, 1262, 1272, 1273, 1215, 1242, 1245,
- /*   280 */  1312, 1244, 1269, 1258, 1284, 1317, 1275, 1328, 1298, 1216,
- /*   290 */  1289, 1220, 1294, 1218, 1227, 1228, 1233, 1238, 1247, 1301,
- /*   300 */  1221, 1229, 1248,  985, 1384, 1286, 1270, 1271, 1386, 1385,
- /*   310 */  1389, 1288, 1341, 1357, 1361, 1362, 1364, 1345, 1365, 1354,
- /*   320 */  1401, 1387, 1403, 1412, 1375, 1377, 1381, 1379, 1415, 1414,
- /*   330 */  1434, 1436, 1435, 1366, 1347, 1378, 1382, 1404, 1411, 1413,
- /*   340 */  1425, 1440,
+ /*   170 */   626,  831,  954, -400,  681,  982, 1029, 1001,  939,  937,
+ /*   180 */   958, 1093, 1074, 1074, 1087, 1089, 1055, 1108, 1064, 1005,
+ /*   190 */  1008, 1010, 1084, 1074, 1019, 1168, 1129, 1172, 1145, 1115,
+ /*   200 */  1134, 1135, 1074, 1071, 1071, 1051, 1071, 1082, 1072, 1177,
+ /*   210 */  1132, 1114, 1121, 1131, 1130, 1202, 1138, 1207, 1149, 1219,
+ /*   220 */  1220, 1175, 1225, 1178, 1183, 1231, 1232, 1235, 1189, 1185,
+ /*   230 */  1191, 1193, 1230, 1233, 1247, 1249, 1257, 1258, 1261, 1270,
+ /*   240 */  1268, 1274, 1271, 1194, 1263, 1272, 1240, 1277, 1292, 1228,
+ /*   250 */  1294, 1303, 1297, 1250, 1299, 1301, 1312, 1304, 1321, 1288,
+ /*   260 */  1289, 1290, 1293, 1295, 1296, 1298, 1302, 1313, 1314, 1315,
+ /*   270 */  1320, 1330, 1332, 1335, 1300, 1307, 1317, 1269, 1275, 1276,
+ /*   280 */  1342, 1280, 1286, 1322, 1323, 1360, 1305, 1365, 1327, 1243,
+ /*   290 */  1329, 1244, 1331, 1242, 1254, 1262, 1265, 1273, 1279, 1337,
+ /*   300 */  1248, 1259, 1266, 1071, 1406, 1324, 1306, 1341, 1411, 1407,
+ /*   310 */  1409, 1328, 1361, 1377, 1381, 1382, 1383, 1362, 1384, 1371,
+ /*   320 */  1426, 1403, 1428, 1438, 1393, 1395, 1397, 1399, 1400, 1404,
+ /*   330 */  1417, 1420, 1424, 1425, 1430, 1445, 1447, 1455, 1456, 1459,
+ /*   340 */  1462, 1463, 1464, 1467, 1468, 1469, 1414, 1470, 1475, 1441,
+ /*   350 */  1472, 1473, 1477, 1387, 1412, 1446, 1457, 1479, 1484, 1489,
+ /*   360 */  1481, 1492,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    10 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    20 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    30 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    40 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    50 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    60 */  2308, 1966, 1966, 2271, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    70 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 2278, 1966, 1966,
- /*    80 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*    90 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 2065, 1966, 1966,
- /*   100 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   110 */  1966, 1966, 1966, 1966, 2063, 2536, 1966, 1966, 1966, 1966,
- /*   120 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   130 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2548,
- /*   140 */  1966, 1966, 2037, 2037, 1966, 2548, 2548, 2548, 2508, 2508,
- /*   150 */  2063, 1966, 1966, 2065, 1966, 2350, 1966, 1966, 1966, 1966,
- /*   160 */  1966, 1966, 1966, 1966, 2189, 1996, 2348, 1966, 1966, 1966,
- /*   170 */  1966, 1966, 1966, 1966, 2334, 1966, 1966, 2577, 2639, 1966,
- /*   180 */  2580, 1966, 1966, 1966, 1966, 1966, 2283, 1966, 2567, 1966,
- /*   190 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2141, 2328,
- /*   200 */  1966, 1966, 1966, 2540, 2554, 2623, 2541, 2538, 2561, 1966,
- /*   210 */  2571, 1966, 2375, 1966, 2364, 2065, 1966, 2065, 2321, 2266,
- /*   220 */  1966, 2276, 1966, 2276, 2273, 1966, 1966, 1966, 2276, 2273,
- /*   230 */  2273, 2273, 2130, 2126, 1966, 2124, 1966, 1966, 1966, 1966,
- /*   240 */  2021, 1966, 2021, 1966, 2065, 2065, 1966, 2065, 1966, 1966,
- /*   250 */  2065, 1966, 2065, 1966, 2065, 2065, 1966, 2065, 1966, 1966,
- /*   260 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   270 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 2362, 2344, 1966,
- /*   280 */  2063, 1966, 2332, 2330, 1966, 2063, 2571, 1966, 1966, 2593,
- /*   290 */  2588, 2593, 2588, 2607, 2603, 2593, 2612, 2609, 2573, 2571,
- /*   300 */  2642, 2629, 2625, 2554, 1966, 1966, 2559, 2557, 1966, 2063,
- /*   310 */  2063, 1966, 2588, 1966, 1966, 1966, 1966, 2588, 1966, 1966,
- /*   320 */  2063, 1966, 2063, 1966, 1966, 1966, 2157, 1966, 1966, 2063,
- /*   330 */  1966, 2005, 1966, 2323, 2353, 2304, 2304, 2192, 2192, 2192,
- /*   340 */  2066, 1971, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   350 */  1966, 1966, 1966, 1966, 2606, 2605, 2460, 1966, 2512, 2511,
- /*   360 */  2510, 2501, 2459, 2153, 1966, 1966, 2458, 2457, 1966, 1966,
- /*   370 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2451,
- /*   380 */  1966, 1966, 2452, 2450, 2449, 2295, 2294, 1966, 1966, 1966,
- /*   390 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   400 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   410 */  1966, 1966, 1966, 2626, 2630, 1966, 2537, 1966, 1966, 1966,
- /*   420 */  2431, 1966, 1966, 1966, 1966, 1966, 2399, 1966, 1966, 1966,
- /*   430 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   440 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   450 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   460 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   470 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   480 */  1966, 2272, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   490 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   500 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   510 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   520 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   530 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   540 */  1966, 1966, 1966, 1966, 2287, 1966, 1966, 1966, 1966, 1966,
- /*   550 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   560 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   570 */  1966, 1966, 1966, 1966, 1966, 1966, 2010, 2438, 1966, 1966,
- /*   580 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   590 */  1966, 2441, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   600 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   610 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   620 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   630 */  1966, 1966, 2105, 2104, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   640 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   650 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   660 */  2442, 1966, 1966, 1966, 2348, 1966, 1966, 1966, 2433, 1966,
- /*   670 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   680 */  1966, 1966, 1966, 1966, 1966, 2622, 2574, 1966, 1966, 1966,
- /*   690 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   700 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2431,
- /*   710 */  1966, 2604, 1966, 1966, 2620, 1966, 2624, 1966, 1966, 1966,
- /*   720 */  1966, 1966, 1966, 1966, 2547, 2543, 1966, 1966, 2539, 1966,
- /*   730 */  1966, 1966, 1966, 1966, 2498, 1966, 1966, 1966, 2532, 1966,
- /*   740 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2442, 1966,
- /*   750 */  2445, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   760 */  1966, 1966, 1966, 2430, 1966, 2483, 2482, 1966, 1966, 1966,
- /*   770 */  1966, 1966, 1966, 1966, 2186, 1966, 1966, 1966, 1966, 1966,
- /*   780 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   790 */  2170, 2168, 2167, 2166, 1966, 2163, 1966, 2199, 1966, 1966,
- /*   800 */  1966, 2195, 2194, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   810 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2084,
- /*   820 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 2076, 1966,
- /*   830 */  2075, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   840 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966,
- /*   850 */  1966, 1966, 1966, 1966, 1966, 1966, 1966, 1966, 1995, 1966,
- /*   860 */  1966, 1966, 1966, 1966, 1966,
+ /*     0 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    10 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    20 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    30 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    40 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    50 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    60 */  2368, 2026, 2026, 2331, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    70 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2338, 2026, 2026,
+ /*    80 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*    90 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2125, 2026, 2026,
+ /*   100 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   110 */  2026, 2026, 2026, 2026, 2123, 2616, 2026, 2026, 2026, 2026,
+ /*   120 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   130 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2628,
+ /*   140 */  2026, 2026, 2097, 2097, 2026, 2628, 2628, 2628, 2588, 2588,
+ /*   150 */  2123, 2026, 2026, 2125, 2026, 2410, 2026, 2026, 2026, 2026,
+ /*   160 */  2026, 2026, 2026, 2026, 2249, 2056, 2408, 2026, 2026, 2026,
+ /*   170 */  2026, 2026, 2026, 2026, 2394, 2026, 2026, 2657, 2719, 2026,
+ /*   180 */  2660, 2026, 2026, 2026, 2026, 2026, 2343, 2026, 2647, 2026,
+ /*   190 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2201, 2388,
+ /*   200 */  2026, 2026, 2026, 2620, 2634, 2703, 2621, 2618, 2641, 2026,
+ /*   210 */  2651, 2026, 2435, 2026, 2424, 2125, 2026, 2125, 2381, 2326,
+ /*   220 */  2026, 2336, 2026, 2336, 2333, 2026, 2026, 2026, 2336, 2333,
+ /*   230 */  2333, 2333, 2190, 2186, 2026, 2184, 2026, 2026, 2026, 2026,
+ /*   240 */  2081, 2026, 2081, 2026, 2125, 2125, 2026, 2125, 2026, 2026,
+ /*   250 */  2125, 2026, 2125, 2026, 2125, 2125, 2026, 2125, 2026, 2026,
+ /*   260 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   270 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2422, 2404, 2026,
+ /*   280 */  2123, 2026, 2392, 2390, 2026, 2123, 2651, 2026, 2026, 2673,
+ /*   290 */  2668, 2673, 2668, 2687, 2683, 2673, 2692, 2689, 2653, 2651,
+ /*   300 */  2722, 2709, 2705, 2634, 2026, 2026, 2639, 2637, 2026, 2123,
+ /*   310 */  2123, 2026, 2668, 2026, 2026, 2026, 2026, 2668, 2026, 2026,
+ /*   320 */  2123, 2026, 2123, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   330 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   340 */  2026, 2026, 2026, 2026, 2026, 2026, 2217, 2026, 2026, 2123,
+ /*   350 */  2026, 2065, 2026, 2383, 2413, 2364, 2364, 2252, 2252, 2252,
+ /*   360 */  2126, 2031, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   370 */  2026, 2026, 2026, 2026, 2686, 2685, 2540, 2026, 2592, 2591,
+ /*   380 */  2590, 2581, 2539, 2213, 2026, 2026, 2538, 2537, 2026, 2026,
+ /*   390 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2531,
+ /*   400 */  2026, 2026, 2532, 2530, 2529, 2355, 2354, 2026, 2026, 2026,
+ /*   410 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   420 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   430 */  2026, 2026, 2026, 2706, 2710, 2026, 2617, 2026, 2026, 2026,
+ /*   440 */  2511, 2026, 2026, 2026, 2026, 2026, 2479, 2474, 2465, 2456,
+ /*   450 */  2471, 2462, 2450, 2468, 2459, 2447, 2444, 2026, 2026, 2026,
+ /*   460 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   470 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   480 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   490 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   500 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   510 */  2026, 2332, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   520 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   530 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   540 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   550 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   560 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   570 */  2026, 2026, 2026, 2026, 2347, 2026, 2026, 2026, 2026, 2026,
+ /*   580 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   590 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   600 */  2026, 2026, 2026, 2026, 2026, 2026, 2070, 2518, 2026, 2026,
+ /*   610 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   620 */  2026, 2521, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   630 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   640 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   650 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   660 */  2026, 2026, 2165, 2164, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   670 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   680 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   690 */  2522, 2026, 2026, 2026, 2408, 2026, 2026, 2026, 2513, 2026,
+ /*   700 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   710 */  2026, 2026, 2026, 2026, 2026, 2702, 2654, 2026, 2026, 2026,
+ /*   720 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   730 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2511,
+ /*   740 */  2026, 2684, 2026, 2026, 2700, 2026, 2704, 2026, 2026, 2026,
+ /*   750 */  2026, 2026, 2026, 2026, 2627, 2623, 2026, 2026, 2619, 2026,
+ /*   760 */  2026, 2026, 2026, 2026, 2578, 2026, 2026, 2026, 2612, 2026,
+ /*   770 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2522, 2026,
+ /*   780 */  2525, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   790 */  2026, 2026, 2026, 2510, 2026, 2563, 2562, 2026, 2026, 2026,
+ /*   800 */  2026, 2026, 2026, 2026, 2246, 2026, 2026, 2026, 2026, 2026,
+ /*   810 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   820 */  2230, 2228, 2227, 2226, 2026, 2223, 2026, 2259, 2026, 2026,
+ /*   830 */  2026, 2255, 2254, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   840 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2144,
+ /*   850 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2136, 2026,
+ /*   860 */  2135, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   870 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026,
+ /*   880 */  2026, 2026, 2026, 2026, 2026, 2026, 2026, 2026, 2055, 2026,
+ /*   890 */  2026, 2026, 2026, 2026, 2026,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -2861,266 +2869,286 @@ static const char *const yyRuleName[] = {
  /* 413 */ "insert_query ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery",
  /* 414 */ "insert_query ::= INSERT INTO full_table_name query_or_subquery",
  /* 415 */ "tags_literal ::= NK_INTEGER",
- /* 416 */ "tags_literal ::= NK_PLUS NK_INTEGER",
- /* 417 */ "tags_literal ::= NK_MINUS NK_INTEGER",
- /* 418 */ "tags_literal ::= NK_FLOAT",
- /* 419 */ "tags_literal ::= NK_PLUS NK_FLOAT",
- /* 420 */ "tags_literal ::= NK_MINUS NK_FLOAT",
- /* 421 */ "tags_literal ::= NK_BIN",
- /* 422 */ "tags_literal ::= NK_PLUS NK_BIN",
- /* 423 */ "tags_literal ::= NK_MINUS NK_BIN",
- /* 424 */ "tags_literal ::= NK_HEX",
- /* 425 */ "tags_literal ::= NK_PLUS NK_HEX",
- /* 426 */ "tags_literal ::= NK_MINUS NK_HEX",
- /* 427 */ "tags_literal ::= NK_STRING",
- /* 428 */ "tags_literal ::= NK_BOOL",
- /* 429 */ "tags_literal ::= NULL",
- /* 430 */ "tags_literal ::= literal_func",
- /* 431 */ "tags_literal ::= literal_func NK_PLUS duration_literal",
- /* 432 */ "tags_literal ::= literal_func NK_MINUS duration_literal",
- /* 433 */ "tags_literal_list ::= tags_literal",
- /* 434 */ "tags_literal_list ::= tags_literal_list NK_COMMA tags_literal",
- /* 435 */ "literal ::= NK_INTEGER",
- /* 436 */ "literal ::= NK_FLOAT",
- /* 437 */ "literal ::= NK_STRING",
- /* 438 */ "literal ::= NK_BOOL",
- /* 439 */ "literal ::= TIMESTAMP NK_STRING",
- /* 440 */ "literal ::= duration_literal",
- /* 441 */ "literal ::= NULL",
- /* 442 */ "literal ::= NK_QUESTION",
- /* 443 */ "duration_literal ::= NK_VARIABLE",
- /* 444 */ "signed ::= NK_INTEGER",
- /* 445 */ "signed ::= NK_PLUS NK_INTEGER",
- /* 446 */ "signed ::= NK_MINUS NK_INTEGER",
- /* 447 */ "signed ::= NK_FLOAT",
- /* 448 */ "signed ::= NK_PLUS NK_FLOAT",
- /* 449 */ "signed ::= NK_MINUS NK_FLOAT",
- /* 450 */ "signed_literal ::= signed",
- /* 451 */ "signed_literal ::= NK_STRING",
- /* 452 */ "signed_literal ::= NK_BOOL",
- /* 453 */ "signed_literal ::= TIMESTAMP NK_STRING",
- /* 454 */ "signed_literal ::= duration_literal",
- /* 455 */ "signed_literal ::= NULL",
- /* 456 */ "signed_literal ::= literal_func",
- /* 457 */ "signed_literal ::= NK_QUESTION",
- /* 458 */ "literal_list ::= signed_literal",
- /* 459 */ "literal_list ::= literal_list NK_COMMA signed_literal",
- /* 460 */ "db_name ::= NK_ID",
- /* 461 */ "table_name ::= NK_ID",
- /* 462 */ "column_name ::= NK_ID",
- /* 463 */ "function_name ::= NK_ID",
- /* 464 */ "view_name ::= NK_ID",
- /* 465 */ "table_alias ::= NK_ID",
- /* 466 */ "column_alias ::= NK_ID",
- /* 467 */ "column_alias ::= NK_ALIAS",
- /* 468 */ "user_name ::= NK_ID",
- /* 469 */ "topic_name ::= NK_ID",
- /* 470 */ "stream_name ::= NK_ID",
- /* 471 */ "cgroup_name ::= NK_ID",
- /* 472 */ "index_name ::= NK_ID",
- /* 473 */ "expr_or_subquery ::= expression",
- /* 474 */ "expression ::= literal",
- /* 475 */ "expression ::= pseudo_column",
- /* 476 */ "expression ::= column_reference",
- /* 477 */ "expression ::= function_expression",
- /* 478 */ "expression ::= case_when_expression",
- /* 479 */ "expression ::= NK_LP expression NK_RP",
- /* 480 */ "expression ::= NK_PLUS expr_or_subquery",
- /* 481 */ "expression ::= NK_MINUS expr_or_subquery",
- /* 482 */ "expression ::= expr_or_subquery NK_PLUS expr_or_subquery",
- /* 483 */ "expression ::= expr_or_subquery NK_MINUS expr_or_subquery",
- /* 484 */ "expression ::= expr_or_subquery NK_STAR expr_or_subquery",
- /* 485 */ "expression ::= expr_or_subquery NK_SLASH expr_or_subquery",
- /* 486 */ "expression ::= expr_or_subquery NK_REM expr_or_subquery",
- /* 487 */ "expression ::= column_reference NK_ARROW NK_STRING",
- /* 488 */ "expression ::= expr_or_subquery NK_BITAND expr_or_subquery",
- /* 489 */ "expression ::= expr_or_subquery NK_BITOR expr_or_subquery",
- /* 490 */ "expression_list ::= expr_or_subquery",
- /* 491 */ "expression_list ::= expression_list NK_COMMA expr_or_subquery",
- /* 492 */ "column_reference ::= column_name",
- /* 493 */ "column_reference ::= table_name NK_DOT column_name",
- /* 494 */ "column_reference ::= NK_ALIAS",
- /* 495 */ "column_reference ::= table_name NK_DOT NK_ALIAS",
- /* 496 */ "pseudo_column ::= ROWTS",
- /* 497 */ "pseudo_column ::= TBNAME",
- /* 498 */ "pseudo_column ::= table_name NK_DOT TBNAME",
- /* 499 */ "pseudo_column ::= QSTART",
- /* 500 */ "pseudo_column ::= QEND",
- /* 501 */ "pseudo_column ::= QDURATION",
- /* 502 */ "pseudo_column ::= WSTART",
- /* 503 */ "pseudo_column ::= WEND",
- /* 504 */ "pseudo_column ::= WDURATION",
- /* 505 */ "pseudo_column ::= IROWTS",
- /* 506 */ "pseudo_column ::= ISFILLED",
- /* 507 */ "pseudo_column ::= QTAGS",
- /* 508 */ "function_expression ::= function_name NK_LP expression_list NK_RP",
- /* 509 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP",
- /* 510 */ "function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP",
- /* 511 */ "function_expression ::= literal_func",
- /* 512 */ "literal_func ::= noarg_func NK_LP NK_RP",
- /* 513 */ "literal_func ::= NOW",
- /* 514 */ "literal_func ::= TODAY",
- /* 515 */ "noarg_func ::= NOW",
- /* 516 */ "noarg_func ::= TODAY",
- /* 517 */ "noarg_func ::= TIMEZONE",
- /* 518 */ "noarg_func ::= DATABASE",
- /* 519 */ "noarg_func ::= CLIENT_VERSION",
- /* 520 */ "noarg_func ::= SERVER_VERSION",
- /* 521 */ "noarg_func ::= SERVER_STATUS",
- /* 522 */ "noarg_func ::= CURRENT_USER",
- /* 523 */ "noarg_func ::= USER",
- /* 524 */ "star_func ::= COUNT",
- /* 525 */ "star_func ::= FIRST",
- /* 526 */ "star_func ::= LAST",
- /* 527 */ "star_func ::= LAST_ROW",
- /* 528 */ "star_func_para_list ::= NK_STAR",
- /* 529 */ "star_func_para_list ::= other_para_list",
- /* 530 */ "other_para_list ::= star_func_para",
- /* 531 */ "other_para_list ::= other_para_list NK_COMMA star_func_para",
- /* 532 */ "star_func_para ::= expr_or_subquery",
- /* 533 */ "star_func_para ::= table_name NK_DOT NK_STAR",
- /* 534 */ "case_when_expression ::= CASE when_then_list case_when_else_opt END",
- /* 535 */ "case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END",
- /* 536 */ "when_then_list ::= when_then_expr",
- /* 537 */ "when_then_list ::= when_then_list when_then_expr",
- /* 538 */ "when_then_expr ::= WHEN common_expression THEN common_expression",
- /* 539 */ "case_when_else_opt ::=",
- /* 540 */ "case_when_else_opt ::= ELSE common_expression",
- /* 541 */ "predicate ::= expr_or_subquery compare_op expr_or_subquery",
- /* 542 */ "predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery",
- /* 543 */ "predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery",
- /* 544 */ "predicate ::= expr_or_subquery IS NULL",
- /* 545 */ "predicate ::= expr_or_subquery IS NOT NULL",
- /* 546 */ "predicate ::= expr_or_subquery in_op in_predicate_value",
- /* 547 */ "compare_op ::= NK_LT",
- /* 548 */ "compare_op ::= NK_GT",
- /* 549 */ "compare_op ::= NK_LE",
- /* 550 */ "compare_op ::= NK_GE",
- /* 551 */ "compare_op ::= NK_NE",
- /* 552 */ "compare_op ::= NK_EQ",
- /* 553 */ "compare_op ::= LIKE",
- /* 554 */ "compare_op ::= NOT LIKE",
- /* 555 */ "compare_op ::= MATCH",
- /* 556 */ "compare_op ::= NMATCH",
- /* 557 */ "compare_op ::= CONTAINS",
- /* 558 */ "in_op ::= IN",
- /* 559 */ "in_op ::= NOT IN",
- /* 560 */ "in_predicate_value ::= NK_LP literal_list NK_RP",
- /* 561 */ "boolean_value_expression ::= boolean_primary",
- /* 562 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 563 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 564 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 565 */ "boolean_primary ::= predicate",
- /* 566 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 567 */ "common_expression ::= expr_or_subquery",
- /* 568 */ "common_expression ::= boolean_value_expression",
- /* 569 */ "from_clause_opt ::=",
- /* 570 */ "from_clause_opt ::= FROM table_reference_list",
- /* 571 */ "table_reference_list ::= table_reference",
- /* 572 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 573 */ "table_reference ::= table_primary",
- /* 574 */ "table_reference ::= joined_table",
- /* 575 */ "table_primary ::= table_name alias_opt",
- /* 576 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 577 */ "table_primary ::= subquery alias_opt",
- /* 578 */ "table_primary ::= parenthesized_joined_table",
- /* 579 */ "alias_opt ::=",
- /* 580 */ "alias_opt ::= table_alias",
- /* 581 */ "alias_opt ::= AS table_alias",
- /* 582 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 583 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 584 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 585 */ "join_type ::=",
- /* 586 */ "join_type ::= INNER",
- /* 587 */ "query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
- /* 588 */ "hint_list ::=",
- /* 589 */ "hint_list ::= NK_HINT",
- /* 590 */ "tag_mode_opt ::=",
- /* 591 */ "tag_mode_opt ::= TAGS",
- /* 592 */ "set_quantifier_opt ::=",
- /* 593 */ "set_quantifier_opt ::= DISTINCT",
- /* 594 */ "set_quantifier_opt ::= ALL",
- /* 595 */ "select_list ::= select_item",
- /* 596 */ "select_list ::= select_list NK_COMMA select_item",
- /* 597 */ "select_item ::= NK_STAR",
- /* 598 */ "select_item ::= common_expression",
- /* 599 */ "select_item ::= common_expression column_alias",
- /* 600 */ "select_item ::= common_expression AS column_alias",
- /* 601 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 602 */ "where_clause_opt ::=",
- /* 603 */ "where_clause_opt ::= WHERE search_condition",
- /* 604 */ "partition_by_clause_opt ::=",
- /* 605 */ "partition_by_clause_opt ::= PARTITION BY partition_list",
- /* 606 */ "partition_list ::= partition_item",
- /* 607 */ "partition_list ::= partition_list NK_COMMA partition_item",
- /* 608 */ "partition_item ::= expr_or_subquery",
- /* 609 */ "partition_item ::= expr_or_subquery column_alias",
- /* 610 */ "partition_item ::= expr_or_subquery AS column_alias",
- /* 611 */ "twindow_clause_opt ::=",
- /* 612 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP",
- /* 613 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP",
- /* 614 */ "twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt",
- /* 615 */ "twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt",
- /* 616 */ "twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition",
- /* 617 */ "twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP",
- /* 618 */ "twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP",
- /* 619 */ "sliding_opt ::=",
- /* 620 */ "sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP",
- /* 621 */ "interval_sliding_duration_literal ::= NK_VARIABLE",
- /* 622 */ "interval_sliding_duration_literal ::= NK_STRING",
- /* 623 */ "interval_sliding_duration_literal ::= NK_INTEGER",
- /* 624 */ "fill_opt ::=",
- /* 625 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 626 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP",
- /* 627 */ "fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP",
- /* 628 */ "fill_mode ::= NONE",
- /* 629 */ "fill_mode ::= PREV",
- /* 630 */ "fill_mode ::= NULL",
- /* 631 */ "fill_mode ::= NULL_F",
- /* 632 */ "fill_mode ::= LINEAR",
- /* 633 */ "fill_mode ::= NEXT",
- /* 634 */ "group_by_clause_opt ::=",
- /* 635 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 636 */ "group_by_list ::= expr_or_subquery",
- /* 637 */ "group_by_list ::= group_by_list NK_COMMA expr_or_subquery",
- /* 638 */ "having_clause_opt ::=",
- /* 639 */ "having_clause_opt ::= HAVING search_condition",
- /* 640 */ "range_opt ::=",
- /* 641 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP",
- /* 642 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_RP",
- /* 643 */ "every_opt ::=",
- /* 644 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP",
- /* 645 */ "query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 646 */ "query_simple ::= query_specification",
- /* 647 */ "query_simple ::= union_query_expression",
- /* 648 */ "union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery",
- /* 649 */ "union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery",
- /* 650 */ "query_simple_or_subquery ::= query_simple",
- /* 651 */ "query_simple_or_subquery ::= subquery",
- /* 652 */ "query_or_subquery ::= query_expression",
- /* 653 */ "query_or_subquery ::= subquery",
- /* 654 */ "order_by_clause_opt ::=",
- /* 655 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 656 */ "slimit_clause_opt ::=",
- /* 657 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 658 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 659 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 660 */ "limit_clause_opt ::=",
- /* 661 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 662 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 663 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 664 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 665 */ "subquery ::= NK_LP subquery NK_RP",
- /* 666 */ "search_condition ::= common_expression",
- /* 667 */ "sort_specification_list ::= sort_specification",
- /* 668 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 669 */ "sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt",
- /* 670 */ "ordering_specification_opt ::=",
- /* 671 */ "ordering_specification_opt ::= ASC",
- /* 672 */ "ordering_specification_opt ::= DESC",
- /* 673 */ "null_ordering_opt ::=",
- /* 674 */ "null_ordering_opt ::= NULLS FIRST",
- /* 675 */ "null_ordering_opt ::= NULLS LAST",
+ /* 416 */ "tags_literal ::= NK_INTEGER NK_PLUS duration_literal",
+ /* 417 */ "tags_literal ::= NK_INTEGER NK_MINUS duration_literal",
+ /* 418 */ "tags_literal ::= NK_PLUS NK_INTEGER",
+ /* 419 */ "tags_literal ::= NK_PLUS NK_INTEGER NK_PLUS duration_literal",
+ /* 420 */ "tags_literal ::= NK_PLUS NK_INTEGER NK_MINUS duration_literal",
+ /* 421 */ "tags_literal ::= NK_MINUS NK_INTEGER",
+ /* 422 */ "tags_literal ::= NK_MINUS NK_INTEGER NK_PLUS duration_literal",
+ /* 423 */ "tags_literal ::= NK_MINUS NK_INTEGER NK_MINUS duration_literal",
+ /* 424 */ "tags_literal ::= NK_FLOAT",
+ /* 425 */ "tags_literal ::= NK_PLUS NK_FLOAT",
+ /* 426 */ "tags_literal ::= NK_MINUS NK_FLOAT",
+ /* 427 */ "tags_literal ::= NK_BIN",
+ /* 428 */ "tags_literal ::= NK_BIN NK_PLUS duration_literal",
+ /* 429 */ "tags_literal ::= NK_BIN NK_MINUS duration_literal",
+ /* 430 */ "tags_literal ::= NK_PLUS NK_BIN",
+ /* 431 */ "tags_literal ::= NK_PLUS NK_BIN NK_PLUS duration_literal",
+ /* 432 */ "tags_literal ::= NK_PLUS NK_BIN NK_MINUS duration_literal",
+ /* 433 */ "tags_literal ::= NK_MINUS NK_BIN",
+ /* 434 */ "tags_literal ::= NK_MINUS NK_BIN NK_PLUS duration_literal",
+ /* 435 */ "tags_literal ::= NK_MINUS NK_BIN NK_MINUS duration_literal",
+ /* 436 */ "tags_literal ::= NK_HEX",
+ /* 437 */ "tags_literal ::= NK_HEX NK_PLUS duration_literal",
+ /* 438 */ "tags_literal ::= NK_HEX NK_MINUS duration_literal",
+ /* 439 */ "tags_literal ::= NK_PLUS NK_HEX",
+ /* 440 */ "tags_literal ::= NK_PLUS NK_HEX NK_PLUS duration_literal",
+ /* 441 */ "tags_literal ::= NK_PLUS NK_HEX NK_MINUS duration_literal",
+ /* 442 */ "tags_literal ::= NK_MINUS NK_HEX",
+ /* 443 */ "tags_literal ::= NK_MINUS NK_HEX NK_PLUS duration_literal",
+ /* 444 */ "tags_literal ::= NK_MINUS NK_HEX NK_MINUS duration_literal",
+ /* 445 */ "tags_literal ::= NK_STRING",
+ /* 446 */ "tags_literal ::= NK_STRING NK_PLUS duration_literal",
+ /* 447 */ "tags_literal ::= NK_STRING NK_MINUS duration_literal",
+ /* 448 */ "tags_literal ::= NK_BOOL",
+ /* 449 */ "tags_literal ::= NULL",
+ /* 450 */ "tags_literal ::= literal_func",
+ /* 451 */ "tags_literal ::= literal_func NK_PLUS duration_literal",
+ /* 452 */ "tags_literal ::= literal_func NK_MINUS duration_literal",
+ /* 453 */ "tags_literal_list ::= tags_literal",
+ /* 454 */ "tags_literal_list ::= tags_literal_list NK_COMMA tags_literal",
+ /* 455 */ "literal ::= NK_INTEGER",
+ /* 456 */ "literal ::= NK_FLOAT",
+ /* 457 */ "literal ::= NK_STRING",
+ /* 458 */ "literal ::= NK_BOOL",
+ /* 459 */ "literal ::= TIMESTAMP NK_STRING",
+ /* 460 */ "literal ::= duration_literal",
+ /* 461 */ "literal ::= NULL",
+ /* 462 */ "literal ::= NK_QUESTION",
+ /* 463 */ "duration_literal ::= NK_VARIABLE",
+ /* 464 */ "signed ::= NK_INTEGER",
+ /* 465 */ "signed ::= NK_PLUS NK_INTEGER",
+ /* 466 */ "signed ::= NK_MINUS NK_INTEGER",
+ /* 467 */ "signed ::= NK_FLOAT",
+ /* 468 */ "signed ::= NK_PLUS NK_FLOAT",
+ /* 469 */ "signed ::= NK_MINUS NK_FLOAT",
+ /* 470 */ "signed_literal ::= signed",
+ /* 471 */ "signed_literal ::= NK_STRING",
+ /* 472 */ "signed_literal ::= NK_BOOL",
+ /* 473 */ "signed_literal ::= TIMESTAMP NK_STRING",
+ /* 474 */ "signed_literal ::= duration_literal",
+ /* 475 */ "signed_literal ::= NULL",
+ /* 476 */ "signed_literal ::= literal_func",
+ /* 477 */ "signed_literal ::= NK_QUESTION",
+ /* 478 */ "literal_list ::= signed_literal",
+ /* 479 */ "literal_list ::= literal_list NK_COMMA signed_literal",
+ /* 480 */ "db_name ::= NK_ID",
+ /* 481 */ "table_name ::= NK_ID",
+ /* 482 */ "column_name ::= NK_ID",
+ /* 483 */ "function_name ::= NK_ID",
+ /* 484 */ "view_name ::= NK_ID",
+ /* 485 */ "table_alias ::= NK_ID",
+ /* 486 */ "column_alias ::= NK_ID",
+ /* 487 */ "column_alias ::= NK_ALIAS",
+ /* 488 */ "user_name ::= NK_ID",
+ /* 489 */ "topic_name ::= NK_ID",
+ /* 490 */ "stream_name ::= NK_ID",
+ /* 491 */ "cgroup_name ::= NK_ID",
+ /* 492 */ "index_name ::= NK_ID",
+ /* 493 */ "expr_or_subquery ::= expression",
+ /* 494 */ "expression ::= literal",
+ /* 495 */ "expression ::= pseudo_column",
+ /* 496 */ "expression ::= column_reference",
+ /* 497 */ "expression ::= function_expression",
+ /* 498 */ "expression ::= case_when_expression",
+ /* 499 */ "expression ::= NK_LP expression NK_RP",
+ /* 500 */ "expression ::= NK_PLUS expr_or_subquery",
+ /* 501 */ "expression ::= NK_MINUS expr_or_subquery",
+ /* 502 */ "expression ::= expr_or_subquery NK_PLUS expr_or_subquery",
+ /* 503 */ "expression ::= expr_or_subquery NK_MINUS expr_or_subquery",
+ /* 504 */ "expression ::= expr_or_subquery NK_STAR expr_or_subquery",
+ /* 505 */ "expression ::= expr_or_subquery NK_SLASH expr_or_subquery",
+ /* 506 */ "expression ::= expr_or_subquery NK_REM expr_or_subquery",
+ /* 507 */ "expression ::= column_reference NK_ARROW NK_STRING",
+ /* 508 */ "expression ::= expr_or_subquery NK_BITAND expr_or_subquery",
+ /* 509 */ "expression ::= expr_or_subquery NK_BITOR expr_or_subquery",
+ /* 510 */ "expression_list ::= expr_or_subquery",
+ /* 511 */ "expression_list ::= expression_list NK_COMMA expr_or_subquery",
+ /* 512 */ "column_reference ::= column_name",
+ /* 513 */ "column_reference ::= table_name NK_DOT column_name",
+ /* 514 */ "column_reference ::= NK_ALIAS",
+ /* 515 */ "column_reference ::= table_name NK_DOT NK_ALIAS",
+ /* 516 */ "pseudo_column ::= ROWTS",
+ /* 517 */ "pseudo_column ::= TBNAME",
+ /* 518 */ "pseudo_column ::= table_name NK_DOT TBNAME",
+ /* 519 */ "pseudo_column ::= QSTART",
+ /* 520 */ "pseudo_column ::= QEND",
+ /* 521 */ "pseudo_column ::= QDURATION",
+ /* 522 */ "pseudo_column ::= WSTART",
+ /* 523 */ "pseudo_column ::= WEND",
+ /* 524 */ "pseudo_column ::= WDURATION",
+ /* 525 */ "pseudo_column ::= IROWTS",
+ /* 526 */ "pseudo_column ::= ISFILLED",
+ /* 527 */ "pseudo_column ::= QTAGS",
+ /* 528 */ "function_expression ::= function_name NK_LP expression_list NK_RP",
+ /* 529 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP",
+ /* 530 */ "function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP",
+ /* 531 */ "function_expression ::= literal_func",
+ /* 532 */ "literal_func ::= noarg_func NK_LP NK_RP",
+ /* 533 */ "literal_func ::= NOW",
+ /* 534 */ "literal_func ::= TODAY",
+ /* 535 */ "noarg_func ::= NOW",
+ /* 536 */ "noarg_func ::= TODAY",
+ /* 537 */ "noarg_func ::= TIMEZONE",
+ /* 538 */ "noarg_func ::= DATABASE",
+ /* 539 */ "noarg_func ::= CLIENT_VERSION",
+ /* 540 */ "noarg_func ::= SERVER_VERSION",
+ /* 541 */ "noarg_func ::= SERVER_STATUS",
+ /* 542 */ "noarg_func ::= CURRENT_USER",
+ /* 543 */ "noarg_func ::= USER",
+ /* 544 */ "star_func ::= COUNT",
+ /* 545 */ "star_func ::= FIRST",
+ /* 546 */ "star_func ::= LAST",
+ /* 547 */ "star_func ::= LAST_ROW",
+ /* 548 */ "star_func_para_list ::= NK_STAR",
+ /* 549 */ "star_func_para_list ::= other_para_list",
+ /* 550 */ "other_para_list ::= star_func_para",
+ /* 551 */ "other_para_list ::= other_para_list NK_COMMA star_func_para",
+ /* 552 */ "star_func_para ::= expr_or_subquery",
+ /* 553 */ "star_func_para ::= table_name NK_DOT NK_STAR",
+ /* 554 */ "case_when_expression ::= CASE when_then_list case_when_else_opt END",
+ /* 555 */ "case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END",
+ /* 556 */ "when_then_list ::= when_then_expr",
+ /* 557 */ "when_then_list ::= when_then_list when_then_expr",
+ /* 558 */ "when_then_expr ::= WHEN common_expression THEN common_expression",
+ /* 559 */ "case_when_else_opt ::=",
+ /* 560 */ "case_when_else_opt ::= ELSE common_expression",
+ /* 561 */ "predicate ::= expr_or_subquery compare_op expr_or_subquery",
+ /* 562 */ "predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery",
+ /* 563 */ "predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery",
+ /* 564 */ "predicate ::= expr_or_subquery IS NULL",
+ /* 565 */ "predicate ::= expr_or_subquery IS NOT NULL",
+ /* 566 */ "predicate ::= expr_or_subquery in_op in_predicate_value",
+ /* 567 */ "compare_op ::= NK_LT",
+ /* 568 */ "compare_op ::= NK_GT",
+ /* 569 */ "compare_op ::= NK_LE",
+ /* 570 */ "compare_op ::= NK_GE",
+ /* 571 */ "compare_op ::= NK_NE",
+ /* 572 */ "compare_op ::= NK_EQ",
+ /* 573 */ "compare_op ::= LIKE",
+ /* 574 */ "compare_op ::= NOT LIKE",
+ /* 575 */ "compare_op ::= MATCH",
+ /* 576 */ "compare_op ::= NMATCH",
+ /* 577 */ "compare_op ::= CONTAINS",
+ /* 578 */ "in_op ::= IN",
+ /* 579 */ "in_op ::= NOT IN",
+ /* 580 */ "in_predicate_value ::= NK_LP literal_list NK_RP",
+ /* 581 */ "boolean_value_expression ::= boolean_primary",
+ /* 582 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 583 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 584 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 585 */ "boolean_primary ::= predicate",
+ /* 586 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 587 */ "common_expression ::= expr_or_subquery",
+ /* 588 */ "common_expression ::= boolean_value_expression",
+ /* 589 */ "from_clause_opt ::=",
+ /* 590 */ "from_clause_opt ::= FROM table_reference_list",
+ /* 591 */ "table_reference_list ::= table_reference",
+ /* 592 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 593 */ "table_reference ::= table_primary",
+ /* 594 */ "table_reference ::= joined_table",
+ /* 595 */ "table_primary ::= table_name alias_opt",
+ /* 596 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 597 */ "table_primary ::= subquery alias_opt",
+ /* 598 */ "table_primary ::= parenthesized_joined_table",
+ /* 599 */ "alias_opt ::=",
+ /* 600 */ "alias_opt ::= table_alias",
+ /* 601 */ "alias_opt ::= AS table_alias",
+ /* 602 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 603 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 604 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 605 */ "join_type ::=",
+ /* 606 */ "join_type ::= INNER",
+ /* 607 */ "query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
+ /* 608 */ "hint_list ::=",
+ /* 609 */ "hint_list ::= NK_HINT",
+ /* 610 */ "tag_mode_opt ::=",
+ /* 611 */ "tag_mode_opt ::= TAGS",
+ /* 612 */ "set_quantifier_opt ::=",
+ /* 613 */ "set_quantifier_opt ::= DISTINCT",
+ /* 614 */ "set_quantifier_opt ::= ALL",
+ /* 615 */ "select_list ::= select_item",
+ /* 616 */ "select_list ::= select_list NK_COMMA select_item",
+ /* 617 */ "select_item ::= NK_STAR",
+ /* 618 */ "select_item ::= common_expression",
+ /* 619 */ "select_item ::= common_expression column_alias",
+ /* 620 */ "select_item ::= common_expression AS column_alias",
+ /* 621 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 622 */ "where_clause_opt ::=",
+ /* 623 */ "where_clause_opt ::= WHERE search_condition",
+ /* 624 */ "partition_by_clause_opt ::=",
+ /* 625 */ "partition_by_clause_opt ::= PARTITION BY partition_list",
+ /* 626 */ "partition_list ::= partition_item",
+ /* 627 */ "partition_list ::= partition_list NK_COMMA partition_item",
+ /* 628 */ "partition_item ::= expr_or_subquery",
+ /* 629 */ "partition_item ::= expr_or_subquery column_alias",
+ /* 630 */ "partition_item ::= expr_or_subquery AS column_alias",
+ /* 631 */ "twindow_clause_opt ::=",
+ /* 632 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP",
+ /* 633 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP",
+ /* 634 */ "twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt",
+ /* 635 */ "twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt",
+ /* 636 */ "twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition",
+ /* 637 */ "twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP",
+ /* 638 */ "twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP",
+ /* 639 */ "sliding_opt ::=",
+ /* 640 */ "sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP",
+ /* 641 */ "interval_sliding_duration_literal ::= NK_VARIABLE",
+ /* 642 */ "interval_sliding_duration_literal ::= NK_STRING",
+ /* 643 */ "interval_sliding_duration_literal ::= NK_INTEGER",
+ /* 644 */ "fill_opt ::=",
+ /* 645 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 646 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP",
+ /* 647 */ "fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP",
+ /* 648 */ "fill_mode ::= NONE",
+ /* 649 */ "fill_mode ::= PREV",
+ /* 650 */ "fill_mode ::= NULL",
+ /* 651 */ "fill_mode ::= NULL_F",
+ /* 652 */ "fill_mode ::= LINEAR",
+ /* 653 */ "fill_mode ::= NEXT",
+ /* 654 */ "group_by_clause_opt ::=",
+ /* 655 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 656 */ "group_by_list ::= expr_or_subquery",
+ /* 657 */ "group_by_list ::= group_by_list NK_COMMA expr_or_subquery",
+ /* 658 */ "having_clause_opt ::=",
+ /* 659 */ "having_clause_opt ::= HAVING search_condition",
+ /* 660 */ "range_opt ::=",
+ /* 661 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP",
+ /* 662 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_RP",
+ /* 663 */ "every_opt ::=",
+ /* 664 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP",
+ /* 665 */ "query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 666 */ "query_simple ::= query_specification",
+ /* 667 */ "query_simple ::= union_query_expression",
+ /* 668 */ "union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery",
+ /* 669 */ "union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery",
+ /* 670 */ "query_simple_or_subquery ::= query_simple",
+ /* 671 */ "query_simple_or_subquery ::= subquery",
+ /* 672 */ "query_or_subquery ::= query_expression",
+ /* 673 */ "query_or_subquery ::= subquery",
+ /* 674 */ "order_by_clause_opt ::=",
+ /* 675 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 676 */ "slimit_clause_opt ::=",
+ /* 677 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 678 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 679 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 680 */ "limit_clause_opt ::=",
+ /* 681 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 682 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 683 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 684 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 685 */ "subquery ::= NK_LP subquery NK_RP",
+ /* 686 */ "search_condition ::= common_expression",
+ /* 687 */ "sort_specification_list ::= sort_specification",
+ /* 688 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 689 */ "sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt",
+ /* 690 */ "ordering_specification_opt ::=",
+ /* 691 */ "ordering_specification_opt ::= ASC",
+ /* 692 */ "ordering_specification_opt ::= DESC",
+ /* 693 */ "null_ordering_opt ::=",
+ /* 694 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 695 */ "null_ordering_opt ::= NULLS LAST",
 };
 #endif /* NDEBUG */
 
@@ -4182,266 +4210,286 @@ static const YYCODETYPE yyRuleInfoLhs[] = {
    440,  /* (413) insert_query ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery */
    440,  /* (414) insert_query ::= INSERT INTO full_table_name query_or_subquery */
    401,  /* (415) tags_literal ::= NK_INTEGER */
-   401,  /* (416) tags_literal ::= NK_PLUS NK_INTEGER */
-   401,  /* (417) tags_literal ::= NK_MINUS NK_INTEGER */
-   401,  /* (418) tags_literal ::= NK_FLOAT */
-   401,  /* (419) tags_literal ::= NK_PLUS NK_FLOAT */
-   401,  /* (420) tags_literal ::= NK_MINUS NK_FLOAT */
-   401,  /* (421) tags_literal ::= NK_BIN */
-   401,  /* (422) tags_literal ::= NK_PLUS NK_BIN */
-   401,  /* (423) tags_literal ::= NK_MINUS NK_BIN */
-   401,  /* (424) tags_literal ::= NK_HEX */
-   401,  /* (425) tags_literal ::= NK_PLUS NK_HEX */
-   401,  /* (426) tags_literal ::= NK_MINUS NK_HEX */
-   401,  /* (427) tags_literal ::= NK_STRING */
-   401,  /* (428) tags_literal ::= NK_BOOL */
-   401,  /* (429) tags_literal ::= NULL */
-   401,  /* (430) tags_literal ::= literal_func */
-   401,  /* (431) tags_literal ::= literal_func NK_PLUS duration_literal */
-   401,  /* (432) tags_literal ::= literal_func NK_MINUS duration_literal */
-   404,  /* (433) tags_literal_list ::= tags_literal */
-   404,  /* (434) tags_literal_list ::= tags_literal_list NK_COMMA tags_literal */
-   358,  /* (435) literal ::= NK_INTEGER */
-   358,  /* (436) literal ::= NK_FLOAT */
-   358,  /* (437) literal ::= NK_STRING */
-   358,  /* (438) literal ::= NK_BOOL */
-   358,  /* (439) literal ::= TIMESTAMP NK_STRING */
-   358,  /* (440) literal ::= duration_literal */
-   358,  /* (441) literal ::= NULL */
-   358,  /* (442) literal ::= NK_QUESTION */
-   411,  /* (443) duration_literal ::= NK_VARIABLE */
-   387,  /* (444) signed ::= NK_INTEGER */
-   387,  /* (445) signed ::= NK_PLUS NK_INTEGER */
-   387,  /* (446) signed ::= NK_MINUS NK_INTEGER */
-   387,  /* (447) signed ::= NK_FLOAT */
-   387,  /* (448) signed ::= NK_PLUS NK_FLOAT */
-   387,  /* (449) signed ::= NK_MINUS NK_FLOAT */
-   459,  /* (450) signed_literal ::= signed */
-   459,  /* (451) signed_literal ::= NK_STRING */
-   459,  /* (452) signed_literal ::= NK_BOOL */
-   459,  /* (453) signed_literal ::= TIMESTAMP NK_STRING */
-   459,  /* (454) signed_literal ::= duration_literal */
-   459,  /* (455) signed_literal ::= NULL */
-   459,  /* (456) signed_literal ::= literal_func */
-   459,  /* (457) signed_literal ::= NK_QUESTION */
-   460,  /* (458) literal_list ::= signed_literal */
-   460,  /* (459) literal_list ::= literal_list NK_COMMA signed_literal */
-   370,  /* (460) db_name ::= NK_ID */
-   371,  /* (461) table_name ::= NK_ID */
-   399,  /* (462) column_name ::= NK_ID */
-   413,  /* (463) function_name ::= NK_ID */
-   446,  /* (464) view_name ::= NK_ID */
-   461,  /* (465) table_alias ::= NK_ID */
-   424,  /* (466) column_alias ::= NK_ID */
-   424,  /* (467) column_alias ::= NK_ALIAS */
-   363,  /* (468) user_name ::= NK_ID */
-   372,  /* (469) topic_name ::= NK_ID */
-   447,  /* (470) stream_name ::= NK_ID */
-   437,  /* (471) cgroup_name ::= NK_ID */
-   427,  /* (472) index_name ::= NK_ID */
-   462,  /* (473) expr_or_subquery ::= expression */
-   455,  /* (474) expression ::= literal */
-   455,  /* (475) expression ::= pseudo_column */
-   455,  /* (476) expression ::= column_reference */
-   455,  /* (477) expression ::= function_expression */
-   455,  /* (478) expression ::= case_when_expression */
-   455,  /* (479) expression ::= NK_LP expression NK_RP */
-   455,  /* (480) expression ::= NK_PLUS expr_or_subquery */
-   455,  /* (481) expression ::= NK_MINUS expr_or_subquery */
-   455,  /* (482) expression ::= expr_or_subquery NK_PLUS expr_or_subquery */
-   455,  /* (483) expression ::= expr_or_subquery NK_MINUS expr_or_subquery */
-   455,  /* (484) expression ::= expr_or_subquery NK_STAR expr_or_subquery */
-   455,  /* (485) expression ::= expr_or_subquery NK_SLASH expr_or_subquery */
-   455,  /* (486) expression ::= expr_or_subquery NK_REM expr_or_subquery */
-   455,  /* (487) expression ::= column_reference NK_ARROW NK_STRING */
-   455,  /* (488) expression ::= expr_or_subquery NK_BITAND expr_or_subquery */
-   455,  /* (489) expression ::= expr_or_subquery NK_BITOR expr_or_subquery */
-   433,  /* (490) expression_list ::= expr_or_subquery */
-   433,  /* (491) expression_list ::= expression_list NK_COMMA expr_or_subquery */
-   464,  /* (492) column_reference ::= column_name */
-   464,  /* (493) column_reference ::= table_name NK_DOT column_name */
-   464,  /* (494) column_reference ::= NK_ALIAS */
-   464,  /* (495) column_reference ::= table_name NK_DOT NK_ALIAS */
-   463,  /* (496) pseudo_column ::= ROWTS */
-   463,  /* (497) pseudo_column ::= TBNAME */
-   463,  /* (498) pseudo_column ::= table_name NK_DOT TBNAME */
-   463,  /* (499) pseudo_column ::= QSTART */
-   463,  /* (500) pseudo_column ::= QEND */
-   463,  /* (501) pseudo_column ::= QDURATION */
-   463,  /* (502) pseudo_column ::= WSTART */
-   463,  /* (503) pseudo_column ::= WEND */
-   463,  /* (504) pseudo_column ::= WDURATION */
-   463,  /* (505) pseudo_column ::= IROWTS */
-   463,  /* (506) pseudo_column ::= ISFILLED */
-   463,  /* (507) pseudo_column ::= QTAGS */
-   465,  /* (508) function_expression ::= function_name NK_LP expression_list NK_RP */
-   465,  /* (509) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
-   465,  /* (510) function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */
-   465,  /* (511) function_expression ::= literal_func */
-   458,  /* (512) literal_func ::= noarg_func NK_LP NK_RP */
-   458,  /* (513) literal_func ::= NOW */
-   458,  /* (514) literal_func ::= TODAY */
-   469,  /* (515) noarg_func ::= NOW */
-   469,  /* (516) noarg_func ::= TODAY */
-   469,  /* (517) noarg_func ::= TIMEZONE */
-   469,  /* (518) noarg_func ::= DATABASE */
-   469,  /* (519) noarg_func ::= CLIENT_VERSION */
-   469,  /* (520) noarg_func ::= SERVER_VERSION */
-   469,  /* (521) noarg_func ::= SERVER_STATUS */
-   469,  /* (522) noarg_func ::= CURRENT_USER */
-   469,  /* (523) noarg_func ::= USER */
-   467,  /* (524) star_func ::= COUNT */
-   467,  /* (525) star_func ::= FIRST */
-   467,  /* (526) star_func ::= LAST */
-   467,  /* (527) star_func ::= LAST_ROW */
-   468,  /* (528) star_func_para_list ::= NK_STAR */
-   468,  /* (529) star_func_para_list ::= other_para_list */
-   470,  /* (530) other_para_list ::= star_func_para */
-   470,  /* (531) other_para_list ::= other_para_list NK_COMMA star_func_para */
-   471,  /* (532) star_func_para ::= expr_or_subquery */
-   471,  /* (533) star_func_para ::= table_name NK_DOT NK_STAR */
-   466,  /* (534) case_when_expression ::= CASE when_then_list case_when_else_opt END */
-   466,  /* (535) case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */
-   472,  /* (536) when_then_list ::= when_then_expr */
-   472,  /* (537) when_then_list ::= when_then_list when_then_expr */
-   475,  /* (538) when_then_expr ::= WHEN common_expression THEN common_expression */
-   473,  /* (539) case_when_else_opt ::= */
-   473,  /* (540) case_when_else_opt ::= ELSE common_expression */
-   476,  /* (541) predicate ::= expr_or_subquery compare_op expr_or_subquery */
-   476,  /* (542) predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */
-   476,  /* (543) predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */
-   476,  /* (544) predicate ::= expr_or_subquery IS NULL */
-   476,  /* (545) predicate ::= expr_or_subquery IS NOT NULL */
-   476,  /* (546) predicate ::= expr_or_subquery in_op in_predicate_value */
-   477,  /* (547) compare_op ::= NK_LT */
-   477,  /* (548) compare_op ::= NK_GT */
-   477,  /* (549) compare_op ::= NK_LE */
-   477,  /* (550) compare_op ::= NK_GE */
-   477,  /* (551) compare_op ::= NK_NE */
-   477,  /* (552) compare_op ::= NK_EQ */
-   477,  /* (553) compare_op ::= LIKE */
-   477,  /* (554) compare_op ::= NOT LIKE */
-   477,  /* (555) compare_op ::= MATCH */
-   477,  /* (556) compare_op ::= NMATCH */
-   477,  /* (557) compare_op ::= CONTAINS */
-   478,  /* (558) in_op ::= IN */
-   478,  /* (559) in_op ::= NOT IN */
-   479,  /* (560) in_predicate_value ::= NK_LP literal_list NK_RP */
-   480,  /* (561) boolean_value_expression ::= boolean_primary */
-   480,  /* (562) boolean_value_expression ::= NOT boolean_primary */
-   480,  /* (563) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-   480,  /* (564) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-   481,  /* (565) boolean_primary ::= predicate */
-   481,  /* (566) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
-   474,  /* (567) common_expression ::= expr_or_subquery */
-   474,  /* (568) common_expression ::= boolean_value_expression */
-   482,  /* (569) from_clause_opt ::= */
-   482,  /* (570) from_clause_opt ::= FROM table_reference_list */
-   483,  /* (571) table_reference_list ::= table_reference */
-   483,  /* (572) table_reference_list ::= table_reference_list NK_COMMA table_reference */
-   484,  /* (573) table_reference ::= table_primary */
-   484,  /* (574) table_reference ::= joined_table */
-   485,  /* (575) table_primary ::= table_name alias_opt */
-   485,  /* (576) table_primary ::= db_name NK_DOT table_name alias_opt */
-   485,  /* (577) table_primary ::= subquery alias_opt */
-   485,  /* (578) table_primary ::= parenthesized_joined_table */
-   487,  /* (579) alias_opt ::= */
-   487,  /* (580) alias_opt ::= table_alias */
-   487,  /* (581) alias_opt ::= AS table_alias */
-   489,  /* (582) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-   489,  /* (583) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
-   486,  /* (584) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-   490,  /* (585) join_type ::= */
-   490,  /* (586) join_type ::= INNER */
-   491,  /* (587) query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
-   492,  /* (588) hint_list ::= */
-   492,  /* (589) hint_list ::= NK_HINT */
-   494,  /* (590) tag_mode_opt ::= */
-   494,  /* (591) tag_mode_opt ::= TAGS */
-   493,  /* (592) set_quantifier_opt ::= */
-   493,  /* (593) set_quantifier_opt ::= DISTINCT */
-   493,  /* (594) set_quantifier_opt ::= ALL */
-   495,  /* (595) select_list ::= select_item */
-   495,  /* (596) select_list ::= select_list NK_COMMA select_item */
-   503,  /* (597) select_item ::= NK_STAR */
-   503,  /* (598) select_item ::= common_expression */
-   503,  /* (599) select_item ::= common_expression column_alias */
-   503,  /* (600) select_item ::= common_expression AS column_alias */
-   503,  /* (601) select_item ::= table_name NK_DOT NK_STAR */
-   436,  /* (602) where_clause_opt ::= */
-   436,  /* (603) where_clause_opt ::= WHERE search_condition */
-   496,  /* (604) partition_by_clause_opt ::= */
-   496,  /* (605) partition_by_clause_opt ::= PARTITION BY partition_list */
-   504,  /* (606) partition_list ::= partition_item */
-   504,  /* (607) partition_list ::= partition_list NK_COMMA partition_item */
-   505,  /* (608) partition_item ::= expr_or_subquery */
-   505,  /* (609) partition_item ::= expr_or_subquery column_alias */
-   505,  /* (610) partition_item ::= expr_or_subquery AS column_alias */
-   500,  /* (611) twindow_clause_opt ::= */
-   500,  /* (612) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP */
-   500,  /* (613) twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */
-   500,  /* (614) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
-   500,  /* (615) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
-   500,  /* (616) twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition */
-   500,  /* (617) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP */
-   500,  /* (618) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-   429,  /* (619) sliding_opt ::= */
-   429,  /* (620) sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP */
-   506,  /* (621) interval_sliding_duration_literal ::= NK_VARIABLE */
-   506,  /* (622) interval_sliding_duration_literal ::= NK_STRING */
-   506,  /* (623) interval_sliding_duration_literal ::= NK_INTEGER */
-   499,  /* (624) fill_opt ::= */
-   499,  /* (625) fill_opt ::= FILL NK_LP fill_mode NK_RP */
-   499,  /* (626) fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP */
-   499,  /* (627) fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP */
-   507,  /* (628) fill_mode ::= NONE */
-   507,  /* (629) fill_mode ::= PREV */
-   507,  /* (630) fill_mode ::= NULL */
-   507,  /* (631) fill_mode ::= NULL_F */
-   507,  /* (632) fill_mode ::= LINEAR */
-   507,  /* (633) fill_mode ::= NEXT */
-   501,  /* (634) group_by_clause_opt ::= */
-   501,  /* (635) group_by_clause_opt ::= GROUP BY group_by_list */
-   508,  /* (636) group_by_list ::= expr_or_subquery */
-   508,  /* (637) group_by_list ::= group_by_list NK_COMMA expr_or_subquery */
-   502,  /* (638) having_clause_opt ::= */
-   502,  /* (639) having_clause_opt ::= HAVING search_condition */
-   497,  /* (640) range_opt ::= */
-   497,  /* (641) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
-   497,  /* (642) range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
-   498,  /* (643) every_opt ::= */
-   498,  /* (644) every_opt ::= EVERY NK_LP duration_literal NK_RP */
-   509,  /* (645) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
-   510,  /* (646) query_simple ::= query_specification */
-   510,  /* (647) query_simple ::= union_query_expression */
-   514,  /* (648) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
-   514,  /* (649) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
-   515,  /* (650) query_simple_or_subquery ::= query_simple */
-   515,  /* (651) query_simple_or_subquery ::= subquery */
-   435,  /* (652) query_or_subquery ::= query_expression */
-   435,  /* (653) query_or_subquery ::= subquery */
-   511,  /* (654) order_by_clause_opt ::= */
-   511,  /* (655) order_by_clause_opt ::= ORDER BY sort_specification_list */
-   512,  /* (656) slimit_clause_opt ::= */
-   512,  /* (657) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-   512,  /* (658) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-   512,  /* (659) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-   513,  /* (660) limit_clause_opt ::= */
-   513,  /* (661) limit_clause_opt ::= LIMIT NK_INTEGER */
-   513,  /* (662) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-   513,  /* (663) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-   488,  /* (664) subquery ::= NK_LP query_expression NK_RP */
-   488,  /* (665) subquery ::= NK_LP subquery NK_RP */
-   373,  /* (666) search_condition ::= common_expression */
-   516,  /* (667) sort_specification_list ::= sort_specification */
-   516,  /* (668) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-   517,  /* (669) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
-   518,  /* (670) ordering_specification_opt ::= */
-   518,  /* (671) ordering_specification_opt ::= ASC */
-   518,  /* (672) ordering_specification_opt ::= DESC */
-   519,  /* (673) null_ordering_opt ::= */
-   519,  /* (674) null_ordering_opt ::= NULLS FIRST */
-   519,  /* (675) null_ordering_opt ::= NULLS LAST */
+   401,  /* (416) tags_literal ::= NK_INTEGER NK_PLUS duration_literal */
+   401,  /* (417) tags_literal ::= NK_INTEGER NK_MINUS duration_literal */
+   401,  /* (418) tags_literal ::= NK_PLUS NK_INTEGER */
+   401,  /* (419) tags_literal ::= NK_PLUS NK_INTEGER NK_PLUS duration_literal */
+   401,  /* (420) tags_literal ::= NK_PLUS NK_INTEGER NK_MINUS duration_literal */
+   401,  /* (421) tags_literal ::= NK_MINUS NK_INTEGER */
+   401,  /* (422) tags_literal ::= NK_MINUS NK_INTEGER NK_PLUS duration_literal */
+   401,  /* (423) tags_literal ::= NK_MINUS NK_INTEGER NK_MINUS duration_literal */
+   401,  /* (424) tags_literal ::= NK_FLOAT */
+   401,  /* (425) tags_literal ::= NK_PLUS NK_FLOAT */
+   401,  /* (426) tags_literal ::= NK_MINUS NK_FLOAT */
+   401,  /* (427) tags_literal ::= NK_BIN */
+   401,  /* (428) tags_literal ::= NK_BIN NK_PLUS duration_literal */
+   401,  /* (429) tags_literal ::= NK_BIN NK_MINUS duration_literal */
+   401,  /* (430) tags_literal ::= NK_PLUS NK_BIN */
+   401,  /* (431) tags_literal ::= NK_PLUS NK_BIN NK_PLUS duration_literal */
+   401,  /* (432) tags_literal ::= NK_PLUS NK_BIN NK_MINUS duration_literal */
+   401,  /* (433) tags_literal ::= NK_MINUS NK_BIN */
+   401,  /* (434) tags_literal ::= NK_MINUS NK_BIN NK_PLUS duration_literal */
+   401,  /* (435) tags_literal ::= NK_MINUS NK_BIN NK_MINUS duration_literal */
+   401,  /* (436) tags_literal ::= NK_HEX */
+   401,  /* (437) tags_literal ::= NK_HEX NK_PLUS duration_literal */
+   401,  /* (438) tags_literal ::= NK_HEX NK_MINUS duration_literal */
+   401,  /* (439) tags_literal ::= NK_PLUS NK_HEX */
+   401,  /* (440) tags_literal ::= NK_PLUS NK_HEX NK_PLUS duration_literal */
+   401,  /* (441) tags_literal ::= NK_PLUS NK_HEX NK_MINUS duration_literal */
+   401,  /* (442) tags_literal ::= NK_MINUS NK_HEX */
+   401,  /* (443) tags_literal ::= NK_MINUS NK_HEX NK_PLUS duration_literal */
+   401,  /* (444) tags_literal ::= NK_MINUS NK_HEX NK_MINUS duration_literal */
+   401,  /* (445) tags_literal ::= NK_STRING */
+   401,  /* (446) tags_literal ::= NK_STRING NK_PLUS duration_literal */
+   401,  /* (447) tags_literal ::= NK_STRING NK_MINUS duration_literal */
+   401,  /* (448) tags_literal ::= NK_BOOL */
+   401,  /* (449) tags_literal ::= NULL */
+   401,  /* (450) tags_literal ::= literal_func */
+   401,  /* (451) tags_literal ::= literal_func NK_PLUS duration_literal */
+   401,  /* (452) tags_literal ::= literal_func NK_MINUS duration_literal */
+   404,  /* (453) tags_literal_list ::= tags_literal */
+   404,  /* (454) tags_literal_list ::= tags_literal_list NK_COMMA tags_literal */
+   358,  /* (455) literal ::= NK_INTEGER */
+   358,  /* (456) literal ::= NK_FLOAT */
+   358,  /* (457) literal ::= NK_STRING */
+   358,  /* (458) literal ::= NK_BOOL */
+   358,  /* (459) literal ::= TIMESTAMP NK_STRING */
+   358,  /* (460) literal ::= duration_literal */
+   358,  /* (461) literal ::= NULL */
+   358,  /* (462) literal ::= NK_QUESTION */
+   411,  /* (463) duration_literal ::= NK_VARIABLE */
+   387,  /* (464) signed ::= NK_INTEGER */
+   387,  /* (465) signed ::= NK_PLUS NK_INTEGER */
+   387,  /* (466) signed ::= NK_MINUS NK_INTEGER */
+   387,  /* (467) signed ::= NK_FLOAT */
+   387,  /* (468) signed ::= NK_PLUS NK_FLOAT */
+   387,  /* (469) signed ::= NK_MINUS NK_FLOAT */
+   459,  /* (470) signed_literal ::= signed */
+   459,  /* (471) signed_literal ::= NK_STRING */
+   459,  /* (472) signed_literal ::= NK_BOOL */
+   459,  /* (473) signed_literal ::= TIMESTAMP NK_STRING */
+   459,  /* (474) signed_literal ::= duration_literal */
+   459,  /* (475) signed_literal ::= NULL */
+   459,  /* (476) signed_literal ::= literal_func */
+   459,  /* (477) signed_literal ::= NK_QUESTION */
+   460,  /* (478) literal_list ::= signed_literal */
+   460,  /* (479) literal_list ::= literal_list NK_COMMA signed_literal */
+   370,  /* (480) db_name ::= NK_ID */
+   371,  /* (481) table_name ::= NK_ID */
+   399,  /* (482) column_name ::= NK_ID */
+   413,  /* (483) function_name ::= NK_ID */
+   446,  /* (484) view_name ::= NK_ID */
+   461,  /* (485) table_alias ::= NK_ID */
+   424,  /* (486) column_alias ::= NK_ID */
+   424,  /* (487) column_alias ::= NK_ALIAS */
+   363,  /* (488) user_name ::= NK_ID */
+   372,  /* (489) topic_name ::= NK_ID */
+   447,  /* (490) stream_name ::= NK_ID */
+   437,  /* (491) cgroup_name ::= NK_ID */
+   427,  /* (492) index_name ::= NK_ID */
+   462,  /* (493) expr_or_subquery ::= expression */
+   455,  /* (494) expression ::= literal */
+   455,  /* (495) expression ::= pseudo_column */
+   455,  /* (496) expression ::= column_reference */
+   455,  /* (497) expression ::= function_expression */
+   455,  /* (498) expression ::= case_when_expression */
+   455,  /* (499) expression ::= NK_LP expression NK_RP */
+   455,  /* (500) expression ::= NK_PLUS expr_or_subquery */
+   455,  /* (501) expression ::= NK_MINUS expr_or_subquery */
+   455,  /* (502) expression ::= expr_or_subquery NK_PLUS expr_or_subquery */
+   455,  /* (503) expression ::= expr_or_subquery NK_MINUS expr_or_subquery */
+   455,  /* (504) expression ::= expr_or_subquery NK_STAR expr_or_subquery */
+   455,  /* (505) expression ::= expr_or_subquery NK_SLASH expr_or_subquery */
+   455,  /* (506) expression ::= expr_or_subquery NK_REM expr_or_subquery */
+   455,  /* (507) expression ::= column_reference NK_ARROW NK_STRING */
+   455,  /* (508) expression ::= expr_or_subquery NK_BITAND expr_or_subquery */
+   455,  /* (509) expression ::= expr_or_subquery NK_BITOR expr_or_subquery */
+   433,  /* (510) expression_list ::= expr_or_subquery */
+   433,  /* (511) expression_list ::= expression_list NK_COMMA expr_or_subquery */
+   464,  /* (512) column_reference ::= column_name */
+   464,  /* (513) column_reference ::= table_name NK_DOT column_name */
+   464,  /* (514) column_reference ::= NK_ALIAS */
+   464,  /* (515) column_reference ::= table_name NK_DOT NK_ALIAS */
+   463,  /* (516) pseudo_column ::= ROWTS */
+   463,  /* (517) pseudo_column ::= TBNAME */
+   463,  /* (518) pseudo_column ::= table_name NK_DOT TBNAME */
+   463,  /* (519) pseudo_column ::= QSTART */
+   463,  /* (520) pseudo_column ::= QEND */
+   463,  /* (521) pseudo_column ::= QDURATION */
+   463,  /* (522) pseudo_column ::= WSTART */
+   463,  /* (523) pseudo_column ::= WEND */
+   463,  /* (524) pseudo_column ::= WDURATION */
+   463,  /* (525) pseudo_column ::= IROWTS */
+   463,  /* (526) pseudo_column ::= ISFILLED */
+   463,  /* (527) pseudo_column ::= QTAGS */
+   465,  /* (528) function_expression ::= function_name NK_LP expression_list NK_RP */
+   465,  /* (529) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
+   465,  /* (530) function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */
+   465,  /* (531) function_expression ::= literal_func */
+   458,  /* (532) literal_func ::= noarg_func NK_LP NK_RP */
+   458,  /* (533) literal_func ::= NOW */
+   458,  /* (534) literal_func ::= TODAY */
+   469,  /* (535) noarg_func ::= NOW */
+   469,  /* (536) noarg_func ::= TODAY */
+   469,  /* (537) noarg_func ::= TIMEZONE */
+   469,  /* (538) noarg_func ::= DATABASE */
+   469,  /* (539) noarg_func ::= CLIENT_VERSION */
+   469,  /* (540) noarg_func ::= SERVER_VERSION */
+   469,  /* (541) noarg_func ::= SERVER_STATUS */
+   469,  /* (542) noarg_func ::= CURRENT_USER */
+   469,  /* (543) noarg_func ::= USER */
+   467,  /* (544) star_func ::= COUNT */
+   467,  /* (545) star_func ::= FIRST */
+   467,  /* (546) star_func ::= LAST */
+   467,  /* (547) star_func ::= LAST_ROW */
+   468,  /* (548) star_func_para_list ::= NK_STAR */
+   468,  /* (549) star_func_para_list ::= other_para_list */
+   470,  /* (550) other_para_list ::= star_func_para */
+   470,  /* (551) other_para_list ::= other_para_list NK_COMMA star_func_para */
+   471,  /* (552) star_func_para ::= expr_or_subquery */
+   471,  /* (553) star_func_para ::= table_name NK_DOT NK_STAR */
+   466,  /* (554) case_when_expression ::= CASE when_then_list case_when_else_opt END */
+   466,  /* (555) case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */
+   472,  /* (556) when_then_list ::= when_then_expr */
+   472,  /* (557) when_then_list ::= when_then_list when_then_expr */
+   475,  /* (558) when_then_expr ::= WHEN common_expression THEN common_expression */
+   473,  /* (559) case_when_else_opt ::= */
+   473,  /* (560) case_when_else_opt ::= ELSE common_expression */
+   476,  /* (561) predicate ::= expr_or_subquery compare_op expr_or_subquery */
+   476,  /* (562) predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */
+   476,  /* (563) predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */
+   476,  /* (564) predicate ::= expr_or_subquery IS NULL */
+   476,  /* (565) predicate ::= expr_or_subquery IS NOT NULL */
+   476,  /* (566) predicate ::= expr_or_subquery in_op in_predicate_value */
+   477,  /* (567) compare_op ::= NK_LT */
+   477,  /* (568) compare_op ::= NK_GT */
+   477,  /* (569) compare_op ::= NK_LE */
+   477,  /* (570) compare_op ::= NK_GE */
+   477,  /* (571) compare_op ::= NK_NE */
+   477,  /* (572) compare_op ::= NK_EQ */
+   477,  /* (573) compare_op ::= LIKE */
+   477,  /* (574) compare_op ::= NOT LIKE */
+   477,  /* (575) compare_op ::= MATCH */
+   477,  /* (576) compare_op ::= NMATCH */
+   477,  /* (577) compare_op ::= CONTAINS */
+   478,  /* (578) in_op ::= IN */
+   478,  /* (579) in_op ::= NOT IN */
+   479,  /* (580) in_predicate_value ::= NK_LP literal_list NK_RP */
+   480,  /* (581) boolean_value_expression ::= boolean_primary */
+   480,  /* (582) boolean_value_expression ::= NOT boolean_primary */
+   480,  /* (583) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+   480,  /* (584) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+   481,  /* (585) boolean_primary ::= predicate */
+   481,  /* (586) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+   474,  /* (587) common_expression ::= expr_or_subquery */
+   474,  /* (588) common_expression ::= boolean_value_expression */
+   482,  /* (589) from_clause_opt ::= */
+   482,  /* (590) from_clause_opt ::= FROM table_reference_list */
+   483,  /* (591) table_reference_list ::= table_reference */
+   483,  /* (592) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+   484,  /* (593) table_reference ::= table_primary */
+   484,  /* (594) table_reference ::= joined_table */
+   485,  /* (595) table_primary ::= table_name alias_opt */
+   485,  /* (596) table_primary ::= db_name NK_DOT table_name alias_opt */
+   485,  /* (597) table_primary ::= subquery alias_opt */
+   485,  /* (598) table_primary ::= parenthesized_joined_table */
+   487,  /* (599) alias_opt ::= */
+   487,  /* (600) alias_opt ::= table_alias */
+   487,  /* (601) alias_opt ::= AS table_alias */
+   489,  /* (602) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+   489,  /* (603) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+   486,  /* (604) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+   490,  /* (605) join_type ::= */
+   490,  /* (606) join_type ::= INNER */
+   491,  /* (607) query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+   492,  /* (608) hint_list ::= */
+   492,  /* (609) hint_list ::= NK_HINT */
+   494,  /* (610) tag_mode_opt ::= */
+   494,  /* (611) tag_mode_opt ::= TAGS */
+   493,  /* (612) set_quantifier_opt ::= */
+   493,  /* (613) set_quantifier_opt ::= DISTINCT */
+   493,  /* (614) set_quantifier_opt ::= ALL */
+   495,  /* (615) select_list ::= select_item */
+   495,  /* (616) select_list ::= select_list NK_COMMA select_item */
+   503,  /* (617) select_item ::= NK_STAR */
+   503,  /* (618) select_item ::= common_expression */
+   503,  /* (619) select_item ::= common_expression column_alias */
+   503,  /* (620) select_item ::= common_expression AS column_alias */
+   503,  /* (621) select_item ::= table_name NK_DOT NK_STAR */
+   436,  /* (622) where_clause_opt ::= */
+   436,  /* (623) where_clause_opt ::= WHERE search_condition */
+   496,  /* (624) partition_by_clause_opt ::= */
+   496,  /* (625) partition_by_clause_opt ::= PARTITION BY partition_list */
+   504,  /* (626) partition_list ::= partition_item */
+   504,  /* (627) partition_list ::= partition_list NK_COMMA partition_item */
+   505,  /* (628) partition_item ::= expr_or_subquery */
+   505,  /* (629) partition_item ::= expr_or_subquery column_alias */
+   505,  /* (630) partition_item ::= expr_or_subquery AS column_alias */
+   500,  /* (631) twindow_clause_opt ::= */
+   500,  /* (632) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP */
+   500,  /* (633) twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */
+   500,  /* (634) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
+   500,  /* (635) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
+   500,  /* (636) twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition */
+   500,  /* (637) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP */
+   500,  /* (638) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+   429,  /* (639) sliding_opt ::= */
+   429,  /* (640) sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP */
+   506,  /* (641) interval_sliding_duration_literal ::= NK_VARIABLE */
+   506,  /* (642) interval_sliding_duration_literal ::= NK_STRING */
+   506,  /* (643) interval_sliding_duration_literal ::= NK_INTEGER */
+   499,  /* (644) fill_opt ::= */
+   499,  /* (645) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+   499,  /* (646) fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP */
+   499,  /* (647) fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP */
+   507,  /* (648) fill_mode ::= NONE */
+   507,  /* (649) fill_mode ::= PREV */
+   507,  /* (650) fill_mode ::= NULL */
+   507,  /* (651) fill_mode ::= NULL_F */
+   507,  /* (652) fill_mode ::= LINEAR */
+   507,  /* (653) fill_mode ::= NEXT */
+   501,  /* (654) group_by_clause_opt ::= */
+   501,  /* (655) group_by_clause_opt ::= GROUP BY group_by_list */
+   508,  /* (656) group_by_list ::= expr_or_subquery */
+   508,  /* (657) group_by_list ::= group_by_list NK_COMMA expr_or_subquery */
+   502,  /* (658) having_clause_opt ::= */
+   502,  /* (659) having_clause_opt ::= HAVING search_condition */
+   497,  /* (660) range_opt ::= */
+   497,  /* (661) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
+   497,  /* (662) range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
+   498,  /* (663) every_opt ::= */
+   498,  /* (664) every_opt ::= EVERY NK_LP duration_literal NK_RP */
+   509,  /* (665) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
+   510,  /* (666) query_simple ::= query_specification */
+   510,  /* (667) query_simple ::= union_query_expression */
+   514,  /* (668) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
+   514,  /* (669) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
+   515,  /* (670) query_simple_or_subquery ::= query_simple */
+   515,  /* (671) query_simple_or_subquery ::= subquery */
+   435,  /* (672) query_or_subquery ::= query_expression */
+   435,  /* (673) query_or_subquery ::= subquery */
+   511,  /* (674) order_by_clause_opt ::= */
+   511,  /* (675) order_by_clause_opt ::= ORDER BY sort_specification_list */
+   512,  /* (676) slimit_clause_opt ::= */
+   512,  /* (677) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+   512,  /* (678) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+   512,  /* (679) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+   513,  /* (680) limit_clause_opt ::= */
+   513,  /* (681) limit_clause_opt ::= LIMIT NK_INTEGER */
+   513,  /* (682) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+   513,  /* (683) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+   488,  /* (684) subquery ::= NK_LP query_expression NK_RP */
+   488,  /* (685) subquery ::= NK_LP subquery NK_RP */
+   373,  /* (686) search_condition ::= common_expression */
+   516,  /* (687) sort_specification_list ::= sort_specification */
+   516,  /* (688) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+   517,  /* (689) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
+   518,  /* (690) ordering_specification_opt ::= */
+   518,  /* (691) ordering_specification_opt ::= ASC */
+   518,  /* (692) ordering_specification_opt ::= DESC */
+   519,  /* (693) null_ordering_opt ::= */
+   519,  /* (694) null_ordering_opt ::= NULLS FIRST */
+   519,  /* (695) null_ordering_opt ::= NULLS LAST */
 };
 
 /* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
@@ -4863,266 +4911,286 @@ static const signed char yyRuleInfoNRhs[] = {
    -7,  /* (413) insert_query ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery */
    -4,  /* (414) insert_query ::= INSERT INTO full_table_name query_or_subquery */
    -1,  /* (415) tags_literal ::= NK_INTEGER */
-   -2,  /* (416) tags_literal ::= NK_PLUS NK_INTEGER */
-   -2,  /* (417) tags_literal ::= NK_MINUS NK_INTEGER */
-   -1,  /* (418) tags_literal ::= NK_FLOAT */
-   -2,  /* (419) tags_literal ::= NK_PLUS NK_FLOAT */
-   -2,  /* (420) tags_literal ::= NK_MINUS NK_FLOAT */
-   -1,  /* (421) tags_literal ::= NK_BIN */
-   -2,  /* (422) tags_literal ::= NK_PLUS NK_BIN */
-   -2,  /* (423) tags_literal ::= NK_MINUS NK_BIN */
-   -1,  /* (424) tags_literal ::= NK_HEX */
-   -2,  /* (425) tags_literal ::= NK_PLUS NK_HEX */
-   -2,  /* (426) tags_literal ::= NK_MINUS NK_HEX */
-   -1,  /* (427) tags_literal ::= NK_STRING */
-   -1,  /* (428) tags_literal ::= NK_BOOL */
-   -1,  /* (429) tags_literal ::= NULL */
-   -1,  /* (430) tags_literal ::= literal_func */
-   -3,  /* (431) tags_literal ::= literal_func NK_PLUS duration_literal */
-   -3,  /* (432) tags_literal ::= literal_func NK_MINUS duration_literal */
-   -1,  /* (433) tags_literal_list ::= tags_literal */
-   -3,  /* (434) tags_literal_list ::= tags_literal_list NK_COMMA tags_literal */
-   -1,  /* (435) literal ::= NK_INTEGER */
-   -1,  /* (436) literal ::= NK_FLOAT */
-   -1,  /* (437) literal ::= NK_STRING */
-   -1,  /* (438) literal ::= NK_BOOL */
-   -2,  /* (439) literal ::= TIMESTAMP NK_STRING */
-   -1,  /* (440) literal ::= duration_literal */
-   -1,  /* (441) literal ::= NULL */
-   -1,  /* (442) literal ::= NK_QUESTION */
-   -1,  /* (443) duration_literal ::= NK_VARIABLE */
-   -1,  /* (444) signed ::= NK_INTEGER */
-   -2,  /* (445) signed ::= NK_PLUS NK_INTEGER */
-   -2,  /* (446) signed ::= NK_MINUS NK_INTEGER */
-   -1,  /* (447) signed ::= NK_FLOAT */
-   -2,  /* (448) signed ::= NK_PLUS NK_FLOAT */
-   -2,  /* (449) signed ::= NK_MINUS NK_FLOAT */
-   -1,  /* (450) signed_literal ::= signed */
-   -1,  /* (451) signed_literal ::= NK_STRING */
-   -1,  /* (452) signed_literal ::= NK_BOOL */
-   -2,  /* (453) signed_literal ::= TIMESTAMP NK_STRING */
-   -1,  /* (454) signed_literal ::= duration_literal */
-   -1,  /* (455) signed_literal ::= NULL */
-   -1,  /* (456) signed_literal ::= literal_func */
-   -1,  /* (457) signed_literal ::= NK_QUESTION */
-   -1,  /* (458) literal_list ::= signed_literal */
-   -3,  /* (459) literal_list ::= literal_list NK_COMMA signed_literal */
-   -1,  /* (460) db_name ::= NK_ID */
-   -1,  /* (461) table_name ::= NK_ID */
-   -1,  /* (462) column_name ::= NK_ID */
-   -1,  /* (463) function_name ::= NK_ID */
-   -1,  /* (464) view_name ::= NK_ID */
-   -1,  /* (465) table_alias ::= NK_ID */
-   -1,  /* (466) column_alias ::= NK_ID */
-   -1,  /* (467) column_alias ::= NK_ALIAS */
-   -1,  /* (468) user_name ::= NK_ID */
-   -1,  /* (469) topic_name ::= NK_ID */
-   -1,  /* (470) stream_name ::= NK_ID */
-   -1,  /* (471) cgroup_name ::= NK_ID */
-   -1,  /* (472) index_name ::= NK_ID */
-   -1,  /* (473) expr_or_subquery ::= expression */
-   -1,  /* (474) expression ::= literal */
-   -1,  /* (475) expression ::= pseudo_column */
-   -1,  /* (476) expression ::= column_reference */
-   -1,  /* (477) expression ::= function_expression */
-   -1,  /* (478) expression ::= case_when_expression */
-   -3,  /* (479) expression ::= NK_LP expression NK_RP */
-   -2,  /* (480) expression ::= NK_PLUS expr_or_subquery */
-   -2,  /* (481) expression ::= NK_MINUS expr_or_subquery */
-   -3,  /* (482) expression ::= expr_or_subquery NK_PLUS expr_or_subquery */
-   -3,  /* (483) expression ::= expr_or_subquery NK_MINUS expr_or_subquery */
-   -3,  /* (484) expression ::= expr_or_subquery NK_STAR expr_or_subquery */
-   -3,  /* (485) expression ::= expr_or_subquery NK_SLASH expr_or_subquery */
-   -3,  /* (486) expression ::= expr_or_subquery NK_REM expr_or_subquery */
-   -3,  /* (487) expression ::= column_reference NK_ARROW NK_STRING */
-   -3,  /* (488) expression ::= expr_or_subquery NK_BITAND expr_or_subquery */
-   -3,  /* (489) expression ::= expr_or_subquery NK_BITOR expr_or_subquery */
-   -1,  /* (490) expression_list ::= expr_or_subquery */
-   -3,  /* (491) expression_list ::= expression_list NK_COMMA expr_or_subquery */
-   -1,  /* (492) column_reference ::= column_name */
-   -3,  /* (493) column_reference ::= table_name NK_DOT column_name */
-   -1,  /* (494) column_reference ::= NK_ALIAS */
-   -3,  /* (495) column_reference ::= table_name NK_DOT NK_ALIAS */
-   -1,  /* (496) pseudo_column ::= ROWTS */
-   -1,  /* (497) pseudo_column ::= TBNAME */
-   -3,  /* (498) pseudo_column ::= table_name NK_DOT TBNAME */
-   -1,  /* (499) pseudo_column ::= QSTART */
-   -1,  /* (500) pseudo_column ::= QEND */
-   -1,  /* (501) pseudo_column ::= QDURATION */
-   -1,  /* (502) pseudo_column ::= WSTART */
-   -1,  /* (503) pseudo_column ::= WEND */
-   -1,  /* (504) pseudo_column ::= WDURATION */
-   -1,  /* (505) pseudo_column ::= IROWTS */
-   -1,  /* (506) pseudo_column ::= ISFILLED */
-   -1,  /* (507) pseudo_column ::= QTAGS */
-   -4,  /* (508) function_expression ::= function_name NK_LP expression_list NK_RP */
-   -4,  /* (509) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
-   -6,  /* (510) function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */
-   -1,  /* (511) function_expression ::= literal_func */
-   -3,  /* (512) literal_func ::= noarg_func NK_LP NK_RP */
-   -1,  /* (513) literal_func ::= NOW */
-   -1,  /* (514) literal_func ::= TODAY */
-   -1,  /* (515) noarg_func ::= NOW */
-   -1,  /* (516) noarg_func ::= TODAY */
-   -1,  /* (517) noarg_func ::= TIMEZONE */
-   -1,  /* (518) noarg_func ::= DATABASE */
-   -1,  /* (519) noarg_func ::= CLIENT_VERSION */
-   -1,  /* (520) noarg_func ::= SERVER_VERSION */
-   -1,  /* (521) noarg_func ::= SERVER_STATUS */
-   -1,  /* (522) noarg_func ::= CURRENT_USER */
-   -1,  /* (523) noarg_func ::= USER */
-   -1,  /* (524) star_func ::= COUNT */
-   -1,  /* (525) star_func ::= FIRST */
-   -1,  /* (526) star_func ::= LAST */
-   -1,  /* (527) star_func ::= LAST_ROW */
-   -1,  /* (528) star_func_para_list ::= NK_STAR */
-   -1,  /* (529) star_func_para_list ::= other_para_list */
-   -1,  /* (530) other_para_list ::= star_func_para */
-   -3,  /* (531) other_para_list ::= other_para_list NK_COMMA star_func_para */
-   -1,  /* (532) star_func_para ::= expr_or_subquery */
-   -3,  /* (533) star_func_para ::= table_name NK_DOT NK_STAR */
-   -4,  /* (534) case_when_expression ::= CASE when_then_list case_when_else_opt END */
-   -5,  /* (535) case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */
-   -1,  /* (536) when_then_list ::= when_then_expr */
-   -2,  /* (537) when_then_list ::= when_then_list when_then_expr */
-   -4,  /* (538) when_then_expr ::= WHEN common_expression THEN common_expression */
-    0,  /* (539) case_when_else_opt ::= */
-   -2,  /* (540) case_when_else_opt ::= ELSE common_expression */
-   -3,  /* (541) predicate ::= expr_or_subquery compare_op expr_or_subquery */
-   -5,  /* (542) predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */
-   -6,  /* (543) predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */
-   -3,  /* (544) predicate ::= expr_or_subquery IS NULL */
-   -4,  /* (545) predicate ::= expr_or_subquery IS NOT NULL */
-   -3,  /* (546) predicate ::= expr_or_subquery in_op in_predicate_value */
-   -1,  /* (547) compare_op ::= NK_LT */
-   -1,  /* (548) compare_op ::= NK_GT */
-   -1,  /* (549) compare_op ::= NK_LE */
-   -1,  /* (550) compare_op ::= NK_GE */
-   -1,  /* (551) compare_op ::= NK_NE */
-   -1,  /* (552) compare_op ::= NK_EQ */
-   -1,  /* (553) compare_op ::= LIKE */
-   -2,  /* (554) compare_op ::= NOT LIKE */
-   -1,  /* (555) compare_op ::= MATCH */
-   -1,  /* (556) compare_op ::= NMATCH */
-   -1,  /* (557) compare_op ::= CONTAINS */
-   -1,  /* (558) in_op ::= IN */
-   -2,  /* (559) in_op ::= NOT IN */
-   -3,  /* (560) in_predicate_value ::= NK_LP literal_list NK_RP */
-   -1,  /* (561) boolean_value_expression ::= boolean_primary */
-   -2,  /* (562) boolean_value_expression ::= NOT boolean_primary */
-   -3,  /* (563) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-   -3,  /* (564) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-   -1,  /* (565) boolean_primary ::= predicate */
-   -3,  /* (566) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
-   -1,  /* (567) common_expression ::= expr_or_subquery */
-   -1,  /* (568) common_expression ::= boolean_value_expression */
-    0,  /* (569) from_clause_opt ::= */
-   -2,  /* (570) from_clause_opt ::= FROM table_reference_list */
-   -1,  /* (571) table_reference_list ::= table_reference */
-   -3,  /* (572) table_reference_list ::= table_reference_list NK_COMMA table_reference */
-   -1,  /* (573) table_reference ::= table_primary */
-   -1,  /* (574) table_reference ::= joined_table */
-   -2,  /* (575) table_primary ::= table_name alias_opt */
-   -4,  /* (576) table_primary ::= db_name NK_DOT table_name alias_opt */
-   -2,  /* (577) table_primary ::= subquery alias_opt */
-   -1,  /* (578) table_primary ::= parenthesized_joined_table */
-    0,  /* (579) alias_opt ::= */
-   -1,  /* (580) alias_opt ::= table_alias */
-   -2,  /* (581) alias_opt ::= AS table_alias */
-   -3,  /* (582) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-   -3,  /* (583) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
-   -6,  /* (584) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-    0,  /* (585) join_type ::= */
-   -1,  /* (586) join_type ::= INNER */
-  -14,  /* (587) query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
-    0,  /* (588) hint_list ::= */
-   -1,  /* (589) hint_list ::= NK_HINT */
-    0,  /* (590) tag_mode_opt ::= */
-   -1,  /* (591) tag_mode_opt ::= TAGS */
-    0,  /* (592) set_quantifier_opt ::= */
-   -1,  /* (593) set_quantifier_opt ::= DISTINCT */
-   -1,  /* (594) set_quantifier_opt ::= ALL */
-   -1,  /* (595) select_list ::= select_item */
-   -3,  /* (596) select_list ::= select_list NK_COMMA select_item */
-   -1,  /* (597) select_item ::= NK_STAR */
-   -1,  /* (598) select_item ::= common_expression */
-   -2,  /* (599) select_item ::= common_expression column_alias */
-   -3,  /* (600) select_item ::= common_expression AS column_alias */
-   -3,  /* (601) select_item ::= table_name NK_DOT NK_STAR */
-    0,  /* (602) where_clause_opt ::= */
-   -2,  /* (603) where_clause_opt ::= WHERE search_condition */
-    0,  /* (604) partition_by_clause_opt ::= */
-   -3,  /* (605) partition_by_clause_opt ::= PARTITION BY partition_list */
-   -1,  /* (606) partition_list ::= partition_item */
-   -3,  /* (607) partition_list ::= partition_list NK_COMMA partition_item */
-   -1,  /* (608) partition_item ::= expr_or_subquery */
-   -2,  /* (609) partition_item ::= expr_or_subquery column_alias */
-   -3,  /* (610) partition_item ::= expr_or_subquery AS column_alias */
-    0,  /* (611) twindow_clause_opt ::= */
-   -6,  /* (612) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP */
-   -4,  /* (613) twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */
-   -6,  /* (614) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
-   -8,  /* (615) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
-   -7,  /* (616) twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition */
-   -4,  /* (617) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP */
-   -6,  /* (618) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-    0,  /* (619) sliding_opt ::= */
-   -4,  /* (620) sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP */
-   -1,  /* (621) interval_sliding_duration_literal ::= NK_VARIABLE */
-   -1,  /* (622) interval_sliding_duration_literal ::= NK_STRING */
-   -1,  /* (623) interval_sliding_duration_literal ::= NK_INTEGER */
-    0,  /* (624) fill_opt ::= */
-   -4,  /* (625) fill_opt ::= FILL NK_LP fill_mode NK_RP */
-   -6,  /* (626) fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP */
-   -6,  /* (627) fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP */
-   -1,  /* (628) fill_mode ::= NONE */
-   -1,  /* (629) fill_mode ::= PREV */
-   -1,  /* (630) fill_mode ::= NULL */
-   -1,  /* (631) fill_mode ::= NULL_F */
-   -1,  /* (632) fill_mode ::= LINEAR */
-   -1,  /* (633) fill_mode ::= NEXT */
-    0,  /* (634) group_by_clause_opt ::= */
-   -3,  /* (635) group_by_clause_opt ::= GROUP BY group_by_list */
-   -1,  /* (636) group_by_list ::= expr_or_subquery */
-   -3,  /* (637) group_by_list ::= group_by_list NK_COMMA expr_or_subquery */
-    0,  /* (638) having_clause_opt ::= */
-   -2,  /* (639) having_clause_opt ::= HAVING search_condition */
-    0,  /* (640) range_opt ::= */
-   -6,  /* (641) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
-   -4,  /* (642) range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
-    0,  /* (643) every_opt ::= */
-   -4,  /* (644) every_opt ::= EVERY NK_LP duration_literal NK_RP */
-   -4,  /* (645) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
-   -1,  /* (646) query_simple ::= query_specification */
-   -1,  /* (647) query_simple ::= union_query_expression */
-   -4,  /* (648) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
-   -3,  /* (649) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
-   -1,  /* (650) query_simple_or_subquery ::= query_simple */
-   -1,  /* (651) query_simple_or_subquery ::= subquery */
-   -1,  /* (652) query_or_subquery ::= query_expression */
-   -1,  /* (653) query_or_subquery ::= subquery */
-    0,  /* (654) order_by_clause_opt ::= */
-   -3,  /* (655) order_by_clause_opt ::= ORDER BY sort_specification_list */
-    0,  /* (656) slimit_clause_opt ::= */
-   -2,  /* (657) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-   -4,  /* (658) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-   -4,  /* (659) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-    0,  /* (660) limit_clause_opt ::= */
-   -2,  /* (661) limit_clause_opt ::= LIMIT NK_INTEGER */
-   -4,  /* (662) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-   -4,  /* (663) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-   -3,  /* (664) subquery ::= NK_LP query_expression NK_RP */
-   -3,  /* (665) subquery ::= NK_LP subquery NK_RP */
-   -1,  /* (666) search_condition ::= common_expression */
-   -1,  /* (667) sort_specification_list ::= sort_specification */
-   -3,  /* (668) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-   -3,  /* (669) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
-    0,  /* (670) ordering_specification_opt ::= */
-   -1,  /* (671) ordering_specification_opt ::= ASC */
-   -1,  /* (672) ordering_specification_opt ::= DESC */
-    0,  /* (673) null_ordering_opt ::= */
-   -2,  /* (674) null_ordering_opt ::= NULLS FIRST */
-   -2,  /* (675) null_ordering_opt ::= NULLS LAST */
+   -3,  /* (416) tags_literal ::= NK_INTEGER NK_PLUS duration_literal */
+   -3,  /* (417) tags_literal ::= NK_INTEGER NK_MINUS duration_literal */
+   -2,  /* (418) tags_literal ::= NK_PLUS NK_INTEGER */
+   -4,  /* (419) tags_literal ::= NK_PLUS NK_INTEGER NK_PLUS duration_literal */
+   -4,  /* (420) tags_literal ::= NK_PLUS NK_INTEGER NK_MINUS duration_literal */
+   -2,  /* (421) tags_literal ::= NK_MINUS NK_INTEGER */
+   -4,  /* (422) tags_literal ::= NK_MINUS NK_INTEGER NK_PLUS duration_literal */
+   -4,  /* (423) tags_literal ::= NK_MINUS NK_INTEGER NK_MINUS duration_literal */
+   -1,  /* (424) tags_literal ::= NK_FLOAT */
+   -2,  /* (425) tags_literal ::= NK_PLUS NK_FLOAT */
+   -2,  /* (426) tags_literal ::= NK_MINUS NK_FLOAT */
+   -1,  /* (427) tags_literal ::= NK_BIN */
+   -3,  /* (428) tags_literal ::= NK_BIN NK_PLUS duration_literal */
+   -3,  /* (429) tags_literal ::= NK_BIN NK_MINUS duration_literal */
+   -2,  /* (430) tags_literal ::= NK_PLUS NK_BIN */
+   -4,  /* (431) tags_literal ::= NK_PLUS NK_BIN NK_PLUS duration_literal */
+   -4,  /* (432) tags_literal ::= NK_PLUS NK_BIN NK_MINUS duration_literal */
+   -2,  /* (433) tags_literal ::= NK_MINUS NK_BIN */
+   -4,  /* (434) tags_literal ::= NK_MINUS NK_BIN NK_PLUS duration_literal */
+   -4,  /* (435) tags_literal ::= NK_MINUS NK_BIN NK_MINUS duration_literal */
+   -1,  /* (436) tags_literal ::= NK_HEX */
+   -3,  /* (437) tags_literal ::= NK_HEX NK_PLUS duration_literal */
+   -3,  /* (438) tags_literal ::= NK_HEX NK_MINUS duration_literal */
+   -2,  /* (439) tags_literal ::= NK_PLUS NK_HEX */
+   -4,  /* (440) tags_literal ::= NK_PLUS NK_HEX NK_PLUS duration_literal */
+   -4,  /* (441) tags_literal ::= NK_PLUS NK_HEX NK_MINUS duration_literal */
+   -2,  /* (442) tags_literal ::= NK_MINUS NK_HEX */
+   -4,  /* (443) tags_literal ::= NK_MINUS NK_HEX NK_PLUS duration_literal */
+   -4,  /* (444) tags_literal ::= NK_MINUS NK_HEX NK_MINUS duration_literal */
+   -1,  /* (445) tags_literal ::= NK_STRING */
+   -3,  /* (446) tags_literal ::= NK_STRING NK_PLUS duration_literal */
+   -3,  /* (447) tags_literal ::= NK_STRING NK_MINUS duration_literal */
+   -1,  /* (448) tags_literal ::= NK_BOOL */
+   -1,  /* (449) tags_literal ::= NULL */
+   -1,  /* (450) tags_literal ::= literal_func */
+   -3,  /* (451) tags_literal ::= literal_func NK_PLUS duration_literal */
+   -3,  /* (452) tags_literal ::= literal_func NK_MINUS duration_literal */
+   -1,  /* (453) tags_literal_list ::= tags_literal */
+   -3,  /* (454) tags_literal_list ::= tags_literal_list NK_COMMA tags_literal */
+   -1,  /* (455) literal ::= NK_INTEGER */
+   -1,  /* (456) literal ::= NK_FLOAT */
+   -1,  /* (457) literal ::= NK_STRING */
+   -1,  /* (458) literal ::= NK_BOOL */
+   -2,  /* (459) literal ::= TIMESTAMP NK_STRING */
+   -1,  /* (460) literal ::= duration_literal */
+   -1,  /* (461) literal ::= NULL */
+   -1,  /* (462) literal ::= NK_QUESTION */
+   -1,  /* (463) duration_literal ::= NK_VARIABLE */
+   -1,  /* (464) signed ::= NK_INTEGER */
+   -2,  /* (465) signed ::= NK_PLUS NK_INTEGER */
+   -2,  /* (466) signed ::= NK_MINUS NK_INTEGER */
+   -1,  /* (467) signed ::= NK_FLOAT */
+   -2,  /* (468) signed ::= NK_PLUS NK_FLOAT */
+   -2,  /* (469) signed ::= NK_MINUS NK_FLOAT */
+   -1,  /* (470) signed_literal ::= signed */
+   -1,  /* (471) signed_literal ::= NK_STRING */
+   -1,  /* (472) signed_literal ::= NK_BOOL */
+   -2,  /* (473) signed_literal ::= TIMESTAMP NK_STRING */
+   -1,  /* (474) signed_literal ::= duration_literal */
+   -1,  /* (475) signed_literal ::= NULL */
+   -1,  /* (476) signed_literal ::= literal_func */
+   -1,  /* (477) signed_literal ::= NK_QUESTION */
+   -1,  /* (478) literal_list ::= signed_literal */
+   -3,  /* (479) literal_list ::= literal_list NK_COMMA signed_literal */
+   -1,  /* (480) db_name ::= NK_ID */
+   -1,  /* (481) table_name ::= NK_ID */
+   -1,  /* (482) column_name ::= NK_ID */
+   -1,  /* (483) function_name ::= NK_ID */
+   -1,  /* (484) view_name ::= NK_ID */
+   -1,  /* (485) table_alias ::= NK_ID */
+   -1,  /* (486) column_alias ::= NK_ID */
+   -1,  /* (487) column_alias ::= NK_ALIAS */
+   -1,  /* (488) user_name ::= NK_ID */
+   -1,  /* (489) topic_name ::= NK_ID */
+   -1,  /* (490) stream_name ::= NK_ID */
+   -1,  /* (491) cgroup_name ::= NK_ID */
+   -1,  /* (492) index_name ::= NK_ID */
+   -1,  /* (493) expr_or_subquery ::= expression */
+   -1,  /* (494) expression ::= literal */
+   -1,  /* (495) expression ::= pseudo_column */
+   -1,  /* (496) expression ::= column_reference */
+   -1,  /* (497) expression ::= function_expression */
+   -1,  /* (498) expression ::= case_when_expression */
+   -3,  /* (499) expression ::= NK_LP expression NK_RP */
+   -2,  /* (500) expression ::= NK_PLUS expr_or_subquery */
+   -2,  /* (501) expression ::= NK_MINUS expr_or_subquery */
+   -3,  /* (502) expression ::= expr_or_subquery NK_PLUS expr_or_subquery */
+   -3,  /* (503) expression ::= expr_or_subquery NK_MINUS expr_or_subquery */
+   -3,  /* (504) expression ::= expr_or_subquery NK_STAR expr_or_subquery */
+   -3,  /* (505) expression ::= expr_or_subquery NK_SLASH expr_or_subquery */
+   -3,  /* (506) expression ::= expr_or_subquery NK_REM expr_or_subquery */
+   -3,  /* (507) expression ::= column_reference NK_ARROW NK_STRING */
+   -3,  /* (508) expression ::= expr_or_subquery NK_BITAND expr_or_subquery */
+   -3,  /* (509) expression ::= expr_or_subquery NK_BITOR expr_or_subquery */
+   -1,  /* (510) expression_list ::= expr_or_subquery */
+   -3,  /* (511) expression_list ::= expression_list NK_COMMA expr_or_subquery */
+   -1,  /* (512) column_reference ::= column_name */
+   -3,  /* (513) column_reference ::= table_name NK_DOT column_name */
+   -1,  /* (514) column_reference ::= NK_ALIAS */
+   -3,  /* (515) column_reference ::= table_name NK_DOT NK_ALIAS */
+   -1,  /* (516) pseudo_column ::= ROWTS */
+   -1,  /* (517) pseudo_column ::= TBNAME */
+   -3,  /* (518) pseudo_column ::= table_name NK_DOT TBNAME */
+   -1,  /* (519) pseudo_column ::= QSTART */
+   -1,  /* (520) pseudo_column ::= QEND */
+   -1,  /* (521) pseudo_column ::= QDURATION */
+   -1,  /* (522) pseudo_column ::= WSTART */
+   -1,  /* (523) pseudo_column ::= WEND */
+   -1,  /* (524) pseudo_column ::= WDURATION */
+   -1,  /* (525) pseudo_column ::= IROWTS */
+   -1,  /* (526) pseudo_column ::= ISFILLED */
+   -1,  /* (527) pseudo_column ::= QTAGS */
+   -4,  /* (528) function_expression ::= function_name NK_LP expression_list NK_RP */
+   -4,  /* (529) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
+   -6,  /* (530) function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */
+   -1,  /* (531) function_expression ::= literal_func */
+   -3,  /* (532) literal_func ::= noarg_func NK_LP NK_RP */
+   -1,  /* (533) literal_func ::= NOW */
+   -1,  /* (534) literal_func ::= TODAY */
+   -1,  /* (535) noarg_func ::= NOW */
+   -1,  /* (536) noarg_func ::= TODAY */
+   -1,  /* (537) noarg_func ::= TIMEZONE */
+   -1,  /* (538) noarg_func ::= DATABASE */
+   -1,  /* (539) noarg_func ::= CLIENT_VERSION */
+   -1,  /* (540) noarg_func ::= SERVER_VERSION */
+   -1,  /* (541) noarg_func ::= SERVER_STATUS */
+   -1,  /* (542) noarg_func ::= CURRENT_USER */
+   -1,  /* (543) noarg_func ::= USER */
+   -1,  /* (544) star_func ::= COUNT */
+   -1,  /* (545) star_func ::= FIRST */
+   -1,  /* (546) star_func ::= LAST */
+   -1,  /* (547) star_func ::= LAST_ROW */
+   -1,  /* (548) star_func_para_list ::= NK_STAR */
+   -1,  /* (549) star_func_para_list ::= other_para_list */
+   -1,  /* (550) other_para_list ::= star_func_para */
+   -3,  /* (551) other_para_list ::= other_para_list NK_COMMA star_func_para */
+   -1,  /* (552) star_func_para ::= expr_or_subquery */
+   -3,  /* (553) star_func_para ::= table_name NK_DOT NK_STAR */
+   -4,  /* (554) case_when_expression ::= CASE when_then_list case_when_else_opt END */
+   -5,  /* (555) case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */
+   -1,  /* (556) when_then_list ::= when_then_expr */
+   -2,  /* (557) when_then_list ::= when_then_list when_then_expr */
+   -4,  /* (558) when_then_expr ::= WHEN common_expression THEN common_expression */
+    0,  /* (559) case_when_else_opt ::= */
+   -2,  /* (560) case_when_else_opt ::= ELSE common_expression */
+   -3,  /* (561) predicate ::= expr_or_subquery compare_op expr_or_subquery */
+   -5,  /* (562) predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */
+   -6,  /* (563) predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */
+   -3,  /* (564) predicate ::= expr_or_subquery IS NULL */
+   -4,  /* (565) predicate ::= expr_or_subquery IS NOT NULL */
+   -3,  /* (566) predicate ::= expr_or_subquery in_op in_predicate_value */
+   -1,  /* (567) compare_op ::= NK_LT */
+   -1,  /* (568) compare_op ::= NK_GT */
+   -1,  /* (569) compare_op ::= NK_LE */
+   -1,  /* (570) compare_op ::= NK_GE */
+   -1,  /* (571) compare_op ::= NK_NE */
+   -1,  /* (572) compare_op ::= NK_EQ */
+   -1,  /* (573) compare_op ::= LIKE */
+   -2,  /* (574) compare_op ::= NOT LIKE */
+   -1,  /* (575) compare_op ::= MATCH */
+   -1,  /* (576) compare_op ::= NMATCH */
+   -1,  /* (577) compare_op ::= CONTAINS */
+   -1,  /* (578) in_op ::= IN */
+   -2,  /* (579) in_op ::= NOT IN */
+   -3,  /* (580) in_predicate_value ::= NK_LP literal_list NK_RP */
+   -1,  /* (581) boolean_value_expression ::= boolean_primary */
+   -2,  /* (582) boolean_value_expression ::= NOT boolean_primary */
+   -3,  /* (583) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+   -3,  /* (584) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+   -1,  /* (585) boolean_primary ::= predicate */
+   -3,  /* (586) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+   -1,  /* (587) common_expression ::= expr_or_subquery */
+   -1,  /* (588) common_expression ::= boolean_value_expression */
+    0,  /* (589) from_clause_opt ::= */
+   -2,  /* (590) from_clause_opt ::= FROM table_reference_list */
+   -1,  /* (591) table_reference_list ::= table_reference */
+   -3,  /* (592) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+   -1,  /* (593) table_reference ::= table_primary */
+   -1,  /* (594) table_reference ::= joined_table */
+   -2,  /* (595) table_primary ::= table_name alias_opt */
+   -4,  /* (596) table_primary ::= db_name NK_DOT table_name alias_opt */
+   -2,  /* (597) table_primary ::= subquery alias_opt */
+   -1,  /* (598) table_primary ::= parenthesized_joined_table */
+    0,  /* (599) alias_opt ::= */
+   -1,  /* (600) alias_opt ::= table_alias */
+   -2,  /* (601) alias_opt ::= AS table_alias */
+   -3,  /* (602) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+   -3,  /* (603) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+   -6,  /* (604) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+    0,  /* (605) join_type ::= */
+   -1,  /* (606) join_type ::= INNER */
+  -14,  /* (607) query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+    0,  /* (608) hint_list ::= */
+   -1,  /* (609) hint_list ::= NK_HINT */
+    0,  /* (610) tag_mode_opt ::= */
+   -1,  /* (611) tag_mode_opt ::= TAGS */
+    0,  /* (612) set_quantifier_opt ::= */
+   -1,  /* (613) set_quantifier_opt ::= DISTINCT */
+   -1,  /* (614) set_quantifier_opt ::= ALL */
+   -1,  /* (615) select_list ::= select_item */
+   -3,  /* (616) select_list ::= select_list NK_COMMA select_item */
+   -1,  /* (617) select_item ::= NK_STAR */
+   -1,  /* (618) select_item ::= common_expression */
+   -2,  /* (619) select_item ::= common_expression column_alias */
+   -3,  /* (620) select_item ::= common_expression AS column_alias */
+   -3,  /* (621) select_item ::= table_name NK_DOT NK_STAR */
+    0,  /* (622) where_clause_opt ::= */
+   -2,  /* (623) where_clause_opt ::= WHERE search_condition */
+    0,  /* (624) partition_by_clause_opt ::= */
+   -3,  /* (625) partition_by_clause_opt ::= PARTITION BY partition_list */
+   -1,  /* (626) partition_list ::= partition_item */
+   -3,  /* (627) partition_list ::= partition_list NK_COMMA partition_item */
+   -1,  /* (628) partition_item ::= expr_or_subquery */
+   -2,  /* (629) partition_item ::= expr_or_subquery column_alias */
+   -3,  /* (630) partition_item ::= expr_or_subquery AS column_alias */
+    0,  /* (631) twindow_clause_opt ::= */
+   -6,  /* (632) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP */
+   -4,  /* (633) twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */
+   -6,  /* (634) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
+   -8,  /* (635) twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
+   -7,  /* (636) twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition */
+   -4,  /* (637) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP */
+   -6,  /* (638) twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+    0,  /* (639) sliding_opt ::= */
+   -4,  /* (640) sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP */
+   -1,  /* (641) interval_sliding_duration_literal ::= NK_VARIABLE */
+   -1,  /* (642) interval_sliding_duration_literal ::= NK_STRING */
+   -1,  /* (643) interval_sliding_duration_literal ::= NK_INTEGER */
+    0,  /* (644) fill_opt ::= */
+   -4,  /* (645) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+   -6,  /* (646) fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP */
+   -6,  /* (647) fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP */
+   -1,  /* (648) fill_mode ::= NONE */
+   -1,  /* (649) fill_mode ::= PREV */
+   -1,  /* (650) fill_mode ::= NULL */
+   -1,  /* (651) fill_mode ::= NULL_F */
+   -1,  /* (652) fill_mode ::= LINEAR */
+   -1,  /* (653) fill_mode ::= NEXT */
+    0,  /* (654) group_by_clause_opt ::= */
+   -3,  /* (655) group_by_clause_opt ::= GROUP BY group_by_list */
+   -1,  /* (656) group_by_list ::= expr_or_subquery */
+   -3,  /* (657) group_by_list ::= group_by_list NK_COMMA expr_or_subquery */
+    0,  /* (658) having_clause_opt ::= */
+   -2,  /* (659) having_clause_opt ::= HAVING search_condition */
+    0,  /* (660) range_opt ::= */
+   -6,  /* (661) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
+   -4,  /* (662) range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
+    0,  /* (663) every_opt ::= */
+   -4,  /* (664) every_opt ::= EVERY NK_LP duration_literal NK_RP */
+   -4,  /* (665) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
+   -1,  /* (666) query_simple ::= query_specification */
+   -1,  /* (667) query_simple ::= union_query_expression */
+   -4,  /* (668) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
+   -3,  /* (669) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
+   -1,  /* (670) query_simple_or_subquery ::= query_simple */
+   -1,  /* (671) query_simple_or_subquery ::= subquery */
+   -1,  /* (672) query_or_subquery ::= query_expression */
+   -1,  /* (673) query_or_subquery ::= subquery */
+    0,  /* (674) order_by_clause_opt ::= */
+   -3,  /* (675) order_by_clause_opt ::= ORDER BY sort_specification_list */
+    0,  /* (676) slimit_clause_opt ::= */
+   -2,  /* (677) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+   -4,  /* (678) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+   -4,  /* (679) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+    0,  /* (680) limit_clause_opt ::= */
+   -2,  /* (681) limit_clause_opt ::= LIMIT NK_INTEGER */
+   -4,  /* (682) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+   -4,  /* (683) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+   -3,  /* (684) subquery ::= NK_LP query_expression NK_RP */
+   -3,  /* (685) subquery ::= NK_LP subquery NK_RP */
+   -1,  /* (686) search_condition ::= common_expression */
+   -1,  /* (687) sort_specification_list ::= sort_specification */
+   -3,  /* (688) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+   -3,  /* (689) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
+    0,  /* (690) ordering_specification_opt ::= */
+   -1,  /* (691) ordering_specification_opt ::= ASC */
+   -1,  /* (692) ordering_specification_opt ::= DESC */
+    0,  /* (693) null_ordering_opt ::= */
+   -2,  /* (694) null_ordering_opt ::= NULLS FIRST */
+   -2,  /* (695) null_ordering_opt ::= NULLS LAST */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -5230,15 +5298,15 @@ static YYACTIONTYPE yy_reduce(
       case 309: /* tag_list_opt ::= */ yytestcase(yyruleno==309);
       case 375: /* col_list_opt ::= */ yytestcase(yyruleno==375);
       case 381: /* tag_def_or_ref_opt ::= */ yytestcase(yyruleno==381);
-      case 604: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==604);
-      case 634: /* group_by_clause_opt ::= */ yytestcase(yyruleno==634);
-      case 654: /* order_by_clause_opt ::= */ yytestcase(yyruleno==654);
+      case 624: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==624);
+      case 654: /* group_by_clause_opt ::= */ yytestcase(yyruleno==654);
+      case 674: /* order_by_clause_opt ::= */ yytestcase(yyruleno==674);
 { yymsp[1].minor.yy184 = NULL; }
         break;
       case 28: /* white_list_opt ::= white_list */
       case 221: /* tags_def_opt ::= tags_def */ yytestcase(yyruleno==221);
       case 382: /* tag_def_or_ref_opt ::= tags_def */ yytestcase(yyruleno==382);
-      case 529: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==529);
+      case 549: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==549);
 { yylhsminor.yy184 = yymsp[0].minor.yy184; }
   yymsp[0].minor.yy184 = yylhsminor.yy184;
         break;
@@ -5323,23 +5391,23 @@ static YYACTIONTYPE yy_reduce(
       case 161: /* end_opt ::= */ yytestcase(yyruleno==161);
       case 304: /* like_pattern_opt ::= */ yytestcase(yyruleno==304);
       case 393: /* subtable_opt ::= */ yytestcase(yyruleno==393);
-      case 539: /* case_when_else_opt ::= */ yytestcase(yyruleno==539);
-      case 569: /* from_clause_opt ::= */ yytestcase(yyruleno==569);
-      case 602: /* where_clause_opt ::= */ yytestcase(yyruleno==602);
-      case 611: /* twindow_clause_opt ::= */ yytestcase(yyruleno==611);
-      case 619: /* sliding_opt ::= */ yytestcase(yyruleno==619);
-      case 624: /* fill_opt ::= */ yytestcase(yyruleno==624);
-      case 638: /* having_clause_opt ::= */ yytestcase(yyruleno==638);
-      case 640: /* range_opt ::= */ yytestcase(yyruleno==640);
-      case 643: /* every_opt ::= */ yytestcase(yyruleno==643);
-      case 656: /* slimit_clause_opt ::= */ yytestcase(yyruleno==656);
-      case 660: /* limit_clause_opt ::= */ yytestcase(yyruleno==660);
+      case 559: /* case_when_else_opt ::= */ yytestcase(yyruleno==559);
+      case 589: /* from_clause_opt ::= */ yytestcase(yyruleno==589);
+      case 622: /* where_clause_opt ::= */ yytestcase(yyruleno==622);
+      case 631: /* twindow_clause_opt ::= */ yytestcase(yyruleno==631);
+      case 639: /* sliding_opt ::= */ yytestcase(yyruleno==639);
+      case 644: /* fill_opt ::= */ yytestcase(yyruleno==644);
+      case 658: /* having_clause_opt ::= */ yytestcase(yyruleno==658);
+      case 660: /* range_opt ::= */ yytestcase(yyruleno==660);
+      case 663: /* every_opt ::= */ yytestcase(yyruleno==663);
+      case 676: /* slimit_clause_opt ::= */ yytestcase(yyruleno==676);
+      case 680: /* limit_clause_opt ::= */ yytestcase(yyruleno==680);
 { yymsp[1].minor.yy392 = NULL; }
         break;
       case 53: /* with_opt ::= WITH search_condition */
-      case 570: /* from_clause_opt ::= FROM table_reference_list */ yytestcase(yyruleno==570);
-      case 603: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==603);
-      case 639: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==639);
+      case 590: /* from_clause_opt ::= FROM table_reference_list */ yytestcase(yyruleno==590);
+      case 623: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==623);
+      case 659: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==659);
 { yymsp[-1].minor.yy392 = yymsp[0].minor.yy392; }
         break;
       case 54: /* cmd ::= CREATE DNODE dnode_endpoint */
@@ -5382,32 +5450,32 @@ static YYACTIONTYPE yy_reduce(
       case 332: /* sma_func_name ::= FIRST */ yytestcase(yyruleno==332);
       case 333: /* sma_func_name ::= LAST */ yytestcase(yyruleno==333);
       case 334: /* sma_func_name ::= LAST_ROW */ yytestcase(yyruleno==334);
-      case 460: /* db_name ::= NK_ID */ yytestcase(yyruleno==460);
-      case 461: /* table_name ::= NK_ID */ yytestcase(yyruleno==461);
-      case 462: /* column_name ::= NK_ID */ yytestcase(yyruleno==462);
-      case 463: /* function_name ::= NK_ID */ yytestcase(yyruleno==463);
-      case 464: /* view_name ::= NK_ID */ yytestcase(yyruleno==464);
-      case 465: /* table_alias ::= NK_ID */ yytestcase(yyruleno==465);
-      case 466: /* column_alias ::= NK_ID */ yytestcase(yyruleno==466);
-      case 467: /* column_alias ::= NK_ALIAS */ yytestcase(yyruleno==467);
-      case 468: /* user_name ::= NK_ID */ yytestcase(yyruleno==468);
-      case 469: /* topic_name ::= NK_ID */ yytestcase(yyruleno==469);
-      case 470: /* stream_name ::= NK_ID */ yytestcase(yyruleno==470);
-      case 471: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==471);
-      case 472: /* index_name ::= NK_ID */ yytestcase(yyruleno==472);
-      case 515: /* noarg_func ::= NOW */ yytestcase(yyruleno==515);
-      case 516: /* noarg_func ::= TODAY */ yytestcase(yyruleno==516);
-      case 517: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==517);
-      case 518: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==518);
-      case 519: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==519);
-      case 520: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==520);
-      case 521: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==521);
-      case 522: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==522);
-      case 523: /* noarg_func ::= USER */ yytestcase(yyruleno==523);
-      case 524: /* star_func ::= COUNT */ yytestcase(yyruleno==524);
-      case 525: /* star_func ::= FIRST */ yytestcase(yyruleno==525);
-      case 526: /* star_func ::= LAST */ yytestcase(yyruleno==526);
-      case 527: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==527);
+      case 480: /* db_name ::= NK_ID */ yytestcase(yyruleno==480);
+      case 481: /* table_name ::= NK_ID */ yytestcase(yyruleno==481);
+      case 482: /* column_name ::= NK_ID */ yytestcase(yyruleno==482);
+      case 483: /* function_name ::= NK_ID */ yytestcase(yyruleno==483);
+      case 484: /* view_name ::= NK_ID */ yytestcase(yyruleno==484);
+      case 485: /* table_alias ::= NK_ID */ yytestcase(yyruleno==485);
+      case 486: /* column_alias ::= NK_ID */ yytestcase(yyruleno==486);
+      case 487: /* column_alias ::= NK_ALIAS */ yytestcase(yyruleno==487);
+      case 488: /* user_name ::= NK_ID */ yytestcase(yyruleno==488);
+      case 489: /* topic_name ::= NK_ID */ yytestcase(yyruleno==489);
+      case 490: /* stream_name ::= NK_ID */ yytestcase(yyruleno==490);
+      case 491: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==491);
+      case 492: /* index_name ::= NK_ID */ yytestcase(yyruleno==492);
+      case 535: /* noarg_func ::= NOW */ yytestcase(yyruleno==535);
+      case 536: /* noarg_func ::= TODAY */ yytestcase(yyruleno==536);
+      case 537: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==537);
+      case 538: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==538);
+      case 539: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==539);
+      case 540: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==540);
+      case 541: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==541);
+      case 542: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==542);
+      case 543: /* noarg_func ::= USER */ yytestcase(yyruleno==543);
+      case 544: /* star_func ::= COUNT */ yytestcase(yyruleno==544);
+      case 545: /* star_func ::= FIRST */ yytestcase(yyruleno==545);
+      case 546: /* star_func ::= LAST */ yytestcase(yyruleno==546);
+      case 547: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==547);
 { yylhsminor.yy369 = yymsp[0].minor.yy0; }
   yymsp[0].minor.yy369 = yylhsminor.yy369;
         break;
@@ -5418,16 +5486,16 @@ static YYACTIONTYPE yy_reduce(
       case 359: /* agg_func_opt ::= */ yytestcase(yyruleno==359);
       case 365: /* or_replace_opt ::= */ yytestcase(yyruleno==365);
       case 395: /* ignore_opt ::= */ yytestcase(yyruleno==395);
-      case 590: /* tag_mode_opt ::= */ yytestcase(yyruleno==590);
-      case 592: /* set_quantifier_opt ::= */ yytestcase(yyruleno==592);
+      case 610: /* tag_mode_opt ::= */ yytestcase(yyruleno==610);
+      case 612: /* set_quantifier_opt ::= */ yytestcase(yyruleno==612);
 { yymsp[1].minor.yy377 = false; }
         break;
       case 69: /* force_opt ::= FORCE */
       case 70: /* unsafe_opt ::= UNSAFE */ yytestcase(yyruleno==70);
       case 353: /* analyze_opt ::= ANALYZE */ yytestcase(yyruleno==353);
       case 360: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==360);
-      case 591: /* tag_mode_opt ::= TAGS */ yytestcase(yyruleno==591);
-      case 593: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==593);
+      case 611: /* tag_mode_opt ::= TAGS */ yytestcase(yyruleno==611);
+      case 613: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==613);
 { yymsp[0].minor.yy377 = true; }
         break;
       case 71: /* cmd ::= ALTER CLUSTER NK_STRING */
@@ -5721,13 +5789,13 @@ static YYACTIONTYPE yy_reduce(
       case 310: /* tag_list_opt ::= tag_item */ yytestcase(yyruleno==310);
       case 327: /* func_list ::= func */ yytestcase(yyruleno==327);
       case 377: /* column_stream_def_list ::= column_stream_def */ yytestcase(yyruleno==377);
-      case 433: /* tags_literal_list ::= tags_literal */ yytestcase(yyruleno==433);
-      case 458: /* literal_list ::= signed_literal */ yytestcase(yyruleno==458);
-      case 530: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==530);
-      case 536: /* when_then_list ::= when_then_expr */ yytestcase(yyruleno==536);
-      case 595: /* select_list ::= select_item */ yytestcase(yyruleno==595);
-      case 606: /* partition_list ::= partition_item */ yytestcase(yyruleno==606);
-      case 667: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==667);
+      case 453: /* tags_literal_list ::= tags_literal */ yytestcase(yyruleno==453);
+      case 478: /* literal_list ::= signed_literal */ yytestcase(yyruleno==478);
+      case 550: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==550);
+      case 556: /* when_then_list ::= when_then_expr */ yytestcase(yyruleno==556);
+      case 615: /* select_list ::= select_item */ yytestcase(yyruleno==615);
+      case 626: /* partition_list ::= partition_item */ yytestcase(yyruleno==626);
+      case 687: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==687);
 { yylhsminor.yy184 = createNodeList(pCxt, yymsp[0].minor.yy392); }
   yymsp[0].minor.yy184 = yylhsminor.yy184;
         break;
@@ -5739,12 +5807,12 @@ static YYACTIONTYPE yy_reduce(
       case 311: /* tag_list_opt ::= tag_list_opt NK_COMMA tag_item */ yytestcase(yyruleno==311);
       case 328: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==328);
       case 378: /* column_stream_def_list ::= column_stream_def_list NK_COMMA column_stream_def */ yytestcase(yyruleno==378);
-      case 434: /* tags_literal_list ::= tags_literal_list NK_COMMA tags_literal */ yytestcase(yyruleno==434);
-      case 459: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==459);
-      case 531: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==531);
-      case 596: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==596);
-      case 607: /* partition_list ::= partition_list NK_COMMA partition_item */ yytestcase(yyruleno==607);
-      case 668: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==668);
+      case 454: /* tags_literal_list ::= tags_literal_list NK_COMMA tags_literal */ yytestcase(yyruleno==454);
+      case 479: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==479);
+      case 551: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==551);
+      case 616: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==616);
+      case 627: /* partition_list ::= partition_list NK_COMMA partition_item */ yytestcase(yyruleno==627);
+      case 688: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==688);
 { yylhsminor.yy184 = addNodeToList(pCxt, yymsp[-2].minor.yy184, yymsp[0].minor.yy392); }
   yymsp[-2].minor.yy184 = yylhsminor.yy184;
         break;
@@ -5835,7 +5903,7 @@ static YYACTIONTYPE yy_reduce(
   yymsp[-5].minor.yy392 = yylhsminor.yy392;
         break;
       case 183: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
-      case 537: /* when_then_list ::= when_then_list when_then_expr */ yytestcase(yyruleno==537);
+      case 557: /* when_then_list ::= when_then_list when_then_expr */ yytestcase(yyruleno==557);
 { yylhsminor.yy184 = addNodeToList(pCxt, yymsp[-1].minor.yy184, yymsp[0].minor.yy392); }
   yymsp[-1].minor.yy184 = yylhsminor.yy184;
         break;
@@ -5987,12 +6055,12 @@ static YYACTIONTYPE yy_reduce(
 { yymsp[-1].minor.yy845.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy845.val = yymsp[0].minor.yy0; }
         break;
       case 235: /* duration_list ::= duration_literal */
-      case 490: /* expression_list ::= expr_or_subquery */ yytestcase(yyruleno==490);
+      case 510: /* expression_list ::= expr_or_subquery */ yytestcase(yyruleno==510);
 { yylhsminor.yy184 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy392)); }
   yymsp[0].minor.yy184 = yylhsminor.yy184;
         break;
       case 236: /* duration_list ::= duration_list NK_COMMA duration_literal */
-      case 491: /* expression_list ::= expression_list NK_COMMA expr_or_subquery */ yytestcase(yyruleno==491);
+      case 511: /* expression_list ::= expression_list NK_COMMA expr_or_subquery */ yytestcase(yyruleno==511);
 { yylhsminor.yy184 = addNodeToList(pCxt, yymsp[-2].minor.yy184, releaseRawExprNode(pCxt, yymsp[0].minor.yy392)); }
   yymsp[-2].minor.yy184 = yylhsminor.yy184;
         break;
@@ -6253,7 +6321,7 @@ static YYACTIONTYPE yy_reduce(
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
       case 330: /* sma_func_name ::= function_name */
-      case 580: /* alias_opt ::= table_alias */ yytestcase(yyruleno==580);
+      case 600: /* alias_opt ::= table_alias */ yytestcase(yyruleno==600);
 { yylhsminor.yy369 = yymsp[0].minor.yy369; }
   yymsp[0].minor.yy369 = yylhsminor.yy369;
         break;
@@ -6397,8 +6465,8 @@ static YYACTIONTYPE yy_reduce(
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
       case 394: /* subtable_opt ::= SUBTABLE NK_LP expression NK_RP */
-      case 620: /* sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP */ yytestcase(yyruleno==620);
-      case 644: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==644);
+      case 640: /* sliding_opt ::= SLIDING NK_LP interval_sliding_duration_literal NK_RP */ yytestcase(yyruleno==640);
+      case 664: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==664);
 { yymsp[-3].minor.yy392 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy392); }
         break;
       case 397: /* cmd ::= KILL CONNECTION NK_INTEGER */
@@ -6441,17 +6509,33 @@ static YYACTIONTYPE yy_reduce(
 { yymsp[-3].minor.yy392 = createInsertStmt(pCxt, yymsp[-1].minor.yy392, NULL, yymsp[0].minor.yy392); }
         break;
       case 415: /* tags_literal ::= NK_INTEGER */
-      case 421: /* tags_literal ::= NK_BIN */ yytestcase(yyruleno==421);
-      case 424: /* tags_literal ::= NK_HEX */ yytestcase(yyruleno==424);
+      case 427: /* tags_literal ::= NK_BIN */ yytestcase(yyruleno==427);
+      case 436: /* tags_literal ::= NK_HEX */ yytestcase(yyruleno==436);
 { yylhsminor.yy392 = createRawValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0, NULL); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 416: /* tags_literal ::= NK_PLUS NK_INTEGER */
-      case 417: /* tags_literal ::= NK_MINUS NK_INTEGER */ yytestcase(yyruleno==417);
-      case 422: /* tags_literal ::= NK_PLUS NK_BIN */ yytestcase(yyruleno==422);
-      case 423: /* tags_literal ::= NK_MINUS NK_BIN */ yytestcase(yyruleno==423);
-      case 425: /* tags_literal ::= NK_PLUS NK_HEX */ yytestcase(yyruleno==425);
-      case 426: /* tags_literal ::= NK_MINUS NK_HEX */ yytestcase(yyruleno==426);
+      case 416: /* tags_literal ::= NK_INTEGER NK_PLUS duration_literal */
+      case 417: /* tags_literal ::= NK_INTEGER NK_MINUS duration_literal */ yytestcase(yyruleno==417);
+      case 428: /* tags_literal ::= NK_BIN NK_PLUS duration_literal */ yytestcase(yyruleno==428);
+      case 429: /* tags_literal ::= NK_BIN NK_MINUS duration_literal */ yytestcase(yyruleno==429);
+      case 437: /* tags_literal ::= NK_HEX NK_PLUS duration_literal */ yytestcase(yyruleno==437);
+      case 438: /* tags_literal ::= NK_HEX NK_MINUS duration_literal */ yytestcase(yyruleno==438);
+      case 446: /* tags_literal ::= NK_STRING NK_PLUS duration_literal */ yytestcase(yyruleno==446);
+      case 447: /* tags_literal ::= NK_STRING NK_MINUS duration_literal */ yytestcase(yyruleno==447);
+{
+                                                                                    SToken l = yymsp[-2].minor.yy0;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    yylhsminor.yy392 = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, yymsp[0].minor.yy392);
+                                                                                  }
+  yymsp[-2].minor.yy392 = yylhsminor.yy392;
+        break;
+      case 418: /* tags_literal ::= NK_PLUS NK_INTEGER */
+      case 421: /* tags_literal ::= NK_MINUS NK_INTEGER */ yytestcase(yyruleno==421);
+      case 430: /* tags_literal ::= NK_PLUS NK_BIN */ yytestcase(yyruleno==430);
+      case 433: /* tags_literal ::= NK_MINUS NK_BIN */ yytestcase(yyruleno==433);
+      case 439: /* tags_literal ::= NK_PLUS NK_HEX */ yytestcase(yyruleno==439);
+      case 442: /* tags_literal ::= NK_MINUS NK_HEX */ yytestcase(yyruleno==442);
 {
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
@@ -6459,12 +6543,32 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 418: /* tags_literal ::= NK_FLOAT */
+      case 419: /* tags_literal ::= NK_PLUS NK_INTEGER NK_PLUS duration_literal */
+      case 420: /* tags_literal ::= NK_PLUS NK_INTEGER NK_MINUS duration_literal */ yytestcase(yyruleno==420);
+      case 422: /* tags_literal ::= NK_MINUS NK_INTEGER NK_PLUS duration_literal */ yytestcase(yyruleno==422);
+      case 423: /* tags_literal ::= NK_MINUS NK_INTEGER NK_MINUS duration_literal */ yytestcase(yyruleno==423);
+      case 431: /* tags_literal ::= NK_PLUS NK_BIN NK_PLUS duration_literal */ yytestcase(yyruleno==431);
+      case 432: /* tags_literal ::= NK_PLUS NK_BIN NK_MINUS duration_literal */ yytestcase(yyruleno==432);
+      case 434: /* tags_literal ::= NK_MINUS NK_BIN NK_PLUS duration_literal */ yytestcase(yyruleno==434);
+      case 435: /* tags_literal ::= NK_MINUS NK_BIN NK_MINUS duration_literal */ yytestcase(yyruleno==435);
+      case 440: /* tags_literal ::= NK_PLUS NK_HEX NK_PLUS duration_literal */ yytestcase(yyruleno==440);
+      case 441: /* tags_literal ::= NK_PLUS NK_HEX NK_MINUS duration_literal */ yytestcase(yyruleno==441);
+      case 443: /* tags_literal ::= NK_MINUS NK_HEX NK_PLUS duration_literal */ yytestcase(yyruleno==443);
+      case 444: /* tags_literal ::= NK_MINUS NK_HEX NK_MINUS duration_literal */ yytestcase(yyruleno==444);
+{
+                                                                                    SToken l = yymsp[-3].minor.yy0;
+                                                                                    SToken r = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
+                                                                                    l.n = (r.z + r.n) - l.z;  
+                                                                                    yylhsminor.yy392 = createRawValueNodeExt(pCxt, TSDB_DATA_TYPE_BINARY, &l, NULL, yymsp[0].minor.yy392);
+                                                                                  }
+  yymsp[-3].minor.yy392 = yylhsminor.yy392;
+        break;
+      case 424: /* tags_literal ::= NK_FLOAT */
 { yylhsminor.yy392 = createRawValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0, NULL); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 419: /* tags_literal ::= NK_PLUS NK_FLOAT */
-      case 420: /* tags_literal ::= NK_MINUS NK_FLOAT */ yytestcase(yyruleno==420);
+      case 425: /* tags_literal ::= NK_PLUS NK_FLOAT */
+      case 426: /* tags_literal ::= NK_MINUS NK_FLOAT */ yytestcase(yyruleno==426);
 {
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
@@ -6472,24 +6576,24 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 427: /* tags_literal ::= NK_STRING */
+      case 445: /* tags_literal ::= NK_STRING */
 { yylhsminor.yy392 = createRawValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0, NULL); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 428: /* tags_literal ::= NK_BOOL */
+      case 448: /* tags_literal ::= NK_BOOL */
 { yylhsminor.yy392 = createRawValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0, NULL); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 429: /* tags_literal ::= NULL */
+      case 449: /* tags_literal ::= NULL */
 { yylhsminor.yy392 = createRawValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0, NULL); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 430: /* tags_literal ::= literal_func */
+      case 450: /* tags_literal ::= literal_func */
 { yylhsminor.yy392 = createRawValueNode(pCxt, TSDB_DATA_TYPE_BINARY, NULL, yymsp[0].minor.yy392); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 431: /* tags_literal ::= literal_func NK_PLUS duration_literal */
-      case 432: /* tags_literal ::= literal_func NK_MINUS duration_literal */ yytestcase(yyruleno==432);
+      case 451: /* tags_literal ::= literal_func NK_PLUS duration_literal */
+      case 452: /* tags_literal ::= literal_func NK_MINUS duration_literal */ yytestcase(yyruleno==452);
 {
                                                                                     SToken l = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken r = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6498,72 +6602,72 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 435: /* literal ::= NK_INTEGER */
+      case 455: /* literal ::= NK_INTEGER */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 436: /* literal ::= NK_FLOAT */
+      case 456: /* literal ::= NK_FLOAT */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 437: /* literal ::= NK_STRING */
+      case 457: /* literal ::= NK_STRING */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 438: /* literal ::= NK_BOOL */
+      case 458: /* literal ::= NK_BOOL */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 439: /* literal ::= TIMESTAMP NK_STRING */
+      case 459: /* literal ::= TIMESTAMP NK_STRING */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 440: /* literal ::= duration_literal */
-      case 450: /* signed_literal ::= signed */ yytestcase(yyruleno==450);
-      case 473: /* expr_or_subquery ::= expression */ yytestcase(yyruleno==473);
-      case 474: /* expression ::= literal */ yytestcase(yyruleno==474);
-      case 476: /* expression ::= column_reference */ yytestcase(yyruleno==476);
-      case 477: /* expression ::= function_expression */ yytestcase(yyruleno==477);
-      case 478: /* expression ::= case_when_expression */ yytestcase(yyruleno==478);
-      case 511: /* function_expression ::= literal_func */ yytestcase(yyruleno==511);
-      case 561: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==561);
-      case 565: /* boolean_primary ::= predicate */ yytestcase(yyruleno==565);
-      case 567: /* common_expression ::= expr_or_subquery */ yytestcase(yyruleno==567);
-      case 568: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==568);
-      case 571: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==571);
-      case 573: /* table_reference ::= table_primary */ yytestcase(yyruleno==573);
-      case 574: /* table_reference ::= joined_table */ yytestcase(yyruleno==574);
-      case 578: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==578);
-      case 646: /* query_simple ::= query_specification */ yytestcase(yyruleno==646);
-      case 647: /* query_simple ::= union_query_expression */ yytestcase(yyruleno==647);
-      case 650: /* query_simple_or_subquery ::= query_simple */ yytestcase(yyruleno==650);
-      case 652: /* query_or_subquery ::= query_expression */ yytestcase(yyruleno==652);
+      case 460: /* literal ::= duration_literal */
+      case 470: /* signed_literal ::= signed */ yytestcase(yyruleno==470);
+      case 493: /* expr_or_subquery ::= expression */ yytestcase(yyruleno==493);
+      case 494: /* expression ::= literal */ yytestcase(yyruleno==494);
+      case 496: /* expression ::= column_reference */ yytestcase(yyruleno==496);
+      case 497: /* expression ::= function_expression */ yytestcase(yyruleno==497);
+      case 498: /* expression ::= case_when_expression */ yytestcase(yyruleno==498);
+      case 531: /* function_expression ::= literal_func */ yytestcase(yyruleno==531);
+      case 581: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==581);
+      case 585: /* boolean_primary ::= predicate */ yytestcase(yyruleno==585);
+      case 587: /* common_expression ::= expr_or_subquery */ yytestcase(yyruleno==587);
+      case 588: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==588);
+      case 591: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==591);
+      case 593: /* table_reference ::= table_primary */ yytestcase(yyruleno==593);
+      case 594: /* table_reference ::= joined_table */ yytestcase(yyruleno==594);
+      case 598: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==598);
+      case 666: /* query_simple ::= query_specification */ yytestcase(yyruleno==666);
+      case 667: /* query_simple ::= union_query_expression */ yytestcase(yyruleno==667);
+      case 670: /* query_simple_or_subquery ::= query_simple */ yytestcase(yyruleno==670);
+      case 672: /* query_or_subquery ::= query_expression */ yytestcase(yyruleno==672);
 { yylhsminor.yy392 = yymsp[0].minor.yy392; }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 441: /* literal ::= NULL */
+      case 461: /* literal ::= NULL */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 442: /* literal ::= NK_QUESTION */
+      case 462: /* literal ::= NK_QUESTION */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 443: /* duration_literal ::= NK_VARIABLE */
-      case 621: /* interval_sliding_duration_literal ::= NK_VARIABLE */ yytestcase(yyruleno==621);
-      case 622: /* interval_sliding_duration_literal ::= NK_STRING */ yytestcase(yyruleno==622);
-      case 623: /* interval_sliding_duration_literal ::= NK_INTEGER */ yytestcase(yyruleno==623);
+      case 463: /* duration_literal ::= NK_VARIABLE */
+      case 641: /* interval_sliding_duration_literal ::= NK_VARIABLE */ yytestcase(yyruleno==641);
+      case 642: /* interval_sliding_duration_literal ::= NK_STRING */ yytestcase(yyruleno==642);
+      case 643: /* interval_sliding_duration_literal ::= NK_INTEGER */ yytestcase(yyruleno==643);
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 444: /* signed ::= NK_INTEGER */
+      case 464: /* signed ::= NK_INTEGER */
 { yylhsminor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 445: /* signed ::= NK_PLUS NK_INTEGER */
+      case 465: /* signed ::= NK_PLUS NK_INTEGER */
 { yymsp[-1].minor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0); }
         break;
-      case 446: /* signed ::= NK_MINUS NK_INTEGER */
+      case 466: /* signed ::= NK_MINUS NK_INTEGER */
 {
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
@@ -6571,14 +6675,14 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 447: /* signed ::= NK_FLOAT */
+      case 467: /* signed ::= NK_FLOAT */
 { yylhsminor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 448: /* signed ::= NK_PLUS NK_FLOAT */
+      case 468: /* signed ::= NK_PLUS NK_FLOAT */
 { yymsp[-1].minor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
         break;
-      case 449: /* signed ::= NK_MINUS NK_FLOAT */
+      case 469: /* signed ::= NK_MINUS NK_FLOAT */
 {
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
@@ -6586,61 +6690,61 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 451: /* signed_literal ::= NK_STRING */
+      case 471: /* signed_literal ::= NK_STRING */
 { yylhsminor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 452: /* signed_literal ::= NK_BOOL */
+      case 472: /* signed_literal ::= NK_BOOL */
 { yylhsminor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 453: /* signed_literal ::= TIMESTAMP NK_STRING */
+      case 473: /* signed_literal ::= TIMESTAMP NK_STRING */
 { yymsp[-1].minor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
         break;
-      case 454: /* signed_literal ::= duration_literal */
-      case 456: /* signed_literal ::= literal_func */ yytestcase(yyruleno==456);
-      case 532: /* star_func_para ::= expr_or_subquery */ yytestcase(yyruleno==532);
-      case 598: /* select_item ::= common_expression */ yytestcase(yyruleno==598);
-      case 608: /* partition_item ::= expr_or_subquery */ yytestcase(yyruleno==608);
-      case 651: /* query_simple_or_subquery ::= subquery */ yytestcase(yyruleno==651);
-      case 653: /* query_or_subquery ::= subquery */ yytestcase(yyruleno==653);
-      case 666: /* search_condition ::= common_expression */ yytestcase(yyruleno==666);
+      case 474: /* signed_literal ::= duration_literal */
+      case 476: /* signed_literal ::= literal_func */ yytestcase(yyruleno==476);
+      case 552: /* star_func_para ::= expr_or_subquery */ yytestcase(yyruleno==552);
+      case 618: /* select_item ::= common_expression */ yytestcase(yyruleno==618);
+      case 628: /* partition_item ::= expr_or_subquery */ yytestcase(yyruleno==628);
+      case 671: /* query_simple_or_subquery ::= subquery */ yytestcase(yyruleno==671);
+      case 673: /* query_or_subquery ::= subquery */ yytestcase(yyruleno==673);
+      case 686: /* search_condition ::= common_expression */ yytestcase(yyruleno==686);
 { yylhsminor.yy392 = releaseRawExprNode(pCxt, yymsp[0].minor.yy392); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 455: /* signed_literal ::= NULL */
+      case 475: /* signed_literal ::= NULL */
 { yylhsminor.yy392 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 457: /* signed_literal ::= NK_QUESTION */
+      case 477: /* signed_literal ::= NK_QUESTION */
 { yylhsminor.yy392 = createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 475: /* expression ::= pseudo_column */
+      case 495: /* expression ::= pseudo_column */
 { yylhsminor.yy392 = yymsp[0].minor.yy392; setRawExprNodeIsPseudoColumn(pCxt, yylhsminor.yy392, true); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 479: /* expression ::= NK_LP expression NK_RP */
-      case 566: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==566);
-      case 665: /* subquery ::= NK_LP subquery NK_RP */ yytestcase(yyruleno==665);
+      case 499: /* expression ::= NK_LP expression NK_RP */
+      case 586: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==586);
+      case 685: /* subquery ::= NK_LP subquery NK_RP */ yytestcase(yyruleno==685);
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy392)); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 480: /* expression ::= NK_PLUS expr_or_subquery */
+      case 500: /* expression ::= NK_PLUS expr_or_subquery */
 {
                                                                                     SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
                                                                                     yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy392));
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 481: /* expression ::= NK_MINUS expr_or_subquery */
+      case 501: /* expression ::= NK_MINUS expr_or_subquery */
 {
                                                                                     SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
                                                                                     yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy392), NULL));
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 482: /* expression ::= expr_or_subquery NK_PLUS expr_or_subquery */
+      case 502: /* expression ::= expr_or_subquery NK_PLUS expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6648,7 +6752,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 483: /* expression ::= expr_or_subquery NK_MINUS expr_or_subquery */
+      case 503: /* expression ::= expr_or_subquery NK_MINUS expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6656,7 +6760,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 484: /* expression ::= expr_or_subquery NK_STAR expr_or_subquery */
+      case 504: /* expression ::= expr_or_subquery NK_STAR expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6664,7 +6768,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 485: /* expression ::= expr_or_subquery NK_SLASH expr_or_subquery */
+      case 505: /* expression ::= expr_or_subquery NK_SLASH expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6672,7 +6776,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 486: /* expression ::= expr_or_subquery NK_REM expr_or_subquery */
+      case 506: /* expression ::= expr_or_subquery NK_REM expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6680,14 +6784,14 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 487: /* expression ::= column_reference NK_ARROW NK_STRING */
+      case 507: /* expression ::= column_reference NK_ARROW NK_STRING */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     yylhsminor.yy392 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy392), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)));
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 488: /* expression ::= expr_or_subquery NK_BITAND expr_or_subquery */
+      case 508: /* expression ::= expr_or_subquery NK_BITAND expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6695,7 +6799,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 489: /* expression ::= expr_or_subquery NK_BITOR expr_or_subquery */
+      case 509: /* expression ::= expr_or_subquery NK_BITOR expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6703,80 +6807,80 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 492: /* column_reference ::= column_name */
+      case 512: /* column_reference ::= column_name */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy369, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy369)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 493: /* column_reference ::= table_name NK_DOT column_name */
+      case 513: /* column_reference ::= table_name NK_DOT column_name */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy369, createColumnNode(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy369)); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 494: /* column_reference ::= NK_ALIAS */
+      case 514: /* column_reference ::= NK_ALIAS */
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 495: /* column_reference ::= table_name NK_DOT NK_ALIAS */
+      case 515: /* column_reference ::= table_name NK_DOT NK_ALIAS */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy0, createColumnNode(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy0)); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 496: /* pseudo_column ::= ROWTS */
-      case 497: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==497);
-      case 499: /* pseudo_column ::= QSTART */ yytestcase(yyruleno==499);
-      case 500: /* pseudo_column ::= QEND */ yytestcase(yyruleno==500);
-      case 501: /* pseudo_column ::= QDURATION */ yytestcase(yyruleno==501);
-      case 502: /* pseudo_column ::= WSTART */ yytestcase(yyruleno==502);
-      case 503: /* pseudo_column ::= WEND */ yytestcase(yyruleno==503);
-      case 504: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==504);
-      case 505: /* pseudo_column ::= IROWTS */ yytestcase(yyruleno==505);
-      case 506: /* pseudo_column ::= ISFILLED */ yytestcase(yyruleno==506);
-      case 507: /* pseudo_column ::= QTAGS */ yytestcase(yyruleno==507);
-      case 513: /* literal_func ::= NOW */ yytestcase(yyruleno==513);
-      case 514: /* literal_func ::= TODAY */ yytestcase(yyruleno==514);
+      case 516: /* pseudo_column ::= ROWTS */
+      case 517: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==517);
+      case 519: /* pseudo_column ::= QSTART */ yytestcase(yyruleno==519);
+      case 520: /* pseudo_column ::= QEND */ yytestcase(yyruleno==520);
+      case 521: /* pseudo_column ::= QDURATION */ yytestcase(yyruleno==521);
+      case 522: /* pseudo_column ::= WSTART */ yytestcase(yyruleno==522);
+      case 523: /* pseudo_column ::= WEND */ yytestcase(yyruleno==523);
+      case 524: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==524);
+      case 525: /* pseudo_column ::= IROWTS */ yytestcase(yyruleno==525);
+      case 526: /* pseudo_column ::= ISFILLED */ yytestcase(yyruleno==526);
+      case 527: /* pseudo_column ::= QTAGS */ yytestcase(yyruleno==527);
+      case 533: /* literal_func ::= NOW */ yytestcase(yyruleno==533);
+      case 534: /* literal_func ::= TODAY */ yytestcase(yyruleno==534);
 { yylhsminor.yy392 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 498: /* pseudo_column ::= table_name NK_DOT TBNAME */
+      case 518: /* pseudo_column ::= table_name NK_DOT TBNAME */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy369)))); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 508: /* function_expression ::= function_name NK_LP expression_list NK_RP */
-      case 509: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==509);
+      case 528: /* function_expression ::= function_name NK_LP expression_list NK_RP */
+      case 529: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==529);
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy369, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy369, yymsp[-1].minor.yy184)); }
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
-      case 510: /* function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */
+      case 530: /* function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), yymsp[-1].minor.yy864)); }
   yymsp[-5].minor.yy392 = yylhsminor.yy392;
         break;
-      case 512: /* literal_func ::= noarg_func NK_LP NK_RP */
+      case 532: /* literal_func ::= noarg_func NK_LP NK_RP */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy369, NULL)); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 528: /* star_func_para_list ::= NK_STAR */
+      case 548: /* star_func_para_list ::= NK_STAR */
 { yylhsminor.yy184 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); }
   yymsp[0].minor.yy184 = yylhsminor.yy184;
         break;
-      case 533: /* star_func_para ::= table_name NK_DOT NK_STAR */
-      case 601: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==601);
+      case 553: /* star_func_para ::= table_name NK_DOT NK_STAR */
+      case 621: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==621);
 { yylhsminor.yy392 = createColumnNode(pCxt, &yymsp[-2].minor.yy369, &yymsp[0].minor.yy0); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 534: /* case_when_expression ::= CASE when_then_list case_when_else_opt END */
+      case 554: /* case_when_expression ::= CASE when_then_list case_when_else_opt END */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, createCaseWhenNode(pCxt, NULL, yymsp[-2].minor.yy184, yymsp[-1].minor.yy392)); }
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
-      case 535: /* case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */
+      case 555: /* case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0, createCaseWhenNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), yymsp[-2].minor.yy184, yymsp[-1].minor.yy392)); }
   yymsp[-4].minor.yy392 = yylhsminor.yy392;
         break;
-      case 538: /* when_then_expr ::= WHEN common_expression THEN common_expression */
+      case 558: /* when_then_expr ::= WHEN common_expression THEN common_expression */
 { yymsp[-3].minor.yy392 = createWhenThenNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy392), releaseRawExprNode(pCxt, yymsp[0].minor.yy392)); }
         break;
-      case 540: /* case_when_else_opt ::= ELSE common_expression */
+      case 560: /* case_when_else_opt ::= ELSE common_expression */
 { yymsp[-1].minor.yy392 = releaseRawExprNode(pCxt, yymsp[0].minor.yy392); }
         break;
-      case 541: /* predicate ::= expr_or_subquery compare_op expr_or_subquery */
-      case 546: /* predicate ::= expr_or_subquery in_op in_predicate_value */ yytestcase(yyruleno==546);
+      case 561: /* predicate ::= expr_or_subquery compare_op expr_or_subquery */
+      case 566: /* predicate ::= expr_or_subquery in_op in_predicate_value */ yytestcase(yyruleno==566);
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6784,7 +6888,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 542: /* predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */
+      case 562: /* predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6792,7 +6896,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-4].minor.yy392 = yylhsminor.yy392;
         break;
-      case 543: /* predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */
+      case 563: /* predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6800,71 +6904,71 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-5].minor.yy392 = yylhsminor.yy392;
         break;
-      case 544: /* predicate ::= expr_or_subquery IS NULL */
+      case 564: /* predicate ::= expr_or_subquery IS NULL */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     yylhsminor.yy392 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy392), NULL));
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 545: /* predicate ::= expr_or_subquery IS NOT NULL */
+      case 565: /* predicate ::= expr_or_subquery IS NOT NULL */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy392);
                                                                                     yylhsminor.yy392 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), NULL));
                                                                                   }
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
-      case 547: /* compare_op ::= NK_LT */
+      case 567: /* compare_op ::= NK_LT */
 { yymsp[0].minor.yy220 = OP_TYPE_LOWER_THAN; }
         break;
-      case 548: /* compare_op ::= NK_GT */
+      case 568: /* compare_op ::= NK_GT */
 { yymsp[0].minor.yy220 = OP_TYPE_GREATER_THAN; }
         break;
-      case 549: /* compare_op ::= NK_LE */
+      case 569: /* compare_op ::= NK_LE */
 { yymsp[0].minor.yy220 = OP_TYPE_LOWER_EQUAL; }
         break;
-      case 550: /* compare_op ::= NK_GE */
+      case 570: /* compare_op ::= NK_GE */
 { yymsp[0].minor.yy220 = OP_TYPE_GREATER_EQUAL; }
         break;
-      case 551: /* compare_op ::= NK_NE */
+      case 571: /* compare_op ::= NK_NE */
 { yymsp[0].minor.yy220 = OP_TYPE_NOT_EQUAL; }
         break;
-      case 552: /* compare_op ::= NK_EQ */
+      case 572: /* compare_op ::= NK_EQ */
 { yymsp[0].minor.yy220 = OP_TYPE_EQUAL; }
         break;
-      case 553: /* compare_op ::= LIKE */
+      case 573: /* compare_op ::= LIKE */
 { yymsp[0].minor.yy220 = OP_TYPE_LIKE; }
         break;
-      case 554: /* compare_op ::= NOT LIKE */
+      case 574: /* compare_op ::= NOT LIKE */
 { yymsp[-1].minor.yy220 = OP_TYPE_NOT_LIKE; }
         break;
-      case 555: /* compare_op ::= MATCH */
+      case 575: /* compare_op ::= MATCH */
 { yymsp[0].minor.yy220 = OP_TYPE_MATCH; }
         break;
-      case 556: /* compare_op ::= NMATCH */
+      case 576: /* compare_op ::= NMATCH */
 { yymsp[0].minor.yy220 = OP_TYPE_NMATCH; }
         break;
-      case 557: /* compare_op ::= CONTAINS */
+      case 577: /* compare_op ::= CONTAINS */
 { yymsp[0].minor.yy220 = OP_TYPE_JSON_CONTAINS; }
         break;
-      case 558: /* in_op ::= IN */
+      case 578: /* in_op ::= IN */
 { yymsp[0].minor.yy220 = OP_TYPE_IN; }
         break;
-      case 559: /* in_op ::= NOT IN */
+      case 579: /* in_op ::= NOT IN */
 { yymsp[-1].minor.yy220 = OP_TYPE_NOT_IN; }
         break;
-      case 560: /* in_predicate_value ::= NK_LP literal_list NK_RP */
+      case 580: /* in_predicate_value ::= NK_LP literal_list NK_RP */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy184)); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 562: /* boolean_value_expression ::= NOT boolean_primary */
+      case 582: /* boolean_value_expression ::= NOT boolean_primary */
 {
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
                                                                                     yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy392), NULL));
                                                                                   }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 563: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+      case 583: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6872,7 +6976,7 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 564: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+      case 584: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
 {
                                                                                     SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy392);
                                                                                     SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy392);
@@ -6880,43 +6984,43 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 572: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+      case 592: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
 { yylhsminor.yy392 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy392, yymsp[0].minor.yy392, NULL); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 575: /* table_primary ::= table_name alias_opt */
+      case 595: /* table_primary ::= table_name alias_opt */
 { yylhsminor.yy392 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy369, &yymsp[0].minor.yy369); }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 576: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+      case 596: /* table_primary ::= db_name NK_DOT table_name alias_opt */
 { yylhsminor.yy392 = createRealTableNode(pCxt, &yymsp[-3].minor.yy369, &yymsp[-1].minor.yy369, &yymsp[0].minor.yy369); }
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
-      case 577: /* table_primary ::= subquery alias_opt */
+      case 597: /* table_primary ::= subquery alias_opt */
 { yylhsminor.yy392 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy392), &yymsp[0].minor.yy369); }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 579: /* alias_opt ::= */
+      case 599: /* alias_opt ::= */
 { yymsp[1].minor.yy369 = nil_token;  }
         break;
-      case 581: /* alias_opt ::= AS table_alias */
+      case 601: /* alias_opt ::= AS table_alias */
 { yymsp[-1].minor.yy369 = yymsp[0].minor.yy369; }
         break;
-      case 582: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-      case 583: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==583);
+      case 602: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+      case 603: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==603);
 { yymsp[-2].minor.yy392 = yymsp[-1].minor.yy392; }
         break;
-      case 584: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+      case 604: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
 { yylhsminor.yy392 = createJoinTableNode(pCxt, yymsp[-4].minor.yy932, yymsp[-5].minor.yy392, yymsp[-2].minor.yy392, yymsp[0].minor.yy392); }
   yymsp[-5].minor.yy392 = yylhsminor.yy392;
         break;
-      case 585: /* join_type ::= */
+      case 605: /* join_type ::= */
 { yymsp[1].minor.yy932 = JOIN_TYPE_INNER; }
         break;
-      case 586: /* join_type ::= INNER */
+      case 606: /* join_type ::= INNER */
 { yymsp[0].minor.yy932 = JOIN_TYPE_INNER; }
         break;
-      case 587: /* query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+      case 607: /* query_specification ::= SELECT hint_list set_quantifier_opt tag_mode_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
 {
                                                                                     yymsp[-13].minor.yy392 = createSelectStmt(pCxt, yymsp[-11].minor.yy377, yymsp[-9].minor.yy184, yymsp[-8].minor.yy392, yymsp[-12].minor.yy184);
                                                                                     yymsp[-13].minor.yy392 = setSelectStmtTagMode(pCxt, yymsp[-13].minor.yy392, yymsp[-10].minor.yy377);
@@ -6930,98 +7034,98 @@ static YYACTIONTYPE yy_reduce(
                                                                                     yymsp[-13].minor.yy392 = addFillClause(pCxt, yymsp[-13].minor.yy392, yymsp[-3].minor.yy392);
                                                                                   }
         break;
-      case 588: /* hint_list ::= */
+      case 608: /* hint_list ::= */
 { yymsp[1].minor.yy184 = createHintNodeList(pCxt, NULL); }
         break;
-      case 589: /* hint_list ::= NK_HINT */
+      case 609: /* hint_list ::= NK_HINT */
 { yylhsminor.yy184 = createHintNodeList(pCxt, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy184 = yylhsminor.yy184;
         break;
-      case 594: /* set_quantifier_opt ::= ALL */
+      case 614: /* set_quantifier_opt ::= ALL */
 { yymsp[0].minor.yy377 = false; }
         break;
-      case 597: /* select_item ::= NK_STAR */
+      case 617: /* select_item ::= NK_STAR */
 { yylhsminor.yy392 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); }
   yymsp[0].minor.yy392 = yylhsminor.yy392;
         break;
-      case 599: /* select_item ::= common_expression column_alias */
-      case 609: /* partition_item ::= expr_or_subquery column_alias */ yytestcase(yyruleno==609);
+      case 619: /* select_item ::= common_expression column_alias */
+      case 629: /* partition_item ::= expr_or_subquery column_alias */ yytestcase(yyruleno==629);
 { yylhsminor.yy392 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy392), &yymsp[0].minor.yy369); }
   yymsp[-1].minor.yy392 = yylhsminor.yy392;
         break;
-      case 600: /* select_item ::= common_expression AS column_alias */
-      case 610: /* partition_item ::= expr_or_subquery AS column_alias */ yytestcase(yyruleno==610);
+      case 620: /* select_item ::= common_expression AS column_alias */
+      case 630: /* partition_item ::= expr_or_subquery AS column_alias */ yytestcase(yyruleno==630);
 { yylhsminor.yy392 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy392), &yymsp[0].minor.yy369); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 605: /* partition_by_clause_opt ::= PARTITION BY partition_list */
-      case 635: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==635);
-      case 655: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==655);
+      case 625: /* partition_by_clause_opt ::= PARTITION BY partition_list */
+      case 655: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==655);
+      case 675: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==675);
 { yymsp[-2].minor.yy184 = yymsp[0].minor.yy184; }
         break;
-      case 612: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP */
+      case 632: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA interval_sliding_duration_literal NK_RP */
 { yymsp[-5].minor.yy392 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), releaseRawExprNode(pCxt, yymsp[-1].minor.yy392)); }
         break;
-      case 613: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */
+      case 633: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */
 { yymsp[-3].minor.yy392 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy392)); }
         break;
-      case 614: /* twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
+      case 634: /* twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
 { yymsp[-5].minor.yy392 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), NULL, yymsp[-1].minor.yy392, yymsp[0].minor.yy392); }
         break;
-      case 615: /* twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
+      case 635: /* twindow_clause_opt ::= INTERVAL NK_LP interval_sliding_duration_literal NK_COMMA interval_sliding_duration_literal NK_RP sliding_opt fill_opt */
 { yymsp[-7].minor.yy392 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy392), releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), yymsp[-1].minor.yy392, yymsp[0].minor.yy392); }
         break;
-      case 616: /* twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition */
+      case 636: /* twindow_clause_opt ::= EVENT_WINDOW START WITH search_condition END WITH search_condition */
 { yymsp[-6].minor.yy392 = createEventWindowNode(pCxt, yymsp[-3].minor.yy392, yymsp[0].minor.yy392); }
         break;
-      case 617: /* twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP */
+      case 637: /* twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_RP */
 { yymsp[-3].minor.yy392 = createCountWindowNode(pCxt, &yymsp[-1].minor.yy0, &yymsp[-1].minor.yy0); }
         break;
-      case 618: /* twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+      case 638: /* twindow_clause_opt ::= COUNT_WINDOW NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
 { yymsp[-5].minor.yy392 = createCountWindowNode(pCxt, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0); }
         break;
-      case 625: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+      case 645: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
 { yymsp[-3].minor.yy392 = createFillNode(pCxt, yymsp[-1].minor.yy374, NULL); }
         break;
-      case 626: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP */
+      case 646: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA expression_list NK_RP */
 { yymsp[-5].minor.yy392 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy184)); }
         break;
-      case 627: /* fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP */
+      case 647: /* fill_opt ::= FILL NK_LP VALUE_F NK_COMMA expression_list NK_RP */
 { yymsp[-5].minor.yy392 = createFillNode(pCxt, FILL_MODE_VALUE_F, createNodeListNode(pCxt, yymsp[-1].minor.yy184)); }
         break;
-      case 628: /* fill_mode ::= NONE */
+      case 648: /* fill_mode ::= NONE */
 { yymsp[0].minor.yy374 = FILL_MODE_NONE; }
         break;
-      case 629: /* fill_mode ::= PREV */
+      case 649: /* fill_mode ::= PREV */
 { yymsp[0].minor.yy374 = FILL_MODE_PREV; }
         break;
-      case 630: /* fill_mode ::= NULL */
+      case 650: /* fill_mode ::= NULL */
 { yymsp[0].minor.yy374 = FILL_MODE_NULL; }
         break;
-      case 631: /* fill_mode ::= NULL_F */
+      case 651: /* fill_mode ::= NULL_F */
 { yymsp[0].minor.yy374 = FILL_MODE_NULL_F; }
         break;
-      case 632: /* fill_mode ::= LINEAR */
+      case 652: /* fill_mode ::= LINEAR */
 { yymsp[0].minor.yy374 = FILL_MODE_LINEAR; }
         break;
-      case 633: /* fill_mode ::= NEXT */
+      case 653: /* fill_mode ::= NEXT */
 { yymsp[0].minor.yy374 = FILL_MODE_NEXT; }
         break;
-      case 636: /* group_by_list ::= expr_or_subquery */
+      case 656: /* group_by_list ::= expr_or_subquery */
 { yylhsminor.yy184 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy392))); }
   yymsp[0].minor.yy184 = yylhsminor.yy184;
         break;
-      case 637: /* group_by_list ::= group_by_list NK_COMMA expr_or_subquery */
+      case 657: /* group_by_list ::= group_by_list NK_COMMA expr_or_subquery */
 { yylhsminor.yy184 = addNodeToList(pCxt, yymsp[-2].minor.yy184, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy392))); }
   yymsp[-2].minor.yy184 = yylhsminor.yy184;
         break;
-      case 641: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
+      case 661: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
 { yymsp[-5].minor.yy392 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy392), releaseRawExprNode(pCxt, yymsp[-1].minor.yy392)); }
         break;
-      case 642: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
+      case 662: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
 { yymsp[-3].minor.yy392 = createInterpTimePoint(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy392)); }
         break;
-      case 645: /* query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
+      case 665: /* query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
 {
                                                                                     yylhsminor.yy392 = addOrderByClause(pCxt, yymsp[-3].minor.yy392, yymsp[-2].minor.yy184);
                                                                                     yylhsminor.yy392 = addSlimitClause(pCxt, yylhsminor.yy392, yymsp[-1].minor.yy392);
@@ -7029,50 +7133,50 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
-      case 648: /* union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
+      case 668: /* union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
 { yylhsminor.yy392 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy392, yymsp[0].minor.yy392); }
   yymsp[-3].minor.yy392 = yylhsminor.yy392;
         break;
-      case 649: /* union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
+      case 669: /* union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
 { yylhsminor.yy392 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy392, yymsp[0].minor.yy392); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 657: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
-      case 661: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==661);
+      case 677: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+      case 681: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==681);
 { yymsp[-1].minor.yy392 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
         break;
-      case 658: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-      case 662: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==662);
+      case 678: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+      case 682: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==682);
 { yymsp[-3].minor.yy392 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 659: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-      case 663: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==663);
+      case 679: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+      case 683: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==683);
 { yymsp[-3].minor.yy392 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
         break;
-      case 664: /* subquery ::= NK_LP query_expression NK_RP */
+      case 684: /* subquery ::= NK_LP query_expression NK_RP */
 { yylhsminor.yy392 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy392); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 669: /* sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
+      case 689: /* sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
 { yylhsminor.yy392 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy392), yymsp[-1].minor.yy578, yymsp[0].minor.yy217); }
   yymsp[-2].minor.yy392 = yylhsminor.yy392;
         break;
-      case 670: /* ordering_specification_opt ::= */
+      case 690: /* ordering_specification_opt ::= */
 { yymsp[1].minor.yy578 = ORDER_ASC; }
         break;
-      case 671: /* ordering_specification_opt ::= ASC */
+      case 691: /* ordering_specification_opt ::= ASC */
 { yymsp[0].minor.yy578 = ORDER_ASC; }
         break;
-      case 672: /* ordering_specification_opt ::= DESC */
+      case 692: /* ordering_specification_opt ::= DESC */
 { yymsp[0].minor.yy578 = ORDER_DESC; }
         break;
-      case 673: /* null_ordering_opt ::= */
+      case 693: /* null_ordering_opt ::= */
 { yymsp[1].minor.yy217 = NULL_ORDER_DEFAULT; }
         break;
-      case 674: /* null_ordering_opt ::= NULLS FIRST */
+      case 694: /* null_ordering_opt ::= NULLS FIRST */
 { yymsp[-1].minor.yy217 = NULL_ORDER_FIRST; }
         break;
-      case 675: /* null_ordering_opt ::= NULLS LAST */
+      case 695: /* null_ordering_opt ::= NULLS LAST */
 { yymsp[-1].minor.yy217 = NULL_ORDER_LAST; }
         break;
       default:
diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c
index 0af664f1e1..9542009d72 100644
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@@ -580,12 +580,15 @@ int32_t streamSearchAndAddBlock(SStreamTask* pTask, SStreamDispatchReq* pReqs, S
   } else {
     char ctbName[TSDB_TABLE_FNAME_LEN] = {0};
     if (pDataBlock->info.parTbName[0]) {
-      if(pTask->ver >= SSTREAM_TASK_SUBTABLE_CHANGED_VER &&
-          pTask->subtableWithoutMd5 != 1 &&
+      if(pTask->subtableWithoutMd5 != 1 &&
           !isAutoTableName(pDataBlock->info.parTbName) &&
           !alreadyAddGroupId(pDataBlock->info.parTbName) &&
           groupId != 0){
-        buildCtbNameAddGroupId(pDataBlock->info.parTbName, groupId);
+        if(pTask->ver == SSTREAM_TASK_SUBTABLE_CHANGED_VER){
+          buildCtbNameAddGroupId(NULL, pDataBlock->info.parTbName, groupId);
+        }else if(pTask->ver > SSTREAM_TASK_SUBTABLE_CHANGED_VER) {
+          buildCtbNameAddGroupId(pTask->outputInfo.shuffleDispatcher.stbFullName, pDataBlock->info.parTbName, groupId);
+        }
       }
     } else {
       buildCtbNameByGroupIdImpl(pTask->outputInfo.shuffleDispatcher.stbFullName, groupId, pDataBlock->info.parTbName);
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index 5f6440c06d..aae3594905 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -542,7 +542,6 @@ int32_t streamMetaSaveTask(SStreamMeta* pMeta, SStreamTask* pTask) {
   void*   buf = NULL;
   int32_t len;
   int32_t code;
-  pTask->ver = SSTREAM_TASK_VER;
   tEncodeSize(tEncodeStreamTask, pTask, len, code);
   if (code < 0) {
     return -1;
@@ -552,6 +551,9 @@ int32_t streamMetaSaveTask(SStreamMeta* pMeta, SStreamTask* pTask) {
     return -1;
   }
 
+  if (pTask->ver < SSTREAM_TASK_SUBTABLE_CHANGED_VER){
+    pTask->ver = SSTREAM_TASK_VER;
+  }
   SEncoder encoder = {0};
   tEncoderInit(&encoder, buf, len);
   tEncodeStreamTask(&encoder, pTask);
@@ -648,14 +650,17 @@ SStreamTask* streamMetaAcquireOneTask(SStreamTask* pTask) {
 }
 
 void streamMetaReleaseTask(SStreamMeta* UNUSED_PARAM(pMeta), SStreamTask* pTask) {
+  int32_t taskId = pTask->id.taskId;
   int32_t ref = atomic_sub_fetch_32(&pTask->refCnt, 1);
+
+  // not safe to use the pTask->id.idStr, since pTask may be released by other threads when print logs.
   if (ref > 0) {
-    stTrace("s-task:%s release task, ref:%d", pTask->id.idStr, ref);
+    stTrace("s-task:0x%x release task, ref:%d", taskId, ref);
   } else if (ref == 0) {
-    stTrace("s-task:%s all refs are gone, free it", pTask->id.idStr);
+    stTrace("s-task:0x%x all refs are gone, free it", taskId);
     tFreeStreamTask(pTask);
   } else if (ref < 0) {
-    stError("task ref is invalid, ref:%d, %s", ref, pTask->id.idStr);
+    stError("task ref is invalid, ref:%d, 0x%x", ref, taskId);
   }
 }
 
@@ -824,13 +829,6 @@ int64_t streamMetaGetLatestCheckpointId(SStreamMeta* pMeta) {
   return chkpId;
 }
 
-static void doClear(void* pKey, void* pVal, TBC* pCur, SArray* pRecycleList) {
-  tdbFree(pKey);
-  tdbFree(pVal);
-  tdbTbcClose(pCur);
-  taosArrayDestroy(pRecycleList);
-}
-
 int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
   TBC*     pCur = NULL;
   void*    pKey = NULL;
@@ -847,10 +845,11 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
   int32_t vgId = pMeta->vgId;
   stInfo("vgId:%d load stream tasks from meta files", vgId);
 
-  if (tdbTbcOpen(pMeta->pTaskDb, &pCur, NULL) < 0) {
-    stError("vgId:%d failed to open stream meta, code:%s", vgId, tstrerror(terrno));
+  int32_t code = tdbTbcOpen(pMeta->pTaskDb, &pCur, NULL);
+  if (code != TSDB_CODE_SUCCESS) {
+    stError("vgId:%d failed to open stream meta, code:%s, not load any stream tasks", vgId, tstrerror(terrno));
     taosArrayDestroy(pRecycleList);
-    return -1;
+    return TSDB_CODE_SUCCESS;
   }
 
   tdbTbcMoveToFirst(pCur);
@@ -859,20 +858,18 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
     if (pTask == NULL) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
       stError("vgId:%d failed to load stream task from meta-files, code:%s", vgId, tstrerror(terrno));
-      doClear(pKey, pVal, pCur, pRecycleList);
-      return -1;
+      break;
     }
 
     tDecoderInit(&decoder, (uint8_t*)pVal, vLen);
     if (tDecodeStreamTask(&decoder, pTask) < 0) {
       tDecoderClear(&decoder);
-      doClear(pKey, pVal, pCur, pRecycleList);
       tFreeStreamTask(pTask);
       stError(
           "vgId:%d stream read incompatible data, rm %s/vnode/vnode*/tq/stream if taosd cannot start, and rebuild "
           "stream manually",
           vgId, tsDataDir);
-      return -1;
+      break;
     }
     tDecoderClear(&decoder);
 
@@ -892,10 +889,11 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
     STaskId id = {.streamId = pTask->id.streamId, .taskId = pTask->id.taskId};
     void*   p = taosHashGet(pMeta->pTasksMap, &id, sizeof(id));
     if (p == NULL) {
-      if (pMeta->expandFunc(pMeta->ahandle, pTask, pTask->chkInfo.checkpointVer + 1) < 0) {
-        doClear(pKey, pVal, pCur, pRecycleList);
+      code = pMeta->expandFunc(pMeta->ahandle, pTask, pTask->chkInfo.checkpointVer + 1);
+      if (code < 0) {
+        stError("failed to expand s-task:0x%"PRIx64", code:%s, continue", id.taskId, tstrerror(terrno));
         tFreeStreamTask(pTask);
-        return -1;
+        continue;
       }
 
       taosArrayPush(pMeta->pTaskList, &pTask->id);
@@ -907,9 +905,10 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
     }
 
     if (taosHashPut(pMeta->pTasksMap, &id, sizeof(id), &pTask, POINTER_BYTES) < 0) {
-      doClear(pKey, pVal, pCur, pRecycleList);
+      stError("s-task:0x%x failed to put into hashTable, code:%s, continue", pTask->id.taskId, tstrerror(terrno));
+      taosArrayPop(pMeta->pTaskList);
       tFreeStreamTask(pTask);
-      return -1;
+      continue;
     }
 
     if (pTask->info.fillHistory == 0) {
@@ -925,10 +924,9 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
 
   tdbFree(pKey);
   tdbFree(pVal);
+
   if (tdbTbcClose(pCur) < 0) {
-    stError("vgId:%d failed to close meta-file cursor", vgId);
-    taosArrayDestroy(pRecycleList);
-    return -1;
+    stError("vgId:%d failed to close meta-file cursor, code:%s, continue", vgId, tstrerror(terrno));
   }
 
   if (taosArrayGetSize(pRecycleList) > 0) {
@@ -942,8 +940,9 @@ int32_t streamMetaLoadAllTasks(SStreamMeta* pMeta) {
   ASSERT(pMeta->numOfStreamTasks <= numOfTasks && pMeta->numOfPausedTasks <= numOfTasks);
   stDebug("vgId:%d load %d tasks into meta from disk completed, streamTask:%d, paused:%d", pMeta->vgId, numOfTasks,
           pMeta->numOfStreamTasks, pMeta->numOfPausedTasks);
+
   taosArrayDestroy(pRecycleList);
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t tEncodeStreamHbMsg(SEncoder* pEncoder, const SStreamHbMsg* pReq) {
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index 4ca784a32f..c7a1a00a46 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -216,7 +216,7 @@ int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
 
   if (tStartDecode(pDecoder) < 0) return -1;
   if (tDecodeI64(pDecoder, &pTask->ver) < 0) return -1;
-  if (pTask->ver <= SSTREAM_TASK_INCOMPATIBLE_VER) return -1;
+  if (pTask->ver <= SSTREAM_TASK_INCOMPATIBLE_VER || pTask->ver > SSTREAM_TASK_VER) return -1;
 
   if (tDecodeI64(pDecoder, &pTask->id.streamId) < 0) return -1;
   if (tDecodeI32(pDecoder, &pTask->id.taskId) < 0) return -1;
@@ -287,7 +287,9 @@ int32_t tDecodeStreamTask(SDecoder* pDecoder, SStreamTask* pTask) {
     if (tDecodeCStrTo(pDecoder, pTask->outputInfo.shuffleDispatcher.stbFullName) < 0) return -1;
   }
   if (tDecodeI64(pDecoder, &pTask->info.triggerParam) < 0) return -1;
-  if (tDecodeI8(pDecoder, &pTask->subtableWithoutMd5) < 0) return -1;
+  if (pTask->ver >= SSTREAM_TASK_SUBTABLE_CHANGED_VER){
+    if (tDecodeI8(pDecoder, &pTask->subtableWithoutMd5) < 0) return -1;
+  }
   if (tDecodeCStrTo(pDecoder, pTask->reserve) < 0) return -1;
 
   tEndDecode(pDecoder);
diff --git a/source/libs/sync/src/syncPipeline.c b/source/libs/sync/src/syncPipeline.c
index d40fff447f..3543ed574c 100644
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
@@ -866,9 +866,14 @@ int32_t syncLogReplRecover(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncAppendEn
   SyncTerm  term = -1;
   SyncIndex firstVer = pNode->pLogStore->syncLogBeginIndex(pNode->pLogStore);
   SyncIndex index = TMIN(pMsg->matchIndex, pNode->pLogBuf->matchIndex);
+  errno = 0;
 
   if (pMsg->matchIndex < pNode->pLogBuf->matchIndex) {
     term = syncLogReplGetPrevLogTerm(pMgr, pNode, index + 1);
+    if (term < 0 && (errno == ENFILE || errno == EMFILE)) {
+      sError("vgId:%d, failed to get prev log term since %s. index:%" PRId64, pNode->vgId, terrstr(), index + 1);
+      return -1;
+    }
     if ((index + 1 < firstVer) || (term < 0) ||
         (term != pMsg->lastMatchTerm && (index + 1 == firstVer || index == firstVer))) {
       ASSERT(term >= 0 || terrno == TSDB_CODE_WAL_LOG_NOT_EXIST);
diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index ac45f1eef6..2d8f4ed3c2 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -585,11 +585,12 @@ void* destroyConnPool(SCliThrd* pThrd) {
 static SCliConn* getConnFromPool(SCliThrd* pThrd, char* key, bool* exceed) {
   void*      pool = pThrd->pool;
   STrans*    pTranInst = pThrd->pTransInst;
-  SConnList* plist = taosHashGet((SHashObj*)pool, key, strlen(key) + 1);
+  size_t     klen = strlen(key);
+  SConnList* plist = taosHashGet((SHashObj*)pool, key, klen);
   if (plist == NULL) {
     SConnList list = {0};
-    taosHashPut((SHashObj*)pool, key, strlen(key) + 1, (void*)&list, sizeof(list));
-    plist = taosHashGet(pool, key, strlen(key) + 1);
+    taosHashPut((SHashObj*)pool, key, klen, (void*)&list, sizeof(list));
+    plist = taosHashGet(pool, key, klen);
 
     SMsgList* nList = taosMemoryCalloc(1, sizeof(SMsgList));
     QUEUE_INIT(&nList->msgQ);
@@ -624,11 +625,12 @@ static SCliConn* getConnFromPool(SCliThrd* pThrd, char* key, bool* exceed) {
 static SCliConn* getConnFromPool2(SCliThrd* pThrd, char* key, SCliMsg** pMsg) {
   void*      pool = pThrd->pool;
   STrans*    pTransInst = pThrd->pTransInst;
-  SConnList* plist = taosHashGet((SHashObj*)pool, key, strlen(key) + 1);
+  size_t     klen = strlen(key);
+  SConnList* plist = taosHashGet((SHashObj*)pool, key, klen);
   if (plist == NULL) {
     SConnList list = {0};
-    taosHashPut((SHashObj*)pool, key, strlen(key) + 1, (void*)&list, sizeof(list));
-    plist = taosHashGet(pool, key, strlen(key) + 1);
+    taosHashPut((SHashObj*)pool, key, klen, (void*)&list, sizeof(list));
+    plist = taosHashGet(pool, key, klen);
 
     SMsgList* nList = taosMemoryCalloc(1, sizeof(SMsgList));
     QUEUE_INIT(&nList->msgQ);
@@ -714,7 +716,7 @@ static void addConnToPool(void* pool, SCliConn* conn) {
   cliDestroyConnMsgs(conn, false);
 
   if (conn->list == NULL) {
-    conn->list = taosHashGet((SHashObj*)pool, conn->dstAddr, strlen(conn->dstAddr) + 1);
+    conn->list = taosHashGet((SHashObj*)pool, conn->dstAddr, strlen(conn->dstAddr));
   }
 
   SConnList* pList = conn->list;
@@ -1279,7 +1281,7 @@ static void cliHandleFastFail(SCliConn* pConn, int status) {
 
     if (pMsg != NULL && REQUEST_NO_RESP(&pMsg->msg) &&
         (pTransInst->failFastFp != NULL && pTransInst->failFastFp(pMsg->msg.msgType))) {
-      SFailFastItem* item = taosHashGet(pThrd->failFastCache, pConn->dstAddr, strlen(pConn->dstAddr) + 1);
+      SFailFastItem* item = taosHashGet(pThrd->failFastCache, pConn->dstAddr, strlen(pConn->dstAddr));
       int64_t        cTimestamp = taosGetTimestampMs();
       if (item != NULL) {
         int32_t elapse = cTimestamp - item->timestamp;
@@ -1291,7 +1293,7 @@ static void cliHandleFastFail(SCliConn* pConn, int status) {
         }
       } else {
         SFailFastItem item = {.count = 1, .timestamp = cTimestamp};
-        taosHashPut(pThrd->failFastCache, pConn->dstAddr, strlen(pConn->dstAddr) + 1, &item, sizeof(SFailFastItem));
+        taosHashPut(pThrd->failFastCache, pConn->dstAddr, strlen(pConn->dstAddr), &item, sizeof(SFailFastItem));
       }
     }
   } else {
@@ -1471,7 +1473,8 @@ FORCE_INLINE int32_t cliBuildExceptResp(SCliMsg* pMsg, STransMsg* pResp) {
 }
 static FORCE_INLINE uint32_t cliGetIpFromFqdnCache(SHashObj* cache, char* fqdn) {
   uint32_t  addr = 0;
-  uint32_t* v = taosHashGet(cache, fqdn, strlen(fqdn) + 1);
+  size_t    len = strlen(fqdn);
+  uint32_t* v = taosHashGet(cache, fqdn, len);
   if (v == NULL) {
     addr = taosGetIpv4FromFqdn(fqdn);
     if (addr == 0xffffffff) {
@@ -1480,7 +1483,7 @@ static FORCE_INLINE uint32_t cliGetIpFromFqdnCache(SHashObj* cache, char* fqdn)
       return addr;
     }
 
-    taosHashPut(cache, fqdn, strlen(fqdn) + 1, &addr, sizeof(addr));
+    taosHashPut(cache, fqdn, len, &addr, sizeof(addr));
   } else {
     addr = *v;
   }
@@ -1490,13 +1493,14 @@ static FORCE_INLINE void cliUpdateFqdnCache(SHashObj* cache, char* fqdn) {
   // impl later
   uint32_t addr = taosGetIpv4FromFqdn(fqdn);
   if (addr != 0xffffffff) {
-    uint32_t* v = taosHashGet(cache, fqdn, strlen(fqdn) + 1);
+    size_t    len = strlen(fqdn);
+    uint32_t* v = taosHashGet(cache, fqdn, len);
     if (addr != *v) {
       char old[64] = {0}, new[64] = {0};
       tinet_ntoa(old, *v);
       tinet_ntoa(new, addr);
       tWarn("update ip of fqdn:%s, old: %s, new: %s", fqdn, old, new);
-      taosHashPut(cache, fqdn, strlen(fqdn) + 1, &addr, sizeof(addr));
+      taosHashPut(cache, fqdn, len, &addr, sizeof(addr));
     }
   }
   return;
@@ -1537,21 +1541,6 @@ void cliHandleReq(SCliMsg* pMsg, SCliThrd* pThrd) {
     return;
   }
 
-  if (rpcDebugFlag & DEBUG_TRACE) {
-    if (tmsgIsValid(pMsg->msg.msgType)) {
-      char buf[128] = {0};
-      sprintf(buf, "%s", TMSG_INFO(pMsg->msg.msgType));
-      int* count = taosHashGet(pThrd->msgCount, buf, sizeof(buf));
-      if (NULL == 0) {
-        int localCount = 1;
-        taosHashPut(pThrd->msgCount, buf, sizeof(buf), &localCount, sizeof(localCount));
-      } else {
-        int localCount = *count + 1;
-        taosHashPut(pThrd->msgCount, buf, sizeof(buf), &localCount, sizeof(localCount));
-      }
-    }
-  }
-
   char*    fqdn = EPSET_GET_INUSE_IP(&pMsg->ctx->epSet);
   uint16_t port = EPSET_GET_INUSE_PORT(&pMsg->ctx->epSet);
   char     addr[TSDB_FQDN_LEN + 64] = {0};
@@ -1704,9 +1693,8 @@ static void cliBatchDealReq(queue* wq, SCliThrd* pThrd) {
       uint32_t port = EPSET_GET_INUSE_PORT(&pCtx->epSet);
       char     key[TSDB_FQDN_LEN + 64] = {0};
       CONN_CONSTRUCT_HASH_KEY(key, ip, port);
-
-      // SCliBatch** ppBatch = taosHashGet(pThrd->batchCache, key, sizeof(key));
-      SCliBatchList** ppBatchList = taosHashGet(pThrd->batchCache, key, sizeof(key));
+      size_t          klen = strlen(key);
+      SCliBatchList** ppBatchList = taosHashGet(pThrd->batchCache, key, klen);
       if (ppBatchList == NULL || *ppBatchList == NULL) {
         SCliBatchList* pBatchList = taosMemoryCalloc(1, sizeof(SCliBatchList));
         QUEUE_INIT(&pBatchList->wq);
@@ -1730,7 +1718,7 @@ static void cliBatchDealReq(queue* wq, SCliThrd* pThrd) {
 
         QUEUE_PUSH(&pBatchList->wq, &pBatch->listq);
 
-        taosHashPut(pThrd->batchCache, key, sizeof(key), &pBatchList, sizeof(void*));
+        taosHashPut(pThrd->batchCache, key, klen, &pBatchList, sizeof(void*));
       } else {
         if (QUEUE_IS_EMPTY(&(*ppBatchList)->wq)) {
           SCliBatch* pBatch = taosMemoryCalloc(1, sizeof(SCliBatch));
@@ -1800,21 +1788,6 @@ static void cliAsyncCb(uv_async_t* handle) {
   QUEUE_MOVE(&item->qmsg, &wq);
   taosThreadMutexUnlock(&item->mtx);
 
-  if (rpcDebugFlag & DEBUG_TRACE) {
-    void* pIter = taosHashIterate(pThrd->msgCount, NULL);
-    while (pIter != NULL) {
-      int*   count = pIter;
-      size_t len = 0;
-      char*  key = taosHashGetKey(pIter, &len);
-      if (*count != 0) {
-        tDebug("key: %s count: %d", key, *count);
-      }
-
-      pIter = taosHashIterate(pThrd->msgCount, pIter);
-    }
-    tDebug("all conn count: %d", pThrd->newConnCount);
-  }
-
   int8_t supportBatch = pTransInst->supportBatch;
   if (supportBatch == 0) {
     cliNoBatchDealReq(&wq, pThrd);
@@ -1971,8 +1944,9 @@ static FORCE_INLINE void destroyCmsgWrapper(void* arg, void* param) {
   if (pMsg == NULL) {
     return;
   }
-  if (param != NULL) {
-    SCliThrd* pThrd = param;
+
+  SCliThrd* pThrd = param;
+  if (pMsg->msg.info.notFreeAhandle == 0 && pThrd != NULL) {
     if (pThrd->destroyAhandleFp) (*pThrd->destroyAhandleFp)(pMsg->msg.info.ahandle);
   }
   destroyCmsg(pMsg);
@@ -1984,12 +1958,9 @@ static FORCE_INLINE void destroyCmsgAndAhandle(void* param) {
   SCliMsg*  pMsg = arg->param1;
   SCliThrd* pThrd = arg->param2;
 
-  tDebug("destroy Ahandle A");
-  if (pThrd != NULL && pThrd->destroyAhandleFp != NULL) {
-    tDebug("destroy Ahandle B");
+  if (pMsg->msg.info.notFreeAhandle == 0 && pThrd != NULL && pThrd->destroyAhandleFp != NULL) {
     pThrd->destroyAhandleFp(pMsg->ctx->ahandle);
   }
-  tDebug("destroy Ahandle C");
 
   transDestroyConnCtx(pMsg->ctx);
   transFreeMsg(pMsg->msg.pCont);
@@ -2411,20 +2382,6 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
       tGTrace("%s conn %p extract epset from msg", CONN_GET_INST_LABEL(pConn), pConn);
     }
   }
-  if (rpcDebugFlag & DEBUG_TRACE) {
-    if (tmsgIsValid(pResp->msgType - 1)) {
-      char buf[128] = {0};
-      sprintf(buf, "%s", TMSG_INFO(pResp->msgType - 1));
-      int* count = taosHashGet(pThrd->msgCount, buf, sizeof(buf));
-      if (NULL == 0) {
-        int localCount = 0;
-        taosHashPut(pThrd->msgCount, buf, sizeof(buf), &localCount, sizeof(localCount));
-      } else {
-        int localCount = *count - 1;
-        taosHashPut(pThrd->msgCount, buf, sizeof(buf), &localCount, sizeof(localCount));
-      }
-    }
-  }
   if (pCtx->pSem || pCtx->syncMsgRef != 0) {
     tGTrace("%s conn %p(sync) handle resp", CONN_GET_INST_LABEL(pConn), pConn);
     if (pCtx->pSem) {
diff --git a/source/util/src/tworker.c b/source/util/src/tworker.c
index 138d4bc1f4..0712010458 100644
--- a/source/util/src/tworker.c
+++ b/source/util/src/tworker.c
@@ -19,7 +19,7 @@
 #include "tgeosctx.h"
 #include "tlog.h"
 
-#define QUEUE_THRESHOLD 1000 * 1000
+#define QUEUE_THRESHOLD (1000 * 1000)
 
 typedef void *(*ThreadFp)(void *param);
 
diff --git a/tests/script/tsim/parser/columnValue_bool.sim b/tests/script/tsim/parser/columnValue_bool.sim
index db89db4256..97d074a6f9 100644
--- a/tests/script/tsim/parser/columnValue_bool.sim
+++ b/tests/script/tsim/parser/columnValue_bool.sim
@@ -936,6 +936,9 @@ sql_error alter table st_bool_i1 set tag tagname="123abc"
 sql        alter table st_bool_i2 set tag tagname="123"
 sql_error alter table st_bool_i3 set tag tagname=abc
 sql_error alter table st_bool_i4 set tag tagname="abc"
+sql_error alter table st_bool_i4 set tag tagname=now
+sql_error alter table st_bool_i4 set tag tagname=now()+1d
+sql_error alter table st_bool_i4 set tag tagname=1+1d
 sql_error alter table st_bool_i5 set tag tagname=" "
 sql_error alter table st_bool_i6 set tag tagname=''
 
diff --git a/tests/script/tsim/parser/columnValue_int.sim b/tests/script/tsim/parser/columnValue_int.sim
index f03a576ae3..f022c33363 100644
--- a/tests/script/tsim/parser/columnValue_int.sim
+++ b/tests/script/tsim/parser/columnValue_int.sim
@@ -913,6 +913,8 @@ sql_error alter table st_int_e19 set tag tagname=123abc
 sql_error alter table st_int_e20 set tag tagname="123abc"
 sql_error alter table st_int_e22 set tag tagname=abc
 sql_error alter table st_int_e23 set tag tagname="abc"
+sql_error alter table st_int_e25 set tag tagname=1+1d
+sql_error alter table st_int_e25 set tag tagname="1"+1d
 sql_error alter table st_int_e24 set tag tagname=" "
 sql_error alter table st_int_e25 set tag tagname=''
 sql alter table st_int_e26_1 set tag tagname='123'
diff --git a/tests/script/tsim/parser/columnValue_timestamp.sim b/tests/script/tsim/parser/columnValue_timestamp.sim
index 1f457dbd7c..4334230a05 100644
--- a/tests/script/tsim/parser/columnValue_timestamp.sim
+++ b/tests/script/tsim/parser/columnValue_timestamp.sim
@@ -132,6 +132,77 @@ sql show tags from  st_timestamp_22
 if $data05 != -1 then
   return -1
 endi
+sql create table st_timestamp_23 using mt_timestamp tags (1+ 1d )
+sql show tags from  st_timestamp_23
+if $data05 != 86400001 then
+  return -1
+endi
+sql create table st_timestamp_24 using mt_timestamp tags (-0 + 1d)
+sql show tags from  st_timestamp_24
+if $data05 != 86400000 then
+  return -1
+endi
+sql create table st_timestamp_25 using mt_timestamp tags ("-0" -1s)
+sql show tags from  st_timestamp_25
+if $data05 != -1000 then
+  return -1
+endi
+sql create table st_timestamp_26 using mt_timestamp tags (0b01 -1a)
+sql show tags from  st_timestamp_26
+if $data05 != 0 then
+  return -1
+endi
+sql create table st_timestamp_27 using mt_timestamp tags (0b01 -1s)
+sql show tags from  st_timestamp_27
+if $data05 != -999 then
+  return -1
+endi
+sql create table st_timestamp_28 using mt_timestamp tags ("0x01" +1u)
+sql show tags from  st_timestamp_28
+if $data05 != 1 then
+  return -1
+endi
+sql create table st_timestamp_29 using mt_timestamp tags (0x01 +1b)
+sql show tags from  st_timestamp_29
+if $data05 != 1 then
+  return -1
+endi
+sql create table st_timestamp_30 using mt_timestamp tags (-0b00 -0a)
+sql show tags from  st_timestamp_30
+if $data05 != 0 then
+  return -1
+endi
+sql create table st_timestamp_31 using mt_timestamp tags ("-0x00" +1u)
+sql show tags from  st_timestamp_31
+if $data05 != 0 then
+  return -1
+endi
+sql create table st_timestamp_32 using mt_timestamp tags (-0x00 +1b)
+sql show tags from  st_timestamp_32
+if $data05 != 0 then
+  return -1
+endi
+sql create table st_timestamp_33 using mt_timestamp tags (now +1b)
+sql show tags from  st_timestamp_33
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql create table st_timestamp_34 using mt_timestamp tags ("now()" +1b)
+sql show tags from  st_timestamp_34
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql create table st_timestamp_35 using mt_timestamp tags (today() +1d)
+sql show tags from  st_timestamp_35
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql create table st_timestamp_36 using mt_timestamp tags ("today()" +1d)
+sql show tags from  st_timestamp_36
+if $data05 < 1711883186000 then
+  return -1
+endi
+
 
 ## case 01: insert values  for test column values
 sql insert into st_timestamp_0 values(now,NULL)
@@ -249,6 +320,76 @@ sql select ts, cast(c as bigint) from  st_timestamp_22
 if $data01 != -1 then
   return -1
 endi
+sql insert into st_timestamp_23 values(now,1+ 1d )
+sql select ts, cast(c as bigint) from st_timestamp_23
+if $data01 != 86400001 then 
+  return -1
+endi
+sql insert into st_timestamp_24 values(now,-0 + 1d)
+sql select ts, cast(c as bigint) from st_timestamp_24
+if $data01 != 86400000 then 
+  return -1
+endi
+sql insert into st_timestamp_25 values(now,"-0" -1s)
+sql select ts, cast(c as bigint) from st_timestamp_25
+if $data01 != -1000 then 
+  return -1
+endi
+sql insert into st_timestamp_26 values(now,0b01 -1a)
+sql select ts, cast(c as bigint) from st_timestamp_26
+if $data01 != 0 then 
+  return -1
+endi
+sql insert into st_timestamp_27 values(now,+0b01 -1s)
+sql select ts, cast(c as bigint) from st_timestamp_27
+if $data01 != -999 then 
+  return -1
+endi
+sql insert into st_timestamp_28 values(now,"+0x01" +1u)
+sql select ts, cast(c as bigint) from st_timestamp_28
+if $data01 != 1 then 
+  return -1
+endi
+sql insert into st_timestamp_29 values(now,0x01 +1b)
+sql select ts, cast(c as bigint) from st_timestamp_29
+if $data01 != 1 then 
+  return -1
+endi
+sql insert into  st_timestamp_30 values(now,-0b00 -0a)
+sql show tags from  st_timestamp_30
+if $data05 != 0 then
+  return -1
+endi
+sql insert into  st_timestamp_31 values(now,"-0x00" +1u)
+sql show tags from  st_timestamp_31
+if $data05 != 0 then
+  return -1
+endi
+sql insert into st_timestamp_32 values (now,-0x00 +1b)
+sql show tags from  st_timestamp_32
+if $data05 != 0 then
+  return -1
+endi
+sql insert into st_timestamp_33 values(now,now +1b)
+sql select ts, cast(c as bigint) from st_timestamp_33
+if $data01 < 1711883186000 then 
+  return -1
+endi
+sql insert into st_timestamp_34 values(now,"now()" +1b)
+sql select ts, cast(c as bigint) from st_timestamp_34
+if $data01 < 1711883186000 then 
+  return -1
+endi
+sql insert into st_timestamp_35 values(now,today() +1d)
+sql select ts, cast(c as bigint) from st_timestamp_35
+if $data01 < 1711883186000 then 
+  return -1
+endi
+sql insert into st_timestamp_36 values(now,"today()" +1d)
+sql select ts, cast(c as bigint) from st_timestamp_36
+if $data01 < 1711883186000 then 
+  return -1
+endi
 
 ## case 02: dynamic create table for test tag values
 sql insert into st_timestamp_100 using mt_timestamp tags(NULL) values(now, NULL)
@@ -450,6 +591,136 @@ sql select ts, cast(c as bigint) from st_timestamp_1022
 if $data01 != -1 then
   return -1
 endi
+sql insert into st_timestamp_1023 using mt_timestamp tags(+1+1d) values(now,+1+ 1d )
+sql show tags from  st_timestamp_1023
+if $data05 != 86400001 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1023
+if $data01 != 86400001 then 
+  return -1
+endi
+sql insert into st_timestamp_1024 using mt_timestamp tags(-0+1d) values(now,-0 + 1d)
+sql show tags from  st_timestamp_1024
+if $data05 != 86400000 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1024
+if $data01 != 86400000 then 
+  return -1
+endi
+sql insert into st_timestamp_1025 using mt_timestamp tags("-0" -1s) values(now,"-0" -1s)
+sql show tags from  st_timestamp_1025
+if $data05 != -1000 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1025
+if $data01 != -1000 then 
+  return -1
+endi
+sql insert into st_timestamp_1026 using mt_timestamp tags(+0b01-1a) values(now,+0b01 -1a)
+sql show tags from  st_timestamp_1026
+if $data05 != 0 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1026
+if $data01 != 0 then 
+  return -1
+endi
+sql insert into st_timestamp_1027 using mt_timestamp tags(0b01-1s) values(now,0b01 -1s)
+sql show tags from  st_timestamp_1027
+if $data05 != -999 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1027
+if $data01 != -999 then 
+  return -1
+endi
+sql insert into st_timestamp_1028 using mt_timestamp tags("0x01" + 1u) values(now,"0x01" +1u)
+sql show tags from  st_timestamp_1028
+if $data05 != 1 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1028
+if $data01 != 1 then 
+  return -1
+endi
+sql insert into st_timestamp_1029 using mt_timestamp tags(+0x01 +1b) values(now,+0x01 +1b)
+sql show tags from  st_timestamp_1029
+if $data05 != 1 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1029
+if $data01 != 1 then 
+  return -1
+endi
+sql insert into st_timestamp_1030 using mt_timestamp tags (-0b00 -0a) values(now,-0b00 -0a)
+sql show tags from  st_timestamp_1030
+if $data05 != 0 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1030
+if $data01 != 0 then 
+  return -1
+endi
+sql insert into st_timestamp_1031 using mt_timestamp tags ("-0x00" +1u) values(now,"-0x00" +1u)
+sql show tags from  st_timestamp_1031
+if $data05 != 0 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1031
+if $data01 != 0 then 
+  return -1
+endi
+sql insert into st_timestamp_1032 using mt_timestamp tags (-0x00 +1b) values(now,-0x00 +1b)
+sql show tags from  st_timestamp_1032
+if $data05 != 0 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1032
+if $data01 != 0 then 
+  return -1
+endi
+sql insert into st_timestamp_1033 using mt_timestamp tags(now+1b) values(now,now +1b)
+sql show tags from  st_timestamp_1033
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1033
+if $data01 < 1711883186000 then 
+  return -1
+endi
+sql insert into st_timestamp_1034 using mt_timestamp tags("now" +1b) values(now,"now()" +1b)
+sql show tags from  st_timestamp_1034
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1034
+if $data01 < 1711883186000 then 
+  return -1
+endi
+sql insert into st_timestamp_1035 using mt_timestamp tags(today() + 1d) values(now,today() +1d)
+sql show tags from  st_timestamp_1035
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1035
+if $data01 < 1711883186000 then 
+  return -1
+endi
+sql insert into st_timestamp_1036 using mt_timestamp tags("today" +1d) values(now,"today()" +1d)
+sql show tags from  st_timestamp_1036
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql select ts, cast(c as bigint) from st_timestamp_1036
+if $data01 < 1711883186000 then 
+  return -1
+endi
+
+
+
+
 
 ### case 03: alter tag values
 sql alter table st_timestamp_0 set tag tagname=NULL
@@ -567,12 +838,85 @@ sql show tags from  st_timestamp_22
 if $data05 != -1 then
   return -1
 endi
+sql alter table st_timestamp_23 set tag tagname=1+ 1d 
+sql show tags from  st_timestamp_23
+if $data05 != 86400001 then
+  return -1
+endi
+sql alter table st_timestamp_24 set tag tagname=-0 + 1d
+sql show tags from  st_timestamp_24
+if $data05 != 86400000 then
+  return -1
+endi
+sql alter table st_timestamp_25 set tag tagname="-0" -1s
+sql show tags from  st_timestamp_25
+if $data05 != -1000 then
+  return -1
+endi
+sql alter table st_timestamp_26 set tag tagname=+0b01 -1a
+sql show tags from  st_timestamp_26
+if $data05 != 0 then
+  return -1
+endi
+sql alter table st_timestamp_27 set tag tagname=0b01 -1s
+sql show tags from  st_timestamp_27
+if $data05 != -999 then
+  return -1
+endi
+sql alter table st_timestamp_28 set tag tagname="0x01" +1u
+sql show tags from  st_timestamp_28
+if $data05 != 1 then
+  return -1
+endi
+sql alter table st_timestamp_29 set tag tagname=0x01 +1b
+sql show tags from  st_timestamp_29
+if $data05 != 1 then
+  return -1
+endi
+sql alter table st_timestamp_30 set tag tagname==-0b00 -0a
+sql show tags from  st_timestamp_30
+if $data05 != 0 then
+  return -1
+endi
+sql alter table st_timestamp_31 set tag tagname="-0x00" +1u
+sql show tags from  st_timestamp_31
+if $data05 != 0 then
+  return -1
+endi
+sql alter table st_timestamp_32 set tag tagname=-0x00 +1b
+sql show tags from  st_timestamp_32
+if $data05 != 0 then
+  return -1
+endi
+sql alter table st_timestamp_33 set tag tagname=now +1b
+sql show tags from  st_timestamp_33
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql alter table st_timestamp_34 set tag tagname="now()" +1b
+sql show tags from  st_timestamp_34
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql alter table st_timestamp_35 set tag tagname=today( ) +1d
+sql show tags from  st_timestamp_35
+if $data05 < 1711883186000 then
+  return -1
+endi
+sql alter table st_timestamp_36 set tag tagname="today()" +1d
+sql show tags from  st_timestamp_36
+if $data05 < 1711883186000 then
+  return -1
+endi
 
 ## case 04: illegal input
 sql_error create table st_timestamp_e0 using mt_timestamp tags (123abc)
 sql_error create table st_timestamp_e0 using mt_timestamp tags ("123abc")
 sql_error create table st_timestamp_e0 using mt_timestamp tags (abc)
 sql_error create table st_timestamp_e0 using mt_timestamp tags ("abc")
+sql_error create table st_timestamp_e0 using mt_timestamp tags (now()+1d+1s)
+sql_error create table st_timestamp_e0 using mt_timestamp tags (1+1y)
+sql_error create table st_timestamp_e0 using mt_timestamp tags (0x01+1b+1a)
 sql_error create table st_timestamp_e0 using mt_timestamp tags (" ")
 sql_error create table st_timestamp_e0 using mt_timestamp tags ('')
 sql_error create table st_timestamp_104 using mt_timestamp tags ("-123.1")
@@ -590,5 +934,7 @@ sql_error create table st_timestamp_115 using mt_timestamp tags (922337203685477
 sql create table st_timestamp_116 using mt_timestamp tags (-9223372036854775808)
 sql_error create table st_timestamp_117 using mt_timestamp tags (-9223372036854775809)
 sql_error insert into st_timestamp_118 using mt_timestamp tags(9223372036854775807) values(9223372036854775807, 9223372036854775807)
+sql_error insert into st_timestamp_119 using mt_timestamp tags(1+1s-1s) values(now, now)
+sql_error insert into st_timestamp_120 using mt_timestamp tags(1-1s) values(now, now-1s+1d)
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
diff --git a/tests/script/tsim/parser/columnValue_varbinary.sim b/tests/script/tsim/parser/columnValue_varbinary.sim
index 1db1054646..eb437f7597 100644
--- a/tests/script/tsim/parser/columnValue_varbinary.sim
+++ b/tests/script/tsim/parser/columnValue_varbinary.sim
@@ -299,6 +299,8 @@ sql_error create table st_varbinary_1012  using mt_varbinary tags(tRue)
 sql_error create table st_varbinary_1013  using mt_varbinary tags(FalsE)
 sql_error create table st_varbinary_1014  using mt_varbinary tags(noW)
 sql_error create table st_varbinary_1015  using mt_varbinary tags(toDay)
+sql_error create table st_varbinary_1016  using mt_varbinary tags(now()+1s)
+sql_error create table st_varbinary_1017  using mt_varbinary tags(1+1s)
 sql_error insert into st_varbinary_106  using mt_varbinary tags(+0123) values(now, NULL);
 sql_error insert into st_varbinary_107  using mt_varbinary tags(-01.23) values(now, NULL);
 sql_error insert into st_varbinary_108  using mt_varbinary tags(+0x01) values(now, NULL);
@@ -309,6 +311,8 @@ sql_error insert into st_varbinary_1012  using mt_varbinary tags(tRue) values(no
 sql_error insert into st_varbinary_1013  using mt_varbinary tags(FalsE) values(now, NULL);
 sql_error insert into st_varbinary_1014  using mt_varbinary tags(noW) values(now, NULL);
 sql_error insert into st_varbinary_1015  using mt_varbinary tags(toDay) values(now, NULL);
+sql_error insert into st_varbinary_1016  using mt_varbinary tags(now()+1s) values(now, NULL);
+sql_error insert into st_varbinary_1017  using mt_varbinary tags(1+1s) values(now, NULL);
 sql_error insert into st_varbinary_106  using mt_varbinary tags(NULL) values(now(), +0123)
 sql_error insert into st_varbinary_107  using mt_varbinary tags(NULL) values(now(), -01.23)
 sql_error insert into st_varbinary_108  using mt_varbinary tags(NULL) values(now(), +0x01)
@@ -319,5 +323,7 @@ sql_error insert into st_varbinary_1012  using mt_varbinary tags(NULL) values(no
 sql_error insert into st_varbinary_1013  using mt_varbinary tags(NULL) values(now(), FalsE)
 sql_error insert into st_varbinary_1014  using mt_varbinary tags(NULL) values(now(), noW)
 sql_error insert into st_varbinary_1015  using mt_varbinary tags(NULL) values(now(), toDay)
+sql_error insert into st_varbinary_1016  using mt_varbinary tags(NULL) values(now(), now()+1s)
+sql_error insert into st_varbinary_1017  using mt_varbinary tags(NULL) values(now(), 1+1s)
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
diff --git a/tests/script/tsim/parser/columnValue_varchar.sim b/tests/script/tsim/parser/columnValue_varchar.sim
index 5edfe5ed24..b705f3069a 100644
--- a/tests/script/tsim/parser/columnValue_varchar.sim
+++ b/tests/script/tsim/parser/columnValue_varchar.sim
@@ -410,6 +410,17 @@ endi
 
 
 # case 04: illegal input
+sql_error create table st_varchar_100  using mt_varchar tags(now+1d)
+sql_error create table st_varchar_101  using mt_varchar tags(toDay+1d)
+sql_error create table st_varchar_102  using mt_varchar tags(1+1b)
+sql_error create table st_varchar_103  using mt_varchar tags(0x01+1d)
+sql_error create table st_varchar_104  using mt_varchar tags(0b01+1s)
+sql_error insert into st_varchar_1100  using mt_varchar tags('now') values(now(),now+1d)
+sql_error insert into st_varchar_1101  using mt_varchar tags('now') values(now(),toDay+1d)
+sql_error insert into st_varchar_1102  using mt_varchar tags('now') values(now(),1+1b)
+sql_error insert into st_varchar_1103  using mt_varchar tags('now') values(now(),0x01+1d)
+sql_error insert into st_varchar_1104  using mt_varchar tags('now') values(now(),0b01+1s)
+sql_error alter table st_varchar_15  set tag tagname=now()+1d
 
 
 system sh/exec.sh -n dnode1 -s stop  -x SIGINT
diff --git a/tests/system-test/8-stream/stream_basic.py b/tests/system-test/8-stream/stream_basic.py
index 3ebc255114..5167423ea3 100644
--- a/tests/system-test/8-stream/stream_basic.py
+++ b/tests/system-test/8-stream/stream_basic.py
@@ -78,14 +78,36 @@ class TDTestCase:
         tdLog.info(cmd)
         os.system(cmd)
 
+    def case1(self):
+
+        tdSql.execute(f'create database if not exists d1 vgroups 1')
+        tdSql.execute(f'use d1')
+        tdSql.execute(f'create table st(ts timestamp, i int) tags(t int)')
+        tdSql.execute(f'insert into t1 using st tags(1) values(now, 1) (now+1s, 2)')
+        tdSql.execute(f'insert into t2 using st tags(2) values(now, 1) (now+1s, 2)')
+        tdSql.execute(f'insert into t3 using st tags(3) values(now, 1) (now+1s, 2)')
+
+        tdSql.execute("create stream stream1 fill_history 1 into sta subtable(concat('new-', tname)) AS SELECT "
+                      "_wstart, count(*), avg(i) FROM st PARTITION BY tbname tname INTERVAL(1m)", show=True)
+
+        tdSql.execute("create stream stream2 fill_history 1 into stb subtable(concat('new-', tname)) AS SELECT "
+                      "_wstart, count(*), avg(i) FROM st PARTITION BY tbname tname INTERVAL(1m)", show=True)
+
+        time.sleep(2)
+        tdSql.query("select * from sta")
+        tdSql.checkRows(3)
+
+        tdSql.query("select * from stb")
+        tdSql.checkRows(3)
     # run
     def run(self):
+        self.case1()
         # gen data
         random.seed(int(time.time()))
         self.taosBenchmark(" -d db -t 2 -v 2 -n 1000000 -y")
         # create stream
         tdSql.execute("use db")
-        tdSql.execute("create stream stream1 fill_history 1 into sta as select count(*) as cnt from meters interval(10a);",show=True)
+        tdSql.execute("create stream stream3 fill_history 1 into sta as select count(*) as cnt from meters interval(10a);",show=True)
         sql = "select count(*) from sta"
         # loop wait max 60s to check count is ok
         tdLog.info("loop wait result ...")
diff --git a/tests/system-test/buildJson.py b/tests/system-test/buildJson.py
new file mode 100644
index 0000000000..6e9e9f83e1
--- /dev/null
+++ b/tests/system-test/buildJson.py
@@ -0,0 +1,243 @@
+# 写一段python代码，生成一个JSON串，json 串为数组，数组长度为10000，每个元素为包含4000个key-value对的JSON字符串，json 数组里每个元素里的4000个key不相同，元素之间使用相同的key，key值为英文单词，value 为int值，且value 的范围是[0, 256]。把json串紧凑形式写入文件，把json串存入parquet文件中，把json串写入avro文件中,把json串写入到postgre sql表中，表有两列第一列主int类型主键，第二列为json类型，数组的每个元素写入json类型里
+import csv
+import json
+import os
+import random
+import string
+import time
+
+from faker import Faker
+import pandas as pd
+import pyarrow as pa
+import pyarrow.parquet as pq
+import fastavro
+import psycopg2
+from psycopg2.extras import Json
+
+
+def get_dir_size(start_path='.'):
+    total = 0
+    for dirpath, dirs, files in os.walk(start_path):
+        for f in files:
+            fp = os.path.join(dirpath, f)
+            # 获取文件大小并累加到total上
+            total += os.path.getsize(fp)
+    return total
+
+
+def to_avro_record(obj):
+    return {key: value for key, value in obj.items()}
+
+
+def generate_random_string(length):
+    return ''.join(random.choices(string.ascii_letters + string.digits, k=length))
+
+
+def generate_random_values(t):
+    if t == 0:
+        return random.randint(-255, 256)
+    elif t == 1:
+        return random.randint(-2100000000, 2100000000)
+    elif t == 2:
+        return random.uniform(-10000.0, 10000.0)
+    elif t == 3:
+        return generate_random_string(10)
+    elif t == 4:
+        return random.choice([True, False])
+
+
+def generate_json_object(key_set, value_set):
+    values = [generate_random_values(t) for t in value_set]
+    return dict(zip(key_set, values))
+
+
+def generate_json_array(keys, values, array_length):
+    return [generate_json_object(keys, values) for _ in range(array_length)]
+
+
+def write_parquet_file(parquet_file, json_array):
+    df = pd.DataFrame(json_array)
+    table = pa.Table.from_pandas(df)
+    pq.write_table(table, parquet_file + ".parquet")
+
+
+def write_json_file(json_file, json_array):
+    with open(json_file + ".json", 'w') as f:
+        json.dump(json_array, f, separators=(',', ':'))
+
+
+def generate_avro_schema(k, t):
+    if t == 0:
+        return {"name": k, "type": "int", "logicalType": "int"}
+    elif t == 1:
+        return {"name": k, "type": "int", "logicalType": "int"}
+    elif t == 2:
+        return {"name": k, "type": "float"}
+    elif t == 3:
+        return {"name": k, "type": "string"}
+    elif t == 4:
+        return {"name": k, "type": "boolean"}
+
+
+def write_avro_file(avro_file, json_array, keys, values):
+    k = list(json_array[0].keys())
+
+    if keys != k:
+        raise ValueError("keys and values should have the same length")
+
+    avro_schema = {
+        "type": "record",
+        "name": "MyRecord",
+        "fields": [generate_avro_schema(k, v) for k, v in dict(zip(keys, values)).items()]
+    }
+
+    avro_records = [to_avro_record(obj) for obj in json_array]
+    with open(avro_file + ".avro", 'wb') as f:
+        fastavro.writer(f, avro_schema, avro_records)
+
+
+def write_pg_file(json_array):
+    conn_str = "dbname=mydatabase user=myuser host=localhost"
+    conn = psycopg2.connect(conn_str)
+    cur = conn.cursor()
+
+    cur.execute("drop table if exists my_table")
+    conn.commit()
+
+    # 创建表（如果不存在）
+    cur.execute("""
+    CREATE TABLE IF NOT EXISTS my_table (
+        id SERIAL PRIMARY KEY,
+        json_data JSONB
+    );
+    """)
+    conn.commit()
+
+    # 执行SQL查询
+    cur.execute("SELECT count(*) FROM my_table")
+    # 获取查询结果
+    rows = cur.fetchall()
+    # 打印查询结果
+    for row in rows:
+        print("rows before:", row[0])
+
+    # 插入数据
+    for idx, json_obj in enumerate(json_array):
+        # print(json.dumps(json_obj))
+        cur.execute("INSERT INTO my_table (json_data) VALUES (%s)", (json.dumps(json_obj),))
+
+    conn.commit()  # 提交事务
+
+    # 执行SQL查询
+    cur.execute("SELECT count(*) FROM my_table")
+    # 获取查询结果
+    rows = cur.fetchall()
+    # 打印查询结果
+    for row in rows:
+        print("rows after:", row[0])
+
+    # # 执行SQL查询
+    # cur.execute("SELECT pg_relation_size('my_table')")
+    # # 获取查询结果
+    # rows = cur.fetchall()
+    # # 打印查询结果
+    # size = 0
+    # for row in rows:
+    #     size = row[0]
+    #     print("table size:", row[0])
+
+    # 关闭游标和连接
+    cur.close()
+    conn.close()
+
+def read_parquet_file(parquet_file):
+    table = pq.read_table(parquet_file + ".parquet")
+    df = table.to_pandas()
+    print(df)
+
+
+def read_avro_file(avg_file):
+    with open(avg_file + ".avro", 'rb') as f:
+        reader = fastavro.reader(f)
+
+        for record in reader:
+            print(record)
+
+
+def read_json_file(csv_file):
+    with open(csv_file + ".json", 'r') as f:
+        data = json.load(f)
+        print(data)
+
+
+def main():
+    key_length = 7
+    key_sizes = 4000
+    row_sizes = 10000
+    file_name = "output"
+
+    # cases = [(0, 0), (1, 1), (2, 2), (3, 3), (4, 4), (0, 4)]
+    cases = [(2, 2), (3, 3), (0, 4)]
+
+    for data in cases:
+        begin, end = data
+        print(f"执行类型：{begin}-{end}")
+
+        N = 2
+        for _ in range(N):
+
+            t0 = time.time()
+
+            keys = [generate_random_string(key_length) for _ in range(key_sizes)]
+            values = [random.randint(begin, end) for _ in range(key_sizes)]
+            # 生成JSON数组
+            json_array = generate_json_array(keys, values, row_sizes)
+
+            t1 = time.time()
+
+            write_json_file(file_name, json_array)
+
+            t2 = time.time()
+
+            write_parquet_file(file_name, json_array)
+
+            t3 = time.time()
+
+            write_avro_file(file_name, json_array, keys, values)
+
+            t4 = time.time()
+
+            size = write_pg_file(json_array)
+
+            t5 = time.time()
+
+            print("生成json 速度：", t2 - t0, "文件大小：", os.path.getsize(file_name + ".json"))
+            print("parquet 速度：", t3 - t2, "文件大小：", os.path.getsize(file_name + ".parquet"))
+            print("avro    速度：", t4 - t3, "文件大小：", os.path.getsize(file_name + ".avro"))
+            print("pg json 速度：", t5 - t4, "文件大小：", get_dir_size("/opt/homebrew/var/postgresql@14/base/16385") - 8 * 1024 * 1024)
+
+            # read_json_file(file_name)
+            # read_parquet_file(file_name)
+            # read_avro_file(file_name)
+        print(f"\n---------------\n")
+
+if __name__ == "__main__":
+    main()
+
+# 压缩文件
+# import os
+#
+# import lz4.frame
+#
+#
+# files =["output.json", "output.parquet", "output.avro"]
+# def compress_file(input_path, output_path):
+#     with open(input_path, 'rb') as f_in:
+#         compressed_data = lz4.frame.compress(f_in.read())
+#
+#     with open(output_path, 'wb') as f_out:
+#         f_out.write(compressed_data)
+#
+# for file in files:
+#     compress_file(file, file + ".lz4")
+#     print(file, "origin size:", os.path.getsize(file), " after lsz size:", os.path.getsize(file + ".lz4"))