diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 4a47acfa50..4bbe42bc50 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -133,7 +133,8 @@ static FORCE_INLINE int32_t colDataAppendInt32(SColumnInfoData* pColumnInfoData,
 }
 
 static FORCE_INLINE int32_t colDataAppendInt64(SColumnInfoData* pColumnInfoData, uint32_t currentRow, int64_t* v) {
-  ASSERT(pColumnInfoData->info.type == TSDB_DATA_TYPE_BIGINT || pColumnInfoData->info.type == TSDB_DATA_TYPE_UBIGINT);
+  int32_t type = pColumnInfoData->info.type;
+  ASSERT(type == TSDB_DATA_TYPE_BIGINT || type == TSDB_DATA_TYPE_UBIGINT || type == TSDB_DATA_TYPE_TIMESTAMP);
   char* p = pColumnInfoData->pData + pColumnInfoData->info.bytes * currentRow;
   *(int64_t*)p = *(int64_t*)v;
 }
@@ -175,17 +176,16 @@ size_t blockDataGetRowSize(SSDataBlock* pBlock);
 double blockDataGetSerialRowSize(const SSDataBlock* pBlock);
 size_t blockDataGetSerialMetaSize(const SSDataBlock* pBlock);
 
-SSchema* blockDataExtractSchema(const SSDataBlock* pBlock, int32_t* numOfCols);
-
 int32_t blockDataSort(SSDataBlock* pDataBlock, SArray* pOrderInfo);
 int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullFirst);
 
-int32_t      blockDataEnsureColumnCapacity(SColumnInfoData* pColumn, uint32_t numOfRows);
-int32_t      blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
-void         blockDataCleanup(SSDataBlock* pDataBlock);
+int32_t blockDataEnsureColumnCapacity(SColumnInfoData* pColumn, uint32_t numOfRows);
+int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
+void    blockDataCleanup(SSDataBlock* pDataBlock);
+size_t  blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
+void*   blockDataDestroy(SSDataBlock* pBlock);
+
 SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock);
-size_t       blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
-void*        blockDataDestroy(SSDataBlock* pBlock);
 
 void blockDebugShowData(const SArray* dataBlocks);
 
diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index de21638179..cd16bbf862 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -469,8 +469,7 @@ typedef struct {
   int32_t tz;  // query client timezone
   char    intervalUnit;
   char    slidingUnit;
-  char
-      offsetUnit;  // TODO Remove it, the offset is the number of precision tickle, and it must be a immutable duration.
+  char    offsetUnit;  // TODO Remove it, the offset is the number of precision tickle, and it must be a immutable duration.
   int8_t  precision;
   int64_t interval;
   int64_t sliding;
@@ -2017,7 +2016,6 @@ typedef struct {
   int8_t   slidingUnit;   // MACRO: TIME_UNIT_XXX
   int8_t   timezoneInt;   // sma data expired if timezone changes.
   char     indexName[TSDB_INDEX_NAME_LEN];
-  char     timezone[TD_TIMEZONE_LEN];
   int32_t  exprLen;
   int32_t  tagsFilterLen;
   int64_t  indexUid;
@@ -2055,32 +2053,6 @@ void*   tDeserializeSVCreateTSmaReq(void* buf, SVCreateTSmaReq* pReq);
 int32_t tSerializeSVDropTSmaReq(void** buf, SVDropTSmaReq* pReq);
 void*   tDeserializeSVDropTSmaReq(void* buf, SVDropTSmaReq* pReq);
 
-typedef struct {
-  col_id_t colId;
-  uint16_t blockSize;  // sma data block size
-  char     data[];
-} STSmaColData;
-
-typedef struct {
-  tb_uid_t tableUid;  // super/child/normal table uid
-  int32_t  dataLen;   // not including head
-  char     data[];
-} STSmaTbData;
-
-typedef struct {
-  int64_t indexUid;
-  TSKEY   skey;  // startKey of one interval/sliding window
-  int64_t interval;
-  int32_t dataLen;  // not including head
-  int8_t  intervalUnit;
-  char    data[];
-} STSmaDataWrapper;  // sma data for a interval/sliding window
-
-// interval/sliding => window
-
-// => window->table->colId
-// => 当一个window下所有的表均计算完成时，流计算告知tsdb清除window的过期标记
-
 // RSma: Rollup SMA
 typedef struct {
   int64_t  interval;
diff --git a/include/common/trow.h b/include/common/trow.h
index df28bc9962..abbe55c3a3 100644
--- a/include/common/trow.h
+++ b/include/common/trow.h
@@ -937,9 +937,8 @@ static FORCE_INLINE bool tdSTSRowIterNext(STSRowIter *pIter, col_id_t colId, col
     STColumn *pCol = NULL;
     STSchema *pSchema = pIter->pSchema;
     while (pIter->colIdx <= pSchema->numOfCols) {
-      pCol = &pSchema->columns[pIter->colIdx];
+      pCol = &pSchema->columns[pIter->colIdx];  // 1st column of schema is primary TS key
       if (colId == pCol->colId) {
-        ++pIter->colIdx;
         break;
       } else if (colId < pCol->colId) {
         ++pIter->colIdx;
@@ -948,7 +947,8 @@ static FORCE_INLINE bool tdSTSRowIterNext(STSRowIter *pIter, col_id_t colId, col
         return false;
       }
     }
-    return tdGetTpRowDataOfCol(pIter, pCol->type, pCol->offset - sizeof(TSKEY), pVal);
+    tdGetTpRowDataOfCol(pIter, pCol->type, pCol->offset - sizeof(TSKEY), pVal);
+    ++pIter->colIdx;
   } else if (TD_IS_KV_ROW(pIter->pRow)) {
     return tdGetKvRowValOfColEx(pIter, colId, colType, &pIter->kvIdx, pVal);
   } else {
diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
index 83de5b6918..73c15d508c 100644
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@@ -138,55 +138,59 @@
 #define TK_INTERVAL                       120
 #define TK_TOPIC                          121
 #define TK_AS                             122
-#define TK_NK_BOOL                        123
-#define TK_NULL                           124
-#define TK_NK_VARIABLE                    125
-#define TK_NK_UNDERLINE                   126
-#define TK_ROWTS                          127
-#define TK_TBNAME                         128
-#define TK_QSTARTTS                       129
-#define TK_QENDTS                         130
-#define TK_WSTARTTS                       131
-#define TK_WENDTS                         132
-#define TK_WDURATION                      133
-#define TK_BETWEEN                        134
-#define TK_IS                             135
-#define TK_NK_LT                          136
-#define TK_NK_GT                          137
-#define TK_NK_LE                          138
-#define TK_NK_GE                          139
-#define TK_NK_NE                          140
-#define TK_MATCH                          141
-#define TK_NMATCH                         142
-#define TK_IN                             143
-#define TK_JOIN                           144
-#define TK_INNER                          145
-#define TK_SELECT                         146
-#define TK_DISTINCT                       147
-#define TK_WHERE                          148
-#define TK_PARTITION                      149
-#define TK_BY                             150
-#define TK_SESSION                        151
-#define TK_STATE_WINDOW                   152
-#define TK_SLIDING                        153
-#define TK_FILL                           154
-#define TK_VALUE                          155
-#define TK_NONE                           156
-#define TK_PREV                           157
-#define TK_LINEAR                         158
-#define TK_NEXT                           159
-#define TK_GROUP                          160
-#define TK_HAVING                         161
-#define TK_ORDER                          162
-#define TK_SLIMIT                         163
-#define TK_SOFFSET                        164
-#define TK_LIMIT                          165
-#define TK_OFFSET                         166
-#define TK_ASC                            167
-#define TK_DESC                           168
-#define TK_NULLS                          169
-#define TK_FIRST                          170
-#define TK_LAST                           171
+#define TK_EXPLAIN                        123
+#define TK_ANALYZE                        124
+#define TK_VERBOSE                        125
+#define TK_NK_BOOL                        126
+#define TK_RATIO                          127
+#define TK_NULL                           128
+#define TK_NK_VARIABLE                    129
+#define TK_NK_UNDERLINE                   130
+#define TK_ROWTS                          131
+#define TK_TBNAME                         132
+#define TK_QSTARTTS                       133
+#define TK_QENDTS                         134
+#define TK_WSTARTTS                       135
+#define TK_WENDTS                         136
+#define TK_WDURATION                      137
+#define TK_BETWEEN                        138
+#define TK_IS                             139
+#define TK_NK_LT                          140
+#define TK_NK_GT                          141
+#define TK_NK_LE                          142
+#define TK_NK_GE                          143
+#define TK_NK_NE                          144
+#define TK_MATCH                          145
+#define TK_NMATCH                         146
+#define TK_IN                             147
+#define TK_JOIN                           148
+#define TK_INNER                          149
+#define TK_SELECT                         150
+#define TK_DISTINCT                       151
+#define TK_WHERE                          152
+#define TK_PARTITION                      153
+#define TK_BY                             154
+#define TK_SESSION                        155
+#define TK_STATE_WINDOW                   156
+#define TK_SLIDING                        157
+#define TK_FILL                           158
+#define TK_VALUE                          159
+#define TK_NONE                           160
+#define TK_PREV                           161
+#define TK_LINEAR                         162
+#define TK_NEXT                           163
+#define TK_GROUP                          164
+#define TK_HAVING                         165
+#define TK_ORDER                          166
+#define TK_SLIMIT                         167
+#define TK_SOFFSET                        168
+#define TK_LIMIT                          169
+#define TK_OFFSET                         170
+#define TK_ASC                            171
+#define TK_DESC                           172
+#define TK_NULLS                          173
+#define TK_FIRST                          174
+#define TK_LAST                           175
 
 #define TK_NK_SPACE                       300
 #define TK_NK_COMMENT                     301
diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h
index fbdb1d66b4..d3cd828cf5 100644
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -37,6 +37,11 @@ typedef struct SReadHandle {
 #define STREAM_DATA_TYPE_SUBMIT_BLOCK 0x1
 #define STREAM_DATA_TYPE_SSDATA_BLOCK 0x2
 
+typedef enum {
+  OPTR_EXEC_MODEL_BATCH  = 0x1,
+  OPTR_EXEC_MODEL_STREAM = 0x2,
+} EOPTR_EXEC_MODEL;
+
 /**
  * Create the exec task for streaming mode
  * @param pMsg
@@ -84,7 +89,7 @@ int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, SArray* tableIdList, bool isA
  * @return
  */
 int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, struct SSubplan* pPlan,
-                        qTaskInfo_t* pTaskInfo, DataSinkHandle* handle);
+                        qTaskInfo_t* pTaskInfo, DataSinkHandle* handle, EOPTR_EXEC_MODEL model);
 
 /**
  * The main task execution function, including query on both table and multiple tables,
diff --git a/include/libs/function/function.h b/include/libs/function/function.h
index e7895bd972..278d9d8b7c 100644
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@@ -41,6 +41,7 @@ typedef void (*FExecFinalize)(struct SqlFunctionCtx *pCtx);
 typedef int32_t (*FScalarExecProcess)(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 
 typedef struct SScalarFuncExecFuncs {
+  FExecGetEnv getEnv;
   FScalarExecProcess process;
 } SScalarFuncExecFuncs;
 
@@ -241,7 +242,6 @@ typedef struct tExprNode {
   };
 } tExprNode;
 
-void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
 void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *));
 
 typedef struct SAggFunctionInfo {
@@ -267,28 +267,6 @@ struct SScalarParam {
   int32_t            numOfRows;
 };
 
-typedef struct SMultiFunctionsDesc {
-  bool stableQuery;
-  bool groupbyColumn;
-  bool agg;
-  bool arithmeticOnAgg;
-  bool projectionQuery;
-  bool hasFilter;
-  bool onlyTagQuery;
-  bool orderProjectQuery;
-  bool globalMerge;
-  bool multigroupResult;
-  bool blockDistribution;
-  bool stateWindow;
-  bool timewindow;
-  bool sessionWindow;
-  bool topbotQuery;
-  bool interpQuery;
-  bool distinct;
-  bool join;
-  bool continueQuery;
-} SMultiFunctionsDesc;
-
 int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, SResultDataInfo* pInfo, int16_t extLength,
                           bool isSuperTable);
 
@@ -296,8 +274,6 @@ bool qIsValidUdf(SArray* pUdfInfo, const char* name, int32_t len, int32_t* funct
 
 tExprNode* exprTreeFromBinary(const void* data, size_t size);
 
-void extractFunctionDesc(SArray* pFunctionIdList, SMultiFunctionsDesc* pDesc);
-
 tExprNode* exprdup(tExprNode* pTree);
 
 void resetResultRowEntryResult(SqlFunctionCtx* pCtx, int32_t num);
diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h
index 411d34063c..83c0bccaaf 100644
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -70,6 +70,7 @@ typedef enum ENodeType {
   QUERY_NODE_DATABASE_OPTIONS,
   QUERY_NODE_TABLE_OPTIONS,
   QUERY_NODE_INDEX_OPTIONS,
+  QUERY_NODE_EXPLAIN_OPTIONS,
 
   // Statement nodes are used in parser and planner module.
   QUERY_NODE_SET_OPERATOR,
@@ -99,6 +100,7 @@ typedef enum ENodeType {
   QUERY_NODE_CREATE_TOPIC_STMT,
   QUERY_NODE_DROP_TOPIC_STMT,
   QUERY_NODE_ALTER_LOCAL_STMT,
+  QUERY_NODE_EXPLAIN_STMT,
   QUERY_NODE_SHOW_DATABASES_STMT,
   QUERY_NODE_SHOW_TABLES_STMT,
   QUERY_NODE_SHOW_STABLES_STMT,
diff --git a/include/libs/nodes/plannodes.h b/include/libs/nodes/plannodes.h
index a41f10068a..f41e049196 100644
--- a/include/libs/nodes/plannodes.h
+++ b/include/libs/nodes/plannodes.h
@@ -49,6 +49,7 @@ typedef struct SScanLogicNode {
   STimeWindow scanRange;
   SName tableName;
   bool showRewrite;
+  double ratio;
 } SScanLogicNode;
 
 typedef struct SJoinLogicNode {
@@ -197,6 +198,7 @@ typedef struct STableScanPhysiNode {
   SScanPhysiNode scan;
   uint8_t scanFlag;         // denotes reversed scan of data or not
   STimeWindow scanRange;
+  double ratio;
 } STableScanPhysiNode;
 
 typedef STableScanPhysiNode STableSeqScanPhysiNode;
@@ -297,18 +299,23 @@ typedef struct SSubplan {
   SDataSinkNode* pDataSink;    // data of the subplan flow into the datasink
 } SSubplan;
 
-typedef enum EQueryMode {
-  QUERY_MODE_NORMAL = 1,
-  QUERY_MODE_EXPLAIN,
-  QUERY_MODE_EXPLAIN_AN
-} EQueryMode;
+typedef enum EExplainMode {
+  EXPLAIN_MODE_DISABLE = 1,
+  EXPLAIN_MODE_STATIC,
+  EXPLAIN_MODE_ANALYZE
+} EExplainMode;
+
+typedef struct SExplainInfo {
+  EExplainMode mode;
+  bool verbose;
+} SExplainInfo;
 
 typedef struct SQueryPlan {
   ENodeType type;
   uint64_t queryId;
   int32_t numOfSubplans;
-
   SNodeList* pSubplans; // Element is SNodeListNode. The execution level of subplan, starting from 0.
+  SExplainInfo explainInfo;
 } SQueryPlan;
 
 #ifdef __cplusplus
diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 5dc2cd35b7..23a63c1a0b 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -131,6 +131,7 @@ typedef struct SRealTableNode {
   struct STableMeta* pMeta;
   SVgroupsInfo* pVgroupList;
   char useDbName[TSDB_DB_NAME_LEN];
+  double ratio;
 } SRealTableNode;
 
 typedef struct STempTableNode {
@@ -282,6 +283,19 @@ typedef struct SVnodeModifOpStmt {
   const char* sql;                 // current sql statement position
 } SVnodeModifOpStmt;
 
+typedef struct SExplainOptions {
+  ENodeType type;
+  bool verbose;
+  double ratio;
+} SExplainOptions;
+
+typedef struct SExplainStmt {
+  ENodeType type;
+  bool analyze;
+  SExplainOptions* pOptions;
+  SNode* pQuery;
+} SExplainStmt;
+
 void nodesWalkSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeWalker walker, void* pContext);
 void nodesRewriteSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeRewriter rewriter, void* pContext);
 
diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h
index c6d17ef65c..7bc0ee42e9 100644
--- a/include/libs/scalar/scalar.h
+++ b/include/libs/scalar/scalar.h
@@ -58,6 +58,14 @@ int32_t ceilFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp
 int32_t floorFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t roundFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 
+bool getTimePseudoFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
+
+int32_t winStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t winEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t winDurFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t qStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t qEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/os/osThread.h b/include/os/osThread.h
index 6d8ff1de3e..cca25f4fa4 100644
--- a/include/os/osThread.h
+++ b/include/os/osThread.h
@@ -32,6 +32,9 @@ typedef pthread_once_t TdThreadOnce;
 typedef pthread_rwlockattr_t TdThreadRwlockAttr;
 typedef pthread_cond_t TdThreadCond;
 typedef pthread_condattr_t TdThreadCondAttr;
+typedef pthread_key_t TdThreadKey;
+typedef pthread_barrier_t TdThreadBarrier;
+typedef pthread_barrierattr_t TdThreadBarrierAttr;
 
 #define taosThreadCleanupPush pthread_cleanup_push
 #define taosThreadCleanupPop pthread_cleanup_pop
@@ -39,78 +42,190 @@ typedef pthread_condattr_t TdThreadCondAttr;
 // If the error is in a third-party library, place this header file under the third-party library header file.
 // When you want to use this feature, you should find or add the same function in the following section.
 #ifndef ALLOW_FORBID_FUNC
-    #define pthread_t PTHREAD_T_TYPE_TAOS_FORBID
-    #define pthread_spinlock_t PTHREAD_SPINLOCK_T_TYPE_TAOS_FORBID
-    #define pthread_mutex_t PTHREAD_MUTEX_T_TYPE_TAOS_FORBID
-    #define pthread_mutexattr_t PTHREAD_MUTEXATTR_T_TYPE_TAOS_FORBID
-    #define pthread_rwlock_t PTHREAD_RWLOCK_T_TYPE_TAOS_FORBID
-    #define pthread_attr_t PTHREAD_ATTR_T_TYPE_TAOS_FORBID
-    #define pthread_once_t PTHREAD_ONCE_T_TYPE_TAOS_FORBID
-    #define pthread_rwlockattr_t PTHREAD_RWLOCKATTR_T_TYPE_TAOS_FORBID
-    #define pthread_cond_t PTHREAD_COND_T_TYPE_TAOS_FORBID
-    #define pthread_condattr_t PTHREAD_CONDATTR_T_TYPE_TAOS_FORBID
-    #define pthread_spin_init PTHREAD_SPIN_INIT_FUNC_TAOS_FORBID
-    #define pthread_mutex_init PTHREAD_MUTEX_INIT_FUNC_TAOS_FORBID
-    #define pthread_spin_destroy PTHREAD_SPIN_DESTROY_FUNC_TAOS_FORBID
-    #define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY_FUNC_TAOS_FORBID
-    #define pthread_spin_lock PTHREAD_SPIN_LOCK_FUNC_TAOS_FORBID
-    #define pthread_mutex_lock PTHREAD_MUTEX_LOCK_FUNC_TAOS_FORBID
-    #define pthread_spin_unlock PTHREAD_SPIN_UNLOCK_FUNC_TAOS_FORBID
-    #define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK_FUNC_TAOS_FORBID
-    #define pthread_rwlock_rdlock PTHREAD_RWLOCK_RDLOCK_FUNC_TAOS_FORBID
-    #define pthread_rwlock_wrlock PTHREAD_RWLOCK_WRLOCK_FUNC_TAOS_FORBID
-    #define pthread_rwlock_unlock PTHREAD_RWLOCK_UNLOCK_FUNC_TAOS_FORBID
-    #define pthread_testcancel PTHREAD_TESTCANCEL_FUNC_TAOS_FORBID
-    #define pthread_attr_init PTHREAD_ATTR_INIT_FUNC_TAOS_FORBID
-    #define pthread_create PTHREAD_CREATE_FUNC_TAOS_FORBID
-    #define pthread_once PTHREAD_ONCE_FUNC_TAOS_FORBID
-    #define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE_FUNC_TAOS_FORBID
-    #define pthread_attr_destroy PTHREAD_ATTR_DESTROY_FUNC_TAOS_FORBID
-    #define pthread_join PTHREAD_JOIN_FUNC_TAOS_FORBID
-    #define pthread_rwlock_init PTHREAD_RWLOCK_INIT_FUNC_TAOS_FORBID
-    #define pthread_rwlock_destroy PTHREAD_RWLOCK_DESTROY_FUNC_TAOS_FORBID
-    #define pthread_cond_signal PTHREAD_COND_SIGNAL_FUNC_TAOS_FORBID
-    #define pthread_cond_init PTHREAD_COND_INIT_FUNC_TAOS_FORBID
-    #define pthread_cond_broadcast PTHREAD_COND_BROADCAST_FUNC_TAOS_FORBID
-    #define pthread_cond_destroy PTHREAD_COND_DESTROY_FUNC_TAOS_FORBID
-    #define pthread_cond_wait PTHREAD_COND_WAIT_FUNC_TAOS_FORBID
-    #define pthread_self PTHREAD_SELF_FUNC_TAOS_FORBID
-    #define pthread_equal PTHREAD_EQUAL_FUNC_TAOS_FORBID
-    #define pthread_sigmask PTHREAD_SIGMASK_FUNC_TAOS_FORBID
-    #define pthread_cancel PTHREAD_CANCEL_FUNC_TAOS_FORBID
-    #define pthread_kill PTHREAD_KILL_FUNC_TAOS_FORBID
+    // #define pthread_t PTHREAD_T_TYPE_TAOS_FORBID
+    // #define pthread_spinlock_t PTHREAD_SPINLOCK_T_TYPE_TAOS_FORBID
+    // #define pthread_mutex_t PTHREAD_MUTEX_T_TYPE_TAOS_FORBID
+    // #define pthread_mutexattr_t PTHREAD_MUTEXATTR_T_TYPE_TAOS_FORBID
+    // #define pthread_rwlock_t PTHREAD_RWLOCK_T_TYPE_TAOS_FORBID
+    // #define pthread_attr_t PTHREAD_ATTR_T_TYPE_TAOS_FORBID
+    // #define pthread_once_t PTHREAD_ONCE_T_TYPE_TAOS_FORBID
+    // #define pthread_rwlockattr_t PTHREAD_RWLOCKATTR_T_TYPE_TAOS_FORBID
+    // #define pthread_cond_t PTHREAD_COND_T_TYPE_TAOS_FORBID
+    // #define pthread_condattr_t PTHREAD_CONDATTR_T_TYPE_TAOS_FORBID
+    // #define pthread_key_t PTHREAD_KEY_T_TYPE_TAOS_FORBID
+    // #define pthread_barrier_t PTHREAD_BARRIER_T_TYPE_TAOS_FORBID
+    // #define pthread_barrierattr_t PTHREAD_BARRIERATTR_T_TYPE_TAOS_FORBID
+    // #define pthread_create PTHREAD_CREATE_FUNC_TAOS_FORBID
+    // #define pthread_attr_destroy PTHREAD_ATTR_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_attr_getdetachstate PTHREAD_ATTR_GETDETACHSTATE_FUNC_TAOS_FORBID
+    // #define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED_FUNC_TAOS_FORBID
+    // #define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM_FUNC_TAOS_FORBID
+    // #define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY_FUNC_TAOS_FORBID
+    // #define pthread_attr_getscope PTHREAD_ATTR_GETSCOPE_FUNC_TAOS_FORBID
+    // #define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE_FUNC_TAOS_FORBID
+    // #define pthread_attr_init PTHREAD_ATTR_INIT_FUNC_TAOS_FORBID
+    // #define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE_FUNC_TAOS_FORBID
+    // #define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED_FUNC_TAOS_FORBID
+    // #define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM_FUNC_TAOS_FORBID
+    // #define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY_FUNC_TAOS_FORBID
+    // #define pthread_attr_setscope PTHREAD_ATTR_SETSCOPE_FUNC_TAOS_FORBID
+    // #define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE_FUNC_TAOS_FORBID
+    // #define pthread_barrier_destroy PTHREAD_BARRIER_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_barrier_init PTHREAD_BARRIER_INIT_FUNC_TAOS_FORBID
+    // #define pthread_barrier_wait PTHREAD_BARRIER_WAIT_FUNC_TAOS_FORBID
+    // #define pthread_barrierattr_destroy PTHREAD_BARRIERATTR_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_barrierattr_getpshared PTHREAD_BARRIERATTR_GETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_barrierattr_init PTHREAD_BARRIERATTR_INIT_FUNC_TAOS_FORBID
+    // #define pthread_barrierattr_setpshared PTHREAD_BARRIERATTR_SETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_cancel PTHREAD_CANCEL_FUNC_TAOS_FORBID
+    // #define pthread_cond_destroy PTHREAD_COND_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_cond_init PTHREAD_COND_INIT_FUNC_TAOS_FORBID
+    // #define pthread_cond_signal PTHREAD_COND_SIGNAL_FUNC_TAOS_FORBID
+    // #define pthread_cond_broadcast PTHREAD_COND_BROADCAST_FUNC_TAOS_FORBID
+    // #define pthread_cond_wait PTHREAD_COND_WAIT_FUNC_TAOS_FORBID
+    // #define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT_FUNC_TAOS_FORBID
+    // #define pthread_condattr_destroy PTHREAD_CONDATTR_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_condattr_getpshared PTHREAD_CONDATTR_GETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_condattr_init PTHREAD_CONDATTR_INIT_FUNC_TAOS_FORBID
+    // #define pthread_condattr_setpshared PTHREAD_CONDATTR_SETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_detach PTHREAD_DETACH_FUNC_TAOS_FORBID
+    // #define pthread_equal PTHREAD_EQUAL_FUNC_TAOS_FORBID
+    // #define pthread_exit PTHREAD_EXIT_FUNC_TAOS_FORBID
+    // #define pthread_getschedparam PTHREAD_GETSCHEDPARAM_FUNC_TAOS_FORBID
+    // #define pthread_getspecific PTHREAD_GETSPECIFIC_FUNC_TAOS_FORBID
+    // #define pthread_join PTHREAD_JOIN_FUNC_TAOS_FORBID
+    // #define pthread_key_create PTHREAD_KEY_CREATE_FUNC_TAOS_FORBID
+    // #define pthread_key_delete PTHREAD_KEY_DELETE_FUNC_TAOS_FORBID
+    // #define pthread_kill PTHREAD_KILL_FUNC_TAOS_FORBID
+    // #define pthread_mutex_consistent PTHREAD_MUTEX_CONSISTENT_FUNC_TAOS_FORBID
+    // #define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_mutex_init PTHREAD_MUTEX_INIT_FUNC_TAOS_FORBID
+    // #define pthread_mutex_lock PTHREAD_MUTEX_LOCK_FUNC_TAOS_FORBID
+    // #define pthread_mutex_timedlock PTHREAD_MUTEX_TIMEDLOCK_FUNC_TAOS_FORBID
+    // #define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK_FUNC_TAOS_FORBID
+    // #define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_getpshared PTHREAD_MUTEXATTR_GETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_getrobust PTHREAD_MUTEXATTR_GETROBUST_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_gettype PTHREAD_MUTEXATTR_GETTYPE_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_setpshared PTHREAD_MUTEXATTR_SETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_setrobust PTHREAD_MUTEXATTR_SETROBUST_FUNC_TAOS_FORBID
+    // #define pthread_mutexattr_settype PTHREAD_MUTEXATTR_SETTYPE_FUNC_TAOS_FORBID
+    // #define pthread_once PTHREAD_ONCE_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_destroy PTHREAD_RWLOCK_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_init PTHREAD_RWLOCK_INIT_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_rdlock PTHREAD_RWLOCK_RDLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_timedrdlock PTHREAD_RWLOCK_TIMEDRDLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_timedwrlock PTHREAD_RWLOCK_TIMEDWRLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_tryrdlock PTHREAD_RWLOCK_TRYRDLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_trywrlock PTHREAD_RWLOCK_TRYWRLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_unlock PTHREAD_RWLOCK_UNLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlock_wrlock PTHREAD_RWLOCK_WRLOCK_FUNC_TAOS_FORBID
+    // #define pthread_rwlockattr_destroy PTHREAD_RWLOCKATTR_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_rwlockattr_getpshared PTHREAD_RWLOCKATTR_GETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_rwlockattr_init PTHREAD_RWLOCKATTR_INIT_FUNC_TAOS_FORBID
+    // #define pthread_rwlockattr_setpshared PTHREAD_RWLOCKATTR_SETPSHARED_FUNC_TAOS_FORBID
+    // #define pthread_self PTHREAD_SELF_FUNC_TAOS_FORBID
+    // #define pthread_setcancelstate PTHREAD_SETCANCELSTATE_FUNC_TAOS_FORBID
+    // #define pthread_setcanceltype PTHREAD_SETCANCELTYPE_FUNC_TAOS_FORBID
+    // #define pthread_setschedparam PTHREAD_SETSCHEDPARAM_FUNC_TAOS_FORBID
+    // #define pthread_setspecific PTHREAD_SETSPECIFIC_FUNC_TAOS_FORBID
+    // #define pthread_spin_destroy PTHREAD_SPIN_DESTROY_FUNC_TAOS_FORBID
+    // #define pthread_spin_init PTHREAD_SPIN_INIT_FUNC_TAOS_FORBID
+    // #define pthread_spin_lock PTHREAD_SPIN_LOCK_FUNC_TAOS_FORBID
+    // #define pthread_spin_trylock PTHREAD_SPIN_TRYLOCK_FUNC_TAOS_FORBID
+    // #define pthread_spin_unlock PTHREAD_SPIN_UNLOCK_FUNC_TAOS_FORBID
+    // #define pthread_testcancel PTHREAD_TESTCANCEL_FUNC_TAOS_FORBID
+    // #define pthread_sigmask PTHREAD_SIGMASK_FUNC_TAOS_FORBID
+    // #define sigwait SIGWAIT_FUNC_TAOS_FORBID
 #endif
 
-int32_t taosThreadSpinInit(TdThreadSpinlock *lock, int pshared);
-int32_t taosThreadMutexInit(TdThreadMutex *mutex, const TdThreadMutexAttr *attr);
-int32_t taosThreadSpinDestroy(TdThreadSpinlock *lock);
-int32_t taosThreadMutexDestroy(TdThreadMutex * mutex);
-int32_t taosThreadSpinLock(TdThreadSpinlock *lock);
-int32_t taosThreadMutexLock(TdThreadMutex *mutex);
-int32_t taosThreadRwlockRdlock(TdThreadRwlock *rwlock);
-int32_t taosThreadSpinUnlock(TdThreadSpinlock *lock);
-int32_t taosThreadMutexUnlock(TdThreadMutex *mutex);
-int32_t taosThreadRwlockWrlock(TdThreadRwlock *rwlock);
-int32_t taosThreadRwlockUnlock(TdThreadRwlock *rwlock);
-void taosThreadTestCancel(void);
-int32_t taosThreadAttrInit(TdThreadAttr *attr);
-int32_t taosThreadCreate(TdThread *tid, const TdThreadAttr *attr, void*(*start)(void*), void *arg);
-int32_t taosThreadOnce(TdThreadOnce *onceControl, void(*initRoutine)(void));
-int32_t taosThreadAttrSetDetachState(TdThreadAttr *attr, int32_t detachState);
-int32_t taosThreadAttrDestroy(TdThreadAttr *attr);
-int32_t taosThreadJoin(TdThread thread, void **pValue);
-int32_t taosThreadRwlockInit(TdThreadRwlock *rwlock, const TdThreadRwlockAttr *attr);
-int32_t taosThreadRwlockDestroy(TdThreadRwlock *rwlock);
-int32_t taosThreadCondSignal(TdThreadCond *cond);
-int32_t taosThreadCondInit(TdThreadCond *cond, const TdThreadCondAttr *attr);
-int32_t taosThreadCondBroadcast(TdThreadCond *cond);
-int32_t taosThreadCondDestroy(TdThreadCond *cond);
-int32_t taosThreadCondWait(TdThreadCond *cond, TdThreadMutex *mutex);
-TdThread taosThreadSelf(void);
-int32_t taosThreadEqual(TdThread t1, TdThread t2);
-int32_t taosThreadSigmask(int how, sigset_t const *set, sigset_t *oset);
+int32_t taosThreadCreate(TdThread * tid, const TdThreadAttr * attr, void *(*start)(void *), void *arg);
+int32_t taosThreadAttrDestroy(TdThreadAttr * attr);
+int32_t taosThreadAttrGetDetachState(const TdThreadAttr * attr, int32_t *detachstate);
+int32_t taosThreadAttrGetInheritSched(const TdThreadAttr * attr, int32_t *inheritsched);
+int32_t taosThreadAttrGetSchedParam(const TdThreadAttr * attr, struct sched_param *param);
+int32_t taosThreadAttrGetSchedPolicy(const TdThreadAttr * attr, int32_t *policy);
+int32_t taosThreadAttrGetScope(const TdThreadAttr * attr, int32_t *contentionscope);
+int32_t taosThreadAttrGetStackSize(const TdThreadAttr * attr, size_t * stacksize);
+int32_t taosThreadAttrInit(TdThreadAttr * attr);
+int32_t taosThreadAttrSetDetachState(TdThreadAttr * attr, int32_t detachstate);
+int32_t taosThreadAttrSetInheritSched(TdThreadAttr * attr, int32_t inheritsched);
+int32_t taosThreadAttrSetSchedParam(TdThreadAttr * attr, const struct sched_param *param);
+int32_t taosThreadAttrSetSchedPolicy(TdThreadAttr * attr, int32_t policy);
+int32_t taosThreadAttrSetScope(TdThreadAttr * attr, int32_t contentionscope);
+int32_t taosThreadAttrSetStackSize(TdThreadAttr * attr, size_t stacksize);
+int32_t taosThreadBarrierDestroy(TdThreadBarrier * barrier);
+int32_t taosThreadBarrierInit(TdThreadBarrier * barrier, const TdThreadBarrierAttr * attr, uint32_t count);
+int32_t taosThreadBarrierWait(TdThreadBarrier * barrier);
+int32_t taosThreadBarrierAttrDestroy(TdThreadBarrierAttr * attr);
+int32_t taosThreadBarrierAttrGetPshared(const TdThreadBarrierAttr * attr, int32_t *pshared);
+int32_t taosThreadBarrierAttrInit(TdThreadBarrierAttr * attr);
+int32_t taosThreadBarrierAttrSetPshared(TdThreadBarrierAttr * attr, int32_t pshared);
 int32_t taosThreadCancel(TdThread thread);
-int32_t taosThreadKill(TdThread thread, int sig);
+int32_t taosThreadCondDestroy(TdThreadCond * cond);
+int32_t taosThreadCondInit(TdThreadCond * cond, const TdThreadCondAttr * attr);
+int32_t taosThreadCondSignal(TdThreadCond * cond);
+int32_t taosThreadCondBroadcast(TdThreadCond * cond);
+int32_t taosThreadCondWait(TdThreadCond * cond, TdThreadMutex * mutex);
+int32_t taosThreadCondTimedWait(TdThreadCond * cond, TdThreadMutex * mutex, const struct timespec *abstime);
+int32_t taosThreadCondAttrDestroy(TdThreadCondAttr * attr);
+int32_t taosThreadCondAttrGetPshared(const TdThreadCondAttr * attr, int32_t *pshared);
+int32_t taosThreadCondAttrInit(TdThreadCondAttr * attr);
+int32_t taosThreadCondAttrSetPshared(TdThreadCondAttr * attr, int32_t pshared);
+int32_t taosThreadDetach(TdThread thread);
+int32_t taosThreadEqual(TdThread t1, TdThread t2);
+void taosThreadExit(void *valuePtr);
+int32_t taosThreadGetSchedParam(TdThread thread, int32_t *policy, struct sched_param *param);
+void *taosThreadGetSpecific(TdThreadKey key);
+int32_t taosThreadJoin(TdThread thread, void **valuePtr);
+int32_t taosThreadKeyCreate(TdThreadKey * key, void(*destructor)(void *));
+int32_t taosThreadKeyDelete(TdThreadKey key);
+int32_t taosThreadKill(TdThread thread, int32_t sig);
+int32_t taosThreadMutexConsistent(TdThreadMutex* mutex);
+int32_t taosThreadMutexDestroy(TdThreadMutex * mutex);
+int32_t taosThreadMutexInit(TdThreadMutex * mutex, const TdThreadMutexAttr * attr);
+int32_t taosThreadMutexLock(TdThreadMutex * mutex);
+int32_t taosThreadMutexTimedLock(TdThreadMutex * mutex, const struct timespec *abstime);
+int32_t taosThreadMutexTryLock(TdThreadMutex * mutex);
+int32_t taosThreadMutexUnlock(TdThreadMutex * mutex);
+int32_t taosThreadMutexAttrDestroy(TdThreadMutexAttr * attr);
+int32_t taosThreadMutexAttrGetPshared(const TdThreadMutexAttr * attr, int32_t *pshared);
+int32_t taosThreadMutexAttrGetRobust(const TdThreadMutexAttr * attr, int32_t * robust);
+int32_t taosThreadMutexAttrGetType(const TdThreadMutexAttr * attr, int32_t *kind);
+int32_t taosThreadMutexAttrInit(TdThreadMutexAttr * attr);
+int32_t taosThreadMutexAttrSetPshared(TdThreadMutexAttr * attr, int32_t pshared);
+int32_t taosThreadMutexAttrSetRobust(TdThreadMutexAttr * attr, int32_t robust);
+int32_t taosThreadMutexAttrSetType(TdThreadMutexAttr * attr, int32_t kind);
+int32_t taosThreadOnce(TdThreadOnce * onceControl, void(*initRoutine)(void));
+int32_t taosThreadRwlockDestroy(TdThreadRwlock * rwlock);
+int32_t taosThreadRwlockInit(TdThreadRwlock * rwlock, const TdThreadRwlockAttr * attr);
+int32_t taosThreadRwlockRdlock(TdThreadRwlock * rwlock);
+int32_t taosThreadRwlockTimedRdlock(TdThreadRwlock * rwlock, const struct timespec *abstime);
+int32_t taosThreadRwlockTimedWrlock(TdThreadRwlock * rwlock, const struct timespec *abstime);
+int32_t taosThreadRwlockTryRdlock(TdThreadRwlock * rwlock);
+int32_t taosThreadRwlockTryWrlock(TdThreadRwlock * rwlock);
+int32_t taosThreadRwlockUnlock(TdThreadRwlock * rwlock);
+int32_t taosThreadRwlockWrlock(TdThreadRwlock * rwlock);
+int32_t taosThreadRwlockAttrDestroy(TdThreadRwlockAttr * attr);
+int32_t taosThreadRwlockAttrGetPshared(const TdThreadRwlockAttr * attr, int32_t *pshared);
+int32_t taosThreadRwlockAttrInit(TdThreadRwlockAttr * attr);
+int32_t taosThreadRwlockAttrSetPshared(TdThreadRwlockAttr * attr, int32_t pshared);
+TdThread taosThreadSelf(void);
+int32_t taosThreadSetCancelState(int32_t state, int32_t *oldstate);
+int32_t taosThreadSetCancelType(int32_t type, int32_t *oldtype);
+int32_t taosThreadSetSchedParam(TdThread thread, int32_t policy, const struct sched_param *param);
+int32_t taosThreadSetSpecific(TdThreadKey key, const void *value);
+int32_t taosThreadSpinDestroy(TdThreadSpinlock * lock);
+int32_t taosThreadSpinInit(TdThreadSpinlock * lock, int32_t pshared);
+int32_t taosThreadSpinLock(TdThreadSpinlock * lock);
+int32_t taosThreadSpinTrylock(TdThreadSpinlock * lock);
+int32_t taosThreadSpinUnlock(TdThreadSpinlock * lock);
+void taosThreadTestCancel(void);
+int32_t taosThreadSigMask(int32_t how, sigset_t const *set, sigset_t * oset);
+int32_t taosThreadSigWait(const sigset_t * set, int32_t *sig);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/os/osTime.h b/include/os/osTime.h
index 031b9d28f9..9e426455dc 100644
--- a/include/os/osTime.h
+++ b/include/os/osTime.h
@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#include <time.h>
+
 // If the error is in a third-party library, place this header file under the third-party library header file.
 // When you want to use this feature, you should find or add the same function in the following section.
 #ifndef ALLOW_FORBID_FUNC
diff --git a/include/util/tdef.h b/include/util/tdef.h
index 193be4a3e6..43981adea2 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -381,6 +381,14 @@ typedef enum ELogicConditionType {
 #define TSDB_MAX_DB_DELAY     10
 #define TSDB_DEFAULT_DB_DELAY 2
 
+#define TSDB_DEFAULT_EXPLAIN_VERBOSE false
+
+#define TSDB_MIN_EXPLAIN_RATIO       0
+#define TSDB_MAX_EXPLAIN_RATIO       1
+#define TSDB_DEFAULT_EXPLAIN_RATIO   0.001
+
+#define TSDB_EXPLAIN_RESULT_ROW_SIZE 1024
+
 #define TSDB_MAX_JOIN_TABLE_NUM 10
 #define TSDB_MAX_UNION_CLAUSE   5
 
diff --git a/source/client/consumer/consumer.c b/source/client/consumer/consumer.c
deleted file mode 100644
index 4ba1f95144..0000000000
--- a/source/client/consumer/consumer.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "consumer.h"
diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index f7593595b0..1fa267ae7e 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -241,6 +241,10 @@ void tmq_list_destroy(tmq_list_t* list) {
   taosArrayDestroyEx(container, (void (*)(void*))taosMemoryFree);
 }
 
+static int32_t tmqMakeTopicVgKey(char* dst, const char* topicName, int32_t vg) {
+  return sprintf(dst, "%s:%d", topicName, vg);
+}
+
 void tmqClearUnhandleMsg(tmq_t* tmq) {
   tmq_message_t* msg = NULL;
   while (1) {
@@ -827,7 +831,7 @@ int32_t tmqPollCb(void* param, const SDataBuf* pMsg, int32_t code) {
   SMqClientVg*    pVg = pParam->pVg;
   tmq_t*          tmq = pParam->tmq;
   if (code != 0) {
-    printf("msg discard, code:%x\n", code);
+    tscWarn("msg discard, code:%x", code);
     goto WRITE_QUEUE_FAIL;
   }
 
@@ -835,12 +839,12 @@ int32_t tmqPollCb(void* param, const SDataBuf* pMsg, int32_t code) {
   int32_t tmqEpoch = atomic_load_32(&tmq->epoch);
   if (msgEpoch < tmqEpoch) {
     tsem_post(&tmq->rspSem);
-    printf("discard rsp epoch %d, current epoch %d\n", msgEpoch, tmqEpoch);
+    tscWarn("discard rsp epoch %d, current epoch %d", msgEpoch, tmqEpoch);
     return 0;
   }
 
   if (msgEpoch != tmqEpoch) {
-    printf("mismatch rsp epoch %d, current epoch %d\n", msgEpoch, tmqEpoch);
+    tscWarn("mismatch rsp epoch %d, current epoch %d", msgEpoch, tmqEpoch);
   } else {
     atomic_sub_fetch_32(&tmq->waitingRequest, 1);
   }
@@ -899,19 +903,54 @@ WRITE_QUEUE_FAIL:
 bool tmqUpdateEp(tmq_t* tmq, int32_t epoch, SMqCMGetSubEpRsp* pRsp) {
   /*printf("call update ep %d\n", epoch);*/
   bool    set = false;
-  int32_t sz = taosArrayGetSize(pRsp->topics);
-  SArray* newTopics = taosArrayInit(sz, sizeof(SMqClientTopic));
-  for (int32_t i = 0; i < sz; i++) {
+  int32_t topicNumGet = taosArrayGetSize(pRsp->topics);
+  char    vgKey[TSDB_TOPIC_FNAME_LEN + 22];
+  SArray* newTopics = taosArrayInit(topicNumGet, sizeof(SMqClientTopic));
+  if (newTopics == NULL) {
+    return false;
+  }
+  SHashObj* pHash = taosHashInit(64, MurmurHash3_32, false, HASH_NO_LOCK);
+  if (pHash == NULL) {
+    taosArrayDestroy(newTopics);
+    return false;
+  }
+
+  // find topic, build hash
+  for (int32_t i = 0; i < topicNumGet; i++) {
     SMqClientTopic topic = {0};
     SMqSubTopicEp* pTopicEp = taosArrayGet(pRsp->topics, i);
+    taosHashClear(pHash);
     topic.topicName = strdup(pTopicEp->topic);
-    int32_t vgSz = taosArrayGetSize(pTopicEp->vgs);
-    topic.vgs = taosArrayInit(vgSz, sizeof(SMqClientVg));
-    for (int32_t j = 0; j < vgSz; j++) {
+
+    int32_t topicNumCur = taosArrayGetSize(tmq->clientTopics);
+    for (int32_t j = 0; j < topicNumCur; j++) {
+      // find old topic
+      SMqClientTopic* pTopicCur = taosArrayGet(tmq->clientTopics, j);
+      if (pTopicCur->vgs && strcmp(pTopicCur->topicName, pTopicEp->topic) == 0) {
+        int32_t vgNumCur = taosArrayGetSize(pTopicCur->vgs);
+        if (vgNumCur == 0) break;
+        for (int32_t k = 0; k < vgNumCur; k++) {
+          SMqClientVg* pVgCur = taosArrayGet(pTopicCur->vgs, k);
+          sprintf(vgKey, "%s:%d", topic.topicName, pVgCur->vgId);
+          taosHashPut(pHash, vgKey, strlen(vgKey), &pVgCur->currentOffset, sizeof(int64_t));
+        }
+        break;
+      }
+    }
+
+    int32_t vgNumGet = taosArrayGetSize(pTopicEp->vgs);
+    topic.vgs = taosArrayInit(vgNumGet, sizeof(SMqClientVg));
+    for (int32_t j = 0; j < vgNumGet; j++) {
       SMqSubVgEp* pVgEp = taosArrayGet(pTopicEp->vgs, j);
+      sprintf(vgKey, "%s:%d", topic.topicName, pVgEp->vgId);
+      int64_t* pOffset = taosHashGet(pHash, vgKey, strlen(vgKey));
+      int64_t  offset = pVgEp->offset;
+      if (pOffset != NULL) {
+        offset = *pOffset;
+      }
       SMqClientVg clientVg = {
           .pollCnt = 0,
-          .currentOffset = pVgEp->offset,
+          .currentOffset = offset,
           .vgId = pVgEp->vgId,
           .epSet = pVgEp->epSet,
           .vgStatus = TMQ_VG_STATUS__IDLE,
@@ -922,6 +961,7 @@ bool tmqUpdateEp(tmq_t* tmq, int32_t epoch, SMqCMGetSubEpRsp* pRsp) {
     taosArrayPush(newTopics, &topic);
   }
   if (tmq->clientTopics) taosArrayDestroy(tmq->clientTopics);
+  taosHashCleanup(pHash);
   tmq->clientTopics = newTopics;
   atomic_store_32(&tmq->epoch, epoch);
   return set;
@@ -931,7 +971,7 @@ int32_t tmqAskEpCb(void* param, const SDataBuf* pMsg, int32_t code) {
   SMqAskEpCbParam* pParam = (SMqAskEpCbParam*)param;
   tmq_t*           tmq = pParam->tmq;
   if (code != 0) {
-    printf("get topic endpoint error, not ready, wait:%d\n", pParam->sync);
+    tscError("get topic endpoint error, not ready, wait:%d\n", pParam->sync);
     goto END;
   }
 
@@ -1302,6 +1342,7 @@ tmq_message_t* tmq_consumer_poll(tmq_t* tmq, int64_t blocking_time) {
 
   while (1) {
     /*printf("cycle\n");*/
+    tmqAskEp(tmq, false);
     tmqPollImpl(tmq, blocking_time);
 
     tsem_wait(&tmq->rspSem);
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 7a958136e7..7f25fd1e80 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -331,7 +331,6 @@ int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock) {
     return 0;
   }
 
-  ASSERT(pColInfoData->nullbitmap == NULL);
   pDataBlock->info.window.skey = *(TSKEY*)colDataGetData(pColInfoData, 0);
   pDataBlock->info.window.ekey = *(TSKEY*)colDataGetData(pColInfoData, (pDataBlock->info.rows - 1));
   return 0;
@@ -609,22 +608,6 @@ size_t blockDataGetSerialMetaSize(const SSDataBlock* pBlock) {
   return sizeof(int32_t) + pBlock->info.numOfCols * sizeof(int32_t);
 }
 
-SSchema* blockDataExtractSchema(const SSDataBlock* pBlock, int32_t* numOfCols) {
-  SSchema* pSchema = taosMemoryCalloc(pBlock->info.numOfCols, sizeof(SSchema));
-  for (int32_t i = 0; i < pBlock->info.numOfCols; ++i) {
-    SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
-    pSchema[i].bytes = pColInfoData->info.bytes;
-    pSchema[i].type = pColInfoData->info.type;
-    pSchema[i].colId = pColInfoData->info.colId;
-  }
-
-  if (numOfCols != NULL) {
-    *numOfCols = pBlock->info.numOfCols;
-  }
-
-  return pSchema;
-}
-
 double blockDataGetSerialRowSize(const SSDataBlock* pBlock) {
   ASSERT(pBlock != NULL);
   double rowSize = 0;
diff --git a/source/dnode/mgmt/vm/src/vmWorker.c b/source/dnode/mgmt/vm/src/vmWorker.c
index 193807317f..9d62624756 100644
--- a/source/dnode/mgmt/vm/src/vmWorker.c
+++ b/source/dnode/mgmt/vm/src/vmWorker.c
@@ -76,7 +76,7 @@ static void vmProcessFetchQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) {
   SVnodeObj *pVnode = pInfo->ahandle;
 
   dTrace("msg:%p, will be processed in vnode-fetch queue", pMsg);
-  int32_t code = vnodeProcessFetchMsg(pVnode->pImpl, &pMsg->rpcMsg);
+  int32_t code = vnodeProcessFetchMsg(pVnode->pImpl, &pMsg->rpcMsg, pInfo);
   if (code != 0) {
     vmSendRsp(pVnode->pWrapper, pMsg, code);
     dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -168,7 +168,7 @@ static void vmProcessMergeQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numO
     taosGetQitem(qall, (void **)&pMsg);
 
     dTrace("msg:%p, will be processed in vnode-merge queue", pMsg);
-    int32_t code = vnodeProcessFetchMsg(pVnode->pImpl, &pMsg->rpcMsg);
+    int32_t code = vnodeProcessFetchMsg(pVnode->pImpl, &pMsg->rpcMsg, pInfo);
     if (code != 0) {
       vmSendRsp(pVnode->pWrapper, pMsg, code);
       dTrace("msg:%p, is freed, result:0x%04x:%s", pMsg, code & 0XFFFF, tstrerror(code));
@@ -414,8 +414,7 @@ int32_t vmStartWorker(SVnodesMgmt *pMgmt) {
   pWPool->max = maxMergeThreads;
   if (tWWorkerInit(pWPool) != 0) return -1;
 
-  SSingleWorkerCfg cfg = {
-      .min = 1, .max = 1, .name = "vnode-mgmt", .fp = (FItem)vmProcessMgmtQueue, .param = pMgmt};
+  SSingleWorkerCfg cfg = {.min = 1, .max = 1, .name = "vnode-mgmt", .fp = (FItem)vmProcessMgmtQueue, .param = pMgmt};
   if (tSingleWorkerInit(&pMgmt->mgmtWorker, &cfg) != 0) {
     dError("failed to start vnode-mgmt worker since %s", terrstr());
     return -1;
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index c0f591d1f2..13ccc912d6 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -26,7 +26,7 @@
 #include "parser.h"
 #include "tname.h"
 
-#define MND_TOPIC_VER_NUMBER   1
+#define MND_TOPIC_VER_NUMBER 1
 #define MND_TOPIC_RESERVE_SIZE 64
 
 static int32_t mndTopicActionInsert(SSdb *pSdb, SMqTopicObj *pTopic);
diff --git a/source/dnode/vnode/inc/tsdb.h b/source/dnode/vnode/inc/tsdb.h
index f1083c0d91..0d3fcffe7d 100644
--- a/source/dnode/vnode/inc/tsdb.h
+++ b/source/dnode/vnode/inc/tsdb.h
@@ -100,10 +100,11 @@ int32_t tsdbUpdateSmaWindow(STsdb *pTsdb, const char *msg);
  * @brief Insert tSma(Time-range-wise SMA) data from stream computing engine
  *
  * @param pTsdb
+ * @param indexUid
  * @param msg
  * @return int32_t
  */
-int32_t tsdbInsertTSmaData(STsdb *pTsdb, char *msg);
+int32_t tsdbInsertTSmaData(STsdb *pTsdb, int64_t indexUid, const char *msg);
 
 /**
  * @brief Drop tSma data and local cache.
@@ -130,16 +131,11 @@ int32_t tsdbInsertRSmaData(STsdb *pTsdb, char *msg);
  * @param pTsdb 
  * @param pData 
  * @param indexUid 
- * @param interval 
- * @param intervalUnit 
- * @param tableUid 
- * @param colId 
  * @param querySKey 
  * @param nMaxResult 
  * @return int32_t 
  */
-int32_t tsdbGetTSmaData(STsdb *pTsdb, STSmaDataWrapper *pData, int64_t indexUid, int64_t interval, int8_t intervalUnit,
-                        tb_uid_t tableUid, col_id_t colId, TSKEY querySKey, int32_t nMaxResult);
+int32_t tsdbGetTSmaData(STsdb *pTsdb, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult);
 
 // STsdbCfg
 int  tsdbOptionsInit(STsdbCfg *);
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index dd4b8d84ca..c1c000295a 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -17,8 +17,9 @@
 #define _TD_VNODE_H_
 
 #include "os.h"
-#include "trpc.h"
 #include "tmsgcb.h"
+#include "tqueue.h"
+#include "trpc.h"
 
 #include "meta.h"
 #include "tarray.h"
@@ -166,7 +167,7 @@ int vnodeProcessQueryMsg(SVnode *pVnode, SRpcMsg *pMsg);
  * @param pMsg The request message
  * @return int 0 for success, -1 for failure
  */
-int vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg);
+int vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo);
 
 /* ------------------------ SVnodeCfg ------------------------ */
 /**
@@ -185,7 +186,6 @@ void vnodeOptionsClear(SVnodeCfg *pOptions);
 
 int vnodeValidateTableHash(SVnodeCfg *pVnodeOptions, char *tableFName);
 
-
 /* ------------------------ FOR COMPILE ------------------------ */
 
 int32_t vnodeAlter(SVnode *pVnode, const SVnodeCfg *pCfg);
diff --git a/source/dnode/vnode/src/inc/tsdbSma.h b/source/dnode/vnode/src/inc/tsdbSma.h
index e0170c90e7..da0a6856ab 100644
--- a/source/dnode/vnode/src/inc/tsdbSma.h
+++ b/source/dnode/vnode/src/inc/tsdbSma.h
@@ -44,15 +44,14 @@ int32_t tsdbRemoveTSmaData(STsdb *pTsdb, STSma *param, STimeWindow *pWin);
 #endif
 
 // internal func
-static FORCE_INLINE int32_t tsdbEncodeTSmaKey(tb_uid_t tableUid, col_id_t colId, TSKEY tsKey, void **pData) {
+static FORCE_INLINE int32_t tsdbEncodeTSmaKey(int64_t groupId, TSKEY tsKey, void **pData) {
   int32_t len = 0;
-  len += taosEncodeFixedI64(pData, tableUid);
-  len += taosEncodeFixedU16(pData, colId);
   len += taosEncodeFixedI64(pData, tsKey);
+  len += taosEncodeFixedI64(pData, groupId);
   return len;
 }
 
-static FORCE_INLINE int tsdbRLockSma(SSmaEnv *pEnv) {
+static FORCE_INLINE int32_t tsdbRLockSma(SSmaEnv *pEnv) {
   int code = taosThreadRwlockRdlock(&(pEnv->lock));
   if (code != 0) {
     terrno = TAOS_SYSTEM_ERROR(code);
@@ -61,7 +60,7 @@ static FORCE_INLINE int tsdbRLockSma(SSmaEnv *pEnv) {
   return 0;
 }
 
-static FORCE_INLINE int tsdbWLockSma(SSmaEnv *pEnv) {
+static FORCE_INLINE int32_t tsdbWLockSma(SSmaEnv *pEnv) {
   int code = taosThreadRwlockWrlock(&(pEnv->lock));
   if (code != 0) {
     terrno = TAOS_SYSTEM_ERROR(code);
@@ -70,7 +69,7 @@ static FORCE_INLINE int tsdbWLockSma(SSmaEnv *pEnv) {
   return 0;
 }
 
-static FORCE_INLINE int tsdbUnLockSma(SSmaEnv *pEnv) {
+static FORCE_INLINE int32_t tsdbUnLockSma(SSmaEnv *pEnv) {
   int code = taosThreadRwlockUnlock(&(pEnv->lock));
   if (code != 0) {
     terrno = TAOS_SYSTEM_ERROR(code);
diff --git a/source/dnode/vnode/src/inc/vnd.h b/source/dnode/vnode/src/inc/vnd.h
index 5ec5b1d58f..e5d1f952a8 100644
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
@@ -197,9 +197,9 @@ int tqCommit(STQ*);
 int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessSetConnReq(STQ* pTq, char* msg);
 int32_t tqProcessRebReq(STQ* pTq, char* msg);
-int32_t tqProcessTaskExec(STQ* pTq, char* msg, int32_t msgLen);
+int32_t tqProcessTaskExec(STQ* pTq, char* msg, int32_t msgLen, int32_t workerId);
 int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen);
-int32_t tqProcessStreamTrigger(STQ* pTq, void* data, int32_t dataLen);
+int32_t tqProcessStreamTrigger(STQ* pTq, void* data, int32_t dataLen, int32_t workerId);
 
 // sma
 void smaHandleRes(void* pVnode, int64_t smaId, const SArray* data);
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index fce423d811..06a2350aab 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -356,7 +356,6 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
   void*   buf = rpcMallocCont(tlen);
   if (buf == NULL) {
     pMsg->code = -1;
-    ASSERT(0);
     return -1;
   }
   ((SMqRspHead*)buf)->mqMsgType = TMQ_MSG_TYPE__POLL_RSP;
@@ -490,7 +489,7 @@ int32_t tqProcessTaskDeploy(STQ* pTq, char* msg, int32_t msgLen) {
   return 0;
 }
 
-int32_t tqProcessStreamTrigger(STQ* pTq, void* data, int32_t dataLen) {
+int32_t tqProcessStreamTrigger(STQ* pTq, void* data, int32_t dataLen, int32_t workerId) {
   void* pIter = NULL;
 
   while (1) {
@@ -498,14 +497,14 @@ int32_t tqProcessStreamTrigger(STQ* pTq, void* data, int32_t dataLen) {
     if (pIter == NULL) break;
     SStreamTask* pTask = (SStreamTask*)pIter;
 
-    if (streamExecTask(pTask, &pTq->pVnode->msgCb, data, STREAM_DATA_TYPE_SUBMIT_BLOCK, 0) < 0) {
+    if (streamExecTask(pTask, &pTq->pVnode->msgCb, data, STREAM_DATA_TYPE_SUBMIT_BLOCK, workerId) < 0) {
       // TODO
     }
   }
   return 0;
 }
 
-int32_t tqProcessTaskExec(STQ* pTq, char* msg, int32_t msgLen) {
+int32_t tqProcessTaskExec(STQ* pTq, char* msg, int32_t msgLen, int32_t workerId) {
   SStreamTaskExecReq req;
   tDecodeSStreamTaskExecReq(msg, &req);
 
@@ -515,7 +514,7 @@ int32_t tqProcessTaskExec(STQ* pTq, char* msg, int32_t msgLen) {
   SStreamTask* pTask = taosHashGet(pTq->pStreamTasks, &taskId, sizeof(int32_t));
   ASSERT(pTask);
 
-  if (streamExecTask(pTask, &pTq->pVnode->msgCb, req.data, STREAM_DATA_TYPE_SSDATA_BLOCK, 0) < 0) {
+  if (streamExecTask(pTask, &pTq->pVnode->msgCb, req.data, STREAM_DATA_TYPE_SSDATA_BLOCK, workerId) < 0) {
     // TODO
   }
   return 0;
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index 3d9d9a90dd..9c0b0802ab 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -167,8 +167,10 @@ SArray* tqRetrieveDataBlock(STqReadHandle* pHandle) {
       if (!tdSTSRowIterNext(&iter, pColData->info.colId, pColData->info.type, &sVal)) {
         break;
       }
-      // TODO handle null
-      colDataAppend(pColData, curRow, sVal.val, sVal.valType == TD_VTYPE_NULL);
+      if (colDataAppend(pColData, curRow, sVal.val, sVal.valType == TD_VTYPE_NULL) < 0) {
+        taosArrayDestroyEx(pArray, (void (*)(void*))tDeleteSSDataBlock);
+        return NULL;
+      }
     }
     curRow++;
   }
diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index 07eafd6df0..f04f4791b5 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -24,7 +24,7 @@ static const char *TSDB_SMA_DNAME[] = {
 #define SMA_STORAGE_TSDB_DAYS   30
 #define SMA_STORAGE_TSDB_TIMES  10
 #define SMA_STORAGE_SPLIT_HOURS 24
-#define SMA_KEY_LEN             18  // tableUid_colId_TSKEY 8+2+8
+#define SMA_KEY_LEN             16  // TSKEY+groupId 8+8
 #define SMA_DROP_EXPIRED_TIME   10  // default is 10 seconds
 
 #define SMA_STATE_HASH_SLOT      4
@@ -38,10 +38,10 @@ typedef enum {
 } ESmaStorageLevel;
 
 typedef struct {
-  STsdb       *pTsdb;
-  SDBFile      dFile;
-  SSDataBlock *pData;     // sma data
-  int32_t      interval;  // interval with the precision of DB
+  STsdb        *pTsdb;
+  SDBFile       dFile;
+  const SArray *pDataBlocks;  // sma data
+  int32_t       interval;     // interval with the precision of DB
 } STSmaWriteH;
 
 typedef struct {
@@ -94,26 +94,24 @@ static int32_t  tsdbUnRefSmaStat(STsdb *pTsdb, SSmaStat *pStat);
 
 // read data
 // TODO: This is the basic params, and should wrap the params to a queryHandle.
-static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSmaDataWrapper *pData, int64_t indexUid, int64_t interval,
-                                   int8_t intervalUnit, tb_uid_t tableUid, col_id_t colId, TSKEY querySKey,
-                                   int32_t nMaxResult);
+static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult);
 
 // insert data
-static int32_t tsdbInitTSmaWriteH(STSmaWriteH *pSmaH, STsdb *pTsdb, SSDataBlock *pData, int64_t interval,
+static int32_t tsdbInitTSmaWriteH(STSmaWriteH *pSmaH, STsdb *pTsdb, const SArray *pDataBlocks, int64_t interval,
                                   int8_t intervalUnit);
 static void    tsdbDestroyTSmaWriteH(STSmaWriteH *pSmaH);
 static int32_t tsdbInitTSmaReadH(STSmaReadH *pSmaH, STsdb *pTsdb, int64_t interval, int8_t intervalUnit);
 static int32_t tsdbGetSmaStorageLevel(int64_t interval, int8_t intervalUnit);
-static int32_t tsdbInsertTSmaDataSection(STSmaWriteH *pSmaH, STSmaDataWrapper *pData);
+static int32_t tsdbSetRSmaDataFile(STSmaWriteH *pSmaH, int32_t fid);
 static int32_t tsdbInsertTSmaBlocks(STSmaWriteH *pSmaH, void *smaKey, uint32_t keyLen, void *pData, uint32_t dataLen);
-static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit, int8_t precision);
+static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit, int8_t precision, bool adjusted);
 static int32_t tsdbGetTSmaDays(STsdb *pTsdb, int64_t interval, int32_t storageLevel);
-static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int64_t indexUid, int32_t fid);
+static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, int64_t indexUid, int32_t fid);
 static int32_t tsdbInitTSmaFile(STSmaReadH *pSmaH, int64_t indexUid, TSKEY skey);
 static bool    tsdbSetAndOpenTSmaFile(STSmaReadH *pReadH, TSKEY *queryKey);
 static void    tsdbGetSmaDir(int32_t vgId, ETsdbSmaType smaType, char dirName[]);
-static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg);
-static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg);
+static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, int64_t indexUid, const char *msg);
+static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, const char *msg);
 
 // mgmt interface
 static int32_t tsdbDropTSmaDataImpl(STsdb *pTsdb, int64_t indexUid);
@@ -387,7 +385,6 @@ static int32_t tsdbCheckAndInitSmaEnv(STsdb *pTsdb, int8_t smaType) {
   return TSDB_CODE_SUCCESS;
 };
 
-
 static int32_t tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey) {
   SSmaStatItem *pItem = taosHashGet(pItemsHash, &indexUid, sizeof(indexUid));
   if (pItem == NULL) {
@@ -480,18 +477,15 @@ int32_t tsdbUpdateExpiredWindowImpl(STsdb *pTsdb, const char *msg) {
   TSKEY expiredWindows[SMA_TEST_EXPIRED_WINDOW_SIZE];
 #endif
 
-
   // Firstly, assume that tSma can only be created on super table/normal table.
   // getActiveTimeWindow
 
-
-  SSmaEnv *pEnv = REPO_SMA_ENV(pTsdb, TSDB_SMA_TYPE_TIME_RANGE);
+  SSmaEnv  *pEnv = REPO_SMA_ENV(pTsdb, TSDB_SMA_TYPE_TIME_RANGE);
   SSmaStat *pStat = SMA_ENV_STAT(pEnv);
   SHashObj *pItemsHash = SMA_ENV_STAT_ITEMS(pEnv);
 
   TASSERT(pEnv != NULL && pStat != NULL && pItemsHash != NULL);
 
-
   // basic procedure
   // TODO: optimization
   tsdbRefSmaStat(pTsdb, pStat);
@@ -523,11 +517,11 @@ int32_t tsdbUpdateExpiredWindowImpl(STsdb *pTsdb, const char *msg) {
         tdFreeTSmaWrapper(pSW);
         break;
       }
-      if(pSW == NULL) {
-        if((pSW =metaGetSmaInfoByTable(REPO_META(pTsdb), pBlock->suid)) == NULL) {
+      if (pSW == NULL) {
+        if ((pSW = metaGetSmaInfoByTable(REPO_META(pTsdb), pBlock->suid)) == NULL) {
           break;
         }
-        if((pSW->number) <= 0 || (pSW->tSma == NULL)) {
+        if ((pSW->number) <= 0 || (pSW->tSma == NULL)) {
           tdFreeTSmaWrapper(pSW);
           break;
         }
@@ -657,9 +651,8 @@ static int32_t tsdbGetSmaStorageLevel(int64_t interval, int8_t intervalUnit) {
  */
 static int32_t tsdbInsertTSmaBlocks(STSmaWriteH *pSmaH, void *smaKey, uint32_t keyLen, void *pData, uint32_t dataLen) {
   SDBFile *pDBFile = &pSmaH->dFile;
-  tsdbDebug("vgId:%d insert sma data blocks into %s: smaKey %" PRIx64 "-%" PRIu16 "-%" PRIx64 ", dataLen %d",
-            REPO_ID(pSmaH->pTsdb), pDBFile->path, *(tb_uid_t *)smaKey, *(uint16_t *)POINTER_SHIFT(smaKey, 8),
-            *(int64_t *)POINTER_SHIFT(smaKey, 10), dataLen);
+  printf("\nvgId:%d insert sma data blocks into %s: smaKey %" PRIx64 "-%" PRIx64 ", dataLen %" PRIu32 "\n",
+         REPO_ID(pSmaH->pTsdb), pDBFile->path, *(int64_t *)smaKey, *(int64_t *)POINTER_SHIFT(smaKey, 8), dataLen);
 
   // TODO: insert sma data blocks into B+Tree(TDB)
   if (tsdbSaveSmaToDB(pDBFile, smaKey, keyLen, pData, dataLen) != 0) {
@@ -683,9 +676,15 @@ static int32_t tsdbInsertTSmaBlocks(STSmaWriteH *pSmaH, void *smaKey, uint32_t k
  * @param interval
  * @param intervalUnit
  * @param precision
+ * @param adjusted Interval already adjusted according to DB precision
  * @return int64_t
  */
-static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit, int8_t precision) {
+static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit, int8_t precision, bool adjusted) {
+  
+  if (adjusted) {
+    return interval;
+  }
+
   switch (intervalUnit) {
     case TIME_UNIT_YEAR:  // approximate value
       interval *= 365 * 86400 * 1e3;
@@ -753,59 +752,12 @@ static int64_t tsdbGetIntervalByPrecision(int64_t interval, uint8_t intervalUnit
   return interval;
 }
 
-/**
- * @brief Split the TSma data blocks into expected size and insert into B+Tree.
- *
- * @param pSmaH
- * @param pData
- * @param nOffset The nOffset of blocks since fid changes.
- * @param nBlocks The nBlocks with the same fid since nOffset.
- * @return int32_t
- */
-static int32_t tsdbInsertTSmaDataSection(STSmaWriteH *pSmaH, STSmaDataWrapper *pData) {
-  STsdb *pTsdb = pSmaH->pTsdb;
-
-  tsdbDebug("tsdbInsertTSmaDataSection: index %" PRIi64 ", skey %" PRIi64, pData->indexUid, pData->skey);
-
-  // TODO: check the data integrity
-
-  int32_t len = 0;
-  while (true) {
-    if (len >= pData->dataLen) {
-      break;
-    }
-    assert(pData->dataLen > 0);
-    STSmaTbData *pTbData = (STSmaTbData *)POINTER_SHIFT(pData->data, len);
-
-    int32_t tbLen = 0;
-    while (true) {
-      if (tbLen >= pTbData->dataLen) {
-        break;
-      }
-      assert(pTbData->dataLen > 0);
-      STSmaColData *pColData = (STSmaColData *)POINTER_SHIFT(pTbData->data, tbLen);
-      char          smaKey[SMA_KEY_LEN] = {0};
-      void         *pSmaKey = &smaKey;
-#if 0
-      printf("tsdbInsertTSmaDataSection: index %" PRIi64 ", skey %" PRIi64 " table[%" PRIi64 "]col[%" PRIu16 "]\n",
-             pData->indexUid, pData->skey, pTbData->tableUid, pColData->colId);
-#endif
-      tsdbEncodeTSmaKey(pTbData->tableUid, pColData->colId, pData->skey, (void **)&pSmaKey);
-      if (tsdbInsertTSmaBlocks(pSmaH, smaKey, SMA_KEY_LEN, pColData->data, pColData->blockSize) < 0) {
-        tsdbWarn("vgId:%d insert tSma blocks failed since %s", REPO_ID(pTsdb), tstrerror(terrno));
-      }
-      tbLen += (sizeof(STSmaColData) + pColData->blockSize);
-    }
-    len += (sizeof(STSmaTbData) + pTbData->dataLen);
-  }
-
-  return TSDB_CODE_SUCCESS;
-}
-
-static int32_t tsdbInitTSmaWriteH(STSmaWriteH *pSmaH, STsdb *pTsdb, SSDataBlock *pData, int64_t interval, int8_t intervalUnit) {
+static int32_t tsdbInitTSmaWriteH(STSmaWriteH *pSmaH, STsdb *pTsdb, const SArray *pDataBlocks, int64_t interval,
+                                  int8_t intervalUnit) {
   pSmaH->pTsdb = pTsdb;
-  pSmaH->interval = tsdbGetIntervalByPrecision(interval, intervalUnit, REPO_CFG(pTsdb)->precision);
-  pSmaH->pData = pData;
+  pSmaH->interval = tsdbGetIntervalByPrecision(interval, intervalUnit, REPO_CFG(pTsdb)->precision, true);
+  pSmaH->pDataBlocks = pDataBlocks;
+  pSmaH->dFile.fid = TSDB_IVLD_FID;
   return TSDB_CODE_SUCCESS;
 }
 
@@ -815,7 +767,7 @@ static void tsdbDestroyTSmaWriteH(STSmaWriteH *pSmaH) {
   }
 }
 
-static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int64_t indexUid, int32_t fid) {
+static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, int64_t indexUid, int32_t fid) {
   STsdb *pTsdb = pSmaH->pTsdb;
   ASSERT(pSmaH->dFile.path == NULL && pSmaH->dFile.pDB == NULL);
 
@@ -859,11 +811,10 @@ static int32_t tsdbGetTSmaDays(STsdb *pTsdb, int64_t interval, int32_t storageLe
  * @param msg
  * @return int32_t
  */
-static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
-  STsdbCfg    *pCfg = REPO_CFG(pTsdb);
-  SSDataBlock *pData = (SSDataBlock *)msg;
-  SSmaEnv     *pEnv = atomic_load_ptr(&pTsdb->pTSmaEnv);
-  int64_t      indexUid = SMA_TEST_INDEX_UID;
+static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, int64_t indexUid, const char *msg) {
+  STsdbCfg     *pCfg = REPO_CFG(pTsdb);
+  const SArray *pDataBlocks = (const SArray *)msg;
+  SSmaEnv      *pEnv = atomic_load_ptr(&pTsdb->pTSmaEnv);
 
   if (pEnv == NULL) {
     terrno = TSDB_CODE_INVALID_PTR;
@@ -871,15 +822,15 @@ static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
     return terrno;
   }
 
-  if (pData == NULL) {
+  if (pDataBlocks == NULL) {
     terrno = TSDB_CODE_INVALID_PTR;
-    tsdbWarn("vgId:%d insert tSma data failed since pData is NULL", REPO_ID(pTsdb));
+    tsdbWarn("vgId:%d insert tSma data failed since pDataBlocks is NULL", REPO_ID(pTsdb));
     return terrno;
   }
 
-  if (taosArrayGetSize(pData->pDataBlock) <= 0) {
+  if (taosArrayGetSize(pDataBlocks) <= 0) {
     terrno = TSDB_CODE_INVALID_PARA;
-    tsdbWarn("vgId:%d insert tSma data failed since pDataBlock is empty", REPO_ID(pTsdb));
+    tsdbWarn("vgId:%d insert tSma data failed since pDataBlocks is empty", REPO_ID(pTsdb));
     return TSDB_CODE_FAILED;
   }
 
@@ -899,10 +850,9 @@ static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
   }
 
   STSma *pSma = pItem->pSma;
-
   STSmaWriteH tSmaH = {0};
 
-  if (tsdbInitTSmaWriteH(&tSmaH, pTsdb, pData, pSma->interval, pSma->intervalUnit) != 0) {
+  if (tsdbInitTSmaWriteH(&tSmaH, pTsdb, pDataBlocks, pSma->interval, pSma->intervalUnit) != 0) {
     return TSDB_CODE_FAILED;
   }
 
@@ -921,33 +871,134 @@ static int32_t tsdbInsertTSmaDataImpl(STsdb *pTsdb, char *msg) {
   int32_t storageLevel = tsdbGetSmaStorageLevel(pSma->interval, pSma->intervalUnit);
   int32_t daysPerFile = tsdbGetTSmaDays(pTsdb, tSmaH.interval, storageLevel);
 
+  // key: skey + groupId
+  char    smaKey[SMA_KEY_LEN] = {0};
+  char    dataBuf[512] = {0};
+  void   *pDataBuf = &dataBuf;
+  int32_t sz = taosArrayGetSize(pDataBlocks);
+  for (int32_t i = 0; i < sz; ++i) {
+    SSDataBlock *pDataBlock = *(SSDataBlock **)taosArrayGet(pDataBlocks, i);
+    int32_t      colNum = pDataBlock->info.numOfCols;
+    int32_t      rows = pDataBlock->info.rows;
+    int32_t      rowSize = pDataBlock->info.rowSize;
+    int64_t      groupId = pDataBlock->info.groupId;
+    for (int32_t j = 0; j < rows; ++j) {
+      printf("|");
+      TSKEY   skey = TSKEY_INITIAL_VAL;  // the start key of TS window by interval
+      void   *pSmaKey = &smaKey;
+      int32_t tlen = 0;
+      for (int32_t k = 0; k < colNum; ++k) {
+        SColumnInfoData *pColInfoData = *(SColumnInfoData **)taosArrayGet(pDataBlock->pDataBlock, k);
+        void            *var = POINTER_SHIFT(pColInfoData->pData, j * pColInfoData->info.bytes);
+        switch (pColInfoData->info.type) {
+          case TSDB_DATA_TYPE_TIMESTAMP:
+            skey = *(TSKEY *)var;
+            printf("==> skey = %" PRIi64 " groupId = %" PRId64 "|", skey, groupId);
+            tsdbEncodeTSmaKey(groupId, skey, &pSmaKey);
+            break;
+          case TSDB_DATA_TYPE_BOOL:
+          case TSDB_DATA_TYPE_UTINYINT:
+            printf(" %15d |", *(uint8_t *)var);
+            tlen += taosEncodeFixedU8(&pDataBuf, *(uint8_t *)var);
+            break;
+          case TSDB_DATA_TYPE_TINYINT:
+            printf(" %15d |", *(int8_t *)var);
+            tlen += taosEncodeFixedI8(&pDataBuf, *(int8_t *)var);
+            break;
+          case TSDB_DATA_TYPE_SMALLINT:
+            printf(" %15d |", *(int16_t *)var);
+            tlen += taosEncodeFixedI16(&pDataBuf, *(int16_t *)var);
+            break;
+          case TSDB_DATA_TYPE_USMALLINT:
+            printf(" %15d |", *(uint16_t *)var);
+            tlen += taosEncodeFixedU16(&pDataBuf, *(uint16_t *)var);
+            break;
+          case TSDB_DATA_TYPE_INT:
+            printf(" %15d |", *(int32_t *)var);
+            tlen += taosEncodeFixedI32(&pDataBuf, *(int32_t *)var);
+            break;
+          case TSDB_DATA_TYPE_FLOAT:
+          case TSDB_DATA_TYPE_UINT:
+            printf(" %15u |", *(uint32_t *)var);
+            tlen += taosEncodeFixedU32(&pDataBuf, *(uint32_t *)var);
+            break;
+          case TSDB_DATA_TYPE_BIGINT:
+            printf(" %15ld |", *(int64_t *)var);
+            tlen += taosEncodeFixedI64(&pDataBuf, *(int64_t *)var);
+            break;
+          case TSDB_DATA_TYPE_DOUBLE:
+          case TSDB_DATA_TYPE_UBIGINT:
+            printf(" %15lu |", *(uint64_t *)var);
+            tlen += taosEncodeFixedU64(&pDataBuf, *(uint64_t *)var);
+            break;
+          case TSDB_DATA_TYPE_NCHAR: {
+            char tmpChar[100] = {0};
+            strncpy(tmpChar, varDataVal(var), varDataLen(var));
+            printf(" %s |", tmpChar);
+            tlen += taosEncodeBinary(&pDataBuf, varDataVal(var), varDataLen(var));
+            break;
+          }
+          case TSDB_DATA_TYPE_VARCHAR: { // TSDB_DATA_TYPE_BINARY
+                      char tmpChar[100] = {0};
+            strncpy(tmpChar, varDataVal(var), varDataLen(var));
+            printf(" %s |", tmpChar);
+            tlen += taosEncodeBinary(&pDataBuf, varDataVal(var), varDataLen(var));
+            break;
+          }
+          case TSDB_DATA_TYPE_VARBINARY:
+            // TODO: add binary/varbinary
+            TASSERT(0);
+          default:
+            printf("the column type %" PRIi16 " is undefined\n", pColInfoData->info.type);
+            TASSERT(0);
+            break;
+        }
+      }
+      if ((tlen > 0) && (skey != TSKEY_INITIAL_VAL)) {
+        int32_t fid = (int32_t)(TSDB_KEY_FID(skey, daysPerFile, pCfg->precision));
 
-#if 0  
-  int32_t fid = (int32_t)(TSDB_KEY_FID(pData->skey, daysPerFile, pCfg->precision));
+        // Step 2: Set the DFile for storage of SMA index, and iterate/split the TSma data and store to B+Tree index
+        // file
+        //         - Set and open the DFile or the B+Tree file
+        // TODO: tsdbStartTSmaCommit();
+        if (fid != tSmaH.dFile.fid) {
+          if (tSmaH.dFile.fid != TSDB_IVLD_FID) {
+            tsdbCloseDBF(&tSmaH.dFile);
+          }
+          tsdbSetTSmaDataFile(&tSmaH, indexUid, fid);
+          if (tsdbOpenDBF(pTsdb->pTSmaEnv->dbEnv, &tSmaH.dFile) != 0) {
+            tsdbWarn("vgId:%d open DB file %s failed since %s", REPO_ID(pTsdb),
+                     tSmaH.dFile.path ? tSmaH.dFile.path : "path is NULL", tstrerror(terrno));
+            tsdbDestroyTSmaWriteH(&tSmaH);
+            tsdbUnRefSmaStat(pTsdb, pStat);
+            return TSDB_CODE_FAILED;
+          }
+        }
 
-  // Step 2: Set the DFile for storage of SMA index, and iterate/split the TSma data and store to B+Tree index file
-  //         - Set and open the DFile or the B+Tree file
-  // TODO: tsdbStartTSmaCommit();
-  tsdbSetTSmaDataFile(&tSmaH, pData, indexUid, fid);
-  if (tsdbOpenDBF(pTsdb->pTSmaEnv->dbEnv, &tSmaH.dFile) != 0) {
-    tsdbWarn("vgId:%d open DB file %s failed since %s", REPO_ID(pTsdb),
-             tSmaH.dFile.path ? tSmaH.dFile.path : "path is NULL", tstrerror(terrno));
-    tsdbDestroyTSmaWriteH(&tSmaH);
-    tsdbUnRefSmaStat(pTsdb, pStat);
-    return TSDB_CODE_FAILED;
+        if (tsdbInsertTSmaBlocks(&tSmaH, &smaKey, SMA_KEY_LEN, pDataBuf, tlen) != 0) {
+          tsdbWarn("vgId:%d insert tSma data blocks failed for index %" PRIi64 ", skey %" PRIi64 ", groupId %" PRIi64
+                   " since %s",
+                   REPO_ID(pTsdb), indexUid, skey, groupId, tstrerror(terrno));
+          tsdbDestroyTSmaWriteH(&tSmaH);
+          tsdbUnRefSmaStat(pTsdb, pStat);
+          return TSDB_CODE_FAILED;
+        } else {
+          tsdbWarn("vgId:%d insert tSma data blocks success for index %" PRIi64 ", skey %" PRIi64 ", groupId %" PRIi64,
+                   REPO_ID(pTsdb), indexUid, skey, groupId);
+        }
+        // TODO:tsdbEndTSmaCommit();
+
+        // Step 3: reset the SSmaStat
+        tsdbResetExpiredWindow(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv), indexUid, skey);
+      } else {
+        tsdbWarn("vgId:%d invalid data skey:%" PRIi64 ", tlen %" PRIi32 " during insert tSma data for %" PRIi64,
+                 REPO_ID(pTsdb), skey, tlen, indexUid);
+      }
+
+      printf("\n");
+    }
   }
 
-  if (tsdbInsertTSmaDataSection(&tSmaH, pData) != 0) {
-    tsdbWarn("vgId:%d insert tSma data section failed since %s", REPO_ID(pTsdb), tstrerror(terrno));
-    tsdbDestroyTSmaWriteH(&tSmaH);
-    tsdbUnRefSmaStat(pTsdb, pStat);
-    return TSDB_CODE_FAILED;
-  }
-  // TODO:tsdbEndTSmaCommit();
-
-  // Step 3: reset the SSmaStat
-  tsdbResetExpiredWindow(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv), pData->indexUid, pData->skey);
-#endif
   tsdbDestroyTSmaWriteH(&tSmaH);
   tsdbUnRefSmaStat(pTsdb, pStat);
   return TSDB_CODE_SUCCESS;
@@ -1002,7 +1053,7 @@ static int32_t tsdbDropTSmaDataImpl(STsdb *pTsdb, int64_t indexUid) {
   // TODO:
 }
 
-static int32_t tsdbSetRSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData, int32_t fid) {
+static int32_t tsdbSetRSmaDataFile(STSmaWriteH *pSmaH, int32_t fid) {
   STsdb *pTsdb = pSmaH->pTsdb;
 
   char tSmaFile[TSDB_FILENAME_LEN] = {0};
@@ -1012,11 +1063,11 @@ static int32_t tsdbSetRSmaDataFile(STSmaWriteH *pSmaH, STSmaDataWrapper *pData,
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg) {
-  STsdbCfg    *pCfg = REPO_CFG(pTsdb);
-  SSDataBlock *pData = (SSDataBlock *)msg;
-  SSmaEnv     *pEnv = atomic_load_ptr(&pTsdb->pRSmaEnv);
-  int64_t      indexUid = SMA_TEST_INDEX_UID;
+static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, const char *msg) {
+  STsdbCfg     *pCfg = REPO_CFG(pTsdb);
+  const SArray *pDataBlocks = (const SArray *)msg;
+  SSmaEnv      *pEnv = atomic_load_ptr(&pTsdb->pRSmaEnv);
+  int64_t       indexUid = SMA_TEST_INDEX_UID;
 
   if (pEnv == NULL) {
     terrno = TSDB_CODE_INVALID_PTR;
@@ -1030,15 +1081,15 @@ static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg) {
     return terrno;
   }
 
-  if (pData == NULL) {
+  if (pDataBlocks == NULL) {
     terrno = TSDB_CODE_INVALID_PTR;
-    tsdbWarn("vgId:%d insert rSma data failed since pData is NULL", REPO_ID(pTsdb));
+    tsdbWarn("vgId:%d insert rSma data failed since pDataBlocks is NULL", REPO_ID(pTsdb));
     return terrno;
   }
 
-  if (taosArrayGetSize(pData->pDataBlock) <= 0) {
+  if (taosArrayGetSize(pDataBlocks) <= 0) {
     terrno = TSDB_CODE_INVALID_PARA;
-    tsdbWarn("vgId:%d insert rSma data failed since pDataBlock is empty", REPO_ID(pTsdb));
+    tsdbWarn("vgId:%d insert rSma data failed since pDataBlocks is empty", REPO_ID(pTsdb));
     return TSDB_CODE_FAILED;
   }
 
@@ -1061,12 +1112,12 @@ static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg) {
 
   STSmaWriteH tSmaH = {0};
 
-  if (tsdbInitTSmaWriteH(&tSmaH, pTsdb, pData, pSma->interval, pSma->intervalUnit) != 0) {
+  if (tsdbInitTSmaWriteH(&tSmaH, pTsdb, pDataBlocks, pSma->interval, pSma->intervalUnit) != 0) {
     return TSDB_CODE_FAILED;
   }
 
-  char    rPath[TSDB_FILENAME_LEN] = {0};
-  char    aPath[TSDB_FILENAME_LEN] = {0};
+  char rPath[TSDB_FILENAME_LEN] = {0};
+  char aPath[TSDB_FILENAME_LEN] = {0};
   snprintf(rPath, TSDB_FILENAME_LEN, "%s%s%" PRIi64, SMA_ENV_PATH(pEnv), TD_DIRSEP, indexUid);
   tfsAbsoluteName(REPO_TFS(pTsdb), SMA_ENV_DID(pEnv), rPath, aPath);
   if (!taosCheckExistFile(aPath)) {
@@ -1078,7 +1129,7 @@ static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg) {
   // Step 1: Judge the storage level and days
   int32_t storageLevel = tsdbGetSmaStorageLevel(pSma->interval, pSma->intervalUnit);
   int32_t daysPerFile = tsdbGetTSmaDays(pTsdb, tSmaH.interval, storageLevel);
-  #if 0
+#if 0
   int32_t fid = (int32_t)(TSDB_KEY_FID(pData->skey, daysPerFile, pCfg->precision));
 
   // Step 2: Set the DFile for storage of SMA index, and iterate/split the TSma data and store to B+Tree index file
@@ -1119,7 +1170,7 @@ static int32_t tsdbInsertRSmaDataImpl(STsdb *pTsdb, char *msg) {
  */
 static int32_t tsdbInitTSmaReadH(STSmaReadH *pSmaH, STsdb *pTsdb, int64_t interval, int8_t intervalUnit) {
   pSmaH->pTsdb = pTsdb;
-  pSmaH->interval = tsdbGetIntervalByPrecision(interval, intervalUnit, REPO_CFG(pTsdb)->precision);
+  pSmaH->interval = tsdbGetIntervalByPrecision(interval, intervalUnit, REPO_CFG(pTsdb)->precision, true);
   pSmaH->storageLevel = tsdbGetSmaStorageLevel(interval, intervalUnit);
   pSmaH->days = tsdbGetTSmaDays(pTsdb, pSmaH->interval, pSmaH->storageLevel);
 }
@@ -1185,17 +1236,11 @@ static bool tsdbSetAndOpenTSmaFile(STSmaReadH *pReadH, TSKEY *queryKey) {
  * @param pTsdb Return the data between queryWin and fill the pData.
  * @param pData
  * @param indexUid
- * @param interval
- * @param intervalUnit
- * @param tableUid
- * @param colId
  * @param pQuerySKey
  * @param nMaxResult The query invoker should control the nMaxResult need to return to avoid OOM.
  * @return int32_t
  */
-static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSmaDataWrapper *pData, int64_t indexUid, int64_t interval,
-                                   int8_t intervalUnit, tb_uid_t tableUid, col_id_t colId, TSKEY querySKey,
-                                   int32_t nMaxResult) {
+static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, char *pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult) {
   SSmaEnv *pEnv = atomic_load_ptr(&pTsdb->pTSmaEnv);
 
   if (!pEnv) {
@@ -1243,13 +1288,18 @@ static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSmaDataWrapper *pData, int64_
     tsdbDebug("vgId:%d skey %" PRIi64 " of window not in expired window for index %" PRIi64, REPO_ID(pTsdb), querySKey,
               indexUid);
   }
-  tsdbUnRefSmaStat(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv));
+
+  STSma *pTSma = pItem->pSma;
+
+  
 
 #endif
 
   STSmaReadH tReadH = {0};
-  tsdbInitTSmaReadH(&tReadH, pTsdb, interval, intervalUnit);
+  tsdbInitTSmaReadH(&tReadH, pTsdb, pTSma->interval, pTSma->intervalUnit);
   tsdbCloseDBF(&tReadH.dFile);
+  
+  tsdbUnRefSmaStat(pTsdb, SMA_ENV_STAT(pTsdb->pTSmaEnv));
 
   tsdbInitTSmaFile(&tReadH, indexUid, querySKey);
   if (tsdbOpenDBF(SMA_ENV_ENV(pTsdb->pTSmaEnv), &tReadH.dFile) != 0) {
@@ -1257,21 +1307,19 @@ static int32_t tsdbGetTSmaDataImpl(STsdb *pTsdb, STSmaDataWrapper *pData, int64_
     return TSDB_CODE_FAILED;
   }
 
-  char  smaKey[SMA_KEY_LEN] = {0};
-  void *pSmaKey = &smaKey;
-  tsdbEncodeTSmaKey(tableUid, colId, querySKey, (void **)&pSmaKey);
+  char    smaKey[SMA_KEY_LEN] = {0};
+  void   *pSmaKey = &smaKey;
+  int64_t queryGroupId = 1;
+  tsdbEncodeTSmaKey(queryGroupId, querySKey, (void **)&pSmaKey);
 
-  tsdbDebug("vgId:%d get sma data from %s: smaKey %" PRIx64 "-%" PRIu16 "-%" PRIx64 ", keyLen %d", REPO_ID(pTsdb),
-            tReadH.dFile.path, *(tb_uid_t *)smaKey, *(uint16_t *)POINTER_SHIFT(smaKey, 8),
-            *(int64_t *)POINTER_SHIFT(smaKey, 10), SMA_KEY_LEN);
+  tsdbDebug("vgId:%d get sma data from %s: smaKey %" PRIx64 "-%" PRIx64 ", keyLen %d", REPO_ID(pTsdb),
+            tReadH.dFile.path, *(int64_t *)smaKey, *(int64_t *)POINTER_SHIFT(smaKey, 8), SMA_KEY_LEN);
 
   void    *result = NULL;
   uint32_t valueSize = 0;
   if ((result = tsdbGetSmaDataByKey(&tReadH.dFile, smaKey, SMA_KEY_LEN, &valueSize)) == NULL) {
-    tsdbWarn("vgId:%d get sma data failed from smaIndex %" PRIi64 ", smaKey %" PRIx64 "-%" PRIu16 "-%" PRIx64
-             " since %s",
-             REPO_ID(pTsdb), indexUid, *(tb_uid_t *)smaKey, *(uint16_t *)POINTER_SHIFT(smaKey, 8),
-             *(int64_t *)POINTER_SHIFT(smaKey, 10), tstrerror(terrno));
+    tsdbWarn("vgId:%d get sma data failed from smaIndex %" PRIi64 ", smaKey %" PRIx64 "-%" PRIx64 " since %s",
+             REPO_ID(pTsdb), indexUid, *(int64_t *)smaKey, *(int64_t *)POINTER_SHIFT(smaKey, 8), tstrerror(terrno));
     tsdbCloseDBF(&tReadH.dFile);
     return TSDB_CODE_FAILED;
   }
@@ -1347,11 +1395,10 @@ int32_t tsdbRemoveTSmaData(STsdb *pTsdb, void *smaIndex, STimeWindow *pWin) {
 }
 #endif
 
-
 // TODO: Who is responsible for resource allocate and release?
-int32_t tsdbInsertTSmaData(STsdb *pTsdb, char *msg) {
+int32_t tsdbInsertTSmaData(STsdb *pTsdb, int64_t indexUid, const char *msg) {
   int32_t code = TSDB_CODE_SUCCESS;
-  if ((code = tsdbInsertTSmaDataImpl(pTsdb, msg)) < 0) {
+  if ((code = tsdbInsertTSmaDataImpl(pTsdb, indexUid, msg)) < 0) {
     tsdbWarn("vgId:%d insert tSma data failed since %s", REPO_ID(pTsdb), tstrerror(terrno));
   }
   return code;
@@ -1373,18 +1420,14 @@ int32_t tsdbInsertRSmaData(STsdb *pTsdb, char *msg) {
   return code;
 }
 
-
-int32_t tsdbGetTSmaData(STsdb *pTsdb, STSmaDataWrapper *pData, int64_t indexUid, int64_t interval, int8_t intervalUnit,
-                        tb_uid_t tableUid, col_id_t colId, TSKEY querySKey, int32_t nMaxResult) {
+int32_t tsdbGetTSmaData(STsdb *pTsdb, char*pData, int64_t indexUid, TSKEY querySKey, int32_t nMaxResult) {
   int32_t code = TSDB_CODE_SUCCESS;
-  if ((code = tsdbGetTSmaDataImpl(pTsdb, pData, indexUid, interval, intervalUnit, tableUid, colId, querySKey,
-                                  nMaxResult)) < 0) {
+  if ((code = tsdbGetTSmaDataImpl(pTsdb, pData, indexUid, querySKey, nMaxResult)) < 0) {
     tsdbWarn("vgId:%d get tSma data failed since %s", REPO_ID(pTsdb), tstrerror(terrno));
   }
   return code;
 }
 
-
 int32_t tsdbDropTSmaData(STsdb *pTsdb, int64_t indexUid) {
   int32_t code = TSDB_CODE_SUCCESS;
   if ((code = tsdbDropTSmaDataImpl(pTsdb, indexUid)) < 0) {
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index 8ebdad48f7..598647f797 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -41,7 +41,7 @@ int vnodeProcessQueryMsg(SVnode *pVnode, SRpcMsg *pMsg) {
   }
 }
 
-int vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg) {
+int vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
   vTrace("message in fetch queue is processing");
   char   *msgstr = POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead));
   int32_t msgLen = pMsg->contLen - sizeof(SMsgHead);
@@ -69,9 +69,9 @@ int vnodeProcessFetchMsg(SVnode *pVnode, SRpcMsg *pMsg) {
       return tqProcessPollReq(pVnode->pTq, pMsg);
     case TDMT_VND_TASK_PIPE_EXEC:
     case TDMT_VND_TASK_MERGE_EXEC:
-      return tqProcessTaskExec(pVnode->pTq, msgstr, msgLen);
+      return tqProcessTaskExec(pVnode->pTq, msgstr, msgLen, pInfo->workerId);
     case TDMT_VND_STREAM_TRIGGER:
-      return tqProcessStreamTrigger(pVnode->pTq, pMsg->pCont, pMsg->contLen);
+      return tqProcessStreamTrigger(pVnode->pTq, pMsg->pCont, pMsg->contLen, pInfo->workerId);
     case TDMT_VND_QUERY_HEARTBEAT:
       return qWorkerProcessHbMsg(pVnode, pVnode->pQuery, pMsg);
     default:
diff --git a/source/dnode/vnode/src/vnd/vnodeWrite.c b/source/dnode/vnode/src/vnd/vnodeWrite.c
index c220e6001f..d6f9f0da0b 100644
--- a/source/dnode/vnode/src/vnd/vnodeWrite.c
+++ b/source/dnode/vnode/src/vnd/vnodeWrite.c
@@ -17,7 +17,9 @@
 
 void smaHandleRes(void *pVnode, int64_t smaId, const SArray *data) {
   // TODO
+
   blockDebugShowData(data);
+  tsdbInsertTSmaData(((SVnode *)pVnode)->pTsdb, smaId, (const char *)data);
 }
 
 void vnodeProcessWMsgs(SVnode *pVnode, SArray *pMsgs) {
@@ -184,24 +186,25 @@ int vnodeApplyWMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
       }
     } break;
     case TDMT_VND_TASK_WRITE_EXEC: {
-      if (tqProcessTaskExec(pVnode->pTq, POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead)),
-                            pMsg->contLen - sizeof(SMsgHead)) < 0) {
+      if (tqProcessTaskExec(pVnode->pTq, POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead)), pMsg->contLen - sizeof(SMsgHead),
+                            0) < 0) {
       }
     } break;
     case TDMT_VND_CREATE_SMA: {  // timeRangeSMA
 #if 1
-      
+
       SSmaCfg vCreateSmaReq = {0};
       if (tDeserializeSVCreateTSmaReq(POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead)), &vCreateSmaReq) == NULL) {
         terrno = TSDB_CODE_OUT_OF_MEMORY;
-        vWarn("vgId%d: TDMT_VND_CREATE_SMA received but deserialize failed since %s", pVnode->config.vgId, terrstr(terrno));
+        vWarn("vgId%d: TDMT_VND_CREATE_SMA received but deserialize failed since %s", pVnode->config.vgId,
+              terrstr(terrno));
         return -1;
       }
       vWarn("vgId%d: TDMT_VND_CREATE_SMA received for %s:%" PRIi64, pVnode->config.vgId, vCreateSmaReq.tSma.indexName,
             vCreateSmaReq.tSma.indexUid);
 
       // record current timezone of server side
-      tstrncpy(vCreateSmaReq.tSma.timezone, tsTimezoneStr, TD_TIMEZONE_LEN);
+      vCreateSmaReq.tSma.timezoneInt = tsTimezone;
 
       if (metaCreateTSma(pVnode->pMeta, &vCreateSmaReq) < 0) {
         // TODO: handle error
diff --git a/source/dnode/vnode/test/tsdbSmaTest.cpp b/source/dnode/vnode/test/tsdbSmaTest.cpp
index d010ea4437..db31b9f4a3 100644
--- a/source/dnode/vnode/test/tsdbSmaTest.cpp
+++ b/source/dnode/vnode/test/tsdbSmaTest.cpp
@@ -15,6 +15,7 @@
 
 #include <gtest/gtest.h>
 #include <tsdbDef.h>
+
 #include <taoserror.h>
 #include <tglobal.h>
 #include <iostream>
@@ -58,20 +59,21 @@ TEST(testCase, unionEncodeDecodeTest) {
 
   void   *buf = taosMemoryMalloc(1024);
   void   *pBuf = buf;
+  void   *qBuf = buf;
   int32_t tlen = 0;
-  tlen += taosEncodeFixedU8(&buf, sut.info);
-  tlen += taosEncodeFixedI16(&buf, sut.nBSmaCols);
+  tlen += taosEncodeFixedU8(&pBuf, sut.info);
+  tlen += taosEncodeFixedI16(&pBuf, sut.nBSmaCols);
   for (col_id_t i = 0; i < sut.nBSmaCols; ++i) {
-    tlen += taosEncodeFixedI16(&buf, sut.pBSmaCols[i]);
+    tlen += taosEncodeFixedI16(&pBuf, sut.pBSmaCols[i]);
   }
 
   SUnionTest dut = {0};
-  pBuf = taosDecodeFixedU8(pBuf, &dut.info);
-  pBuf = taosDecodeFixedI16(pBuf, &dut.nBSmaCols);
+  qBuf = taosDecodeFixedU8(qBuf, &dut.info);
+  qBuf = taosDecodeFixedI16(qBuf, &dut.nBSmaCols);
   if (dut.nBSmaCols > 0) {
     dut.pBSmaCols = (col_id_t *)taosMemoryMalloc(dut.nBSmaCols * sizeof(col_id_t));
     for (col_id_t i = 0; i < dut.nBSmaCols; ++i) {
-      pBuf = taosDecodeFixedI16(pBuf, dut.pBSmaCols + i);
+      qBuf = taosDecodeFixedI16(qBuf, dut.pBSmaCols + i);
     }
   } else {
     dut.pBSmaCols = NULL;
@@ -80,13 +82,17 @@ TEST(testCase, unionEncodeDecodeTest) {
   printf("sut.rollup=%" PRIu8 ", type=%" PRIu8 ", info=%" PRIu8 "\n", sut.rollup, sut.type, sut.info);
   printf("dut.rollup=%" PRIu8 ", type=%" PRIu8 ", info=%" PRIu8 "\n", dut.rollup, dut.type, dut.info);
 
-  ASSERT_EQ(sut.rollup, dut.rollup);
-  ASSERT_EQ(sut.type, dut.type);
-  ASSERT_EQ(sut.nBSmaCols, dut.nBSmaCols);
+  EXPECT_EQ(sut.rollup, dut.rollup);
+  EXPECT_EQ(sut.type, dut.type);
+  EXPECT_EQ(sut.nBSmaCols, dut.nBSmaCols);
   for (col_id_t i = 0; i < sut.nBSmaCols; ++i) {
-    ASSERT_EQ(*(col_id_t *)(sut.pBSmaCols + i), sut.pBSmaCols[i]);
-    ASSERT_EQ(*(col_id_t *)(sut.pBSmaCols + i), dut.pBSmaCols[i]);
+    EXPECT_EQ(*(col_id_t *)(sut.pBSmaCols + i), sut.pBSmaCols[i]);
+    EXPECT_EQ(*(col_id_t *)(sut.pBSmaCols + i), dut.pBSmaCols[i]);
   }
+
+  taosMemoryFreeClear(buf);
+  taosMemoryFreeClear(dut.pBSmaCols);
+  taosMemoryFreeClear(sut.pBSmaCols);
 }
 #if 1
 TEST(testCase, tSma_Meta_Encode_Decode_Test) {
@@ -106,37 +112,37 @@ TEST(testCase, tSma_Meta_Encode_Decode_Test) {
   uint32_t     bufLen = tEncodeTSmaWrapper(NULL, &tSmaWrapper);
 
   void *buf = taosMemoryCalloc(1, bufLen);
-  ASSERT_NE(buf, nullptr);
+  EXPECT_NE(buf, nullptr);
 
   STSmaWrapper *pSW = (STSmaWrapper *)buf;
   uint32_t      len = tEncodeTSmaWrapper(&buf, &tSmaWrapper);
 
-  ASSERT_EQ(len, bufLen);
+  EXPECT_EQ(len, bufLen);
 
   // decode
   STSmaWrapper dstTSmaWrapper = {0};
   void        *result = tDecodeTSmaWrapper(pSW, &dstTSmaWrapper);
-  ASSERT_NE(result, nullptr);
+  EXPECT_NE(result, nullptr);
 
-  ASSERT_EQ(tSmaWrapper.number, dstTSmaWrapper.number);
+  EXPECT_EQ(tSmaWrapper.number, dstTSmaWrapper.number);
 
   for (int i = 0; i < tSmaWrapper.number; ++i) {
     STSma *pSma = tSmaWrapper.tSma + i;
     STSma *qSma = dstTSmaWrapper.tSma + i;
 
-    ASSERT_EQ(pSma->version, qSma->version);
-    ASSERT_EQ(pSma->intervalUnit, qSma->intervalUnit);
-    ASSERT_EQ(pSma->slidingUnit, qSma->slidingUnit);
-    ASSERT_STRCASEEQ(pSma->indexName, qSma->indexName);
-    ASSERT_EQ(pSma->timezoneInt, qSma->timezoneInt);
-    ASSERT_EQ(pSma->indexUid, qSma->indexUid);
-    ASSERT_EQ(pSma->tableUid, qSma->tableUid);
-    ASSERT_EQ(pSma->interval, qSma->interval);
-    ASSERT_EQ(pSma->sliding, qSma->sliding);
-    ASSERT_EQ(pSma->exprLen, qSma->exprLen);
-    ASSERT_STRCASEEQ(pSma->expr, qSma->expr);
-    ASSERT_EQ(pSma->tagsFilterLen, qSma->tagsFilterLen);
-    ASSERT_STRCASEEQ(pSma->tagsFilter, qSma->tagsFilter);
+    EXPECT_EQ(pSma->version, qSma->version);
+    EXPECT_EQ(pSma->intervalUnit, qSma->intervalUnit);
+    EXPECT_EQ(pSma->slidingUnit, qSma->slidingUnit);
+    EXPECT_STRCASEEQ(pSma->indexName, qSma->indexName);
+    EXPECT_EQ(pSma->timezoneInt, qSma->timezoneInt);
+    EXPECT_EQ(pSma->indexUid, qSma->indexUid);
+    EXPECT_EQ(pSma->tableUid, qSma->tableUid);
+    EXPECT_EQ(pSma->interval, qSma->interval);
+    EXPECT_EQ(pSma->sliding, qSma->sliding);
+    EXPECT_EQ(pSma->exprLen, qSma->exprLen);
+    EXPECT_STRCASEEQ(pSma->expr, qSma->expr);
+    EXPECT_EQ(pSma->tagsFilterLen, qSma->tagsFilterLen);
+    EXPECT_STRCASEEQ(pSma->tagsFilter, qSma->tagsFilter);
   }
 
   // resource release
@@ -172,12 +178,12 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
 
   tSma.exprLen = strlen(expr);
   tSma.expr = (char *)taosMemoryCalloc(1, tSma.exprLen + 1);
-  ASSERT_NE(tSma.expr, nullptr);
+  EXPECT_NE(tSma.expr, nullptr);
   tstrncpy(tSma.expr, expr, tSma.exprLen + 1);
 
   tSma.tagsFilterLen = strlen(tagsFilter);
   tSma.tagsFilter = (char *)taosMemoryCalloc(tSma.tagsFilterLen + 1, 1);
-  ASSERT_NE(tSma.tagsFilter, nullptr);
+  EXPECT_NE(tSma.tagsFilter, nullptr);
   tstrncpy(tSma.tagsFilter, tagsFilter, tSma.tagsFilterLen + 1);
 
   SMeta          *pMeta = NULL;
@@ -189,7 +195,7 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
   pMeta = metaOpen(smaTestDir, pMetaCfg, NULL);
   assert(pMeta != NULL);
   // save index 1
-  ASSERT_EQ(metaSaveSmaToDB(pMeta, pSmaCfg), 0);
+  EXPECT_EQ(metaSaveSmaToDB(pMeta, pSmaCfg), 0);
 
   pSmaCfg->indexUid = indexUid2;
   tstrncpy(pSmaCfg->indexName, smaIndexName2, TSDB_INDEX_NAME_LEN);
@@ -200,7 +206,7 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
   pSmaCfg->sliding = 5;
 
   // save index 2
-  ASSERT_EQ(metaSaveSmaToDB(pMeta, pSmaCfg), 0);
+  EXPECT_EQ(metaSaveSmaToDB(pMeta, pSmaCfg), 0);
 
   // get value by indexName
   STSma *qSmaCfg = NULL;
@@ -210,8 +216,8 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
   printf("timezone1 = %" PRIi8 "\n", qSmaCfg->timezoneInt);
   printf("expr1 = %s\n", qSmaCfg->expr != NULL ? qSmaCfg->expr : "");
   printf("tagsFilter1 = %s\n", qSmaCfg->tagsFilter != NULL ? qSmaCfg->tagsFilter : "");
-  ASSERT_STRCASEEQ(qSmaCfg->indexName, smaIndexName1);
-  ASSERT_EQ(qSmaCfg->tableUid, tSma.tableUid);
+  EXPECT_STRCASEEQ(qSmaCfg->indexName, smaIndexName1);
+  EXPECT_EQ(qSmaCfg->tableUid, tSma.tableUid);
   tdDestroyTSma(qSmaCfg);
   taosMemoryFreeClear(qSmaCfg);
 
@@ -221,8 +227,8 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
   printf("timezone2 = %" PRIi8 "\n", qSmaCfg->timezoneInt);
   printf("expr2 = %s\n", qSmaCfg->expr != NULL ? qSmaCfg->expr : "");
   printf("tagsFilter2 = %s\n", qSmaCfg->tagsFilter != NULL ? qSmaCfg->tagsFilter : "");
-  ASSERT_STRCASEEQ(qSmaCfg->indexName, smaIndexName2);
-  ASSERT_EQ(qSmaCfg->interval, tSma.interval);
+  EXPECT_STRCASEEQ(qSmaCfg->indexName, smaIndexName2);
+  EXPECT_EQ(qSmaCfg->interval, tSma.interval);
   tdDestroyTSma(qSmaCfg);
   taosMemoryFreeClear(qSmaCfg);
 
@@ -238,25 +244,25 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
     printf("indexName = %s\n", indexName);
     ++indexCnt;
   }
-  ASSERT_EQ(indexCnt, nCntTSma);
+  EXPECT_EQ(indexCnt, nCntTSma);
   metaCloseSmaCurosr(pSmaCur);
 
   // get wrapper by table uid
   STSmaWrapper *pSW = metaGetSmaInfoByTable(pMeta, tbUid);
   assert(pSW != NULL);
-  ASSERT_EQ(pSW->number, nCntTSma);
-  ASSERT_STRCASEEQ(pSW->tSma->indexName, smaIndexName1);
-  ASSERT_EQ(pSW->tSma->timezoneInt, timezone);
-  ASSERT_STRCASEEQ(pSW->tSma->expr, expr);
-  ASSERT_STRCASEEQ(pSW->tSma->tagsFilter, tagsFilter);
-  ASSERT_EQ(pSW->tSma->indexUid, indexUid1);
-  ASSERT_EQ(pSW->tSma->tableUid, tbUid);
-  ASSERT_STRCASEEQ((pSW->tSma + 1)->indexName, smaIndexName2);
-  ASSERT_EQ((pSW->tSma + 1)->timezoneInt, timezone);
-  ASSERT_STRCASEEQ((pSW->tSma + 1)->expr, expr);
-  ASSERT_STRCASEEQ((pSW->tSma + 1)->tagsFilter, tagsFilter);
-  ASSERT_EQ((pSW->tSma + 1)->indexUid, indexUid2);
-  ASSERT_EQ((pSW->tSma + 1)->tableUid, tbUid);
+  EXPECT_EQ(pSW->number, nCntTSma);
+  EXPECT_STRCASEEQ(pSW->tSma->indexName, smaIndexName1);
+  EXPECT_EQ(pSW->tSma->timezoneInt, timezone);
+  EXPECT_STRCASEEQ(pSW->tSma->expr, expr);
+  EXPECT_STRCASEEQ(pSW->tSma->tagsFilter, tagsFilter);
+  EXPECT_EQ(pSW->tSma->indexUid, indexUid1);
+  EXPECT_EQ(pSW->tSma->tableUid, tbUid);
+  EXPECT_STRCASEEQ((pSW->tSma + 1)->indexName, smaIndexName2);
+  EXPECT_EQ((pSW->tSma + 1)->timezoneInt, timezone);
+  EXPECT_STRCASEEQ((pSW->tSma + 1)->expr, expr);
+  EXPECT_STRCASEEQ((pSW->tSma + 1)->tagsFilter, tagsFilter);
+  EXPECT_EQ((pSW->tSma + 1)->indexUid, indexUid2);
+  EXPECT_EQ((pSW->tSma + 1)->tableUid, tbUid);
 
   tdDestroyTSmaWrapper(pSW);
   taosMemoryFreeClear(pSW);
@@ -268,7 +274,7 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
     printf("metaGetSmaTbUids: uid[%" PRIu32 "] = %" PRIi64 "\n", i, *(tb_uid_t *)taosArrayGet(pUids, i));
     // printf("metaGetSmaTbUids: index[%" PRIu32 "] = %s", i, (char *)taosArrayGet(pUids, i));
   }
-  ASSERT_EQ(taosArrayGetSize(pUids), 1);
+  EXPECT_EQ(taosArrayGetSize(pUids), 1);
   taosArrayDestroy(pUids);
 
   // resource release
@@ -280,7 +286,7 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
 }
 #endif
 
-#if 0
+#if 1
 TEST(testCase, tSma_Data_Insert_Query_Test) {
   // step 1: prepare meta
   const char    *smaIndexName1 = "sma_index_test_1";
@@ -299,9 +305,9 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   // encode
   STSma tSma = {0};
   tSma.version = 0;
-  tSma.intervalUnit = TIME_UNIT_DAY;
+  tSma.intervalUnit = TIME_UNIT_MINUTE;
   tSma.interval = 1;
-  tSma.slidingUnit = TIME_UNIT_HOUR;
+  tSma.slidingUnit = TIME_UNIT_MINUTE;
   tSma.sliding = 1;  // sliding = interval when it's convert window
   tSma.indexUid = indexUid1;
   tstrncpy(tSma.indexName, smaIndexName1, TSDB_INDEX_NAME_LEN);
@@ -310,12 +316,12 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
 
   tSma.exprLen = strlen(expr);
   tSma.expr = (char *)taosMemoryCalloc(1, tSma.exprLen + 1);
-  ASSERT_NE(tSma.expr, nullptr);
+  EXPECT_NE(tSma.expr, nullptr);
   tstrncpy(tSma.expr, expr, tSma.exprLen + 1);
 
   tSma.tagsFilterLen = strlen(tagsFilter);
   tSma.tagsFilter = (char *)taosMemoryCalloc(1, tSma.tagsFilterLen + 1);
-  ASSERT_NE(tSma.tagsFilter, nullptr);
+  EXPECT_NE(tSma.tagsFilter, nullptr);
   tstrncpy(tSma.tagsFilter, tagsFilter, tSma.tagsFilterLen + 1);
 
   SMeta          *pMeta = NULL;
@@ -327,11 +333,11 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   pMeta = metaOpen(smaTestDir, pMetaCfg, NULL);
   assert(pMeta != NULL);
   // save index 1
-  ASSERT_EQ(metaSaveSmaToDB(pMeta, pSmaCfg), 0);
+  EXPECT_EQ(metaSaveSmaToDB(pMeta, pSmaCfg), 0);
 
   // step 2: insert data
-  STsdb            *pTsdb = (STsdb *)taosMemoryCalloc(1, sizeof(STsdb));
-  STsdbCfg         *pCfg = &pTsdb->config;
+  STsdb    *pTsdb = (STsdb *)taosMemoryCalloc(1, sizeof(STsdb));
+  STsdbCfg *pCfg = &pTsdb->config;
 
   pTsdb->pMeta = pMeta;
   pTsdb->vgId = 2;
@@ -364,7 +370,7 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   strncpy(pDisks.dir, "/var/lib/taos", TSDB_FILENAME_LEN);
   int32_t numOfDisks = 1;
   pTsdb->pTfs = tfsOpen(&pDisks, numOfDisks);
-  ASSERT_NE(pTsdb->pTfs, nullptr);
+  EXPECT_NE(pTsdb->pTfs, nullptr);
 
   // generate SSubmitReq msg and update expired window
   int16_t  schemaVer = 0;
@@ -374,7 +380,7 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   uint32_t msgLen = sizeof(SSubmitReq) + mockBlkNum * sizeof(SSubmitBlk) + mockBlkNum * mockRowNum * mockRowLen;
 
   SSubmitReq *pMsg = (SSubmitReq *)taosMemoryCalloc(1, msgLen);
-  ASSERT_NE(pMsg, nullptr);
+  EXPECT_NE(pMsg, nullptr);
   pMsg->version = htobe64(schemaVer);
   pMsg->numOfBlocks = htonl(mockBlkNum);
   pMsg->length = htonl(msgLen);
@@ -400,20 +406,99 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
     }
   }
 
-  ASSERT_EQ(tdScanAndConvertSubmitMsg(pMsg), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(tdScanAndConvertSubmitMsg(pMsg), TSDB_CODE_SUCCESS);
 
-  ASSERT_EQ(tsdbUpdateSmaWindow(pTsdb, (const char *)pMsg), 0);
+  EXPECT_EQ(tsdbUpdateSmaWindow(pTsdb, (const char *)pMsg), 0);
 
   // init
-  int32_t allocCnt = 0;
-  int32_t allocStep = 16384;
-  int32_t buffer = 1024;
-  void   *buf = NULL;
-  ASSERT_EQ(tsdbMakeRoom(&buf, allocStep), 0);
-  int32_t  bufSize = taosTSizeof(buf);
-  int32_t  numOfTables = 10;
-  col_id_t numOfCols = 4096;
-  ASSERT_GT(numOfCols, 0);
+  const int32_t  tSmaGroupSize = 4;
+  const int32_t  tSmaNumOfTags = 2;
+  const int64_t  tSmaGroupId = 12345670;
+  const col_id_t tSmaNumOfCols = 9;  // binary/nchar/varbinary/varchar are only used for tags for group by conditions.
+  const int32_t  tSmaNumOfRows = 2;
+
+  SArray *pDataBlocks = taosArrayInit(tSmaGroupSize, sizeof(SSDataBlock *));
+  EXPECT_NE(pDataBlocks, nullptr);
+  int32_t tSmaTypeArray[tSmaNumOfCols] = {TSDB_DATA_TYPE_TIMESTAMP, TSDB_DATA_TYPE_BOOL,     TSDB_DATA_TYPE_INT,
+                                          TSDB_DATA_TYPE_UBIGINT,   TSDB_DATA_TYPE_SMALLINT, TSDB_DATA_TYPE_FLOAT,
+                                          TSDB_DATA_TYPE_DOUBLE,    TSDB_DATA_TYPE_VARCHAR,  TSDB_DATA_TYPE_NCHAR};
+  // last 2 columns for group by tags
+  // int32_t tSmaTypeArray[tSmaNumOfCols] = {TSDB_DATA_TYPE_TIMESTAMP, TSDB_DATA_TYPE_BOOL};
+  const char *tSmaGroupbyTags[tSmaGroupSize * tSmaNumOfTags] = {"BeiJing",  "HaiDian", "BeiJing",   "ChaoYang",
+                                                                "ShangHai", "PuDong",  "ShangHai", "MinHang"};
+  TSKEY       tSmaSKeyMs = (int64_t)1648535332 * 1000;
+  int64_t     tSmaIntervalMs = tSma.interval * 60 * 1000;
+  int64_t     tSmaInitVal = 0;
+
+  for (int32_t g = 0; g < tSmaGroupSize; ++g) {
+    SSDataBlock *pDataBlock = (SSDataBlock *)taosMemoryCalloc(1, sizeof(SSDataBlock));
+    EXPECT_NE(pDataBlock, nullptr);
+    pDataBlock->pBlockAgg = NULL;
+    pDataBlock->info.numOfCols = tSmaNumOfCols;
+    pDataBlock->info.rows = tSmaNumOfRows;
+    pDataBlock->info.groupId = tSmaGroupId + g;
+
+    pDataBlock->pDataBlock = taosArrayInit(tSmaNumOfCols, sizeof(SColumnInfoData *));
+    EXPECT_NE(pDataBlock->pDataBlock, nullptr);
+    for (int32_t c = 0; c < tSmaNumOfCols; ++c) {
+      
+      SColumnInfoData *pColInfoData = (SColumnInfoData *)taosMemoryCalloc(1, sizeof(SColumnInfoData));
+      EXPECT_NE(pColInfoData, nullptr);
+
+      pColInfoData->info.type = tSmaTypeArray[c];
+      if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) {
+        pColInfoData->info.bytes = 100;  // update accordingly
+      } else {
+        pColInfoData->info.bytes = TYPE_BYTES[pColInfoData->info.type];
+      }
+      pColInfoData->pData = (char *)taosMemoryCalloc(1, tSmaNumOfRows * pColInfoData->info.bytes);
+
+      for (int32_t r = 0; r < tSmaNumOfRows; ++r) {
+        void *pCellData = pColInfoData->pData + r * pColInfoData->info.bytes;
+        switch (pColInfoData->info.type) {
+          case TSDB_DATA_TYPE_TIMESTAMP:
+            *(TSKEY *)pCellData = tSmaSKeyMs + tSmaIntervalMs * r;
+            break;
+          case TSDB_DATA_TYPE_BOOL:
+            *(bool *)pCellData = (bool)tSmaInitVal++;
+            break;
+          case TSDB_DATA_TYPE_INT:
+            *(int *)pCellData = (int)tSmaInitVal++;
+            break;
+          case TSDB_DATA_TYPE_UBIGINT:
+            *(uint64_t *)pCellData = (uint64_t)tSmaInitVal++;
+            break;
+          case TSDB_DATA_TYPE_SMALLINT:
+            *(int16_t *)pCellData = (int16_t)tSmaInitVal++;
+            break;
+          case TSDB_DATA_TYPE_FLOAT:
+            *(float *)pCellData = (float)tSmaInitVal++;
+            break;
+          case TSDB_DATA_TYPE_DOUBLE:
+            *(double *)pCellData = (double)tSmaInitVal++;
+            break;
+          case TSDB_DATA_TYPE_VARCHAR:  // city
+            varDataSetLen(pCellData, strlen(tSmaGroupbyTags[g * 2]));
+            memcpy(varDataVal(pCellData), tSmaGroupbyTags[g * 2], varDataLen(pCellData));
+            break;
+          case TSDB_DATA_TYPE_NCHAR:  // district
+            varDataSetLen(pCellData, strlen(tSmaGroupbyTags[g * 2 + 1]));
+            memcpy(varDataVal(pCellData), tSmaGroupbyTags[g * 2 + 1], varDataLen(pCellData));
+            break;
+          default:
+            EXPECT_EQ(0, 1);  // add definition
+            break;
+        }
+      }
+      // push SColumnInfoData
+      taosArrayPush(pDataBlock->pDataBlock, &pColInfoData);
+    }
+    // push SSDataBlock
+    taosArrayPush(pDataBlocks, &pDataBlock);
+  }
+
+  // execute
+  EXPECT_EQ(tsdbInsertTSmaData(pTsdb, tSma.indexUid, (const char *)pDataBlocks), TSDB_CODE_SUCCESS);
 
 #if 0
   STSmaDataWrapper *pSmaData = NULL;
@@ -432,7 +517,7 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
     int32_t tableDataLen = sizeof(STSmaTbData);
     for (col_id_t c = 0; c < numOfCols; ++c) {
       if (bufSize - len - tableDataLen < buffer) {
-        ASSERT_EQ(tsdbMakeRoom(&buf, bufSize + allocStep), 0);
+        EXPECT_EQ(tsdbMakeRoom(&buf, bufSize + allocStep), 0);
         pSmaData = (STSmaDataWrapper *)buf;
         pTbData = (STSmaTbData *)POINTER_SHIFT(pSmaData, len);
         bufSize = taosTSizeof(buf);
@@ -459,31 +544,36 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   }
   pSmaData->dataLen = (len - sizeof(STSmaDataWrapper));
 
-  ASSERT_GE(bufSize, pSmaData->dataLen);
+  EXPECT_GE(bufSize, pSmaData->dataLen);
   // execute
-  ASSERT_EQ(tsdbInsertTSmaData(pTsdb, (char *)pSmaData), TSDB_CODE_SUCCESS);
+  EXPECT_EQ(tsdbInsertTSmaData(pTsdb, (char *)pSmaData), TSDB_CODE_SUCCESS);
 #endif
 
-  SSDataBlock *pSmaData = (SSDataBlock *)taosMemoryCalloc(1, sizeof(SSDataBlock));
-  
-
-
   // step 3: query
   uint32_t checkDataCnt = 0;
-  for (int32_t t = 0; t < numOfTables; ++t) {
-    for (col_id_t c = 0; c < numOfCols; ++c) {
-      ASSERT_EQ(tsdbGetTSmaData(pTsdb, NULL, indexUid1, interval1, intervalUnit1, tbUid + t,
-                                c + PRIMARYKEY_TIMESTAMP_COL_ID, skey1, 1),
-                TSDB_CODE_SUCCESS);
-      ++checkDataCnt;
-    }
-  }
+  EXPECT_EQ(tsdbGetTSmaData(pTsdb, NULL, indexUid1, skey1, 1), TSDB_CODE_SUCCESS);
+  ++checkDataCnt;
 
   printf("%s:%d The sma data check count for insert and query is %" PRIu32 "\n", __FILE__, __LINE__, checkDataCnt);
 
   // release data
   taosMemoryFreeClear(pMsg);
-  taosTZfree(buf);
+
+  for (int32_t i = 0; i < taosArrayGetSize(pDataBlocks); ++i) {
+    SSDataBlock *pDataBlock = *(SSDataBlock **)taosArrayGet(pDataBlocks, i);
+    int32_t      numOfOutput = taosArrayGetSize(pDataBlock->pDataBlock);
+    for (int32_t j = 0; j < numOfOutput; ++j) {
+      SColumnInfoData *pColInfoData = *(SColumnInfoData **)taosArrayGet(pDataBlock->pDataBlock, j);
+      colDataDestroy(pColInfoData);
+      taosMemoryFreeClear(pColInfoData);
+    }
+
+    taosArrayDestroy(pDataBlock->pDataBlock);
+    taosMemoryFreeClear(pDataBlock->pBlockAgg);
+    taosMemoryFreeClear(pDataBlock);
+  }
+  taosArrayDestroy(pDataBlocks);
+
   // release meta
   tdDestroyTSma(&tSma);
   tfsClose(pTsdb->pTfs);
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index 2bbd16fbd0..1d7023930d 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -161,20 +161,8 @@ typedef struct STaskCostInfo {
 typedef struct SOperatorCostInfo {
   uint64_t openCost;
   uint64_t execCost;
-//  uint64_t totalRows;
-//  uint64_t totalBytes;
 } SOperatorCostInfo;
 
-typedef struct {
-  int64_t vgroupLimit;
-  int64_t ts;
-} SOrderedPrjQueryInfo;
-
-typedef struct {
-  char*   tags;
-  SArray* pResult;  // SArray<SStddevInterResult>
-} SInterResult;
-
 // The basic query information extracted from the SQueryInfo tree to support the
 // execution of query in a data node.
 typedef struct STaskAttr {
@@ -230,7 +218,6 @@ typedef struct STaskAttr {
   SColumnInfo*         tagColList;
   int32_t              numOfFilterCols;
   int64_t*             fillVal;
-  SOrderedPrjQueryInfo prjInfo;  // limit value for each vgroup, only available in global order projection query.
 
   SSingleColumnFilterInfo* pFilterInfo;
   //  SFilterInfo     *pFilters;
@@ -245,8 +232,9 @@ struct SOperatorInfo;
 
 typedef void (*__optr_encode_fn_t)(struct SOperatorInfo* pOperator, char **result, int32_t *length);
 typedef bool (*__optr_decode_fn_t)(struct SOperatorInfo* pOperator, char *result, int32_t length);
-typedef int32_t (*__optr_open_fn_t)(struct SOperatorInfo* param);
-typedef SSDataBlock* (*__optr_fn_t)(struct SOperatorInfo* param, bool* newgroup);
+
+typedef int32_t (*__optr_open_fn_t)(struct SOperatorInfo* pOptr);
+typedef SSDataBlock* (*__optr_fn_t)(struct SOperatorInfo* pOptr, bool* newgroup);
 typedef void (*__optr_close_fn_t)(void* param, int32_t num);
 
 typedef struct STaskIdInfo {
@@ -267,7 +255,8 @@ typedef struct SExecTaskInfo {
   uint64_t        totalRows;            // total number of rows
   STableGroupInfo tableqinfoGroupInfo;  // this is a group array list, including SArray<STableQueryInfo*> structure
   char*           sql;                  // query sql string
-  jmp_buf         env;                  //
+  jmp_buf         env;                  // jump to this position when error happens.
+  EOPTR_EXEC_MODEL execModel;            // operator execution model [batch model|stream model]
   struct SOperatorInfo* pRoot;
 } SExecTaskInfo;
 
@@ -330,11 +319,12 @@ typedef struct SOperatorInfo {
   SResultInfo            resultInfo;
   struct SOperatorInfo** pDownstream;      // downstram pointer list
   int32_t                numOfDownstream;  // number of downstream. The value is always ONE expect for join operator
-  __optr_fn_t            getNextFn;
-  __optr_fn_t            cleanupFn;
-  __optr_close_fn_t      closeFn;
   __optr_open_fn_t       _openFn;          // DO NOT invoke this function directly
-  __optr_encode_fn_t     encodeResultRow;           //
+  __optr_fn_t            getNextFn;
+  __optr_fn_t            getStreamResFn;   // execute the aggregate in the stream model.
+  __optr_fn_t            cleanupFn;        // call this function to release the allocated resources ASAP
+  __optr_close_fn_t      closeFn;
+  __optr_encode_fn_t     encodeResultRow;
   __optr_decode_fn_t     decodeResultRow;
 } SOperatorInfo;
 
@@ -363,18 +353,18 @@ typedef struct SQInfo {
   STaskCostInfo   summary;
 } SQInfo;
 
-enum {
-  DATA_NOT_READY = 0x1,
-  DATA_READY     = 0x2,
-  DATA_EXHAUSTED = 0x3,
-};
+typedef enum {
+  EX_SOURCE_DATA_NOT_READY = 0x1,
+  EX_SOURCE_DATA_READY     = 0x2,
+  EX_SOURCE_DATA_EXHAUSTED = 0x3,
+} EX_SOURCE_STATUS;
 
 typedef struct SSourceDataInfo {
   struct SExchangeInfo *pEx;
-  int32_t            index;
-  SRetrieveTableRsp *pRsp;
-  uint64_t           totalRows;
-  int32_t            status;
+  int32_t               index;
+  SRetrieveTableRsp    *pRsp;
+  uint64_t              totalRows;
+  EX_SOURCE_STATUS      status;
 } SSourceDataInfo;
 
 typedef struct SLoadRemoteDataInfo {
@@ -383,12 +373,6 @@ typedef struct SLoadRemoteDataInfo {
   uint64_t           totalElapsed;  // total elapsed time
 } SLoadRemoteDataInfo;
 
-enum {
-  EX_SOURCE_DATA_NOT_READY = 0x1,
-  EX_SOURCE_DATA_READY     = 0x2,
-  EX_SOURCE_DATA_EXHAUSTED = 0x3,
-};
-
 typedef struct SExchangeInfo {
   SArray*            pSources;
   SArray*            pSourceDataInfo;
@@ -484,16 +468,18 @@ typedef struct SAggSupporter {
 } SAggSupporter;
 
 typedef struct STableIntervalOperatorInfo {
-  SOptrBasicInfo     binfo;
-  SGroupResInfo      groupResInfo;
-  SInterval          interval;
-  STimeWindow        win;
-  int32_t            precision;
-  bool               timeWindowInterpo;
-  char             **pRow;
-  SAggSupporter      aggSup;
-  STableQueryInfo   *pCurrent;
-  int32_t            order;
+  SOptrBasicInfo     binfo;                // basic info
+  SGroupResInfo      groupResInfo;         // multiple results build supporter
+  SInterval          interval;             // interval info
+  STimeWindow        win;                  // query time range
+  bool               timeWindowInterpo;    // interpolation needed or not
+  char             **pRow;                 // previous row/tuple of already processed datablock
+  SAggSupporter      aggSup;               // aggregate supporter
+  STableQueryInfo   *pCurrent;             // current tableQueryInfo struct
+  int32_t            order;                // current SSDataBlock scan order
+  EOPTR_EXEC_MODEL    execModel;            // operator execution model [batch model|stream model]
+  SArray            *pUpdatedWindow;       // updated time window due to the input data block from the downstream operator.
+  SColumnInfoData    timeWindowData;       // query time window info for scalar function execution.
 } STableIntervalOperatorInfo;
 
 typedef struct SAggOperatorInfo {
@@ -695,12 +681,6 @@ SOperatorInfo* createSLimitOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorI
 SOperatorInfo* createJoinOperatorInfo(SOperatorInfo** pdownstream, int32_t numOfDownstream, SSchema* pSchema,
                                       int32_t numOfOutput);
 
-void doSetFilterColumnInfo(SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols, SSDataBlock* pBlock);
-bool doFilterDataBlock(SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols, int32_t numOfRows, int8_t* p);
-void doCompactSDataBlock(SSDataBlock* pBlock, int32_t numOfRows, int8_t* p);
-
-SSDataBlock* createOutputBuf(SExprInfo* pExpr, int32_t numOfOutput, int32_t numOfRows);
-
 void* doDestroyFilterInfo(SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols);
 
 void setInputDataBlock(SOperatorInfo* pOperator, SqlFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t order);
@@ -734,7 +714,7 @@ int32_t getMaximumIdleDurationSec();
 
 void    doInvokeUdf(struct SUdfInfo* pUdfInfo, SqlFunctionCtx* pCtx, int32_t idx, int32_t type);
 void    setTaskStatus(SExecTaskInfo* pTaskInfo, int8_t status);
-int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SReadHandle* pHandle, uint64_t taskId);
+int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SReadHandle* pHandle, uint64_t taskId, EOPTR_EXEC_MODEL model);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 615bcdcdbb..15203d91ca 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -113,7 +113,7 @@ qTaskInfo_t qCreateStreamExecTaskInfo(void* msg, void* streamReadHandle) {
   }
 
   qTaskInfo_t pTaskInfo = NULL;
-  code = qCreateExecTask(streamReadHandle, 0, 0, plan, &pTaskInfo, NULL);
+  code = qCreateExecTask(streamReadHandle, 0, 0, plan, &pTaskInfo, NULL, OPTR_EXEC_MODEL_STREAM);
   if (code != TSDB_CODE_SUCCESS) {
     // TODO: destroy SSubplan & pTaskInfo
     terrno = code;
diff --git a/source/libs/executor/src/executorMain.c b/source/libs/executor/src/executorMain.c
index cc9921ce73..6d78fa835a 100644
--- a/source/libs/executor/src/executorMain.c
+++ b/source/libs/executor/src/executorMain.c
@@ -51,11 +51,12 @@ static void freeqinfoFn(void *qhandle) {
   qDestroyTask(*handle);
 }
 
-int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, SSubplan* pSubplan, qTaskInfo_t* pTaskInfo, DataSinkHandle* handle) {
+int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, SSubplan* pSubplan,
+    qTaskInfo_t* pTaskInfo, DataSinkHandle* handle, EOPTR_EXEC_MODEL model) {
   assert(readHandle != NULL && pSubplan != NULL);
   SExecTaskInfo** pTask = (SExecTaskInfo**)pTaskInfo;
 
-  int32_t code = createExecTaskInfoImpl(pSubplan, pTask, readHandle, taskId);
+  int32_t code = createExecTaskInfoImpl(pSubplan, pTask, readHandle, taskId, model);
   if (code != TSDB_CODE_SUCCESS) {
     goto _error;
   }
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 09cf147335..2df18f135c 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1014,8 +1014,35 @@ static int32_t getNumOfRowsInTimeWindow(SDataBlockInfo* pDataBlockInfo, TSKEY* p
   return num;
 }
 
-static void doApplyFunctions(SqlFunctionCtx* pCtx, STimeWindow* pWin, int32_t offset, int32_t forwardStep, TSKEY* tsCol,
+//  query_range_start, query_range_end, window_duration, window_start, window_end
+static void initExecTimeWindowInfo(SColumnInfoData* pColData, STimeWindow* pQueryWindow) {
+  pColData->info.type = TSDB_DATA_TYPE_TIMESTAMP;
+  pColData->info.bytes = sizeof(int64_t);
+
+  blockDataEnsureColumnCapacity(pColData, 5);
+  colDataAppendInt64(pColData, 0, &pQueryWindow->skey);
+  colDataAppendInt64(pColData, 1, &pQueryWindow->ekey);
+
+  int64_t interval = 0;
+  colDataAppendInt64(pColData, 2, &interval);  // this value may be variable in case of 'n' and 'y'.
+  colDataAppendInt64(pColData, 3, &pQueryWindow->skey);
+  colDataAppendInt64(pColData, 4, &pQueryWindow->ekey);
+}
+
+static void updateTimeWindowInfo(SColumnInfoData* pColData, STimeWindow* pWin) {
+  int64_t* ts = (int64_t*)pColData->pData;
+
+  int64_t duration = pWin->ekey - pWin->skey + 1;
+  ts[2] = duration;       // set the duration
+  ts[3] = pWin->skey;     // window start key
+  ts[4] = pWin->ekey + 1; // window end key
+}
+
+static void doApplyFunctions(SqlFunctionCtx* pCtx, STimeWindow* pWin, SColumnInfoData* pTimeWindowData, int32_t offset, int32_t forwardStep, TSKEY* tsCol,
                              int32_t numOfTotal, int32_t numOfOutput, int32_t order) {
+  SScalarParam intervalParam = {.numOfRows = 5, .columnData = pTimeWindowData};  //TODO move out of this function
+  updateTimeWindowInfo(pTimeWindowData, pWin);
+
   for (int32_t k = 0; k < numOfOutput; ++k) {
     pCtx[k].startTs = pWin->skey;
 
@@ -1038,6 +1065,21 @@ static void doApplyFunctions(SqlFunctionCtx* pCtx, STimeWindow* pWin, int32_t of
       pCtx[k].isAggSet = false;
     }
 
+    if (fmIsWindowPseudoColumnFunc(pCtx[k].functionId)) {
+      SResultRowEntryInfo* pEntryInfo = GET_RES_INFO(&pCtx[k]);
+      char* p = GET_ROWCELL_INTERBUF(pEntryInfo);
+
+      SScalarParam out = {.columnData = NULL};
+      out.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData));
+      out.columnData->info.type = TSDB_DATA_TYPE_BIGINT;
+      out.columnData->info.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes;
+      out.columnData->pData = p;
+      pCtx[k].sfp.process(&intervalParam, 1, &out);
+      pEntryInfo->numOfRes = 1;
+      pEntryInfo->hasResult = ',';
+      continue;
+    }
+
     if (functionNeedToExecute(&pCtx[k])) {
       pCtx[k].fpSet.process(&pCtx[k]);
     }
@@ -1054,7 +1096,7 @@ static int32_t getNextQualifiedWindow(SInterval* pInterval, STimeWindow* pNext,
   int32_t order = pInfo->order;
   bool    ascQuery = (order == TSDB_ORDER_ASC);
 
-  int32_t precision = pInfo->precision;
+  int32_t precision = pInterval->precision;
   getNextTimeWindow(pInterval, precision, order, pNext);
 
   // next time window is not in current block
@@ -1489,15 +1531,19 @@ static void doWindowBorderInterpolation(SOperatorInfo* pOperatorInfo, SSDataBloc
   }
 }
 
-static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResultRowInfo, SSDataBlock* pSDataBlock,
-                            int32_t tableGroupId) {
+static SArray* hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResultRowInfo, SSDataBlock* pSDataBlock, int32_t tableGroupId) {
   STableIntervalOperatorInfo* pInfo = (STableIntervalOperatorInfo*)pOperatorInfo->info;
 
   SExecTaskInfo* pTaskInfo = pOperatorInfo->pTaskInfo;
   int32_t        numOfOutput = pOperatorInfo->numOfOutput;
 
+  SArray* pUpdated = NULL;
+  if (pInfo->execModel == OPTR_EXEC_MODEL_STREAM) {
+    pUpdated = taosArrayInit(4, sizeof(SResultRowPosition));
+  }
+
   int32_t step = 1;
-  bool    ascQuery = true;
+  bool    ascScan = true;
 
   int32_t prevIndex = pResultRowInfo->curPos;
 
@@ -1509,10 +1555,10 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
            tsCols[pSDataBlock->info.rows - 1] == pSDataBlock->info.window.ekey);
   }
 
-  int32_t startPos = ascQuery ? 0 : (pSDataBlock->info.rows - 1);
-  TSKEY   ts = getStartTsKey(&pSDataBlock->info.window, tsCols, pSDataBlock->info.rows, ascQuery);
+  int32_t startPos = ascScan? 0 : (pSDataBlock->info.rows - 1);
+  TSKEY   ts = getStartTsKey(&pSDataBlock->info.window, tsCols, pSDataBlock->info.rows, ascScan);
 
-  STimeWindow win = getActiveTimeWindow(pResultRowInfo, ts, &pInfo->interval, pInfo->precision, &pInfo->win);
+  STimeWindow win = getActiveTimeWindow(pResultRowInfo, ts, &pInfo->interval, pInfo->interval.precision, &pInfo->win);
   bool        masterScan = true;
 
   SResultRow* pResult = NULL;
@@ -1523,6 +1569,11 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
     longjmp(pTaskInfo->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
   }
 
+  if (pInfo->execModel == OPTR_EXEC_MODEL_STREAM) {
+    SResultRowPosition pos = {.pageId = pResult->pageId, .offset = pResult->offset};
+    taosArrayPush(pUpdated, &pos);
+  }
+
   int32_t forwardStep = 0;
   TSKEY   ekey = win.ekey;
   forwardStep =
@@ -1534,8 +1585,7 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
     for (int32_t j = prevIndex; j < curIndex; ++j) {  // previous time window may be all closed already.
       SResultRow* pRes = getResultRow(pResultRowInfo, j);
       if (pRes->closed) {
-        assert(resultRowInterpolated(pRes, RESULT_ROW_START_INTERP) &&
-               resultRowInterpolated(pRes, RESULT_ROW_END_INTERP));
+        assert(resultRowInterpolated(pRes, RESULT_ROW_START_INTERP) && resultRowInterpolated(pRes, RESULT_ROW_END_INTERP));
         continue;
       }
 
@@ -1548,14 +1598,13 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
       }
 
       assert(!resultRowInterpolated(pResult, RESULT_ROW_END_INTERP));
-
       doTimeWindowInterpolation(pOperatorInfo, &pInfo->binfo, pSDataBlock->pDataBlock, *(TSKEY*)pInfo->pRow[0], -1,
                                 tsCols[startPos], startPos, w.ekey, RESULT_ROW_END_INTERP);
 
       setResultRowInterpo(pResult, RESULT_ROW_END_INTERP);
       setNotInterpoWindowKey(pInfo->binfo.pCtx, pOperatorInfo->numOfOutput, RESULT_ROW_START_INTERP);
 
-      doApplyFunctions(pInfo->binfo.pCtx, &w, startPos, 0, tsCols, pSDataBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
+      doApplyFunctions(pInfo->binfo.pCtx, &w, &pInfo->timeWindowData, startPos, 0, tsCols, pSDataBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
     }
 
     // restore current time window
@@ -1570,8 +1619,7 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
   // window start key interpolation
   doWindowBorderInterpolation(pOperatorInfo, pSDataBlock, pInfo->binfo.pCtx, pResult, &win, startPos, forwardStep,
                               pInfo->order, false);
-  doApplyFunctions(pInfo->binfo.pCtx, &win, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput,
-                   TSDB_ORDER_ASC);
+  doApplyFunctions(pInfo->binfo.pCtx, &win, &pInfo->timeWindowData, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
 
   STimeWindow nextWin = win;
   while (1) {
@@ -1589,6 +1637,11 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
       longjmp(pTaskInfo->env, TSDB_CODE_QRY_OUT_OF_MEMORY);
     }
 
+    if (pInfo->execModel == OPTR_EXEC_MODEL_STREAM) {
+      SResultRowPosition pos = {.pageId = pResult->pageId, .offset = pResult->offset};
+      taosArrayPush(pUpdated, &pos);
+    }
+
     ekey = nextWin.ekey;  // reviseWindowEkey(pQueryAttr, &nextWin);
     forwardStep =
         getNumOfRowsInTimeWindow(&pSDataBlock->info, tsCols, startPos, ekey, binarySearchForKey, NULL, TSDB_ORDER_ASC);
@@ -1596,15 +1649,15 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul
     // window start(end) key interpolation
     doWindowBorderInterpolation(pOperatorInfo, pSDataBlock, pInfo->binfo.pCtx, pResult, &nextWin, startPos, forwardStep,
                                 pInfo->order, false);
-    doApplyFunctions(pInfo->binfo.pCtx, &nextWin, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput,
-                     TSDB_ORDER_ASC);
+    doApplyFunctions(pInfo->binfo.pCtx, &nextWin, &pInfo->timeWindowData, startPos, forwardStep, tsCols, pSDataBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
   }
 
   if (pInfo->timeWindowInterpo) {
-    int32_t rowIndex = ascQuery ? (pSDataBlock->info.rows - 1) : 0;
+    int32_t rowIndex = ascScan ? (pSDataBlock->info.rows - 1) : 0;
     saveDataBlockLastRow(pInfo->pRow, pSDataBlock->pDataBlock, rowIndex, pSDataBlock->info.numOfCols);
   }
 
+  return pUpdated;
   //  updateResultRowInfoActiveIndex(pResultRowInfo, &pInfo->win, pRuntimeEnv->current->lastKey, true, false);
 }
 
@@ -1841,7 +1894,7 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
     }
 
     int32_t rowIndex = j - num;
-    doApplyFunctions(pCtx, &w, rowIndex, num, NULL, pBlock->info.rows, pOperator->numOfOutput, TSDB_ORDER_ASC);
+    doApplyFunctions(pCtx, &w, NULL, rowIndex, num, NULL, pBlock->info.rows, pOperator->numOfOutput, TSDB_ORDER_ASC);
 
     // assign the group keys or user input constant values if required
     doAssignGroupKeys(pCtx, pOperator->numOfOutput, pBlock->info.rows, rowIndex);
@@ -1859,7 +1912,7 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SSDataBlock* pBlock) {
     }
 
     int32_t rowIndex = pBlock->info.rows - num;
-    doApplyFunctions(pCtx, &w, rowIndex, num, NULL, pBlock->info.rows, pOperator->numOfOutput, TSDB_ORDER_ASC);
+    doApplyFunctions(pCtx, &w, NULL, rowIndex, num, NULL, pBlock->info.rows, pOperator->numOfOutput, TSDB_ORDER_ASC);
     doAssignGroupKeys(pCtx, pOperator->numOfOutput, pBlock->info.rows, rowIndex);
   }
 }
@@ -1910,8 +1963,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
       }
 
       // pInfo->numOfRows data belong to the current session window
-      doApplyFunctions(pInfo->binfo.pCtx, &window, pInfo->start, pInfo->numOfRows, NULL, pBlock->info.rows, numOfOutput,
-                       TSDB_ORDER_ASC);
+      doApplyFunctions(pInfo->binfo.pCtx, &window, NULL, pInfo->start, pInfo->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
 
       pInfo->curWindow.skey = tsList[j];
       pInfo->curWindow.ekey = tsList[j];
@@ -1931,8 +1983,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
     longjmp(pTaskInfo->env, TSDB_CODE_QRY_APP_ERROR);
   }
 
-  doApplyFunctions(pInfo->binfo.pCtx, &window, pInfo->start, pInfo->numOfRows, NULL, pBlock->info.rows, numOfOutput,
-                   TSDB_ORDER_ASC);
+  doApplyFunctions(pInfo->binfo.pCtx, &window, NULL, pInfo->start, pInfo->numOfRows, NULL, pBlock->info.rows, numOfOutput, TSDB_ORDER_ASC);
 }
 
 static void setResultRowKey(SResultRow* pResultRow, char* pData, int16_t type) {
@@ -1999,11 +2050,7 @@ static bool functionNeedToExecute(SqlFunctionCtx* pCtx) {
     return false;
   }
 
-  if (functionId == FUNCTION_TS) {
-    return true;
-  }
-
-  if (isRowEntryCompleted(pResInfo) || functionId == FUNCTION_TAG_DUMMY || functionId == FUNCTION_TS_DUMMY) {
+  if (isRowEntryCompleted(pResInfo)) {
     return false;
   }
 
@@ -2118,6 +2165,9 @@ static SqlFunctionCtx* createSqlFunctionCtx_rv(SExprInfo* pExprInfo, int32_t num
         pCtx->fpSet.getEnv(pExpr->pExpr->_function.pFunctNode, &env);
       } else {
         fmGetScalarFuncExecFuncs(pCtx->functionId, &pCtx->sfp);
+        if (pCtx->sfp.getEnv != NULL) {
+          pCtx->sfp.getEnv(pExpr->pExpr->_function.pFunctNode, &env);
+        }
       }
       pCtx->resDataInfo.interBufSize = env.calcMemSize;
     } else if (pExpr->pExpr->nodeType == QUERY_NODE_COLUMN) {
@@ -3590,6 +3640,42 @@ void finalizeMultiTupleQueryResult(SqlFunctionCtx* pCtx, int32_t numOfOutput, SD
   }
 }
 
+void finalizeUpdatedResult(SqlFunctionCtx* pCtx, int32_t numOfOutput, SDiskbasedBuf* pBuf, SArray* pUpdateList,
+                           int32_t* rowCellInfoOffset) {
+  size_t num = taosArrayGetSize(pUpdateList);
+
+  for (int32_t i = 0; i < num; ++i) {
+    SResultRowPosition* pPos = taosArrayGet(pUpdateList, i);
+
+    SFilePage*  bufPage = getBufPage(pBuf, pPos->pageId);
+    SResultRow* pRow = (SResultRow*)((char*)bufPage + pPos->offset);
+
+    for (int32_t j = 0; j < numOfOutput; ++j) {
+      pCtx[j].resultInfo = getResultCell(pRow, j, rowCellInfoOffset);
+
+      struct SResultRowEntryInfo* pResInfo = pCtx[j].resultInfo;
+      if (isRowEntryCompleted(pResInfo) && isRowEntryInitialized(pResInfo)) {
+        continue;
+      }
+
+      if (pCtx[j].fpSet.process) {  // TODO set the dummy function.
+        pCtx[j].fpSet.finalize(&pCtx[j]);
+      }
+
+      if (pRow->numOfRows < pResInfo->numOfRes) {
+        pRow->numOfRows = pResInfo->numOfRes;
+      }
+    }
+
+    releaseBufPage(pBuf, bufPage);
+    /*
+     * set the number of output results for group by normal columns, the number of output rows usually is 1 except
+     * the top and bottom query
+     */
+    //    buf->numOfRows = (uint16_t)getNumOfResult(pCtx, numOfOutput);
+  }
+}
+
 static bool hasMainOutput(STaskAttr* pQueryAttr) {
   for (int32_t i = 0; i < pQueryAttr->numOfOutput; ++i) {
     int32_t functionId = getExprFunctionId(&pQueryAttr->pExpr1[i]);
@@ -3680,7 +3766,6 @@ void setResultRowOutputBufInitCtx(STaskRuntimeEnv* pRuntimeEnv, SResultRow* pRes
 
 void setResultRowOutputBufInitCtx_rv(SDiskbasedBuf* pBuf, SResultRow* pResult, SqlFunctionCtx* pCtx,
                                      int32_t numOfOutput, int32_t* rowCellInfoOffset) {
-  // Note: pResult->pos[i]->num == 0, there is only fixed number of results for each group
   for (int32_t i = 0; i < numOfOutput; ++i) {
     pCtx[i].resultInfo = getResultCell(pResult, i, rowCellInfoOffset);
 
@@ -3688,6 +3773,11 @@ void setResultRowOutputBufInitCtx_rv(SDiskbasedBuf* pBuf, SResultRow* pResult, S
     if (isRowEntryCompleted(pResInfo) && isRowEntryInitialized(pResInfo)) {
       continue;
     }
+
+    if (fmIsWindowPseudoColumnFunc(pCtx[i].functionId)) {
+      continue;
+    }
+
     //    int32_t functionId = pCtx[i].functionId;
     //    if (functionId < 0) {
     //      continue;
@@ -4032,8 +4122,7 @@ static void toSDatablock(SGroupResInfo* pGroupResInfo, SDiskbasedBuf* pBuf, SSDa
     return;
   }
 
-  int32_t orderType =
-      TSDB_ORDER_ASC;  //(pQueryAttr->pGroupbyExpr != NULL) ? pQueryAttr->pGroupbyExpr->orderType : TSDB_ORDER_ASC;
+  int32_t orderType = TSDB_ORDER_ASC;
   doCopyToSDataBlock(pBuf, pGroupResInfo, orderType, pBlock, rowCapacity, rowCellOffset);
 
   // add condition (pBlock->info.rows >= 1) just to runtime happy
@@ -5074,12 +5163,12 @@ static SSDataBlock* concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SEx
     for (int32_t i = 0; i < totalSources; ++i) {
       SSourceDataInfo* pDataInfo = taosArrayGet(pExchangeInfo->pSourceDataInfo, i);
 
-      if (pDataInfo->status == DATA_EXHAUSTED) {
+      if (pDataInfo->status == EX_SOURCE_DATA_EXHAUSTED) {
         completed += 1;
         continue;
       }
 
-      if (pDataInfo->status != DATA_READY) {
+      if (pDataInfo->status != EX_SOURCE_DATA_READY) {
         continue;
       }
 
@@ -5093,7 +5182,7 @@ static SSDataBlock* concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SEx
                " try next",
                GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, i + 1, pDataInfo->totalRows,
                pExchangeInfo->loadInfo.totalRows);
-        pDataInfo->status = DATA_EXHAUSTED;
+        pDataInfo->status = EX_SOURCE_DATA_EXHAUSTED;
         completed += 1;
         continue;
       }
@@ -5111,16 +5200,15 @@ static SSDataBlock* concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SEx
                ", totalRows:%" PRIu64 ", totalBytes:%" PRIu64 " try next %d/%" PRIzu,
                GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pRes->info.rows, pDataInfo->totalRows,
                pLoadInfo->totalRows, pLoadInfo->totalSize, i + 1, totalSources);
-        pDataInfo->status = DATA_EXHAUSTED;
+        pDataInfo->status = EX_SOURCE_DATA_EXHAUSTED;
       } else {
-        qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64 " numOfRows:%d, totalRows:%" PRIu64
-               ", totalBytes:%" PRIu64,
+        qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64 " numOfRows:%d, totalRows:%" PRIu64 ", totalBytes:%" PRIu64,
                GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pRes->info.rows, pLoadInfo->totalRows,
                pLoadInfo->totalSize);
       }
 
-      if (pDataInfo->status != DATA_EXHAUSTED) {
-        pDataInfo->status = DATA_NOT_READY;
+      if (pDataInfo->status != EX_SOURCE_DATA_EXHAUSTED) {
+        pDataInfo->status = EX_SOURCE_DATA_NOT_READY;
         code = doSendFetchDataRequest(pExchangeInfo, pTaskInfo, i);
         if (code != TSDB_CODE_SUCCESS) {
           goto _error;
@@ -5223,7 +5311,7 @@ static SSDataBlock* seqLoadRemoteData(SOperatorInfo* pOperator) {
              GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pExchangeInfo->current + 1,
              pDataInfo->totalRows, pLoadInfo->totalRows);
 
-      pDataInfo->status = DATA_EXHAUSTED;
+      pDataInfo->status = EX_SOURCE_DATA_EXHAUSTED;
       pExchangeInfo->current += 1;
       continue;
     }
@@ -5240,7 +5328,7 @@ static SSDataBlock* seqLoadRemoteData(SOperatorInfo* pOperator) {
              GET_TASKID(pTaskInfo), pSource->addr.nodeId, pSource->taskId, pRes->info.rows, pDataInfo->totalRows,
              pLoadInfo->totalRows, pLoadInfo->totalSize, pExchangeInfo->current + 1, totalSources);
 
-      pDataInfo->status = DATA_EXHAUSTED;
+      pDataInfo->status = EX_SOURCE_DATA_EXHAUSTED;
       pExchangeInfo->current += 1;
     } else {
       qDebug("%s fetch msg rsp from vgId:%d, taskId:0x%" PRIx64 " numOfRows:%d, totalRows:%" PRIu64
@@ -6798,37 +6886,6 @@ static SSDataBlock* doLimit(SOperatorInfo* pOperator, bool* newgroup) {
   return pBlock;
 }
 
-static SSDataBlock* doFilter(void* param, bool* newgroup) {
-  SOperatorInfo* pOperator = (SOperatorInfo*)param;
-  if (pOperator->status == OP_EXEC_DONE) {
-    return NULL;
-  }
-
-  SFilterOperatorInfo* pCondInfo = pOperator->info;
-  STaskRuntimeEnv*     pRuntimeEnv = pOperator->pRuntimeEnv;
-
-  while (1) {
-    publishOperatorProfEvent(pOperator->pDownstream[0], QUERY_PROF_BEFORE_OPERATOR_EXEC);
-    SSDataBlock* pBlock = pOperator->pDownstream[0]->getNextFn(pOperator->pDownstream[0], newgroup);
-    publishOperatorProfEvent(pOperator->pDownstream[0], QUERY_PROF_AFTER_OPERATOR_EXEC);
-
-    if (pBlock == NULL) {
-      break;
-    }
-
-    doSetFilterColumnInfo(pCondInfo->pFilterInfo, pCondInfo->numOfFilterCols, pBlock);
-    assert(pRuntimeEnv->pTsBuf == NULL);
-    filterRowsInDataBlock(pRuntimeEnv, pCondInfo->pFilterInfo, pCondInfo->numOfFilterCols, pBlock, true);
-
-    if (pBlock->info.rows > 0) {
-      return pBlock;
-    }
-  }
-
-  doSetOperatorCompleted(pOperator);
-  return NULL;
-}
-
 static int32_t doOpenIntervalAgg(SOperatorInfo* pOperator) {
   if (OPTR_IS_OPENED(pOperator)) {
     return TSDB_CODE_SUCCESS;
@@ -6837,8 +6894,8 @@ static int32_t doOpenIntervalAgg(SOperatorInfo* pOperator) {
   STableIntervalOperatorInfo* pInfo = pOperator->info;
 
   int32_t order = TSDB_ORDER_ASC;
-  //  STimeWindow win = pQueryAttr->window;
-  bool           newgroup = false;
+  //  STimeWindow win = {0};
+  bool newgroup = false;
   SOperatorInfo* downstream = pOperator->pDownstream[0];
 
   while (1) {
@@ -6851,7 +6908,6 @@ static int32_t doOpenIntervalAgg(SOperatorInfo* pOperator) {
     }
 
     //    setTagValue(pOperator, pRuntimeEnv->current->pTable, pInfo->pCtx, pOperator->numOfOutput);
-
     // the pDataBlock are always the same one, no need to call this again
     setInputDataBlock(pOperator, pInfo->binfo.pCtx, pBlock, order);
     hashIntervalAgg(pOperator, &pInfo->binfo.resultRowInfo, pBlock, 0);
@@ -6874,6 +6930,10 @@ static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator, bool* newgro
     return NULL;
   }
 
+  if (pInfo->execModel == OPTR_EXEC_MODEL_STREAM) {
+    return pOperator->getStreamResFn(pOperator, newgroup);
+  }
+
   pTaskInfo->code = pOperator->_openFn(pOperator);
   if (pTaskInfo->code != TSDB_CODE_SUCCESS) {
     return NULL;
@@ -6890,7 +6950,60 @@ static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator, bool* newgro
   return pInfo->binfo.pRes->info.rows == 0 ? NULL : pInfo->binfo.pRes;
 }
 
-static SSDataBlock* doAllIntervalAgg(SOperatorInfo* pOperator, bool* newgroup) {
+static SSDataBlock* doStreamIntervalAgg(SOperatorInfo *pOperator, bool* newgroup) {
+  STableIntervalOperatorInfo* pInfo = pOperator->info;
+  int32_t order = TSDB_ORDER_ASC;
+
+  if (pOperator->status == OP_EXEC_DONE) {
+    return NULL;
+  }
+
+  if (pOperator->status == OP_RES_TO_RETURN) {
+    toSDatablock(&pInfo->groupResInfo, pInfo->aggSup.pResultBuf, pInfo->binfo.pRes, pInfo->binfo.capacity,
+                 pInfo->binfo.rowCellInfoOffset);
+    if (pInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) {
+      pOperator->status = OP_EXEC_DONE;
+    }
+    return pInfo->binfo.pRes;
+  }
+
+  //  STimeWindow win = {0};
+  *newgroup = false;
+  SOperatorInfo* downstream = pOperator->pDownstream[0];
+
+  SArray* pUpdated = NULL;
+
+  while (1) {
+    publishOperatorProfEvent(downstream, QUERY_PROF_BEFORE_OPERATOR_EXEC);
+    SSDataBlock* pBlock = downstream->getNextFn(downstream, newgroup);
+    publishOperatorProfEvent(downstream, QUERY_PROF_AFTER_OPERATOR_EXEC);
+
+    if (pBlock == NULL) {
+      break;
+    }
+
+    // The timewindows that overlaps the timestamps of the input pBlock need to be recalculated and return to the caller.
+    // Note that all the time window are not close till now.
+
+    //    setTagValue(pOperator, pRuntimeEnv->current->pTable, pInfo->pCtx, pOperator->numOfOutput);
+    // the pDataBlock are always the same one, no need to call this again
+    setInputDataBlock(pOperator, pInfo->binfo.pCtx, pBlock, order);
+    pUpdated = hashIntervalAgg(pOperator, &pInfo->binfo.resultRowInfo, pBlock, 0);
+  }
+
+  finalizeUpdatedResult(pInfo->binfo.pCtx, pOperator->numOfOutput, pInfo->aggSup.pResultBuf, pUpdated, pInfo->binfo.rowCellInfoOffset);
+
+  blockDataEnsureCapacity(pInfo->binfo.pRes, pInfo->binfo.capacity);
+  toSDatablock(&pInfo->groupResInfo, pInfo->aggSup.pResultBuf, pInfo->binfo.pRes, pInfo->binfo.capacity,
+               pInfo->binfo.rowCellInfoOffset);
+
+  ASSERT(pInfo->binfo.pRes->info.rows > 0);
+  pOperator->status = OP_RES_TO_RETURN;
+
+  return pInfo->binfo.pRes->info.rows == 0 ? NULL : pInfo->binfo.pRes;
+}
+
+static SSDataBlock* doAllIntervalAgg(SOperatorInfo *pOperator, bool* newgroup) {
   if (pOperator->status == OP_EXEC_DONE) {
     return NULL;
   }
@@ -7514,8 +7627,7 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo*
 
   //(int32_t)(getRowNumForMultioutput(pQueryAttr, pQueryAttr->topBotQuery, pQueryAttr->stableQuery));
   int32_t numOfRows = 1;
-  int32_t code =
-      initAggInfo(&pInfo->binfo, &pInfo->aggSup, pExprInfo, numOfCols, numOfRows, pResultBlock, pTaskInfo->id.str);
+  int32_t code = initAggInfo(&pInfo->binfo, &pInfo->aggSup, pExprInfo, numOfCols, numOfRows, pResultBlock, pTaskInfo->id.str);
   pInfo->pTableQueryInfo = initTableQueryInfo(pTableGroupInfo);
   if (code != TSDB_CODE_SUCCESS || pInfo->pTableQueryInfo == NULL) {
     goto _error;
@@ -7523,18 +7635,18 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo*
 
   setFunctionResultOutput(&pInfo->binfo, &pInfo->aggSup, MAIN_SCAN, pTaskInfo);
 
-  pOperator->name = "TableAggregate";
+  pOperator->name         = "TableAggregate";
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_AGG;
   pOperator->blockingOptr = true;
-  pOperator->status = OP_NOT_OPENED;
-  pOperator->info = pInfo;
-  pOperator->pExpr = pExprInfo;
-  pOperator->numOfOutput = numOfCols;
+  pOperator->status       = OP_NOT_OPENED;
+  pOperator->info         = pInfo;
+  pOperator->pExpr        = pExprInfo;
+  pOperator->numOfOutput  = numOfCols;
 
-  pOperator->pTaskInfo = pTaskInfo;
-  pOperator->_openFn = doOpenAggregateOptr;
-  pOperator->getNextFn = getAggregateResult;
-  pOperator->closeFn = destroyAggOperatorInfo;
+  pOperator->pTaskInfo    = pTaskInfo;
+  pOperator->_openFn      = doOpenAggregateOptr;
+  pOperator->getNextFn    = getAggregateResult;
+  pOperator->closeFn      = destroyAggOperatorInfo;
   pOperator->encodeResultRow = aggEncodeResultRow;
   pOperator->decodeResultRow = aggDecodeResultRow;
 
@@ -7711,16 +7823,16 @@ SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SExprInfo* p
   //  initResultRowInfo(&pBInfo->resultRowInfo, 8);
   //  setFunctionResultOutput(pBInfo, MAIN_SCAN);
 
-  pOperator->name = "ProjectOperator";
+  pOperator->name         = "ProjectOperator";
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_PROJECT;
   pOperator->blockingOptr = false;
-  pOperator->status = OP_NOT_OPENED;
-  pOperator->info = pInfo;
-  pOperator->pExpr = pExprInfo;
-  pOperator->numOfOutput = num;
-  pOperator->_openFn = operatorDummyOpenFn;
-  pOperator->getNextFn = doProjectOperation;
-  pOperator->closeFn = destroyProjectOperatorInfo;
+  pOperator->status       = OP_NOT_OPENED;
+  pOperator->info         = pInfo;
+  pOperator->pExpr        = pExprInfo;
+  pOperator->numOfOutput  = num;
+  pOperator->_openFn      = operatorDummyOpenFn;
+  pOperator->getNextFn    = doProjectOperation;
+  pOperator->closeFn      = destroyProjectOperatorInfo;
 
   pOperator->pTaskInfo = pTaskInfo;
   int32_t code = appendDownstream(pOperator, &downstream, 1);
@@ -7735,39 +7847,6 @@ _error:
   return NULL;
 }
 
-SColumnInfo* extractColumnFilterInfo(SExprInfo* pExpr, int32_t numOfOutput, int32_t* numOfFilterCols) {
-#if 0
-  SColumnInfo* pCols = taosMemoryCalloc(numOfOutput, sizeof(SColumnInfo));
-
-  int32_t numOfFilter = 0;
-  for(int32_t i = 0; i < numOfOutput; ++i) {
-    if (pExpr[i].base.flist.numOfFilters > 0) {
-      numOfFilter += 1;
-    }
-
-    pCols[i].type  = pExpr[i].base.resSchema.type;
-    pCols[i].bytes = pExpr[i].base.resSchema.bytes;
-    pCols[i].colId = pExpr[i].base.resSchema.colId;
-
-    pCols[i].flist.numOfFilters = pExpr[i].base.flist.numOfFilters;
-    if (pCols[i].flist.numOfFilters != 0) { 
-      pCols[i].flist.filterInfo   = taosMemoryCalloc(pCols[i].flist.numOfFilters, sizeof(SColumnFilterInfo));
-      memcpy(pCols[i].flist.filterInfo, pExpr[i].base.flist.filterInfo, pCols[i].flist.numOfFilters * sizeof(SColumnFilterInfo));
-    } else {
-      // avoid runtime error
-      pCols[i].flist.filterInfo   = NULL; 
-    }
-  }
-
-  assert(numOfFilter > 0);
-
-  *numOfFilterCols = numOfFilter;
-  return pCols;
-#endif
-
-  return 0;
-}
-
 SOperatorInfo* createLimitOperatorInfo(SOperatorInfo* downstream, SLimit* pLimit, SExecTaskInfo* pTaskInfo) {
   SLimitOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SLimitOperatorInfo));
   SOperatorInfo*      pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
@@ -7778,17 +7857,18 @@ SOperatorInfo* createLimitOperatorInfo(SOperatorInfo* downstream, SLimit* pLimit
   pInfo->limit = *pLimit;
   pInfo->currentOffset = pLimit->offset;
 
-  pOperator->name = "LimitOperator";
+  pOperator->name         = "LimitOperator";
   //  pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_LIMIT;
   pOperator->blockingOptr = false;
-  pOperator->status = OP_NOT_OPENED;
-  pOperator->_openFn = operatorDummyOpenFn;
-  pOperator->getNextFn = doLimit;
-  pOperator->info = pInfo;
-  pOperator->pTaskInfo = pTaskInfo;
-  int32_t code = appendDownstream(pOperator, &downstream, 1);
+  pOperator->status       = OP_NOT_OPENED;
+  pOperator->_openFn      = operatorDummyOpenFn;
+  pOperator->getNextFn    = doLimit;
+  pOperator->info         = pInfo;
+  pOperator->pTaskInfo    = pTaskInfo;
 
+  int32_t code = appendDownstream(pOperator, &downstream, 1);
   return pOperator;
+
 _error:
   taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
@@ -7805,17 +7885,18 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo*
     goto _error;
   }
 
-  pInfo->order = TSDB_ORDER_ASC;
-  pInfo->precision = TSDB_TIME_PRECISION_MILLI;
-  pInfo->win = pTaskInfo->window;
-  pInfo->interval = *pInterval;
+  pInfo->order     = TSDB_ORDER_ASC;
+  pInfo->interval  = *pInterval;
+  pInfo->execModel = pTaskInfo->execModel;
 
-  pInfo->win.skey = INT64_MIN;
-  pInfo->win.ekey = INT64_MAX;
+  pInfo->win       = pTaskInfo->window;
+  pInfo->win.skey  = 0;
+  pInfo->win.ekey  = INT64_MAX;
 
   int32_t numOfRows = 4096;
-  int32_t code =
-      initAggInfo(&pInfo->binfo, &pInfo->aggSup, pExprInfo, numOfCols, numOfRows, pResBlock, pTaskInfo->id.str);
+  int32_t code = initAggInfo(&pInfo->binfo, &pInfo->aggSup, pExprInfo, numOfCols, numOfRows, pResBlock, pTaskInfo->id.str);
+  initExecTimeWindowInfo(&pInfo->timeWindowData, &pInfo->win);
+
   //  pInfo->pTableQueryInfo = initTableQueryInfo(pTableGroupInfo);
   if (code != TSDB_CODE_SUCCESS /* || pInfo->pTableQueryInfo == NULL*/) {
     goto _error;
@@ -7823,17 +7904,18 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo*
 
   initResultRowInfo(&pInfo->binfo.resultRowInfo, (int32_t)1);
 
-  pOperator->name = "TimeIntervalAggOperator";
+  pOperator->name         = "TimeIntervalAggOperator";
   pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_INTERVAL;
   pOperator->blockingOptr = true;
-  pOperator->status = OP_NOT_OPENED;
-  pOperator->pExpr = pExprInfo;
-  pOperator->pTaskInfo = pTaskInfo;
-  pOperator->numOfOutput = numOfCols;
-  pOperator->info = pInfo;
-  pOperator->_openFn = doOpenIntervalAgg;
-  pOperator->getNextFn = doBuildIntervalResult;
-  pOperator->closeFn = destroyIntervalOperatorInfo;
+  pOperator->status       = OP_NOT_OPENED;
+  pOperator->pExpr        = pExprInfo;
+  pOperator->pTaskInfo    = pTaskInfo;
+  pOperator->numOfOutput  = numOfCols;
+  pOperator->info         = pInfo;
+  pOperator->_openFn      = doOpenIntervalAgg;
+  pOperator->getNextFn    = doBuildIntervalResult;
+  pOperator->getStreamResFn= doStreamIntervalAgg;
+  pOperator->closeFn      = destroyIntervalOperatorInfo;
 
   code = appendDownstream(pOperator, &downstream, 1);
   if (code != TSDB_CODE_SUCCESS) {
@@ -8555,6 +8637,23 @@ static SResSchema createResSchema(int32_t type, int32_t bytes, int32_t slotId, i
   return s;
 }
 
+static SColumn* createColumn(int32_t blockId, int32_t slotId, SDataType* pType) {
+  SColumn* pCol = taosMemoryCalloc(1, sizeof(SColumn));
+  if (pCol == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  pCol->slotId      = slotId;
+  pCol->bytes       = pType->bytes;
+  pCol->type        = pType->type;
+  pCol->scale       = pType->scale;
+  pCol->precision   = pType->precision;
+  pCol->dataBlockId = blockId;
+
+  return pCol;
+}
+
 SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t* numOfExprs) {
   int32_t numOfFuncs = LIST_LENGTH(pNodeList);
   int32_t numOfGroupKeys = 0;
@@ -8586,18 +8685,11 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
 
       pExp->base.pParam = taosMemoryCalloc(1, sizeof(SFunctParam));
       pExp->base.numOfParams = 1;
-      pExp->base.pParam[0].pCol = taosMemoryCalloc(1, sizeof(SColumn));
-      pExp->base.pParam[0].type = FUNC_PARAM_TYPE_COLUMN;
 
       SDataType* pType = &pColNode->node.resType;
       pExp->base.resSchema = createResSchema(pType->type, pType->bytes, pTargetNode->slotId, pType->scale, pType->precision, pColNode->colName);
-
-      SColumn* pCol = pExp->base.pParam[0].pCol;
-      pCol->slotId    = pColNode->slotId;   // TODO refactor
-      pCol->bytes     = pType->bytes;
-      pCol->type      = pType->type;
-      pCol->scale     = pType->scale;
-      pCol->precision = pType->precision;
+      pExp->base.pParam[0].pCol = createColumn(pColNode->dataBlockId, pColNode->slotId, pType);
+      pExp->base.pParam[0].type = FUNC_PARAM_TYPE_COLUMN;
     } else if (nodeType(pTargetNode->pExpr) == QUERY_NODE_FUNCTION) {
       pExp->pExpr->nodeType = QUERY_NODE_FUNCTION;
       SFunctionNode* pFuncNode = (SFunctionNode*)pTargetNode->pExpr;
@@ -8608,8 +8700,7 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
 
       pExp->pExpr->_function.functionId = pFuncNode->funcId;
       pExp->pExpr->_function.pFunctNode = pFuncNode;
-      strncpy(pExp->pExpr->_function.functionName, pFuncNode->functionName,
-              tListLen(pExp->pExpr->_function.functionName));
+      strncpy(pExp->pExpr->_function.functionName, pFuncNode->functionName, tListLen(pExp->pExpr->_function.functionName));
 
       // TODO: value parameter needs to be handled
       int32_t numOfParam = LIST_LENGTH(pFuncNode->pParameterList);
@@ -8620,21 +8711,12 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
       for (int32_t j = 0; j < numOfParam; ++j) {
         SNode*       p1 = nodesListGetNode(pFuncNode->pParameterList, j);
         if (p1->type == QUERY_NODE_COLUMN) {
-          SColumnNode* pcn = (SColumnNode*)p1;  // TODO refactor
+          SColumnNode* pcn = (SColumnNode*) p1;
 
           pExp->base.pParam[j].type = FUNC_PARAM_TYPE_COLUMN;
-          pExp->base.pParam[j].pCol = taosMemoryCalloc(1, sizeof(SColumn));
-          SColumn* pCol = pExp->base.pParam[j].pCol;
-
-          pCol->slotId      = pcn->slotId;
-          pCol->bytes       = pcn->node.resType.bytes;
-          pCol->type        = pcn->node.resType.type;
-          pCol->scale       = pcn->node.resType.scale;
-          pCol->precision   = pcn->node.resType.precision;
-          pCol->dataBlockId = pcn->dataBlockId;
+          pExp->base.pParam[j].pCol = createColumn(pcn->dataBlockId, pcn->slotId, &pcn->node.resType);
         } else if (p1->type == QUERY_NODE_VALUE) {
           SValueNode* pvn = (SValueNode*)p1;
-
           pExp->base.pParam[j].type = FUNC_PARAM_TYPE_VALUE;
         }
       }
@@ -8644,21 +8726,14 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
 
       pExp->base.pParam = taosMemoryCalloc(1, sizeof(SFunctParam));
       pExp->base.numOfParams = 1;
-      pExp->base.pParam[0].pCol = taosMemoryCalloc(1, sizeof(SColumn));
-      pExp->base.pParam[0].type = FUNC_PARAM_TYPE_COLUMN;
 
       SDataType* pType = &pNode->node.resType;
-      pExp->base.resSchema = createResSchema(pType->type, pType->bytes, pTargetNode->slotId, pType->scale,
-                                             pType->precision, pNode->node.aliasName);
+      pExp->base.resSchema = createResSchema(pType->type, pType->bytes, pTargetNode->slotId, pType->scale, pType->precision, pNode->node.aliasName);
 
       pExp->pExpr->_optrRoot.pRootNode = pTargetNode->pExpr;
 
-      SColumn* pCol   = pExp->base.pParam[0].pCol;
-      pCol->slotId    = pTargetNode->slotId;   // TODO refactor
-      pCol->bytes     = pType->bytes;
-      pCol->type      = pType->type;
-      pCol->scale     = pType->scale;
-      pCol->precision = pType->precision;
+      pExp->base.pParam[0].type = FUNC_PARAM_TYPE_COLUMN;
+      pExp->base.pParam[0].pCol = createColumn(pTargetNode->dataBlockId, pTargetNode->slotId, pType);
     } else {
       ASSERT(0);
     }
@@ -8667,12 +8742,13 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
   return pExprs;
 }
 
-static SExecTaskInfo* createExecTaskInfo(uint64_t queryId, uint64_t taskId) {
+static SExecTaskInfo* createExecTaskInfo(uint64_t queryId, uint64_t taskId, EOPTR_EXEC_MODEL model) {
   SExecTaskInfo* pTaskInfo = taosMemoryCalloc(1, sizeof(SExecTaskInfo));
   setTaskStatus(pTaskInfo, TASK_NOT_COMPLETED);
 
   pTaskInfo->cost.created = taosGetTimestampMs();
   pTaskInfo->id.queryId = queryId;
+  pTaskInfo->execModel  = model;
 
   char* p = taosMemoryCalloc(1, 128);
   snprintf(p, 128, "TID:0x%" PRIx64 " QID:0x%" PRIx64, taskId, queryId);
@@ -8692,17 +8768,15 @@ static SArray* extractColumnInfo(SNodeList* pNodeList);
 static SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNodeList, int32_t* numOfOutputCols);
 static SArray* createSortInfo(SNodeList* pNodeList);
 
-SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
+SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
                                         uint64_t queryId, uint64_t taskId, STableGroupInfo* pTableGroupInfo) {
   if (pPhyNode->pChildren == NULL || LIST_LENGTH(pPhyNode->pChildren) == 0) {
     if (QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == nodeType(pPhyNode)) {
       SScanPhysiNode* pScanPhyNode = (SScanPhysiNode*)pPhyNode;
 
       int32_t     numOfCols = 0;
-      tsdbReaderT pDataReader =
-          doCreateDataReader((STableScanPhysiNode*)pPhyNode, pHandle, pTableGroupInfo, (uint64_t)queryId, taskId);
-      SArray* pColList =
-          extractColMatchInfo(pScanPhyNode->pScanCols, pScanPhyNode->node.pOutputDataBlockDesc, &numOfCols);
+      tsdbReaderT pDataReader = doCreateDataReader((STableScanPhysiNode*)pPhyNode, pHandle, pTableGroupInfo, (uint64_t)queryId, taskId);
+      SArray* pColList = extractColMatchInfo(pScanPhyNode->pScanCols, pScanPhyNode->node.pOutputDataBlockDesc, &numOfCols);
 
       return createTableScanOperatorInfo(pDataReader, pScanPhyNode->order, numOfCols, pScanPhyNode->count,
                                          pScanPhyNode->reverse, pColList, pTaskInfo);
@@ -8745,7 +8819,7 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
     assert(size == 1);
 
     SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-    SOperatorInfo* op = doCreateOperatorTreeNode(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+    SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
 
     int32_t      num = 0;
     SExprInfo*   pExprInfo = createExprInfo(((SProjectPhysiNode*)pPhyNode)->pProjections, NULL, &num);
@@ -8757,7 +8831,7 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
 
     for (int32_t i = 0; i < size; ++i) {
       SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, i);
-      SOperatorInfo* op = doCreateOperatorTreeNode(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+      SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
 
       int32_t num = 0;
 
@@ -8778,7 +8852,7 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
 
     for (int32_t i = 0; i < size; ++i) {
       SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, i);
-      SOperatorInfo* op = doCreateOperatorTreeNode(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+      SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
 
       SIntervalPhysiNode* pIntervalPhyNode = (SIntervalPhysiNode*)pPhyNode;
 
@@ -8787,11 +8861,12 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
       SExprInfo*   pExprInfo = createExprInfo(pIntervalPhyNode->window.pFuncs, NULL, &num);
       SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
 
-      SInterval interval = {.interval = pIntervalPhyNode->interval,
-                            .sliding = pIntervalPhyNode->sliding,
+      SInterval interval = {.interval     = pIntervalPhyNode->interval,
+                            .sliding      = pIntervalPhyNode->sliding,
                             .intervalUnit = pIntervalPhyNode->intervalUnit,
-                            .slidingUnit = pIntervalPhyNode->slidingUnit,
-                            .offset = pIntervalPhyNode->offset};
+                            .slidingUnit  = pIntervalPhyNode->slidingUnit,
+                            .offset       = pIntervalPhyNode->offset,
+                            .precision    = TSDB_TIME_PRECISION_MILLI};
       return createIntervalOperatorInfo(op, pExprInfo, num, pResBlock, &interval, pTableGroupInfo, pTaskInfo);
     }
   } else if (QUERY_NODE_PHYSICAL_PLAN_SORT == nodeType(pPhyNode)) {
@@ -8799,7 +8874,7 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
     assert(size == 1);
 
     SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-    SOperatorInfo* op = doCreateOperatorTreeNode(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+    SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
 
     SSortPhysiNode* pSortPhyNode = (SSortPhysiNode*)pPhyNode;
 
@@ -8811,7 +8886,7 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
     assert(size == 1);
 
     SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-    SOperatorInfo* op = doCreateOperatorTreeNode(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+    SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
 
     SSessionWinodwPhysiNode* pSessionNode = (SSessionWinodwPhysiNode*)pPhyNode;
 
@@ -8827,7 +8902,7 @@ SOperatorInfo* doCreateOperatorTreeNode(SPhysiNode* pPhyNode, SExecTaskInfo* pTa
 
      for (int32_t i = 0; i < size; ++i) {
        SPhysiNode*      pChildNode = taosArrayGetP(pPhyNode->pChildren, i);
-       SOperatorInfo* op = doCreateOperatorTreeNode(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+       SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
        return createMultiTableAggOperatorInfo(op, pPhyNode->pTargets, pTaskInfo, pTableGroupInfo);
      }
    }*/
@@ -8972,11 +9047,11 @@ SArray* extractColMatchInfo(SNodeList* pNodeList, SDataBlockDescNode* pOutputNod
   for (int32_t i = 0; i < num; ++i) {
     SSlotDescNode* pNode = (SSlotDescNode*)nodesListGetNode(pOutputNodeList->pSlots, i);
     SColMatchInfo* info = taosArrayGet(pList, pNode->slotId);
-    //    if (pNode->output) {
-    (*numOfOutputCols) += 1;
-    //    } else {
-    //      info->output = false;
-    //    }
+    if (pNode->output) {
+      (*numOfOutputCols) += 1;
+    } else {
+      info->output = false;
+    }
   }
 
   return pList;
@@ -9034,18 +9109,18 @@ _error:
   return NULL;
 }
 
-int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SReadHandle* pHandle, uint64_t taskId) {
+int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SReadHandle* pHandle, uint64_t taskId, EOPTR_EXEC_MODEL model) {
   uint64_t queryId = pPlan->id.queryId;
 
   int32_t code = TSDB_CODE_SUCCESS;
-  *pTaskInfo = createExecTaskInfo(queryId, taskId);
+  *pTaskInfo = createExecTaskInfo(queryId, taskId, model);
   if (*pTaskInfo == NULL) {
     code = TSDB_CODE_QRY_OUT_OF_MEMORY;
     goto _complete;
   }
 
   STableGroupInfo group = {0};
-  (*pTaskInfo)->pRoot = doCreateOperatorTreeNode(pPlan->pNode, *pTaskInfo, pHandle, queryId, taskId, &group);
+  (*pTaskInfo)->pRoot = createOperatorTree(pPlan->pNode, *pTaskInfo, pHandle, queryId, taskId, &group);
   if (NULL == (*pTaskInfo)->pRoot) {
     code = terrno;
     goto _complete;
diff --git a/source/libs/executor/test/executorTests.cpp b/source/libs/executor/test/executorTests.cpp
index c9b0b62013..870a0b71fc 100644
--- a/source/libs/executor/test/executorTests.cpp
+++ b/source/libs/executor/test/executorTests.cpp
@@ -944,7 +944,7 @@ TEST(testCase, build_executor_tree_Test) {
   int32_t code = qStringToSubplan(msg, &plan);
   ASSERT_EQ(code, 0);
 
-  code = qCreateExecTask(&handle, 2, 1, plan, (void**) &pTaskInfo, &sinkHandle);
+  code = qCreateExecTask(&handle, 2, 1, plan, (void**) &pTaskInfo, &sinkHandle, OPTR_EXEC_MODEL_BATCH);
   ASSERT_EQ(code, 0);
 }
 
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 0a5a90d2d9..024da4e04b 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -315,31 +315,31 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "_qstartts",
     .type = FUNCTION_TYPE_QSTARTTS,
-    .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC,
+    .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
     .checkFunc    = stubCheckAndGetResultType,
-    .getEnvFunc   = NULL,
+    .getEnvFunc   = getTimePseudoFuncEnv,
     .initFunc     = NULL,
-    .sprocessFunc = NULL,
+    .sprocessFunc = qStartTsFunction,
     .finalizeFunc = NULL
   },
   {
     .name = "_qendts",
     .type = FUNCTION_TYPE_QENDTS,
-    .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC,
+    .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
     .checkFunc    = stubCheckAndGetResultType,
-    .getEnvFunc   = NULL,
+    .getEnvFunc   = getTimePseudoFuncEnv,
     .initFunc     = NULL,
-    .sprocessFunc = NULL,
+    .sprocessFunc = qEndTsFunction,
     .finalizeFunc = NULL
   },
   {
     .name = "_wstartts",
-    .type = FUNCTION_TYPE_QSTARTTS,
+    .type = FUNCTION_TYPE_WSTARTTS,
     .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
     .checkFunc    = stubCheckAndGetResultType,
-    .getEnvFunc   = NULL,
+    .getEnvFunc   = getTimePseudoFuncEnv,
     .initFunc     = NULL,
-    .sprocessFunc = NULL,
+    .sprocessFunc = winStartTsFunction,
     .finalizeFunc = NULL
   },
   {
@@ -347,9 +347,9 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .type = FUNCTION_TYPE_QENDTS,
     .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
     .checkFunc    = stubCheckAndGetResultType,
-    .getEnvFunc   = NULL,
+    .getEnvFunc   = getTimePseudoFuncEnv,
     .initFunc     = NULL,
-    .sprocessFunc = NULL,
+    .sprocessFunc = winEndTsFunction,
     .finalizeFunc = NULL
   },
   {
@@ -357,9 +357,9 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .type = FUNCTION_TYPE_WDURATION,
     .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
     .checkFunc    = stubCheckAndGetResultType,
-    .getEnvFunc   = NULL,
+    .getEnvFunc   = getTimePseudoFuncEnv,
     .initFunc     = NULL,
-    .sprocessFunc = NULL,
+    .sprocessFunc = winDurFunction,
     .finalizeFunc = NULL
   }
 };
@@ -368,6 +368,7 @@ const int32_t funcMgtBuiltinsNum = (sizeof(funcMgtBuiltins) / sizeof(SBuiltinFun
 
 int32_t stubCheckAndGetResultType(SFunctionNode* pFunc) {
   switch(pFunc->funcType) {
+    case FUNCTION_TYPE_WDURATION:
     case FUNCTION_TYPE_COUNT:
       pFunc->node.resType = (SDataType){.bytes = sizeof(int64_t), .type = TSDB_DATA_TYPE_BIGINT};
       break;
@@ -400,14 +401,18 @@ int32_t stubCheckAndGetResultType(SFunctionNode* pFunc) {
     }
     case FUNCTION_TYPE_CONCAT:
     case FUNCTION_TYPE_ROWTS:
-    case FUNCTION_TYPE_TBNAME:
-    case FUNCTION_TYPE_QSTARTTS:
-    case FUNCTION_TYPE_QENDTS:
-    case FUNCTION_TYPE_WSTARTTS:
-    case FUNCTION_TYPE_WENDTS:
-    case FUNCTION_TYPE_WDURATION:
+    case FUNCTION_TYPE_TBNAME: {
       // todo
       break;
+    }
+
+    case FUNCTION_TYPE_QENDTS:
+    case FUNCTION_TYPE_QSTARTTS:
+    case FUNCTION_TYPE_WENDTS:
+    case FUNCTION_TYPE_WSTARTTS: {
+      pFunc->node.resType = (SDataType){.bytes = sizeof(int64_t), .type = TSDB_DATA_TYPE_TIMESTAMP};
+      break;
+    }
 
     case FUNCTION_TYPE_ABS:
     case FUNCTION_TYPE_CEIL:
diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c
index 3858258374..4034a0eb0f 100644
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
@@ -92,6 +92,7 @@ int32_t fmGetScalarFuncExecFuncs(int32_t funcId, SScalarFuncExecFuncs* pFpSet) {
     return TSDB_CODE_FAILED;
   }
   pFpSet->process = funcMgtBuiltins[funcId].sprocessFunc;
+  pFpSet->getEnv  = funcMgtBuiltins[funcId].getEnvFunc;
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/source/libs/function/src/texpr.c b/source/libs/function/src/texpr.c
index 814aa48b55..61ff6bb825 100644
--- a/source/libs/function/src/texpr.c
+++ b/source/libs/function/src/texpr.c
@@ -116,42 +116,6 @@ bool exprTreeApplyFilter(tExprNode *pExpr, const void *pItem, SExprTraverseSupp
   return param->nodeFilterFn(pItem, pExpr->_node.info);
 }
 
-
-
-static void exprTreeToBinaryImpl(SBufferWriter* bw, tExprNode* expr) {
-  tbufWriteUint8(bw, expr->nodeType);
-  
-  if (expr->nodeType == TEXPR_VALUE_NODE) {
-    SVariant* pVal = expr->pVal;
-    
-    tbufWriteUint32(bw, pVal->nType);
-    if (pVal->nType == TSDB_DATA_TYPE_BINARY) {
-      tbufWriteInt32(bw, pVal->nLen);
-      tbufWrite(bw, pVal->pz, pVal->nLen);
-    } else {
-      tbufWriteInt64(bw, pVal->i);
-    }
-    
-  } else if (expr->nodeType == TEXPR_COL_NODE) {
-    SSchema* pSchema = expr->pSchema;
-    tbufWriteInt16(bw, pSchema->colId);
-    tbufWriteInt16(bw, pSchema->bytes);
-    tbufWriteUint8(bw, pSchema->type);
-    tbufWriteString(bw, pSchema->name);
-    
-  } else if (expr->nodeType == TEXPR_BINARYEXPR_NODE) {
-    tbufWriteUint8(bw, expr->_node.optr);
-    exprTreeToBinaryImpl(bw, expr->_node.pLeft);
-    exprTreeToBinaryImpl(bw, expr->_node.pRight);
-  }
-}
-
-void exprTreeToBinary(SBufferWriter* bw, tExprNode* expr) {
-  if (expr != NULL) {
-    exprTreeToBinaryImpl(bw, expr);
-  }
-}
-
 // TODO: these three functions should be made global
 static void* exception_calloc(size_t nmemb, size_t size) {
   void* p = taosMemoryCalloc(nmemb, size);
@@ -230,97 +194,6 @@ tExprNode* exprTreeFromBinary(const void* data, size_t size) {
   return exprTreeFromBinaryImpl(&br);
 }
 
-tExprNode* exprTreeFromTableName(const char* tbnameCond) {
-  if (!tbnameCond) {
-    return NULL;
-  }
-
-  int32_t anchor = CLEANUP_GET_ANCHOR();
-
-  tExprNode* expr = exception_calloc(1, sizeof(tExprNode));
-  CLEANUP_PUSH_VOID_PTR_PTR(true, tExprTreeDestroy, expr, NULL);
-
-  expr->nodeType = TEXPR_BINARYEXPR_NODE;
-
-  tExprNode* left = exception_calloc(1, sizeof(tExprNode));
-  expr->_node.pLeft = left;
-
-  left->nodeType = TEXPR_COL_NODE;
-  SSchema* pSchema = exception_calloc(1, sizeof(SSchema));
-  left->pSchema = pSchema;
-
-//  *pSchema = NULL;//*tGetTbnameColumnSchema();
-
-  tExprNode* right = exception_calloc(1, sizeof(tExprNode));
-  expr->_node.pRight = right;
-
-  if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_LIKE, QUERY_COND_REL_PREFIX_LIKE_LEN) == 0) {
-    right->nodeType = TEXPR_VALUE_NODE;
-    expr->_node.optr = OP_TYPE_LIKE;
-    SVariant* pVal = exception_calloc(1, sizeof(SVariant));
-    right->pVal = pVal;
-    size_t len = strlen(tbnameCond + QUERY_COND_REL_PREFIX_LIKE_LEN) + 1;
-    pVal->pz = exception_malloc(len);
-    memcpy(pVal->pz, tbnameCond + QUERY_COND_REL_PREFIX_LIKE_LEN, len);
-    pVal->nType = TSDB_DATA_TYPE_BINARY;
-    pVal->nLen = (int32_t)len;
-
-  } else if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_MATCH, QUERY_COND_REL_PREFIX_MATCH_LEN) == 0) {
-    right->nodeType = TEXPR_VALUE_NODE;
-    expr->_node.optr = OP_TYPE_MATCH;
-    SVariant* pVal = exception_calloc(1, sizeof(SVariant));
-    right->pVal = pVal;
-    size_t len = strlen(tbnameCond + QUERY_COND_REL_PREFIX_MATCH_LEN) + 1;
-    pVal->pz = exception_malloc(len);
-    memcpy(pVal->pz, tbnameCond + QUERY_COND_REL_PREFIX_MATCH_LEN, len);
-    pVal->nType = TSDB_DATA_TYPE_BINARY;
-    pVal->nLen = (int32_t)len;
-  } else if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_NMATCH, QUERY_COND_REL_PREFIX_NMATCH_LEN) == 0) {
-    right->nodeType = TEXPR_VALUE_NODE;
-    expr->_node.optr = OP_TYPE_NMATCH;
-    SVariant* pVal = exception_calloc(1, sizeof(SVariant));
-    right->pVal = pVal;
-    size_t len = strlen(tbnameCond + QUERY_COND_REL_PREFIX_NMATCH_LEN) + 1;
-    pVal->pz = exception_malloc(len);
-    memcpy(pVal->pz, tbnameCond + QUERY_COND_REL_PREFIX_NMATCH_LEN, len);
-    pVal->nType = TSDB_DATA_TYPE_BINARY;
-    pVal->nLen = (int32_t)len;
-  } else if (strncmp(tbnameCond, QUERY_COND_REL_PREFIX_IN, QUERY_COND_REL_PREFIX_IN_LEN) == 0) {
-    right->nodeType = TEXPR_VALUE_NODE;
-    expr->_node.optr = OP_TYPE_IN;
-    SVariant* pVal = exception_calloc(1, sizeof(SVariant));
-    right->pVal = pVal;
-    pVal->nType = TSDB_DATA_TYPE_POINTER_ARRAY;
-    pVal->arr = taosArrayInit(2, POINTER_BYTES);
-
-    const char* cond = tbnameCond + QUERY_COND_REL_PREFIX_IN_LEN;
-    for (const char *e = cond; *e != 0; e++) {
-      if (*e == TS_PATH_DELIMITER[0]) {
-        cond = e + 1;
-      } else if (*e == ',') {
-        size_t len = e - cond;
-        char* p = exception_malloc(len + VARSTR_HEADER_SIZE);
-        STR_WITH_SIZE_TO_VARSTR(p, cond, (VarDataLenT)len);
-        cond += len;
-        taosArrayPush(pVal->arr, &p);
-      }
-    }
-
-    if (*cond != 0) {
-      size_t len = strlen(cond) + VARSTR_HEADER_SIZE;
-      
-      char* p = exception_malloc(len);
-      STR_WITH_SIZE_TO_VARSTR(p, cond, (VarDataLenT)(len - VARSTR_HEADER_SIZE));
-      taosArrayPush(pVal->arr, &p);
-    }
-
-    taosArraySortString(pVal->arr, taosArrayCompareString);
-  }
-
-  CLEANUP_EXECUTE_TO(anchor, false);
-  return expr;
-}
-
 void buildFilterSetFromBinary(void **q, const char *buf, int32_t len) {
   SBufferReader br = tbufInitReader(buf, len, false); 
   uint32_t type  = tbufReadUint32(&br);     
diff --git a/source/libs/function/src/tunaryoperator.c b/source/libs/function/src/tunaryoperator.c
deleted file mode 100644
index 957f0799c5..0000000000
--- a/source/libs/function/src/tunaryoperator.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "tunaryoperator.h"
-
-
-
-
-// TODO dynamic define these functions
-//_unary_scalar_fn_t getUnaryScalarOperatorFn(int32_t operator) {
-//  assert(0);
-//}
-
-//bool isStringOperatorFn(int32_t op) {
-//  return op == FUNCTION_LENGTH;
-//}
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index fdfef6434b..89b4476899 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -82,6 +82,8 @@ SNodeptr nodesMakeNode(ENodeType type) {
       return makeNode(type, sizeof(STableOptions));
     case QUERY_NODE_INDEX_OPTIONS:
       return makeNode(type, sizeof(SIndexOptions));
+    case QUERY_NODE_EXPLAIN_OPTIONS:
+      return makeNode(type, sizeof(SExplainOptions));
     case QUERY_NODE_SET_OPERATOR:
       return makeNode(type, sizeof(SSetOperator));
     case QUERY_NODE_SELECT_STMT:
@@ -132,6 +134,8 @@ SNodeptr nodesMakeNode(ENodeType type) {
       return makeNode(type, sizeof(SCreateTopicStmt));
     case QUERY_NODE_DROP_TOPIC_STMT:
       return makeNode(type, sizeof(SDropTopicStmt));
+    case QUERY_NODE_EXPLAIN_STMT:
+      return makeNode(type, sizeof(SExplainStmt));
     case QUERY_NODE_SHOW_DATABASES_STMT:
     case QUERY_NODE_SHOW_TABLES_STMT:
     case QUERY_NODE_SHOW_STABLES_STMT:
diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 0fe5df183d..029ae7e91f 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -159,6 +159,10 @@ SNode* createDropQnodeStmt(SAstCreateContext* pCxt, const SToken* pDnodeId);
 SNode* createCreateTopicStmt(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, SNode* pQuery, const SToken* pSubscribeDbName);
 SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pTopicName);
 SNode* createAlterLocalStmt(SAstCreateContext* pCxt, const SToken* pConfig, const SToken* pValue);
+SNode* createDefaultExplainOptions(SAstCreateContext* pCxt);
+SNode* setExplainVerbose(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal);
+SNode* setExplainRatio(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal);
+SNode* createExplainStmt(SAstCreateContext* pCxt, bool analyze, SNode* pOptions, SNode* pQuery);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 7556684e8b..5e2f8e4241 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -339,6 +339,18 @@ cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B) AS query_expression(C).
 cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B) AS db_name(C).               { pCxt->pRootNode = createCreateTopicStmt(pCxt, A, &B, NULL, &C); }
 cmd ::= DROP TOPIC exists_opt(A) topic_name(B).                                   { pCxt->pRootNode = createDropTopicStmt(pCxt, A, &B); }
 
+/************************************************ select **************************************************************/
+cmd ::= EXPLAIN analyze_opt(A) explain_options(B) query_expression(C).            { pCxt->pRootNode = createExplainStmt(pCxt, A, B, C); }
+
+%type analyze_opt                                                                 { bool }
+%destructor analyze_opt                                                           { }
+analyze_opt(A) ::= .                                                              { A = false; }
+analyze_opt(A) ::= ANALYZE.                                                       { A = true; }
+
+explain_options(A) ::= .                                                          { A = createDefaultExplainOptions(pCxt); }
+explain_options(A) ::= explain_options(B) VERBOSE NK_BOOL(C).                     { A = setExplainVerbose(pCxt, B, &C); }
+explain_options(A) ::= explain_options(B) RATIO NK_FLOAT(C).                      { A = setExplainRatio(pCxt, B, &C); }
+
 /************************************************ select **************************************************************/
 cmd ::= query_expression(A).                                                      { pCxt->pRootNode = A; }
 
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index fcabd4614c..8783872ad8 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -1316,3 +1316,30 @@ SNode* createAlterLocalStmt(SAstCreateContext* pCxt, const SToken* pConfig, cons
   }
   return (SNode*)pStmt;
 }
+
+SNode* createDefaultExplainOptions(SAstCreateContext* pCxt) {
+  SExplainOptions* pOptions = nodesMakeNode(QUERY_NODE_EXPLAIN_OPTIONS);
+  CHECK_OUT_OF_MEM(pOptions);
+  pOptions->verbose = TSDB_DEFAULT_EXPLAIN_VERBOSE;
+  pOptions->ratio = TSDB_DEFAULT_EXPLAIN_RATIO;
+  return (SNode*)pOptions;
+}
+
+SNode* setExplainVerbose(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal) {
+  ((SExplainOptions*)pOptions)->verbose = (0 == strncasecmp(pVal->z, "true", pVal->n));
+  return pOptions;
+}
+
+SNode* setExplainRatio(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal) {
+  ((SExplainOptions*)pOptions)->ratio = strtod(pVal->z, NULL);
+  return pOptions;
+}
+
+SNode* createExplainStmt(SAstCreateContext* pCxt, bool analyze, SNode* pOptions, SNode* pQuery) {
+  SExplainStmt* pStmt = nodesMakeNode(QUERY_NODE_EXPLAIN_STMT);
+  CHECK_OUT_OF_MEM(pStmt);
+  pStmt->analyze = analyze;
+  pStmt->pOptions = (SExplainOptions*)pOptions;
+  pStmt->pQuery = pQuery;
+  return (SNode*)pStmt;
+}
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index 3751041ef7..213b14ae5d 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -31,6 +31,7 @@ static SKeyword keywordTable[] = {
     {"ACCOUNT",       TK_ACCOUNT},
     {"ALL",           TK_ALL},
     {"ALTER",         TK_ALTER},
+    {"ANALYZE",       TK_ANALYZE},
     {"AND",           TK_AND},
     {"AS",            TK_AS},
     {"ASC",           TK_ASC},
@@ -56,6 +57,7 @@ static SKeyword keywordTable[] = {
     {"DOUBLE",        TK_DOUBLE},
     {"DROP",          TK_DROP},
     {"EXISTS",        TK_EXISTS},
+    {"EXPLAIN",       TK_EXPLAIN},
     {"FILE_FACTOR",   TK_FILE_FACTOR},
     {"FILL",          TK_FILL},
     {"FLOAT",         TK_FLOAT},
@@ -110,6 +112,7 @@ static SKeyword keywordTable[] = {
     {"QNODES",        TK_QNODES},
     {"QSTARTTS",      TK_QSTARTTS},
     {"QUORUM",        TK_QUORUM},
+    {"RATIO",         TK_RATIO},
     {"REPLICA",       TK_REPLICA},
     {"RETENTIONS",    TK_RETENTIONS},
     {"ROLLUP",        TK_ROLLUP},
@@ -144,6 +147,7 @@ static SKeyword keywordTable[] = {
     {"USING",         TK_USING},
     {"VALUES",        TK_VALUES},
     {"VARCHAR",       TK_VARCHAR},
+    {"VERBOSE",       TK_VERBOSE},
     {"VGROUPS",       TK_VGROUPS},
     {"WAL",           TK_WAL},
     {"WDURATION",     TK_WDURATION},
@@ -224,7 +228,6 @@ static SKeyword keywordTable[] = {
     // {"DETACH",       TK_DETACH},
     // {"EACH",         TK_EACH},
     // {"END",          TK_END},
-    // {"EXPLAIN",      TK_EXPLAIN},
     // {"FAIL",         TK_FAIL},
     // {"FOR",          TK_FOR},
     // {"IGNORE",       TK_IGNORE},
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index e3fa2fc631..d453193d0f 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -32,6 +32,7 @@ typedef struct STranslateContext {
   SCmdMsgInfo* pCmdMsg;
   SHashObj* pDbs;
   SHashObj* pTables;
+  SExplainOptions* pExplainOpt;
 } STranslateContext;
 
 typedef struct SFullDatabaseName {
@@ -673,6 +674,7 @@ static int32_t translateTable(STranslateContext* pCxt, SNode* pTable) {
   switch (nodeType(pTable)) {
     case QUERY_NODE_REAL_TABLE: {
       SRealTableNode* pRealTable = (SRealTableNode*)pTable;
+      pRealTable->ratio = (NULL != pCxt->pExplainOpt ? pCxt->pExplainOpt->ratio : 1.0);
       SName name;
       code = getTableMetaImpl(pCxt,
           toName(pCxt->pParseCxt->acctId, pRealTable->table.dbName, pRealTable->table.tableName, &name), &(pRealTable->pMeta));
@@ -680,10 +682,9 @@ static int32_t translateTable(STranslateContext* pCxt, SNode* pTable) {
         return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_TABLE_NOT_EXIST, pRealTable->table.tableName);
       }
       code = setTableVgroupList(pCxt, &name, pRealTable);
-      if (TSDB_CODE_SUCCESS != code) {
-        return code;
+      if (TSDB_CODE_SUCCESS == code) {
+        code = addNamespace(pCxt, pRealTable);
       }
-      code = addNamespace(pCxt, pRealTable);
       break;
     }
     case QUERY_NODE_TEMP_TABLE: {
@@ -1804,6 +1805,13 @@ static int32_t translateAlterLocal(STranslateContext* pCxt, SAlterLocalStmt* pSt
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t translateExplain(STranslateContext* pCxt, SExplainStmt* pStmt) {
+  if (pStmt->analyze) {
+    pCxt->pExplainOpt = pStmt->pOptions;
+  }
+  return translateQuery(pCxt, pStmt->pQuery);
+}
+
 static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
   int32_t code = TSDB_CODE_SUCCESS;
   switch (nodeType(pNode)) {
@@ -1885,6 +1893,9 @@ static int32_t translateQuery(STranslateContext* pCxt, SNode* pNode) {
     case QUERY_NODE_ALTER_LOCAL_STMT:
       code = translateAlterLocal(pCxt, (SAlterLocalStmt*)pNode);
       break;
+    case QUERY_NODE_EXPLAIN_STMT:
+      code = translateExplain(pCxt, (SExplainStmt*)pNode);
+      break;
     default:
       break;
   }
@@ -1903,7 +1914,11 @@ static int32_t translateSubquery(STranslateContext* pCxt, SNode* pNode) {
 }
 
 int32_t qExtractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** pSchema) {
-  if (NULL != pRoot && QUERY_NODE_SELECT_STMT == nodeType(pRoot)) {
+  if (NULL == pRoot) {
+    return TSDB_CODE_SUCCESS;
+  }
+
+  if (QUERY_NODE_SELECT_STMT == nodeType(pRoot)) {
     SSelectStmt* pSelect = (SSelectStmt*) pRoot;
     *numOfCols = LIST_LENGTH(pSelect->pProjectionList);
     *pSchema = taosMemoryCalloc((*numOfCols), sizeof(SSchema));
@@ -1921,6 +1936,14 @@ int32_t qExtractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** p
       strcpy((*pSchema)[index].name, pExpr->aliasName);
       index +=1;
     }
+  } else if (QUERY_NODE_EXPLAIN_STMT == nodeType(pRoot)) {
+    *numOfCols = 1;
+    *pSchema = taosMemoryCalloc((*numOfCols), sizeof(SSchema));
+    if (NULL == (*pSchema)) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+    (*pSchema)[0].type = TSDB_DATA_TYPE_BINARY;
+    (*pSchema)[0].bytes = TSDB_EXPLAIN_RESULT_ROW_SIZE;
   }
 
   return TSDB_CODE_SUCCESS;
@@ -2505,6 +2528,7 @@ static int32_t rewriteQuery(STranslateContext* pCxt, SQuery* pQuery) {
 static int32_t setQuery(STranslateContext* pCxt, SQuery* pQuery) {
   switch (nodeType(pQuery->pRoot)) {
     case QUERY_NODE_SELECT_STMT:
+    case QUERY_NODE_EXPLAIN_STMT:
       pQuery->haveResultSet = true;
       pQuery->directRpc = false;
       pQuery->msgType = TDMT_VND_QUERY;
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index ef2c547e44..154b87ba4b 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -100,24 +100,24 @@
 #endif
 /************* Begin control #defines *****************************************/
 #define YYCODETYPE unsigned short int
-#define YYNOCODE 268
+#define YYNOCODE 274
 #define YYACTIONTYPE unsigned short int
 #define ParseTOKENTYPE  SToken 
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  EOrder yy106;
-  EFillMode yy142;
-  SNode* yy176;
-  SToken yy225;
-  EJoinType yy236;
-  SAlterOption yy325;
-  EOperatorType yy404;
-  SDataType yy448;
-  ENullOrder yy465;
-  bool yy505;
-  int32_t yy508;
-  SNodeList* yy512;
+  SAlterOption yy29;
+  SNodeList* yy40;
+  ENullOrder yy177;
+  EOrder yy210;
+  EOperatorType yy328;
+  SNode* yy364;
+  EJoinType yy392;
+  SDataType yy420;
+  SToken yy437;
+  int32_t yy460;
+  EFillMode yy478;
+  bool yy493;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -132,17 +132,17 @@ typedef union {
 #define ParseCTX_PARAM
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
-#define YYNSTATE             432
-#define YYNRULE              348
-#define YYNTOKEN             172
-#define YY_MAX_SHIFT         431
-#define YY_MIN_SHIFTREDUCE   675
-#define YY_MAX_SHIFTREDUCE   1022
-#define YY_ERROR_ACTION      1023
-#define YY_ACCEPT_ACTION     1024
-#define YY_NO_ACTION         1025
-#define YY_MIN_REDUCE        1026
-#define YY_MAX_REDUCE        1373
+#define YYNSTATE             438
+#define YYNRULE              354
+#define YYNTOKEN             176
+#define YY_MAX_SHIFT         437
+#define YY_MIN_SHIFTREDUCE   684
+#define YY_MAX_SHIFTREDUCE   1037
+#define YY_ERROR_ACTION      1038
+#define YY_ACCEPT_ACTION     1039
+#define YY_NO_ACTION         1040
+#define YY_MIN_REDUCE        1041
+#define YY_MAX_REDUCE        1394
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -209,405 +209,408 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (1282)
+#define YY_ACTTAB_COUNT (1305)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */  1230,   43,  306, 1243, 1118,  350, 1226, 1233,  238, 1114,
- /*    10 */    89, 1205,   31,   29,   27,   26,   25, 1259, 1124,   24,
- /*    20 */   170, 1352,  226, 1259,  347,   31,   29,   27,   26,   25,
- /*    30 */   347,  363,  363,  251, 1351,  362,   66,  270, 1350, 1230,
- /*    40 */   349, 1243,  307,  280, 1217, 1226, 1232,  212, 1069,  335,
- /*    50 */   321,  362, 1129, 1129,   61, 1244, 1245, 1248, 1291,  210,
- /*    60 */   212, 1259,  211, 1287,  246,  363, 1065, 1352,  347,  898,
- /*    70 */  1126, 1196, 1198,  239, 1352,  106, 1096,  928,  349,  350,
- /*    80 */   117,  104, 1217,   12, 1350, 1206, 1129,  117,  293, 1131,
- /*    90 */   928, 1350,  107, 1244, 1245, 1248, 1027,  416,  415,  414,
- /*   100 */   413,  412,  411,  410,  409,  408,  407,  406,  405,  404,
- /*   110 */   403,  402,  401,  400,  399,  189,  929,   77, 1159, 1120,
- /*   120 */    76,   75,   74,   73,   72,   71,   70,   69,   68,  929,
- /*   130 */   336, 1365,  424,  423,   23,  233,  923,  924,  925,  926,
- /*   140 */   927,  931,  932,  933,   27,   26,   25,   23,  233,  923,
- /*   150 */   924,  925,  926,  927,  931,  932,  933,    9,    8, 1243,
- /*   160 */  1217,  784,  386,  385,  384,  788,  383,  790,  791,  382,
- /*   170 */   793,  379,  883,  799,  376,  801,  802,  373,  370, 1259,
- /*   180 */    30,   28,  105, 1176, 1038,  243,  334, 1049,  235,  225,
- /*   190 */   863,   30,   28,  965, 1174,  271,  349,  362, 1259,  235,
- /*   200 */  1217,  863, 1230, 1243,  885,  347,  861, 1107, 1226, 1232,
- /*   210 */    62, 1244, 1245, 1248, 1291,   11,  363,  861,  228, 1287,
- /*   220 */   112,  360,  712, 1259,  711,  941,   11,  339, 1217, 1105,
- /*   230 */   347,  324,  166,   30,   28, 1024,    1, 1129,  313, 1318,
- /*   240 */   349,  235,  713,  863, 1217,   12,  320,    1,   31,   29,
- /*   250 */    27,   26,   25,  271,   62, 1244, 1245, 1248, 1291,  861,
- /*   260 */   428,  338,  228, 1287, 1364, 1310,  960, 1048,   11,  363,
- /*   270 */   930,  428,  862, 1325,   66,  398, 1176,  326,  322, 1243,
- /*   280 */  1047,  286,  240,  862,  250,  242,  241, 1174,   21,    1,
- /*   290 */  1129,  864,  867,  868,  201,  876,  911,  934,  118, 1259,
- /*   300 */   325,  109,  864,  867,  868,  201,  334,  911, 1217, 1352,
- /*   310 */   340,  869, 1169,  428,  118, 1243,  349, 1046, 1176, 1045,
- /*   320 */  1217, 1217,  117,  118,  247,  862, 1350,  259, 1060, 1174,
- /*   330 */    62, 1244, 1245, 1248, 1291, 1259,  363, 1305,  228, 1287,
- /*   340 */   112,  361,  347,  363,  864,  867,  868,  201,  184,  911,
- /*   350 */   295, 1243,  349,   30,   28, 1302, 1217, 1129, 1217, 1319,
- /*   360 */  1217,  235, 1305,  863, 1129,  364,   62, 1244, 1245, 1248,
- /*   370 */  1291, 1259,  122,  121,  228, 1287, 1364,  872,  347,  861,
- /*   380 */  1301,   30,   28,  348,  972, 1348, 1044,  389,  349,  235,
- /*   390 */   885,  863, 1217,  118,  363,  331,  877,  880,  868,  249,
- /*   400 */  1043, 1042,   62, 1244, 1245, 1248, 1291,  861, 1041,    7,
- /*   410 */   228, 1287, 1364,  964,  245, 1129,   92,  886,   30,   28,
- /*   420 */   337, 1309,  104,  398,   30,   28,  235, 1217,  863,   59,
- /*   430 */  1131, 1243,  235,  428,  863, 1040, 1176,    7, 1037,   93,
- /*   440 */   248, 1217, 1217,   90,  861,  862, 1121, 1197,  104, 1217,
- /*   450 */   861, 1259,  333,  113, 1298, 1299, 1131, 1303,  347, 1036,
- /*   460 */  1035,  428,  884, 1193,  864,  867,  868,  201,  349,  911,
- /*   470 */   120, 1034, 1217,  862,    7,  887, 1217,  335, 1176, 1217,
- /*   480 */     1, 1033,  202, 1244, 1245, 1248,  284,  118,  297, 1175,
- /*   490 */   283, 1116,  864,  867,  868,  201,   43,  911,  428, 1112,
- /*   500 */  1217, 1217, 1352,  305,  428, 1032, 1243, 1106, 1031, 1030,
- /*   510 */   862,  285, 1217, 1125, 1029,  117,  862,  145,  888, 1350,
- /*   520 */   300, 1305, 1217,    9,    8,  294, 1259,   52,  144,  864,
- /*   530 */   867,  868,  201,  347,  911,  864,  867,  868,  201, 1300,
- /*   540 */   911,  989, 1243,  349, 1122,  104, 1217, 1217,    6, 1217,
- /*   550 */  1217,   40,  342, 1132,   39, 1217,  963,   63, 1244, 1245,
- /*   560 */  1248, 1291, 1259,  331,  395, 1290, 1287,  304,  394,  347,
- /*   570 */   863,  388,  317,  987,  988,  990,  991,  165, 1243,  349,
- /*   580 */   302,  871,  137, 1217,   92,  135,  861,  194,  139,  396,
- /*   590 */  1039,  138,  196,   63, 1244, 1245, 1248, 1291, 1259,  318,
- /*   600 */   711,  345, 1287,  335,  195,  347,  309, 1243,  393,  392,
- /*   610 */   391,   90,  390, 1058,  123,  349,  278,  346,   98, 1217,
- /*   620 */   151,  163, 1298,  330, 1104,  329, 1243, 1259, 1352,   63,
- /*   630 */  1244, 1245, 1248, 1291,  347,  298,  141,  343, 1288,  140,
- /*   640 */   428,  117,  986,  156,  349, 1350, 1259,  874, 1217, 1243,
- /*   650 */   960,  234,  862,  347,   41,  154, 1021, 1022,  206, 1244,
- /*   660 */  1245, 1248,  143,  349,   58,  142, 1097, 1217, 1243, 1259,
- /*   670 */   314,  864,  867,  868,   54,   64,  347,  206, 1244, 1245,
- /*   680 */  1248,  395,  870, 1170,  935,  394,  349,  895, 1259,  167,
- /*   690 */  1217,  160,  277, 1321,  920,  347,   32,  883, 1237,   32,
- /*   700 */   205, 1244, 1245, 1248,  252,  349,  396,  264, 1243, 1217,
- /*   710 */  1235,  856,  175, 1243,  332,  118,  265,  169,  355,  107,
- /*   720 */  1244, 1245, 1248,   32,  173,  393,  392,  391, 1259,  390,
- /*   730 */    95, 1260,  327, 1259,    2,  347,  883, 1195,  119,  253,
- /*   740 */   347,  181,  261,  260,  266,  349,  891,  262,  873, 1217,
- /*   750 */   349,  777,  232,   96, 1217, 1072,  268,  236, 1366,  206,
- /*   760 */  1244, 1245, 1248,   98,  206, 1244, 1245, 1248, 1026,  267,
- /*   770 */   124,   77,  890,  772,   76,   75,   74,   73,   72,   71,
- /*   780 */    70,   69,   68,  127,  263,   41,   42,  258,  257,  256,
- /*   790 */   255,  254,   86,   85,   84,   83,   82,   81,   80,   79,
- /*   800 */    78,  431, 1243,  272,  292,  269,  287, 1243,  130,  291,
- /*   810 */   889,  805,  290,  279,  288,  187,  281,  289,   88,   87,
- /*   820 */   809,  308, 1259,  368,  420,  224,  186, 1259,  292,  347,
- /*   830 */   287,  310,   96,  291,  347,  815,  290, 1243,  288,  349,
- /*   840 */  1119,  289,  134, 1217,  349, 1243, 1115,   97, 1217,   60,
- /*   850 */   814,  136,  182,  204, 1244, 1245, 1248, 1259,  207, 1244,
- /*   860 */  1245, 1248,   98,   99,  347, 1259,   31,   29,   27,   26,
- /*   870 */    25,  100,  347,  101,  349,   96, 1117,  146, 1217, 1113,
- /*   880 */   102, 1243,  349,  359,  103,  149, 1217,  311,  199, 1244,
- /*   890 */  1245, 1248,  888, 1322,  319, 1332,  208, 1244, 1245, 1248,
- /*   900 */   312, 1259,  353,  147, 1243,  152,  316,  227,  347, 1243,
- /*   910 */    31,   29,   27,   26,   25, 1331,  868,  155,  349,  323,
- /*   920 */     5,  328, 1217,  898, 1259,  315, 1312,  159,    4, 1259,
- /*   930 */   110,  347,  200, 1244, 1245, 1248,  347,  960,   91,  887,
- /*   940 */    33,  349,  161, 1306, 1243, 1217,  349,  162,  344,  341,
- /*   950 */  1217,   17, 1243,  229, 1367,  209, 1244, 1245, 1248,  331,
- /*   960 */  1256, 1244, 1245, 1248, 1259, 1273,  356,  357,  179, 1349,
- /*   970 */   168,  347, 1259, 1204, 1243, 1203,  351,  177,  352,  347,
- /*   980 */    92,  349,   51,  237,  358, 1217,  188, 1130,   53,  349,
- /*   990 */   190,  366,  185, 1217, 1259, 1255, 1244, 1245, 1248,  427,
- /*  1000 */   197,  347, 1243, 1254, 1244, 1245, 1248,   90,  198,  193,
- /*  1010 */  1243,  349,  192, 1211,  839, 1217, 1188,  114, 1298, 1299,
- /*  1020 */    94, 1303, 1259, 1187, 1186,  215, 1244, 1245, 1248,  347,
- /*  1030 */  1259, 1185, 1243, 1184, 1183, 1182, 1181,  347,  126,  349,
- /*  1040 */  1243,  841, 1180, 1217, 1179, 1178, 1177,  349, 1071, 1210,
- /*  1050 */  1201, 1217, 1259,  214, 1244, 1245, 1248, 1108,  724,  347,
- /*  1060 */  1259,  216, 1244, 1245, 1248, 1018, 1019,  347, 1070,  349,
- /*  1070 */  1068,  132,  275, 1217,  111,  219, 1057,  349,  331,  273,
- /*  1080 */   276, 1217,  131,  213, 1244, 1245, 1248,  274, 1056, 1053,
- /*  1090 */  1110,  203, 1244, 1245, 1248,   67,  133,  284,  822,   92,
- /*  1100 */   821,  283,  820, 1109,  752,   44, 1066,  751,  129,  750,
- /*  1110 */   749,  220,  748,  218,  217,  747,  282,   20,  221, 1061,
- /*  1120 */   222,  296,  285, 1059,  223,  299,   90,   31,   29,   27,
- /*  1130 */    26,   25,   22, 1052,  301, 1051,  115, 1298, 1299,  303,
- /*  1140 */  1303,   65,   31,   29,   27,   26,   25,  910, 1209,  912,
- /*  1150 */   913,  914,  915,  916, 1208,  128, 1200,  148,   14,  125,
- /*  1160 */    45,   36,    3,  153,  150,   32,   37,  158,  985,  108,
- /*  1170 */    34, 1235,  157,  164,  979,   46,   19,  978,   47,   48,
- /*  1180 */    15,   35,  957, 1007, 1006,  956,    8, 1012,  230,  116,
- /*  1190 */  1011, 1010,   16,   10,  896,  231,   13,  921,  172,   18,
- /*  1200 */   171,  983,  174,  354,  176,   49, 1199,  178,   50,  878,
- /*  1210 */    38,  367,  244,  806,  180,  369,   54,  371,  803, 1234,
- /*  1220 */   800,  183,  365,  372,  374,  783,  375,  377,  794,  378,
- /*  1230 */   380,  792,  817,  381,  813,  812,  811,   55,  722,   56,
- /*  1240 */    57,  744,  397,  743,  736,  742,  741,  740,  739,  738,
- /*  1250 */   387,  737, 1067,  735,  798,  734,  733,  797,  732,  731,
- /*  1260 */   796,  795,  730,  729,  728,  727,  417,  418, 1055, 1054,
- /*  1270 */   421,  422,  419, 1050,  816,  425,  426, 1025,  865,  191,
- /*  1280 */   429,  430,
+ /*     0 */  1251,  337,   24,  172,  356,  356,  256,  241, 1247, 1254,
+ /*    10 */  1220, 1221,   31,   29,   27,   26,   25, 1264,  369,  369,
+ /*    20 */     9,    8,   93,   67,   67,   31,   29,   27,   26,   25,
+ /*    30 */   286,  292,  337, 1373,  106,   60, 1053, 1280,  369, 1144,
+ /*    40 */  1144,  341, 1135,  276,  353,   94,  118,  215, 1084,  249,
+ /*    50 */  1371,   91, 1136,   93,  355,  979, 1211, 1213, 1238, 1144,
+ /*    60 */   215,  165, 1319,  336,  110,  335, 1087,   44, 1373,  913,
+ /*    70 */    63, 1265, 1266, 1269, 1312, 1184,   90,  943,  231, 1308,
+ /*    80 */  1385,  118,   91, 1238, 1139, 1371,  107, 1111,  956, 1346,
+ /*    90 */   943,  339,  114, 1319, 1320,  257, 1324,  422,  421,  420,
+ /*   100 */   419,  418,  417,  416,  415,  414,  413,  412,  411,  410,
+ /*   110 */   409,  408,  407,  406,  405,  298,  944,  293,  105,  242,
+ /*   120 */   297,  213,  898,  296,  368,  294, 1147,  105,  295,  944,
+ /*   130 */    31,   29,   27,   26,   25, 1146,  368, 1122,   23,  236,
+ /*   140 */   938,  939,  940,  941,  942,  946,  947,  948,   27,   26,
+ /*   150 */    25,   23,  236,  938,  939,  940,  941,  942,  946,  947,
+ /*   160 */   948,  793,  392,  391,  390,  797,  389,  799,  800,  388,
+ /*   170 */   802,  385, 1264,  808,  382,  810,  811,  379,  376,  229,
+ /*   180 */    30,   28,  337,  277,   12,   30,   28,  980,  238,  277,
+ /*   190 */   878,  246, 1280,  238, 1264,  878, 1251,  310,  255,  353,
+ /*   200 */   254, 1191,  978,   93, 1247, 1253,  876,  228, 1251,  355,
+ /*   210 */   308,  876, 1189, 1238, 1280,   11, 1247, 1253,  341,  369,
+ /*   220 */    11,  340,  248,  119, 1141,   62, 1265, 1266, 1269, 1312,
+ /*   230 */   105,  355,   91,  214, 1308, 1238,    1,  265, 1146, 1120,
+ /*   240 */  1144,    1,  115, 1319, 1320, 1373, 1324,   63, 1265, 1266,
+ /*   250 */  1269, 1312,  119, 1191,  720,  231, 1308,  113,  118,  243,
+ /*   260 */   434,    6, 1371,  902, 1189,  434,  119,  430,  429,  168,
+ /*   270 */   284,  312,  877, 1280, 1280,  319, 1339,  877,   30,   28,
+ /*   280 */   353,  353,  124,  123,  222,  404,  238, 1264,  878, 1033,
+ /*   290 */  1034,  326, 1331,  975,  879,   53,  882,  883,  204,  879,
+ /*   300 */   926,  882,  883,  204,  876,  926,  290, 1280,  327,  330,
+ /*   310 */   289,  313, 1137,   11,  340,  721, 1373,  720,  119, 1264,
+ /*   320 */   223, 1191,  221,  220,  355,  288,  332,  328, 1238, 1372,
+ /*   330 */  1064,  291, 1212, 1371,    1,  722,  119,  368, 1373, 1280,
+ /*   340 */    63, 1265, 1266, 1269, 1312,  404,  353,  369,  231, 1308,
+ /*   350 */   113,  118,  366,   30,   28, 1371,  355,  369,  434,  900,
+ /*   360 */  1238,  238,  367,  878,  395,  167, 1264,  975, 1144, 1340,
+ /*   370 */   877, 1238,   63, 1265, 1266, 1269, 1312, 1191, 1144,  876,
+ /*   380 */   231, 1308, 1385,  250, 1063,   12, 1280,  192, 1189,  331,
+ /*   390 */  1174, 1369,  879,  353,  882,  883,  204,  337,  926,  139,
+ /*   400 */   251, 1062,  137,  355,   30,   28,  354, 1238,  105,    7,
+ /*   410 */   369,  303,  238,  348,  878,  186, 1146,   44,   93,   63,
+ /*   420 */  1265, 1266, 1269, 1312, 1061, 1238,  311,  231, 1308, 1385,
+ /*   430 */   876, 1144,  945,  434, 1140,  987,   30,   28, 1330,  345,
+ /*   440 */   147,  900, 1238,  306,  238,  877,  878,   91,  300, 1060,
+ /*   450 */  1326,  146, 1264, 1059,   21, 1191,  901,  116, 1319, 1320,
+ /*   460 */     7, 1324,  876,  949,  899, 1238, 1190,  879, 1323,  882,
+ /*   470 */   883,  204, 1280,  926,   41,   30,   28,   40, 1004,  353,
+ /*   480 */  1121, 1326,  369,  238,  434,  878, 1058,  252, 1208,  355,
+ /*   490 */  1238,  119,    7, 1238, 1238,  122,  877, 1039,  341, 1322,
+ /*   500 */   344,  876,  349, 1144, 1057,  205, 1265, 1266, 1269,  323,
+ /*   510 */  1002, 1003, 1005, 1006, 1326,  290,  434, 1056,  879,  289,
+ /*   520 */   882,  883,  204, 1055,  926, 1373,  346, 1238,  877,  898,
+ /*   530 */  1052,    1, 1321,    9,    8,  903,  258,  401,  118,  270,
+ /*   540 */   291,  400, 1371, 1264,  141, 1238,  253,  140,  271, 1133,
+ /*   550 */   879,  352,  882,  883,  204,  434,  926,  143, 1238,  886,
+ /*   560 */   142, 1051,  402, 1280, 1238,   20, 1050,  877, 1049, 1112,
+ /*   570 */   353, 1238, 1129, 1373, 1264,   31,   29,   27,   26,   25,
+ /*   580 */   355,  399,  398,  397, 1238,  396,  118, 1036, 1037,  879,
+ /*   590 */  1371,  882,  883,  204, 1280,  926,   64, 1265, 1266, 1269,
+ /*   600 */  1312,  353, 1238,  145, 1311, 1308,  144, 1238, 1131, 1238,
+ /*   610 */  1048,  355, 1047, 1264,  315, 1238,  269, 1046, 1264,  264,
+ /*   620 */   263,  262,  261,  260, 1045,  889,   99,   64, 1265, 1266,
+ /*   630 */  1269, 1312,  935, 1280, 1001,  351, 1308,  153, 1280,  298,
+ /*   640 */   353,  293, 1080, 1127,  297,  353,   42,  296, 1075,  294,
+ /*   650 */   355, 1238,  295, 1238, 1238,  355, 1264, 1119, 1238, 1238,
+ /*   660 */  1042,  885, 1044,  343,  299, 1238,  108, 1265, 1266, 1269,
+ /*   670 */   301,   64, 1265, 1266, 1269, 1312, 1280,  169,  394, 1054,
+ /*   680 */  1309,   78,  158,  353,   77,   76,   75,   74,   73,   72,
+ /*   690 */    71,   70,   69,  355,  156,  324, 1264, 1238, 1073,  878,
+ /*   700 */   237, 1264, 1185, 1238,  342, 1386,  162,  950,  283,  209,
+ /*   710 */  1265, 1266, 1269, 1258,  401,  876, 1280, 1342,  400,   32,
+ /*   720 */   304, 1280,  910,  353,  865, 1256,  338,  888,  353, 1281,
+ /*   730 */   171,  871,  177,  355,   32,  361,   32, 1238,  355,  402,
+ /*   740 */   320,  183, 1238, 1264,  175,    2,  190,   96,  898,  209,
+ /*   750 */  1265, 1266, 1269,   97,  208, 1265, 1266, 1269,  399,  398,
+ /*   760 */   397, 1210,  396, 1280,  121,   22,  259,  267,  266,  434,
+ /*   770 */   353,  786,  268, 1264,  272,   31,   29,   27,   26,   25,
+ /*   780 */   355,  877,  781,   99, 1238,  906,  333,  126,   31,   29,
+ /*   790 */    27,   26,   25, 1280,   42, 1264,  108, 1265, 1266, 1269,
+ /*   800 */   353,  273,  274,  879,  814,  882,  883,  818,  905,  824,
+ /*   810 */   355,  823,  100,  129, 1238, 1280,  374,  235,  275,   97,
+ /*   820 */   437,   98,  353,   99,   97,  278,  209, 1265, 1266, 1269,
+ /*   830 */    43,  132,  355,  904,  189, 1387, 1238,   89,  287,  239,
+ /*   840 */   285,  314,  227,  426,  317,  188,   59,   88,  209, 1265,
+ /*   850 */  1266, 1269, 1041, 1134,   78,  136,   55,   77,   76,   75,
+ /*   860 */    74,   73,   72,   71,   70,   69, 1130,  138,   61,  101,
+ /*   870 */  1264,  184,  102, 1132, 1128,  103,   87,   86,   85,   84,
+ /*   880 */    83,   82,   81,   80,   79,  104,  316,  148,  151,  925,
+ /*   890 */  1280,  927,  928,  929,  930,  931,  903,  353, 1353,  325,
+ /*   900 */   197, 1264,  365,  359,  154,  199,  883,  355,  322, 1343,
+ /*   910 */   157, 1238, 1352,  230,  329,    5,  161,  198,  334,  318,
+ /*   920 */   321, 1280,  149,  207, 1265, 1266, 1269,  125,  353,  975,
+ /*   930 */  1333, 1264,   31,   29,   27,   26,   25,  111,  355,    4,
+ /*   940 */   163,  902, 1238,   92, 1327,   33,  232,   17,  164,  347,
+ /*   950 */   350, 1280, 1388, 1264,  210, 1265, 1266, 1269,  353, 1294,
+ /*   960 */  1370,  362,  170,  179,  191, 1219, 1218,  357,  355,  358,
+ /*   970 */   364,  240, 1238, 1280,  363, 1264,  181,   52, 1145,   54,
+ /*   980 */   353,  372,  193,  187,  202, 1265, 1266, 1269,   65,  913,
+ /*   990 */   355,  433,  195,   39, 1238, 1280,  200, 1264,  201,  196,
+ /*  1000 */  1232,  874,  353,  873, 1226,  120,  211, 1265, 1266, 1269,
+ /*  1010 */   848, 1203,  355, 1202,   95, 1201, 1238, 1280, 1200, 1264,
+ /*  1020 */  1199, 1198, 1197, 1196,  353,  850, 1195, 1194,  203, 1265,
+ /*  1030 */  1266, 1269,  119, 1193,  355, 1192, 1086, 1225, 1238, 1280,
+ /*  1040 */  1216, 1264,  128, 1123,  733, 1085,  353, 1083,  279,  281,
+ /*  1050 */   212, 1265, 1266, 1269, 1072,  280,  355, 1071, 1068, 1125,
+ /*  1060 */  1238, 1280,   68, 1264,  135, 1124,  831,  830,  353,  761,
+ /*  1070 */   829, 1081, 1277, 1265, 1266, 1269,  760,  759,  355,  758,
+ /*  1080 */   757, 1076, 1238, 1280,  756,  224,  225, 1264,  302, 1074,
+ /*  1090 */   353,  226, 1067,  305, 1276, 1265, 1266, 1269,  307, 1066,
+ /*  1100 */   355,  309,   66, 1224, 1238, 1223,   36, 1280,  152,  150,
+ /*  1110 */    14, 1264, 1215,    3,  353,   32, 1275, 1265, 1266, 1269,
+ /*  1120 */   245,  244,  155,   15,  355,   37,   34,   10, 1238,   46,
+ /*  1130 */   891, 1280,  160, 1264,   49, 1022, 1000,  994,  353,  993,
+ /*  1140 */   218, 1265, 1266, 1269,  972,  109,  884, 1021,  355,  233,
+ /*  1150 */     8,  159, 1238, 1280,   47, 1264,   48, 1026, 1256,  971,
+ /*  1160 */   353,   19, 1025, 1027,  217, 1265, 1266, 1269,   35,  234,
+ /*  1170 */   355,  166,   13,  117, 1238, 1280,   16, 1264,  936,  911,
+ /*  1180 */   173,   18,  353,  174,  998,  176,  219, 1265, 1266, 1269,
+ /*  1190 */   178,   50,  355,  360, 1214,  180, 1238, 1280,   55,  893,
+ /*  1200 */   370,  182,   51,   38,  353, 1255,  185,  371,  216, 1265,
+ /*  1210 */  1266, 1269,  887,  815,  355,  375,  134,  373, 1238,  112,
+ /*  1220 */   247,  807,  812,  377,  378,  282,  809,  133,  380,  381,
+ /*  1230 */   206, 1265, 1266, 1269,  892,  803,  895,  883,  383,  384,
+ /*  1240 */   386,  801,  387,  806,  805,  804,  792,  393,   56,  826,
+ /*  1250 */    45,  822,   57,  131,   58,  821,  820,  731,  825,  403,
+ /*  1260 */   753,  752,  745,  751,  750,  749,  748,  747,  746,  744,
+ /*  1270 */   743,  742, 1082,  741,  740,  739, 1070,  738, 1069,  737,
+ /*  1280 */   736,  423,  424,  427,  428, 1065,  431,  425,  432, 1040,
+ /*  1290 */   880,  194,  435,  436, 1040, 1040, 1040, 1040, 1040, 1040,
+ /*  1300 */   130, 1040, 1040, 1040,  127,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */   216,  183,  181,  175,  196,  212,  222,  223,  215,  196,
- /*    10 */   192,  218,   12,   13,   14,   15,   16,  195,  200,  231,
- /*    20 */   232,  246,  199,  195,  202,   12,   13,   14,   15,   16,
- /*    30 */   202,  181,  181,  181,  259,   20,  186,  186,  263,  216,
- /*    40 */   212,  175,  221,  193,  216,  222,  223,   47,    0,  221,
- /*    50 */   228,   20,  202,  202,  226,  227,  228,  229,  230,  207,
- /*    60 */    47,  195,  234,  235,  204,  181,    0,  246,  202,   69,
- /*    70 */   186,  211,  212,  187,  246,  184,  185,   77,  212,  212,
- /*    80 */   259,  195,  216,   68,  263,  218,  202,  259,   22,  203,
- /*    90 */    77,  263,  226,  227,  228,  229,    0,   49,   50,   51,
+ /*     0 */   220,  185,  237,  238,  216,  216,  225,  219,  228,  229,
+ /*    10 */   222,  222,   12,   13,   14,   15,   16,  179,  185,  185,
+ /*    20 */     1,    2,  206,  190,  190,   12,   13,   14,   15,   16,
+ /*    30 */   197,  197,  185,  252,  178,  184,  180,  199,  185,  206,
+ /*    40 */   206,  225,  179,  190,  206,  194,  265,   47,    0,  208,
+ /*    50 */   269,  235,  201,  206,  216,    4,  215,  216,  220,  206,
+ /*    60 */    47,  245,  246,  247,  198,  249,    0,  187,  252,   69,
+ /*    70 */   232,  233,  234,  235,  236,  209,  196,   77,  240,  241,
+ /*    80 */   242,  265,  235,  220,  204,  269,  188,  189,   69,  251,
+ /*    90 */    77,  244,  245,  246,  247,  185,  249,   49,   50,   51,
  /*   100 */    52,   53,   54,   55,   56,   57,   58,   59,   60,   61,
- /*   110 */    62,   63,   64,   65,   66,  188,  116,   21,  191,  175,
- /*   120 */    24,   25,   26,   27,   28,   29,   30,   31,   32,  116,
- /*   130 */   264,  265,  178,  179,  134,  135,  136,  137,  138,  139,
- /*   140 */   140,  141,  142,  143,   14,   15,   16,  134,  135,  136,
- /*   150 */   137,  138,  139,  140,  141,  142,  143,    1,    2,  175,
- /*   160 */   216,   83,   84,   85,   86,   87,   88,   89,   90,   91,
- /*   170 */    92,   93,   20,   95,   96,   97,   98,   99,  100,  195,
- /*   180 */    12,   13,  174,  195,  176,  199,  202,  175,   20,  201,
- /*   190 */    22,   12,   13,   14,  206,   46,  212,   20,  195,   20,
- /*   200 */   216,   22,  216,  175,   20,  202,   38,    0,  222,  223,
- /*   210 */   226,  227,  228,  229,  230,   47,  181,   38,  234,  235,
- /*   220 */   236,  186,   20,  195,   22,   69,   47,   81,  216,    0,
- /*   230 */   202,  228,  248,   12,   13,  172,   68,  202,  254,  255,
- /*   240 */   212,   20,   40,   22,  216,   68,  120,   68,   12,   13,
- /*   250 */    14,   15,   16,   46,  226,  227,  228,  229,  230,   38,
- /*   260 */    92,    3,  234,  235,  236,  144,  145,  175,   47,  181,
- /*   270 */   116,   92,  104,  245,  186,   46,  195,  151,  152,  175,
- /*   280 */   175,  193,  201,  104,  221,   12,   13,  206,  134,   68,
- /*   290 */   202,  123,  124,  125,  126,   22,  128,  143,  146,  195,
- /*   300 */    20,  194,  123,  124,  125,  126,  202,  128,  216,  246,
- /*   310 */   164,   38,  205,   92,  146,  175,  212,  175,  195,  175,
- /*   320 */   216,  216,  259,  146,  201,  104,  263,   63,    0,  206,
- /*   330 */   226,  227,  228,  229,  230,  195,  181,  224,  234,  235,
- /*   340 */   236,  186,  202,  181,  123,  124,  125,  126,  186,  128,
- /*   350 */    22,  175,  212,   12,   13,  242,  216,  202,  216,  255,
- /*   360 */   216,   20,  224,   22,  202,   92,  226,  227,  228,  229,
- /*   370 */   230,  195,  108,  109,  234,  235,  236,  104,  202,   38,
- /*   380 */   242,   12,   13,   14,   14,  245,  175,   79,  212,   20,
- /*   390 */    20,   22,  216,  146,  181,  181,  123,  124,  125,  186,
- /*   400 */   175,  175,  226,  227,  228,  229,  230,   38,  175,   68,
- /*   410 */   234,  235,  236,    4,  187,  202,  202,   20,   12,   13,
- /*   420 */   162,  245,  195,   46,   12,   13,   20,  216,   22,  180,
- /*   430 */   203,  175,   20,   92,   22,  175,  195,   68,  175,  190,
- /*   440 */   187,  216,  216,  229,   38,  104,  197,  206,  195,  216,
- /*   450 */    38,  195,  238,  239,  240,  241,  203,  243,  202,  175,
- /*   460 */   175,   92,   20,  202,  123,  124,  125,  126,  212,  128,
- /*   470 */   209,  175,  216,  104,   68,   20,  216,  221,  195,  216,
- /*   480 */    68,  175,  226,  227,  228,  229,   57,  146,    4,  206,
- /*   490 */    61,  196,  123,  124,  125,  126,  183,  128,   92,  196,
- /*   500 */   216,  216,  246,   19,   92,  175,  175,    0,  175,  175,
- /*   510 */   104,   82,  216,  200,  175,  259,  104,   33,   20,  263,
- /*   520 */    36,  224,  216,    1,    2,   41,  195,  180,   44,  123,
- /*   530 */   124,  125,  126,  202,  128,  123,  124,  125,  126,  242,
- /*   540 */   128,  124,  175,  212,  197,  195,  216,  216,   43,  216,
- /*   550 */   216,   67,   81,  203,   70,  216,  147,  226,  227,  228,
- /*   560 */   229,  230,  195,  181,   57,  234,  235,   21,   61,  202,
- /*   570 */    22,  196,  155,  156,  157,  158,  159,  122,  175,  212,
- /*   580 */    34,   38,   72,  216,  202,   75,   38,   18,   72,   82,
- /*   590 */   176,   75,   23,  226,  227,  228,  229,  230,  195,  257,
- /*   600 */    22,  234,  235,  221,   35,  202,   69,  175,  101,  102,
- /*   610 */   103,  229,  105,    0,   45,  212,   38,   47,   81,  216,
- /*   620 */   122,  239,  240,  241,    0,  243,  175,  195,  246,  226,
- /*   630 */   227,  228,  229,  230,  202,   22,   72,  166,  235,   75,
- /*   640 */    92,  259,   69,   69,  212,  263,  195,  104,  216,  175,
- /*   650 */   145,  219,  104,  202,   81,   81,  170,  171,  226,  227,
- /*   660 */   228,  229,   72,  212,   68,   75,  185,  216,  175,  195,
- /*   670 */   219,  123,  124,  125,   78,  106,  202,  226,  227,  228,
- /*   680 */   229,   57,   38,  205,   69,   61,  212,   69,  195,  266,
- /*   690 */   216,  251,  178,  225,  124,  202,   81,   20,   68,   81,
- /*   700 */   226,  227,  228,  229,   27,  212,   82,   30,  175,  216,
- /*   710 */    80,   69,   69,  175,  244,  146,   39,  260,   69,  226,
- /*   720 */   227,  228,  229,   81,   81,  101,  102,  103,  195,  105,
- /*   730 */    81,  195,  258,  195,  247,  202,   20,  181,  115,  210,
- /*   740 */   202,   69,  116,  208,  181,  212,   20,  208,  104,  216,
- /*   750 */   212,   69,  219,   81,  216,    0,  202,  219,  265,  226,
- /*   760 */   227,  228,  229,   81,  226,  227,  228,  229,    0,  220,
- /*   770 */   183,   21,   20,   69,   24,   25,   26,   27,   28,   29,
- /*   780 */    30,   31,   32,  183,  107,   81,  183,  110,  111,  112,
- /*   790 */   113,  114,   24,   25,   26,   27,   28,   29,   30,   31,
- /*   800 */    32,   19,  175,  181,   49,  213,   51,  175,  183,   54,
- /*   810 */    20,   69,   57,  177,   59,   33,  195,   62,   36,  181,
- /*   820 */    69,  220,  195,   81,   42,  177,   44,  195,   49,  202,
- /*   830 */    51,  202,   81,   54,  202,   69,   57,  175,   59,  212,
- /*   840 */   195,   62,  195,  216,  212,  175,  195,   81,  216,   67,
- /*   850 */    69,  195,   70,  226,  227,  228,  229,  195,  226,  227,
- /*   860 */   228,  229,   81,   69,  202,  195,   12,   13,   14,   15,
- /*   870 */    16,  195,  202,  195,  212,   81,  195,  180,  216,  195,
- /*   880 */   195,  175,  212,  101,  195,  180,  216,  213,  226,  227,
- /*   890 */   228,  229,   20,  225,  154,  256,  226,  227,  228,  229,
- /*   900 */   118,  195,  153,  121,  175,  217,  216,  216,  202,  175,
- /*   910 */    12,   13,   14,   15,   16,  256,  125,  217,  212,  216,
- /*   920 */   161,  160,  216,   69,  195,  149,  253,  252,  148,  195,
- /*   930 */   250,  202,  226,  227,  228,  229,  202,  145,  202,   20,
- /*   940 */   115,  212,  249,  224,  175,  216,  212,  237,  165,  163,
- /*   950 */   216,   68,  175,  169,  267,  226,  227,  228,  229,  181,
- /*   960 */   226,  227,  228,  229,  195,  233,  119,  214,  180,  262,
- /*   970 */   261,  202,  195,  217,  175,  217,  216,  202,  216,  202,
- /*   980 */   202,  212,  180,  216,  213,  216,  191,  202,   68,  212,
- /*   990 */   181,  198,  180,  216,  195,  226,  227,  228,  229,  177,
- /*  1000 */   189,  202,  175,  226,  227,  228,  229,  229,  189,  173,
- /*  1010 */   175,  212,  182,    0,   80,  216,    0,  239,  240,  241,
- /*  1020 */   115,  243,  195,    0,    0,  226,  227,  228,  229,  202,
- /*  1030 */   195,    0,  175,    0,    0,    0,    0,  202,   43,  212,
- /*  1040 */   175,   22,    0,  216,    0,    0,    0,  212,    0,    0,
- /*  1050 */     0,  216,  195,  226,  227,  228,  229,    0,   48,  202,
- /*  1060 */   195,  226,  227,  228,  229,  167,  168,  202,    0,  212,
- /*  1070 */     0,   33,   43,  216,   36,   35,    0,  212,  181,   38,
- /*  1080 */    42,  216,   44,  226,  227,  228,  229,   36,    0,    0,
- /*  1090 */     0,  226,  227,  228,  229,   77,   75,   57,   38,  202,
- /*  1100 */    38,   61,   22,    0,   38,   67,    0,   38,   70,   38,
- /*  1110 */    38,   71,   38,   73,   74,   38,   76,    2,   22,    0,
- /*  1120 */    22,   39,   82,    0,   22,   38,  229,   12,   13,   14,
- /*  1130 */    15,   16,    2,    0,   22,    0,  239,  240,  241,   22,
- /*  1140 */   243,   20,   12,   13,   14,   15,   16,  127,    0,  129,
- /*  1150 */   130,  131,  132,  133,    0,  117,    0,   43,  150,  121,
- /*  1160 */    68,  122,   81,   69,  117,   81,   81,   81,   69,   68,
- /*  1170 */   144,   80,   68,   80,   69,   68,   81,   69,   68,    4,
- /*  1180 */   150,   81,   69,   38,   38,   69,    2,   69,   38,   80,
- /*  1190 */    38,   38,   81,  150,   69,   38,   68,  124,   69,   68,
- /*  1200 */    80,   69,   68,  120,   68,   68,    0,   43,   68,   22,
- /*  1210 */    68,   38,   38,   69,  117,   68,   78,   38,   69,   80,
- /*  1220 */    69,   80,   79,   68,   38,   22,   68,   38,   69,   68,
- /*  1230 */    38,   69,   38,   68,   38,   38,   22,   68,   48,   68,
- /*  1240 */    68,   22,   47,   38,   22,   38,   38,   38,   38,   38,
- /*  1250 */    82,   38,    0,   38,   94,   38,   38,   94,   38,   38,
- /*  1260 */    94,   94,   38,   38,   38,   38,   38,   36,    0,    0,
- /*  1270 */    38,   37,   43,    0,  104,   22,   21,  268,   22,   22,
- /*  1280 */    21,   20,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1290 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1300 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1310 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1320 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1330 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1340 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1350 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1360 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1370 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1380 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1390 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1400 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1410 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1420 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1430 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1440 */   268,  268,  268,  268,  268,  268,  268,  268,  268,  268,
- /*  1450 */   268,  268,  268,  268,
+ /*   110 */    62,   63,   64,   65,   66,   49,  116,   51,  199,  191,
+ /*   120 */    54,  211,   20,   57,   20,   59,  207,  199,   62,  116,
+ /*   130 */    12,   13,   14,   15,   16,  207,   20,    0,  138,  139,
+ /*   140 */   140,  141,  142,  143,  144,  145,  146,  147,   14,   15,
+ /*   150 */    16,  138,  139,  140,  141,  142,  143,  144,  145,  146,
+ /*   160 */   147,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+ /*   170 */    92,   93,  179,   95,   96,   97,   98,   99,  100,  203,
+ /*   180 */    12,   13,  185,   46,   68,   12,   13,   14,   20,   46,
+ /*   190 */    22,  203,  199,   20,  179,   22,  220,   21,  125,  206,
+ /*   200 */   127,  199,  151,  206,  228,  229,   38,  205,  220,  216,
+ /*   210 */    34,   38,  210,  220,  199,   47,  228,  229,  225,  185,
+ /*   220 */    47,  206,  191,  150,  190,  232,  233,  234,  235,  236,
+ /*   230 */   199,  216,  235,  240,  241,  220,   68,   63,  207,    0,
+ /*   240 */   206,   68,  245,  246,  247,  252,  249,  232,  233,  234,
+ /*   250 */   235,  236,  150,  199,   22,  240,  241,  242,  265,  205,
+ /*   260 */    92,   43,  269,   20,  210,   92,  150,  182,  183,  254,
+ /*   270 */    38,  185,  104,  199,  199,  260,  261,  104,   12,   13,
+ /*   280 */   206,  206,  108,  109,   35,   46,   20,  179,   22,  171,
+ /*   290 */   172,  120,  148,  149,  126,  184,  128,  129,  130,  126,
+ /*   300 */   132,  128,  129,  130,   38,  132,   57,  199,  234,  234,
+ /*   310 */    61,  225,  201,   47,  206,   20,  252,   22,  150,  179,
+ /*   320 */    71,  199,   73,   74,  216,   76,  155,  156,  220,  265,
+ /*   330 */   179,   82,  210,  269,   68,   40,  150,   20,  252,  199,
+ /*   340 */   232,  233,  234,  235,  236,   46,  206,  185,  240,  241,
+ /*   350 */   242,  265,  190,   12,   13,  269,  216,  185,   92,   20,
+ /*   360 */   220,   20,  190,   22,   79,  122,  179,  149,  206,  261,
+ /*   370 */   104,  220,  232,  233,  234,  235,  236,  199,  206,   38,
+ /*   380 */   240,  241,  242,  205,  179,   68,  199,  192,  210,   20,
+ /*   390 */   195,  251,  126,  206,  128,  129,  130,  185,  132,   72,
+ /*   400 */   191,  179,   75,  216,   12,   13,   14,  220,  199,   68,
+ /*   410 */   185,    4,   20,   81,   22,  190,  207,  187,  206,  232,
+ /*   420 */   233,  234,  235,  236,  179,  220,   19,  240,  241,  242,
+ /*   430 */    38,  206,  116,   92,  204,   14,   12,   13,  251,   81,
+ /*   440 */    33,   20,  220,   36,   20,  104,   22,  235,   41,  179,
+ /*   450 */   230,   44,  179,  179,  138,  199,   20,  245,  246,  247,
+ /*   460 */    68,  249,   38,  147,   20,  220,  210,  126,  248,  128,
+ /*   470 */   129,  130,  199,  132,   67,   12,   13,   70,  128,  206,
+ /*   480 */     0,  230,  185,   20,   92,   22,  179,  190,  206,  216,
+ /*   490 */   220,  150,   68,  220,  220,  213,  104,  176,  225,  248,
+ /*   500 */     3,   38,  170,  206,  179,  232,  233,  234,  235,  159,
+ /*   510 */   160,  161,  162,  163,  230,   57,   92,  179,  126,   61,
+ /*   520 */   128,  129,  130,  179,  132,  252,  168,  220,  104,   20,
+ /*   530 */   179,   68,  248,    1,    2,   20,   27,   57,  265,   30,
+ /*   540 */    82,   61,  269,  179,   72,  220,  225,   75,   39,  200,
+ /*   550 */   126,   47,  128,  129,  130,   92,  132,   72,  220,   38,
+ /*   560 */    75,  179,   82,  199,  220,    2,  179,  104,  179,  189,
+ /*   570 */   206,  220,  200,  252,  179,   12,   13,   14,   15,   16,
+ /*   580 */   216,  101,  102,  103,  220,  105,  265,  174,  175,  126,
+ /*   590 */   269,  128,  129,  130,  199,  132,  232,  233,  234,  235,
+ /*   600 */   236,  206,  220,   72,  240,  241,   75,  220,  200,  220,
+ /*   610 */   179,  216,  179,  179,   69,  220,  107,  179,  179,  110,
+ /*   620 */   111,  112,  113,  114,  179,  104,   81,  232,  233,  234,
+ /*   630 */   235,  236,  128,  199,   69,  240,  241,  122,  199,   49,
+ /*   640 */   206,   51,    0,  200,   54,  206,   81,   57,    0,   59,
+ /*   650 */   216,  220,   62,  220,  220,  216,  179,    0,  220,  220,
+ /*   660 */     0,   38,  179,  166,   22,  220,  232,  233,  234,  235,
+ /*   670 */    22,  232,  233,  234,  235,  236,  199,  272,  200,  180,
+ /*   680 */   241,   21,   69,  206,   24,   25,   26,   27,   28,   29,
+ /*   690 */    30,   31,   32,  216,   81,  263,  179,  220,    0,   22,
+ /*   700 */   223,  179,  209,  220,  270,  271,  257,   69,  182,  232,
+ /*   710 */   233,  234,  235,   68,   57,   38,  199,  231,   61,   81,
+ /*   720 */    22,  199,   69,  206,   69,   80,  250,  104,  206,  199,
+ /*   730 */   266,  124,   69,  216,   81,   69,   81,  220,  216,   82,
+ /*   740 */   223,   69,  220,  179,   81,  253,  226,   81,   20,  232,
+ /*   750 */   233,  234,  235,   81,  232,  233,  234,  235,  101,  102,
+ /*   760 */   103,  185,  105,  199,  115,    2,  214,  116,  212,   92,
+ /*   770 */   206,   69,  212,  179,  185,   12,   13,   14,   15,   16,
+ /*   780 */   216,  104,   69,   81,  220,   20,  264,  187,   12,   13,
+ /*   790 */    14,   15,   16,  199,   81,  179,  232,  233,  234,  235,
+ /*   800 */   206,  224,  206,  126,   69,  128,  129,   69,   20,   69,
+ /*   810 */   216,   69,   69,  187,  220,  199,   81,  223,  217,   81,
+ /*   820 */    19,   81,  206,   81,   81,  185,  232,  233,  234,  235,
+ /*   830 */   187,  187,  216,   20,   33,  271,  220,   36,  199,  223,
+ /*   840 */   181,  224,  181,   42,  217,   44,   68,  185,  232,  233,
+ /*   850 */   234,  235,    0,  199,   21,  199,   78,   24,   25,   26,
+ /*   860 */    27,   28,   29,   30,   31,   32,  199,  199,   67,  199,
+ /*   870 */   179,   70,  199,  199,  199,  199,   24,   25,   26,   27,
+ /*   880 */    28,   29,   30,   31,   32,  199,  206,  184,  184,  131,
+ /*   890 */   199,  133,  134,  135,  136,  137,   20,  206,  262,  158,
+ /*   900 */    18,  179,  101,  157,  221,   23,  129,  216,  220,  231,
+ /*   910 */   221,  220,  262,  220,  220,  165,  258,   35,  164,  118,
+ /*   920 */   153,  199,  121,  232,  233,  234,  235,   45,  206,  149,
+ /*   930 */   259,  179,   12,   13,   14,   15,   16,  256,  216,  152,
+ /*   940 */   255,   20,  220,  206,  230,  115,  173,   68,  243,  167,
+ /*   950 */   169,  199,  273,  179,  232,  233,  234,  235,  206,  239,
+ /*   960 */   268,  119,  267,  206,  195,  221,  221,  220,  216,  220,
+ /*   970 */   217,  220,  220,  199,  218,  179,  184,  184,  206,   68,
+ /*   980 */   206,  202,  185,  184,  232,  233,  234,  235,  106,   69,
+ /*   990 */   216,  181,  186,  227,  220,  199,  193,  179,  193,  177,
+ /*  1000 */     0,  104,  206,  126,    0,  123,  232,  233,  234,  235,
+ /*  1010 */    80,    0,  216,    0,  115,    0,  220,  199,    0,  179,
+ /*  1020 */     0,    0,    0,    0,  206,   22,    0,    0,  232,  233,
+ /*  1030 */   234,  235,  150,    0,  216,    0,    0,    0,  220,  199,
+ /*  1040 */     0,  179,   43,    0,   48,    0,  206,    0,   38,   43,
+ /*  1050 */   232,  233,  234,  235,    0,   36,  216,    0,    0,    0,
+ /*  1060 */   220,  199,   77,  179,   75,    0,   38,   38,  206,   38,
+ /*  1070 */    22,    0,  232,  233,  234,  235,   38,   38,  216,   38,
+ /*  1080 */    38,    0,  220,  199,   38,   22,   22,  179,   39,    0,
+ /*  1090 */   206,   22,    0,   38,  232,  233,  234,  235,   22,    0,
+ /*  1100 */   216,   22,   20,    0,  220,    0,  122,  199,  117,   43,
+ /*  1110 */   154,  179,    0,   81,  206,   81,  232,  233,  234,  235,
+ /*  1120 */    12,   13,   69,  154,  216,   81,  148,  154,  220,   68,
+ /*  1130 */    22,  199,   81,  179,    4,   38,   69,   69,  206,   69,
+ /*  1140 */   232,  233,  234,  235,   69,   68,   38,   38,  216,   38,
+ /*  1150 */     2,   68,  220,  199,   68,  179,   68,   38,   80,   69,
+ /*  1160 */   206,   81,   38,   69,  232,  233,  234,  235,   81,   38,
+ /*  1170 */   216,   80,   68,   80,  220,  199,   81,  179,  128,   69,
+ /*  1180 */    80,   68,  206,   69,   69,   68,  232,  233,  234,  235,
+ /*  1190 */    68,   68,  216,  120,    0,   43,  220,  199,   78,   22,
+ /*  1200 */    92,  117,   68,   68,  206,   80,   80,   79,  232,  233,
+ /*  1210 */   234,  235,  104,   69,  216,   68,   33,   38,  220,   36,
+ /*  1220 */    38,   94,   69,   38,   68,   42,   69,   44,   38,   68,
+ /*  1230 */   232,  233,  234,  235,  126,   69,  128,  129,   38,   68,
+ /*  1240 */    38,   69,   68,   94,   94,   94,   22,   82,   68,   38,
+ /*  1250 */    67,   38,   68,   70,   68,   38,   22,   48,  104,   47,
+ /*  1260 */    22,   38,   22,   38,   38,   38,   38,   38,   38,   38,
+ /*  1270 */    38,   38,    0,   38,   38,   38,    0,   38,    0,   38,
+ /*  1280 */    38,   38,   36,   38,   37,    0,   22,   43,   21,  274,
+ /*  1290 */    22,   22,   21,   20,  274,  274,  274,  274,  274,  274,
+ /*  1300 */   117,  274,  274,  274,  121,  274,  274,  274,  274,  274,
+ /*  1310 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1320 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1330 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1340 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1350 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1360 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1370 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1380 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1390 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1400 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1410 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1420 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1430 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1440 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1450 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
+ /*  1460 */   274,  274,  274,  274,  274,  274,  274,  274,  274,  274,
 };
-#define YY_SHIFT_COUNT    (431)
+#define YY_SHIFT_COUNT    (437)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (1273)
+#define YY_SHIFT_MAX      (1285)
 static const unsigned short int yy_shift_ofst[] = {
- /*     0 */   569,  168,  179,  221,  221,  221,  221,  341,  221,  221,
- /*    10 */   406,  412,  177,  369,  406,  406,  406,  406,  406,  406,
- /*    20 */   406,  406,  406,  406,  406,  406,  406,  406,  406,  406,
- /*    30 */   406,  406,  406,   15,   15,   15,  152,  273,  273,   31,
- /*    40 */    31,  273,   31,   31,  149,  184,  280,  280,  247,  397,
- /*    50 */   184,   31,   31,  184,   31,  184,  397,  184,  184,   31,
- /*    60 */   377,    0,   13,   13,  677,  750, 1040,  548,  548,  548,
- /*    70 */   548,  548,  548,  548,  548,  548,  548,  548,  548,  548,
- /*    80 */   548,  548,  548,  548,  548,  548,  548,  779,  202,  207,
- /*    90 */   455,  455,  455,  229,  442,  397,  184,  184,  184,  308,
- /*   100 */    78,   78,   78,   78,   78,   96,  755,  898,  417,  429,
- /*   110 */   126,  578,  498,  121,  505,  121,  370,  258,  409,  716,
- /*   120 */   623,  626,  626,  716,  726,  149,  442,  752,  149,  149,
- /*   130 */   716,  149,  790,  184,  184,  184,  184,  184,  184,  184,
- /*   140 */   184,  184,  184,  184,  716,  790,  726,  377,  442,  752,
- /*   150 */   377,  872,  740,  749,  791,  740,  749,  791,  791,  759,
- /*   160 */   761,  776,  780,  792,  442,  919,  825,  784,  783,  786,
- /*   170 */   883,  184,  749,  791,  791,  749,  791,  847,  442,  752,
- /*   180 */   377,  308,  377,  442,  920,  716,  377,  790, 1282, 1282,
- /*   190 */  1282, 1282,   48,  768,  782, 1038,  484,  507,  624, 1115,
- /*   200 */  1130, 1020,  854,  236,  236,  236,  236,  236,  236,  236,
- /*   210 */   264,  156,  154,  130,  130,  130,  130,  510,  516,  564,
- /*   220 */   590,   66,  328,  613,  546,  537,  573,  574,  522,  486,
- /*   230 */   146,  471,  615,  570,  618,  630,  642,  643,  649,  672,
- /*   240 */   682,  543,  644,  704,  742,  751,  766,  781,  794,  596,
- /*   250 */  1013,  934, 1016, 1023,  905, 1024, 1031, 1033, 1034, 1035,
- /*   260 */  1036, 1019, 1042, 1044, 1045, 1046, 1048, 1049, 1050,  995,
- /*   270 */  1057, 1010, 1068, 1070, 1041, 1051, 1029, 1076, 1088, 1089,
- /*   280 */  1090, 1018, 1021, 1060, 1062, 1080, 1103, 1066, 1069, 1071,
- /*   290 */  1072, 1074, 1077, 1106, 1096, 1119, 1098, 1082, 1123, 1102,
- /*   300 */  1087, 1133, 1112, 1135, 1117, 1121, 1148, 1154, 1039, 1156,
- /*   310 */  1092, 1114, 1047, 1081, 1084, 1008, 1094, 1085, 1099, 1101,
- /*   320 */  1104, 1105, 1107, 1108, 1086, 1091, 1110, 1095, 1030, 1113,
- /*   330 */  1116, 1093, 1026, 1100, 1109, 1118, 1111, 1043, 1175, 1145,
- /*   340 */  1146, 1150, 1152, 1153, 1157, 1184, 1073, 1120, 1125, 1128,
- /*   350 */  1131, 1129, 1132, 1134, 1136, 1083, 1137, 1206, 1164, 1097,
- /*   360 */  1140, 1138, 1139, 1141, 1187, 1142, 1143, 1144, 1173, 1174,
- /*   370 */  1147, 1149, 1179, 1155, 1151, 1186, 1158, 1159, 1189, 1161,
- /*   380 */  1162, 1192, 1165, 1160, 1163, 1166, 1167, 1203, 1168, 1169,
- /*   390 */  1194, 1170, 1171, 1172, 1196, 1197, 1214, 1190, 1195, 1219,
- /*   400 */  1205, 1207, 1208, 1209, 1210, 1211, 1213, 1222, 1215, 1217,
- /*   410 */  1218, 1220, 1221, 1224, 1225, 1226, 1227, 1252, 1228, 1231,
- /*   420 */  1229, 1268, 1232, 1234, 1269, 1273, 1253, 1255, 1256, 1257,
- /*   430 */  1259, 1261,
+ /*     0 */   882,  168,  173,  266,  266,  266,  266,  341,  266,  266,
+ /*    10 */   424,  463,  116,  392,  424,  424,  424,  424,  424,  424,
+ /*    20 */   424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
+ /*    30 */   424,  424,  424,  317,  317,  317,  102, 1108, 1108,   73,
+ /*    40 */   104,  104, 1108,  104,  104,  143,  339,  369,  369,  186,
+ /*    50 */   436,  339,  104,  104,  339,  104,  339,  436,  339,  339,
+ /*    60 */   104,  299,    0,   13,   13,  509,  833,  249,  677,  677,
+ /*    70 */   677,  677,  677,  677,  677,  677,  677,  677,  677,  677,
+ /*    80 */   677,  677,  677,  677,  677,  677,  677,  677,  590,  295,
+ /*    90 */   137,  243,  243,  243,  239,  444,  436,  339,  339,  339,
+ /*   100 */   285,   78,   78,   78,   78,   78,  660,   66,  118,  350,
+ /*   110 */   458,  171,  232,  515,  144,  218,  144,  421,  497,   51,
+ /*   120 */   607,  728,  649,  651,  651,  728,  765,  143,  444,  788,
+ /*   130 */   143,  143,  728,  143,  813,  339,  339,  339,  339,  339,
+ /*   140 */   339,  339,  339,  339,  339,  339,  728,  813,  765,  299,
+ /*   150 */   444,  788,  299,  876,  741,  746,  777,  741,  746,  777,
+ /*   160 */   777,  750,  754,  767,  787,  780,  444,  921,  830,  773,
+ /*   170 */   781,  782,  879,  339,  746,  777,  777,  746,  777,  842,
+ /*   180 */   444,  788,  299,  285,  299,  444,  911,  728,  299,  813,
+ /*   190 */  1305, 1305, 1305, 1305, 1305,   48,  852,  801, 1183,  407,
+ /*   200 */   480,  657,  563,  763,  758,  920,  776,  776,  776,  776,
+ /*   210 */   776,  776,  776,  174,   19,  316,  134,  134,  134,  134,
+ /*   220 */   327,  472,  485,  531,  642,  648,  698,  176,  545,  565,
+ /*   230 */   613,  532,  413,  358,  332,  638,  504,  653,  645,  655,
+ /*   240 */   663,  666,  672,  702,  521,  623,  713,  735,  738,  740,
+ /*   250 */   742,  743,  778, 1000,  897,  877, 1004,  930, 1011, 1013,
+ /*   260 */   899, 1015, 1018, 1020, 1021, 1022, 1023, 1003, 1026, 1027,
+ /*   270 */  1033, 1035, 1036, 1037, 1040,  999, 1043,  996, 1045, 1047,
+ /*   280 */  1010, 1019, 1006, 1054, 1057, 1058, 1059,  985,  989, 1028,
+ /*   290 */  1029, 1048, 1065, 1031, 1038, 1039, 1041, 1042, 1046, 1071,
+ /*   300 */  1063, 1081, 1064, 1049, 1089, 1069, 1055, 1092, 1076, 1099,
+ /*   310 */  1079, 1082, 1103, 1105,  984, 1112, 1061, 1066,  991, 1032,
+ /*   320 */  1034,  956, 1053, 1044, 1067, 1077, 1083, 1068, 1086, 1070,
+ /*   330 */  1051, 1078, 1088, 1080,  969, 1075, 1090, 1091,  978, 1087,
+ /*   340 */  1093, 1094, 1095,  973, 1130, 1097, 1109, 1111, 1119, 1124,
+ /*   350 */  1131, 1148, 1050, 1100, 1110, 1104, 1113, 1114, 1115, 1117,
+ /*   360 */  1122, 1073, 1123, 1194, 1152, 1084, 1134, 1120, 1125, 1126,
+ /*   370 */  1177, 1135, 1128, 1144, 1179, 1182, 1147, 1153, 1185, 1156,
+ /*   380 */  1157, 1190, 1161, 1166, 1200, 1171, 1172, 1202, 1174, 1127,
+ /*   390 */  1149, 1150, 1151, 1224, 1165, 1180, 1211, 1154, 1184, 1186,
+ /*   400 */  1213, 1217, 1234, 1209, 1212, 1238, 1223, 1225, 1226, 1227,
+ /*   410 */  1228, 1229, 1230, 1240, 1231, 1232, 1233, 1235, 1236, 1237,
+ /*   420 */  1239, 1241, 1242, 1272, 1243, 1246, 1244, 1276, 1245, 1247,
+ /*   430 */  1278, 1285, 1264, 1267, 1268, 1269, 1271, 1273,
 };
-#define YY_REDUCE_COUNT (191)
-#define YY_REDUCE_MIN   (-225)
-#define YY_REDUCE_MAX   (897)
+#define YY_REDUCE_COUNT (194)
+#define YY_REDUCE_MIN   (-235)
+#define YY_REDUCE_MAX   (998)
 static const short yy_reduce_ofst[] = {
- /*     0 */    63, -172,  -16,  104,   28,  140,  176,  256,  331,  367,
- /*    10 */  -134,  403,  382,  432,  451,  474,  493,  533,  538,  627,
- /*    20 */   632,  662,  670,  706,  729,  734,  769,  777,  799,  827,
- /*    30 */   835,  857,  865,  214,  778,  897, -179, -177,  -14, -150,
- /*    40 */    88, -216, -149, -116, -182,  -12, -178,    3, -225, -207,
- /*    50 */  -114,   35,  155,   81,  162,  227, -140,  123,  253,  213,
- /*    60 */   249, -212, -212, -212, -148,    8,  107,  -56,   12,   92,
- /*    70 */   105,  142,  144,  211,  225,  226,  233,  260,  263,  284,
- /*    80 */   285,  296,  306,  330,  333,  334,  339, -109,  -46,  313,
- /*    90 */   113,  138,  297,  347,  261, -133,  350,  241,  283,  -73,
- /*   100 */  -192, -187,  295,  303,  375,  414,  481,  423,  342,  478,
- /*   110 */   440,  514,  468,  470,  470,  470,  536,  457,  487,  556,
- /*   120 */   529,  535,  539,  563,  549,  587,  554,  592,  600,  603,
- /*   130 */   622,  625,  636,  621,  645,  647,  651,  656,  676,  678,
- /*   140 */   681,  684,  685,  689,  638,  648,  601,  697,  629,  674,
- /*   150 */   705,  668,  639,  688,  690,  659,  700,  691,  703,  673,
- /*   160 */   675,  680,  693,  470,  736,  719,  710,  687,  707,  709,
- /*   170 */   732,  536,  756,  760,  762,  758,  767,  753,  775,  771,
- /*   180 */   788,  795,  802,  785,  793,  809,  812,  822,  811,  819,
- /*   190 */   830,  836,
+ /*     0 */   321,   -7,   15,  108, -162,  140,  187,  273,  364,  395,
+ /*    10 */   434,  439, -184,  477,  517,  522,  564,  594,  616,  691,
+ /*    20 */   722,  752,  774,  796,  818,  840,  862,  884,  908,  932,
+ /*    30 */   954,  976,  998, -153,   -3,  212,   86,  -24,  -12, -219,
+ /*    40 */  -167, -166, -220, -147,   34, -120,    2,   74,   75,   64,
+ /*    50 */  -212,  -72,  162,  172,   54,  225,   31, -159,  178,  209,
+ /*    60 */   297, -149, -235, -235, -235,  -90, -144, -134, -137,  151,
+ /*    70 */   205,  222,  245,  270,  274,  307,  325,  338,  344,  351,
+ /*    80 */   382,  387,  389,  431,  433,  438,  445,  483, -102,   85,
+ /*    90 */   230,  220,  251,  284,  111,  282, -211,  -81,  122,  256,
+ /*   100 */   195,  349,  372,  408,  443,  478,  499,  380,  405,  432,
+ /*   110 */   493,  449,  526,  486,  476,  476,  476,  530,  464,  492,
+ /*   120 */   520,  576,  552,  556,  560,  589,  577,  600,  596,  601,
+ /*   130 */   626,  643,  640,  644,  659,  639,  654,  656,  667,  668,
+ /*   140 */   670,  673,  674,  675,  676,  686,  662,  661,  617,  703,
+ /*   150 */   680,  627,  704,  678,  636,  683,  688,  650,  689,  693,
+ /*   160 */   694,  671,  658,  681,  685,  476,  737,  714,  705,  679,
+ /*   170 */   692,  695,  720,  530,  744,  747,  749,  745,  751,  756,
+ /*   180 */   757,  753,  792,  769,  793,  772,  779,  797,  799,  810,
+ /*   190 */   766,  803,  805,  806,  822,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*    10 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*    20 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*    30 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*    40 */  1023, 1023, 1023, 1023, 1076, 1023, 1023, 1023, 1023, 1023,
- /*    50 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*    60 */  1074, 1023, 1293, 1023, 1189, 1023, 1023, 1023, 1023, 1023,
- /*    70 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*    80 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1076,
- /*    90 */  1304, 1304, 1304, 1074, 1023, 1023, 1023, 1023, 1023, 1158,
- /*   100 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1368, 1023, 1111,
- /*   110 */  1328, 1023, 1320, 1296, 1310, 1297, 1023, 1353, 1313, 1023,
- /*   120 */  1194, 1191, 1191, 1023, 1023, 1076, 1023, 1023, 1076, 1076,
- /*   130 */  1023, 1076, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   140 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1074, 1023, 1023,
- /*   150 */  1074, 1023, 1335, 1333, 1023, 1335, 1333, 1023, 1023, 1347,
- /*   160 */  1343, 1326, 1324, 1310, 1023, 1023, 1023, 1371, 1359, 1355,
- /*   170 */  1023, 1023, 1333, 1023, 1023, 1333, 1023, 1202, 1023, 1023,
- /*   180 */  1074, 1023, 1074, 1023, 1127, 1023, 1074, 1023, 1161, 1161,
- /*   190 */  1077, 1028, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   200 */  1023, 1023, 1023, 1258, 1346, 1345, 1257, 1270, 1269, 1268,
- /*   210 */  1023, 1023, 1023, 1252, 1253, 1251, 1250, 1023, 1023, 1023,
- /*   220 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1294, 1023,
- /*   230 */  1356, 1360, 1023, 1023, 1023, 1236, 1023, 1023, 1023, 1023,
- /*   240 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   250 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   260 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   270 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   280 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   290 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   300 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   310 */  1023, 1023, 1023, 1317, 1327, 1023, 1023, 1023, 1023, 1023,
- /*   320 */  1023, 1023, 1023, 1023, 1023, 1236, 1023, 1344, 1023, 1303,
- /*   330 */  1299, 1023, 1023, 1295, 1023, 1023, 1354, 1023, 1023, 1023,
- /*   340 */  1023, 1023, 1023, 1023, 1023, 1289, 1023, 1023, 1023, 1023,
- /*   350 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   360 */  1023, 1023, 1235, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   370 */  1155, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   380 */  1023, 1023, 1023, 1140, 1138, 1137, 1136, 1023, 1133, 1023,
- /*   390 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   400 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   410 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   420 */  1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023,
- /*   430 */  1023, 1023,
+ /*     0 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    10 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    20 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    30 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    40 */  1038, 1038, 1038, 1038, 1038, 1091, 1038, 1038, 1038, 1038,
+ /*    50 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    60 */  1038, 1089, 1038, 1314, 1038, 1204, 1038, 1038, 1038, 1038,
+ /*    70 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    80 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*    90 */  1091, 1325, 1325, 1325, 1089, 1038, 1038, 1038, 1038, 1038,
+ /*   100 */  1173, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1389, 1038,
+ /*   110 */  1126, 1349, 1038, 1341, 1317, 1331, 1318, 1038, 1374, 1334,
+ /*   120 */  1227, 1038, 1209, 1206, 1206, 1038, 1038, 1091, 1038, 1038,
+ /*   130 */  1091, 1091, 1038, 1091, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   140 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1089,
+ /*   150 */  1038, 1038, 1089, 1038, 1356, 1354, 1038, 1356, 1354, 1038,
+ /*   160 */  1038, 1368, 1364, 1347, 1345, 1331, 1038, 1038, 1038, 1392,
+ /*   170 */  1380, 1376, 1038, 1038, 1354, 1038, 1038, 1354, 1038, 1217,
+ /*   180 */  1038, 1038, 1089, 1038, 1089, 1038, 1142, 1038, 1089, 1038,
+ /*   190 */  1229, 1176, 1176, 1092, 1043, 1038, 1038, 1038, 1038, 1038,
+ /*   200 */  1038, 1038, 1038, 1038, 1038, 1038, 1279, 1367, 1366, 1278,
+ /*   210 */  1291, 1290, 1289, 1038, 1038, 1038, 1273, 1274, 1272, 1271,
+ /*   220 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   230 */  1038, 1315, 1038, 1377, 1381, 1038, 1038, 1038, 1257, 1038,
+ /*   240 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   250 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   260 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   270 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   280 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   290 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   300 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   310 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1338,
+ /*   320 */  1348, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   330 */  1038, 1257, 1038, 1365, 1038, 1324, 1320, 1038, 1038, 1316,
+ /*   340 */  1038, 1038, 1375, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   350 */  1038, 1310, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   360 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1256, 1038,
+ /*   370 */  1038, 1038, 1038, 1038, 1038, 1038, 1170, 1038, 1038, 1038,
+ /*   380 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1155,
+ /*   390 */  1153, 1152, 1151, 1038, 1148, 1038, 1038, 1038, 1038, 1038,
+ /*   400 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   410 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   420 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
+ /*   430 */  1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -837,151 +840,157 @@ static const char *const yyTokenName[] = {
   /*  120 */ "INTERVAL",
   /*  121 */ "TOPIC",
   /*  122 */ "AS",
-  /*  123 */ "NK_BOOL",
-  /*  124 */ "NULL",
-  /*  125 */ "NK_VARIABLE",
-  /*  126 */ "NK_UNDERLINE",
-  /*  127 */ "ROWTS",
-  /*  128 */ "TBNAME",
-  /*  129 */ "QSTARTTS",
-  /*  130 */ "QENDTS",
-  /*  131 */ "WSTARTTS",
-  /*  132 */ "WENDTS",
-  /*  133 */ "WDURATION",
-  /*  134 */ "BETWEEN",
-  /*  135 */ "IS",
-  /*  136 */ "NK_LT",
-  /*  137 */ "NK_GT",
-  /*  138 */ "NK_LE",
-  /*  139 */ "NK_GE",
-  /*  140 */ "NK_NE",
-  /*  141 */ "MATCH",
-  /*  142 */ "NMATCH",
-  /*  143 */ "IN",
-  /*  144 */ "JOIN",
-  /*  145 */ "INNER",
-  /*  146 */ "SELECT",
-  /*  147 */ "DISTINCT",
-  /*  148 */ "WHERE",
-  /*  149 */ "PARTITION",
-  /*  150 */ "BY",
-  /*  151 */ "SESSION",
-  /*  152 */ "STATE_WINDOW",
-  /*  153 */ "SLIDING",
-  /*  154 */ "FILL",
-  /*  155 */ "VALUE",
-  /*  156 */ "NONE",
-  /*  157 */ "PREV",
-  /*  158 */ "LINEAR",
-  /*  159 */ "NEXT",
-  /*  160 */ "GROUP",
-  /*  161 */ "HAVING",
-  /*  162 */ "ORDER",
-  /*  163 */ "SLIMIT",
-  /*  164 */ "SOFFSET",
-  /*  165 */ "LIMIT",
-  /*  166 */ "OFFSET",
-  /*  167 */ "ASC",
-  /*  168 */ "DESC",
-  /*  169 */ "NULLS",
-  /*  170 */ "FIRST",
-  /*  171 */ "LAST",
-  /*  172 */ "cmd",
-  /*  173 */ "account_options",
-  /*  174 */ "alter_account_options",
-  /*  175 */ "literal",
-  /*  176 */ "alter_account_option",
-  /*  177 */ "user_name",
-  /*  178 */ "dnode_endpoint",
-  /*  179 */ "dnode_host_name",
-  /*  180 */ "not_exists_opt",
-  /*  181 */ "db_name",
-  /*  182 */ "db_options",
-  /*  183 */ "exists_opt",
-  /*  184 */ "alter_db_options",
-  /*  185 */ "alter_db_option",
-  /*  186 */ "full_table_name",
-  /*  187 */ "column_def_list",
-  /*  188 */ "tags_def_opt",
-  /*  189 */ "table_options",
-  /*  190 */ "multi_create_clause",
-  /*  191 */ "tags_def",
-  /*  192 */ "multi_drop_clause",
-  /*  193 */ "alter_table_clause",
-  /*  194 */ "alter_table_options",
-  /*  195 */ "column_name",
-  /*  196 */ "type_name",
-  /*  197 */ "create_subtable_clause",
-  /*  198 */ "specific_tags_opt",
-  /*  199 */ "literal_list",
-  /*  200 */ "drop_table_clause",
-  /*  201 */ "col_name_list",
-  /*  202 */ "table_name",
-  /*  203 */ "column_def",
-  /*  204 */ "func_name_list",
-  /*  205 */ "alter_table_option",
-  /*  206 */ "col_name",
-  /*  207 */ "db_name_cond_opt",
-  /*  208 */ "like_pattern_opt",
-  /*  209 */ "table_name_cond",
-  /*  210 */ "from_db_opt",
-  /*  211 */ "func_name",
-  /*  212 */ "function_name",
-  /*  213 */ "index_name",
-  /*  214 */ "index_options",
-  /*  215 */ "func_list",
-  /*  216 */ "duration_literal",
-  /*  217 */ "sliding_opt",
-  /*  218 */ "func",
-  /*  219 */ "expression_list",
-  /*  220 */ "topic_name",
-  /*  221 */ "query_expression",
-  /*  222 */ "signed",
-  /*  223 */ "signed_literal",
-  /*  224 */ "table_alias",
-  /*  225 */ "column_alias",
-  /*  226 */ "expression",
-  /*  227 */ "pseudo_column",
-  /*  228 */ "column_reference",
-  /*  229 */ "subquery",
-  /*  230 */ "predicate",
-  /*  231 */ "compare_op",
-  /*  232 */ "in_op",
-  /*  233 */ "in_predicate_value",
-  /*  234 */ "boolean_value_expression",
-  /*  235 */ "boolean_primary",
-  /*  236 */ "common_expression",
-  /*  237 */ "from_clause",
-  /*  238 */ "table_reference_list",
-  /*  239 */ "table_reference",
-  /*  240 */ "table_primary",
-  /*  241 */ "joined_table",
-  /*  242 */ "alias_opt",
-  /*  243 */ "parenthesized_joined_table",
-  /*  244 */ "join_type",
-  /*  245 */ "search_condition",
-  /*  246 */ "query_specification",
-  /*  247 */ "set_quantifier_opt",
-  /*  248 */ "select_list",
-  /*  249 */ "where_clause_opt",
-  /*  250 */ "partition_by_clause_opt",
-  /*  251 */ "twindow_clause_opt",
-  /*  252 */ "group_by_clause_opt",
-  /*  253 */ "having_clause_opt",
-  /*  254 */ "select_sublist",
-  /*  255 */ "select_item",
-  /*  256 */ "fill_opt",
-  /*  257 */ "fill_mode",
-  /*  258 */ "group_by_list",
-  /*  259 */ "query_expression_body",
-  /*  260 */ "order_by_clause_opt",
-  /*  261 */ "slimit_clause_opt",
-  /*  262 */ "limit_clause_opt",
-  /*  263 */ "query_primary",
-  /*  264 */ "sort_specification_list",
-  /*  265 */ "sort_specification",
-  /*  266 */ "ordering_specification_opt",
-  /*  267 */ "null_ordering_opt",
+  /*  123 */ "EXPLAIN",
+  /*  124 */ "ANALYZE",
+  /*  125 */ "VERBOSE",
+  /*  126 */ "NK_BOOL",
+  /*  127 */ "RATIO",
+  /*  128 */ "NULL",
+  /*  129 */ "NK_VARIABLE",
+  /*  130 */ "NK_UNDERLINE",
+  /*  131 */ "ROWTS",
+  /*  132 */ "TBNAME",
+  /*  133 */ "QSTARTTS",
+  /*  134 */ "QENDTS",
+  /*  135 */ "WSTARTTS",
+  /*  136 */ "WENDTS",
+  /*  137 */ "WDURATION",
+  /*  138 */ "BETWEEN",
+  /*  139 */ "IS",
+  /*  140 */ "NK_LT",
+  /*  141 */ "NK_GT",
+  /*  142 */ "NK_LE",
+  /*  143 */ "NK_GE",
+  /*  144 */ "NK_NE",
+  /*  145 */ "MATCH",
+  /*  146 */ "NMATCH",
+  /*  147 */ "IN",
+  /*  148 */ "JOIN",
+  /*  149 */ "INNER",
+  /*  150 */ "SELECT",
+  /*  151 */ "DISTINCT",
+  /*  152 */ "WHERE",
+  /*  153 */ "PARTITION",
+  /*  154 */ "BY",
+  /*  155 */ "SESSION",
+  /*  156 */ "STATE_WINDOW",
+  /*  157 */ "SLIDING",
+  /*  158 */ "FILL",
+  /*  159 */ "VALUE",
+  /*  160 */ "NONE",
+  /*  161 */ "PREV",
+  /*  162 */ "LINEAR",
+  /*  163 */ "NEXT",
+  /*  164 */ "GROUP",
+  /*  165 */ "HAVING",
+  /*  166 */ "ORDER",
+  /*  167 */ "SLIMIT",
+  /*  168 */ "SOFFSET",
+  /*  169 */ "LIMIT",
+  /*  170 */ "OFFSET",
+  /*  171 */ "ASC",
+  /*  172 */ "DESC",
+  /*  173 */ "NULLS",
+  /*  174 */ "FIRST",
+  /*  175 */ "LAST",
+  /*  176 */ "cmd",
+  /*  177 */ "account_options",
+  /*  178 */ "alter_account_options",
+  /*  179 */ "literal",
+  /*  180 */ "alter_account_option",
+  /*  181 */ "user_name",
+  /*  182 */ "dnode_endpoint",
+  /*  183 */ "dnode_host_name",
+  /*  184 */ "not_exists_opt",
+  /*  185 */ "db_name",
+  /*  186 */ "db_options",
+  /*  187 */ "exists_opt",
+  /*  188 */ "alter_db_options",
+  /*  189 */ "alter_db_option",
+  /*  190 */ "full_table_name",
+  /*  191 */ "column_def_list",
+  /*  192 */ "tags_def_opt",
+  /*  193 */ "table_options",
+  /*  194 */ "multi_create_clause",
+  /*  195 */ "tags_def",
+  /*  196 */ "multi_drop_clause",
+  /*  197 */ "alter_table_clause",
+  /*  198 */ "alter_table_options",
+  /*  199 */ "column_name",
+  /*  200 */ "type_name",
+  /*  201 */ "create_subtable_clause",
+  /*  202 */ "specific_tags_opt",
+  /*  203 */ "literal_list",
+  /*  204 */ "drop_table_clause",
+  /*  205 */ "col_name_list",
+  /*  206 */ "table_name",
+  /*  207 */ "column_def",
+  /*  208 */ "func_name_list",
+  /*  209 */ "alter_table_option",
+  /*  210 */ "col_name",
+  /*  211 */ "db_name_cond_opt",
+  /*  212 */ "like_pattern_opt",
+  /*  213 */ "table_name_cond",
+  /*  214 */ "from_db_opt",
+  /*  215 */ "func_name",
+  /*  216 */ "function_name",
+  /*  217 */ "index_name",
+  /*  218 */ "index_options",
+  /*  219 */ "func_list",
+  /*  220 */ "duration_literal",
+  /*  221 */ "sliding_opt",
+  /*  222 */ "func",
+  /*  223 */ "expression_list",
+  /*  224 */ "topic_name",
+  /*  225 */ "query_expression",
+  /*  226 */ "analyze_opt",
+  /*  227 */ "explain_options",
+  /*  228 */ "signed",
+  /*  229 */ "signed_literal",
+  /*  230 */ "table_alias",
+  /*  231 */ "column_alias",
+  /*  232 */ "expression",
+  /*  233 */ "pseudo_column",
+  /*  234 */ "column_reference",
+  /*  235 */ "subquery",
+  /*  236 */ "predicate",
+  /*  237 */ "compare_op",
+  /*  238 */ "in_op",
+  /*  239 */ "in_predicate_value",
+  /*  240 */ "boolean_value_expression",
+  /*  241 */ "boolean_primary",
+  /*  242 */ "common_expression",
+  /*  243 */ "from_clause",
+  /*  244 */ "table_reference_list",
+  /*  245 */ "table_reference",
+  /*  246 */ "table_primary",
+  /*  247 */ "joined_table",
+  /*  248 */ "alias_opt",
+  /*  249 */ "parenthesized_joined_table",
+  /*  250 */ "join_type",
+  /*  251 */ "search_condition",
+  /*  252 */ "query_specification",
+  /*  253 */ "set_quantifier_opt",
+  /*  254 */ "select_list",
+  /*  255 */ "where_clause_opt",
+  /*  256 */ "partition_by_clause_opt",
+  /*  257 */ "twindow_clause_opt",
+  /*  258 */ "group_by_clause_opt",
+  /*  259 */ "having_clause_opt",
+  /*  260 */ "select_sublist",
+  /*  261 */ "select_item",
+  /*  262 */ "fill_opt",
+  /*  263 */ "fill_mode",
+  /*  264 */ "group_by_list",
+  /*  265 */ "query_expression_body",
+  /*  266 */ "order_by_clause_opt",
+  /*  267 */ "slimit_clause_opt",
+  /*  268 */ "limit_clause_opt",
+  /*  269 */ "query_primary",
+  /*  270 */ "sort_specification_list",
+  /*  271 */ "sort_specification",
+  /*  272 */ "ordering_specification_opt",
+  /*  273 */ "null_ordering_opt",
 };
 #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
 
@@ -1174,169 +1183,175 @@ static const char *const yyRuleName[] = {
  /* 182 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression",
  /* 183 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name",
  /* 184 */ "cmd ::= DROP TOPIC exists_opt topic_name",
- /* 185 */ "cmd ::= query_expression",
- /* 186 */ "literal ::= NK_INTEGER",
- /* 187 */ "literal ::= NK_FLOAT",
- /* 188 */ "literal ::= NK_STRING",
- /* 189 */ "literal ::= NK_BOOL",
- /* 190 */ "literal ::= TIMESTAMP NK_STRING",
- /* 191 */ "literal ::= duration_literal",
- /* 192 */ "literal ::= NULL",
- /* 193 */ "duration_literal ::= NK_VARIABLE",
- /* 194 */ "signed ::= NK_INTEGER",
- /* 195 */ "signed ::= NK_PLUS NK_INTEGER",
- /* 196 */ "signed ::= NK_MINUS NK_INTEGER",
- /* 197 */ "signed ::= NK_FLOAT",
- /* 198 */ "signed ::= NK_PLUS NK_FLOAT",
- /* 199 */ "signed ::= NK_MINUS NK_FLOAT",
- /* 200 */ "signed_literal ::= signed",
- /* 201 */ "signed_literal ::= NK_STRING",
- /* 202 */ "signed_literal ::= NK_BOOL",
- /* 203 */ "signed_literal ::= TIMESTAMP NK_STRING",
- /* 204 */ "signed_literal ::= duration_literal",
- /* 205 */ "signed_literal ::= NULL",
- /* 206 */ "literal_list ::= signed_literal",
- /* 207 */ "literal_list ::= literal_list NK_COMMA signed_literal",
- /* 208 */ "db_name ::= NK_ID",
- /* 209 */ "table_name ::= NK_ID",
- /* 210 */ "column_name ::= NK_ID",
- /* 211 */ "function_name ::= NK_ID",
- /* 212 */ "table_alias ::= NK_ID",
- /* 213 */ "column_alias ::= NK_ID",
- /* 214 */ "user_name ::= NK_ID",
- /* 215 */ "index_name ::= NK_ID",
- /* 216 */ "topic_name ::= NK_ID",
- /* 217 */ "expression ::= literal",
- /* 218 */ "expression ::= pseudo_column",
- /* 219 */ "expression ::= column_reference",
- /* 220 */ "expression ::= function_name NK_LP expression_list NK_RP",
- /* 221 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
- /* 222 */ "expression ::= subquery",
- /* 223 */ "expression ::= NK_LP expression NK_RP",
- /* 224 */ "expression ::= NK_PLUS expression",
- /* 225 */ "expression ::= NK_MINUS expression",
- /* 226 */ "expression ::= expression NK_PLUS expression",
- /* 227 */ "expression ::= expression NK_MINUS expression",
- /* 228 */ "expression ::= expression NK_STAR expression",
- /* 229 */ "expression ::= expression NK_SLASH expression",
- /* 230 */ "expression ::= expression NK_REM expression",
- /* 231 */ "expression_list ::= expression",
- /* 232 */ "expression_list ::= expression_list NK_COMMA expression",
- /* 233 */ "column_reference ::= column_name",
- /* 234 */ "column_reference ::= table_name NK_DOT column_name",
- /* 235 */ "pseudo_column ::= NK_UNDERLINE ROWTS",
- /* 236 */ "pseudo_column ::= TBNAME",
- /* 237 */ "pseudo_column ::= NK_UNDERLINE QSTARTTS",
- /* 238 */ "pseudo_column ::= NK_UNDERLINE QENDTS",
- /* 239 */ "pseudo_column ::= NK_UNDERLINE WSTARTTS",
- /* 240 */ "pseudo_column ::= NK_UNDERLINE WENDTS",
- /* 241 */ "pseudo_column ::= NK_UNDERLINE WDURATION",
- /* 242 */ "predicate ::= expression compare_op expression",
- /* 243 */ "predicate ::= expression BETWEEN expression AND expression",
- /* 244 */ "predicate ::= expression NOT BETWEEN expression AND expression",
- /* 245 */ "predicate ::= expression IS NULL",
- /* 246 */ "predicate ::= expression IS NOT NULL",
- /* 247 */ "predicate ::= expression in_op in_predicate_value",
- /* 248 */ "compare_op ::= NK_LT",
- /* 249 */ "compare_op ::= NK_GT",
- /* 250 */ "compare_op ::= NK_LE",
- /* 251 */ "compare_op ::= NK_GE",
- /* 252 */ "compare_op ::= NK_NE",
- /* 253 */ "compare_op ::= NK_EQ",
- /* 254 */ "compare_op ::= LIKE",
- /* 255 */ "compare_op ::= NOT LIKE",
- /* 256 */ "compare_op ::= MATCH",
- /* 257 */ "compare_op ::= NMATCH",
- /* 258 */ "in_op ::= IN",
- /* 259 */ "in_op ::= NOT IN",
- /* 260 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
- /* 261 */ "boolean_value_expression ::= boolean_primary",
- /* 262 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 263 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 264 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 265 */ "boolean_primary ::= predicate",
- /* 266 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 267 */ "common_expression ::= expression",
- /* 268 */ "common_expression ::= boolean_value_expression",
- /* 269 */ "from_clause ::= FROM table_reference_list",
- /* 270 */ "table_reference_list ::= table_reference",
- /* 271 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 272 */ "table_reference ::= table_primary",
- /* 273 */ "table_reference ::= joined_table",
- /* 274 */ "table_primary ::= table_name alias_opt",
- /* 275 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 276 */ "table_primary ::= subquery alias_opt",
- /* 277 */ "table_primary ::= parenthesized_joined_table",
- /* 278 */ "alias_opt ::=",
- /* 279 */ "alias_opt ::= table_alias",
- /* 280 */ "alias_opt ::= AS table_alias",
- /* 281 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 282 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 283 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 284 */ "join_type ::=",
- /* 285 */ "join_type ::= INNER",
- /* 286 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
- /* 287 */ "set_quantifier_opt ::=",
- /* 288 */ "set_quantifier_opt ::= DISTINCT",
- /* 289 */ "set_quantifier_opt ::= ALL",
- /* 290 */ "select_list ::= NK_STAR",
- /* 291 */ "select_list ::= select_sublist",
- /* 292 */ "select_sublist ::= select_item",
- /* 293 */ "select_sublist ::= select_sublist NK_COMMA select_item",
- /* 294 */ "select_item ::= common_expression",
- /* 295 */ "select_item ::= common_expression column_alias",
- /* 296 */ "select_item ::= common_expression AS column_alias",
- /* 297 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 298 */ "where_clause_opt ::=",
- /* 299 */ "where_clause_opt ::= WHERE search_condition",
- /* 300 */ "partition_by_clause_opt ::=",
- /* 301 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
- /* 302 */ "twindow_clause_opt ::=",
- /* 303 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
- /* 304 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP",
- /* 305 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
- /* 306 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
- /* 307 */ "sliding_opt ::=",
- /* 308 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
- /* 309 */ "fill_opt ::=",
- /* 310 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 311 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
- /* 312 */ "fill_mode ::= NONE",
- /* 313 */ "fill_mode ::= PREV",
- /* 314 */ "fill_mode ::= NULL",
- /* 315 */ "fill_mode ::= LINEAR",
- /* 316 */ "fill_mode ::= NEXT",
- /* 317 */ "group_by_clause_opt ::=",
- /* 318 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 319 */ "group_by_list ::= expression",
- /* 320 */ "group_by_list ::= group_by_list NK_COMMA expression",
- /* 321 */ "having_clause_opt ::=",
- /* 322 */ "having_clause_opt ::= HAVING search_condition",
- /* 323 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 324 */ "query_expression_body ::= query_primary",
- /* 325 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
- /* 326 */ "query_primary ::= query_specification",
- /* 327 */ "order_by_clause_opt ::=",
- /* 328 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 329 */ "slimit_clause_opt ::=",
- /* 330 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 331 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 332 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 333 */ "limit_clause_opt ::=",
- /* 334 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 335 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 336 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 337 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 338 */ "search_condition ::= common_expression",
- /* 339 */ "sort_specification_list ::= sort_specification",
- /* 340 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 341 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
- /* 342 */ "ordering_specification_opt ::=",
- /* 343 */ "ordering_specification_opt ::= ASC",
- /* 344 */ "ordering_specification_opt ::= DESC",
- /* 345 */ "null_ordering_opt ::=",
- /* 346 */ "null_ordering_opt ::= NULLS FIRST",
- /* 347 */ "null_ordering_opt ::= NULLS LAST",
+ /* 185 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression",
+ /* 186 */ "analyze_opt ::=",
+ /* 187 */ "analyze_opt ::= ANALYZE",
+ /* 188 */ "explain_options ::=",
+ /* 189 */ "explain_options ::= explain_options VERBOSE NK_BOOL",
+ /* 190 */ "explain_options ::= explain_options RATIO NK_FLOAT",
+ /* 191 */ "cmd ::= query_expression",
+ /* 192 */ "literal ::= NK_INTEGER",
+ /* 193 */ "literal ::= NK_FLOAT",
+ /* 194 */ "literal ::= NK_STRING",
+ /* 195 */ "literal ::= NK_BOOL",
+ /* 196 */ "literal ::= TIMESTAMP NK_STRING",
+ /* 197 */ "literal ::= duration_literal",
+ /* 198 */ "literal ::= NULL",
+ /* 199 */ "duration_literal ::= NK_VARIABLE",
+ /* 200 */ "signed ::= NK_INTEGER",
+ /* 201 */ "signed ::= NK_PLUS NK_INTEGER",
+ /* 202 */ "signed ::= NK_MINUS NK_INTEGER",
+ /* 203 */ "signed ::= NK_FLOAT",
+ /* 204 */ "signed ::= NK_PLUS NK_FLOAT",
+ /* 205 */ "signed ::= NK_MINUS NK_FLOAT",
+ /* 206 */ "signed_literal ::= signed",
+ /* 207 */ "signed_literal ::= NK_STRING",
+ /* 208 */ "signed_literal ::= NK_BOOL",
+ /* 209 */ "signed_literal ::= TIMESTAMP NK_STRING",
+ /* 210 */ "signed_literal ::= duration_literal",
+ /* 211 */ "signed_literal ::= NULL",
+ /* 212 */ "literal_list ::= signed_literal",
+ /* 213 */ "literal_list ::= literal_list NK_COMMA signed_literal",
+ /* 214 */ "db_name ::= NK_ID",
+ /* 215 */ "table_name ::= NK_ID",
+ /* 216 */ "column_name ::= NK_ID",
+ /* 217 */ "function_name ::= NK_ID",
+ /* 218 */ "table_alias ::= NK_ID",
+ /* 219 */ "column_alias ::= NK_ID",
+ /* 220 */ "user_name ::= NK_ID",
+ /* 221 */ "index_name ::= NK_ID",
+ /* 222 */ "topic_name ::= NK_ID",
+ /* 223 */ "expression ::= literal",
+ /* 224 */ "expression ::= pseudo_column",
+ /* 225 */ "expression ::= column_reference",
+ /* 226 */ "expression ::= function_name NK_LP expression_list NK_RP",
+ /* 227 */ "expression ::= function_name NK_LP NK_STAR NK_RP",
+ /* 228 */ "expression ::= subquery",
+ /* 229 */ "expression ::= NK_LP expression NK_RP",
+ /* 230 */ "expression ::= NK_PLUS expression",
+ /* 231 */ "expression ::= NK_MINUS expression",
+ /* 232 */ "expression ::= expression NK_PLUS expression",
+ /* 233 */ "expression ::= expression NK_MINUS expression",
+ /* 234 */ "expression ::= expression NK_STAR expression",
+ /* 235 */ "expression ::= expression NK_SLASH expression",
+ /* 236 */ "expression ::= expression NK_REM expression",
+ /* 237 */ "expression_list ::= expression",
+ /* 238 */ "expression_list ::= expression_list NK_COMMA expression",
+ /* 239 */ "column_reference ::= column_name",
+ /* 240 */ "column_reference ::= table_name NK_DOT column_name",
+ /* 241 */ "pseudo_column ::= NK_UNDERLINE ROWTS",
+ /* 242 */ "pseudo_column ::= TBNAME",
+ /* 243 */ "pseudo_column ::= NK_UNDERLINE QSTARTTS",
+ /* 244 */ "pseudo_column ::= NK_UNDERLINE QENDTS",
+ /* 245 */ "pseudo_column ::= NK_UNDERLINE WSTARTTS",
+ /* 246 */ "pseudo_column ::= NK_UNDERLINE WENDTS",
+ /* 247 */ "pseudo_column ::= NK_UNDERLINE WDURATION",
+ /* 248 */ "predicate ::= expression compare_op expression",
+ /* 249 */ "predicate ::= expression BETWEEN expression AND expression",
+ /* 250 */ "predicate ::= expression NOT BETWEEN expression AND expression",
+ /* 251 */ "predicate ::= expression IS NULL",
+ /* 252 */ "predicate ::= expression IS NOT NULL",
+ /* 253 */ "predicate ::= expression in_op in_predicate_value",
+ /* 254 */ "compare_op ::= NK_LT",
+ /* 255 */ "compare_op ::= NK_GT",
+ /* 256 */ "compare_op ::= NK_LE",
+ /* 257 */ "compare_op ::= NK_GE",
+ /* 258 */ "compare_op ::= NK_NE",
+ /* 259 */ "compare_op ::= NK_EQ",
+ /* 260 */ "compare_op ::= LIKE",
+ /* 261 */ "compare_op ::= NOT LIKE",
+ /* 262 */ "compare_op ::= MATCH",
+ /* 263 */ "compare_op ::= NMATCH",
+ /* 264 */ "in_op ::= IN",
+ /* 265 */ "in_op ::= NOT IN",
+ /* 266 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
+ /* 267 */ "boolean_value_expression ::= boolean_primary",
+ /* 268 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 269 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 270 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 271 */ "boolean_primary ::= predicate",
+ /* 272 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 273 */ "common_expression ::= expression",
+ /* 274 */ "common_expression ::= boolean_value_expression",
+ /* 275 */ "from_clause ::= FROM table_reference_list",
+ /* 276 */ "table_reference_list ::= table_reference",
+ /* 277 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 278 */ "table_reference ::= table_primary",
+ /* 279 */ "table_reference ::= joined_table",
+ /* 280 */ "table_primary ::= table_name alias_opt",
+ /* 281 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 282 */ "table_primary ::= subquery alias_opt",
+ /* 283 */ "table_primary ::= parenthesized_joined_table",
+ /* 284 */ "alias_opt ::=",
+ /* 285 */ "alias_opt ::= table_alias",
+ /* 286 */ "alias_opt ::= AS table_alias",
+ /* 287 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 288 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 289 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 290 */ "join_type ::=",
+ /* 291 */ "join_type ::= INNER",
+ /* 292 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
+ /* 293 */ "set_quantifier_opt ::=",
+ /* 294 */ "set_quantifier_opt ::= DISTINCT",
+ /* 295 */ "set_quantifier_opt ::= ALL",
+ /* 296 */ "select_list ::= NK_STAR",
+ /* 297 */ "select_list ::= select_sublist",
+ /* 298 */ "select_sublist ::= select_item",
+ /* 299 */ "select_sublist ::= select_sublist NK_COMMA select_item",
+ /* 300 */ "select_item ::= common_expression",
+ /* 301 */ "select_item ::= common_expression column_alias",
+ /* 302 */ "select_item ::= common_expression AS column_alias",
+ /* 303 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 304 */ "where_clause_opt ::=",
+ /* 305 */ "where_clause_opt ::= WHERE search_condition",
+ /* 306 */ "partition_by_clause_opt ::=",
+ /* 307 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
+ /* 308 */ "twindow_clause_opt ::=",
+ /* 309 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
+ /* 310 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP",
+ /* 311 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
+ /* 312 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
+ /* 313 */ "sliding_opt ::=",
+ /* 314 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
+ /* 315 */ "fill_opt ::=",
+ /* 316 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 317 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
+ /* 318 */ "fill_mode ::= NONE",
+ /* 319 */ "fill_mode ::= PREV",
+ /* 320 */ "fill_mode ::= NULL",
+ /* 321 */ "fill_mode ::= LINEAR",
+ /* 322 */ "fill_mode ::= NEXT",
+ /* 323 */ "group_by_clause_opt ::=",
+ /* 324 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 325 */ "group_by_list ::= expression",
+ /* 326 */ "group_by_list ::= group_by_list NK_COMMA expression",
+ /* 327 */ "having_clause_opt ::=",
+ /* 328 */ "having_clause_opt ::= HAVING search_condition",
+ /* 329 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 330 */ "query_expression_body ::= query_primary",
+ /* 331 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
+ /* 332 */ "query_primary ::= query_specification",
+ /* 333 */ "order_by_clause_opt ::=",
+ /* 334 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 335 */ "slimit_clause_opt ::=",
+ /* 336 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 337 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 338 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 339 */ "limit_clause_opt ::=",
+ /* 340 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 341 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 342 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 343 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 344 */ "search_condition ::= common_expression",
+ /* 345 */ "sort_specification_list ::= sort_specification",
+ /* 346 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 347 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
+ /* 348 */ "ordering_specification_opt ::=",
+ /* 349 */ "ordering_specification_opt ::= ASC",
+ /* 350 */ "ordering_specification_opt ::= DESC",
+ /* 351 */ "null_ordering_opt ::=",
+ /* 352 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 353 */ "null_ordering_opt ::= NULLS LAST",
 };
 #endif /* NDEBUG */
 
@@ -1463,146 +1478,148 @@ static void yy_destructor(
     */
 /********* Begin destructor definitions ***************************************/
       /* Default NON-TERMINAL Destructor */
-    case 172: /* cmd */
-    case 175: /* literal */
-    case 182: /* db_options */
-    case 184: /* alter_db_options */
-    case 186: /* full_table_name */
-    case 189: /* table_options */
-    case 193: /* alter_table_clause */
-    case 194: /* alter_table_options */
-    case 197: /* create_subtable_clause */
-    case 200: /* drop_table_clause */
-    case 203: /* column_def */
-    case 206: /* col_name */
-    case 207: /* db_name_cond_opt */
-    case 208: /* like_pattern_opt */
-    case 209: /* table_name_cond */
-    case 210: /* from_db_opt */
-    case 211: /* func_name */
-    case 214: /* index_options */
-    case 216: /* duration_literal */
-    case 217: /* sliding_opt */
-    case 218: /* func */
-    case 221: /* query_expression */
-    case 222: /* signed */
-    case 223: /* signed_literal */
-    case 226: /* expression */
-    case 227: /* pseudo_column */
-    case 228: /* column_reference */
-    case 229: /* subquery */
-    case 230: /* predicate */
-    case 233: /* in_predicate_value */
-    case 234: /* boolean_value_expression */
-    case 235: /* boolean_primary */
-    case 236: /* common_expression */
-    case 237: /* from_clause */
-    case 238: /* table_reference_list */
-    case 239: /* table_reference */
-    case 240: /* table_primary */
-    case 241: /* joined_table */
-    case 243: /* parenthesized_joined_table */
-    case 245: /* search_condition */
-    case 246: /* query_specification */
-    case 249: /* where_clause_opt */
-    case 251: /* twindow_clause_opt */
-    case 253: /* having_clause_opt */
-    case 255: /* select_item */
-    case 256: /* fill_opt */
-    case 259: /* query_expression_body */
-    case 261: /* slimit_clause_opt */
-    case 262: /* limit_clause_opt */
-    case 263: /* query_primary */
-    case 265: /* sort_specification */
+    case 176: /* cmd */
+    case 179: /* literal */
+    case 186: /* db_options */
+    case 188: /* alter_db_options */
+    case 190: /* full_table_name */
+    case 193: /* table_options */
+    case 197: /* alter_table_clause */
+    case 198: /* alter_table_options */
+    case 201: /* create_subtable_clause */
+    case 204: /* drop_table_clause */
+    case 207: /* column_def */
+    case 210: /* col_name */
+    case 211: /* db_name_cond_opt */
+    case 212: /* like_pattern_opt */
+    case 213: /* table_name_cond */
+    case 214: /* from_db_opt */
+    case 215: /* func_name */
+    case 218: /* index_options */
+    case 220: /* duration_literal */
+    case 221: /* sliding_opt */
+    case 222: /* func */
+    case 225: /* query_expression */
+    case 227: /* explain_options */
+    case 228: /* signed */
+    case 229: /* signed_literal */
+    case 232: /* expression */
+    case 233: /* pseudo_column */
+    case 234: /* column_reference */
+    case 235: /* subquery */
+    case 236: /* predicate */
+    case 239: /* in_predicate_value */
+    case 240: /* boolean_value_expression */
+    case 241: /* boolean_primary */
+    case 242: /* common_expression */
+    case 243: /* from_clause */
+    case 244: /* table_reference_list */
+    case 245: /* table_reference */
+    case 246: /* table_primary */
+    case 247: /* joined_table */
+    case 249: /* parenthesized_joined_table */
+    case 251: /* search_condition */
+    case 252: /* query_specification */
+    case 255: /* where_clause_opt */
+    case 257: /* twindow_clause_opt */
+    case 259: /* having_clause_opt */
+    case 261: /* select_item */
+    case 262: /* fill_opt */
+    case 265: /* query_expression_body */
+    case 267: /* slimit_clause_opt */
+    case 268: /* limit_clause_opt */
+    case 269: /* query_primary */
+    case 271: /* sort_specification */
 {
- nodesDestroyNode((yypminor->yy176)); 
+ nodesDestroyNode((yypminor->yy364)); 
 }
       break;
-    case 173: /* account_options */
-    case 174: /* alter_account_options */
-    case 176: /* alter_account_option */
+    case 177: /* account_options */
+    case 178: /* alter_account_options */
+    case 180: /* alter_account_option */
 {
  
 }
       break;
-    case 177: /* user_name */
-    case 178: /* dnode_endpoint */
-    case 179: /* dnode_host_name */
-    case 181: /* db_name */
-    case 195: /* column_name */
-    case 202: /* table_name */
-    case 212: /* function_name */
-    case 213: /* index_name */
-    case 220: /* topic_name */
-    case 224: /* table_alias */
-    case 225: /* column_alias */
-    case 242: /* alias_opt */
+    case 181: /* user_name */
+    case 182: /* dnode_endpoint */
+    case 183: /* dnode_host_name */
+    case 185: /* db_name */
+    case 199: /* column_name */
+    case 206: /* table_name */
+    case 216: /* function_name */
+    case 217: /* index_name */
+    case 224: /* topic_name */
+    case 230: /* table_alias */
+    case 231: /* column_alias */
+    case 248: /* alias_opt */
 {
  
 }
       break;
-    case 180: /* not_exists_opt */
-    case 183: /* exists_opt */
-    case 247: /* set_quantifier_opt */
+    case 184: /* not_exists_opt */
+    case 187: /* exists_opt */
+    case 226: /* analyze_opt */
+    case 253: /* set_quantifier_opt */
 {
  
 }
       break;
-    case 185: /* alter_db_option */
-    case 205: /* alter_table_option */
+    case 189: /* alter_db_option */
+    case 209: /* alter_table_option */
 {
  
 }
       break;
-    case 187: /* column_def_list */
-    case 188: /* tags_def_opt */
-    case 190: /* multi_create_clause */
-    case 191: /* tags_def */
-    case 192: /* multi_drop_clause */
-    case 198: /* specific_tags_opt */
-    case 199: /* literal_list */
-    case 201: /* col_name_list */
-    case 204: /* func_name_list */
-    case 215: /* func_list */
-    case 219: /* expression_list */
-    case 248: /* select_list */
-    case 250: /* partition_by_clause_opt */
-    case 252: /* group_by_clause_opt */
-    case 254: /* select_sublist */
-    case 258: /* group_by_list */
-    case 260: /* order_by_clause_opt */
-    case 264: /* sort_specification_list */
+    case 191: /* column_def_list */
+    case 192: /* tags_def_opt */
+    case 194: /* multi_create_clause */
+    case 195: /* tags_def */
+    case 196: /* multi_drop_clause */
+    case 202: /* specific_tags_opt */
+    case 203: /* literal_list */
+    case 205: /* col_name_list */
+    case 208: /* func_name_list */
+    case 219: /* func_list */
+    case 223: /* expression_list */
+    case 254: /* select_list */
+    case 256: /* partition_by_clause_opt */
+    case 258: /* group_by_clause_opt */
+    case 260: /* select_sublist */
+    case 264: /* group_by_list */
+    case 266: /* order_by_clause_opt */
+    case 270: /* sort_specification_list */
 {
- nodesDestroyList((yypminor->yy512)); 
+ nodesDestroyList((yypminor->yy40)); 
 }
       break;
-    case 196: /* type_name */
+    case 200: /* type_name */
 {
  
 }
       break;
-    case 231: /* compare_op */
-    case 232: /* in_op */
+    case 237: /* compare_op */
+    case 238: /* in_op */
 {
  
 }
       break;
-    case 244: /* join_type */
+    case 250: /* join_type */
 {
  
 }
       break;
-    case 257: /* fill_mode */
+    case 263: /* fill_mode */
 {
  
 }
       break;
-    case 266: /* ordering_specification_opt */
+    case 272: /* ordering_specification_opt */
 {
  
 }
       break;
-    case 267: /* null_ordering_opt */
+    case 273: /* null_ordering_opt */
 {
  
 }
@@ -1901,354 +1918,360 @@ static const struct {
   YYCODETYPE lhs;       /* Symbol on the left-hand side of the rule */
   signed char nrhs;     /* Negative of the number of RHS symbols in the rule */
 } yyRuleInfo[] = {
-  {  172,   -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
-  {  172,   -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
-  {  173,    0 }, /* (2) account_options ::= */
-  {  173,   -3 }, /* (3) account_options ::= account_options PPS literal */
-  {  173,   -3 }, /* (4) account_options ::= account_options TSERIES literal */
-  {  173,   -3 }, /* (5) account_options ::= account_options STORAGE literal */
-  {  173,   -3 }, /* (6) account_options ::= account_options STREAMS literal */
-  {  173,   -3 }, /* (7) account_options ::= account_options QTIME literal */
-  {  173,   -3 }, /* (8) account_options ::= account_options DBS literal */
-  {  173,   -3 }, /* (9) account_options ::= account_options USERS literal */
-  {  173,   -3 }, /* (10) account_options ::= account_options CONNS literal */
-  {  173,   -3 }, /* (11) account_options ::= account_options STATE literal */
-  {  174,   -1 }, /* (12) alter_account_options ::= alter_account_option */
-  {  174,   -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
-  {  176,   -2 }, /* (14) alter_account_option ::= PASS literal */
-  {  176,   -2 }, /* (15) alter_account_option ::= PPS literal */
-  {  176,   -2 }, /* (16) alter_account_option ::= TSERIES literal */
-  {  176,   -2 }, /* (17) alter_account_option ::= STORAGE literal */
-  {  176,   -2 }, /* (18) alter_account_option ::= STREAMS literal */
-  {  176,   -2 }, /* (19) alter_account_option ::= QTIME literal */
-  {  176,   -2 }, /* (20) alter_account_option ::= DBS literal */
-  {  176,   -2 }, /* (21) alter_account_option ::= USERS literal */
-  {  176,   -2 }, /* (22) alter_account_option ::= CONNS literal */
-  {  176,   -2 }, /* (23) alter_account_option ::= STATE literal */
-  {  172,   -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */
-  {  172,   -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
-  {  172,   -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
-  {  172,   -3 }, /* (27) cmd ::= DROP USER user_name */
-  {  172,   -3 }, /* (28) cmd ::= CREATE DNODE dnode_endpoint */
-  {  172,   -5 }, /* (29) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-  {  172,   -3 }, /* (30) cmd ::= DROP DNODE NK_INTEGER */
-  {  172,   -3 }, /* (31) cmd ::= DROP DNODE dnode_endpoint */
-  {  172,   -4 }, /* (32) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
-  {  172,   -5 }, /* (33) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
-  {  172,   -4 }, /* (34) cmd ::= ALTER ALL DNODES NK_STRING */
-  {  172,   -5 }, /* (35) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
-  {  178,   -1 }, /* (36) dnode_endpoint ::= NK_STRING */
-  {  179,   -1 }, /* (37) dnode_host_name ::= NK_ID */
-  {  179,   -1 }, /* (38) dnode_host_name ::= NK_IPTOKEN */
-  {  172,   -3 }, /* (39) cmd ::= ALTER LOCAL NK_STRING */
-  {  172,   -4 }, /* (40) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
-  {  172,   -5 }, /* (41) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
-  {  172,   -5 }, /* (42) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
-  {  172,   -5 }, /* (43) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-  {  172,   -4 }, /* (44) cmd ::= DROP DATABASE exists_opt db_name */
-  {  172,   -2 }, /* (45) cmd ::= USE db_name */
-  {  172,   -4 }, /* (46) cmd ::= ALTER DATABASE db_name alter_db_options */
-  {  180,   -3 }, /* (47) not_exists_opt ::= IF NOT EXISTS */
-  {  180,    0 }, /* (48) not_exists_opt ::= */
-  {  183,   -2 }, /* (49) exists_opt ::= IF EXISTS */
-  {  183,    0 }, /* (50) exists_opt ::= */
-  {  182,    0 }, /* (51) db_options ::= */
-  {  182,   -3 }, /* (52) db_options ::= db_options BLOCKS NK_INTEGER */
-  {  182,   -3 }, /* (53) db_options ::= db_options CACHE NK_INTEGER */
-  {  182,   -3 }, /* (54) db_options ::= db_options CACHELAST NK_INTEGER */
-  {  182,   -3 }, /* (55) db_options ::= db_options COMP NK_INTEGER */
-  {  182,   -3 }, /* (56) db_options ::= db_options DAYS NK_INTEGER */
-  {  182,   -3 }, /* (57) db_options ::= db_options FSYNC NK_INTEGER */
-  {  182,   -3 }, /* (58) db_options ::= db_options MAXROWS NK_INTEGER */
-  {  182,   -3 }, /* (59) db_options ::= db_options MINROWS NK_INTEGER */
-  {  182,   -3 }, /* (60) db_options ::= db_options KEEP NK_INTEGER */
-  {  182,   -3 }, /* (61) db_options ::= db_options PRECISION NK_STRING */
-  {  182,   -3 }, /* (62) db_options ::= db_options QUORUM NK_INTEGER */
-  {  182,   -3 }, /* (63) db_options ::= db_options REPLICA NK_INTEGER */
-  {  182,   -3 }, /* (64) db_options ::= db_options TTL NK_INTEGER */
-  {  182,   -3 }, /* (65) db_options ::= db_options WAL NK_INTEGER */
-  {  182,   -3 }, /* (66) db_options ::= db_options VGROUPS NK_INTEGER */
-  {  182,   -3 }, /* (67) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-  {  182,   -3 }, /* (68) db_options ::= db_options STREAM_MODE NK_INTEGER */
-  {  182,   -3 }, /* (69) db_options ::= db_options RETENTIONS NK_STRING */
-  {  184,   -1 }, /* (70) alter_db_options ::= alter_db_option */
-  {  184,   -2 }, /* (71) alter_db_options ::= alter_db_options alter_db_option */
-  {  185,   -2 }, /* (72) alter_db_option ::= BLOCKS NK_INTEGER */
-  {  185,   -2 }, /* (73) alter_db_option ::= FSYNC NK_INTEGER */
-  {  185,   -2 }, /* (74) alter_db_option ::= KEEP NK_INTEGER */
-  {  185,   -2 }, /* (75) alter_db_option ::= WAL NK_INTEGER */
-  {  185,   -2 }, /* (76) alter_db_option ::= QUORUM NK_INTEGER */
-  {  185,   -2 }, /* (77) alter_db_option ::= CACHELAST NK_INTEGER */
-  {  172,   -9 }, /* (78) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
-  {  172,   -3 }, /* (79) cmd ::= CREATE TABLE multi_create_clause */
-  {  172,   -9 }, /* (80) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
-  {  172,   -3 }, /* (81) cmd ::= DROP TABLE multi_drop_clause */
-  {  172,   -4 }, /* (82) cmd ::= DROP STABLE exists_opt full_table_name */
-  {  172,   -3 }, /* (83) cmd ::= ALTER TABLE alter_table_clause */
-  {  172,   -3 }, /* (84) cmd ::= ALTER STABLE alter_table_clause */
-  {  193,   -2 }, /* (85) alter_table_clause ::= full_table_name alter_table_options */
-  {  193,   -5 }, /* (86) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-  {  193,   -4 }, /* (87) alter_table_clause ::= full_table_name DROP COLUMN column_name */
-  {  193,   -5 }, /* (88) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-  {  193,   -5 }, /* (89) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-  {  193,   -5 }, /* (90) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-  {  193,   -4 }, /* (91) alter_table_clause ::= full_table_name DROP TAG column_name */
-  {  193,   -5 }, /* (92) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-  {  193,   -5 }, /* (93) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-  {  193,   -6 }, /* (94) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
-  {  190,   -1 }, /* (95) multi_create_clause ::= create_subtable_clause */
-  {  190,   -2 }, /* (96) multi_create_clause ::= multi_create_clause create_subtable_clause */
-  {  197,   -9 }, /* (97) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-  {  192,   -1 }, /* (98) multi_drop_clause ::= drop_table_clause */
-  {  192,   -2 }, /* (99) multi_drop_clause ::= multi_drop_clause drop_table_clause */
-  {  200,   -2 }, /* (100) drop_table_clause ::= exists_opt full_table_name */
-  {  198,    0 }, /* (101) specific_tags_opt ::= */
-  {  198,   -3 }, /* (102) specific_tags_opt ::= NK_LP col_name_list NK_RP */
-  {  186,   -1 }, /* (103) full_table_name ::= table_name */
-  {  186,   -3 }, /* (104) full_table_name ::= db_name NK_DOT table_name */
-  {  187,   -1 }, /* (105) column_def_list ::= column_def */
-  {  187,   -3 }, /* (106) column_def_list ::= column_def_list NK_COMMA column_def */
-  {  203,   -2 }, /* (107) column_def ::= column_name type_name */
-  {  203,   -4 }, /* (108) column_def ::= column_name type_name COMMENT NK_STRING */
-  {  196,   -1 }, /* (109) type_name ::= BOOL */
-  {  196,   -1 }, /* (110) type_name ::= TINYINT */
-  {  196,   -1 }, /* (111) type_name ::= SMALLINT */
-  {  196,   -1 }, /* (112) type_name ::= INT */
-  {  196,   -1 }, /* (113) type_name ::= INTEGER */
-  {  196,   -1 }, /* (114) type_name ::= BIGINT */
-  {  196,   -1 }, /* (115) type_name ::= FLOAT */
-  {  196,   -1 }, /* (116) type_name ::= DOUBLE */
-  {  196,   -4 }, /* (117) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-  {  196,   -1 }, /* (118) type_name ::= TIMESTAMP */
-  {  196,   -4 }, /* (119) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-  {  196,   -2 }, /* (120) type_name ::= TINYINT UNSIGNED */
-  {  196,   -2 }, /* (121) type_name ::= SMALLINT UNSIGNED */
-  {  196,   -2 }, /* (122) type_name ::= INT UNSIGNED */
-  {  196,   -2 }, /* (123) type_name ::= BIGINT UNSIGNED */
-  {  196,   -1 }, /* (124) type_name ::= JSON */
-  {  196,   -4 }, /* (125) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-  {  196,   -1 }, /* (126) type_name ::= MEDIUMBLOB */
-  {  196,   -1 }, /* (127) type_name ::= BLOB */
-  {  196,   -4 }, /* (128) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-  {  196,   -1 }, /* (129) type_name ::= DECIMAL */
-  {  196,   -4 }, /* (130) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-  {  196,   -6 }, /* (131) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-  {  188,    0 }, /* (132) tags_def_opt ::= */
-  {  188,   -1 }, /* (133) tags_def_opt ::= tags_def */
-  {  191,   -4 }, /* (134) tags_def ::= TAGS NK_LP column_def_list NK_RP */
-  {  189,    0 }, /* (135) table_options ::= */
-  {  189,   -3 }, /* (136) table_options ::= table_options COMMENT NK_STRING */
-  {  189,   -3 }, /* (137) table_options ::= table_options KEEP NK_INTEGER */
-  {  189,   -3 }, /* (138) table_options ::= table_options TTL NK_INTEGER */
-  {  189,   -5 }, /* (139) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-  {  189,   -5 }, /* (140) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
-  {  189,   -3 }, /* (141) table_options ::= table_options FILE_FACTOR NK_FLOAT */
-  {  189,   -3 }, /* (142) table_options ::= table_options DELAY NK_INTEGER */
-  {  194,   -1 }, /* (143) alter_table_options ::= alter_table_option */
-  {  194,   -2 }, /* (144) alter_table_options ::= alter_table_options alter_table_option */
-  {  205,   -2 }, /* (145) alter_table_option ::= COMMENT NK_STRING */
-  {  205,   -2 }, /* (146) alter_table_option ::= KEEP NK_INTEGER */
-  {  205,   -2 }, /* (147) alter_table_option ::= TTL NK_INTEGER */
-  {  201,   -1 }, /* (148) col_name_list ::= col_name */
-  {  201,   -3 }, /* (149) col_name_list ::= col_name_list NK_COMMA col_name */
-  {  206,   -1 }, /* (150) col_name ::= column_name */
-  {  172,   -2 }, /* (151) cmd ::= SHOW DNODES */
-  {  172,   -2 }, /* (152) cmd ::= SHOW USERS */
-  {  172,   -2 }, /* (153) cmd ::= SHOW DATABASES */
-  {  172,   -4 }, /* (154) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-  {  172,   -4 }, /* (155) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-  {  172,   -3 }, /* (156) cmd ::= SHOW db_name_cond_opt VGROUPS */
-  {  172,   -2 }, /* (157) cmd ::= SHOW MNODES */
-  {  172,   -2 }, /* (158) cmd ::= SHOW MODULES */
-  {  172,   -2 }, /* (159) cmd ::= SHOW QNODES */
-  {  172,   -2 }, /* (160) cmd ::= SHOW FUNCTIONS */
-  {  172,   -5 }, /* (161) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-  {  172,   -2 }, /* (162) cmd ::= SHOW STREAMS */
-  {  207,    0 }, /* (163) db_name_cond_opt ::= */
-  {  207,   -2 }, /* (164) db_name_cond_opt ::= db_name NK_DOT */
-  {  208,    0 }, /* (165) like_pattern_opt ::= */
-  {  208,   -2 }, /* (166) like_pattern_opt ::= LIKE NK_STRING */
-  {  209,   -1 }, /* (167) table_name_cond ::= table_name */
-  {  210,    0 }, /* (168) from_db_opt ::= */
-  {  210,   -2 }, /* (169) from_db_opt ::= FROM db_name */
-  {  204,   -1 }, /* (170) func_name_list ::= func_name */
-  {  204,   -3 }, /* (171) func_name_list ::= func_name_list NK_COMMA col_name */
-  {  211,   -1 }, /* (172) func_name ::= function_name */
-  {  172,   -8 }, /* (173) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
-  {  172,  -10 }, /* (174) cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
-  {  172,   -6 }, /* (175) cmd ::= DROP INDEX exists_opt index_name ON table_name */
-  {  214,    0 }, /* (176) index_options ::= */
-  {  214,   -9 }, /* (177) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-  {  214,  -11 }, /* (178) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
-  {  215,   -1 }, /* (179) func_list ::= func */
-  {  215,   -3 }, /* (180) func_list ::= func_list NK_COMMA func */
-  {  218,   -4 }, /* (181) func ::= function_name NK_LP expression_list NK_RP */
-  {  172,   -6 }, /* (182) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-  {  172,   -6 }, /* (183) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-  {  172,   -4 }, /* (184) cmd ::= DROP TOPIC exists_opt topic_name */
-  {  172,   -1 }, /* (185) cmd ::= query_expression */
-  {  175,   -1 }, /* (186) literal ::= NK_INTEGER */
-  {  175,   -1 }, /* (187) literal ::= NK_FLOAT */
-  {  175,   -1 }, /* (188) literal ::= NK_STRING */
-  {  175,   -1 }, /* (189) literal ::= NK_BOOL */
-  {  175,   -2 }, /* (190) literal ::= TIMESTAMP NK_STRING */
-  {  175,   -1 }, /* (191) literal ::= duration_literal */
-  {  175,   -1 }, /* (192) literal ::= NULL */
-  {  216,   -1 }, /* (193) duration_literal ::= NK_VARIABLE */
-  {  222,   -1 }, /* (194) signed ::= NK_INTEGER */
-  {  222,   -2 }, /* (195) signed ::= NK_PLUS NK_INTEGER */
-  {  222,   -2 }, /* (196) signed ::= NK_MINUS NK_INTEGER */
-  {  222,   -1 }, /* (197) signed ::= NK_FLOAT */
-  {  222,   -2 }, /* (198) signed ::= NK_PLUS NK_FLOAT */
-  {  222,   -2 }, /* (199) signed ::= NK_MINUS NK_FLOAT */
-  {  223,   -1 }, /* (200) signed_literal ::= signed */
-  {  223,   -1 }, /* (201) signed_literal ::= NK_STRING */
-  {  223,   -1 }, /* (202) signed_literal ::= NK_BOOL */
-  {  223,   -2 }, /* (203) signed_literal ::= TIMESTAMP NK_STRING */
-  {  223,   -1 }, /* (204) signed_literal ::= duration_literal */
-  {  223,   -1 }, /* (205) signed_literal ::= NULL */
-  {  199,   -1 }, /* (206) literal_list ::= signed_literal */
-  {  199,   -3 }, /* (207) literal_list ::= literal_list NK_COMMA signed_literal */
-  {  181,   -1 }, /* (208) db_name ::= NK_ID */
-  {  202,   -1 }, /* (209) table_name ::= NK_ID */
-  {  195,   -1 }, /* (210) column_name ::= NK_ID */
-  {  212,   -1 }, /* (211) function_name ::= NK_ID */
-  {  224,   -1 }, /* (212) table_alias ::= NK_ID */
-  {  225,   -1 }, /* (213) column_alias ::= NK_ID */
-  {  177,   -1 }, /* (214) user_name ::= NK_ID */
-  {  213,   -1 }, /* (215) index_name ::= NK_ID */
-  {  220,   -1 }, /* (216) topic_name ::= NK_ID */
-  {  226,   -1 }, /* (217) expression ::= literal */
-  {  226,   -1 }, /* (218) expression ::= pseudo_column */
-  {  226,   -1 }, /* (219) expression ::= column_reference */
-  {  226,   -4 }, /* (220) expression ::= function_name NK_LP expression_list NK_RP */
-  {  226,   -4 }, /* (221) expression ::= function_name NK_LP NK_STAR NK_RP */
-  {  226,   -1 }, /* (222) expression ::= subquery */
-  {  226,   -3 }, /* (223) expression ::= NK_LP expression NK_RP */
-  {  226,   -2 }, /* (224) expression ::= NK_PLUS expression */
-  {  226,   -2 }, /* (225) expression ::= NK_MINUS expression */
-  {  226,   -3 }, /* (226) expression ::= expression NK_PLUS expression */
-  {  226,   -3 }, /* (227) expression ::= expression NK_MINUS expression */
-  {  226,   -3 }, /* (228) expression ::= expression NK_STAR expression */
-  {  226,   -3 }, /* (229) expression ::= expression NK_SLASH expression */
-  {  226,   -3 }, /* (230) expression ::= expression NK_REM expression */
-  {  219,   -1 }, /* (231) expression_list ::= expression */
-  {  219,   -3 }, /* (232) expression_list ::= expression_list NK_COMMA expression */
-  {  228,   -1 }, /* (233) column_reference ::= column_name */
-  {  228,   -3 }, /* (234) column_reference ::= table_name NK_DOT column_name */
-  {  227,   -2 }, /* (235) pseudo_column ::= NK_UNDERLINE ROWTS */
-  {  227,   -1 }, /* (236) pseudo_column ::= TBNAME */
-  {  227,   -2 }, /* (237) pseudo_column ::= NK_UNDERLINE QSTARTTS */
-  {  227,   -2 }, /* (238) pseudo_column ::= NK_UNDERLINE QENDTS */
-  {  227,   -2 }, /* (239) pseudo_column ::= NK_UNDERLINE WSTARTTS */
-  {  227,   -2 }, /* (240) pseudo_column ::= NK_UNDERLINE WENDTS */
-  {  227,   -2 }, /* (241) pseudo_column ::= NK_UNDERLINE WDURATION */
-  {  230,   -3 }, /* (242) predicate ::= expression compare_op expression */
-  {  230,   -5 }, /* (243) predicate ::= expression BETWEEN expression AND expression */
-  {  230,   -6 }, /* (244) predicate ::= expression NOT BETWEEN expression AND expression */
-  {  230,   -3 }, /* (245) predicate ::= expression IS NULL */
-  {  230,   -4 }, /* (246) predicate ::= expression IS NOT NULL */
-  {  230,   -3 }, /* (247) predicate ::= expression in_op in_predicate_value */
-  {  231,   -1 }, /* (248) compare_op ::= NK_LT */
-  {  231,   -1 }, /* (249) compare_op ::= NK_GT */
-  {  231,   -1 }, /* (250) compare_op ::= NK_LE */
-  {  231,   -1 }, /* (251) compare_op ::= NK_GE */
-  {  231,   -1 }, /* (252) compare_op ::= NK_NE */
-  {  231,   -1 }, /* (253) compare_op ::= NK_EQ */
-  {  231,   -1 }, /* (254) compare_op ::= LIKE */
-  {  231,   -2 }, /* (255) compare_op ::= NOT LIKE */
-  {  231,   -1 }, /* (256) compare_op ::= MATCH */
-  {  231,   -1 }, /* (257) compare_op ::= NMATCH */
-  {  232,   -1 }, /* (258) in_op ::= IN */
-  {  232,   -2 }, /* (259) in_op ::= NOT IN */
-  {  233,   -3 }, /* (260) in_predicate_value ::= NK_LP expression_list NK_RP */
-  {  234,   -1 }, /* (261) boolean_value_expression ::= boolean_primary */
-  {  234,   -2 }, /* (262) boolean_value_expression ::= NOT boolean_primary */
-  {  234,   -3 }, /* (263) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-  {  234,   -3 }, /* (264) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-  {  235,   -1 }, /* (265) boolean_primary ::= predicate */
-  {  235,   -3 }, /* (266) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
-  {  236,   -1 }, /* (267) common_expression ::= expression */
-  {  236,   -1 }, /* (268) common_expression ::= boolean_value_expression */
-  {  237,   -2 }, /* (269) from_clause ::= FROM table_reference_list */
-  {  238,   -1 }, /* (270) table_reference_list ::= table_reference */
-  {  238,   -3 }, /* (271) table_reference_list ::= table_reference_list NK_COMMA table_reference */
-  {  239,   -1 }, /* (272) table_reference ::= table_primary */
-  {  239,   -1 }, /* (273) table_reference ::= joined_table */
-  {  240,   -2 }, /* (274) table_primary ::= table_name alias_opt */
-  {  240,   -4 }, /* (275) table_primary ::= db_name NK_DOT table_name alias_opt */
-  {  240,   -2 }, /* (276) table_primary ::= subquery alias_opt */
-  {  240,   -1 }, /* (277) table_primary ::= parenthesized_joined_table */
-  {  242,    0 }, /* (278) alias_opt ::= */
-  {  242,   -1 }, /* (279) alias_opt ::= table_alias */
-  {  242,   -2 }, /* (280) alias_opt ::= AS table_alias */
-  {  243,   -3 }, /* (281) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-  {  243,   -3 }, /* (282) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
-  {  241,   -6 }, /* (283) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-  {  244,    0 }, /* (284) join_type ::= */
-  {  244,   -1 }, /* (285) join_type ::= INNER */
-  {  246,   -9 }, /* (286) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
-  {  247,    0 }, /* (287) set_quantifier_opt ::= */
-  {  247,   -1 }, /* (288) set_quantifier_opt ::= DISTINCT */
-  {  247,   -1 }, /* (289) set_quantifier_opt ::= ALL */
-  {  248,   -1 }, /* (290) select_list ::= NK_STAR */
-  {  248,   -1 }, /* (291) select_list ::= select_sublist */
-  {  254,   -1 }, /* (292) select_sublist ::= select_item */
-  {  254,   -3 }, /* (293) select_sublist ::= select_sublist NK_COMMA select_item */
-  {  255,   -1 }, /* (294) select_item ::= common_expression */
-  {  255,   -2 }, /* (295) select_item ::= common_expression column_alias */
-  {  255,   -3 }, /* (296) select_item ::= common_expression AS column_alias */
-  {  255,   -3 }, /* (297) select_item ::= table_name NK_DOT NK_STAR */
-  {  249,    0 }, /* (298) where_clause_opt ::= */
-  {  249,   -2 }, /* (299) where_clause_opt ::= WHERE search_condition */
-  {  250,    0 }, /* (300) partition_by_clause_opt ::= */
-  {  250,   -3 }, /* (301) partition_by_clause_opt ::= PARTITION BY expression_list */
-  {  251,    0 }, /* (302) twindow_clause_opt ::= */
-  {  251,   -6 }, /* (303) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-  {  251,   -4 }, /* (304) twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
-  {  251,   -6 }, /* (305) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-  {  251,   -8 }, /* (306) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-  {  217,    0 }, /* (307) sliding_opt ::= */
-  {  217,   -4 }, /* (308) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-  {  256,    0 }, /* (309) fill_opt ::= */
-  {  256,   -4 }, /* (310) fill_opt ::= FILL NK_LP fill_mode NK_RP */
-  {  256,   -6 }, /* (311) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-  {  257,   -1 }, /* (312) fill_mode ::= NONE */
-  {  257,   -1 }, /* (313) fill_mode ::= PREV */
-  {  257,   -1 }, /* (314) fill_mode ::= NULL */
-  {  257,   -1 }, /* (315) fill_mode ::= LINEAR */
-  {  257,   -1 }, /* (316) fill_mode ::= NEXT */
-  {  252,    0 }, /* (317) group_by_clause_opt ::= */
-  {  252,   -3 }, /* (318) group_by_clause_opt ::= GROUP BY group_by_list */
-  {  258,   -1 }, /* (319) group_by_list ::= expression */
-  {  258,   -3 }, /* (320) group_by_list ::= group_by_list NK_COMMA expression */
-  {  253,    0 }, /* (321) having_clause_opt ::= */
-  {  253,   -2 }, /* (322) having_clause_opt ::= HAVING search_condition */
-  {  221,   -4 }, /* (323) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
-  {  259,   -1 }, /* (324) query_expression_body ::= query_primary */
-  {  259,   -4 }, /* (325) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-  {  263,   -1 }, /* (326) query_primary ::= query_specification */
-  {  260,    0 }, /* (327) order_by_clause_opt ::= */
-  {  260,   -3 }, /* (328) order_by_clause_opt ::= ORDER BY sort_specification_list */
-  {  261,    0 }, /* (329) slimit_clause_opt ::= */
-  {  261,   -2 }, /* (330) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-  {  261,   -4 }, /* (331) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-  {  261,   -4 }, /* (332) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  262,    0 }, /* (333) limit_clause_opt ::= */
-  {  262,   -2 }, /* (334) limit_clause_opt ::= LIMIT NK_INTEGER */
-  {  262,   -4 }, /* (335) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-  {  262,   -4 }, /* (336) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  229,   -3 }, /* (337) subquery ::= NK_LP query_expression NK_RP */
-  {  245,   -1 }, /* (338) search_condition ::= common_expression */
-  {  264,   -1 }, /* (339) sort_specification_list ::= sort_specification */
-  {  264,   -3 }, /* (340) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-  {  265,   -3 }, /* (341) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-  {  266,    0 }, /* (342) ordering_specification_opt ::= */
-  {  266,   -1 }, /* (343) ordering_specification_opt ::= ASC */
-  {  266,   -1 }, /* (344) ordering_specification_opt ::= DESC */
-  {  267,    0 }, /* (345) null_ordering_opt ::= */
-  {  267,   -2 }, /* (346) null_ordering_opt ::= NULLS FIRST */
-  {  267,   -2 }, /* (347) null_ordering_opt ::= NULLS LAST */
+  {  176,   -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
+  {  176,   -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
+  {  177,    0 }, /* (2) account_options ::= */
+  {  177,   -3 }, /* (3) account_options ::= account_options PPS literal */
+  {  177,   -3 }, /* (4) account_options ::= account_options TSERIES literal */
+  {  177,   -3 }, /* (5) account_options ::= account_options STORAGE literal */
+  {  177,   -3 }, /* (6) account_options ::= account_options STREAMS literal */
+  {  177,   -3 }, /* (7) account_options ::= account_options QTIME literal */
+  {  177,   -3 }, /* (8) account_options ::= account_options DBS literal */
+  {  177,   -3 }, /* (9) account_options ::= account_options USERS literal */
+  {  177,   -3 }, /* (10) account_options ::= account_options CONNS literal */
+  {  177,   -3 }, /* (11) account_options ::= account_options STATE literal */
+  {  178,   -1 }, /* (12) alter_account_options ::= alter_account_option */
+  {  178,   -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
+  {  180,   -2 }, /* (14) alter_account_option ::= PASS literal */
+  {  180,   -2 }, /* (15) alter_account_option ::= PPS literal */
+  {  180,   -2 }, /* (16) alter_account_option ::= TSERIES literal */
+  {  180,   -2 }, /* (17) alter_account_option ::= STORAGE literal */
+  {  180,   -2 }, /* (18) alter_account_option ::= STREAMS literal */
+  {  180,   -2 }, /* (19) alter_account_option ::= QTIME literal */
+  {  180,   -2 }, /* (20) alter_account_option ::= DBS literal */
+  {  180,   -2 }, /* (21) alter_account_option ::= USERS literal */
+  {  180,   -2 }, /* (22) alter_account_option ::= CONNS literal */
+  {  180,   -2 }, /* (23) alter_account_option ::= STATE literal */
+  {  176,   -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */
+  {  176,   -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
+  {  176,   -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
+  {  176,   -3 }, /* (27) cmd ::= DROP USER user_name */
+  {  176,   -3 }, /* (28) cmd ::= CREATE DNODE dnode_endpoint */
+  {  176,   -5 }, /* (29) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
+  {  176,   -3 }, /* (30) cmd ::= DROP DNODE NK_INTEGER */
+  {  176,   -3 }, /* (31) cmd ::= DROP DNODE dnode_endpoint */
+  {  176,   -4 }, /* (32) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
+  {  176,   -5 }, /* (33) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
+  {  176,   -4 }, /* (34) cmd ::= ALTER ALL DNODES NK_STRING */
+  {  176,   -5 }, /* (35) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
+  {  182,   -1 }, /* (36) dnode_endpoint ::= NK_STRING */
+  {  183,   -1 }, /* (37) dnode_host_name ::= NK_ID */
+  {  183,   -1 }, /* (38) dnode_host_name ::= NK_IPTOKEN */
+  {  176,   -3 }, /* (39) cmd ::= ALTER LOCAL NK_STRING */
+  {  176,   -4 }, /* (40) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
+  {  176,   -5 }, /* (41) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
+  {  176,   -5 }, /* (42) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
+  {  176,   -5 }, /* (43) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
+  {  176,   -4 }, /* (44) cmd ::= DROP DATABASE exists_opt db_name */
+  {  176,   -2 }, /* (45) cmd ::= USE db_name */
+  {  176,   -4 }, /* (46) cmd ::= ALTER DATABASE db_name alter_db_options */
+  {  184,   -3 }, /* (47) not_exists_opt ::= IF NOT EXISTS */
+  {  184,    0 }, /* (48) not_exists_opt ::= */
+  {  187,   -2 }, /* (49) exists_opt ::= IF EXISTS */
+  {  187,    0 }, /* (50) exists_opt ::= */
+  {  186,    0 }, /* (51) db_options ::= */
+  {  186,   -3 }, /* (52) db_options ::= db_options BLOCKS NK_INTEGER */
+  {  186,   -3 }, /* (53) db_options ::= db_options CACHE NK_INTEGER */
+  {  186,   -3 }, /* (54) db_options ::= db_options CACHELAST NK_INTEGER */
+  {  186,   -3 }, /* (55) db_options ::= db_options COMP NK_INTEGER */
+  {  186,   -3 }, /* (56) db_options ::= db_options DAYS NK_INTEGER */
+  {  186,   -3 }, /* (57) db_options ::= db_options FSYNC NK_INTEGER */
+  {  186,   -3 }, /* (58) db_options ::= db_options MAXROWS NK_INTEGER */
+  {  186,   -3 }, /* (59) db_options ::= db_options MINROWS NK_INTEGER */
+  {  186,   -3 }, /* (60) db_options ::= db_options KEEP NK_INTEGER */
+  {  186,   -3 }, /* (61) db_options ::= db_options PRECISION NK_STRING */
+  {  186,   -3 }, /* (62) db_options ::= db_options QUORUM NK_INTEGER */
+  {  186,   -3 }, /* (63) db_options ::= db_options REPLICA NK_INTEGER */
+  {  186,   -3 }, /* (64) db_options ::= db_options TTL NK_INTEGER */
+  {  186,   -3 }, /* (65) db_options ::= db_options WAL NK_INTEGER */
+  {  186,   -3 }, /* (66) db_options ::= db_options VGROUPS NK_INTEGER */
+  {  186,   -3 }, /* (67) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
+  {  186,   -3 }, /* (68) db_options ::= db_options STREAM_MODE NK_INTEGER */
+  {  186,   -3 }, /* (69) db_options ::= db_options RETENTIONS NK_STRING */
+  {  188,   -1 }, /* (70) alter_db_options ::= alter_db_option */
+  {  188,   -2 }, /* (71) alter_db_options ::= alter_db_options alter_db_option */
+  {  189,   -2 }, /* (72) alter_db_option ::= BLOCKS NK_INTEGER */
+  {  189,   -2 }, /* (73) alter_db_option ::= FSYNC NK_INTEGER */
+  {  189,   -2 }, /* (74) alter_db_option ::= KEEP NK_INTEGER */
+  {  189,   -2 }, /* (75) alter_db_option ::= WAL NK_INTEGER */
+  {  189,   -2 }, /* (76) alter_db_option ::= QUORUM NK_INTEGER */
+  {  189,   -2 }, /* (77) alter_db_option ::= CACHELAST NK_INTEGER */
+  {  176,   -9 }, /* (78) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
+  {  176,   -3 }, /* (79) cmd ::= CREATE TABLE multi_create_clause */
+  {  176,   -9 }, /* (80) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
+  {  176,   -3 }, /* (81) cmd ::= DROP TABLE multi_drop_clause */
+  {  176,   -4 }, /* (82) cmd ::= DROP STABLE exists_opt full_table_name */
+  {  176,   -3 }, /* (83) cmd ::= ALTER TABLE alter_table_clause */
+  {  176,   -3 }, /* (84) cmd ::= ALTER STABLE alter_table_clause */
+  {  197,   -2 }, /* (85) alter_table_clause ::= full_table_name alter_table_options */
+  {  197,   -5 }, /* (86) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
+  {  197,   -4 }, /* (87) alter_table_clause ::= full_table_name DROP COLUMN column_name */
+  {  197,   -5 }, /* (88) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
+  {  197,   -5 }, /* (89) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
+  {  197,   -5 }, /* (90) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
+  {  197,   -4 }, /* (91) alter_table_clause ::= full_table_name DROP TAG column_name */
+  {  197,   -5 }, /* (92) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
+  {  197,   -5 }, /* (93) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
+  {  197,   -6 }, /* (94) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
+  {  194,   -1 }, /* (95) multi_create_clause ::= create_subtable_clause */
+  {  194,   -2 }, /* (96) multi_create_clause ::= multi_create_clause create_subtable_clause */
+  {  201,   -9 }, /* (97) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
+  {  196,   -1 }, /* (98) multi_drop_clause ::= drop_table_clause */
+  {  196,   -2 }, /* (99) multi_drop_clause ::= multi_drop_clause drop_table_clause */
+  {  204,   -2 }, /* (100) drop_table_clause ::= exists_opt full_table_name */
+  {  202,    0 }, /* (101) specific_tags_opt ::= */
+  {  202,   -3 }, /* (102) specific_tags_opt ::= NK_LP col_name_list NK_RP */
+  {  190,   -1 }, /* (103) full_table_name ::= table_name */
+  {  190,   -3 }, /* (104) full_table_name ::= db_name NK_DOT table_name */
+  {  191,   -1 }, /* (105) column_def_list ::= column_def */
+  {  191,   -3 }, /* (106) column_def_list ::= column_def_list NK_COMMA column_def */
+  {  207,   -2 }, /* (107) column_def ::= column_name type_name */
+  {  207,   -4 }, /* (108) column_def ::= column_name type_name COMMENT NK_STRING */
+  {  200,   -1 }, /* (109) type_name ::= BOOL */
+  {  200,   -1 }, /* (110) type_name ::= TINYINT */
+  {  200,   -1 }, /* (111) type_name ::= SMALLINT */
+  {  200,   -1 }, /* (112) type_name ::= INT */
+  {  200,   -1 }, /* (113) type_name ::= INTEGER */
+  {  200,   -1 }, /* (114) type_name ::= BIGINT */
+  {  200,   -1 }, /* (115) type_name ::= FLOAT */
+  {  200,   -1 }, /* (116) type_name ::= DOUBLE */
+  {  200,   -4 }, /* (117) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
+  {  200,   -1 }, /* (118) type_name ::= TIMESTAMP */
+  {  200,   -4 }, /* (119) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
+  {  200,   -2 }, /* (120) type_name ::= TINYINT UNSIGNED */
+  {  200,   -2 }, /* (121) type_name ::= SMALLINT UNSIGNED */
+  {  200,   -2 }, /* (122) type_name ::= INT UNSIGNED */
+  {  200,   -2 }, /* (123) type_name ::= BIGINT UNSIGNED */
+  {  200,   -1 }, /* (124) type_name ::= JSON */
+  {  200,   -4 }, /* (125) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
+  {  200,   -1 }, /* (126) type_name ::= MEDIUMBLOB */
+  {  200,   -1 }, /* (127) type_name ::= BLOB */
+  {  200,   -4 }, /* (128) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
+  {  200,   -1 }, /* (129) type_name ::= DECIMAL */
+  {  200,   -4 }, /* (130) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
+  {  200,   -6 }, /* (131) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+  {  192,    0 }, /* (132) tags_def_opt ::= */
+  {  192,   -1 }, /* (133) tags_def_opt ::= tags_def */
+  {  195,   -4 }, /* (134) tags_def ::= TAGS NK_LP column_def_list NK_RP */
+  {  193,    0 }, /* (135) table_options ::= */
+  {  193,   -3 }, /* (136) table_options ::= table_options COMMENT NK_STRING */
+  {  193,   -3 }, /* (137) table_options ::= table_options KEEP NK_INTEGER */
+  {  193,   -3 }, /* (138) table_options ::= table_options TTL NK_INTEGER */
+  {  193,   -5 }, /* (139) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
+  {  193,   -5 }, /* (140) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
+  {  193,   -3 }, /* (141) table_options ::= table_options FILE_FACTOR NK_FLOAT */
+  {  193,   -3 }, /* (142) table_options ::= table_options DELAY NK_INTEGER */
+  {  198,   -1 }, /* (143) alter_table_options ::= alter_table_option */
+  {  198,   -2 }, /* (144) alter_table_options ::= alter_table_options alter_table_option */
+  {  209,   -2 }, /* (145) alter_table_option ::= COMMENT NK_STRING */
+  {  209,   -2 }, /* (146) alter_table_option ::= KEEP NK_INTEGER */
+  {  209,   -2 }, /* (147) alter_table_option ::= TTL NK_INTEGER */
+  {  205,   -1 }, /* (148) col_name_list ::= col_name */
+  {  205,   -3 }, /* (149) col_name_list ::= col_name_list NK_COMMA col_name */
+  {  210,   -1 }, /* (150) col_name ::= column_name */
+  {  176,   -2 }, /* (151) cmd ::= SHOW DNODES */
+  {  176,   -2 }, /* (152) cmd ::= SHOW USERS */
+  {  176,   -2 }, /* (153) cmd ::= SHOW DATABASES */
+  {  176,   -4 }, /* (154) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
+  {  176,   -4 }, /* (155) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
+  {  176,   -3 }, /* (156) cmd ::= SHOW db_name_cond_opt VGROUPS */
+  {  176,   -2 }, /* (157) cmd ::= SHOW MNODES */
+  {  176,   -2 }, /* (158) cmd ::= SHOW MODULES */
+  {  176,   -2 }, /* (159) cmd ::= SHOW QNODES */
+  {  176,   -2 }, /* (160) cmd ::= SHOW FUNCTIONS */
+  {  176,   -5 }, /* (161) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
+  {  176,   -2 }, /* (162) cmd ::= SHOW STREAMS */
+  {  211,    0 }, /* (163) db_name_cond_opt ::= */
+  {  211,   -2 }, /* (164) db_name_cond_opt ::= db_name NK_DOT */
+  {  212,    0 }, /* (165) like_pattern_opt ::= */
+  {  212,   -2 }, /* (166) like_pattern_opt ::= LIKE NK_STRING */
+  {  213,   -1 }, /* (167) table_name_cond ::= table_name */
+  {  214,    0 }, /* (168) from_db_opt ::= */
+  {  214,   -2 }, /* (169) from_db_opt ::= FROM db_name */
+  {  208,   -1 }, /* (170) func_name_list ::= func_name */
+  {  208,   -3 }, /* (171) func_name_list ::= func_name_list NK_COMMA col_name */
+  {  215,   -1 }, /* (172) func_name ::= function_name */
+  {  176,   -8 }, /* (173) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
+  {  176,  -10 }, /* (174) cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
+  {  176,   -6 }, /* (175) cmd ::= DROP INDEX exists_opt index_name ON table_name */
+  {  218,    0 }, /* (176) index_options ::= */
+  {  218,   -9 }, /* (177) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
+  {  218,  -11 }, /* (178) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
+  {  219,   -1 }, /* (179) func_list ::= func */
+  {  219,   -3 }, /* (180) func_list ::= func_list NK_COMMA func */
+  {  222,   -4 }, /* (181) func ::= function_name NK_LP expression_list NK_RP */
+  {  176,   -6 }, /* (182) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
+  {  176,   -6 }, /* (183) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
+  {  176,   -4 }, /* (184) cmd ::= DROP TOPIC exists_opt topic_name */
+  {  176,   -4 }, /* (185) cmd ::= EXPLAIN analyze_opt explain_options query_expression */
+  {  226,    0 }, /* (186) analyze_opt ::= */
+  {  226,   -1 }, /* (187) analyze_opt ::= ANALYZE */
+  {  227,    0 }, /* (188) explain_options ::= */
+  {  227,   -3 }, /* (189) explain_options ::= explain_options VERBOSE NK_BOOL */
+  {  227,   -3 }, /* (190) explain_options ::= explain_options RATIO NK_FLOAT */
+  {  176,   -1 }, /* (191) cmd ::= query_expression */
+  {  179,   -1 }, /* (192) literal ::= NK_INTEGER */
+  {  179,   -1 }, /* (193) literal ::= NK_FLOAT */
+  {  179,   -1 }, /* (194) literal ::= NK_STRING */
+  {  179,   -1 }, /* (195) literal ::= NK_BOOL */
+  {  179,   -2 }, /* (196) literal ::= TIMESTAMP NK_STRING */
+  {  179,   -1 }, /* (197) literal ::= duration_literal */
+  {  179,   -1 }, /* (198) literal ::= NULL */
+  {  220,   -1 }, /* (199) duration_literal ::= NK_VARIABLE */
+  {  228,   -1 }, /* (200) signed ::= NK_INTEGER */
+  {  228,   -2 }, /* (201) signed ::= NK_PLUS NK_INTEGER */
+  {  228,   -2 }, /* (202) signed ::= NK_MINUS NK_INTEGER */
+  {  228,   -1 }, /* (203) signed ::= NK_FLOAT */
+  {  228,   -2 }, /* (204) signed ::= NK_PLUS NK_FLOAT */
+  {  228,   -2 }, /* (205) signed ::= NK_MINUS NK_FLOAT */
+  {  229,   -1 }, /* (206) signed_literal ::= signed */
+  {  229,   -1 }, /* (207) signed_literal ::= NK_STRING */
+  {  229,   -1 }, /* (208) signed_literal ::= NK_BOOL */
+  {  229,   -2 }, /* (209) signed_literal ::= TIMESTAMP NK_STRING */
+  {  229,   -1 }, /* (210) signed_literal ::= duration_literal */
+  {  229,   -1 }, /* (211) signed_literal ::= NULL */
+  {  203,   -1 }, /* (212) literal_list ::= signed_literal */
+  {  203,   -3 }, /* (213) literal_list ::= literal_list NK_COMMA signed_literal */
+  {  185,   -1 }, /* (214) db_name ::= NK_ID */
+  {  206,   -1 }, /* (215) table_name ::= NK_ID */
+  {  199,   -1 }, /* (216) column_name ::= NK_ID */
+  {  216,   -1 }, /* (217) function_name ::= NK_ID */
+  {  230,   -1 }, /* (218) table_alias ::= NK_ID */
+  {  231,   -1 }, /* (219) column_alias ::= NK_ID */
+  {  181,   -1 }, /* (220) user_name ::= NK_ID */
+  {  217,   -1 }, /* (221) index_name ::= NK_ID */
+  {  224,   -1 }, /* (222) topic_name ::= NK_ID */
+  {  232,   -1 }, /* (223) expression ::= literal */
+  {  232,   -1 }, /* (224) expression ::= pseudo_column */
+  {  232,   -1 }, /* (225) expression ::= column_reference */
+  {  232,   -4 }, /* (226) expression ::= function_name NK_LP expression_list NK_RP */
+  {  232,   -4 }, /* (227) expression ::= function_name NK_LP NK_STAR NK_RP */
+  {  232,   -1 }, /* (228) expression ::= subquery */
+  {  232,   -3 }, /* (229) expression ::= NK_LP expression NK_RP */
+  {  232,   -2 }, /* (230) expression ::= NK_PLUS expression */
+  {  232,   -2 }, /* (231) expression ::= NK_MINUS expression */
+  {  232,   -3 }, /* (232) expression ::= expression NK_PLUS expression */
+  {  232,   -3 }, /* (233) expression ::= expression NK_MINUS expression */
+  {  232,   -3 }, /* (234) expression ::= expression NK_STAR expression */
+  {  232,   -3 }, /* (235) expression ::= expression NK_SLASH expression */
+  {  232,   -3 }, /* (236) expression ::= expression NK_REM expression */
+  {  223,   -1 }, /* (237) expression_list ::= expression */
+  {  223,   -3 }, /* (238) expression_list ::= expression_list NK_COMMA expression */
+  {  234,   -1 }, /* (239) column_reference ::= column_name */
+  {  234,   -3 }, /* (240) column_reference ::= table_name NK_DOT column_name */
+  {  233,   -2 }, /* (241) pseudo_column ::= NK_UNDERLINE ROWTS */
+  {  233,   -1 }, /* (242) pseudo_column ::= TBNAME */
+  {  233,   -2 }, /* (243) pseudo_column ::= NK_UNDERLINE QSTARTTS */
+  {  233,   -2 }, /* (244) pseudo_column ::= NK_UNDERLINE QENDTS */
+  {  233,   -2 }, /* (245) pseudo_column ::= NK_UNDERLINE WSTARTTS */
+  {  233,   -2 }, /* (246) pseudo_column ::= NK_UNDERLINE WENDTS */
+  {  233,   -2 }, /* (247) pseudo_column ::= NK_UNDERLINE WDURATION */
+  {  236,   -3 }, /* (248) predicate ::= expression compare_op expression */
+  {  236,   -5 }, /* (249) predicate ::= expression BETWEEN expression AND expression */
+  {  236,   -6 }, /* (250) predicate ::= expression NOT BETWEEN expression AND expression */
+  {  236,   -3 }, /* (251) predicate ::= expression IS NULL */
+  {  236,   -4 }, /* (252) predicate ::= expression IS NOT NULL */
+  {  236,   -3 }, /* (253) predicate ::= expression in_op in_predicate_value */
+  {  237,   -1 }, /* (254) compare_op ::= NK_LT */
+  {  237,   -1 }, /* (255) compare_op ::= NK_GT */
+  {  237,   -1 }, /* (256) compare_op ::= NK_LE */
+  {  237,   -1 }, /* (257) compare_op ::= NK_GE */
+  {  237,   -1 }, /* (258) compare_op ::= NK_NE */
+  {  237,   -1 }, /* (259) compare_op ::= NK_EQ */
+  {  237,   -1 }, /* (260) compare_op ::= LIKE */
+  {  237,   -2 }, /* (261) compare_op ::= NOT LIKE */
+  {  237,   -1 }, /* (262) compare_op ::= MATCH */
+  {  237,   -1 }, /* (263) compare_op ::= NMATCH */
+  {  238,   -1 }, /* (264) in_op ::= IN */
+  {  238,   -2 }, /* (265) in_op ::= NOT IN */
+  {  239,   -3 }, /* (266) in_predicate_value ::= NK_LP expression_list NK_RP */
+  {  240,   -1 }, /* (267) boolean_value_expression ::= boolean_primary */
+  {  240,   -2 }, /* (268) boolean_value_expression ::= NOT boolean_primary */
+  {  240,   -3 }, /* (269) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+  {  240,   -3 }, /* (270) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+  {  241,   -1 }, /* (271) boolean_primary ::= predicate */
+  {  241,   -3 }, /* (272) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+  {  242,   -1 }, /* (273) common_expression ::= expression */
+  {  242,   -1 }, /* (274) common_expression ::= boolean_value_expression */
+  {  243,   -2 }, /* (275) from_clause ::= FROM table_reference_list */
+  {  244,   -1 }, /* (276) table_reference_list ::= table_reference */
+  {  244,   -3 }, /* (277) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+  {  245,   -1 }, /* (278) table_reference ::= table_primary */
+  {  245,   -1 }, /* (279) table_reference ::= joined_table */
+  {  246,   -2 }, /* (280) table_primary ::= table_name alias_opt */
+  {  246,   -4 }, /* (281) table_primary ::= db_name NK_DOT table_name alias_opt */
+  {  246,   -2 }, /* (282) table_primary ::= subquery alias_opt */
+  {  246,   -1 }, /* (283) table_primary ::= parenthesized_joined_table */
+  {  248,    0 }, /* (284) alias_opt ::= */
+  {  248,   -1 }, /* (285) alias_opt ::= table_alias */
+  {  248,   -2 }, /* (286) alias_opt ::= AS table_alias */
+  {  249,   -3 }, /* (287) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+  {  249,   -3 }, /* (288) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+  {  247,   -6 }, /* (289) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+  {  250,    0 }, /* (290) join_type ::= */
+  {  250,   -1 }, /* (291) join_type ::= INNER */
+  {  252,   -9 }, /* (292) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+  {  253,    0 }, /* (293) set_quantifier_opt ::= */
+  {  253,   -1 }, /* (294) set_quantifier_opt ::= DISTINCT */
+  {  253,   -1 }, /* (295) set_quantifier_opt ::= ALL */
+  {  254,   -1 }, /* (296) select_list ::= NK_STAR */
+  {  254,   -1 }, /* (297) select_list ::= select_sublist */
+  {  260,   -1 }, /* (298) select_sublist ::= select_item */
+  {  260,   -3 }, /* (299) select_sublist ::= select_sublist NK_COMMA select_item */
+  {  261,   -1 }, /* (300) select_item ::= common_expression */
+  {  261,   -2 }, /* (301) select_item ::= common_expression column_alias */
+  {  261,   -3 }, /* (302) select_item ::= common_expression AS column_alias */
+  {  261,   -3 }, /* (303) select_item ::= table_name NK_DOT NK_STAR */
+  {  255,    0 }, /* (304) where_clause_opt ::= */
+  {  255,   -2 }, /* (305) where_clause_opt ::= WHERE search_condition */
+  {  256,    0 }, /* (306) partition_by_clause_opt ::= */
+  {  256,   -3 }, /* (307) partition_by_clause_opt ::= PARTITION BY expression_list */
+  {  257,    0 }, /* (308) twindow_clause_opt ::= */
+  {  257,   -6 }, /* (309) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+  {  257,   -4 }, /* (310) twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
+  {  257,   -6 }, /* (311) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+  {  257,   -8 }, /* (312) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+  {  221,    0 }, /* (313) sliding_opt ::= */
+  {  221,   -4 }, /* (314) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+  {  262,    0 }, /* (315) fill_opt ::= */
+  {  262,   -4 }, /* (316) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+  {  262,   -6 }, /* (317) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+  {  263,   -1 }, /* (318) fill_mode ::= NONE */
+  {  263,   -1 }, /* (319) fill_mode ::= PREV */
+  {  263,   -1 }, /* (320) fill_mode ::= NULL */
+  {  263,   -1 }, /* (321) fill_mode ::= LINEAR */
+  {  263,   -1 }, /* (322) fill_mode ::= NEXT */
+  {  258,    0 }, /* (323) group_by_clause_opt ::= */
+  {  258,   -3 }, /* (324) group_by_clause_opt ::= GROUP BY group_by_list */
+  {  264,   -1 }, /* (325) group_by_list ::= expression */
+  {  264,   -3 }, /* (326) group_by_list ::= group_by_list NK_COMMA expression */
+  {  259,    0 }, /* (327) having_clause_opt ::= */
+  {  259,   -2 }, /* (328) having_clause_opt ::= HAVING search_condition */
+  {  225,   -4 }, /* (329) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+  {  265,   -1 }, /* (330) query_expression_body ::= query_primary */
+  {  265,   -4 }, /* (331) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+  {  269,   -1 }, /* (332) query_primary ::= query_specification */
+  {  266,    0 }, /* (333) order_by_clause_opt ::= */
+  {  266,   -3 }, /* (334) order_by_clause_opt ::= ORDER BY sort_specification_list */
+  {  267,    0 }, /* (335) slimit_clause_opt ::= */
+  {  267,   -2 }, /* (336) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+  {  267,   -4 }, /* (337) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+  {  267,   -4 }, /* (338) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  268,    0 }, /* (339) limit_clause_opt ::= */
+  {  268,   -2 }, /* (340) limit_clause_opt ::= LIMIT NK_INTEGER */
+  {  268,   -4 }, /* (341) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+  {  268,   -4 }, /* (342) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  235,   -3 }, /* (343) subquery ::= NK_LP query_expression NK_RP */
+  {  251,   -1 }, /* (344) search_condition ::= common_expression */
+  {  270,   -1 }, /* (345) sort_specification_list ::= sort_specification */
+  {  270,   -3 }, /* (346) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+  {  271,   -3 }, /* (347) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+  {  272,    0 }, /* (348) ordering_specification_opt ::= */
+  {  272,   -1 }, /* (349) ordering_specification_opt ::= ASC */
+  {  272,   -1 }, /* (350) ordering_specification_opt ::= DESC */
+  {  273,    0 }, /* (351) null_ordering_opt ::= */
+  {  273,   -2 }, /* (352) null_ordering_opt ::= NULLS FIRST */
+  {  273,   -2 }, /* (353) null_ordering_opt ::= NULLS LAST */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -2337,11 +2360,11 @@ static YYACTIONTYPE yy_reduce(
         YYMINORTYPE yylhsminor;
       case 0: /* cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
 { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
-  yy_destructor(yypParser,173,&yymsp[0].minor);
+  yy_destructor(yypParser,177,&yymsp[0].minor);
         break;
       case 1: /* cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
 { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
-  yy_destructor(yypParser,174,&yymsp[0].minor);
+  yy_destructor(yypParser,178,&yymsp[0].minor);
         break;
       case 2: /* account_options ::= */
 { }
@@ -2355,20 +2378,20 @@ static YYACTIONTYPE yy_reduce(
       case 9: /* account_options ::= account_options USERS literal */ yytestcase(yyruleno==9);
       case 10: /* account_options ::= account_options CONNS literal */ yytestcase(yyruleno==10);
       case 11: /* account_options ::= account_options STATE literal */ yytestcase(yyruleno==11);
-{  yy_destructor(yypParser,173,&yymsp[-2].minor);
+{  yy_destructor(yypParser,177,&yymsp[-2].minor);
 { }
-  yy_destructor(yypParser,175,&yymsp[0].minor);
+  yy_destructor(yypParser,179,&yymsp[0].minor);
 }
         break;
       case 12: /* alter_account_options ::= alter_account_option */
-{  yy_destructor(yypParser,176,&yymsp[0].minor);
+{  yy_destructor(yypParser,180,&yymsp[0].minor);
 { }
 }
         break;
       case 13: /* alter_account_options ::= alter_account_options alter_account_option */
-{  yy_destructor(yypParser,174,&yymsp[-1].minor);
+{  yy_destructor(yypParser,178,&yymsp[-1].minor);
 { }
-  yy_destructor(yypParser,176,&yymsp[0].minor);
+  yy_destructor(yypParser,180,&yymsp[0].minor);
 }
         break;
       case 14: /* alter_account_option ::= PASS literal */
@@ -2382,31 +2405,31 @@ static YYACTIONTYPE yy_reduce(
       case 22: /* alter_account_option ::= CONNS literal */ yytestcase(yyruleno==22);
       case 23: /* alter_account_option ::= STATE literal */ yytestcase(yyruleno==23);
 { }
-  yy_destructor(yypParser,175,&yymsp[0].minor);
+  yy_destructor(yypParser,179,&yymsp[0].minor);
         break;
       case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy0); }
         break;
       case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy225, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy437, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
         break;
       case 26: /* cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy225, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy437, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
         break;
       case 27: /* cmd ::= DROP USER user_name */
-{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy437); }
         break;
       case 28: /* cmd ::= CREATE DNODE dnode_endpoint */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy225, NULL); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy437, NULL); }
         break;
       case 29: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy0); }
         break;
       case 30: /* cmd ::= DROP DNODE NK_INTEGER */
 { pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 31: /* cmd ::= DROP DNODE dnode_endpoint */
-{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy437); }
         break;
       case 32: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
 { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); }
@@ -2423,17 +2446,17 @@ static YYACTIONTYPE yy_reduce(
       case 36: /* dnode_endpoint ::= NK_STRING */
       case 37: /* dnode_host_name ::= NK_ID */ yytestcase(yyruleno==37);
       case 38: /* dnode_host_name ::= NK_IPTOKEN */ yytestcase(yyruleno==38);
-      case 208: /* db_name ::= NK_ID */ yytestcase(yyruleno==208);
-      case 209: /* table_name ::= NK_ID */ yytestcase(yyruleno==209);
-      case 210: /* column_name ::= NK_ID */ yytestcase(yyruleno==210);
-      case 211: /* function_name ::= NK_ID */ yytestcase(yyruleno==211);
-      case 212: /* table_alias ::= NK_ID */ yytestcase(yyruleno==212);
-      case 213: /* column_alias ::= NK_ID */ yytestcase(yyruleno==213);
-      case 214: /* user_name ::= NK_ID */ yytestcase(yyruleno==214);
-      case 215: /* index_name ::= NK_ID */ yytestcase(yyruleno==215);
-      case 216: /* topic_name ::= NK_ID */ yytestcase(yyruleno==216);
-{ yylhsminor.yy225 = yymsp[0].minor.yy0; }
-  yymsp[0].minor.yy225 = yylhsminor.yy225;
+      case 214: /* db_name ::= NK_ID */ yytestcase(yyruleno==214);
+      case 215: /* table_name ::= NK_ID */ yytestcase(yyruleno==215);
+      case 216: /* column_name ::= NK_ID */ yytestcase(yyruleno==216);
+      case 217: /* function_name ::= NK_ID */ yytestcase(yyruleno==217);
+      case 218: /* table_alias ::= NK_ID */ yytestcase(yyruleno==218);
+      case 219: /* column_alias ::= NK_ID */ yytestcase(yyruleno==219);
+      case 220: /* user_name ::= NK_ID */ yytestcase(yyruleno==220);
+      case 221: /* index_name ::= NK_ID */ yytestcase(yyruleno==221);
+      case 222: /* topic_name ::= NK_ID */ yytestcase(yyruleno==222);
+{ yylhsminor.yy437 = yymsp[0].minor.yy0; }
+  yymsp[0].minor.yy437 = yylhsminor.yy437;
         break;
       case 39: /* cmd ::= ALTER LOCAL NK_STRING */
 { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); }
@@ -2448,186 +2471,187 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createDropQnodeStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 43: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy505, &yymsp[-1].minor.yy225, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy493, &yymsp[-1].minor.yy437, yymsp[0].minor.yy364); }
         break;
       case 44: /* cmd ::= DROP DATABASE exists_opt db_name */
-{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy505, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy493, &yymsp[0].minor.yy437); }
         break;
       case 45: /* cmd ::= USE db_name */
-{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy437); }
         break;
       case 46: /* cmd ::= ALTER DATABASE db_name alter_db_options */
-{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy225, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy437, yymsp[0].minor.yy364); }
         break;
       case 47: /* not_exists_opt ::= IF NOT EXISTS */
-{ yymsp[-2].minor.yy505 = true; }
+{ yymsp[-2].minor.yy493 = true; }
         break;
       case 48: /* not_exists_opt ::= */
       case 50: /* exists_opt ::= */ yytestcase(yyruleno==50);
-      case 287: /* set_quantifier_opt ::= */ yytestcase(yyruleno==287);
-{ yymsp[1].minor.yy505 = false; }
+      case 186: /* analyze_opt ::= */ yytestcase(yyruleno==186);
+      case 293: /* set_quantifier_opt ::= */ yytestcase(yyruleno==293);
+{ yymsp[1].minor.yy493 = false; }
         break;
       case 49: /* exists_opt ::= IF EXISTS */
-{ yymsp[-1].minor.yy505 = true; }
+{ yymsp[-1].minor.yy493 = true; }
         break;
       case 51: /* db_options ::= */
-{ yymsp[1].minor.yy176 = createDefaultDatabaseOptions(pCxt); }
+{ yymsp[1].minor.yy364 = createDefaultDatabaseOptions(pCxt); }
         break;
       case 52: /* db_options ::= db_options BLOCKS NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_BLOCKS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_BLOCKS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 53: /* db_options ::= db_options CACHE NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_CACHE, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_CACHE, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 54: /* db_options ::= db_options CACHELAST NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 55: /* db_options ::= db_options COMP NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 56: /* db_options ::= db_options DAYS NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 57: /* db_options ::= db_options FSYNC NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 58: /* db_options ::= db_options MAXROWS NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 59: /* db_options ::= db_options MINROWS NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 60: /* db_options ::= db_options KEEP NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_KEEP, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_KEEP, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 61: /* db_options ::= db_options PRECISION NK_STRING */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 62: /* db_options ::= db_options QUORUM NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_QUORUM, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_QUORUM, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 63: /* db_options ::= db_options REPLICA NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 64: /* db_options ::= db_options TTL NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_TTL, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_TTL, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 65: /* db_options ::= db_options WAL NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 66: /* db_options ::= db_options VGROUPS NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 67: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 68: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_STREAM_MODE, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_STREAM_MODE, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 69: /* db_options ::= db_options RETENTIONS NK_STRING */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-2].minor.yy176, DB_OPTION_RETENTIONS, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-2].minor.yy364, DB_OPTION_RETENTIONS, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 70: /* alter_db_options ::= alter_db_option */
-{ yylhsminor.yy176 = createDefaultAlterDatabaseOptions(pCxt); yylhsminor.yy176 = setDatabaseOption(pCxt, yylhsminor.yy176, yymsp[0].minor.yy325.type, &yymsp[0].minor.yy325.val); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createDefaultAlterDatabaseOptions(pCxt); yylhsminor.yy364 = setDatabaseOption(pCxt, yylhsminor.yy364, yymsp[0].minor.yy29.type, &yymsp[0].minor.yy29.val); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
       case 71: /* alter_db_options ::= alter_db_options alter_db_option */
-{ yylhsminor.yy176 = setDatabaseOption(pCxt, yymsp[-1].minor.yy176, yymsp[0].minor.yy325.type, &yymsp[0].minor.yy325.val); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setDatabaseOption(pCxt, yymsp[-1].minor.yy364, yymsp[0].minor.yy29.type, &yymsp[0].minor.yy29.val); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
       case 72: /* alter_db_option ::= BLOCKS NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 73: /* alter_db_option ::= FSYNC NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 74: /* alter_db_option ::= KEEP NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = DB_OPTION_KEEP; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = DB_OPTION_KEEP; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 75: /* alter_db_option ::= WAL NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = DB_OPTION_WAL; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = DB_OPTION_WAL; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 76: /* alter_db_option ::= QUORUM NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 77: /* alter_db_option ::= CACHELAST NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 78: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
       case 80: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==80);
-{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy505, yymsp[-5].minor.yy176, yymsp[-3].minor.yy512, yymsp[-1].minor.yy512, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy493, yymsp[-5].minor.yy364, yymsp[-3].minor.yy40, yymsp[-1].minor.yy40, yymsp[0].minor.yy364); }
         break;
       case 79: /* cmd ::= CREATE TABLE multi_create_clause */
-{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy512); }
+{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy40); }
         break;
       case 81: /* cmd ::= DROP TABLE multi_drop_clause */
-{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy512); }
+{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy40); }
         break;
       case 82: /* cmd ::= DROP STABLE exists_opt full_table_name */
-{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy505, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy493, yymsp[0].minor.yy364); }
         break;
       case 83: /* cmd ::= ALTER TABLE alter_table_clause */
       case 84: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==84);
-      case 185: /* cmd ::= query_expression */ yytestcase(yyruleno==185);
-{ pCxt->pRootNode = yymsp[0].minor.yy176; }
+      case 191: /* cmd ::= query_expression */ yytestcase(yyruleno==191);
+{ pCxt->pRootNode = yymsp[0].minor.yy364; }
         break;
       case 85: /* alter_table_clause ::= full_table_name alter_table_options */
-{ yylhsminor.yy176 = createAlterTableOption(pCxt, yymsp[-1].minor.yy176, yymsp[0].minor.yy176); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableOption(pCxt, yymsp[-1].minor.yy364, yymsp[0].minor.yy364); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
       case 86: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-{ yylhsminor.yy176 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy176, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy225, yymsp[0].minor.yy448); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy364, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy437, yymsp[0].minor.yy420); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 87: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
-{ yylhsminor.yy176 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy176, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy225); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy364, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy437); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
       case 88: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-{ yylhsminor.yy176 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy176, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy225, yymsp[0].minor.yy448); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy364, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy437, yymsp[0].minor.yy420); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 89: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-{ yylhsminor.yy176 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy176, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy225, &yymsp[0].minor.yy225); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy364, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy437, &yymsp[0].minor.yy437); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 90: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-{ yylhsminor.yy176 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy176, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy225, yymsp[0].minor.yy448); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy364, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy437, yymsp[0].minor.yy420); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 91: /* alter_table_clause ::= full_table_name DROP TAG column_name */
-{ yylhsminor.yy176 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy176, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy225); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy364, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy437); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
       case 92: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-{ yylhsminor.yy176 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy176, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy225, yymsp[0].minor.yy448); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy364, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy437, yymsp[0].minor.yy420); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 93: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-{ yylhsminor.yy176 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy176, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy225, &yymsp[0].minor.yy225); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy364, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy437, &yymsp[0].minor.yy437); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 94: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
-{ yylhsminor.yy176 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy176, &yymsp[-2].minor.yy225, yymsp[0].minor.yy176); }
-  yymsp[-5].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy364, &yymsp[-2].minor.yy437, yymsp[0].minor.yy364); }
+  yymsp[-5].minor.yy364 = yylhsminor.yy364;
         break;
       case 95: /* multi_create_clause ::= create_subtable_clause */
       case 98: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==98);
@@ -2635,187 +2659,187 @@ static YYACTIONTYPE yy_reduce(
       case 148: /* col_name_list ::= col_name */ yytestcase(yyruleno==148);
       case 170: /* func_name_list ::= func_name */ yytestcase(yyruleno==170);
       case 179: /* func_list ::= func */ yytestcase(yyruleno==179);
-      case 206: /* literal_list ::= signed_literal */ yytestcase(yyruleno==206);
-      case 292: /* select_sublist ::= select_item */ yytestcase(yyruleno==292);
-      case 339: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==339);
-{ yylhsminor.yy512 = createNodeList(pCxt, yymsp[0].minor.yy176); }
-  yymsp[0].minor.yy512 = yylhsminor.yy512;
+      case 212: /* literal_list ::= signed_literal */ yytestcase(yyruleno==212);
+      case 298: /* select_sublist ::= select_item */ yytestcase(yyruleno==298);
+      case 345: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==345);
+{ yylhsminor.yy40 = createNodeList(pCxt, yymsp[0].minor.yy364); }
+  yymsp[0].minor.yy40 = yylhsminor.yy40;
         break;
       case 96: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
       case 99: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==99);
-{ yylhsminor.yy512 = addNodeToList(pCxt, yymsp[-1].minor.yy512, yymsp[0].minor.yy176); }
-  yymsp[-1].minor.yy512 = yylhsminor.yy512;
+{ yylhsminor.yy40 = addNodeToList(pCxt, yymsp[-1].minor.yy40, yymsp[0].minor.yy364); }
+  yymsp[-1].minor.yy40 = yylhsminor.yy40;
         break;
       case 97: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-{ yylhsminor.yy176 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy505, yymsp[-7].minor.yy176, yymsp[-5].minor.yy176, yymsp[-4].minor.yy512, yymsp[-1].minor.yy512); }
-  yymsp[-8].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy493, yymsp[-7].minor.yy364, yymsp[-5].minor.yy364, yymsp[-4].minor.yy40, yymsp[-1].minor.yy40); }
+  yymsp[-8].minor.yy364 = yylhsminor.yy364;
         break;
       case 100: /* drop_table_clause ::= exists_opt full_table_name */
-{ yylhsminor.yy176 = createDropTableClause(pCxt, yymsp[-1].minor.yy505, yymsp[0].minor.yy176); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createDropTableClause(pCxt, yymsp[-1].minor.yy493, yymsp[0].minor.yy364); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
       case 101: /* specific_tags_opt ::= */
       case 132: /* tags_def_opt ::= */ yytestcase(yyruleno==132);
-      case 300: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==300);
-      case 317: /* group_by_clause_opt ::= */ yytestcase(yyruleno==317);
-      case 327: /* order_by_clause_opt ::= */ yytestcase(yyruleno==327);
-{ yymsp[1].minor.yy512 = NULL; }
+      case 306: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==306);
+      case 323: /* group_by_clause_opt ::= */ yytestcase(yyruleno==323);
+      case 333: /* order_by_clause_opt ::= */ yytestcase(yyruleno==333);
+{ yymsp[1].minor.yy40 = NULL; }
         break;
       case 102: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
-{ yymsp[-2].minor.yy512 = yymsp[-1].minor.yy512; }
+{ yymsp[-2].minor.yy40 = yymsp[-1].minor.yy40; }
         break;
       case 103: /* full_table_name ::= table_name */
-{ yylhsminor.yy176 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy225, NULL); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy437, NULL); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
       case 104: /* full_table_name ::= db_name NK_DOT table_name */
-{ yylhsminor.yy176 = createRealTableNode(pCxt, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy225, NULL); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createRealTableNode(pCxt, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy437, NULL); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 106: /* column_def_list ::= column_def_list NK_COMMA column_def */
       case 149: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==149);
       case 171: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==171);
       case 180: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==180);
-      case 207: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==207);
-      case 293: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==293);
-      case 340: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==340);
-{ yylhsminor.yy512 = addNodeToList(pCxt, yymsp[-2].minor.yy512, yymsp[0].minor.yy176); }
-  yymsp[-2].minor.yy512 = yylhsminor.yy512;
+      case 213: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==213);
+      case 299: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==299);
+      case 346: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==346);
+{ yylhsminor.yy40 = addNodeToList(pCxt, yymsp[-2].minor.yy40, yymsp[0].minor.yy364); }
+  yymsp[-2].minor.yy40 = yylhsminor.yy40;
         break;
       case 107: /* column_def ::= column_name type_name */
-{ yylhsminor.yy176 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy225, yymsp[0].minor.yy448, NULL); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy437, yymsp[0].minor.yy420, NULL); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
       case 108: /* column_def ::= column_name type_name COMMENT NK_STRING */
-{ yylhsminor.yy176 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy225, yymsp[-2].minor.yy448, &yymsp[0].minor.yy0); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy437, yymsp[-2].minor.yy420, &yymsp[0].minor.yy0); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
       case 109: /* type_name ::= BOOL */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_BOOL); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_BOOL); }
         break;
       case 110: /* type_name ::= TINYINT */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_TINYINT); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_TINYINT); }
         break;
       case 111: /* type_name ::= SMALLINT */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
         break;
       case 112: /* type_name ::= INT */
       case 113: /* type_name ::= INTEGER */ yytestcase(yyruleno==113);
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_INT); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_INT); }
         break;
       case 114: /* type_name ::= BIGINT */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_BIGINT); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_BIGINT); }
         break;
       case 115: /* type_name ::= FLOAT */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_FLOAT); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_FLOAT); }
         break;
       case 116: /* type_name ::= DOUBLE */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
         break;
       case 117: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy448 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy420 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
         break;
       case 118: /* type_name ::= TIMESTAMP */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
         break;
       case 119: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy448 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy420 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
         break;
       case 120: /* type_name ::= TINYINT UNSIGNED */
-{ yymsp[-1].minor.yy448 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
+{ yymsp[-1].minor.yy420 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
         break;
       case 121: /* type_name ::= SMALLINT UNSIGNED */
-{ yymsp[-1].minor.yy448 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
+{ yymsp[-1].minor.yy420 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
         break;
       case 122: /* type_name ::= INT UNSIGNED */
-{ yymsp[-1].minor.yy448 = createDataType(TSDB_DATA_TYPE_UINT); }
+{ yymsp[-1].minor.yy420 = createDataType(TSDB_DATA_TYPE_UINT); }
         break;
       case 123: /* type_name ::= BIGINT UNSIGNED */
-{ yymsp[-1].minor.yy448 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
+{ yymsp[-1].minor.yy420 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
         break;
       case 124: /* type_name ::= JSON */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_JSON); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_JSON); }
         break;
       case 125: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy448 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy420 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
         break;
       case 126: /* type_name ::= MEDIUMBLOB */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
         break;
       case 127: /* type_name ::= BLOB */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_BLOB); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_BLOB); }
         break;
       case 128: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy448 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy420 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
         break;
       case 129: /* type_name ::= DECIMAL */
-{ yymsp[0].minor.yy448 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[0].minor.yy420 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 130: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy448 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-3].minor.yy420 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 131: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy448 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-5].minor.yy420 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 133: /* tags_def_opt ::= tags_def */
-      case 291: /* select_list ::= select_sublist */ yytestcase(yyruleno==291);
-{ yylhsminor.yy512 = yymsp[0].minor.yy512; }
-  yymsp[0].minor.yy512 = yylhsminor.yy512;
+      case 297: /* select_list ::= select_sublist */ yytestcase(yyruleno==297);
+{ yylhsminor.yy40 = yymsp[0].minor.yy40; }
+  yymsp[0].minor.yy40 = yylhsminor.yy40;
         break;
       case 134: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
-{ yymsp[-3].minor.yy512 = yymsp[-1].minor.yy512; }
+{ yymsp[-3].minor.yy40 = yymsp[-1].minor.yy40; }
         break;
       case 135: /* table_options ::= */
-{ yymsp[1].minor.yy176 = createDefaultTableOptions(pCxt); }
+{ yymsp[1].minor.yy364 = createDefaultTableOptions(pCxt); }
         break;
       case 136: /* table_options ::= table_options COMMENT NK_STRING */
-{ yylhsminor.yy176 = setTableOption(pCxt, yymsp[-2].minor.yy176, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableOption(pCxt, yymsp[-2].minor.yy364, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 137: /* table_options ::= table_options KEEP NK_INTEGER */
-{ yylhsminor.yy176 = setTableOption(pCxt, yymsp[-2].minor.yy176, TABLE_OPTION_KEEP, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableOption(pCxt, yymsp[-2].minor.yy364, TABLE_OPTION_KEEP, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 138: /* table_options ::= table_options TTL NK_INTEGER */
-{ yylhsminor.yy176 = setTableOption(pCxt, yymsp[-2].minor.yy176, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableOption(pCxt, yymsp[-2].minor.yy364, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 139: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-{ yylhsminor.yy176 = setTableSmaOption(pCxt, yymsp[-4].minor.yy176, yymsp[-1].minor.yy512); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableSmaOption(pCxt, yymsp[-4].minor.yy364, yymsp[-1].minor.yy40); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 140: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
-{ yylhsminor.yy176 = setTableRollupOption(pCxt, yymsp[-4].minor.yy176, yymsp[-1].minor.yy512); }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableRollupOption(pCxt, yymsp[-4].minor.yy364, yymsp[-1].minor.yy40); }
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
       case 141: /* table_options ::= table_options FILE_FACTOR NK_FLOAT */
-{ yylhsminor.yy176 = setTableOption(pCxt, yymsp[-2].minor.yy176, TABLE_OPTION_FILE_FACTOR, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableOption(pCxt, yymsp[-2].minor.yy364, TABLE_OPTION_FILE_FACTOR, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 142: /* table_options ::= table_options DELAY NK_INTEGER */
-{ yylhsminor.yy176 = setTableOption(pCxt, yymsp[-2].minor.yy176, TABLE_OPTION_DELAY, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableOption(pCxt, yymsp[-2].minor.yy364, TABLE_OPTION_DELAY, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
       case 143: /* alter_table_options ::= alter_table_option */
-{ yylhsminor.yy176 = createDefaultAlterTableOptions(pCxt); yylhsminor.yy176 = setTableOption(pCxt, yylhsminor.yy176, yymsp[0].minor.yy325.type, &yymsp[0].minor.yy325.val); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createDefaultAlterTableOptions(pCxt); yylhsminor.yy364 = setTableOption(pCxt, yylhsminor.yy364, yymsp[0].minor.yy29.type, &yymsp[0].minor.yy29.val); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
       case 144: /* alter_table_options ::= alter_table_options alter_table_option */
-{ yylhsminor.yy176 = setTableOption(pCxt, yymsp[-1].minor.yy176, yymsp[0].minor.yy325.type, &yymsp[0].minor.yy325.val); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = setTableOption(pCxt, yymsp[-1].minor.yy364, yymsp[0].minor.yy29.type, &yymsp[0].minor.yy29.val); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
       case 145: /* alter_table_option ::= COMMENT NK_STRING */
-{ yymsp[-1].minor.yy325.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 146: /* alter_table_option ::= KEEP NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 147: /* alter_table_option ::= TTL NK_INTEGER */
-{ yymsp[-1].minor.yy325.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy325.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy29.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy29.val = yymsp[0].minor.yy0; }
         break;
       case 150: /* col_name ::= column_name */
-{ yylhsminor.yy176 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy225); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy437); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
       case 151: /* cmd ::= SHOW DNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL, NULL); }
@@ -2827,13 +2851,13 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL, NULL); }
         break;
       case 154: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy176, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy364, yymsp[0].minor.yy364); }
         break;
       case 155: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy176, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy364, yymsp[0].minor.yy364); }
         break;
       case 156: /* cmd ::= SHOW db_name_cond_opt VGROUPS */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy176, NULL); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy364, NULL); }
         break;
       case 157: /* cmd ::= SHOW MNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT, NULL, NULL); }
@@ -2848,551 +2872,566 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT, NULL, NULL); }
         break;
       case 161: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy176, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy364, yymsp[0].minor.yy364); }
         break;
       case 162: /* cmd ::= SHOW STREAMS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT, NULL, NULL); }
         break;
       case 163: /* db_name_cond_opt ::= */
       case 168: /* from_db_opt ::= */ yytestcase(yyruleno==168);
-{ yymsp[1].minor.yy176 = createDefaultDatabaseCondValue(pCxt); }
+{ yymsp[1].minor.yy364 = createDefaultDatabaseCondValue(pCxt); }
         break;
       case 164: /* db_name_cond_opt ::= db_name NK_DOT */
-{ yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy225); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy437); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
       case 165: /* like_pattern_opt ::= */
       case 176: /* index_options ::= */ yytestcase(yyruleno==176);
-      case 298: /* where_clause_opt ::= */ yytestcase(yyruleno==298);
-      case 302: /* twindow_clause_opt ::= */ yytestcase(yyruleno==302);
-      case 307: /* sliding_opt ::= */ yytestcase(yyruleno==307);
-      case 309: /* fill_opt ::= */ yytestcase(yyruleno==309);
-      case 321: /* having_clause_opt ::= */ yytestcase(yyruleno==321);
-      case 329: /* slimit_clause_opt ::= */ yytestcase(yyruleno==329);
-      case 333: /* limit_clause_opt ::= */ yytestcase(yyruleno==333);
-{ yymsp[1].minor.yy176 = NULL; }
+      case 304: /* where_clause_opt ::= */ yytestcase(yyruleno==304);
+      case 308: /* twindow_clause_opt ::= */ yytestcase(yyruleno==308);
+      case 313: /* sliding_opt ::= */ yytestcase(yyruleno==313);
+      case 315: /* fill_opt ::= */ yytestcase(yyruleno==315);
+      case 327: /* having_clause_opt ::= */ yytestcase(yyruleno==327);
+      case 335: /* slimit_clause_opt ::= */ yytestcase(yyruleno==335);
+      case 339: /* limit_clause_opt ::= */ yytestcase(yyruleno==339);
+{ yymsp[1].minor.yy364 = NULL; }
         break;
       case 166: /* like_pattern_opt ::= LIKE NK_STRING */
-{ yymsp[-1].minor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
         break;
       case 167: /* table_name_cond ::= table_name */
-{ yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy225); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy437); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
       case 169: /* from_db_opt ::= FROM db_name */
-{ yymsp[-1].minor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy225); }
+{ yymsp[-1].minor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy437); }
         break;
       case 172: /* func_name ::= function_name */
-{ yylhsminor.yy176 = createFunctionNode(pCxt, &yymsp[0].minor.yy225, NULL); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createFunctionNode(pCxt, &yymsp[0].minor.yy437, NULL); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
       case 173: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy505, &yymsp[-3].minor.yy225, &yymsp[-1].minor.yy225, NULL, yymsp[0].minor.yy176); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy493, &yymsp[-3].minor.yy437, &yymsp[-1].minor.yy437, NULL, yymsp[0].minor.yy364); }
         break;
       case 174: /* cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy505, &yymsp[-5].minor.yy225, &yymsp[-3].minor.yy225, yymsp[-1].minor.yy512, NULL); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy493, &yymsp[-5].minor.yy437, &yymsp[-3].minor.yy437, yymsp[-1].minor.yy40, NULL); }
         break;
       case 175: /* cmd ::= DROP INDEX exists_opt index_name ON table_name */
-{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy505, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy493, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy437); }
         break;
       case 177: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-{ yymsp[-8].minor.yy176 = createIndexOption(pCxt, yymsp[-6].minor.yy512, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), NULL, yymsp[0].minor.yy176); }
+{ yymsp[-8].minor.yy364 = createIndexOption(pCxt, yymsp[-6].minor.yy40, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), NULL, yymsp[0].minor.yy364); }
         break;
       case 178: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */
-{ yymsp[-10].minor.yy176 = createIndexOption(pCxt, yymsp[-8].minor.yy512, releaseRawExprNode(pCxt, yymsp[-4].minor.yy176), releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), yymsp[0].minor.yy176); }
+{ yymsp[-10].minor.yy364 = createIndexOption(pCxt, yymsp[-8].minor.yy40, releaseRawExprNode(pCxt, yymsp[-4].minor.yy364), releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), yymsp[0].minor.yy364); }
         break;
       case 181: /* func ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy176 = createFunctionNode(pCxt, &yymsp[-3].minor.yy225, yymsp[-1].minor.yy512); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+{ yylhsminor.yy364 = createFunctionNode(pCxt, &yymsp[-3].minor.yy437, yymsp[-1].minor.yy40); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
       case 182: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy505, &yymsp[-2].minor.yy225, yymsp[0].minor.yy176, NULL); }
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy493, &yymsp[-2].minor.yy437, yymsp[0].minor.yy364, NULL); }
         break;
       case 183: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy505, &yymsp[-2].minor.yy225, NULL, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy493, &yymsp[-2].minor.yy437, NULL, &yymsp[0].minor.yy437); }
         break;
       case 184: /* cmd ::= DROP TOPIC exists_opt topic_name */
-{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy505, &yymsp[0].minor.yy225); }
+{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy493, &yymsp[0].minor.yy437); }
         break;
-      case 186: /* literal ::= NK_INTEGER */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 185: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */
+{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy493, yymsp[-1].minor.yy364, yymsp[0].minor.yy364); }
         break;
-      case 187: /* literal ::= NK_FLOAT */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 187: /* analyze_opt ::= ANALYZE */
+      case 294: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==294);
+{ yymsp[0].minor.yy493 = true; }
         break;
-      case 188: /* literal ::= NK_STRING */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 188: /* explain_options ::= */
+{ yymsp[1].minor.yy364 = createDefaultExplainOptions(pCxt); }
         break;
-      case 189: /* literal ::= NK_BOOL */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 189: /* explain_options ::= explain_options VERBOSE NK_BOOL */
+{ yylhsminor.yy364 = setExplainVerbose(pCxt, yymsp[-2].minor.yy364, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 190: /* literal ::= TIMESTAMP NK_STRING */
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+      case 190: /* explain_options ::= explain_options RATIO NK_FLOAT */
+{ yylhsminor.yy364 = setExplainRatio(pCxt, yymsp[-2].minor.yy364, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 191: /* literal ::= duration_literal */
-      case 200: /* signed_literal ::= signed */ yytestcase(yyruleno==200);
-      case 217: /* expression ::= literal */ yytestcase(yyruleno==217);
-      case 218: /* expression ::= pseudo_column */ yytestcase(yyruleno==218);
-      case 219: /* expression ::= column_reference */ yytestcase(yyruleno==219);
-      case 222: /* expression ::= subquery */ yytestcase(yyruleno==222);
-      case 261: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==261);
-      case 265: /* boolean_primary ::= predicate */ yytestcase(yyruleno==265);
-      case 267: /* common_expression ::= expression */ yytestcase(yyruleno==267);
-      case 268: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==268);
-      case 270: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==270);
-      case 272: /* table_reference ::= table_primary */ yytestcase(yyruleno==272);
-      case 273: /* table_reference ::= joined_table */ yytestcase(yyruleno==273);
-      case 277: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==277);
-      case 324: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==324);
-      case 326: /* query_primary ::= query_specification */ yytestcase(yyruleno==326);
-{ yylhsminor.yy176 = yymsp[0].minor.yy176; }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 192: /* literal ::= NK_INTEGER */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 192: /* literal ::= NULL */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 193: /* literal ::= NK_FLOAT */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 193: /* duration_literal ::= NK_VARIABLE */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 194: /* literal ::= NK_STRING */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 194: /* signed ::= NK_INTEGER */
-{ yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 195: /* literal ::= NK_BOOL */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 195: /* signed ::= NK_PLUS NK_INTEGER */
-{ yymsp[-1].minor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+      case 196: /* literal ::= TIMESTAMP NK_STRING */
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 196: /* signed ::= NK_MINUS NK_INTEGER */
+      case 197: /* literal ::= duration_literal */
+      case 206: /* signed_literal ::= signed */ yytestcase(yyruleno==206);
+      case 223: /* expression ::= literal */ yytestcase(yyruleno==223);
+      case 224: /* expression ::= pseudo_column */ yytestcase(yyruleno==224);
+      case 225: /* expression ::= column_reference */ yytestcase(yyruleno==225);
+      case 228: /* expression ::= subquery */ yytestcase(yyruleno==228);
+      case 267: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==267);
+      case 271: /* boolean_primary ::= predicate */ yytestcase(yyruleno==271);
+      case 273: /* common_expression ::= expression */ yytestcase(yyruleno==273);
+      case 274: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==274);
+      case 276: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==276);
+      case 278: /* table_reference ::= table_primary */ yytestcase(yyruleno==278);
+      case 279: /* table_reference ::= joined_table */ yytestcase(yyruleno==279);
+      case 283: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==283);
+      case 330: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==330);
+      case 332: /* query_primary ::= query_specification */ yytestcase(yyruleno==332);
+{ yylhsminor.yy364 = yymsp[0].minor.yy364; }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
+        break;
+      case 198: /* literal ::= NULL */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
+        break;
+      case 199: /* duration_literal ::= NK_VARIABLE */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
+        break;
+      case 200: /* signed ::= NK_INTEGER */
+{ yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
+        break;
+      case 201: /* signed ::= NK_PLUS NK_INTEGER */
+{ yymsp[-1].minor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+        break;
+      case 202: /* signed ::= NK_MINUS NK_INTEGER */
 { 
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
-                                                                                    yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
+                                                                                    yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
                                                                                   }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 197: /* signed ::= NK_FLOAT */
-{ yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 203: /* signed ::= NK_FLOAT */
+{ yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 198: /* signed ::= NK_PLUS NK_FLOAT */
-{ yymsp[-1].minor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+      case 204: /* signed ::= NK_PLUS NK_FLOAT */
+{ yymsp[-1].minor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
         break;
-      case 199: /* signed ::= NK_MINUS NK_FLOAT */
+      case 205: /* signed ::= NK_MINUS NK_FLOAT */
 { 
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
-                                                                                    yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
+                                                                                    yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
                                                                                   }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 201: /* signed_literal ::= NK_STRING */
-{ yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 207: /* signed_literal ::= NK_STRING */
+{ yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 202: /* signed_literal ::= NK_BOOL */
-{ yylhsminor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 208: /* signed_literal ::= NK_BOOL */
+{ yylhsminor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 203: /* signed_literal ::= TIMESTAMP NK_STRING */
-{ yymsp[-1].minor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
+      case 209: /* signed_literal ::= TIMESTAMP NK_STRING */
+{ yymsp[-1].minor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
         break;
-      case 204: /* signed_literal ::= duration_literal */
-      case 338: /* search_condition ::= common_expression */ yytestcase(yyruleno==338);
-{ yylhsminor.yy176 = releaseRawExprNode(pCxt, yymsp[0].minor.yy176); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 210: /* signed_literal ::= duration_literal */
+      case 344: /* search_condition ::= common_expression */ yytestcase(yyruleno==344);
+{ yylhsminor.yy364 = releaseRawExprNode(pCxt, yymsp[0].minor.yy364); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 205: /* signed_literal ::= NULL */
-{ yymsp[0].minor.yy176 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); }
+      case 211: /* signed_literal ::= NULL */
+{ yymsp[0].minor.yy364 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); }
         break;
-      case 220: /* expression ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy225, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy225, yymsp[-1].minor.yy512)); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+      case 226: /* expression ::= function_name NK_LP expression_list NK_RP */
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy437, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy437, yymsp[-1].minor.yy40)); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
-      case 221: /* expression ::= function_name NK_LP NK_STAR NK_RP */
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy225, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy225, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+      case 227: /* expression ::= function_name NK_LP NK_STAR NK_RP */
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy437, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy437, createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy0)))); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
-      case 223: /* expression ::= NK_LP expression NK_RP */
-      case 266: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==266);
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy176)); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 229: /* expression ::= NK_LP expression NK_RP */
+      case 272: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==272);
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy364)); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 224: /* expression ::= NK_PLUS expression */
+      case 230: /* expression ::= NK_PLUS expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy176));
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy364));
                                                                                   }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 225: /* expression ::= NK_MINUS expression */
+      case 231: /* expression ::= NK_MINUS expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[0].minor.yy176), NULL));
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[0].minor.yy364), NULL));
                                                                                   }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 226: /* expression ::= expression NK_PLUS expression */
+      case 232: /* expression ::= expression NK_PLUS expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); 
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 227: /* expression ::= expression NK_MINUS expression */
+      case 233: /* expression ::= expression NK_MINUS expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); 
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 228: /* expression ::= expression NK_STAR expression */
+      case 234: /* expression ::= expression NK_STAR expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); 
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 229: /* expression ::= expression NK_SLASH expression */
+      case 235: /* expression ::= expression NK_SLASH expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); 
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 230: /* expression ::= expression NK_REM expression */
+      case 236: /* expression ::= expression NK_REM expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); 
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 231: /* expression_list ::= expression */
-{ yylhsminor.yy512 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy176)); }
-  yymsp[0].minor.yy512 = yylhsminor.yy512;
+      case 237: /* expression_list ::= expression */
+{ yylhsminor.yy40 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy364)); }
+  yymsp[0].minor.yy40 = yylhsminor.yy40;
         break;
-      case 232: /* expression_list ::= expression_list NK_COMMA expression */
-{ yylhsminor.yy512 = addNodeToList(pCxt, yymsp[-2].minor.yy512, releaseRawExprNode(pCxt, yymsp[0].minor.yy176)); }
-  yymsp[-2].minor.yy512 = yylhsminor.yy512;
+      case 238: /* expression_list ::= expression_list NK_COMMA expression */
+{ yylhsminor.yy40 = addNodeToList(pCxt, yymsp[-2].minor.yy40, releaseRawExprNode(pCxt, yymsp[0].minor.yy364)); }
+  yymsp[-2].minor.yy40 = yylhsminor.yy40;
         break;
-      case 233: /* column_reference ::= column_name */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy225, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy225)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 239: /* column_reference ::= column_name */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy437, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy437)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 234: /* column_reference ::= table_name NK_DOT column_name */
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy225, createColumnNode(pCxt, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy225)); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 240: /* column_reference ::= table_name NK_DOT column_name */
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy437, createColumnNode(pCxt, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy437)); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 235: /* pseudo_column ::= NK_UNDERLINE ROWTS */
-      case 237: /* pseudo_column ::= NK_UNDERLINE QSTARTTS */ yytestcase(yyruleno==237);
-      case 238: /* pseudo_column ::= NK_UNDERLINE QENDTS */ yytestcase(yyruleno==238);
-      case 239: /* pseudo_column ::= NK_UNDERLINE WSTARTTS */ yytestcase(yyruleno==239);
-      case 240: /* pseudo_column ::= NK_UNDERLINE WENDTS */ yytestcase(yyruleno==240);
-      case 241: /* pseudo_column ::= NK_UNDERLINE WDURATION */ yytestcase(yyruleno==241);
+      case 241: /* pseudo_column ::= NK_UNDERLINE ROWTS */
+      case 243: /* pseudo_column ::= NK_UNDERLINE QSTARTTS */ yytestcase(yyruleno==243);
+      case 244: /* pseudo_column ::= NK_UNDERLINE QENDTS */ yytestcase(yyruleno==244);
+      case 245: /* pseudo_column ::= NK_UNDERLINE WSTARTTS */ yytestcase(yyruleno==245);
+      case 246: /* pseudo_column ::= NK_UNDERLINE WENDTS */ yytestcase(yyruleno==246);
+      case 247: /* pseudo_column ::= NK_UNDERLINE WDURATION */ yytestcase(yyruleno==247);
 {
                                                                                     SToken t = yymsp[-1].minor.yy0;
                                                                                     t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z;
-                                                                                    yylhsminor.yy176 = createRawExprNode(pCxt, &t, createFunctionNode(pCxt, &t, NULL));
+                                                                                    yylhsminor.yy364 = createRawExprNode(pCxt, &t, createFunctionNode(pCxt, &t, NULL));
                                                                                   }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 236: /* pseudo_column ::= TBNAME */
-{ yylhsminor.yy176 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+      case 242: /* pseudo_column ::= TBNAME */
+{ yylhsminor.yy364 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 242: /* predicate ::= expression compare_op expression */
-      case 247: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==247);
+      case 248: /* predicate ::= expression compare_op expression */
+      case 253: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==253);
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy404, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy328, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364)));
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 243: /* predicate ::= expression BETWEEN expression AND expression */
+      case 249: /* predicate ::= expression BETWEEN expression AND expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy176), releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy364), releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364)));
                                                                                   }
-  yymsp[-4].minor.yy176 = yylhsminor.yy176;
+  yymsp[-4].minor.yy364 = yylhsminor.yy364;
         break;
-      case 244: /* predicate ::= expression NOT BETWEEN expression AND expression */
+      case 250: /* predicate ::= expression NOT BETWEEN expression AND expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[-5].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[-5].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364)));
                                                                                   }
-  yymsp[-5].minor.yy176 = yylhsminor.yy176;
+  yymsp[-5].minor.yy364 = yylhsminor.yy364;
         break;
-      case 245: /* predicate ::= expression IS NULL */
+      case 251: /* predicate ::= expression IS NULL */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), NULL));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), NULL));
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 246: /* predicate ::= expression IS NOT NULL */
+      case 252: /* predicate ::= expression IS NOT NULL */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy176), NULL));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy364), NULL));
                                                                                   }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
-      case 248: /* compare_op ::= NK_LT */
-{ yymsp[0].minor.yy404 = OP_TYPE_LOWER_THAN; }
+      case 254: /* compare_op ::= NK_LT */
+{ yymsp[0].minor.yy328 = OP_TYPE_LOWER_THAN; }
         break;
-      case 249: /* compare_op ::= NK_GT */
-{ yymsp[0].minor.yy404 = OP_TYPE_GREATER_THAN; }
+      case 255: /* compare_op ::= NK_GT */
+{ yymsp[0].minor.yy328 = OP_TYPE_GREATER_THAN; }
         break;
-      case 250: /* compare_op ::= NK_LE */
-{ yymsp[0].minor.yy404 = OP_TYPE_LOWER_EQUAL; }
+      case 256: /* compare_op ::= NK_LE */
+{ yymsp[0].minor.yy328 = OP_TYPE_LOWER_EQUAL; }
         break;
-      case 251: /* compare_op ::= NK_GE */
-{ yymsp[0].minor.yy404 = OP_TYPE_GREATER_EQUAL; }
+      case 257: /* compare_op ::= NK_GE */
+{ yymsp[0].minor.yy328 = OP_TYPE_GREATER_EQUAL; }
         break;
-      case 252: /* compare_op ::= NK_NE */
-{ yymsp[0].minor.yy404 = OP_TYPE_NOT_EQUAL; }
+      case 258: /* compare_op ::= NK_NE */
+{ yymsp[0].minor.yy328 = OP_TYPE_NOT_EQUAL; }
         break;
-      case 253: /* compare_op ::= NK_EQ */
-{ yymsp[0].minor.yy404 = OP_TYPE_EQUAL; }
+      case 259: /* compare_op ::= NK_EQ */
+{ yymsp[0].minor.yy328 = OP_TYPE_EQUAL; }
         break;
-      case 254: /* compare_op ::= LIKE */
-{ yymsp[0].minor.yy404 = OP_TYPE_LIKE; }
+      case 260: /* compare_op ::= LIKE */
+{ yymsp[0].minor.yy328 = OP_TYPE_LIKE; }
         break;
-      case 255: /* compare_op ::= NOT LIKE */
-{ yymsp[-1].minor.yy404 = OP_TYPE_NOT_LIKE; }
+      case 261: /* compare_op ::= NOT LIKE */
+{ yymsp[-1].minor.yy328 = OP_TYPE_NOT_LIKE; }
         break;
-      case 256: /* compare_op ::= MATCH */
-{ yymsp[0].minor.yy404 = OP_TYPE_MATCH; }
+      case 262: /* compare_op ::= MATCH */
+{ yymsp[0].minor.yy328 = OP_TYPE_MATCH; }
         break;
-      case 257: /* compare_op ::= NMATCH */
-{ yymsp[0].minor.yy404 = OP_TYPE_NMATCH; }
+      case 263: /* compare_op ::= NMATCH */
+{ yymsp[0].minor.yy328 = OP_TYPE_NMATCH; }
         break;
-      case 258: /* in_op ::= IN */
-{ yymsp[0].minor.yy404 = OP_TYPE_IN; }
+      case 264: /* in_op ::= IN */
+{ yymsp[0].minor.yy328 = OP_TYPE_IN; }
         break;
-      case 259: /* in_op ::= NOT IN */
-{ yymsp[-1].minor.yy404 = OP_TYPE_NOT_IN; }
+      case 265: /* in_op ::= NOT IN */
+{ yymsp[-1].minor.yy328 = OP_TYPE_NOT_IN; }
         break;
-      case 260: /* in_predicate_value ::= NK_LP expression_list NK_RP */
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy512)); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 266: /* in_predicate_value ::= NK_LP expression_list NK_RP */
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy40)); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 262: /* boolean_value_expression ::= NOT boolean_primary */
+      case 268: /* boolean_value_expression ::= NOT boolean_primary */
 {
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy176), NULL));
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy364), NULL));
                                                                                   }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 263: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+      case 269: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364)));
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 264: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+      case 270: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy176);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), releaseRawExprNode(pCxt, yymsp[0].minor.yy176)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy364);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), releaseRawExprNode(pCxt, yymsp[0].minor.yy364)));
                                                                                   }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 269: /* from_clause ::= FROM table_reference_list */
-      case 299: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==299);
-      case 322: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==322);
-{ yymsp[-1].minor.yy176 = yymsp[0].minor.yy176; }
+      case 275: /* from_clause ::= FROM table_reference_list */
+      case 305: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==305);
+      case 328: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==328);
+{ yymsp[-1].minor.yy364 = yymsp[0].minor.yy364; }
         break;
-      case 271: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
-{ yylhsminor.yy176 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy176, yymsp[0].minor.yy176, NULL); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 277: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+{ yylhsminor.yy364 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy364, yymsp[0].minor.yy364, NULL); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 274: /* table_primary ::= table_name alias_opt */
-{ yylhsminor.yy176 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy225, &yymsp[0].minor.yy225); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+      case 280: /* table_primary ::= table_name alias_opt */
+{ yylhsminor.yy364 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy437, &yymsp[0].minor.yy437); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 275: /* table_primary ::= db_name NK_DOT table_name alias_opt */
-{ yylhsminor.yy176 = createRealTableNode(pCxt, &yymsp[-3].minor.yy225, &yymsp[-1].minor.yy225, &yymsp[0].minor.yy225); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+      case 281: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+{ yylhsminor.yy364 = createRealTableNode(pCxt, &yymsp[-3].minor.yy437, &yymsp[-1].minor.yy437, &yymsp[0].minor.yy437); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
-      case 276: /* table_primary ::= subquery alias_opt */
-{ yylhsminor.yy176 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy176), &yymsp[0].minor.yy225); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+      case 282: /* table_primary ::= subquery alias_opt */
+{ yylhsminor.yy364 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy364), &yymsp[0].minor.yy437); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 278: /* alias_opt ::= */
-{ yymsp[1].minor.yy225 = nil_token;  }
+      case 284: /* alias_opt ::= */
+{ yymsp[1].minor.yy437 = nil_token;  }
         break;
-      case 279: /* alias_opt ::= table_alias */
-{ yylhsminor.yy225 = yymsp[0].minor.yy225; }
-  yymsp[0].minor.yy225 = yylhsminor.yy225;
+      case 285: /* alias_opt ::= table_alias */
+{ yylhsminor.yy437 = yymsp[0].minor.yy437; }
+  yymsp[0].minor.yy437 = yylhsminor.yy437;
         break;
-      case 280: /* alias_opt ::= AS table_alias */
-{ yymsp[-1].minor.yy225 = yymsp[0].minor.yy225; }
+      case 286: /* alias_opt ::= AS table_alias */
+{ yymsp[-1].minor.yy437 = yymsp[0].minor.yy437; }
         break;
-      case 281: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-      case 282: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==282);
-{ yymsp[-2].minor.yy176 = yymsp[-1].minor.yy176; }
+      case 287: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+      case 288: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==288);
+{ yymsp[-2].minor.yy364 = yymsp[-1].minor.yy364; }
         break;
-      case 283: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-{ yylhsminor.yy176 = createJoinTableNode(pCxt, yymsp[-4].minor.yy236, yymsp[-5].minor.yy176, yymsp[-2].minor.yy176, yymsp[0].minor.yy176); }
-  yymsp[-5].minor.yy176 = yylhsminor.yy176;
+      case 289: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+{ yylhsminor.yy364 = createJoinTableNode(pCxt, yymsp[-4].minor.yy392, yymsp[-5].minor.yy364, yymsp[-2].minor.yy364, yymsp[0].minor.yy364); }
+  yymsp[-5].minor.yy364 = yylhsminor.yy364;
         break;
-      case 284: /* join_type ::= */
-{ yymsp[1].minor.yy236 = JOIN_TYPE_INNER; }
+      case 290: /* join_type ::= */
+{ yymsp[1].minor.yy392 = JOIN_TYPE_INNER; }
         break;
-      case 285: /* join_type ::= INNER */
-{ yymsp[0].minor.yy236 = JOIN_TYPE_INNER; }
+      case 291: /* join_type ::= INNER */
+{ yymsp[0].minor.yy392 = JOIN_TYPE_INNER; }
         break;
-      case 286: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+      case 292: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
 { 
-                                                                                    yymsp[-8].minor.yy176 = createSelectStmt(pCxt, yymsp[-7].minor.yy505, yymsp[-6].minor.yy512, yymsp[-5].minor.yy176);
-                                                                                    yymsp[-8].minor.yy176 = addWhereClause(pCxt, yymsp[-8].minor.yy176, yymsp[-4].minor.yy176);
-                                                                                    yymsp[-8].minor.yy176 = addPartitionByClause(pCxt, yymsp[-8].minor.yy176, yymsp[-3].minor.yy512);
-                                                                                    yymsp[-8].minor.yy176 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy176, yymsp[-2].minor.yy176);
-                                                                                    yymsp[-8].minor.yy176 = addGroupByClause(pCxt, yymsp[-8].minor.yy176, yymsp[-1].minor.yy512);
-                                                                                    yymsp[-8].minor.yy176 = addHavingClause(pCxt, yymsp[-8].minor.yy176, yymsp[0].minor.yy176);
+                                                                                    yymsp[-8].minor.yy364 = createSelectStmt(pCxt, yymsp[-7].minor.yy493, yymsp[-6].minor.yy40, yymsp[-5].minor.yy364);
+                                                                                    yymsp[-8].minor.yy364 = addWhereClause(pCxt, yymsp[-8].minor.yy364, yymsp[-4].minor.yy364);
+                                                                                    yymsp[-8].minor.yy364 = addPartitionByClause(pCxt, yymsp[-8].minor.yy364, yymsp[-3].minor.yy40);
+                                                                                    yymsp[-8].minor.yy364 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy364, yymsp[-2].minor.yy364);
+                                                                                    yymsp[-8].minor.yy364 = addGroupByClause(pCxt, yymsp[-8].minor.yy364, yymsp[-1].minor.yy40);
+                                                                                    yymsp[-8].minor.yy364 = addHavingClause(pCxt, yymsp[-8].minor.yy364, yymsp[0].minor.yy364);
                                                                                   }
         break;
-      case 288: /* set_quantifier_opt ::= DISTINCT */
-{ yymsp[0].minor.yy505 = true; }
+      case 295: /* set_quantifier_opt ::= ALL */
+{ yymsp[0].minor.yy493 = false; }
         break;
-      case 289: /* set_quantifier_opt ::= ALL */
-{ yymsp[0].minor.yy505 = false; }
+      case 296: /* select_list ::= NK_STAR */
+{ yymsp[0].minor.yy40 = NULL; }
         break;
-      case 290: /* select_list ::= NK_STAR */
-{ yymsp[0].minor.yy512 = NULL; }
-        break;
-      case 294: /* select_item ::= common_expression */
+      case 300: /* select_item ::= common_expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy176);
-                                                                                    yylhsminor.yy176 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy176), &t);
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy364);
+                                                                                    yylhsminor.yy364 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy364), &t);
                                                                                   }
-  yymsp[0].minor.yy176 = yylhsminor.yy176;
+  yymsp[0].minor.yy364 = yylhsminor.yy364;
         break;
-      case 295: /* select_item ::= common_expression column_alias */
-{ yylhsminor.yy176 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy176), &yymsp[0].minor.yy225); }
-  yymsp[-1].minor.yy176 = yylhsminor.yy176;
+      case 301: /* select_item ::= common_expression column_alias */
+{ yylhsminor.yy364 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy364), &yymsp[0].minor.yy437); }
+  yymsp[-1].minor.yy364 = yylhsminor.yy364;
         break;
-      case 296: /* select_item ::= common_expression AS column_alias */
-{ yylhsminor.yy176 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), &yymsp[0].minor.yy225); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 302: /* select_item ::= common_expression AS column_alias */
+{ yylhsminor.yy364 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), &yymsp[0].minor.yy437); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 297: /* select_item ::= table_name NK_DOT NK_STAR */
-{ yylhsminor.yy176 = createColumnNode(pCxt, &yymsp[-2].minor.yy225, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 303: /* select_item ::= table_name NK_DOT NK_STAR */
+{ yylhsminor.yy364 = createColumnNode(pCxt, &yymsp[-2].minor.yy437, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 301: /* partition_by_clause_opt ::= PARTITION BY expression_list */
-      case 318: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==318);
-      case 328: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==328);
-{ yymsp[-2].minor.yy512 = yymsp[0].minor.yy512; }
+      case 307: /* partition_by_clause_opt ::= PARTITION BY expression_list */
+      case 324: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==324);
+      case 334: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==334);
+{ yymsp[-2].minor.yy40 = yymsp[0].minor.yy40; }
         break;
-      case 303: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-{ yymsp[-5].minor.yy176 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy176), releaseRawExprNode(pCxt, yymsp[-1].minor.yy176)); }
+      case 309: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+{ yymsp[-5].minor.yy364 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy364), releaseRawExprNode(pCxt, yymsp[-1].minor.yy364)); }
         break;
-      case 304: /* twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
-{ yymsp[-3].minor.yy176 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy176)); }
+      case 310: /* twindow_clause_opt ::= STATE_WINDOW NK_LP column_reference NK_RP */
+{ yymsp[-3].minor.yy364 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy364)); }
         break;
-      case 305: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-5].minor.yy176 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy176), NULL, yymsp[-1].minor.yy176, yymsp[0].minor.yy176); }
+      case 311: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-5].minor.yy364 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy364), NULL, yymsp[-1].minor.yy364, yymsp[0].minor.yy364); }
         break;
-      case 306: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-7].minor.yy176 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy176), releaseRawExprNode(pCxt, yymsp[-3].minor.yy176), yymsp[-1].minor.yy176, yymsp[0].minor.yy176); }
+      case 312: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-7].minor.yy364 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy364), releaseRawExprNode(pCxt, yymsp[-3].minor.yy364), yymsp[-1].minor.yy364, yymsp[0].minor.yy364); }
         break;
-      case 308: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-{ yymsp[-3].minor.yy176 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy176); }
+      case 314: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+{ yymsp[-3].minor.yy364 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy364); }
         break;
-      case 310: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
-{ yymsp[-3].minor.yy176 = createFillNode(pCxt, yymsp[-1].minor.yy142, NULL); }
+      case 316: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+{ yymsp[-3].minor.yy364 = createFillNode(pCxt, yymsp[-1].minor.yy478, NULL); }
         break;
-      case 311: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-{ yymsp[-5].minor.yy176 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy512)); }
+      case 317: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+{ yymsp[-5].minor.yy364 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy40)); }
         break;
-      case 312: /* fill_mode ::= NONE */
-{ yymsp[0].minor.yy142 = FILL_MODE_NONE; }
+      case 318: /* fill_mode ::= NONE */
+{ yymsp[0].minor.yy478 = FILL_MODE_NONE; }
         break;
-      case 313: /* fill_mode ::= PREV */
-{ yymsp[0].minor.yy142 = FILL_MODE_PREV; }
+      case 319: /* fill_mode ::= PREV */
+{ yymsp[0].minor.yy478 = FILL_MODE_PREV; }
         break;
-      case 314: /* fill_mode ::= NULL */
-{ yymsp[0].minor.yy142 = FILL_MODE_NULL; }
+      case 320: /* fill_mode ::= NULL */
+{ yymsp[0].minor.yy478 = FILL_MODE_NULL; }
         break;
-      case 315: /* fill_mode ::= LINEAR */
-{ yymsp[0].minor.yy142 = FILL_MODE_LINEAR; }
+      case 321: /* fill_mode ::= LINEAR */
+{ yymsp[0].minor.yy478 = FILL_MODE_LINEAR; }
         break;
-      case 316: /* fill_mode ::= NEXT */
-{ yymsp[0].minor.yy142 = FILL_MODE_NEXT; }
+      case 322: /* fill_mode ::= NEXT */
+{ yymsp[0].minor.yy478 = FILL_MODE_NEXT; }
         break;
-      case 319: /* group_by_list ::= expression */
-{ yylhsminor.yy512 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); }
-  yymsp[0].minor.yy512 = yylhsminor.yy512;
+      case 325: /* group_by_list ::= expression */
+{ yylhsminor.yy40 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); }
+  yymsp[0].minor.yy40 = yylhsminor.yy40;
         break;
-      case 320: /* group_by_list ::= group_by_list NK_COMMA expression */
-{ yylhsminor.yy512 = addNodeToList(pCxt, yymsp[-2].minor.yy512, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy176))); }
-  yymsp[-2].minor.yy512 = yylhsminor.yy512;
+      case 326: /* group_by_list ::= group_by_list NK_COMMA expression */
+{ yylhsminor.yy40 = addNodeToList(pCxt, yymsp[-2].minor.yy40, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy364))); }
+  yymsp[-2].minor.yy40 = yylhsminor.yy40;
         break;
-      case 323: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+      case 329: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
 { 
-                                                                                    yylhsminor.yy176 = addOrderByClause(pCxt, yymsp[-3].minor.yy176, yymsp[-2].minor.yy512);
-                                                                                    yylhsminor.yy176 = addSlimitClause(pCxt, yylhsminor.yy176, yymsp[-1].minor.yy176);
-                                                                                    yylhsminor.yy176 = addLimitClause(pCxt, yylhsminor.yy176, yymsp[0].minor.yy176);
+                                                                                    yylhsminor.yy364 = addOrderByClause(pCxt, yymsp[-3].minor.yy364, yymsp[-2].minor.yy40);
+                                                                                    yylhsminor.yy364 = addSlimitClause(pCxt, yylhsminor.yy364, yymsp[-1].minor.yy364);
+                                                                                    yylhsminor.yy364 = addLimitClause(pCxt, yylhsminor.yy364, yymsp[0].minor.yy364);
                                                                                   }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
-      case 325: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-{ yylhsminor.yy176 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy176, yymsp[0].minor.yy176); }
-  yymsp[-3].minor.yy176 = yylhsminor.yy176;
+      case 331: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+{ yylhsminor.yy364 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy364, yymsp[0].minor.yy364); }
+  yymsp[-3].minor.yy364 = yylhsminor.yy364;
         break;
-      case 330: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
-      case 334: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==334);
-{ yymsp[-1].minor.yy176 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+      case 336: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+      case 340: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==340);
+{ yymsp[-1].minor.yy364 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
         break;
-      case 331: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-      case 335: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==335);
-{ yymsp[-3].minor.yy176 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+      case 337: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+      case 341: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==341);
+{ yymsp[-3].minor.yy364 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 332: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-      case 336: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==336);
-{ yymsp[-3].minor.yy176 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+      case 338: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+      case 342: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==342);
+{ yymsp[-3].minor.yy364 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
         break;
-      case 337: /* subquery ::= NK_LP query_expression NK_RP */
-{ yylhsminor.yy176 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy176); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 343: /* subquery ::= NK_LP query_expression NK_RP */
+{ yylhsminor.yy364 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy364); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 341: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-{ yylhsminor.yy176 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy176), yymsp[-1].minor.yy106, yymsp[0].minor.yy465); }
-  yymsp[-2].minor.yy176 = yylhsminor.yy176;
+      case 347: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+{ yylhsminor.yy364 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy364), yymsp[-1].minor.yy210, yymsp[0].minor.yy177); }
+  yymsp[-2].minor.yy364 = yylhsminor.yy364;
         break;
-      case 342: /* ordering_specification_opt ::= */
-{ yymsp[1].minor.yy106 = ORDER_ASC; }
+      case 348: /* ordering_specification_opt ::= */
+{ yymsp[1].minor.yy210 = ORDER_ASC; }
         break;
-      case 343: /* ordering_specification_opt ::= ASC */
-{ yymsp[0].minor.yy106 = ORDER_ASC; }
+      case 349: /* ordering_specification_opt ::= ASC */
+{ yymsp[0].minor.yy210 = ORDER_ASC; }
         break;
-      case 344: /* ordering_specification_opt ::= DESC */
-{ yymsp[0].minor.yy106 = ORDER_DESC; }
+      case 350: /* ordering_specification_opt ::= DESC */
+{ yymsp[0].minor.yy210 = ORDER_DESC; }
         break;
-      case 345: /* null_ordering_opt ::= */
-{ yymsp[1].minor.yy465 = NULL_ORDER_DEFAULT; }
+      case 351: /* null_ordering_opt ::= */
+{ yymsp[1].minor.yy177 = NULL_ORDER_DEFAULT; }
         break;
-      case 346: /* null_ordering_opt ::= NULLS FIRST */
-{ yymsp[-1].minor.yy465 = NULL_ORDER_FIRST; }
+      case 352: /* null_ordering_opt ::= NULLS FIRST */
+{ yymsp[-1].minor.yy177 = NULL_ORDER_FIRST; }
         break;
-      case 347: /* null_ordering_opt ::= NULLS LAST */
-{ yymsp[-1].minor.yy465 = NULL_ORDER_LAST; }
+      case 353: /* null_ordering_opt ::= NULLS LAST */
+{ yymsp[-1].minor.yy177 = NULL_ORDER_LAST; }
         break;
       default:
         break;
diff --git a/source/libs/parser/test/parserAstTest.cpp b/source/libs/parser/test/parserAstTest.cpp
index 87f20e8d25..6dc3b53ae3 100644
--- a/source/libs/parser/test/parserAstTest.cpp
+++ b/source/libs/parser/test/parserAstTest.cpp
@@ -647,3 +647,16 @@ TEST_F(ParserTest, dropTopic) {
   bind("drop topic if exists tp1");
   ASSERT_TRUE(run());
 }
+
+TEST_F(ParserTest, explain) {
+  setDatabase("root", "test");
+
+  bind("explain SELECT * FROM t1");
+  ASSERT_TRUE(run());
+
+  bind("explain analyze SELECT * FROM t1");
+  ASSERT_TRUE(run());
+
+  bind("explain analyze verbose true ratio 0.01 SELECT * FROM t1");
+  ASSERT_TRUE(run());
+}
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index c0d7ff238e..7f6d8826e6 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -197,6 +197,7 @@ static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
   strcpy(pScan->tableName.dbname, pRealTable->table.dbName);
   strcpy(pScan->tableName.tname, pRealTable->table.tableName);
   pScan->showRewrite = pCxt->pPlanCxt->showRewrite;
+  pScan->ratio = pRealTable->ratio;
 
   // set columns to scan
   SNodeList* pCols = NULL;
@@ -704,6 +705,8 @@ static int32_t createQueryLogicNode(SLogicPlanContext* pCxt, SNode* pStmt, SLogi
       return createSelectLogicNode(pCxt, (SSelectStmt*)pStmt, pLogicNode);
     case QUERY_NODE_VNODE_MODIF_STMT:
       return createVnodeModifLogicNode(pCxt, (SVnodeModifOpStmt*)pStmt, pLogicNode);
+    case QUERY_NODE_EXPLAIN_STMT:
+      return createQueryLogicNode(pCxt, ((SExplainStmt*)pStmt)->pQuery, pLogicNode);
     default:
       break;
   }
diff --git a/source/libs/planner/src/planPhysiCreater.c b/source/libs/planner/src/planPhysiCreater.c
index d5e35fa594..9ef1c01cd1 100644
--- a/source/libs/planner/src/planPhysiCreater.c
+++ b/source/libs/planner/src/planPhysiCreater.c
@@ -398,6 +398,7 @@ static int32_t createTableScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSubp
 
   pTableScan->scanFlag = pScanLogicNode->scanFlag;
   pTableScan->scanRange = pScanLogicNode->scanRange;
+  pTableScan->ratio = pScanLogicNode->ratio;
   vgroupInfoToNodeAddr(pScanLogicNode->pVgroupList->vgroups, &pSubplan->execNode);
   taosArrayPush(pCxt->pExecNodeList, &pSubplan->execNode);
   pSubplan->execNodeStat.tableNum = pScanLogicNode->pVgroupList->vgroups[0].numOfTable;
@@ -1095,6 +1096,16 @@ static void destoryPhysiPlanContext(SPhysiPlanContext* pCxt) {
   taosArrayDestroyEx(pCxt->pLocationHelper, destoryLocationHash);
 }
 
+static void setExplainInfo(SPlanContext* pCxt, SQueryPlan* pPlan) {
+  if (QUERY_NODE_EXPLAIN_STMT == nodeType(pCxt->pAstRoot)) {
+    SExplainStmt* pStmt = (SExplainStmt*)pCxt->pAstRoot;
+    pPlan->explainInfo.mode = pStmt->analyze ? EXPLAIN_MODE_ANALYZE : EXPLAIN_MODE_STATIC;
+    pPlan->explainInfo.verbose = pStmt->pOptions->verbose;
+  } else {
+    pPlan->explainInfo.mode = EXPLAIN_MODE_DISABLE;
+  }
+}
+
 int32_t createPhysiPlan(SPlanContext* pCxt, SQueryLogicPlan* pLogicPlan, SQueryPlan** pPlan, SArray* pExecNodeList) {
   SPhysiPlanContext cxt = {
     .pPlanCxt = pCxt,
@@ -1106,7 +1117,12 @@ int32_t createPhysiPlan(SPlanContext* pCxt, SQueryLogicPlan* pLogicPlan, SQueryP
   if (NULL == cxt.pLocationHelper) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
+
   int32_t code = doCreatePhysiPlan(&cxt, pLogicPlan, pPlan);
+  if (TSDB_CODE_SUCCESS == code) {
+    setExplainInfo(pCxt, *pPlan);
+  }
+
   destoryPhysiPlanContext(&cxt);
   return code;
 }
diff --git a/source/libs/planner/test/plannerTest.cpp b/source/libs/planner/test/plannerTest.cpp
index 7b706242e5..d19d88f455 100644
--- a/source/libs/planner/test/plannerTest.cpp
+++ b/source/libs/planner/test/plannerTest.cpp
@@ -282,3 +282,16 @@ TEST_F(PlannerTest, createSmaIndex) {
   bind("create sma index index1 on t1 function(max(c1), min(c3 + 10), sum(c4)) INTERVAL(10s)");
   ASSERT_TRUE(run());
 }
+
+TEST_F(PlannerTest, explain) {
+  setDatabase("root", "test");
+
+  bind("explain SELECT * FROM t1");
+  ASSERT_TRUE(run());
+
+  bind("explain analyze SELECT * FROM t1");
+  ASSERT_TRUE(run());
+
+  bind("explain analyze verbose true ratio 0.01 SELECT * FROM t1");
+  ASSERT_TRUE(run());
+}
diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c
index 34159a1355..42d10a2361 100644
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
@@ -959,7 +959,7 @@ int32_t qwProcessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg, int8_t taskType) {
     QW_ERR_JRET(code);
   }
   
-  code = qCreateExecTask(qwMsg->node, mgmt->nodeId, tId, plan, &pTaskInfo, &sinkHandle);
+  code = qCreateExecTask(qwMsg->node, mgmt->nodeId, tId, plan, &pTaskInfo, &sinkHandle, OPTR_EXEC_MODEL_BATCH);
   if (code) {
     QW_TASK_ELOG("qCreateExecTask failed, code:%x - %s", code, tstrerror(code));
     QW_ERR_JRET(code);
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index 7b2cb9ca67..1cc259d4da 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -288,7 +288,7 @@ _return:
   SCL_RET(code);
 }
 
-int32_t sclExecFuncion(SFunctionNode *node, SScalarCtx *ctx, SScalarParam *output) {
+int32_t sclExecFunction(SFunctionNode *node, SScalarCtx *ctx, SScalarParam *output) {
   if (NULL == node->pParameterList || node->pParameterList->length <= 0) {
     sclError("invalid function parameter list, list:%p, paramNum:%d", node->pParameterList, node->pParameterList ? node->pParameterList->length : 0);
     SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
@@ -420,7 +420,7 @@ EDealRes sclRewriteFunction(SNode** pNode, SScalarCtx *ctx) {
   SFunctionNode *node = (SFunctionNode *)*pNode;
   SScalarParam output = {0};
   
-  ctx->code = sclExecFuncion(node, ctx, &output);
+  ctx->code = sclExecFunction(node, ctx, &output);
   if (ctx->code) {
     return DEAL_RES_ERROR;
   }
@@ -547,7 +547,7 @@ EDealRes sclWalkFunction(SNode* pNode, SScalarCtx *ctx) {
   SFunctionNode *node = (SFunctionNode *)pNode;
   SScalarParam output = {0};
   
-  ctx->code = sclExecFuncion(node, ctx, &output);
+  ctx->code = sclExecFunction(node, ctx, &output);
   if (ctx->code) {
     return DEAL_RES_ERROR;
   }
@@ -667,7 +667,7 @@ int32_t scalarCalculateConstants(SNode *pNode, SNode **pRes) {
 
   int32_t code = 0;
   SScalarCtx ctx = {0};
-  ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
+  ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
   if (NULL == ctx.pRes) {
     sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
     SCL_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
@@ -689,7 +689,7 @@ int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) {
 
   int32_t code = 0;
   SScalarCtx ctx = {.code = 0, .pBlockList = pBlockList};
-  
+  // TODO: OPT performance
   ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
   if (NULL == ctx.pRes) {
     sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
@@ -716,6 +716,3 @@ _return:
   sclFreeRes(ctx.pRes);
   return code;
 }
-
-
-
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index db0aa21f42..d8e97e7e12 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -377,3 +377,34 @@ static void reverseCopy(char* dest, const char* src, int16_t type, int32_t numOf
   }
 }
 
+bool getTimePseudoFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
+  pEnv->calcMemSize = sizeof(int64_t);
+  return true;
+}
+
+int32_t qStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  ASSERT(inputNum == 1);
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 0));
+}
+
+int32_t qEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  ASSERT(inputNum == 1);
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 1));
+}
+
+int32_t winDurFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  ASSERT(inputNum == 1);
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 2));
+}
+
+int32_t winStartTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  ASSERT(inputNum == 1);
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t*) colDataGetData(pInput->columnData, 3));
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t winEndTsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  ASSERT(inputNum == 1);
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t*) colDataGetData(pInput->columnData, 4));
+  return TSDB_CODE_SUCCESS;
+}
\ No newline at end of file
diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
index b133e1fcbc..fc27e88cf1 100644
--- a/source/libs/tdb/src/db/tdbBtree.c
+++ b/source/libs/tdb/src/db/tdbBtree.c
@@ -18,12 +18,6 @@
 #define TDB_BTREE_ROOT 0x1
 #define TDB_BTREE_LEAF 0x2
 
-#define TDB_BTREE_PAGE_IS_ROOT(flags) TDB_FLAG_HAS(flags, TDB_BTREE_ROOT)
-#define TDB_BTREE_PAGE_IS_LEAF(flags) TDB_FLAG_HAS(flags, TDB_BTREE_LEAF)
-#define TDB_BTREE_ASSERT_FLAG(flags)                                                 \
-  ASSERT(TDB_FLAG_IS(flags, TDB_BTREE_ROOT) || TDB_FLAG_IS(flags, TDB_BTREE_LEAF) || \
-         TDB_FLAG_IS(flags, TDB_BTREE_ROOT | TDB_BTREE_LEAF) || TDB_FLAG_IS(flags, 0))
-
 struct SBTree {
   SPgno          root;
   int            keyLen;
@@ -40,8 +34,13 @@ struct SBTree {
 
 #define TDB_BTREE_PAGE_COMMON_HDR u8 flags;
 
-#define TDB_BTREE_PAGE_GET_FLAGS(PAGE)        (PAGE)->pData[0]
+#define TDB_BTREE_PAGE_GET_FLAGS(PAGE) (PAGE)->pData[0]
 #define TDB_BTREE_PAGE_SET_FLAGS(PAGE, flags) ((PAGE)->pData[0] = (flags))
+#define TDB_BTREE_PAGE_IS_ROOT(PAGE) (TDB_BTREE_PAGE_GET_FLAGS(PAGE) & TDB_BTREE_ROOT)
+#define TDB_BTREE_PAGE_IS_LEAF(PAGE) (TDB_BTREE_PAGE_GET_FLAGS(PAGE) & TDB_BTREE_LEAF)
+#define TDB_BTREE_ASSERT_FLAG(flags)                                                 \
+  ASSERT(TDB_FLAG_IS(flags, TDB_BTREE_ROOT) || TDB_FLAG_IS(flags, TDB_BTREE_LEAF) || \
+         TDB_FLAG_IS(flags, TDB_BTREE_ROOT | TDB_BTREE_LEAF) || TDB_FLAG_IS(flags, 0))
 
 typedef struct __attribute__((__packed__)) {
   TDB_BTREE_PAGE_COMMON_HDR
@@ -58,15 +57,15 @@ typedef struct {
 } SBtreeInitPageArg;
 
 typedef struct {
-  int   kLen;
-  u8   *pKey;
-  int   vLen;
-  u8   *pVal;
-  SPgno pgno;
-  u8   *pTmpSpace;
+  int       kLen;
+  const u8 *pKey;
+  int       vLen;
+  const u8 *pVal;
+  SPgno     pgno;
+  u8       *pBuf;
 } SCellDecoder;
 
-static int tdbBtCursorMoveTo(SBTC *pBtc, const void *pKey, int kLen, int *pCRst);
+static int tdbBtcMoveTo(SBTC *pBtc, const void *pKey, int kLen, int *pCRst);
 static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2);
 static int tdbBtreeOpenImpl(SBTree *pBt);
 static int tdbBtreeZeroPage(SPage *pPage, void *arg);
@@ -77,7 +76,7 @@ static int tdbBtreeDecodeCell(SPage *pPage, const SCell *pCell, SCellDecoder *pD
 static int tdbBtreeBalance(SBTC *pBtc);
 static int tdbBtreeCellSize(const SPage *pPage, SCell *pCell);
 static int tdbBtcMoveToNext(SBTC *pBtc);
-static int tdbBtcMoveDownward(SBTC *pBtc, SPgno pgno);
+static int tdbBtcMoveDownward(SBTC *pBtc);
 static int tdbBtcMoveUpward(SBTC *pBtc);
 
 int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, SBTree **ppBt) {
@@ -94,9 +93,9 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, S
   }
 
   // pBt->keyLen
-  pBt->keyLen = keyLen;
+  pBt->keyLen = keyLen < 0 ? TDB_VARIANT_LEN : keyLen;
   // pBt->valLen
-  pBt->valLen = valLen;
+  pBt->valLen = valLen < 0 ? TDB_VARIANT_LEN : valLen;
   // pBt->pPager
   pBt->pPager = pPager;
   // pBt->kcmpr
@@ -137,7 +136,7 @@ int tdbBtCursorInsert(SBTC *pBtc, const void *pKey, int kLen, const void *pVal,
   int     cret;
   SBTree *pBt;
 
-  ret = tdbBtCursorMoveTo(pBtc, pKey, kLen, &cret);
+  ret = tdbBtcMoveTo(pBtc, pKey, kLen, &cret);
   if (ret < 0) {
     // TODO: handle error
     return -1;
@@ -200,7 +199,7 @@ int tdbBtreeGet(SBTree *pBt, const void *pKey, int kLen, void **ppVal, int *vLen
 
   tdbBtcOpen(&btc, pBt);
 
-  tdbBtCursorMoveTo(&btc, pKey, kLen, &cret);
+  tdbBtcMoveTo(&btc, pKey, kLen, &cret);
 
   if (cret) {
     return cret;
@@ -230,7 +229,7 @@ int tdbBtreePGet(SBTree *pBt, const void *pKey, int kLen, void **ppKey, int *pkL
 
   tdbBtcOpen(&btc, pBt);
 
-  tdbBtCursorMoveTo(&btc, pKey, kLen, &cret);
+  tdbBtcMoveTo(&btc, pKey, kLen, &cret);
   if (cret) {
     return cret;
   }
@@ -257,106 +256,6 @@ int tdbBtreePGet(SBTree *pBt, const void *pKey, int kLen, void **ppKey, int *pkL
   return 0;
 }
 
-static int tdbBtCursorMoveTo(SBTC *pBtc, const void *pKey, int kLen, int *pCRst) {
-  int     ret;
-  SBTree *pBt;
-  SPager *pPager;
-
-  pBt = pBtc->pBt;
-  pPager = pBt->pPager;
-
-  if (pBtc->iPage < 0) {
-    ASSERT(pBtc->iPage == -1);
-    ASSERT(pBtc->idx == -1);
-
-    // Move from the root
-    ret = tdbPagerFetchPage(pPager, pBt->root, &(pBtc->pPage), tdbBtreeInitPage, pBt);
-    if (ret < 0) {
-      ASSERT(0);
-      return -1;
-    }
-
-    pBtc->iPage = 0;
-
-    if (TDB_PAGE_TOTAL_CELLS(pBtc->pPage) == 0) {
-      // Current page is empty
-      // ASSERT(TDB_FLAG_IS(TDB_PAGE_FLAGS(pBtc->pPage), TDB_BTREE_ROOT | TDB_BTREE_LEAF));
-      return 0;
-    }
-
-    for (;;) {
-      int          lidx, ridx, midx, c, nCells;
-      SCell       *pCell;
-      SPage       *pPage;
-      SCellDecoder cd = {0};
-
-      pPage = pBtc->pPage;
-      nCells = TDB_PAGE_TOTAL_CELLS(pPage);
-      lidx = 0;
-      ridx = nCells - 1;
-
-      ASSERT(nCells > 0);
-
-      for (;;) {
-        if (lidx > ridx) break;
-
-        midx = (lidx + ridx) >> 1;
-
-        pCell = tdbPageGetCell(pPage, midx);
-        ret = tdbBtreeDecodeCell(pPage, pCell, &cd);
-        if (ret < 0) {
-          // TODO: handle error
-          ASSERT(0);
-          return -1;
-        }
-
-        // Compare the key values
-        c = pBt->kcmpr(pKey, kLen, cd.pKey, cd.kLen);
-        if (c < 0) {
-          /* input-key < cell-key */
-          ridx = midx - 1;
-        } else if (c > 0) {
-          /* input-key > cell-key */
-          lidx = midx + 1;
-        } else {
-          /* input-key == cell-key */
-          break;
-        }
-      }
-
-      // Move downward or break
-      u8 flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-      u8 leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
-      if (leaf) {
-        pBtc->idx = midx;
-        *pCRst = c;
-        break;
-      } else {
-        if (c <= 0) {
-          pBtc->idx = midx;
-          tdbBtcMoveDownward(pBtc, cd.pgno);
-        } else {
-          pBtc->idx = midx + 1;
-          if (midx == nCells - 1) {
-            /* Move to right-most child */
-            tdbBtcMoveDownward(pBtc, ((SIntHdr *)pBtc->pPage->pData)->pgno);
-          } else {
-            pCell = tdbPageGetCell(pPage, pBtc->idx);
-            tdbBtreeDecodeCell(pPage, pCell, &cd);
-            tdbBtcMoveDownward(pBtc, cd.pgno);
-          }
-        }
-      }
-    }
-
-  } else {
-    // TODO: Move the cursor from a some position instead of a clear state
-    ASSERT(0);
-  }
-
-  return 0;
-}
-
 static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2) {
   int mlen;
   int cret;
@@ -416,7 +315,7 @@ static int tdbBtreeInitPage(SPage *pPage, void *arg) {
 
   pBt = (SBTree *)arg;
   flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-  isLeaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  isLeaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
 
   ASSERT(flags == TDB_BTREE_PAGE_GET_FLAGS(pPage));
 
@@ -442,15 +341,15 @@ static int tdbBtreeInitPage(SPage *pPage, void *arg) {
 static int tdbBtreeZeroPage(SPage *pPage, void *arg) {
   u8      flags;
   SBTree *pBt;
-  u8      isLeaf;
+  u8      leaf;
 
   flags = ((SBtreeInitPageArg *)arg)->flags;
   pBt = ((SBtreeInitPageArg *)arg)->pBt;
-  isLeaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  leaf = flags & TDB_BTREE_LEAF;
 
-  tdbPageZero(pPage, isLeaf ? sizeof(SLeafHdr) : sizeof(SIntHdr), tdbBtreeCellSize);
+  tdbPageZero(pPage, leaf ? sizeof(SLeafHdr) : sizeof(SIntHdr), tdbBtreeCellSize);
 
-  if (isLeaf) {
+  if (leaf) {
     SLeafHdr *pLeafHdr = (SLeafHdr *)(pPage->pData);
     pLeafHdr->flags = flags;
 
@@ -495,7 +394,7 @@ static int tdbBtreeBalanceDeeper(SBTree *pBt, SPage *pRoot, SPage **ppChild) {
 
   pPager = pRoot->pPager;
   flags = TDB_BTREE_PAGE_GET_FLAGS(pRoot);
-  leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  leaf = TDB_BTREE_PAGE_IS_LEAF(pRoot);
 
   // Allocate a new child page
   zArg.flags = TDB_FLAG_REMOVE(flags, TDB_BTREE_ROOT);
@@ -561,7 +460,7 @@ static int tdbBtreeBalanceNonRoot(SBTree *pBt, SPage *pParent, int idx) {
 
       SPgno pgno;
       if (sIdx + i == nCells) {
-        ASSERT(!TDB_BTREE_PAGE_IS_LEAF(TDB_BTREE_PAGE_GET_FLAGS(pParent)));
+        ASSERT(!TDB_BTREE_PAGE_IS_LEAF(pParent));
         pgno = ((SIntHdr *)(pParent->pData))->pgno;
       } else {
         pCell = tdbPageGetCell(pParent, sIdx + i);
@@ -575,7 +474,7 @@ static int tdbBtreeBalanceNonRoot(SBTree *pBt, SPage *pParent, int idx) {
       }
     }
     // copy the parent key out if child pages are not leaf page
-    childNotLeaf = !TDB_BTREE_PAGE_IS_LEAF(TDB_BTREE_PAGE_GET_FLAGS(pOlds[0]));
+    childNotLeaf = !TDB_BTREE_PAGE_IS_LEAF(pOlds[0]);
     if (childNotLeaf) {
       for (int i = 0; i < nOlds; i++) {
         if (sIdx + i < TDB_PAGE_TOTAL_CELLS(pParent)) {
@@ -849,9 +748,8 @@ static int tdbBtreeBalance(SBTC *pBtc) {
   for (;;) {
     iPage = pBtc->iPage;
     pPage = pBtc->pPage;
-    flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-    leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
-    root = TDB_BTREE_PAGE_IS_ROOT(flags);
+    leaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
+    root = TDB_BTREE_PAGE_IS_ROOT(pPage);
 
     // when the page is not overflow and not too empty, the balance work
     // is finished. Just break out the balance loop.
@@ -892,23 +790,17 @@ static int tdbBtreeBalance(SBTC *pBtc) {
 }
 #endif
 
-#ifndef TDB_BTREE_CELL  // =========================================================
-static int tdbBtreeEncodePayload(SPage *pPage, u8 *pPayload, const void *pKey, int kLen, const void *pVal, int vLen,
-                                 int *szPayload) {
+// TDB_BTREE_CELL =====================
+static int tdbBtreeEncodePayload(SPage *pPage, SCell *pCell, int nHeader, const void *pKey, int kLen, const void *pVal,
+                                 int vLen, int *szPayload) {
   int nPayload;
 
-  ASSERT(pKey != NULL);
-
-  if (pVal == NULL) {
-    vLen = 0;
-  }
-
   nPayload = kLen + vLen;
-  if (nPayload <= pPage->maxLocal) {
-    // General case without overflow
-    memcpy(pPayload, pKey, kLen);
+  if (nPayload + nHeader <= pPage->maxLocal) {
+    // no overflow page is needed
+    memcpy(pCell + nHeader, pKey, kLen);
     if (pVal) {
-      memcpy(pPayload + kLen, pVal, vLen);
+      memcpy(pCell + nHeader + kLen, pVal, vLen);
     }
 
     *szPayload = nPayload;
@@ -923,10 +815,8 @@ static int tdbBtreeEncodePayload(SPage *pPage, u8 *pPayload, const void *pKey, i
   return 0;
 }
 
-// TODO: allow vLen = 0
 static int tdbBtreeEncodeCell(SPage *pPage, const void *pKey, int kLen, const void *pVal, int vLen, SCell *pCell,
                               int *szCell) {
-  u8  flags;
   u8  leaf;
   int nHeader;
   int nPayload;
@@ -934,11 +824,11 @@ static int tdbBtreeEncodeCell(SPage *pPage, const void *pKey, int kLen, const vo
 
   ASSERT(pPage->kLen == TDB_VARIANT_LEN || pPage->kLen == kLen);
   ASSERT(pPage->vLen == TDB_VARIANT_LEN || pPage->vLen == vLen);
+  ASSERT(pKey != NULL && kLen > 0);
 
   nPayload = 0;
   nHeader = 0;
-  flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-  leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  leaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
 
   // 1. Encode Header part
   /* Encode SPgno if interior page */
@@ -960,38 +850,42 @@ static int tdbBtreeEncodeCell(SPage *pPage, const void *pKey, int kLen, const vo
   }
 
   // 2. Encode payload part
-  if (leaf && vLen > 0) {
-    ret = tdbBtreeEncodePayload(pPage, pCell + nHeader, pKey, kLen, pVal, vLen, &nPayload);
-  } else {
-    ret = tdbBtreeEncodePayload(pPage, pCell + nHeader, pKey, kLen, NULL, 0, &nPayload);
+  if ((!leaf) || pPage->vLen == 0) {
+    pVal = NULL;
+    vLen = 0;
   }
+
+  ret = tdbBtreeEncodePayload(pPage, pCell, nHeader, pKey, kLen, pVal, vLen, &nPayload);
   if (ret < 0) {
-    // TODO: handle error
-    return -1;
+    // TODO
+    ASSERT(0);
+    return 0;
   }
 
   *szCell = nHeader + nPayload;
   return 0;
 }
 
-static int tdbBtreeDecodePayload(SPage *pPage, const u8 *pPayload, SCellDecoder *pDecoder) {
+static int tdbBtreeDecodePayload(SPage *pPage, const SCell *pCell, int nHeader, SCellDecoder *pDecoder) {
   int nPayload;
 
-  ASSERT(pDecoder->pKey == NULL);
-
   if (pDecoder->pVal) {
-    nPayload = pDecoder->kLen + pDecoder->vLen;
-  } else {
+    ASSERT(!TDB_BTREE_PAGE_IS_LEAF(pPage));
     nPayload = pDecoder->kLen;
+  } else {
+    nPayload = pDecoder->kLen + pDecoder->vLen;
   }
 
-  if (nPayload <= pPage->maxLocal) {
-    // General case without overflow
-    pDecoder->pKey = (void *)pPayload;
-    if (!pDecoder->pVal) {
-      pDecoder->pVal = (void *)(pPayload + pDecoder->kLen);
+  if (nHeader + nPayload <= pPage->maxLocal) {
+    // no over flow case
+    pDecoder->pKey = pCell + nHeader;
+    if (pDecoder->pVal == NULL && pDecoder->vLen > 0) {
+      pDecoder->pVal = pCell + nHeader + pDecoder->kLen;
     }
-  } else {
+    return 0;
+  }
+
+  {
     // TODO: handle overflow case
     ASSERT(0);
   }
@@ -999,16 +893,13 @@ static int tdbBtreeDecodePayload(SPage *pPage, const u8 *pPayload, SCellDecoder
   return 0;
 }
 
-// TODO: here has problem
 static int tdbBtreeDecodeCell(SPage *pPage, const SCell *pCell, SCellDecoder *pDecoder) {
-  u8  flags;
   u8  leaf;
   int nHeader;
   int ret;
 
   nHeader = 0;
-  flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-  leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  leaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
 
   // Clear the state of decoder
   pDecoder->kLen = -1;
@@ -1033,13 +924,14 @@ static int tdbBtreeDecodeCell(SPage *pPage, const SCell *pCell, SCellDecoder *pD
   }
 
   if (pPage->vLen == TDB_VARIANT_LEN) {
+    ASSERT(leaf);
     nHeader += tdbGetVarInt(pCell + nHeader, &(pDecoder->vLen));
   } else {
     pDecoder->vLen = pPage->vLen;
   }
 
   // 2. Decode payload part
-  ret = tdbBtreeDecodePayload(pPage, pCell + nHeader, pDecoder);
+  ret = tdbBtreeDecodePayload(pPage, pCell, nHeader, pDecoder);
   if (ret < 0) {
     return -1;
   }
@@ -1048,16 +940,14 @@ static int tdbBtreeDecodeCell(SPage *pPage, const SCell *pCell, SCellDecoder *pD
 }
 
 static int tdbBtreeCellSize(const SPage *pPage, SCell *pCell) {
-  u8  flags;
-  u8  isLeaf;
+  u8  leaf;
   int szCell;
   int kLen = 0, vLen = 0;
 
-  flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-  isLeaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  leaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
   szCell = 0;
 
-  if (!isLeaf) {
+  if (!leaf) {
     szCell += sizeof(SPgno);
   }
 
@@ -1067,21 +957,28 @@ static int tdbBtreeCellSize(const SPage *pPage, SCell *pCell) {
     kLen = pPage->kLen;
   }
 
-  if (isLeaf) {
-    if (pPage->vLen == TDB_VARIANT_LEN) {
-      szCell += tdbGetVarInt(pCell + szCell, &vLen);
-    } else {
-      vLen = pPage->vLen;
-    }
+  if (pPage->vLen == TDB_VARIANT_LEN) {
+    ASSERT(leaf);
+    szCell += tdbGetVarInt(pCell + szCell, &vLen);
+  } else if (leaf) {
+    vLen = pPage->vLen;
   }
 
   szCell = szCell + kLen + vLen;
 
-  return szCell;
+  if (szCell <= pPage->maxLocal) {
+    return szCell;
+  }
+
+  {
+    // TODO
+    ASSERT(0);
+    return 0;
+  }
 }
+// TDB_BTREE_CELL
 
-#endif
-
+// TDB_BTREE_CURSOR =====================
 int tdbBtcOpen(SBTC *pBtc, SBTree *pBt) {
   pBtc->pBt = pBt;
   pBtc->iPage = -1;
@@ -1095,7 +992,6 @@ int tdbBtcMoveToFirst(SBTC *pBtc) {
   int     ret;
   SBTree *pBt;
   SPager *pPager;
-  u8      flags;
   SCell  *pCell;
   SPgno   pgno;
 
@@ -1110,23 +1006,43 @@ int tdbBtcMoveToFirst(SBTC *pBtc) {
       return -1;
     }
 
+    ASSERT(TDB_BTREE_PAGE_IS_ROOT(pBtc->pPage));
+
     pBtc->iPage = 0;
-    pBtc->idx = 0;
+    if (TDB_PAGE_TOTAL_CELLS(pBtc->pPage) > 0) {
+      pBtc->idx = 0;
+    } else {
+      // no any data, point to an invalid position
+      ASSERT(TDB_BTREE_PAGE_IS_LEAF(pBtc->pPage));
+      pBtc->idx = -1;
+      return 0;
+    }
   } else {
     // move from a position
-    ASSERT(0);
+    int iPage = 0;
+
+    for (; iPage < pBtc->iPage; iPage++) {
+      ASSERT(pBtc->idxStack[iPage] >= 0);
+      if (pBtc->idxStack[iPage]) break;
+    }
+
+    // move upward
+    for (;;) {
+      if (pBtc->iPage == 0) {
+        pBtc->idx = 0;
+        break;
+      }
+
+      if (pBtc->iPage < iPage) break;
+      tdbBtcMoveUpward(pBtc);
+    }
   }
 
   // move downward
   for (;;) {
-    flags = TDB_BTREE_PAGE_GET_FLAGS(pBtc->pPage);
+    if (TDB_BTREE_PAGE_IS_LEAF(pBtc->pPage)) break;
 
-    if (TDB_BTREE_PAGE_IS_LEAF(flags)) break;
-
-    pCell = tdbPageGetCell(pBtc->pPage, 0);
-    pgno = *(SPgno *)pCell;
-
-    ret = tdbBtcMoveDownward(pBtc, pgno);
+    ret = tdbBtcMoveDownward(pBtc);
     if (ret < 0) {
       ASSERT(0);
       return -1;
@@ -1142,7 +1058,6 @@ int tdbBtcMoveToLast(SBTC *pBtc) {
   int     ret;
   SBTree *pBt;
   SPager *pPager;
-  u8      flags;
   SPgno   pgno;
 
   pBt = pBtc->pBt;
@@ -1164,18 +1079,15 @@ int tdbBtcMoveToLast(SBTC *pBtc) {
 
   // move downward
   for (;;) {
-    flags = TDB_BTREE_PAGE_GET_FLAGS(pBtc->pPage);
-
-    if (TDB_BTREE_PAGE_IS_LEAF(flags)) {
+    if (TDB_BTREE_PAGE_IS_LEAF(pBtc->pPage)) {
       // TODO: handle empty case
       ASSERT(TDB_PAGE_TOTAL_CELLS(pBtc->pPage) > 0);
       pBtc->idx = TDB_PAGE_TOTAL_CELLS(pBtc->pPage) - 1;
       break;
     } else {
       pBtc->idx = TDB_PAGE_TOTAL_CELLS(pBtc->pPage);
-      pgno = ((SIntHdr *)pBtc->pPage->pData)->pgno;
 
-      ret = tdbBtcMoveDownward(pBtc, pgno);
+      ret = tdbBtcMoveDownward(pBtc);
       if (ret < 0) {
         ASSERT(0);
         return -1;
@@ -1186,11 +1098,6 @@ int tdbBtcMoveToLast(SBTC *pBtc) {
   return 0;
 }
 
-int tdbBtcMoveTo(SBTC *pBtc, const void *pKey, int kLen) {
-  // TODO
-  return 0;
-}
-
 int tdbBtreeNext(SBTC *pBtc, void **ppKey, int *kLen, void **ppVal, int *vLen) {
   SCell       *pCell;
   SCellDecoder cd;
@@ -1233,11 +1140,9 @@ int tdbBtreeNext(SBTC *pBtc, void **ppKey, int *kLen, void **ppVal, int *vLen) {
 
 static int tdbBtcMoveToNext(SBTC *pBtc) {
   int    nCells;
-  SPgno  pgno;
   SCell *pCell;
-  u8     flags;
 
-  ASSERT(TDB_BTREE_PAGE_IS_LEAF(TDB_BTREE_PAGE_GET_FLAGS(pBtc->pPage)));
+  ASSERT(TDB_BTREE_PAGE_IS_LEAF(pBtc->pPage));
 
   if (pBtc->idx < 0) return -1;
 
@@ -1270,18 +1175,11 @@ static int tdbBtcMoveToNext(SBTC *pBtc) {
   // Move downward
   for (;;) {
     nCells = TDB_PAGE_TOTAL_CELLS(pBtc->pPage);
-    if (pBtc->idx < nCells) {
-      pCell = tdbPageGetCell(pBtc->pPage, pBtc->idx);
-      pgno = *(SPgno *)pCell;
-    } else {
-      pgno = ((SIntHdr *)pBtc->pPage->pData)->pgno;
-    }
 
-    tdbBtcMoveDownward(pBtc, pgno);
+    tdbBtcMoveDownward(pBtc);
     pBtc->idx = 0;
 
-    flags = TDB_BTREE_PAGE_GET_FLAGS(pBtc->pPage);
-    if (TDB_BTREE_PAGE_IS_LEAF(flags)) {
+    if (TDB_BTREE_PAGE_IS_LEAF(pBtc->pPage)) {
       break;
     }
   }
@@ -1289,13 +1187,20 @@ static int tdbBtcMoveToNext(SBTC *pBtc) {
   return 0;
 }
 
-int tdbBtcClose(SBTC *pBtc) {
-  // TODO
-  return 0;
-}
+static int tdbBtcMoveDownward(SBTC *pBtc) {
+  int    ret;
+  SPgno  pgno;
+  SCell *pCell;
 
-static int tdbBtcMoveDownward(SBTC *pBtc, SPgno pgno) {
-  int ret;
+  ASSERT(pBtc->idx >= 0);
+  ASSERT(!TDB_BTREE_PAGE_IS_LEAF(pBtc->pPage));
+
+  if (pBtc->idx < TDB_PAGE_TOTAL_CELLS(pBtc->pPage)) {
+    pCell = tdbPageGetCell(pBtc->pPage, pBtc->idx);
+    pgno = ((SPgno *)pCell)[0];
+  } else {
+    pgno = ((SIntHdr *)pBtc->pPage->pData)->pgno;
+  }
 
   pBtc->pgStack[pBtc->iPage] = pBtc->pPage;
   pBtc->idxStack[pBtc->iPage] = pBtc->idx;
@@ -1306,6 +1211,7 @@ static int tdbBtcMoveDownward(SBTC *pBtc, SPgno pgno) {
   ret = tdbPagerFetchPage(pBtc->pBt->pPager, pgno, &pBtc->pPage, tdbBtreeInitPage, pBtc->pBt);
   if (ret < 0) {
     ASSERT(0);
+    return -1;
   }
 
   return 0;
@@ -1314,7 +1220,7 @@ static int tdbBtcMoveDownward(SBTC *pBtc, SPgno pgno) {
 static int tdbBtcMoveUpward(SBTC *pBtc) {
   if (pBtc->iPage == 0) return -1;
 
-  // tdbPagerReturnPage(pBtc->pBt->pPager, pBtc->pPage);
+  tdbPagerReturnPage(pBtc->pBt->pPager, pBtc->pPage);
 
   pBtc->iPage--;
   pBtc->pPage = pBtc->pgStack[pBtc->iPage];
@@ -1323,6 +1229,117 @@ static int tdbBtcMoveUpward(SBTC *pBtc) {
   return 0;
 }
 
+static int tdbBtcMoveTo(SBTC *pBtc, const void *pKey, int kLen, int *pCRst) {
+  int     ret;
+  SBTree *pBt;
+  SPager *pPager;
+
+  pBt = pBtc->pBt;
+  pPager = pBt->pPager;
+
+  if (pBtc->iPage < 0) {
+    ASSERT(pBtc->iPage == -1);
+    ASSERT(pBtc->idx == -1);
+
+    // Move from the root
+    ret = tdbPagerFetchPage(pPager, pBt->root, &(pBtc->pPage), tdbBtreeInitPage, pBt);
+    if (ret < 0) {
+      ASSERT(0);
+      return -1;
+    }
+
+    pBtc->iPage = 0;
+
+    if (TDB_PAGE_TOTAL_CELLS(pBtc->pPage) == 0) {
+      // Current page is empty
+      // ASSERT(TDB_FLAG_IS(TDB_PAGE_FLAGS(pBtc->pPage), TDB_BTREE_ROOT | TDB_BTREE_LEAF));
+      return 0;
+    }
+
+    for (;;) {
+      int          lidx, ridx, midx, c, nCells;
+      SCell       *pCell;
+      SPage       *pPage;
+      SCellDecoder cd = {0};
+
+      pPage = pBtc->pPage;
+      nCells = TDB_PAGE_TOTAL_CELLS(pPage);
+      lidx = 0;
+      ridx = nCells - 1;
+
+      ASSERT(nCells > 0);
+
+      for (;;) {
+        if (lidx > ridx) break;
+
+        midx = (lidx + ridx) >> 1;
+
+        pCell = tdbPageGetCell(pPage, midx);
+        ret = tdbBtreeDecodeCell(pPage, pCell, &cd);
+        if (ret < 0) {
+          // TODO: handle error
+          ASSERT(0);
+          return -1;
+        }
+
+        // Compare the key values
+        c = pBt->kcmpr(pKey, kLen, cd.pKey, cd.kLen);
+        if (c < 0) {
+          /* input-key < cell-key */
+          ridx = midx - 1;
+        } else if (c > 0) {
+          /* input-key > cell-key */
+          lidx = midx + 1;
+        } else {
+          /* input-key == cell-key */
+          break;
+        }
+      }
+
+      // Move downward or break
+      u8 leaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
+      if (leaf) {
+        pBtc->idx = midx;
+        *pCRst = c;
+        break;
+      } else {
+        if (c <= 0) {
+          pBtc->idx = midx;
+        } else {
+          pBtc->idx = midx + 1;
+        }
+        tdbBtcMoveDownward(pBtc);
+      }
+    }
+
+  } else {
+    // TODO: Move the cursor from a some position instead of a clear state
+    ASSERT(0);
+  }
+
+  return 0;
+}
+
+int tdbBtcClose(SBTC *pBtc) {
+  if (pBtc->iPage < 0) return 0;
+
+  for (;;) {
+    ASSERT(pBtc->pPage);
+
+    tdbPagerReturnPage(pBtc->pBt->pPager, pBtc->pPage);
+
+    pBtc->iPage--;
+    if (pBtc->iPage < 0) break;
+
+    pBtc->pPage = pBtc->pgStack[pBtc->iPage];
+    pBtc->idx = pBtc->idxStack[pBtc->iPage];
+  }
+
+  return 0;
+}
+// TDB_BTREE_CURSOR
+
+// TDB_BTREE_DEBUG =====================
 #ifndef NODEBUG
 typedef struct {
   SPgno pgno;
@@ -1336,17 +1353,14 @@ typedef struct {
 SBtPageInfo btPageInfos[20];
 
 void tdbBtPageInfo(SPage *pPage, int idx) {
-  u8           flags;
   SBtPageInfo *pBtPageInfo;
 
   pBtPageInfo = btPageInfos + idx;
 
   pBtPageInfo->pgno = TDB_PAGE_PGNO(pPage);
 
-  flags = TDB_BTREE_PAGE_GET_FLAGS(pPage);
-
-  pBtPageInfo->root = TDB_BTREE_PAGE_IS_ROOT(flags);
-  pBtPageInfo->leaf = TDB_BTREE_PAGE_IS_LEAF(flags);
+  pBtPageInfo->root = TDB_BTREE_PAGE_IS_ROOT(pPage);
+  pBtPageInfo->leaf = TDB_BTREE_PAGE_IS_LEAF(pPage);
 
   pBtPageInfo->rChild = 0;
   if (!pBtPageInfo->leaf) {
@@ -1356,4 +1370,5 @@ void tdbBtPageInfo(SPage *pPage, int idx) {
   pBtPageInfo->nCells = TDB_PAGE_TOTAL_CELLS(pPage) - pPage->nOverflow;
   pBtPageInfo->nOvfl = pPage->nOverflow;
 }
-#endif
\ No newline at end of file
+#endif
+// TDB_BTREE_DEBUG
\ No newline at end of file
diff --git a/source/libs/tdb/src/inc/tdbBtree.h b/source/libs/tdb/src/inc/tdbBtree.h
index 0e8ca0c803..2797b5ea5e 100644
--- a/source/libs/tdb/src/inc/tdbBtree.h
+++ b/source/libs/tdb/src/inc/tdbBtree.h
@@ -35,7 +35,6 @@ struct SBTC {
   int     idx;
   int     idxStack[BTREE_MAX_DEPTH + 1];
   SPage  *pgStack[BTREE_MAX_DEPTH + 1];
-  void   *pBuf;
 };
 
 // SBTree
@@ -49,7 +48,6 @@ int tdbBtreePGet(SBTree *pBt, const void *pKey, int kLen, void **ppKey, int *pkL
 int tdbBtcOpen(SBTC *pCur, SBTree *pBt);
 int tdbBtcMoveToFirst(SBTC *pBtc);
 int tdbBtcMoveToLast(SBTC *pBtc);
-int tdbBtcMoveTo(SBTC *pBtc, const void *pKey, int kLen);
 int tdbBtreeNext(SBTC *pBtc, void **ppKey, int *kLen, void **ppVal, int *vLen);
 int tdbBtcClose(SBTC *pBtc);
 
diff --git a/source/libs/tdb/src/inc/tdbOs.h b/source/libs/tdb/src/inc/tdbOs.h
index 794d4c502a..196bbdafc7 100644
--- a/source/libs/tdb/src/inc/tdbOs.h
+++ b/source/libs/tdb/src/inc/tdbOs.h
@@ -64,7 +64,7 @@ typedef TdThreadSpinlock tdb_spinlock_t;
 #define tdbSpinlockDestroy taosThreadSpinDestroy
 #define tdbSpinlockLock    taosThreadSpinLock
 #define tdbSpinlockUnlock  taosThreadSpinUnlock
-#define tdbSpinlockTrylock pthread_spin_trylock
+#define tdbSpinlockTrylock taosThreadSpinTrylock
 
 /* mutex lock */
 typedef TdThreadMutex tdb_mutex_t;
diff --git a/source/os/src/osSocket.c b/source/os/src/osSocket.c
index b130689d4b..d79d7c3d58 100644
--- a/source/os/src/osSocket.c
+++ b/source/os/src/osSocket.c
@@ -758,7 +758,7 @@ void taosBlockSIGPIPE() {
   sigset_t signal_mask;
   sigemptyset(&signal_mask);
   sigaddset(&signal_mask, SIGPIPE);
-  int32_t rc = taosThreadSigmask(SIG_BLOCK, &signal_mask, NULL);
+  int32_t rc = taosThreadSigMask(SIG_BLOCK, &signal_mask, NULL);
   if (rc != 0) {
     // printf("failed to block SIGPIPE");
   }
@@ -876,7 +876,7 @@ void taosSetMaskSIGPIPE() {
   sigset_t signal_mask;
   sigemptyset(&signal_mask);
   sigaddset(&signal_mask, SIGPIPE);
-  int32_t rc = taosThreadSigmask(SIG_SETMASK, &signal_mask, NULL);
+  int32_t rc = taosThreadSigMask(SIG_SETMASK, &signal_mask, NULL);
   if (rc != 0) {
     // printf("failed to setmask SIGPIPE");
   }
diff --git a/source/os/src/osThread.c b/source/os/src/osThread.c
index 716080274b..436614ad6a 100644
--- a/source/os/src/osThread.c
+++ b/source/os/src/osThread.c
@@ -14,132 +14,341 @@
  */
 
 #define ALLOW_FORBID_FUNC
+#include <pthread.h>
 #include "os.h"
 
-// int32_t taosThreadSetnameNp(TdThread thread, const char *name) {
-//     return pthread_setname_np(thread,name);
-// }
-
-int32_t taosThreadSpinInit(TdThreadSpinlock *lock, int pshared) {
-    return pthread_spin_init(lock, pshared);
+int32_t taosThreadCreate(TdThread * tid, const TdThreadAttr * attr, void *(*start)(void *), void *arg) {
+  return pthread_create(tid, attr, start, arg);
 }
 
-int32_t taosThreadMutexInit(TdThreadMutex *mutex, const TdThreadMutexAttr *attr) {
-    return pthread_mutex_init(mutex, attr);
+int32_t taosThreadAttrDestroy(TdThreadAttr * attr) {
+  return pthread_attr_destroy(attr);
 }
 
-int32_t taosThreadSpinDestroy(TdThreadSpinlock *lock) {
-    return pthread_spin_destroy(lock);
+int32_t taosThreadAttrGetDetachState(const TdThreadAttr * attr, int32_t *detachstate) {
+  return pthread_attr_getdetachstate(attr, detachstate);
 }
 
-int32_t taosThreadMutexDestroy(TdThreadMutex * mutex) {
-    return pthread_mutex_destroy(mutex);
+int32_t taosThreadAttrGetInheritSched(const TdThreadAttr * attr, int32_t *inheritsched) {
+  return pthread_attr_getinheritsched(attr, inheritsched);
 }
 
-int32_t taosThreadSpinLock(TdThreadSpinlock *lock) {
-    return pthread_spin_lock(lock);
+int32_t taosThreadAttrGetSchedParam(const TdThreadAttr * attr, struct sched_param *param) {
+  return pthread_attr_getschedparam(attr, param);
 }
 
-int32_t taosThreadMutexLock(TdThreadMutex *mutex) {
-    return pthread_mutex_lock(mutex);
+int32_t taosThreadAttrGetSchedPolicy(const TdThreadAttr * attr, int32_t *policy) {
+  return pthread_attr_getschedpolicy(attr, policy);
 }
 
-int32_t taosThreadSpinUnlock(TdThreadSpinlock *lock) {
-    return pthread_spin_unlock(lock);
+int32_t taosThreadAttrGetScope(const TdThreadAttr * attr, int32_t *contentionscope) {
+  return pthread_attr_getscope(attr, contentionscope);
 }
 
-int32_t taosThreadMutexUnlock(TdThreadMutex *mutex) {
-    return pthread_mutex_unlock(mutex);
+int32_t taosThreadAttrGetStackSize(const TdThreadAttr * attr, size_t * stacksize) {
+  return pthread_attr_getstacksize(attr, stacksize);
 }
 
-int32_t taosThreadRwlockRdlock(TdThreadRwlock *rwlock) {
-    return pthread_rwlock_rdlock(rwlock);
+int32_t taosThreadAttrInit(TdThreadAttr * attr) {
+  return pthread_attr_init(attr);
 }
 
-int32_t taosThreadRwlockWrlock(TdThreadRwlock *rwlock) {
-    return pthread_rwlock_wrlock(rwlock);
+int32_t taosThreadAttrSetDetachState(TdThreadAttr * attr, int32_t detachstate) {
+  return pthread_attr_setdetachstate(attr, detachstate);
 }
 
-int32_t taosThreadRwlockUnlock(TdThreadRwlock *rwlock) {
-    return pthread_rwlock_unlock(rwlock);
+int32_t taosThreadAttrSetInheritSched(TdThreadAttr * attr, int32_t inheritsched) {
+  return pthread_attr_setinheritsched(attr, inheritsched);
 }
 
-void taosThreadTestCancel(void) {
-    return pthread_testcancel();
+int32_t taosThreadAttrSetSchedParam(TdThreadAttr * attr, const struct sched_param *param) {
+  return pthread_attr_setschedparam(attr, param);
 }
 
-int32_t taosThreadAttrInit(TdThreadAttr *attr) {
-    return pthread_attr_init(attr);
+int32_t taosThreadAttrSetSchedPolicy(TdThreadAttr * attr, int32_t policy) {
+  return pthread_attr_setschedpolicy(attr, policy);
 }
 
-int32_t taosThreadCreate(TdThread *tid, const TdThreadAttr *attr, void*(*start)(void*), void *arg) {
-    return pthread_create(tid, attr, start, arg);
+int32_t taosThreadAttrSetScope(TdThreadAttr * attr, int32_t contentionscope) {
+  return pthread_attr_setscope(attr, contentionscope);
 }
 
-int32_t taosThreadOnce(TdThreadOnce *onceControl, void(*initRoutine)(void)) {
-    return pthread_once(onceControl, initRoutine);
+int32_t taosThreadAttrSetStackSize(TdThreadAttr * attr, size_t stacksize) {
+  return pthread_attr_setstacksize(attr, stacksize);
 }
 
-int32_t taosThreadAttrSetDetachState(TdThreadAttr *attr, int32_t detachState) {
-    return pthread_attr_setdetachstate(attr, detachState);
+int32_t taosThreadBarrierDestroy(TdThreadBarrier * barrier) {
+  return pthread_barrier_destroy(barrier);
 }
 
-int32_t taosThreadAttrDestroy(TdThreadAttr *attr) {
-    return pthread_attr_destroy(attr);
+int32_t taosThreadBarrierInit(TdThreadBarrier * barrier, const TdThreadBarrierAttr * attr, uint32_t count) {
+  return pthread_barrier_init(barrier, attr, count);
 }
 
-int32_t taosThreadJoin(TdThread thread, void **pValue) {
-    return pthread_join(thread, pValue);
+int32_t taosThreadBarrierWait(TdThreadBarrier * barrier) {
+  return pthread_barrier_wait(barrier);
 }
 
-int32_t taosThreadRwlockInit(TdThreadRwlock *rwlock, const TdThreadRwlockAttr *attr) {
-    return pthread_rwlock_init(rwlock, attr);
+int32_t taosThreadBarrierAttrDestroy(TdThreadBarrierAttr * attr) {
+  return pthread_barrierattr_destroy(attr);
 }
 
-int32_t taosThreadRwlockDestroy(TdThreadRwlock *rwlock) {
-    return pthread_rwlock_destroy(rwlock);
+int32_t taosThreadBarrierAttrGetPshared(const TdThreadBarrierAttr * attr, int32_t *pshared) {
+  return pthread_barrierattr_getpshared(attr, pshared);
 }
 
-int32_t taosThreadCondSignal(TdThreadCond *cond) {
-    return pthread_cond_signal(cond);
+int32_t taosThreadBarrierAttrInit(TdThreadBarrierAttr * attr) {
+  return pthread_barrierattr_init(attr);
 }
 
-int32_t taosThreadCondInit(TdThreadCond *cond, const TdThreadCondAttr *attr) {
-    return pthread_cond_init(cond, attr);
-}
-
-int32_t taosThreadCondBroadcast(TdThreadCond *cond) {
-    return pthread_cond_broadcast(cond);
-}
-
-int32_t taosThreadCondDestroy(TdThreadCond *cond) {
-    return pthread_cond_destroy(cond);
-}
-
-int32_t taosThreadCondWait(TdThreadCond *cond, TdThreadMutex *mutex) {
-    return pthread_cond_wait(cond, mutex);
-}
-
-TdThread taosThreadSelf(void) {
-    return pthread_self();
-}
-
-// int32_t taosThreadGetW32ThreadIdNp(TdThread thread) {
-//     return pthread_getw32threadid_np(thread);
-// }
-
-int32_t taosThreadEqual(TdThread t1, TdThread t2) {
-    return pthread_equal(t1, t2);
-}
-
-int32_t taosThreadSigmask(int how, sigset_t const *set, sigset_t *oset) {
-    return pthread_sigmask(how, set, oset);
+int32_t taosThreadBarrierAttrSetPshared(TdThreadBarrierAttr * attr, int32_t pshared) {
+  return pthread_barrierattr_setpshared(attr, pshared);
 }
 
 int32_t taosThreadCancel(TdThread thread) {
-    return pthread_cancel(thread);
+  return pthread_cancel(thread);
 }
 
-int32_t taosThreadKill(TdThread thread, int sig) {
-    return pthread_kill(thread, sig);
+int32_t taosThreadCondDestroy(TdThreadCond * cond) {
+  return pthread_cond_destroy(cond);
+}
+
+int32_t taosThreadCondInit(TdThreadCond * cond, const TdThreadCondAttr * attr) {
+  return pthread_cond_init(cond, attr);
+}
+
+int32_t taosThreadCondSignal(TdThreadCond * cond) {
+  return pthread_cond_signal(cond);
+}
+
+int32_t taosThreadCondBroadcast(TdThreadCond * cond) {
+  return pthread_cond_broadcast(cond);
+}
+
+int32_t taosThreadCondWait(TdThreadCond * cond, TdThreadMutex * mutex) {
+  return pthread_cond_wait(cond, mutex);
+}
+
+int32_t taosThreadCondTimedWait(TdThreadCond * cond, TdThreadMutex * mutex, const struct timespec *abstime) {
+  return pthread_cond_timedwait(cond, mutex, abstime);
+}
+
+int32_t taosThreadCondAttrDestroy(TdThreadCondAttr * attr) {
+  return pthread_condattr_destroy(attr);
+}
+
+int32_t taosThreadCondAttrGetPshared(const TdThreadCondAttr * attr, int32_t *pshared) {
+  return pthread_condattr_getpshared(attr, pshared);
+}
+
+int32_t taosThreadCondAttrInit(TdThreadCondAttr * attr) {
+  return pthread_condattr_init(attr);
+}
+
+int32_t taosThreadCondAttrSetPshared(TdThreadCondAttr * attr, int32_t pshared) {
+  return pthread_condattr_setpshared(attr, pshared);
+}
+
+int32_t taosThreadDetach(TdThread thread) {
+  return pthread_detach(thread);
+}
+
+int32_t taosThreadEqual(TdThread t1, TdThread t2) {
+  return pthread_equal(t1, t2);
+}
+
+void taosThreadExit(void *valuePtr) {
+  return pthread_exit(valuePtr);
+}
+
+int32_t taosThreadGetSchedParam(TdThread thread, int32_t *policy, struct sched_param *param) {
+  return pthread_getschedparam(thread, policy, param);
+}
+
+void *taosThreadGetSpecific(TdThreadKey key) {
+  return pthread_getspecific(key);
+}
+
+int32_t taosThreadJoin(TdThread thread, void **valuePtr) {
+  return pthread_join(thread, valuePtr);
+}
+
+int32_t taosThreadKeyCreate(TdThreadKey * key, void(*destructor)(void *)) {
+  return pthread_key_create(key, destructor);
+}
+
+int32_t taosThreadKeyDelete(TdThreadKey key) {
+  return pthread_key_delete(key);
+}
+
+int32_t taosThreadKill(TdThread thread, int32_t sig) {
+  return pthread_kill(thread, sig);
+}
+
+int32_t taosThreadMutexConsistent(TdThreadMutex* mutex) {
+  return pthread_mutex_consistent(mutex);
+}
+
+int32_t taosThreadMutexDestroy(TdThreadMutex * mutex) {
+  return pthread_mutex_destroy(mutex);
+}
+
+int32_t taosThreadMutexInit(TdThreadMutex * mutex, const TdThreadMutexAttr * attr) {
+  return pthread_mutex_init(mutex, attr);
+}
+
+int32_t taosThreadMutexLock(TdThreadMutex * mutex) {
+  return pthread_mutex_lock(mutex);
+}
+
+int32_t taosThreadMutexTimedLock(TdThreadMutex * mutex, const struct timespec *abstime) {
+  return pthread_mutex_timedlock(mutex, abstime);
+}
+
+int32_t taosThreadMutexTryLock(TdThreadMutex * mutex) {
+  return pthread_mutex_trylock(mutex);
+}
+
+int32_t taosThreadMutexUnlock(TdThreadMutex * mutex) {
+  return pthread_mutex_unlock(mutex);
+}
+
+int32_t taosThreadMutexAttrDestroy(TdThreadMutexAttr * attr) {
+  return pthread_mutexattr_destroy(attr);
+}
+
+int32_t taosThreadMutexAttrGetPshared(const TdThreadMutexAttr * attr, int32_t *pshared) {
+  return pthread_mutexattr_getpshared(attr, pshared);
+}
+
+int32_t taosThreadMutexAttrGetRobust(const TdThreadMutexAttr * attr, int32_t * robust) {
+  return pthread_mutexattr_getrobust(attr, robust);
+}
+
+int32_t taosThreadMutexAttrGetType(const TdThreadMutexAttr * attr, int32_t *kind) {
+  return pthread_mutexattr_gettype(attr, kind);
+}
+
+int32_t taosThreadMutexAttrInit(TdThreadMutexAttr * attr) {
+  return pthread_mutexattr_init(attr);
+}
+
+int32_t taosThreadMutexAttrSetPshared(TdThreadMutexAttr * attr, int32_t pshared) {
+  return pthread_mutexattr_setpshared(attr, pshared);
+}
+
+int32_t taosThreadMutexAttrSetRobust(TdThreadMutexAttr * attr, int32_t robust) {
+  return pthread_mutexattr_setrobust(attr, robust);
+}
+
+int32_t taosThreadMutexAttrSetType(TdThreadMutexAttr * attr, int32_t kind) {
+  return pthread_mutexattr_settype(attr, kind);
+}
+
+int32_t taosThreadOnce(TdThreadOnce * onceControl, void(*initRoutine)(void)) {
+  return pthread_once(onceControl, initRoutine);
+}
+
+int32_t taosThreadRwlockDestroy(TdThreadRwlock * rwlock) {
+  return pthread_rwlock_destroy(rwlock);
+}
+
+int32_t taosThreadRwlockInit(TdThreadRwlock * rwlock, const TdThreadRwlockAttr * attr) {
+  return pthread_rwlock_init(rwlock, attr);
+}
+
+int32_t taosThreadRwlockRdlock(TdThreadRwlock * rwlock) {
+  return pthread_rwlock_rdlock(rwlock);
+}
+
+int32_t taosThreadRwlockTimedRdlock(TdThreadRwlock * rwlock, const struct timespec *abstime) {
+  return pthread_rwlock_timedrdlock(rwlock, abstime);
+}
+
+int32_t taosThreadRwlockTimedWrlock(TdThreadRwlock * rwlock, const struct timespec *abstime) {
+  return pthread_rwlock_timedwrlock(rwlock, abstime);
+}
+
+int32_t taosThreadRwlockTryRdlock(TdThreadRwlock * rwlock) {
+  return pthread_rwlock_tryrdlock(rwlock);
+}
+
+int32_t taosThreadRwlockTryWrlock(TdThreadRwlock * rwlock) {
+  return pthread_rwlock_trywrlock(rwlock);
+}
+
+int32_t taosThreadRwlockUnlock(TdThreadRwlock * rwlock) {
+  return pthread_rwlock_unlock(rwlock);
+}
+
+int32_t taosThreadRwlockWrlock(TdThreadRwlock * rwlock) {
+  return pthread_rwlock_wrlock(rwlock);
+}
+
+int32_t taosThreadRwlockAttrDestroy(TdThreadRwlockAttr * attr) {
+  return pthread_rwlockattr_destroy(attr);
+}
+
+int32_t taosThreadRwlockAttrGetPshared(const TdThreadRwlockAttr * attr, int32_t *pshared) {
+  return pthread_rwlockattr_getpshared(attr, pshared);
+}
+
+int32_t taosThreadRwlockAttrInit(TdThreadRwlockAttr * attr) {
+  return pthread_rwlockattr_init(attr);
+}
+
+int32_t taosThreadRwlockAttrSetPshared(TdThreadRwlockAttr * attr, int32_t pshared) {
+  return pthread_rwlockattr_setpshared(attr, pshared);
+}
+
+TdThread taosThreadSelf(void) {
+  return pthread_self();
+}
+
+int32_t taosThreadSetCancelState(int32_t state, int32_t *oldstate) {
+  return pthread_setcancelstate(state, oldstate);
+}
+
+int32_t taosThreadSetCancelType(int32_t type, int32_t *oldtype) {
+  return pthread_setcanceltype(type, oldtype);
+}
+
+int32_t taosThreadSetSchedParam(TdThread thread, int32_t policy, const struct sched_param *param) {
+  return pthread_setschedparam(thread, policy, param);
+}
+
+int32_t taosThreadSetSpecific(TdThreadKey key, const void *value) {
+  return pthread_setspecific(key, value);
+}
+
+int32_t taosThreadSpinDestroy(TdThreadSpinlock * lock) {
+  return pthread_spin_destroy(lock);
+}
+
+int32_t taosThreadSpinInit(TdThreadSpinlock * lock, int32_t pshared) {
+  return pthread_spin_init(lock, pshared);
+}
+
+int32_t taosThreadSpinLock(TdThreadSpinlock * lock) {
+  return pthread_spin_lock(lock);
+}
+
+int32_t taosThreadSpinTrylock(TdThreadSpinlock * lock) {
+  return pthread_spin_trylock(lock);
+}
+
+int32_t taosThreadSpinUnlock(TdThreadSpinlock * lock) {
+  return pthread_spin_unlock(lock);
+}
+
+void taosThreadTestCancel(void) {
+  return pthread_testcancel();
+}
+
+int32_t taosThreadSigMask(int32_t how, sigset_t const *set, sigset_t * oset) {
+  return pthread_sigmask(how, set, oset);
+}
+
+int32_t taosThreadSigWait(const sigset_t * set, int32_t *sig) {
+  return sigwait(set, sig);
 }
\ No newline at end of file
diff --git a/source/util/src/tprocess.c b/source/util/src/tprocess.c
index 1d565083e1..d7e199039a 100644
--- a/source/util/src/tprocess.c
+++ b/source/util/src/tprocess.c
@@ -63,27 +63,27 @@ static inline int32_t CEIL8(int32_t v) {
 static int32_t taosProcInitMutex(SProcQueue *pQueue) {
   TdThreadMutexAttr mattr = {0};
 
-  if (pthread_mutexattr_init(&mattr) != 0) {
+  if (taosThreadMutexAttrInit(&mattr) != 0) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     uError("failed to init mutex while init attr since %s", terrstr());
     return -1;
   }
 
-  if (pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED) != 0) {
-    pthread_mutexattr_destroy(&mattr);
+  if (taosThreadMutexAttrSetPshared(&mattr, PTHREAD_PROCESS_SHARED) != 0) {
+    taosThreadMutexAttrDestroy(&mattr);
     terrno = TAOS_SYSTEM_ERROR(errno);
     uError("failed to init mutex while set shared since %s", terrstr());
     return -1;
   }
 
   if (taosThreadMutexInit(&pQueue->mutex, &mattr) != 0) {
-    pthread_mutexattr_destroy(&mattr);
+    taosThreadMutexDestroy(&pQueue->mutex);
     terrno = TAOS_SYSTEM_ERROR(errno);
     uError("failed to init mutex since %s", terrstr());
     return -1;
   }
 
-  pthread_mutexattr_destroy(&mattr);
+  taosThreadMutexAttrDestroy(&mattr);
   return 0;
 }
 
@@ -139,7 +139,6 @@ static void taosProcDestroySem(SProcQueue *pQueue) {
     tsem_destroy(pQueue->sem);
     pQueue->sem = NULL;
   }
-
 }
 
 static void taosProcCleanupQueue(SProcQueue *pQueue) {
@@ -318,7 +317,7 @@ SProcObj *taosProcInit(const SProcCfg *pCfg) {
   pProc->pChildQueue = taosProcInitQueue(pCfg->name, pCfg->isChild, (char *)pCfg->shm.ptr + cstart, csize);
   pProc->pParentQueue = taosProcInitQueue(pCfg->name, pCfg->isChild, (char *)pCfg->shm.ptr + pstart, psize);
   if (pProc->pChildQueue == NULL || pProc->pParentQueue == NULL) {
-    taosProcCleanupQueue(pProc->pChildQueue);
+    // taosProcCleanupQueue(pProc->pChildQueue);
     taosMemoryFree(pProc);
     return NULL;
   }
@@ -422,8 +421,8 @@ void taosProcCleanup(SProcObj *pProc) {
   if (pProc != NULL) {
     uDebug("proc:%s, clean up", pProc->name);
     taosProcStop(pProc);
-    taosProcCleanupQueue(pProc->pChildQueue);
-    taosProcCleanupQueue(pProc->pParentQueue);
+    // taosProcCleanupQueue(pProc->pChildQueue);
+    // taosProcCleanupQueue(pProc->pParentQueue);
     taosMemoryFree(pProc);
   }
 }
diff --git a/source/util/test/queueTest.cpp b/source/util/test/queueTest.cpp
index 09c544df9f..0bc53ab85a 100644
--- a/source/util/test/queueTest.cpp
+++ b/source/util/test/queueTest.cpp
@@ -36,12 +36,12 @@ TEST_F(UtilTestQueue, 01_fork) {
 
   int                 err;
   pthread_mutexattr_t mattr;
-  if ((err = pthread_mutexattr_init(&mattr)) < 0) {
+  if ((err = taosThreadMutexAttrInit(&mattr)) < 0) {
     printf("mutex addr init error:%s\n", strerror(err));
     exit(1);
   }
 
-  if ((err = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED)) < 0) {
+  if ((err = taosThreadMutexAttrSetPshared(&mattr, PTHREAD_PROCESS_SHARED)) < 0) {
     printf("mutex addr get shared error:%s\n", strerror(err));
     exit(1);
   }
@@ -50,7 +50,7 @@ TEST_F(UtilTestQueue, 01_fork) {
   int              mid = shmget(IPC_PRIVATE, sizeof(pthread_mutex_t), 0600);
   m = (pthread_mutex_t*)shmat(mid, NULL, 0);
 
-  if ((err = pthread_mutex_init(m, &mattr)) < 0) {
+  if ((err = taosThreadMutexInit(m, &mattr)) < 0) {
     printf("mutex mutex init error:%s\n", strerror(err));
     exit(1);
   }
@@ -125,7 +125,7 @@ TEST_F(UtilTestQueue, 01_fork) {
 
   taosThreadAttrDestroy(&mattr);
   //销毁mutex
-  pthread_mutex_destroy(m);
+  taosThreadMutexDestroy(m);
 
   exit(0);
 }
diff --git a/tests/script/general/stable/disk.sim b/tests/script/general/stable/disk.sim
deleted file mode 100644
index 1faae78e89..0000000000
--- a/tests/script/general/stable/disk.sim
+++ /dev/null
@@ -1,199 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = d_db
-$tbPrefix = d_tb
-$mtPrefix = d_mt
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = 0
-  while $x < $rowNum
-    $val = $x * 60000
-    $ms = 1519833600000 + $val 
-    sql insert into $tb values ($ms , $x ) 
-    $x = $x + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sql show vgroups
-print vgroups ==> $rows
-if $rows != 3 then 
-  return -1
-endi
-
-sql select count(*) from $mt
-print select count(*) from $mt ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-sleep 1000
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
-system sh/exec.sh -n dnode1 -s start
-sleep 6000
-
-sql use $db
-sql show vgroups
-print vgroups ==> $rows
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step2
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step3
-sql select count(tbcol) from $tb where ts <= 1519833840000
-print ===> $data00
-if $data00 != 5 then 
-  return -1
-endi
-
-print =============== step4
-sql select count(tbcol) as b from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step5
-sql select count(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-print =============== step6
-sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 5 then 
-  return -1
-endi
-
-print =============== step7
-sql select count(*) from $mt
-print select count(*) from $mt ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-print =============== step8
-sql select count(tbcol) as c from $mt where ts <= 1519833840000
-print ===> $data00
-if $data00 != 50 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5
-print ===> $data00
-if $data00 != 100 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
-print ===> $data00
-if $data00 != 25 then 
-  return -1
-endi
-
-print =============== step9
-sql select count(tbcol) as b from $mt interval(1m)
-print select count(tbcol) as b from $mt interval(1m) ===> $data01
-if $data01 != 10 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $mt interval(1d)
-print ===> $data02
-if $data01 != 200 then 
-  return -1
-endi
-
-print =============== step10
-print select count(tbcol) as b from $mt group by tgcol
-sql select count(tbcol) as b from $mt group by tgcol
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-if $rows != $tbNum then 
-  return -1
-endi
-
-print =============== step11
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-
-print =============== clear
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/dnode3.sim b/tests/script/general/stable/dnode3.sim
deleted file mode 100644
index 872cfb8d2e..0000000000
--- a/tests/script/general/stable/dnode3.sim
+++ /dev/null
@@ -1,212 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode4 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sql connect
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-sql create dnode $hostname4
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
-$x = 0
-createDnode: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes;
-if $data4_2 == offline then
-  goto createDnode
-endi  
-if $data4_3 == offline then
-  goto createDnode
-endi  
-if $data4_4 == offline then
-  goto createDnode
-endi  
-
-print ======================== dnode1 start
-
-$dbPrefix = r3v3_db
-$tbPrefix = r3v3_tb
-$mtPrefix = r3v3_mt
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql create database $db 
-sql use $db
-sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = 0
-  while $x < $rowNum
-    $val = $x * 60000
-    $ms = 1519833600000 + $val 
-    sql insert into $tb values ($ms , $x ) 
-    $x = $x + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sql show vgroups
-print vgroups ==> $rows
-if $rows != 3 then 
-  return -1
-endi
-
-sleep 100
-
-print =============== step2
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step3
-sql select count(tbcol) from $tb where ts <= 1519833840000
-print ===> $data00
-if $data00 != 5 then 
-  return -1
-endi
-
-print =============== step4
-sql select count(tbcol) as b from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step5
-sql select count(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-print =============== step6
-sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 5 then 
-  return -1
-endi
-
-print =============== step7
-print select count(*) from $mt
-sql select count(*) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-print =============== step8
-sql select count(tbcol) as c from $mt where ts <= 1519833840000
-print ===> $data00
-if $data00 != 50 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5
-print ===> $data00
-if $data00 != 100 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
-print ===> $data00
-if $data00 != 25 then 
-  return -1
-endi
-
-print =============== step9
-sql select count(tbcol) as b from $mt interval(1m)
-print ===> $data01
-if $data01 != 10 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-print =============== step10
-sql select count(tbcol) as b from $mt group by tgcol
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-if $rows != $tbNum then 
-  return -1
-endi
-
-print =============== step11
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-
-print =============== clear
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/values.sim b/tests/script/general/stable/values.sim
deleted file mode 100644
index fb2c908da2..0000000000
--- a/tests/script/general/stable/values.sim
+++ /dev/null
@@ -1,113 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-sql create database vdb0
-sql create table vdb0.mt (ts timestamp, tbcol int) TAGS(tgcol int)
-
-sql create table vdb0.vtb00 using vdb0.mt tags( 0 )
-sql create table vdb0.vtb01 using vdb0.mt tags( 0 )
-
-sql create database vdb1
-sql create table vdb1.mt (ts timestamp, tbcol int) TAGS(tgcol int)
-sql_error create table vdb1.vtb10 using vdb0.mt tags( 1 )
-sql_error create table vdb1.vtb11 using vdb0.mt tags( 1 )
-sql create table vdb1.vtb10 using vdb1.mt tags( 1 )
-sql create table vdb1.vtb11 using vdb1.mt tags( 1 )
-
-sql create database vdb2
-sql create table vdb2.mt (ts timestamp, tbcol int) TAGS(tgcol int)
-sql_error create table vdb2.vtb20 using vdb0.mt tags( 2 )
-sql_error create table vdb2.vtb21 using vdb0.mt tags( 2 )
-sql create table vdb2.vtb20 using vdb2.mt tags( 2 )
-sql create table vdb2.vtb21 using vdb2.mt tags( 2 )
-
-sql create database vdb3
-sql create table vdb3.mt (ts timestamp, tbcol int) TAGS(tgcol int)
-sql_error create table vdb3.vtb20 using vdb0.mt tags( 2 )
-sql_error create table vdb3.vtb21 using vdb0.mt tags( 2 )
-sql create table vdb3.vtb30 using vdb3.mt tags( 3 )
-sql create table vdb3.vtb31 using vdb3.mt tags( 3 )
-
-print =============== step2
-sql insert into vdb0.vtb00 values (1519833600000 , 10) (1519833600001, 20) (1519833600002, 30) 
-sql insert into vdb0.vtb01 values (1519833600000 , 10) (1519833600001, 20) (1519833600002, 30) 
-sql insert into vdb1.vtb10 values (1519833600000 , 11) (1519833600001, 21) (1519833600002, 31) 
-sql insert into vdb1.vtb11 values (1519833600000 , 11) (1519833600001, 21) (1519833600002, 31) 
-sql insert into vdb2.vtb20 values (1519833600000 , 12) (1519833600001, 22) (1519833600002, 32) 
-sql insert into vdb2.vtb21 values (1519833600000 , 12) (1519833600001, 22) (1519833600002, 32) 
-sql insert into vdb3.vtb30 values (1519833600000 , 13) (1519833600001, 23) (1519833600002, 33) 
-sql insert into vdb3.vtb31 values (1519833600000 , 13) (1519833600001, 23) (1519833600002, 33) 
-sql select * from vdb0.mt
-
-if $rows != 6 then 
-  return -1
-endi
-
-print =============== step3
-sql insert into vdb0.vtb00 values (1519833600003 , 40) (1519833600005, 50) (1519833600004, 60) 
-sql insert into vdb0.vtb01 values (1519833600003 , 40) (1519833600005, 50) (1519833600004, 60) 
-sql insert into vdb1.vtb10 values (1519833600003 , 41) (1519833600005, 51) (1519833600004, 61) 
-sql insert into vdb1.vtb11 values (1519833600003 , 41) (1519833600005, 51) (1519833600004, 61) 
-sql insert into vdb2.vtb20 values (1519833600003 , 42) (1519833600005, 52) (1519833600004, 62) 
-sql insert into vdb2.vtb21 values (1519833600003 , 42) (1519833600005, 52) (1519833600004, 62) 
-sql insert into vdb3.vtb30 values (1519833600003 , 43) (1519833600005, 53) (1519833600004, 63) 
-sql insert into vdb3.vtb31 values (1519833600003 , 43) (1519833600005, 53) (1519833600004, 63) 
-sql select * from vdb0.mt
-
-if $rows != 12 then 
-  return -1
-endi
-
-print =============== step4
-sql insert into vdb0.vtb00 values(1519833600006, 60) (1519833600007, 70) vdb0.vtb01 values(1519833600006, 60) (1519833600007, 70) 
-sql insert into vdb1.vtb10 values(1519833600006, 61) (1519833600007, 71) vdb1.vtb11 values(1519833600006, 61) (1519833600007, 71) 
-sql insert into vdb2.vtb20 values(1519833600006, 62) (1519833600007, 72) vdb2.vtb21 values(1519833600006, 62) (1519833600007, 72) 
-sql insert into vdb3.vtb30 values(1519833600006, 63) (1519833600007, 73) vdb3.vtb31 values(1519833600006, 63) (1519833600007, 73) 
-sql select * from vdb0.mt
-
-if $rows != 16 then 
-  return -1
-endi
-
-print =============== step5
-sql insert into vdb0.vtb00 values(1519833600008, 80) (1519833600007, 70) vdb0.vtb01 values(1519833600006, 80) (1519833600007, 70) 
-sql insert into vdb1.vtb10 values(1519833600008, 81) (1519833600007, 71) vdb1.vtb11 values(1519833600006, 81) (1519833600007, 71) 
-sql insert into vdb2.vtb20 values(1519833600008, 82) (1519833600007, 72) vdb2.vtb21 values(1519833600006, 82) (1519833600007, 72) 
-sql insert into vdb3.vtb30 values(1519833600008, 83) (1519833600007, 73) vdb3.vtb31 values(1519833600006, 83) (1519833600007, 73) 
-sql select * from vdb0.mt
-
-if $rows != 17 then 
-  return -1
-endi
-
-print =============== step6
-sql insert into vdb0.vtb00 values(1519833600009, 90) (1519833600010, 100) vdb1.vtb10 values(1519833600009, 90) (1519833600010, 100) vdb2.vtb20 values(1519833600009, 90) (1519833600010, 100) vdb3.vtb30 values(1519833600009, 90) (1519833600010, 100) 
-sql insert into vdb0.vtb01 values(1519833600009, 90) (1519833600010, 100) vdb1.vtb11 values(1519833600009, 90) (1519833600010, 100) vdb2.vtb21 values(1519833600009, 90) (1519833600010, 100) vdb3.vtb31 values(1519833600009, 90) (1519833600010, 100) 
-
-sql select * from vdb0.mt
-
-if $rows != 21 then 
-  return -1
-endi
-
-print =============== step7
-sql insert into vdb0.vtb00 values(1519833600012, 120) (1519833600011, 110) vdb1.vtb10 values(1519833600012, 120) (1519833600011, 110) vdb2.vtb20 values(1519833600012, 120) (1519833600011, 110) vdb3.vtb30 values(1519833600012, 120) (1519833600011, 110) 
-sql insert into vdb0.vtb01 values(1519833600012, 120) (1519833600011, 110) vdb1.vtb11 values(1519833600012, 120) (1519833600011, 110) vdb2.vtb21 values(1519833600012, 120) (1519833600011, 110) vdb3.vtb31 values(1519833600012, 120) (1519833600011, 110) 
-
-sql select * from vdb0.mt
-
-if $rows != 25 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/stable/vnode3.sim b/tests/script/general/stable/vnode3.sim
deleted file mode 100644
index 61948b5063..0000000000
--- a/tests/script/general/stable/vnode3.sim
+++ /dev/null
@@ -1,179 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = v3_db
-$tbPrefix = v3_tb
-$mtPrefix = v3_mt
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
-  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( $i )
-  
-  $x = 0
-  while $x < $rowNum
-    $val = $x * 60000
-    $ms = 1519833600000 + $val 
-    sql insert into $tb values ($ms , $x ) 
-    $x = $x + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sql show vgroups
-print vgroups ==> $rows
-if $rows != 3 then 
-  return -1
-endi
-
-
-print =============== step2
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step3
-sql select count(tbcol) from $tb where ts <= 1519833840000
-print ===> $data00
-if $data00 != 5 then 
-  return -1
-endi
-
-print =============== step4
-sql select count(tbcol) as b from $tb
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-print =============== step5
-sql select count(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != $rowNum then 
-  return -1
-endi
-
-print =============== step6
-sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 5 then 
-  return -1
-endi
-
-print =============== step7
-sql select count(*) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-sql select count(tbcol) from $mt
-print ===> $data00
-if $data00 != $totalNum then 
-  return -1
-endi
-
-print =============== step8
-sql select count(tbcol) as c from $mt where ts <= 1519833840000
-print ===> $data00
-if $data00 != 50 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5
-print ===> $data00
-if $data00 != 100 then 
-  return -1
-endi
-
-sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
-print ===> $data00
-if $data00 != 25 then 
-  return -1
-endi
-
-print =============== step9
-sql select count(tbcol) as b from $mt interval(1m)
-print ===> $data01
-if $data01 != 10 then 
-  return -1
-endi
-
-sql select count(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 200 then 
-  return -1
-endi
-
-print =============== step10
-sql select count(tbcol) as b from $mt group by tgcol
-print ===> $data00
-if $data00 != $rowNum then 
-  return -1
-endi
-
-if $rows != $tbNum then 
-  return -1
-endi
-
-print =============== step11
-sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
-print ===> $data01
-if $data01 != 1 then 
-  return -1
-endi
-if $rows != 50 then 
-  return -1
-endi
-
-print =============== clear
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 2cad518128..46b6a40166 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -2,7 +2,7 @@
 #======================b1-start===============
 
 # ---- user
-./test.sh -f tsim/user/basic1.sim 
+./test.sh -f tsim/user/basic1.sim
 
 # ---- db
 ./test.sh -f tsim/db/basic1.sim
@@ -30,13 +30,22 @@
 ./test.sh -f tsim/query/interval-offset.sim
 
 # ---- show
-./test.sh -f tsim/show/basic.sim 
+./test.sh -f tsim/show/basic.sim
 
 # ---- table
-./test.sh -f tsim/table/basic1.sim 
+./test.sh -f tsim/table/basic1.sim
 
 # ---- tmq
 ./test.sh -f tsim/tmq/basic.sim
 ./test.sh -f tsim/tmq/basic1.sim
 
+# --- stable
+./test.sh -f tsim/stable/disk.sim
+./test.sh -f tsim/stable/dnode3.sim
+./test.sh -f tsim/stable/metrics.sim
+./test.sh -f tsim/stable/refcount.sim
+# ./test.sh -f tsim/stable/show.sim
+./test.sh -f tsim/stable/values.sim
+./test.sh -f tsim/stable/vnode3.sim
+
 #======================b1-end===============
diff --git a/tests/script/sh/massiveTable/compileVersion.sh b/tests/script/sh/massiveTable/compileVersion.sh
index 13b2baae32..68c049cad7 100755
--- a/tests/script/sh/massiveTable/compileVersion.sh
+++ b/tests/script/sh/massiveTable/compileVersion.sh
@@ -68,7 +68,7 @@ gitPullBranchInfo $TDengineBrVer
 compileTDengineVersion
 
 taos_dir=${projectDir}/debug/tools/shell
-taosd_dir=${projectDir}/debug/source/dnode/mgmt/main
+taosd_dir=${projectDir}/debug/source/dnode/mgmt
 exec_process_dir=${projectDir}/debug/tests/test/c
 
 rm -f /usr/bin/taos
diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim
new file mode 100644
index 0000000000..5c2848883b
--- /dev/null
+++ b/tests/script/tsim/db/alter_option.sim
@@ -0,0 +1,443 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/exec.sh -n dnode1 -s start
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+
+$loop_cnt = 0
+check_dnode_ready:
+	$loop_cnt = $loop_cnt + 1
+	sleep 200
+	if $loop_cnt == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05
+if $data00 != 1 then
+  return -1
+endi
+if $data04 != ready then
+  goto check_dnode_ready
+endi
+
+sql connect
+sql create dnode $hostname port 7200
+sql create dnode $hostname port 7300
+
+$loop_cnt = 0
+check_dnode_ready_1:
+	$loop_cnt = $loop_cnt + 1
+	sleep 200
+	if $loop_cnt == 10 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> rows: $rows 
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+print ===> $data20 $data21 $data22 $data23 $data24 $data25
+if $data00 != 1 then
+  return -1
+endi
+if $data01 != localhost:7100 then
+  return -1
+endi
+if $data04 != ready then
+  goto check_dnode_ready_1
+endi
+if $data14 != ready then
+  goto check_dnode_ready_1
+endi
+if $data24 != ready then
+  goto check_dnode_ready_1
+endi
+
+print ============= create database
+#database_option: {
+#    BLOCKS value       [3~1000, default: 6]
+#  | CACHE value        [default: 16M]
+#  | CACHELAST value    [0, 1, 2, 3]
+#  | COMP               [0 | 1 | 2]
+#  | DAYS value         [unit is minutes]
+#  | FSYNC value        [0 ~ 180000 ms]
+#  | MAXROWS value      [default: 4096]
+#  | MINROWS value      [default: 100]
+#  | KEEP value         [days, 365000]
+#  | PRECISION          ['ms' | 'us' | 'ns']
+#  | QUORUM value       [1 | 2]
+#  | REPLICA value      [1 | 3]
+#  | TTL value          [unit is day, min=1]
+#  | WAL value          [1 | 2]
+#  | VGROUPS value      [default: 2]
+#  | SINGLE_STABLE      [0 | 1]
+#  | STREAM_MODE        [0 | 1]
+
+sql create database db BLOCKS 7 CACHE 3 CACHELAST 3 COMP 0 DAYS 240 FSYNC 1000 MAXROWS 8000 MINROWS 10 KEEP 1000 PRECISION 'ns' QUORUM 1 REPLICA 3 TTL 7 WAL 2 VGROUPS 6 SINGLE_STABLE 1 STREAM_MODE 1
+sql show databases
+print rows: $rows
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+print $data10 $data11 $data12 $data13 $data14 $data15 $data16 $data17 $data18 $data19
+print ====> dataX_db
+print $data0_db $data1_db $data2_db $data3_db $data4_db $data5_db $data6_db $data7_db $data8_db $data9_db $data10_db $data11_db $data12_db $data13_db $data14_db $data15_db $data16_db $data17_db
+
+if $rows != 2 then
+  return -1
+endi
+if $data0_db != db then # name
+  return -1
+endi
+if $data2_db != 6 then  # vgroups
+  return -1
+endi
+if $data3_db != 0 then  # ntables
+  return -1
+endi
+if $data4_db != 3 then  # replica
+  return -1
+endi
+if $data5_db != 1 then  # quorum
+  return -1
+endi
+if $data6_db != 240 then  # days
+  return -1
+endi
+if $data7_db != 1000,1000,1000 then # keep
+  return -1
+endi
+if $data8_db != 3 then  # cache
+  return -1
+endi
+if $data9_db != 7 then  # blocks
+  return -1
+endi
+if $data10_db != 10 then  # minrows
+  return -1
+endi
+if $data11_db != 8000 then  # maxrows
+  return -1
+endi
+if $data12_db != 2 then  # wal
+  return -1
+endi
+if $data13_db != 1000 then  # fsync
+  return -1
+endi
+if $data14_db != 0 then  # comp
+  return -1
+endi
+if $data15_db != 3 then  # cachelast
+  return -1
+endi
+if $data16_db != ns then  # precision
+  return -1
+endi
+
+print ============== not support modify options: name, create_time, vgroups, ntables
+sql_error alter database db name dba
+sql_error alter database db create_time "2022-03-03 15:08:13.329"
+sql_error alter database db vgroups -1
+sql_error alter database db vgroups 0
+sql_error alter database db vgroups 2
+sql_error alter database db vgroups 20
+sql_error alter database db ntables -1
+sql_error alter database db ntables 0
+sql_error alter database db ntables 1
+sql_error alter database db ntables 10
+
+#print ============== modify replica
+sql_error alter database db replica 2
+sql_error alter database db replica 5
+sql_error alter database db replica -1
+sql_error alter database db replica 0
+#sql alter database db replica 1
+#sql show databases
+#print replica: $data4_db
+#if $data4_db != 1 then 
+#  return -1
+#endi
+#sql alter database db replica 3
+#sql show databases
+#print replica: $data4_db
+#if $data4_db != 3 then 
+#  return -1
+#endi
+
+print ============== modify quorum
+sql alter database db quorum 2
+sql show databases
+print quorum $data5_db
+if $data5_db != 2 then 
+  return -1
+endi
+sql alter database db quorum 1
+sql show databases
+print quorum $data5_db
+if $data5_db != 1 then 
+  return -1
+endi
+
+sql_error alter database db quorum -1
+sql_error alter database db quorum 0
+sql_error alter database db quorum 3
+sql_error alter database db quorum 4
+sql_error alter database db quorum 5
+
+#print ============== modify days
+#sql alter database db days 480
+#sql show databases
+#print days $data6_db
+#if $data6_db != 480 then  # days
+#  return -1
+#endi
+#sql alter database db days 360
+#sql show databases
+#print days $data6_db
+#if $data6_db != 360 then  # days
+#  return -1
+#endi
+
+sql_error alter database db days 0
+#sql_error alter database db days 14400  # set over than keep
+
+
+print ============== modify keep
+sql alter database db keep 2000
+sql show databases
+print keep $data7_db
+if $data7_db != 1000,1000,2000 then
+  return -1
+endi
+
+#sql alter database db keep 1000,2000
+#sql show databases
+#print keep $data7_db
+#if $data7_db != 500,500,500 then 
+#  return -1
+#endi
+
+#sql alter database db keep 40,50
+#sql alter database db keep 30,31
+#sql alter database db keep 20
+#sql_error alter database db keep 10.0
+#sql_error alter database db keep 9
+#sql_error alter database db keep 1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
+#sql_error alter database db keep 365001
+
+print ============== modify cache
+#sql alter database db cache 12
+#sql show databases
+#print cache $data8_db
+#if $data8_db != 12 then 
+#  return -1
+#endi
+#sql alter database db cache 1
+#sql show databases
+#print cache $data8_db
+#if $data8_db != 6 then 
+#  return -1
+#endi
+#
+#sql_error alter database db cache 60
+#sql_error alter database db cache 50
+#sql_error alter database db cache 20
+#sql_error alter database db cache 3
+#sql_error alter database db cache 129
+#sql_error alter database db cache 300
+sql_error alter database db cache 0
+sql_error alter database db cache -1
+
+print ============== modify blocks
+sql alter database db blocks 3
+sql show databases
+print blocks $data9_db
+if $data9_db != 3 then 
+  return -1
+endi
+sql alter database db blocks 11
+sql show databases
+print blocks $data9_db
+if $data9_db != 11 then 
+  return -1
+endi
+
+sql alter database db blocks 40
+sql alter database db blocks 30
+sql alter database db blocks 20
+sql alter database db blocks 10
+sql_error alter database db blocks 2
+sql_error alter database db blocks 1
+sql_error alter database db blocks 0
+sql_error alter database db blocks -1
+sql_error alter database db blocks 10001
+
+#print ============== modify minrows
+#sql alter database db minrows 8
+#sql show databases
+#print minrows $data10_db
+#if $data10_db != 8 then 
+#  return -1
+#endi
+#sql alter database db minrows 200
+#sql show databases
+#print minrows $data10_db
+#if $data10_db != 200 then 
+#  return -1
+#endi
+#
+#sql alter database db minrows 11
+#sql show databases
+#print minrows $data10_db
+#if $data10_db != 11 then 
+#  return -1
+#endi
+#sql_error alter database db minrows 8000
+#sql_error alter database db minrows 8001
+
+#print ============== modify maxrows
+#sql alter database db maxrows 1000
+#sql show databases
+#print maxrows $data11_db
+#if $data11_db != 1000 then 
+#  return -1
+#endi
+#sql alter database db maxrows 2000
+#sql show databases
+#print maxrows $data11_db
+#if $data11_db != 2000 then 
+#  return -1
+#endi
+#
+#sql_error alter database db maxrows 11  # equal minrows
+#sql_error alter database db maxrows 10  # little than minrows
+
+print ============== step wal
+sql alter database db wal 1
+sql show databases
+print wal $data12_db
+if $data12_db != 1 then 
+  return -1
+endi
+sql alter database db wal 2
+sql show databases
+print wal $data12_db
+if $data12_db != 2 then 
+  return -1
+endi
+
+sql_error alter database db wal 0
+sql_error alter database db wal 3
+sql_error alter database db wal 100
+sql_error alter database db wal -1
+
+print ============== modify fsync
+sql alter database db fsync 2000
+sql show databases
+print fsync $data13_db
+if $data13_db != 2000 then 
+  return -1
+endi
+sql alter database db fsync 500
+sql show databases
+print fsync $data13_db
+if $data13_db != 500 then 
+  return -1
+endi
+sql_error alter database db fsync 0
+sql_error alter database db fsync -1
+
+print ============== modify comp
+sql alter database db comp 1
+sql show databases
+print comp $data14_db
+if $data14_db != 1 then 
+  return -1
+endi
+sql alter database db comp 2
+sql show databases
+print comp $data14_db
+if $data14_db != 2 then 
+  return -1
+endi
+sql alter database db comp 1
+sql show databases
+print comp $data14_db
+if $data14_db != 1 then 
+  return -1
+endi
+sql alter database db comp 0
+sql show databases
+print comp $data14_db
+if $data14_db != 0 then 
+  return -1
+endi
+
+sql_error alter database db comp 3
+sql_error alter database db comp 4
+sql_error alter database db comp 5
+sql_error alter database db comp -1
+
+print ============== modify cachelast [0, 1, 2, 3]
+sql alter database db cachelast 2
+sql show databases
+print cachelast $data15_db
+if $data15_db != 2 then 
+  return -1
+endi
+sql alter database db cachelast 1
+sql show databases
+print cachelast $data15_db
+if $data15_db != 1 then 
+  return -1
+endi
+sql alter database db cachelast 0
+sql show databases
+print cachelast $data15_db
+if $data15_db != 0 then 
+  return -1
+endi
+sql alter database db cachelast 2
+sql show databases
+print cachelast $data15_db
+if $data15_db != 2 then 
+  return -1
+endi
+sql alter database db cachelast 3
+sql show databases
+print cachelast $data15_db
+if $data15_db != 3 then 
+  return -1
+endi
+
+sql_error alter database db comp 4
+sql_error alter database db comp 10
+sql_error alter database db comp -1
+
+print ============== modify precision
+sql alter database db precision 'ms'
+sql show databases
+print precision $data16_db
+if $data16_db != ms then 
+  return -1
+endi
+sql alter database db precision 'us'
+sql show databases
+print precision $data16_db
+if $data16_db != us then 
+  return -1
+endi
+sql alter database db precision 'ns'
+sql show databases
+print precision $data16_db
+if $data16_db != ns then 
+  return -1
+endi
+
+sql_error alter database db prec 'xs'
+
+#system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stable/disk.sim b/tests/script/tsim/stable/disk.sim
new file mode 100644
index 0000000000..0e33c2066d
--- /dev/null
+++ b/tests/script/tsim/stable/disk.sim
@@ -0,0 +1,206 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 2000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = d_db
+$tbPrefix = d_tb
+$mtPrefix = d_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val
+    sql insert into $tb values ($ms , $x )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 2 then
+  return -1
+endi
+
+sql select count(tbcol) from $mt
+print select count(tbcol) from $mt ===> $data00
+if $data00 != $totalNum then
+  return -1
+endi
+
+sleep 1000
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 3000
+system sh/exec.sh -n dnode1 -s start
+sleep 6000
+
+sql use $db
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 2 then
+  return -1
+endi
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step3
+# TODO : where condition
+# sql select count(tbcol) from $tb where ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 5 then
+#   return -1
+# endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data00
+if $data00 != 1 then
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step6
+# TODO
+# sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+# print ===> $data00
+# if $data00 != 1 then
+#   return -1
+# endi
+# if $rows != 5 then
+#   return -1
+# endi
+
+print =============== step7
+# TODO
+# sql select count(*) from $mt
+# print select count(*) from $mt ===> $data00
+# if $data00 != $totalNum then
+#   return -1
+# endi
+
+sql select count(tbcol) from $mt
+print ===> $data00
+if $data00 != $totalNum then
+  return -1
+endi
+
+print =============== step8
+# TODO
+# sql select count(tbcol) as c from $mt where ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 50 then
+#   return -1
+# endi
+#
+# sql select count(tbcol) as c from $mt where tgcol < 5
+# print ===> $data00
+# if $data00 != 100 then
+#   return -1
+# endi
+#
+# sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 25 then
+#   return -1
+# endi
+
+print =============== step9
+# TODO : count from stable
+# sql select count(tbcol) as b from $mt interval(1m)
+# print select count(tbcol) as b from $mt interval(1m) ===> $data01
+# if $data01 != 10 then
+#   return -1
+# endi
+
+# sql select count(tbcol) as b from $mt interval(1d)
+# print ===> $data02
+# if $data01 != 200 then
+#   return -1
+# endi
+
+print =============== step10
+# TODO
+# print select count(tbcol) as b from $mt group by tgcol
+# sql select count(tbcol) as b from $mt group by tgcol
+# print ===> $data00
+# if $data00 != $rowNum then
+#   return -1
+# endi
+
+# if $rows != $tbNum then
+#   return -1
+# endi
+#
+print =============== step11
+# TODO : where condition
+# sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+# print ===> $data01
+# if $data01 != 1 then
+#   return -1
+# endi
+# if $rows != 50 then
+#   return -1
+# endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/tsim/stable/dnode3.sim b/tests/script/tsim/stable/dnode3.sim
new file mode 100644
index 0000000000..c2243b1ac8
--- /dev/null
+++ b/tests/script/tsim/stable/dnode3.sim
@@ -0,0 +1,213 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode2 -c walLevel -v 1
+system sh/cfg.sh -n dnode3 -c walLevel -v 1
+system sh/cfg.sh -n dnode4 -c walLevel -v 1
+# system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+# system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+# system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+# system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sql connect
+
+sql create dnode $hostname PORT 7200
+sql create dnode $hostname PORT 7300
+system sh/exec.sh -n dnode2 -s start
+system sh/exec.sh -n dnode3 -s start
+system sh/exec.sh -n dnode4 -s start
+$x = 0
+createDnode:
+	$x = $x + 1
+	sleep 1000
+	if $x == 20 then
+	  return -1
+	endi
+sql show dnodes;
+if $data4_2 == offline then
+  goto createDnode
+endi
+if $data4_3 == offline then
+  goto createDnode
+endi
+if $data4_4 == offline then
+  goto createDnode
+endi
+
+print ======================== dnode1 start
+
+$dbPrefix = r3v3_db
+$tbPrefix = r3v3_tb
+$mtPrefix = r3v3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val
+    sql insert into $tb values ($ms , $x )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 2 then
+  return -1
+endi
+
+sleep 100
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step3
+# TODO : where condition
+# sql select count(tbcol) from $tb where ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 5 then
+#   return -1
+# endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data00
+if $data00 != 1 then
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step6
+# sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+# print ===> $data00
+# if $data00 != 1 then
+#   return -1
+# endi
+# if $rows != 5 then
+#   return -1
+# endi
+
+print =============== step7
+# print select count(*) from $mt
+# sql select count(*) from $mt
+# print ===> $data00
+# if $data00 != $totalNum then
+#   return -1
+# endi
+#
+# sql select count(tbcol) from $mt
+# print ===> $data00
+# if $data00 != $totalNum then
+#   return -1
+# endi
+
+print =============== step8
+# sql select count(tbcol) as c from $mt where ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 50 then
+#   return -1
+# endi
+#
+# sql select count(tbcol) as c from $mt where tgcol < 5
+# print ===> $data00
+# if $data00 != 100 then
+#   return -1
+# endi
+#
+# sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 25 then
+#   return -1
+# endi
+
+print =============== step9
+# TODO : group by in stable
+# sql select count(tbcol) as b from $mt interval(1m)
+# print ===> $data00
+# if $data00 != 10 then
+#   return -1
+# endi
+#
+# sql select count(tbcol) as b from $mt interval(1d)
+# print ===> $data00
+# if $data00 != 200 then
+#   return -1
+# endi
+
+print =============== step10
+# sql select count(tbcol) as b from $mt group by tgcol
+# print ===> $data00
+# if $data00 != $rowNum then
+#   return -1
+# endi
+#
+# if $rows != $tbNum then
+#   return -1
+# endi
+
+print =============== step11
+# sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+# print ===> $data00
+# if $data00 != 1 then
+#   return -1
+# endi
+# if $rows != 50 then
+#   return -1
+# endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop  -x SIGINT
diff --git a/tests/script/general/stable/metrics.sim b/tests/script/tsim/stable/metrics.sim
similarity index 64%
rename from tests/script/general/stable/metrics.sim
rename to tests/script/tsim/stable/metrics.sim
index a3dca3f1a5..948af72d09 100644
--- a/tests/script/general/stable/metrics.sim
+++ b/tests/script/tsim/stable/metrics.sim
@@ -24,14 +24,14 @@ sql use $db
 
 sql create table $mt (ts timestamp, speed int) TAGS(sp int)
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step2
 sql drop table $mt
 sql show stables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -39,97 +39,98 @@ print =============== step3
 sql create table $mt (ts timestamp, speed int) TAGS(sp int)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != $mt then 
+if $data00 != $mt then
   return -1
 endi
-if $data04 != 0 then 
-  return -1
-endi
-sql select * from $mt
-if $rows != 0 then 
+if $data04 != 1 then
   return -1
 endi
+# TODO : select * from stable
+# sql select * from $mt
+# if $rows != 0 then
+#   return -1
+# endi
 
 print =============== step4
 $i = 0
 $tb = $tbPrefix . $i
 sql create table $tb using $mt tags(1)
-$i = 1 
+$i = 1
 $tb = $tbPrefix . $i
 sql create table $tb using $mt tags(2)
-$i = 2 
+$i = 2
 $tb = $tbPrefix . $i
 sql create table $tb using $mt tags(3)
 
 sql show tables
-if $rows != 3 then 
-  return -1
-endi
-if $data03 != $mt then 
+if $rows != 3 then
   return -1
 endi
+# if $data03 != $mt then
+#   return -1
+# endi
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != $mt then 
-  return -1
-endi
-if $data04 != 3 then 
+if $data00 != $mt then
   return -1
 endi
+# if $data04 != 3 then
+#   return -1
+# endi
 
 print =============== step5
 $i = 0
 $tb = $tbPrefix . $i
-sql insert into $tb values (now + 1m , 1 ) 
+sql insert into $tb values (now + 1m , 1 )
 $i = 1
 $tb = $tbPrefix . $i
-sql insert into $tb values (now + 1m , 1 ) 
+sql insert into $tb values (now + 1m , 1 )
 $i = 2
 $tb = $tbPrefix . $i
-sql insert into $tb values (now + 1m , 1 ) 
+sql insert into $tb values (now + 1m , 1 )
 
 print sleep 8000
 sleep 8000
 
 print =============== step6
 
-sql select * from $mt
-print select * from $mt ==> $rows $data00
-if $rows != 3 then 
-  return -1
-endi
+# sql select * from $mt
+# print select * from $mt ==> $rows $data00
+# if $rows != 3 then
+#   return -1
+# endi
 
 print =============== step7
-sql select * from $mt where sp = 1
-print select * from $mt where sp = 1 ==> $rows $data00
-if $rows != 1 then 
-  return -1
-endi
+# sql select * from $mt where sp = 1
+# print select * from $mt where sp = 1 ==> $rows $data00
+# if $rows != 1 then
+#   return -1
+# endi
 
 print =============== step8
 sql drop table $mt
 
 print =============== step9
 
-sql show tables
-if $rows != 0 then 
-  return -1
-endi
+#sql show tables
+#if $rows != 0 then
+#  return -1
+#endi
 
 sql show stables
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 
diff --git a/tests/script/general/stable/refcount.sim b/tests/script/tsim/stable/refcount.sim
similarity index 79%
rename from tests/script/general/stable/refcount.sim
rename to tests/script/tsim/stable/refcount.sim
index 6629dc1177..1f00483090 100644
--- a/tests/script/general/stable/refcount.sim
+++ b/tests/script/tsim/stable/refcount.sim
@@ -16,11 +16,11 @@ sql create table d1.t2 (ts timestamp, i int);
 sql create table d1.t3 (ts timestamp, i int);
 sql insert into d1.t1 values(now, 1);
 sql insert into d1.t2 values(now, 1);
-sql drop table d1.t1;
+# sql drop table d1.t1;
 sql drop database d1;
 
 sql show databases;
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -32,24 +32,24 @@ sql create table d2.t2 (ts timestamp, i int);
 sql create table d2.t3 (ts timestamp, i int);
 sql insert into d2.t1 values(now, 1);
 sql insert into d2.t2 values(now, 1);
-sql drop table d2.t1;
-sql drop table d2.t2;
-sql drop table d2.t3;
-
-sql show d2.tables;
-if $rows != 0 then 
-  return -1
-endi
+# sql drop table d2.t1;
+# sql drop table d2.t2;
+# sql drop table d2.t3;
+#
+# sql show d2.tables;
+# if $rows != 0 then
+#   return -1
+# endi
 
 sql show d2.vgroups;
-if $rows != 0 then 
+if $rows != 2 then
   return -1
 endi
 
 sql drop database d2;
 
 sql show databases;
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -61,24 +61,24 @@ sql create table d3.t1 using d3.st tags(1);
 sql create table d3.t2 using d3.st tags(1);
 sql create table d3.t3 using d3.st tags(1);
 sql insert into d3.t1 values(now, 1);
-sql drop table d3.t1;
-sql drop table d3.t2;
-sql drop table d3.t3;
-
-sql show d3.tables;
-if $rows != 0 then 
-  return -1
-endi
+# sql drop table d3.t1;
+# sql drop table d3.t2;
+# sql drop table d3.t3;
+#
+# sql show d3.tables;
+# if $rows != 0 then
+#   return -1
+# endi
 
 sql show d3.vgroups;
-if $rows != 0 then 
+if $rows != 2 then
   return -1
 endi
 
 sql drop database d3;
 
 sql show databases;
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -90,23 +90,23 @@ sql create table d4.t1 using d4.st tags(1);
 sql create table d4.t2 using d4.st tags(1);
 sql create table d4.t3 using d4.st tags(1);
 sql insert into d4.t1 values(now, 1);
-sql drop table d4.t1;
+# sql drop table d4.t1;
 sql drop table d4.st;
-
-sql show d4.tables;
-if $rows != 0 then 
-  return -1
-endi
+#
+# sql show d4.tables;
+# if $rows != 0 then
+#   return -1
+# endi
 
 sql show d4.stables;
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql drop database d4;
 
 sql show databases;
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -118,12 +118,12 @@ sql create table d5.t1 using d5.st tags(1);
 sql create table d5.t2 using d5.st tags(1);
 sql create table d5.t3 using d5.st tags(1);
 sql insert into d5.t1 values(now, 1);
-sql drop table d5.t1;
+# sql drop table d5.t1;
 
 sql drop database d5;
 
 sql show databases;
-if $rows != 0 then 
+if $rows != 1 then
   return -1
 endi
 
diff --git a/tests/script/general/stable/show.sim b/tests/script/tsim/stable/show.sim
similarity index 63%
rename from tests/script/general/stable/show.sim
rename to tests/script/tsim/stable/show.sim
index 5fe05b41eb..8ebb765a78 100644
--- a/tests/script/general/stable/show.sim
+++ b/tests/script/tsim/stable/show.sim
@@ -10,20 +10,37 @@ sql connect
 print ======================== create stable
 
 sql create database d1
+sql use d1
 
 $x = 0
 while $x < 128
   $tb = d1.s . $x
   sql create table $tb (ts timestamp, i int) tags (j int)
   $x = $x + 1
-endw 
+endw
+
+print ======================== describe stables
+# TODO : create stable error
+$m = 0
+while $m < 128
+  $tb = s . $m
+  $filter = ' . $tb
+  $filter = $filter . '
+  sql show stables like $filter
+  # print sql : show stables like $filter  ==> $rows
+  if $rows != 1 then
+    return -1
+  endi
+  $m = $m + 1
+endw
+
 
 print ======================== show stables
 
 sql show d1.stables
 
 print num of stables is $rows
-if $rows != 128 then 
+if $rows != 128 then
   return -1
 endi
 
@@ -34,15 +51,15 @@ while $x < 424
   $tb = d1.t . $x
   sql create table $tb using d1.s0 tags( $x )
   $x = $x + 1
-endw 
+endw
 
 print ======================== show stables
 
 sql show d1.tables
 
 print num of tables is $rows
-if $rows != 424 then 
+if $rows != 424 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stable/values.sim b/tests/script/tsim/stable/values.sim
new file mode 100644
index 0000000000..e5e3118e12
--- /dev/null
+++ b/tests/script/tsim/stable/values.sim
@@ -0,0 +1,121 @@
+system sh/stop_dnodes.sh
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 2000
+sql connect
+
+print ======================== dnode1 start
+
+sql create database vdb0
+sql create table vdb0.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+sql create table vdb0.vtb00 using vdb0.mt tags( 0 )
+sql create table vdb0.vtb01 using vdb0.mt tags( 0 )
+
+sql create database vdb1
+sql create table vdb1.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+# sql_error create table vdb1.vtb10 using vdb0.mt tags( 1 )
+# sql_error create table vdb1.vtb11 using vdb0.mt tags( 1 )
+sql create table vdb1.vtb10 using vdb1.mt tags( 1 )
+sql create table vdb1.vtb11 using vdb1.mt tags( 1 )
+
+sql create database vdb2
+sql create table vdb2.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+# sql_error create table vdb2.vtb20 using vdb0.mt tags( 2 )
+# sql_error create table vdb2.vtb21 using vdb0.mt tags( 2 )
+sql create table vdb2.vtb20 using vdb2.mt tags( 2 )
+sql create table vdb2.vtb21 using vdb2.mt tags( 2 )
+
+sql create database vdb3
+sql create table vdb3.mt (ts timestamp, tbcol int) TAGS(tgcol int)
+# sql_error create table vdb3.vtb20 using vdb0.mt tags( 2 )
+# sql_error create table vdb3.vtb21 using vdb0.mt tags( 2 )
+sql create table vdb3.vtb30 using vdb3.mt tags( 3 )
+sql create table vdb3.vtb31 using vdb3.mt tags( 3 )
+
+print =============== step2
+sql insert into vdb0.vtb00 values (1519833600000 , 10) (1519833600001, 20) (1519833600002, 30)
+sql insert into vdb0.vtb01 values (1519833600000 , 10) (1519833600001, 20) (1519833600002, 30)
+sql insert into vdb1.vtb10 values (1519833600000 , 11) (1519833600001, 21) (1519833600002, 31)
+sql insert into vdb1.vtb11 values (1519833600000 , 11) (1519833600001, 21) (1519833600002, 31)
+sql insert into vdb2.vtb20 values (1519833600000 , 12) (1519833600001, 22) (1519833600002, 32)
+sql insert into vdb2.vtb21 values (1519833600000 , 12) (1519833600001, 22) (1519833600002, 32)
+sql insert into vdb3.vtb30 values (1519833600000 , 13) (1519833600001, 23) (1519833600002, 33)
+sql insert into vdb3.vtb31 values (1519833600000 , 13) (1519833600001, 23) (1519833600002, 33)
+# sql select * from vdb0.mt
+sql select ts from vdb0.mt
+
+if $rows != 6 then
+  return -1
+endi
+
+print =============== step3
+sql insert into vdb0.vtb00 values (1519833600003 , 40) (1519833600005, 50) (1519833600004, 60)
+sql insert into vdb0.vtb01 values (1519833600003 , 40) (1519833600005, 50) (1519833600004, 60)
+sql insert into vdb1.vtb10 values (1519833600003 , 41) (1519833600005, 51) (1519833600004, 61)
+sql insert into vdb1.vtb11 values (1519833600003 , 41) (1519833600005, 51) (1519833600004, 61)
+sql insert into vdb2.vtb20 values (1519833600003 , 42) (1519833600005, 52) (1519833600004, 62)
+sql insert into vdb2.vtb21 values (1519833600003 , 42) (1519833600005, 52) (1519833600004, 62)
+sql insert into vdb3.vtb30 values (1519833600003 , 43) (1519833600005, 53) (1519833600004, 63)
+sql insert into vdb3.vtb31 values (1519833600003 , 43) (1519833600005, 53) (1519833600004, 63)
+# TODO : select * from stable
+# sql select * from vdb0.mt
+sql select ts from vdb0.mt
+
+if $rows != 12 then
+  return -1
+endi
+
+print =============== step4
+# TODO : insert into diffrent table
+# sql insert into vdb0.vtb00 values(1519833600006, 60) (1519833600007, 70) vdb0.vtb01 values(1519833600006, 60) (1519833600007, 70)
+# sql insert into vdb1.vtb10 values(1519833600006, 61) (1519833600007, 71) vdb1.vtb11 values(1519833600006, 61) (1519833600007, 71)
+# sql insert into vdb2.vtb20 values(1519833600006, 62) (1519833600007, 72) vdb2.vtb21 values(1519833600006, 62) (1519833600007, 72)
+# sql insert into vdb3.vtb30 values(1519833600006, 63) (1519833600007, 73) vdb3.vtb31 values(1519833600006, 63) (1519833600007, 73)
+# # sql select * from vdb0.mt
+# sql select ts from vdb0.mt
+#
+# if $rows != 16 then
+#   return -1
+# endi
+
+print =============== step5
+# sql insert into vdb0.vtb00 values(1519833600008, 80) (1519833600007, 70) vdb0.vtb01 values(1519833600006, 80) (1519833600007, 70)
+# sql insert into vdb1.vtb10 values(1519833600008, 81) (1519833600007, 71) vdb1.vtb11 values(1519833600006, 81) (1519833600007, 71)
+# sql insert into vdb2.vtb20 values(1519833600008, 82) (1519833600007, 72) vdb2.vtb21 values(1519833600006, 82) (1519833600007, 72)
+# sql insert into vdb3.vtb30 values(1519833600008, 83) (1519833600007, 73) vdb3.vtb31 values(1519833600006, 83) (1519833600007, 73)
+# # sql select * from vdb0.mt
+# sql select ts from vdb0.mt
+#
+# if $rows != 17 then
+#   return -1
+# endi
+
+print =============== step6
+# sql insert into vdb0.vtb00 values(1519833600009, 90) (1519833600010, 100) vdb1.vtb10 values(1519833600009, 90) (1519833600010, 100) vdb2.vtb20 values(1519833600009, 90) (1519833600010, 100) vdb3.vtb30 values(1519833600009, 90) (1519833600010, 100)
+# sql insert into vdb0.vtb01 values(1519833600009, 90) (1519833600010, 100) vdb1.vtb11 values(1519833600009, 90) (1519833600010, 100) vdb2.vtb21 values(1519833600009, 90) (1519833600010, 100) vdb3.vtb31 values(1519833600009, 90) (1519833600010, 100)
+#
+# # sql select * from vdb0.mt
+# sql select ts from vdb0.mt
+#
+# if $rows != 21 then
+#   return -1
+# endi
+
+print =============== step7
+# sql insert into vdb0.vtb00 values(1519833600012, 120) (1519833600011, 110) vdb1.vtb10 values(1519833600012, 120) (1519833600011, 110) vdb2.vtb20 values(1519833600012, 120) (1519833600011, 110) vdb3.vtb30 values(1519833600012, 120) (1519833600011, 110)
+# sql insert into vdb0.vtb01 values(1519833600012, 120) (1519833600011, 110) vdb1.vtb11 values(1519833600012, 120) (1519833600011, 110) vdb2.vtb21 values(1519833600012, 120) (1519833600011, 110) vdb3.vtb31 values(1519833600012, 120) (1519833600011, 110)
+#
+# # sql select * from vdb0.mt
+# sql select ts from vdb0.mt
+#
+# if $rows != 25 then
+#   return -1
+# endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/stable/vnode3.sim b/tests/script/tsim/stable/vnode3.sim
new file mode 100644
index 0000000000..2d408b4191
--- /dev/null
+++ b/tests/script/tsim/stable/vnode3.sim
@@ -0,0 +1,181 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 2000
+sql connect
+
+print ======================== dnode1 start
+
+$dbPrefix = v3_db
+$tbPrefix = v3_tb
+$mtPrefix = v3_mt
+$tbNum = 10
+$rowNum = 20
+$totalNum = 200
+
+print =============== step1
+$i = 0
+$db = $dbPrefix . $i
+$mt = $mtPrefix . $i
+
+sql create database $db
+sql use $db
+sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
+
+$i = 0
+while $i < $tbNum
+  $tb = $tbPrefix . $i
+  sql create table $tb using $mt tags( $i )
+
+  $x = 0
+  while $x < $rowNum
+    $val = $x * 60000
+    $ms = 1519833600000 + $val
+    sql insert into $tb values ($ms , $x )
+    $x = $x + 1
+  endw
+
+  $i = $i + 1
+endw
+
+sql show vgroups
+print vgroups ==> $rows
+if $rows != 2 then
+  return -1
+endi
+
+
+print =============== step2
+$i = 1
+$tb = $tbPrefix . $i
+
+sql select count(*) from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+sql select count(tbcol) from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step3
+# TODO : where condition
+# sql select count(tbcol) from $tb where ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 5 then
+#   return -1
+# endi
+
+print =============== step4
+sql select count(tbcol) as b from $tb
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step5
+sql select count(tbcol) as b from $tb interval(1m)
+print ===> $data00
+if $data00 != 1 then
+  return -1
+endi
+
+sql select count(tbcol) as b from $tb interval(1d)
+print ===> $data00
+if $data00 != $rowNum then
+  return -1
+endi
+
+print =============== step6
+# sql select count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+# print ===> $data00
+# if $data00 != 1 then
+#   return -1
+# endi
+# if $rows != 5 then
+#   return -1
+#endi
+
+print =============== step7
+# TODO : count(*) err
+# sql select count(*) from $mt
+# print ===> $data00
+# if $data00 != $totalNum then
+#   return -1
+# endi
+#
+# sql select count(tbcol) from $mt
+# print ===> $data00
+# if $data00 != $totalNum then
+#   return -1
+# endi
+
+print =============== step8
+# sql select count(tbcol) as c from $mt where ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 50 then
+#   return -1
+# endi
+
+# sql select count(tbcol) as c from $mt where tgcol < 5
+# print ===> $data00
+# if $data00 != 100 then
+#   return -1
+# endi
+
+# sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= 1519833840000
+# print ===> $data00
+# if $data00 != 25 then
+#   return -1
+# endi
+
+print =============== step9
+# sql select count(tbcol) as b from $mt interval(1m)
+# print ===> $data00
+# if $data00 != 10 then
+#   return -1
+# endi
+#
+# sql select count(tbcol) as b from $mt interval(1d)
+# print ===> $data00
+# if $data00 != 200 then
+#   return -1
+# endi
+
+print =============== step10
+# sql select count(tbcol) as b from $mt group by tgcol
+# print ===> $data00
+# if $data00 != $rowNum then
+#   return -1
+# endi
+#
+# if $rows != $tbNum then
+#   return -1
+# endi
+
+print =============== step11
+# sql select count(tbcol) as b from $mt  where ts <= 1519833840000 interval(1m) group by tgcol
+# print ===> $data01
+# if $data01 != 1 then
+#   return -1
+# endi
+# if $rows != 50 then
+#   return -1
+# endi
+
+print =============== clear
+sql drop database $db
+sql show databases
+if $rows != 1 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/tmq/basic1.sim b/tests/script/tsim/tmq/basic1.sim
index fe6a7a0660..cfcb1ac992 100644
--- a/tests/script/tsim/tmq/basic1.sim
+++ b/tests/script/tsim/tmq/basic1.sim
@@ -66,15 +66,15 @@ print =============== will support: * from stb; function from stb/ctb
 
 sql create topic topic_stb_column as select ts, c1, c3 from stb
 #sql create topic topic_stb_all as select * from stb
-#sql create topic topic_stb_function as select ts, abs(c1), sina(c2) from stb
+sql create topic topic_stb_function as select ts, abs(c1), sin(c2) from stb
 
 sql create topic topic_ctb_column as select ts, c1, c3 from ct0
 sql create topic topic_ctb_all as select * from ct0
-#sql create topic topic_ctb_function as select ts, abs(c1), sina(c2) from ct0
+sql create topic topic_ctb_function as select ts, abs(c1), sin(c2) from ct0
 
 sql create topic topic_ntb_column as select ts, c1, c3 from ntb
 sql create topic topic_ntb_all as select * from ntb
-#sql create topic topic_ntb_function as select ts, abs(c1), sina(c2) from ntb
+sql create topic topic_ntb_function as select ts, abs(c1), sin(c2) from ntb
 
 sql show tables
 if $rows != 3 then 
@@ -147,6 +147,13 @@ endi
 #  return -1
 #endi
 
+print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_stb_function" -k "group.id:tg2"
+system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_stb_function" -k "group.id:tg2"
+print cmd result----> $system_content
+if $system_content != @{consume success: 20, 0}@ then
+  return -1
+endi
+
 print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_column" -k "group.id:tg2"
 system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_column" -k "group.id:tg2"
 print cmd result----> $system_content
@@ -161,6 +168,13 @@ if $system_content != @{consume success: 10, 0}@ then
   return -1
 endi
 
+print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_function" -k "group.id:tg2"
+system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ctb_function" -k "group.id:tg2"
+print cmd result----> $system_content
+if $system_content != @{consume success: 10, 0}@ then
+  return -1
+endi
+
 print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_column" -k "group.id:tg2"
 system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_column" -k "group.id:tg2"
 print cmd result----> $system_content
@@ -175,6 +189,13 @@ if $system_content != @{consume success: 20, 0}@ then
   return -1
 endi
 
+print cmd===> system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_function" -k "group.id:tg2"
+system_content ../../debug/tests/test/c/tmq_sim -c ../../sim/tsim/cfg -d $dbNamme -t "topic_ntb_function" -k "group.id:tg2"
+print cmd result----> $system_content
+if $system_content != @{consume success: 20, 0}@ then
+  return -1
+endi
+
 print =============== create database , vgroup 4
 $dbNamme = d1
 sql create database $dbNamme vgroups 4
diff --git a/tests/test/c/tmqDemo.c b/tests/test/c/tmqDemo.c
index 182d40c96a..d339166d74 100644
--- a/tests/test/c/tmqDemo.c
+++ b/tests/test/c/tmqDemo.c
@@ -387,11 +387,12 @@ void perf_loop(tmq_t* tmq, tmq_list_t* topics, int32_t totalMsgs, int64_t walLog
     printf("subscribe err\n");
     return;
   }
+  /*taosSsleep(3);*/
   int32_t batchCnt = 0;
   int32_t skipLogNum = 0;
   int64_t startTime = taosGetTimestampUs();
   while (running) {
-    tmq_message_t* tmqmessage = tmq_consumer_poll(tmq, 1);
+    tmq_message_t* tmqmessage = tmq_consumer_poll(tmq, 3000);
     if (tmqmessage) {
       batchCnt++;
       skipLogNum += tmqGetSkipLogNum(tmqmessage);
diff --git a/tests/test/c/tmqSim.c b/tests/test/c/tmqSim.c
index 4d3108500e..38264331c1 100644
--- a/tests/test/c/tmqSim.c
+++ b/tests/test/c/tmqSim.c
@@ -226,7 +226,7 @@ void loop_consume(tmq_t* tmq) {
   int32_t totalRows = 0;
   int32_t skipLogNum = 0;
   while (running) {
-    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 1);
+    tmq_message_t* tmqMsg = tmq_consumer_poll(tmq, 3000);
     if (tmqMsg) {
 	  totalMsgs++;