diff --git a/examples/lua/build.sh b/examples/lua/build.sh
index 9d00c68425..1e6fef632c 100755
--- a/examples/lua/build.sh
+++ b/examples/lua/build.sh
@@ -4,5 +4,5 @@ if [ "$lua_header_installed" = "0" ]; then
   sudo apt install -y liblua5.3-dev
 fi
 
-gcc -std=c99 lua_connector.c -fPIC -shared -o luaconnector.so -Wall -ltaos -I/usr/include/lua5.3
+gcc -std=c99 lua_connector.c -fPIC -shared -o luaconnector.so -Wall -ltaos -I/usr/include/lua5.3 -I../../include/client
 
diff --git a/examples/lua/lua_connector.c b/examples/lua/lua_connector.c
index 76634ed254..3c13b196b9 100644
--- a/examples/lua/lua_connector.c
+++ b/examples/lua/lua_connector.c
@@ -1,11 +1,11 @@
-#include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
+#include <stdio.h>
 #include <math.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include "../../../include/client/taos.h"
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#include "taos.h"
 
 struct cb_param{
   lua_State* state;
@@ -28,14 +28,14 @@ static int l_connect(lua_State *L){
 
   luaL_checktype(L, 1, LUA_TTABLE);
 
-  lua_getfield(L,1,"host");
+  lua_getfield(L, 1,"host");
   if (lua_isstring(L,-1)){
     host = lua_tostring(L, -1);
     // printf("host = %s\n", host);
   }
   
   lua_getfield(L, 1, "port");
-  if (lua_isinteger(L,-1)){
+  if (lua_isinteger(L, -1)){
     port = lua_tointeger(L, -1);
     //printf("port = %d\n", port);
   }
@@ -60,8 +60,6 @@ static int l_connect(lua_State *L){
 
   lua_settop(L,0);
 
-  taos_init();
-  
   lua_newtable(L);
   int table_index = lua_gettop(L);
 
@@ -102,7 +100,7 @@ static int l_query(lua_State *L){
     printf("failed, reason:%s\n", taos_errstr(result));
     lua_pushinteger(L, -1);
     lua_setfield(L, table_index, "code");    
-    lua_pushstring(L, taos_errstr(taos));
+    lua_pushstring(L, taos_errstr(result));
     lua_setfield(L, table_index, "error");    
    
     return 1;
@@ -113,7 +111,6 @@ static int l_query(lua_State *L){
     int         rows = 0;
     int         num_fields = taos_field_count(result);
     const TAOS_FIELD *fields = taos_fetch_fields(result);
-    //char        temp[256];
 
     const int affectRows = taos_affected_rows(result);
     //    printf(" affect rows:%d\r\n", affectRows);
@@ -122,7 +119,7 @@ static int l_query(lua_State *L){
     lua_pushinteger(L, affectRows);
     lua_setfield(L, table_index, "affected");
     lua_newtable(L);
-    
+
     while ((row = taos_fetch_row(result))) {
       //printf("row index:%d\n",rows);
       rows++;
@@ -136,17 +133,21 @@ static int l_query(lua_State *L){
 	}
 
 	lua_pushstring(L,fields[i].name);
-
+	int32_t* length = taos_fetch_lengths(result);
 	switch (fields[i].type) {
+	case TSDB_DATA_TYPE_UTINYINT:
 	case TSDB_DATA_TYPE_TINYINT:
 	  lua_pushinteger(L,*((char *)row[i]));
 	  break;
+	case TSDB_DATA_TYPE_USMALLINT:
 	case TSDB_DATA_TYPE_SMALLINT:
 	  lua_pushinteger(L,*((short *)row[i]));
 	  break;
+	case TSDB_DATA_TYPE_UINT:
 	case TSDB_DATA_TYPE_INT:
 	  lua_pushinteger(L,*((int *)row[i]));
 	  break;
+	case TSDB_DATA_TYPE_UBIGINT:
 	case TSDB_DATA_TYPE_BIGINT:
 	  lua_pushinteger(L,*((int64_t *)row[i]));
 	  break;
@@ -156,9 +157,11 @@ static int l_query(lua_State *L){
 	case TSDB_DATA_TYPE_DOUBLE:
 	  lua_pushnumber(L,*((double *)row[i]));
 	  break;
+	case TSDB_DATA_TYPE_JSON:
 	case TSDB_DATA_TYPE_BINARY:
 	case TSDB_DATA_TYPE_NCHAR:
-	  lua_pushstring(L,(char *)row[i]);
+	  //printf("type:%d, max len:%d, current len:%d\n",fields[i].type, fields[i].bytes, length[i]);
+	  lua_pushlstring(L,(char *)row[i], length[i]);
 	  break;
 	case TSDB_DATA_TYPE_TIMESTAMP:
 	  lua_pushinteger(L,*((int64_t *)row[i]));
@@ -166,6 +169,7 @@ static int l_query(lua_State *L){
 	case TSDB_DATA_TYPE_BOOL:
 	  lua_pushinteger(L,*((char *)row[i]));
 	  break;
+	case TSDB_DATA_TYPE_NULL:
 	default:
 	  lua_pushnil(L);
 	  break;
@@ -235,112 +239,6 @@ static int l_async_query(lua_State *L){
   return 1;
 }
 
-void stream_cb(void *param, TAOS_RES *result, TAOS_ROW row){
-  struct cb_param* p = (struct cb_param*) param;
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  int         numFields = taos_num_fields(result);
-
-  // printf("\nnumfields:%d\n", numFields);
-  //printf("\n\r-----------------------------------------------------------------------------------\n");
-
-  lua_State *L = p->state;
-  lua_rawgeti(L, LUA_REGISTRYINDEX, p->callback);
-
-  lua_newtable(L);
-
-  for (int i = 0; i < numFields; ++i) {
-    if (row[i] == NULL) {
-      continue;
-    }
-
-    lua_pushstring(L,fields[i].name);
-
-    switch (fields[i].type) {
-    case TSDB_DATA_TYPE_TINYINT:
-      lua_pushinteger(L,*((char *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_SMALLINT:
-      lua_pushinteger(L,*((short *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_INT:
-      lua_pushinteger(L,*((int *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_BIGINT:
-      lua_pushinteger(L,*((int64_t *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_FLOAT:
-      lua_pushnumber(L,*((float *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_DOUBLE:
-      lua_pushnumber(L,*((double *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_BINARY:
-    case TSDB_DATA_TYPE_NCHAR:
-      lua_pushstring(L,(char *)row[i]);
-      break;
-    case TSDB_DATA_TYPE_TIMESTAMP:
-      lua_pushinteger(L,*((int64_t *)row[i]));
-      break;
-    case TSDB_DATA_TYPE_BOOL:
-      lua_pushinteger(L,*((char *)row[i]));
-      break;
-    default:
-      lua_pushnil(L);
-      break;
-    }
-
-    lua_settable(L, -3);
-  }
-
-  lua_call(L, 1, 0);
-
-  //  printf("-----------------------------------------------------------------------------------\n\r");
-}
-
-static int l_open_stream(lua_State *L){
-  int r = luaL_ref(L, LUA_REGISTRYINDEX);
-  TAOS *    taos = (TAOS*)lua_topointer(L,1);
-  const char * sqlstr = lua_tostring(L,2);
-  int stime = luaL_checknumber(L,3);
-
-  lua_newtable(L);
-  int table_index = lua_gettop(L);
-
-  struct cb_param *p = malloc(sizeof(struct cb_param));
-  p->state = L;
-  p->callback=r;
-  //  printf("r:%d, L:%d\n",r,L);
-  void * s = taos_open_stream(taos,sqlstr,stream_cb,stime,p,NULL);
-  if (s == NULL) {
-    printf("failed to open stream, reason:%s\n", taos_errstr(taos));
-    free(p);
-    lua_pushnumber(L, -1);
-    lua_setfield(L, table_index, "code");
-    lua_pushstring(L, taos_errstr(taos));
-    lua_setfield(L, table_index, "error");
-    lua_pushlightuserdata(L,NULL);
-    lua_setfield(L, table_index, "stream");
-  }else{
-    //    printf("success to open stream\n");
-    lua_pushnumber(L, 0);
-    lua_setfield(L, table_index, "code");
-    lua_pushstring(L, taos_errstr(taos));
-    lua_setfield(L, table_index, "error");
-    p->stream = s;
-    lua_pushlightuserdata(L,p);
-    lua_setfield(L, table_index, "stream");//stream has different content in lua and c.
-  }
-
-  return 1;
-}
-
-static int l_close_stream(lua_State *L){
-  //TODO:get stream and free cb_param
-  struct cb_param *p = lua_touserdata(L,1);
-  taos_close_stream(p->stream);
-  free(p);
-  return 0;
-}
 
 static int l_close(lua_State *L){
   TAOS *taos= (TAOS*)lua_topointer(L,1);
@@ -367,8 +265,6 @@ static const struct luaL_Reg lib[] = {
     {"query", l_query},
     {"query_a",l_async_query},
     {"close", l_close},
-    {"open_stream", l_open_stream},
-    {"close_stream", l_close_stream},
     {NULL, NULL}
 };
 
diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 8686d91a10..4e89beabcb 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -70,13 +70,11 @@ typedef uint16_t tmsg_t;
 #define TSDB_IE_TYPE_DNODE_EXT   6
 #define TSDB_IE_TYPE_DNODE_STATE 7
 
-typedef enum {
-  HEARTBEAT_TYPE_MQ = 0,
-  HEARTBEAT_TYPE_QUERY,
-  // types can be added here
-  //
-  HEARTBEAT_TYPE_MAX
-} EHbType;
+enum {
+  CONN_TYPE__QUERY = 1,
+  CONN_TYPE__TMQ,
+  CONN_TYPE__MAX
+};
 
 enum {
   HEARTBEAT_KEY_DBINFO = 1,
@@ -346,7 +344,7 @@ int32_t tDeserializeSConnectReq(void* buf, int32_t bufLen, SConnectReq* pReq);
 typedef struct {
   int32_t acctId;
   int64_t clusterId;
-  int32_t connId;
+  uint32_t connId;
   int8_t  superUser;
   int8_t  connType;
   SEpSet  epSet;
@@ -1048,40 +1046,6 @@ typedef struct {
 int32_t tSerializeSDCreateMnodeReq(void* buf, int32_t bufLen, SDCreateMnodeReq* pReq);
 int32_t tDeserializeSDCreateMnodeReq(void* buf, int32_t bufLen, SDCreateMnodeReq* pReq);
 
-typedef struct {
-  char    sql[TSDB_SHOW_SQL_LEN];
-  int32_t queryId;
-  int64_t useconds;
-  int64_t stime;
-  int64_t qId;
-  int64_t sqlObjId;
-  int32_t pid;
-  char    fqdn[TSDB_FQDN_LEN];
-  int8_t  stableQuery;
-  int32_t numOfSub;
-  char    subSqlInfo[TSDB_SHOW_SUBQUERY_LEN];  // include subqueries' index, Obj IDs and states(C-complete/I-imcomplete)
-} SQueryDesc;
-
-typedef struct {
-  int32_t connId;
-  int32_t pid;
-  int32_t numOfQueries;
-  int32_t numOfStreams;
-  char    app[TSDB_APP_NAME_LEN];
-  char    pData[];
-} SHeartBeatReq;
-
-typedef struct {
-  int32_t connId;
-  int32_t queryId;
-  int32_t streamId;
-  int32_t totalDnodes;
-  int32_t onlineDnodes;
-  int8_t  killConnection;
-  int8_t  align[3];
-  SEpSet  epSet;
-} SHeartBeatRsp;
-
 typedef struct {
   int32_t connId;
   int32_t queryId;
@@ -1684,13 +1648,48 @@ typedef struct {
 } SKv;
 
 typedef struct {
-  int32_t connId;
-  int32_t hbType;
+  int64_t tscRid;
+  int8_t  connType;
 } SClientHbKey;
 
 typedef struct {
-  SClientHbKey connKey;
-  SHashObj*    info;  // hash<Skv.key, Skv>
+  int64_t tid;
+  int32_t status;
+} SQuerySubDesc;
+
+typedef struct {
+  char     sql[TSDB_SHOW_SQL_LEN];
+  uint64_t queryId;
+  int64_t  useconds;
+  int64_t  stime;
+  int64_t  reqRid;
+  int32_t  pid;
+  char     fqdn[TSDB_FQDN_LEN];
+  int32_t  subPlanNum;
+  SArray*  subDesc;    // SArray<SQuerySubDesc>
+} SQueryDesc;
+
+typedef struct {
+  uint32_t   connId;
+  int32_t    pid;
+  char       app[TSDB_APP_NAME_LEN];
+  SArray*    queryDesc;   // SArray<SQueryDesc>
+} SQueryHbReqBasic;
+
+typedef struct {
+  uint32_t connId;
+  uint64_t killRid;
+  int32_t  totalDnodes;
+  int32_t  onlineDnodes;
+  int8_t   killConnection;
+  int8_t   align[3];
+  SEpSet   epSet;
+} SQueryHbRspBasic;
+
+typedef struct {
+  SClientHbKey      connKey;
+  SQueryHbReqBasic* query;
+  SHashObj*         info;  // hash<Skv.key, Skv>
 } SClientHbReq;
 
 typedef struct {
@@ -1699,9 +1698,10 @@ typedef struct {
 } SClientHbBatchReq;
 
 typedef struct {
-  SClientHbKey connKey;
-  int32_t      status;
-  SArray*      info;  // Array<Skv>
+  SClientHbKey      connKey;
+  int32_t           status;
+  SQueryHbRspBasic* query;
+  SArray*           info;  // Array<Skv>
 } SClientHbRsp;
 
 typedef struct {
@@ -1721,8 +1721,23 @@ static FORCE_INLINE void tFreeReqKvHash(SHashObj* info) {
   }
 }
 
+static FORCE_INLINE void tFreeClientHbQueryDesc(void* pDesc) {
+  SQueryDesc* desc = (SQueryDesc*)pDesc;
+  if (desc->subDesc) {
+    taosArrayDestroy(desc->subDesc);
+    desc->subDesc = NULL;
+  }
+}
+
 static FORCE_INLINE void tFreeClientHbReq(void* pReq) {
   SClientHbReq* req = (SClientHbReq*)pReq;
+  if (req->query) {
+    if (req->query->queryDesc) {
+      taosArrayDestroyEx(req->query->queryDesc, tFreeClientHbQueryDesc);
+    }
+    taosMemoryFreeClear(req->query);
+  }
+  
   if (req->info) {
     tFreeReqKvHash(req->info);
     taosHashCleanup(req->info);
@@ -1751,6 +1766,7 @@ static FORCE_INLINE void tFreeClientKv(void* pKv) {
 
 static FORCE_INLINE void tFreeClientHbRsp(void* pRsp) {
   SClientHbRsp* rsp = (SClientHbRsp*)pRsp;
+  taosMemoryFreeClear(rsp->query);
   if (rsp->info) taosArrayDestroyEx(rsp->info, tFreeClientKv);
 }
 
@@ -1779,14 +1795,14 @@ static FORCE_INLINE int32_t tDecodeSKv(SCoder* pDecoder, SKv* pKv) {
 }
 
 static FORCE_INLINE int32_t tEncodeSClientHbKey(SCoder* pEncoder, const SClientHbKey* pKey) {
-  if (tEncodeI32(pEncoder, pKey->connId) < 0) return -1;
-  if (tEncodeI32(pEncoder, pKey->hbType) < 0) return -1;
+  if (tEncodeI64(pEncoder, pKey->tscRid) < 0) return -1;
+  if (tEncodeI8(pEncoder, pKey->connType) < 0) return -1;
   return 0;
 }
 
 static FORCE_INLINE int32_t tDecodeSClientHbKey(SCoder* pDecoder, SClientHbKey* pKey) {
-  if (tDecodeI32(pDecoder, &pKey->connId) < 0) return -1;
-  if (tDecodeI32(pDecoder, &pKey->hbType) < 0) return -1;
+  if (tDecodeI64(pDecoder, &pKey->tscRid) < 0) return -1;
+  if (tDecodeI8(pDecoder, &pKey->connType) < 0) return -1;
   return 0;
 }
 
diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
index 47f2303246..63ebbd9879 100644
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@@ -185,16 +185,16 @@
 #define TK_NULL                           167
 #define TK_NK_QUESTION                    168
 #define TK_NK_ARROW                       169
-#define TK_NOW                            170
-#define TK_TODAY                          171
-#define TK_ROWTS                          172
-#define TK_TBNAME                         173
-#define TK_QSTARTTS                       174
-#define TK_QENDTS                         175
-#define TK_WSTARTTS                       176
-#define TK_WENDTS                         177
-#define TK_WDURATION                      178
-#define TK_CAST                           179
+#define TK_ROWTS                          170
+#define TK_TBNAME                         171
+#define TK_QSTARTTS                       172
+#define TK_QENDTS                         173
+#define TK_WSTARTTS                       174
+#define TK_WENDTS                         175
+#define TK_WDURATION                      176
+#define TK_CAST                           177
+#define TK_NOW                            178
+#define TK_TODAY                          179
 #define TK_COUNT                          180
 #define TK_FIRST                          181
 #define TK_LAST                           182
diff --git a/include/libs/function/function.h b/include/libs/function/function.h
index 9fa89f0415..1303a1fb6a 100644
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@@ -110,7 +110,6 @@ typedef struct SFileBlockInfo {
 #define FUNCTION_COV          38
 
 typedef struct SResultRowEntryInfo {
-//  int8_t   hasResult:6;       // result generated, not NULL value
   bool     initialized:1;     // output buffer has been initialized
   bool     complete:1;        // query has completed
   uint8_t  isNullRes:6;       // the result is null
@@ -119,10 +118,10 @@ typedef struct SResultRowEntryInfo {
 
 // determine the real data need to calculated the result
 enum {
-  BLK_DATA_NO_NEEDED     = 0x0,
-  BLK_DATA_STATIS_NEEDED = 0x1,
-  BLK_DATA_ALL_NEEDED    = 0x3,
-  BLK_DATA_DISCARD       = 0x4,   // discard current data block since it is not qualified for filter
+  BLK_DATA_NOT_LOAD  = 0x0,
+  BLK_DATA_SMA_LOAD  = 0x1,
+  BLK_DATA_DATA_LOAD = 0x3,
+  BLK_DATA_FILTEROUT = 0x4,   // discard current data block since it is not qualified for filter
 };
 
 enum {
diff --git a/include/libs/function/functionMgt.h b/include/libs/function/functionMgt.h
index dc5bdc62e5..22bbc36ee1 100644
--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
@@ -140,10 +140,10 @@ bool fmIsDynamicScanOptimizedFunc(int32_t funcId);
 bool fmIsMultiResFunc(int32_t funcId);
 
 typedef enum EFuncDataRequired {
-  FUNC_DATA_REQUIRED_ALL_NEEDED = 1,
-  FUNC_DATA_REQUIRED_STATIS_NEEDED,
-  FUNC_DATA_REQUIRED_NO_NEEDED,
-  FUNC_DATA_REQUIRED_DISCARD
+  FUNC_DATA_REQUIRED_DATA_LOAD = 1,
+  FUNC_DATA_REQUIRED_STATIS_LOAD,
+  FUNC_DATA_REQUIRED_NOT_LOAD,
+  FUNC_DATA_REQUIRED_FILTEROUT,
 } EFuncDataRequired;
 
 EFuncDataRequired fmFuncDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow);
diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index fef624288a..02cd073226 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -57,6 +57,7 @@ typedef struct SQuery {
   SNode* pRoot;
   int32_t numOfResCols;
   SSchema* pResSchema;
+  int8_t   precision;
   SCmdMsgInfo* pCmdMsg;
   int32_t msgType;
   SArray* pDbList;
diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h
index 10b4866a96..49af10cd2c 100644
--- a/include/libs/scalar/scalar.h
+++ b/include/libs/scalar/scalar.h
@@ -78,6 +78,8 @@ int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam *
 int32_t toUnixtimestampFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t nowFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
+int32_t todayFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput);
 
 bool getTimePseudoFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv);
 
diff --git a/include/libs/scheduler/scheduler.h b/include/libs/scheduler/scheduler.h
index 5ab4ead89c..460749243c 100644
--- a/include/libs/scheduler/scheduler.h
+++ b/include/libs/scheduler/scheduler.h
@@ -89,6 +89,8 @@ int32_t schedulerAsyncExecJob(void *transport, SArray *pNodeList, SQueryPlan* pD
  */
 int32_t schedulerFetchRows(int64_t job, void **data);
 
+int32_t schedulerGetTasksStatus(int64_t job, SArray *pSub);
+
 
 /**
  * Cancel query job
diff --git a/include/os/osMemory.h b/include/os/osMemory.h
index e516000c66..4efe69e204 100644
--- a/include/os/osMemory.h
+++ b/include/os/osMemory.h
@@ -33,13 +33,13 @@ void *taosMemoryMalloc(int32_t size);
 void *taosMemoryCalloc(int32_t num, int32_t size);
 void *taosMemoryRealloc(void *ptr, int32_t size);
 void *taosMemoryStrDup(void *ptr);
-void taosMemoryFree(const void *ptr);
+void taosMemoryFree(void *ptr);
 int32_t taosMemorySize(void *ptr);
 
 #define taosMemoryFreeClear(ptr) \
   do {                           \
     if (ptr) {                   \
-      taosMemoryFree(ptr);       \
+      taosMemoryFree((void*)ptr);       \
       (ptr) = NULL;              \
     }                            \
   } while (0)
diff --git a/include/util/tarray.h b/include/util/tarray.h
index 521e54040d..383af8309d 100644
--- a/include/util/tarray.h
+++ b/include/util/tarray.h
@@ -205,6 +205,14 @@ SArray* taosArrayDup(const SArray* pSrc);
  */
 void taosArrayClear(SArray* pArray);
 
+/**
+ * clear the array (remove all element)
+ * @param pArray
+ * @param fp
+ */
+void taosArrayClearEx(SArray* pArray, void (*fp)(void*));
+
+
 /**
  * destroy array list
  * @param pArray
diff --git a/include/util/tdef.h b/include/util/tdef.h
index 6baf784fe3..5fc30540ee 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -128,6 +128,13 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_INS_TABLE_QUERIES                "queries"
 #define TSDB_INS_TABLE_VNODES                 "vnodes"
 
+#define TSDB_PERFORMANCE_SCHEMA_DB            "performance_schema"
+#define TSDB_PERFS_TABLE_CONNECTIONS          "connections"
+#define TSDB_PERFS_TABLE_QUERIES              "queries"
+#define TSDB_PERFS_TABLE_TOPICS               "topics"
+#define TSDB_PERFS_TABLE_CONSUMERS            "consumers"
+#define TSDB_PERFS_TABLE_SUBSCRIBES           "subscribes"
+
 #define TSDB_INDEX_TYPE_SMA      "SMA"
 #define TSDB_INDEX_TYPE_FULLTEXT "FULLTEXT"
 
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index 0f12880272..772ff5e69a 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -43,13 +43,17 @@ extern "C" {
     }                                \
   } while (0)
 
+#define ERROR_MSG_BUF_DEFAULT_SIZE 512
 #define HEARTBEAT_INTERVAL 1500  // ms
 
 enum {
-  CONN_TYPE__QUERY = 1,
-  CONN_TYPE__TMQ,
+  RES_TYPE__QUERY = 1,
+  RES_TYPE__TMQ,
 };
 
+#define TD_RES_QUERY(res) (*(int8_t*)res == RES_TYPE__QUERY)
+#define TD_RES_TMQ(res)   (*(int8_t*)res == RES_TYPE__TMQ)
+
 typedef struct SAppInstInfo SAppInstInfo;
 
 typedef struct {
@@ -84,8 +88,8 @@ typedef struct {
   TdThread      thread;
   TdThreadMutex lock;       // used when app init and cleanup
   SArray*       appHbMgrs;  // SArray<SAppHbMgr*> one for each cluster
-  FHbReqHandle  reqHandle[HEARTBEAT_TYPE_MAX];
-  FHbRspHandle  rspHandle[HEARTBEAT_TYPE_MAX];
+  FHbReqHandle  reqHandle[CONN_TYPE__MAX];
+  FHbRspHandle  rspHandle[CONN_TYPE__MAX];
 } SClientHbMgr;
 
 typedef struct SQueryExecMetric {
@@ -144,6 +148,7 @@ typedef struct STscObj {
   TdThreadMutex mutex;      // used to protect the operation on db
   int32_t       numOfReqs;  // number of sqlObj bound to this connection
   SAppInstInfo* pAppInfo;
+  SHashObj*     pRequests;
 } STscObj;
 
 typedef struct SResultColumn {
@@ -172,33 +177,15 @@ typedef struct SReqResultInfo {
   int32_t        payloadLen;
 } SReqResultInfo;
 
-typedef struct SShowReqInfo {
-  int64_t execId;  // showId/queryId
-  int32_t vgId;
-  SArray* pArray;        // SArray<SVgroupInfo>
-  int32_t currentIndex;  // current accessed vgroup index.
-} SShowReqInfo;
-
 typedef struct SRequestSendRecvBody {
   tsem_t             rspSem;  // not used now
   void*              fp;
-  SShowReqInfo       showInfo;  // todo this attribute will be removed after the query framework being completed.
   SDataBuf           requestMsg;
   int64_t            queryJob;  // query job, created according to sql query DAG.
   struct SQueryPlan* pDag;      // the query dag, generated according to the sql statement.
   SReqResultInfo     resInfo;
 } SRequestSendRecvBody;
 
-#define ERROR_MSG_BUF_DEFAULT_SIZE 512
-
-enum {
-  RES_TYPE__QUERY = 1,
-  RES_TYPE__TMQ,
-};
-
-#define TD_RES_QUERY(res) (*(int8_t*)res == RES_TYPE__QUERY)
-#define TD_RES_TMQ(res)   (*(int8_t*)res == RES_TYPE__TMQ)
-
 typedef struct {
   int8_t  resType;
   char*   topic;
@@ -212,12 +199,11 @@ typedef struct SRequestObj {
   uint64_t             requestId;
   int32_t              type;  // request type
   STscObj*             pTscObj;
-  char*                pDb;
+  char*                pDb;     // current database string
   char*                sqlstr;  // sql string
   int32_t              sqlLen;
   int64_t              self;
-  char*                msgBuf;
-  void*                pInfo;  // sql parse info, generated by parser module
+  char*                msgBuf;  // error msg buffer
   int32_t              code;
   SArray*              dbList;
   SArray*              tableList;
@@ -252,21 +238,24 @@ extern int (*handleRequestRspFp[TDMT_MAX])(void*, const SDataBuf* pMsg, int32_t
 int           genericRspCallback(void* param, const SDataBuf* pMsg, int32_t code);
 SMsgSendInfo* buildMsgInfoImpl(SRequestObj* pReqObj);
 
-int taos_init();
+int   taos_init();
 
 void* createTscObj(const char* user, const char* auth, const char* db, SAppInstInfo* pAppInfo);
 void  destroyTscObj(void* pObj);
+STscObj *acquireTscObj(int64_t rid);
+int32_t releaseTscObj(int64_t rid);
 
 uint64_t generateRequestId();
 
 void* createRequest(STscObj* pObj, __taos_async_fn_t fp, void* param, int32_t type);
 void  destroyRequest(SRequestObj* pRequest);
+SRequestObj *acquireRequest(int64_t rid);
+int32_t releaseRequest(int64_t rid);
 
 char* getDbOfConnection(STscObj* pObj);
 void  setConnectionDB(STscObj* pTscObj, const char* db);
 void  resetConnectDB(STscObj* pTscObj);
 
-void taos_init_imp(void);
 int  taos_options_imp(TSDB_OPTION option, const char* str);
 
 void* openTransporter(const char* user, const char* auth, int32_t numOfThreads);
@@ -286,9 +275,8 @@ int32_t buildRequest(STscObj* pTscObj, const char* sql, int sqlLen, SRequestObj*
 
 void*   doFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4);
 void    doSetOneRowPtr(SReqResultInfo* pResultInfo);
-int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32_t numOfCols, int32_t numOfRows,
-                         bool convertUcs4);
 void    setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols);
+void    setResPrecision(SReqResultInfo* pResInfo, int32_t precision);
 int32_t setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp, bool convertUcs4);
 
 // --- heartbeat
@@ -302,7 +290,7 @@ SAppHbMgr* appHbMgrInit(SAppInstInfo* pAppInstInfo, char* key);
 void       appHbMgrCleanup(void);
 
 // conn level
-int  hbRegisterConn(SAppHbMgr* pAppHbMgr, int32_t connId, int64_t clusterId, int32_t hbType);
+int  hbRegisterConn(SAppHbMgr *pAppHbMgr, int64_t tscRefId, int64_t clusterId, int8_t connType);
 void hbDeregisterConn(SAppHbMgr* pAppHbMgr, SClientHbKey connKey);
 
 int hbAddConnInfo(SAppHbMgr* pAppHbMgr, SClientHbKey connKey, void* key, void* value, int32_t keyLen, int32_t valueLen);
diff --git a/source/client/inc/clientStmt.h b/source/client/inc/clientStmt.h
new file mode 100644
index 0000000000..c29361758d
--- /dev/null
+++ b/source/client/inc/clientStmt.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_CLIENTSTMT_H
+#define TDENGINE_CLIENTSTMT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+  STMT_TYPE_INSERT = 1,
+  STMT_TYPE_MULTI_INSERT,
+  STMT_TYPE_QUERY,
+} STMT_TYPE;
+
+typedef struct STscStmt {
+  STMT_TYPE type;
+  //int16_t  last;
+  //STscObj* taos;
+  //SSqlObj* pSql;
+  //SMultiTbStmt mtb;
+  //SNormalStmt normal;
+
+  //int numOfRows;
+} STscStmt;
+
+#define STMT_ERR_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; return _code; } } while (0)
+#define STMT_RET(c) do { int32_t _code = c; if (_code != TSDB_CODE_SUCCESS) { terrno = _code; } return _code; } while (0)
+#define STMT_ERR_JRET(c) do { code = c; if (code != TSDB_CODE_SUCCESS) { terrno = code; goto _return; } } while (0)
+
+TAOS_STMT *stmtInit(TAOS *taos);
+int stmtClose(TAOS_STMT *stmt);
+int stmtExec(TAOS_STMT *stmt);
+char *stmtErrstr(TAOS_STMT *stmt);
+int stmtAffectedRows(TAOS_STMT *stmt);
+int stmtBind(TAOS_STMT *stmt, TAOS_BIND *bind);
+int stmtPrepare(TAOS_STMT *stmt, const char *sql, unsigned long length);
+int stmtSetTbNameTags(TAOS_STMT *stmt, const char *name, TAOS_BIND *tags);
+int stmtIsInsert(TAOS_STMT *stmt, int *insert);
+int stmtGetParamNum(TAOS_STMT *stmt, int *nums);
+int stmtAddBatch(TAOS_STMT *stmt);
+TAOS_RES *stmtUseResult(TAOS_STMT *stmt);
+int stmtBindBatch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_CLIENTSTMT_H
diff --git a/source/client/src/client.c b/source/client/src/client.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index fec6c8e5db..865c3ead27 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -27,17 +27,18 @@
 #include "ttime.h"
 
 #define TSC_VAR_NOT_RELEASE 1
-#define TSC_VAR_RELEASED 0
+#define TSC_VAR_RELEASED    0
 
 SAppInfo appInfo;
-int32_t  clientReqRefPool = -1;
+int32_t  clientReqRefPool  = -1;
 int32_t  clientConnRefPool = -1;
 
-static TdThreadOnce tscinit = PTHREAD_ONCE_INIT;
+static TdThreadOnce   tscinit = PTHREAD_ONCE_INIT;
 volatile int32_t      tscInitRes = 0;
 
 static void registerRequest(SRequestObj *pRequest) {
-  STscObj *pTscObj = (STscObj *)taosAcquireRef(clientConnRefPool, pRequest->pTscObj->id);
+  STscObj *pTscObj = acquireTscObj(pRequest->pTscObj->id);
+  
   assert(pTscObj != NULL);
 
   // connection has been released already, abort creating request.
@@ -48,8 +49,8 @@ static void registerRequest(SRequestObj *pRequest) {
   if (pTscObj->pAppInfo) {
     SInstanceSummary *pSummary = &pTscObj->pAppInfo->summary;
 
-    int32_t total = atomic_add_fetch_64(&pSummary->totalRequests, 1);
-    int32_t currentInst = atomic_add_fetch_64(&pSummary->currentRequests, 1);
+    int32_t total = atomic_add_fetch_64((int64_t*)&pSummary->totalRequests, 1);
+    int32_t currentInst = atomic_add_fetch_64((int64_t*)&pSummary->currentRequests, 1);
     tscDebug("0x%" PRIx64 " new Request from connObj:0x%" PRIx64
              ", current:%d, app current:%d, total:%d, reqId:0x%" PRIx64,
              pRequest->self, pRequest->pTscObj->id, num, currentInst, total, pRequest->requestId);
@@ -62,14 +63,14 @@ static void deregisterRequest(SRequestObj *pRequest) {
   STscObj *         pTscObj = pRequest->pTscObj;
   SInstanceSummary *pActivity = &pTscObj->pAppInfo->summary;
 
-  int32_t currentInst = atomic_sub_fetch_64(&pActivity->currentRequests, 1);
+  int32_t currentInst = atomic_sub_fetch_64((int64_t*)&pActivity->currentRequests, 1);
   int32_t num = atomic_sub_fetch_32(&pTscObj->numOfReqs, 1);
 
   int64_t duration = taosGetTimestampUs() - pRequest->metric.start;
   tscDebug("0x%" PRIx64 " free Request from connObj: 0x%" PRIx64 ", reqId:0x%" PRIx64 " elapsed:%" PRIu64
            " ms, current:%d, app current:%d",
            pRequest->self, pTscObj->id, pRequest->requestId, duration/1000, num, currentInst);
-  taosReleaseRef(clientConnRefPool, pTscObj->id);
+  releaseTscObj(pTscObj->id);
 }
 
 // todo close the transporter properly
@@ -107,12 +108,24 @@ void *openTransporter(const char *user, const char *auth, int32_t numOfThread) {
   return pDnodeConn;
 }
 
+void closeAllRequests(SHashObj *pRequests) {
+  void   *pIter = taosHashIterate(pRequests, NULL);
+  while (pIter != NULL) {
+    int64_t *rid = pIter;
+
+    releaseRequest(*rid);    
+    
+    pIter = taosHashIterate(pRequests, pIter);
+  }
+}
+
 void destroyTscObj(void *pObj) {
   STscObj *pTscObj = pObj;
 
-  SClientHbKey connKey = {.connId = pTscObj->connId, .hbType = pTscObj->connType};
+  SClientHbKey connKey = {.tscRid = pTscObj->id, .connType = pTscObj->connType};
   hbDeregisterConn(pTscObj->pAppInfo->pAppHbMgr, connKey);
   atomic_sub_fetch_64(&pTscObj->pAppInfo->numOfConns, 1);
+  closeAllRequests(pTscObj->pRequests);
   tscDebug("connObj 0x%" PRIx64 " destroyed, totalConn:%" PRId64, pTscObj->id, pTscObj->pAppInfo->numOfConns);
   taosThreadMutexDestroy(&pTscObj->mutex);
   taosMemoryFreeClear(pTscObj);
@@ -125,6 +138,13 @@ void *createTscObj(const char *user, const char *auth, const char *db, SAppInstI
     return NULL;
   }
 
+  pObj->pRequests = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
+  if (NULL == pObj->pRequests) {
+    taosMemoryFree(pObj);
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    return NULL;
+  }
+  
   pObj->pAppInfo = pAppInfo;
   tstrncpy(pObj->user, user, sizeof(pObj->user));
   memcpy(pObj->pass, auth, TSDB_PASSWORD_LEN);
@@ -140,6 +160,14 @@ void *createTscObj(const char *user, const char *auth, const char *db, SAppInstI
   return pObj;
 }
 
+STscObj *acquireTscObj(int64_t rid) {
+  return (STscObj *)taosAcquireRef(clientConnRefPool, rid);
+}
+
+int32_t releaseTscObj(int64_t rid) {
+  return taosReleaseRef(clientConnRefPool, rid);
+}
+
 void *createRequest(STscObj *pObj, __taos_async_fn_t fp, void *param, int32_t type) {
   assert(pObj != NULL);
 
@@ -161,6 +189,7 @@ void *createRequest(STscObj *pObj, __taos_async_fn_t fp, void *param, int32_t ty
   tsem_init(&pRequest->body.rspSem, 0, 0);
 
   registerRequest(pRequest);
+    
   return pRequest;
 }
 
@@ -186,9 +215,10 @@ static void doDestroyRequest(void *p) {
 
   assert(RID_VALID(pRequest->self));
 
+  taosHashRemove(pRequest->pTscObj->pRequests, &pRequest->self, sizeof(pRequest->self));
+  
   taosMemoryFreeClear(pRequest->msgBuf);
   taosMemoryFreeClear(pRequest->sqlstr);
-  taosMemoryFreeClear(pRequest->pInfo);
   taosMemoryFreeClear(pRequest->pDb);
 
   doFreeReqResultInfo(&pRequest->body.resInfo);
@@ -198,10 +228,6 @@ static void doDestroyRequest(void *p) {
     schedulerFreeJob(pRequest->body.queryJob);
   }
 
-  if (pRequest->body.showInfo.pArray != NULL) {
-    taosArrayDestroy(pRequest->body.showInfo.pArray);
-  }
-
   taosArrayDestroy(pRequest->tableList);
   taosArrayDestroy(pRequest->dbList);
 
@@ -214,9 +240,18 @@ void destroyRequest(SRequestObj *pRequest) {
     return;
   }
 
-  taosReleaseRef(clientReqRefPool, pRequest->self);
+  taosRemoveRef(clientReqRefPool, pRequest->self);
 }
 
+SRequestObj *acquireRequest(int64_t rid) {
+  return (SRequestObj *)taosAcquireRef(clientReqRefPool, rid);
+}
+
+int32_t releaseRequest(int64_t rid) {
+  return taosReleaseRef(clientReqRefPool, rid);
+}
+
+
 void taos_init_imp(void) {
   // In the APIs of other program language, taos_cleanup is not available yet.
   // So, to make sure taos_cleanup will be invoked to clean up the allocated resource to suppress the valgrind warning.
@@ -457,11 +492,18 @@ uint64_t generateRequestId() {
     }
   }
 
-  int64_t  ts = taosGetTimestampMs();
-  uint64_t pid = taosGetPId();
-  int32_t  val = atomic_add_fetch_32(&requestSerialId, 1);
+  uint64_t id = 0;
+  
+  while (true) {
+    int64_t  ts = taosGetTimestampMs();
+    uint64_t pid = taosGetPId();
+    int32_t  val = atomic_add_fetch_32(&requestSerialId, 1);
 
-  uint64_t id = ((hashId & 0x0FFF) << 52) | ((pid & 0x0FFF) << 40) | ((ts & 0xFFFFFF) << 16) | (val & 0xFFFF);
+    id = ((hashId & 0x0FFF) << 52) | ((pid & 0x0FFF) << 40) | ((ts & 0xFFFFFF) << 16) | (val & 0xFFFF);
+    if (id) {
+      break;
+    }
+  }
   return id;
 }
 
diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index 82788b2e11..a6678b2ec0 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -14,6 +14,7 @@
  */
 
 #include "catalog.h"
+#include "scheduler.h"
 #include "clientInt.h"
 #include "clientLog.h"
 #include "trpc.h"
@@ -109,10 +110,36 @@ static int32_t hbProcessStbInfoRsp(void *value, int32_t valueLen, struct SCatalo
 static int32_t hbQueryHbRspHandle(SAppHbMgr *pAppHbMgr, SClientHbRsp *pRsp) {
   SHbConnInfo *info = taosHashGet(pAppHbMgr->connInfo, &pRsp->connKey, sizeof(SClientHbKey));
   if (NULL == info) {
-    tscWarn("fail to get connInfo, may be dropped, connId:%d, type:%d", pRsp->connKey.connId, pRsp->connKey.hbType);
+    tscWarn("fail to get connInfo, may be dropped, refId:%" PRIx64 ", type:%d", pRsp->connKey.tscRid, pRsp->connKey.connType);
     return TSDB_CODE_SUCCESS;
   }
 
+  if (pRsp->query) {
+    STscObj *pTscObj = (STscObj *)acquireTscObj(pRsp->connKey.tscRid);
+    if (NULL == pTscObj) {
+      tscDebug("tscObj rid %" PRIx64 " not exist", pRsp->connKey.tscRid);
+    } else {
+      updateEpSet_s(&pTscObj->pAppInfo->mgmtEp, &pRsp->query->epSet);
+      pTscObj->connId = pRsp->query->connId;
+      
+      if (pRsp->query->killRid) {
+        SRequestObj *pRequest = acquireRequest(pRsp->query->killRid);
+        if (NULL == pRequest) {
+          tscDebug("request 0x%" PRIx64 " not exist to kill", pRsp->query->killRid);
+        } else {
+          taos_stop_query((TAOS_RES *)pRequest);
+          releaseRequest(pRsp->query->killRid);
+        }
+      }
+      
+      if (pRsp->query->killConnection) {
+        taos_close(pTscObj);
+      }
+
+      releaseTscObj(pRsp->connKey.tscRid);
+    }
+  }
+  
   int32_t kvNum = pRsp->info ? taosArrayGetSize(pRsp->info) : 0;
 
   tscDebug("hb got %d rsp kv", kvNum);
@@ -197,7 +224,7 @@ static int32_t hbAsyncCallBack(void *param, const SDataBuf *pMsg, int32_t code)
 
   for (int32_t i = 0; i < rspNum; ++i) {
     SClientHbRsp *rsp = taosArrayGet(pRsp.rsps, i);
-    code = (*clientHbMgr.rspHandle[rsp->connKey.hbType])((*pInst)->pAppHbMgr, rsp);
+    code = (*clientHbMgr.rspHandle[rsp->connKey.connType])((*pInst)->pAppHbMgr, rsp);
     if (code) {
       break;
     }
@@ -208,6 +235,97 @@ static int32_t hbAsyncCallBack(void *param, const SDataBuf *pMsg, int32_t code)
   return code;
 }
 
+int32_t hbBuildQueryDesc(SQueryHbReqBasic *hbBasic, STscObj *pObj) {
+  int64_t now = taosGetTimestampUs();
+  SQueryDesc desc = {0};
+  int32_t code = 0;
+
+  void   *pIter = taosHashIterate(pObj->pRequests, NULL);
+  while (pIter != NULL) {
+    int64_t *rid = pIter;
+    SRequestObj *pRequest = acquireRequest(*rid);
+    if (NULL == pRequest) {
+      continue;
+    }
+
+    tstrncpy(desc.sql, pRequest->sqlstr, sizeof(desc.sql));
+    desc.stime    = pRequest->metric.start;
+    desc.queryId  = pRequest->requestId;
+    desc.useconds = now - pRequest->metric.start;
+    desc.reqRid   = pRequest->self;
+    desc.pid      = hbBasic->pid;
+    taosGetFqdn(desc.fqdn);
+    desc.subPlanNum = pRequest->body.pDag ? pRequest->body.pDag->numOfSubplans : 0;
+
+    if (desc.subPlanNum) {
+      desc.subDesc = taosArrayInit(desc.subPlanNum, sizeof(SQuerySubDesc));
+      if (NULL == desc.subDesc) {
+        releaseRequest(*rid);
+        return TSDB_CODE_QRY_OUT_OF_MEMORY;
+      }
+
+      code = schedulerGetTasksStatus(pRequest->body.queryJob, desc.subDesc);
+      if (code) {
+        taosArrayDestroy(desc.subDesc);
+        desc.subDesc = NULL;
+      }
+    }
+
+    releaseRequest(*rid);    
+    taosArrayPush(hbBasic->queryDesc, &desc);
+    
+    pIter = taosHashIterate(pObj->pRequests, pIter);
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t hbGetQueryBasicInfo(SClientHbKey *connKey, SClientHbReq *req) {
+  STscObj *pTscObj = (STscObj *)acquireTscObj(connKey->tscRid);
+  if (NULL == pTscObj) {
+    tscWarn("tscObj rid %" PRIx64 " not exist", connKey->tscRid);
+    return TSDB_CODE_QRY_APP_ERROR;
+  }
+  
+  int32_t numOfQueries = pTscObj->pRequests ? taosHashGetSize(pTscObj->pRequests) : 0;
+  if (numOfQueries <= 0) {
+    releaseTscObj(connKey->tscRid);
+    tscDebug("no queries on connection");
+    return TSDB_CODE_QRY_APP_ERROR;
+  }
+  
+  SQueryHbReqBasic *hbBasic = (SQueryHbReqBasic *)taosMemoryCalloc(1, sizeof(SQueryHbReqBasic));
+  if (NULL == hbBasic) {
+    tscError("calloc %d failed", (int32_t)sizeof(SQueryHbReqBasic));
+    releaseTscObj(connKey->tscRid);
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+
+  hbBasic->queryDesc = taosArrayInit(numOfQueries, sizeof(SQueryDesc));
+  if (NULL == hbBasic->queryDesc) {
+    tscWarn("taosArrayInit %d queryDesc failed", numOfQueries);
+    releaseTscObj(connKey->tscRid);
+    taosMemoryFree(hbBasic);
+    return TSDB_CODE_QRY_OUT_OF_MEMORY;
+  }
+  
+  hbBasic->connId = pTscObj->connId;
+  hbBasic->pid = taosGetPId();
+  taosGetAppName(hbBasic->app, NULL);
+
+  int32_t code = hbBuildQueryDesc(hbBasic, pTscObj);
+  if (code) {
+    releaseTscObj(connKey->tscRid);
+    taosMemoryFree(hbBasic);
+    return code;
+  }
+
+  req->query = hbBasic;
+  releaseTscObj(connKey->tscRid);
+
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t hbGetExpiredDBInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, SClientHbReq *req) {
   SDbVgVersion *dbs = NULL;
   uint32_t      dbNum = 0;
@@ -286,6 +404,8 @@ int32_t hbQueryHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req
     return code;
   }
 
+  hbGetQueryBasicInfo(connKey, req);
+  
   code = hbGetExpiredDBInfo(connKey, pCatalog, req);
   if (TSDB_CODE_SUCCESS != code) {
     return code;
@@ -300,11 +420,11 @@ int32_t hbQueryHbReqHandle(SClientHbKey *connKey, void *param, SClientHbReq *req
 }
 
 void hbMgrInitMqHbHandle() {
-  clientHbMgr.reqHandle[HEARTBEAT_TYPE_QUERY] = hbQueryHbReqHandle;
-  clientHbMgr.reqHandle[HEARTBEAT_TYPE_MQ] = hbMqHbReqHandle;
+  clientHbMgr.reqHandle[CONN_TYPE__QUERY] = hbQueryHbReqHandle;
+  clientHbMgr.reqHandle[CONN_TYPE__TMQ] = hbMqHbReqHandle;
 
-  clientHbMgr.rspHandle[HEARTBEAT_TYPE_QUERY] = hbQueryHbRspHandle;
-  clientHbMgr.rspHandle[HEARTBEAT_TYPE_MQ] = hbMqHbRspHandle;
+  clientHbMgr.rspHandle[CONN_TYPE__QUERY] = hbQueryHbRspHandle;
+  clientHbMgr.rspHandle[CONN_TYPE__TMQ] = hbMqHbRspHandle;
 }
 
 static FORCE_INLINE void hbMgrInitHandle() {
@@ -317,6 +437,11 @@ void hbFreeReq(void *req) {
   tFreeReqKvHash(pReq->info);
 }
 
+void hbClearClientHbReq(SClientHbReq *pReq) {
+  pReq->query = NULL;
+  pReq->info = NULL;
+}
+
 SClientHbBatchReq *hbGatherAllInfo(SAppHbMgr *pAppHbMgr) {
   SClientHbBatchReq *pBatchReq = taosMemoryCalloc(1, sizeof(SClientHbBatchReq));
   if (pBatchReq == NULL) {
@@ -333,22 +458,23 @@ SClientHbBatchReq *hbGatherAllInfo(SAppHbMgr *pAppHbMgr) {
 
     SHbConnInfo *info = taosHashGet(pAppHbMgr->connInfo, &pOneReq->connKey, sizeof(SClientHbKey));
     if (info) {
-      code = (*clientHbMgr.reqHandle[pOneReq->connKey.hbType])(&pOneReq->connKey, info->param, pOneReq);
+      code = (*clientHbMgr.reqHandle[pOneReq->connKey.connType])(&pOneReq->connKey, info->param, pOneReq);
       if (code) {
-        taosHashCancelIterate(pAppHbMgr->activeInfo, pIter);
-        break;
+        pIter = taosHashIterate(pAppHbMgr->activeInfo, pIter);
+        continue;
       }
     }
 
     taosArrayPush(pBatchReq->reqs, pOneReq);
+    hbClearClientHbReq(pOneReq);
 
     pIter = taosHashIterate(pAppHbMgr->activeInfo, pIter);
   }
 
-  if (code) {
-    taosArrayDestroyEx(pBatchReq->reqs, hbFreeReq);
-    taosMemoryFreeClear(pBatchReq);
-  }
+//  if (code) {
+//    taosArrayDestroyEx(pBatchReq->reqs, hbFreeReq);
+//    taosMemoryFreeClear(pBatchReq);
+//  }
 
   return pBatchReq;
 }
@@ -523,13 +649,13 @@ int hbMgrInit() {
   hbMgrInitHandle();
 
   // init backgroud thread
-  hbCreateThread();
+  //hbCreateThread();
 
   return 0;
 }
 
 void hbMgrCleanUp() {
-  hbStopThread();
+  //hbStopThread();
 
   // destroy all appHbMgr
   int8_t old = atomic_val_compare_exchange_8(&clientHbMgr.inited, 1, 0);
@@ -549,7 +675,7 @@ int hbRegisterConnImpl(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, SHbConnInfo *
   if (data != NULL) {
     return 0;
   }
-  SClientHbReq hbReq;
+  SClientHbReq hbReq = {0};
   hbReq.connKey = connKey;
   hbReq.info = taosHashInit(64, hbKeyHashFunc, 1, HASH_ENTRY_LOCK);
 
@@ -566,22 +692,22 @@ int hbRegisterConnImpl(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, SHbConnInfo *
   return 0;
 }
 
-int hbRegisterConn(SAppHbMgr *pAppHbMgr, int32_t connId, int64_t clusterId, int32_t hbType) {
+int hbRegisterConn(SAppHbMgr *pAppHbMgr, int64_t tscRefId, int64_t clusterId, int8_t connType) {
   SClientHbKey connKey = {
-      .connId = connId,
-      .hbType = hbType,
+      .tscRid = tscRefId,
+      .connType = connType,
   };
   SHbConnInfo info = {0};
 
-  switch (hbType) {
-    case HEARTBEAT_TYPE_QUERY: {
+  switch (connType) {
+    case CONN_TYPE__QUERY: {
       int64_t *pClusterId = taosMemoryMalloc(sizeof(int64_t));
       *pClusterId = clusterId;
 
       info.param = pClusterId;
       return hbRegisterConnImpl(pAppHbMgr, connKey, &info);
     }
-    case HEARTBEAT_TYPE_MQ: {
+    case CONN_TYPE__TMQ: {
       return 0;
     }
     default:
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 96a7230ff3..74b8e711dc 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -1,3 +1,17 @@
+/*
+ * 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 "clientInt.h"
 #include "clientLog.h"
@@ -132,6 +146,13 @@ int32_t buildRequest(STscObj* pTscObj, const char* sql, int sqlLen, SRequestObj*
   (*pRequest)->sqlstr[sqlLen] = 0;
   (*pRequest)->sqlLen = sqlLen;
 
+  if (taosHashPut(pTscObj->pRequests, &(*pRequest)->self, sizeof((*pRequest)->self), &(*pRequest)->self, sizeof((*pRequest)->self))) {
+    destroyRequest(*pRequest);
+    *pRequest = NULL;
+    tscError("put request to request hash failed");
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
   tscDebugL("0x%" PRIx64 " SQL: %s, reqId:0x%" PRIx64, (*pRequest)->self, (*pRequest)->sqlstr, (*pRequest)->requestId);
   return TSDB_CODE_SUCCESS;
 }
@@ -161,6 +182,7 @@ int32_t parseSql(SRequestObj* pRequest, bool topicQuery, SQuery** pQuery) {
   if (TSDB_CODE_SUCCESS == code) {
     if ((*pQuery)->haveResultSet) {
       setResSchemaInfo(&pRequest->body.resInfo, (*pQuery)->pResSchema, (*pQuery)->numOfResCols);
+      setResPrecision(&pRequest->body.resInfo, (*pQuery)->precision);
     }
 
     TSWAP(pRequest->dbList, (*pQuery)->pDbList, SArray*);
@@ -215,7 +237,7 @@ int32_t getPlan(SRequestObj* pRequest, SQuery* pQuery, SQueryPlan** pPlan, SArra
 }
 
 void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols) {
-  assert(pSchema != NULL && numOfCols > 0);
+  ASSERT(pSchema != NULL && numOfCols > 0);
 
   pResInfo->numOfCols = numOfCols;
   pResInfo->fields = taosMemoryCalloc(numOfCols, sizeof(TAOS_FIELD));
@@ -239,6 +261,14 @@ void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t
   }
 }
 
+void setResPrecision(SReqResultInfo* pResInfo, int32_t precision) {
+  if (precision != TSDB_TIME_PRECISION_MILLI && precision != TSDB_TIME_PRECISION_MICRO && precision != TSDB_TIME_PRECISION_NANO) {
+    return;
+  }
+
+  pResInfo->precision = precision;
+}
+
 int32_t scheduleQuery(SRequestObj* pRequest, SQueryPlan* pDag, SArray* pNodeList) {
   void* pTransporter = pRequest->pTscObj->pAppInfo->pTransporter;
 
@@ -447,7 +477,7 @@ STscObj* taosConnectImpl(const char* user, const char* auth, const char* db, __t
     taos_close(pTscObj);
     pTscObj = NULL;
   } else {
-    tscDebug("0x%" PRIx64 " connection is opening, connId:%d, dnodeConn:%p, reqId:0x%" PRIx64, pTscObj->id,
+    tscDebug("0x%" PRIx64 " connection is opening, connId:%u, dnodeConn:%p, reqId:0x%" PRIx64, pTscObj->id,
              pTscObj->connId, pTscObj->pAppInfo->pTransporter, pRequest->requestId);
     destroyRequest(pRequest);
   }
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 42d204284e..73ac059276 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -14,7 +14,9 @@
  */
 
 #include "catalog.h"
+#include "scheduler.h"
 #include "clientInt.h"
+#include "clientStmt.h"
 #include "clientLog.h"
 #include "os.h"
 #include "query.h"
@@ -66,6 +68,7 @@ void taos_cleanup(void) {
 
   rpcCleanup();
   catalogDestroy();
+  schedulerDestroy();
   taosCloseLog();
 
   tscInfo("all local resources released");
@@ -98,7 +101,7 @@ void taos_close(TAOS *taos) {
   STscObj *pTscObj = (STscObj *)taos;
   tscDebug("0x%" PRIx64 " try to close connection, numOfReq:%d", pTscObj->id, pTscObj->numOfReqs);
 
-  /*taosRemoveRef(clientConnRefPool, pTscObj->id);*/
+  taosRemoveRef(clientConnRefPool, pTscObj->id);
 }
 
 int taos_errno(TAOS_RES *tres) {
@@ -193,7 +196,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
     }
 
   } else {
-    // assert to avoid uninitialization error
+    // assert to avoid un-initialization error
     ASSERT(0);
   }
   return NULL;
@@ -355,6 +358,7 @@ int taos_result_precision(TAOS_RES *res) {
   if (res == NULL) {
     return TSDB_TIME_PRECISION_MILLI;
   }
+
   if (TD_RES_QUERY(res)) {
     SRequestObj *pRequest = (SRequestObj *)res;
     return pRequest->body.resInfo.precision;
@@ -400,7 +404,7 @@ void taos_stop_query(TAOS_RES *res) {
     return;
   }
 
-  //  scheduleCancelJob(pRequest->body.pQueryJob);
+  schedulerFreeJob(pRequest->body.queryJob);
 }
 
 bool taos_is_null(TAOS_RES *res, int32_t row, int32_t col) {
@@ -467,6 +471,7 @@ int taos_fetch_raw_block(TAOS_RES *res, int *numOfRows, void **pData) {
   if (res == NULL) {
     return 0;
   }
+
   if (TD_RES_TMQ(res)) {
     SReqResultInfo *pResultInfo = tmqGetNextResInfo(res);
     if (pResultInfo == NULL) {
@@ -565,76 +570,149 @@ int taos_load_table_info(TAOS *taos, const char *tableNameList) {
 }
 
 TAOS_STMT *taos_stmt_init(TAOS *taos) {
-  // TODO
-  return NULL;
+  if (taos == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return NULL;
+  }
+
+  return stmtInit(taos);
 }
 
 int taos_stmt_close(TAOS_STMT *stmt) {
-  // TODO
-  return -1;
+  if (stmt == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtClose(stmt);
 }
 
 int taos_stmt_execute(TAOS_STMT *stmt) {
-  // TODO
-  return -1;
+  if (stmt == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtExec(stmt);
 }
 
 char *taos_stmt_errstr(TAOS_STMT *stmt) {
-  // TODO
-  return NULL;
+  if (stmt == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return NULL;
+  }
+
+  return stmtErrstr(stmt);
 }
 
 int taos_stmt_affected_rows(TAOS_STMT *stmt) {
-  // TODO
-  return -1;
+  if (stmt == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return 0;
+  }
+
+  return stmtAffectedRows(stmt);
 }
 
+int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind) {
+  if (stmt == NULL || bind == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtBind(stmt, bind);
+}
+
+int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length) {
+  if (stmt == NULL || sql == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtPrepare(stmt, sql, length);
+}
+
+int taos_stmt_set_tbname_tags(TAOS_STMT *stmt, const char *name, TAOS_BIND *tags) {
+  if (stmt == NULL || name == NULL || tags == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtSetTbNameTags(stmt, name, tags);
+}
+
+int taos_stmt_set_tbname(TAOS_STMT *stmt, const char *name) {
+  if (stmt == NULL || name == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtSetTbNameTags(stmt, name, NULL);
+}
+
+int taos_stmt_is_insert(TAOS_STMT *stmt, int *insert) {
+  if (stmt == NULL || insert == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtIsInsert(stmt, insert);
+}
+
+int taos_stmt_num_params(TAOS_STMT *stmt, int *nums) {
+  if (stmt == NULL || nums == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtGetParamNum(stmt, nums);
+}
+
+int taos_stmt_add_batch(TAOS_STMT *stmt) {
+  if (stmt == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtAddBatch(stmt);
+}
+
+TAOS_RES *taos_stmt_use_result(TAOS_STMT *stmt) {
+  if (stmt == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return NULL;
+  }
+
+  return stmtUseResult(stmt);
+}
+
+int taos_stmt_bind_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) {
+  if (stmt == NULL || bind == NULL) {
+    tscError("NULL parameter for %s", __FUNCTION__);
+    terrno = TSDB_CODE_INVALID_PARA;
+    return terrno;
+  }
+
+  return stmtBindBatch(stmt, bind);
+}
+
+
 TAOS_RES *taos_schemaless_insert(TAOS *taos, char *lines[], int numLines, int protocol, int precision) {
   // TODO
   return NULL;
 }
 
-int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind) {
-  // TODO
-  return -1;
-}
 
-int taos_stmt_prepare(TAOS_STMT *stmt, const char *sql, unsigned long length) {
-  // TODO
-  return -1;
-}
-
-int taos_stmt_set_tbname_tags(TAOS_STMT *stmt, const char *name, TAOS_BIND *tags) {
-  // TODO
-  return -1;
-}
-
-int taos_stmt_set_tbname(TAOS_STMT *stmt, const char *name) {
-  // TODO
-  return -1;
-}
-
-int taos_stmt_is_insert(TAOS_STMT *stmt, int *insert) {
-  // TODO
-  return -1;
-}
-
-int taos_stmt_num_params(TAOS_STMT *stmt, int *nums) {
-  // TODO
-  return -1;
-}
-
-int taos_stmt_add_batch(TAOS_STMT *stmt) {
-  // TODO
-  return -1;
-}
-
-TAOS_RES *taos_stmt_use_result(TAOS_STMT *stmt) {
-  // TODO
-  return NULL;
-}
-
-int taos_stmt_bind_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) {
-  // TODO
-  return -1;
-}
diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 67c5679cac..74347cabf7 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -71,7 +71,7 @@ int32_t processConnectRsp(void* param, const SDataBuf* pMsg, int32_t code) {
 
   pTscObj->connType = connectRsp.connType;
 
-  hbRegisterConn(pTscObj->pAppInfo->pAppHbMgr, connectRsp.connId, connectRsp.clusterId, connectRsp.connType);
+  hbRegisterConn(pTscObj->pAppInfo->pAppHbMgr, pTscObj->id, connectRsp.clusterId, connectRsp.connType);
 
   //  pRequest->body.resInfo.pRspMsg = pMsg->pData;
   tscDebug("0x%" PRIx64 " clusterId:%" PRId64 ", totalConn:%" PRId64, pRequest->requestId, connectRsp.clusterId,
@@ -117,10 +117,10 @@ int32_t processUseDbRsp(void* param, const SDataBuf* pMsg, int32_t code) {
     struct SCatalog *pCatalog = NULL;
 
     if (usedbRsp.vgVersion >= 0) {
-      int32_t code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog);
-      if (code != TSDB_CODE_SUCCESS) {
+      int32_t code1 = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog);
+      if (code1 != TSDB_CODE_SUCCESS) {
         tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->pTscObj->pAppInfo->clusterId,
-                tstrerror(code));
+                tstrerror(code1));
       } else {
         catalogRemoveDB(pCatalog, usedbRsp.db, usedbRsp.uid);
       }
@@ -154,10 +154,10 @@ int32_t processUseDbRsp(void* param, const SDataBuf* pMsg, int32_t code) {
   } else {
     struct SCatalog* pCatalog = NULL;
 
-    int32_t code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog);
-    if (code != TSDB_CODE_SUCCESS) {
+    int32_t code1 = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog);
+    if (code1 != TSDB_CODE_SUCCESS) {
       tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->pTscObj->pAppInfo->clusterId,
-              tstrerror(code));
+              tstrerror(code1));
     } else {
       catalogUpdateDBVgInfo(pCatalog, output.db, output.dbId, output.dbVgroup);
     }
@@ -209,84 +209,9 @@ int32_t processDropDbRsp(void* param, const SDataBuf* pMsg, int32_t code) {
 }
 
 void initMsgHandleFp() {
-#if 0
-  tscBuildMsg[TSDB_SQL_SELECT] = tscBuildQueryMsg;
-  tscBuildMsg[TSDB_SQL_INSERT] = tscBuildSubmitMsg;
-  tscBuildMsg[TSDB_SQL_FETCH] = tscBuildFetchMsg;
-
-  tscBuildMsg[TSDB_SQL_CREATE_DB] = tscBuildCreateDbMsg;
-  tscBuildMsg[TSDB_SQL_CREATE_USER] = tscBuildUserMsg;
-  tscBuildMsg[TSDB_SQL_CREATE_FUNCTION] = tscBuildCreateFuncMsg;
-
-  tscBuildMsg[TSDB_SQL_CREATE_ACCT] = tscBuildAcctMsg;
-  tscBuildMsg[TSDB_SQL_ALTER_ACCT] = tscBuildAcctMsg;
-
-  tscBuildMsg[TSDB_SQL_CREATE_TABLE] = tscBuildCreateTableMsg;
-  tscBuildMsg[TSDB_SQL_DROP_USER] = tscBuildDropUserAcctMsg;
-  tscBuildMsg[TSDB_SQL_DROP_ACCT] = tscBuildDropUserAcctMsg;
-  tscBuildMsg[TSDB_SQL_DROP_DB] = tscBuildDropDbMsg;
-  tscBuildMsg[TSDB_SQL_DROP_FUNCTION] = tscBuildDropFuncMsg;
-  tscBuildMsg[TSDB_SQL_SYNC_DB_REPLICA] = tscBuildSyncDbReplicaMsg;
-  tscBuildMsg[TSDB_SQL_DROP_TABLE] = tscBuildDropTableMsg;
-  tscBuildMsg[TSDB_SQL_ALTER_USER] = tscBuildUserMsg;
-  tscBuildMsg[TSDB_SQL_CREATE_DNODE] = tscBuildCreateDnodeMsg;
-  tscBuildMsg[TSDB_SQL_DROP_DNODE] = tscBuildDropDnodeMsg;
-  tscBuildMsg[TSDB_SQL_CFG_DNODE] = tscBuildCfgDnodeMsg;
-  tscBuildMsg[TSDB_SQL_ALTER_TABLE] = tscBuildAlterTableMsg;
-  tscBuildMsg[TSDB_SQL_UPDATE_TAG_VAL] = tscBuildUpdateTagMsg;
-  tscBuildMsg[TSDB_SQL_ALTER_DB] = tscAlterDbMsg;
-  tscBuildMsg[TSDB_SQL_COMPACT_VNODE] = tscBuildCompactMsg;
-
-
-  tscBuildMsg[TSDB_SQL_USE_DB] = tscBuildUseDbMsg;
-  tscBuildMsg[TSDB_SQL_STABLEVGROUP] = tscBuildSTableVgroupMsg;
-  tscBuildMsg[TSDB_SQL_RETRIEVE_FUNC] = tscBuildRetrieveFuncMsg;
-
-  tscBuildMsg[TSDB_SQL_HB] = tscBuildHeartBeatMsg;
-  tscBuildMsg[TSDB_SQL_SHOW] = tscBuildShowMsg;
-  tscBuildMsg[TSDB_SQL_RETRIEVE_MNODE] = tscBuildRetrieveFromMgmtMsg;
-  tscBuildMsg[TSDB_SQL_KILL_QUERY] = tscBuildKillMsg;
-  tscBuildMsg[TSDB_SQL_KILL_STREAM] = tscBuildKillMsg;
-  tscBuildMsg[TSDB_SQL_KILL_CONNECTION] = tscBuildKillMsg;
-
-  tscProcessMsgRsp[TSDB_SQL_SELECT] = tscProcessQueryRsp;
-  tscProcessMsgRsp[TSDB_SQL_FETCH] = tscProcessRetrieveRspFromNode;
-
-  tscProcessMsgRsp[TSDB_SQL_DROP_DB] = tscProcessDropDbRsp;
-  tscProcessMsgRsp[TSDB_SQL_DROP_TABLE] = tscProcessDropTableRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_USE_DB] = tscProcessUseDbRsp;
-  tscProcessMsgRsp[TSDB_SQL_META] = tscProcessTableMetaRsp;
-  tscProcessMsgRsp[TSDB_SQL_STABLEVGROUP] = tscProcessSTableVgroupRsp;
-  tscProcessMsgRsp[TSDB_SQL_MULTI_META] = tscProcessMultiTableMetaRsp;
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_FUNC] = tscProcessRetrieveFuncRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_SHOW] = tscProcessShowRsp;
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_MNODE] = tscProcessRetrieveRspFromNode;  // rsp handled by same function.
-  tscProcessMsgRsp[TSDB_SQL_DESCRIBE_TABLE] = tscProcessDescribeTableRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_CURRENT_DB]   = tscProcessLocalRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_CURRENT_USER] = tscProcessLocalRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_SERV_VERSION] = tscProcessLocalRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_CLI_VERSION]  = tscProcessLocalRetrieveRsp;
-  tscProcessMsgRsp[TSDB_SQL_SERV_STATUS]  = tscProcessLocalRetrieveRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_EMPTY_RESULT] = tscProcessEmptyResultRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_RETRIEVE_GLOBALMERGE] = tscProcessRetrieveGlobalMergeRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_ALTER_TABLE] = tscProcessAlterTableMsgRsp;
-  tscProcessMsgRsp[TSDB_SQL_ALTER_DB] = tscProcessAlterDbMsgRsp;
-  tscProcessMsgRsp[TSDB_SQL_COMPACT_VNODE] = tscProcessCompactRsp;
-
-  tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_TABLE] = tscProcessShowCreateRsp;
-  tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_STABLE] = tscProcessShowCreateRsp;
-  tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_DATABASE] = tscProcessShowCreateRsp;
-#endif
-
-  handleRequestRspFp[TMSG_INDEX(TDMT_MND_CONNECT)]       = processConnectRsp;
-  handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_DB)]     = processCreateDbRsp;
-  handleRequestRspFp[TMSG_INDEX(TDMT_MND_USE_DB)]        = processUseDbRsp;
-  handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_STB)]    = processCreateTableRsp;
-  handleRequestRspFp[TMSG_INDEX(TDMT_MND_DROP_DB)]       = processDropDbRsp;
+  handleRequestRspFp[TMSG_INDEX(TDMT_MND_CONNECT)]    = processConnectRsp;
+  handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_DB)]  = processCreateDbRsp;
+  handleRequestRspFp[TMSG_INDEX(TDMT_MND_USE_DB)]     = processUseDbRsp;
+  handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_STB)] = processCreateTableRsp;
+  handleRequestRspFp[TMSG_INDEX(TDMT_MND_DROP_DB)]    = processDropDbRsp;
 }
diff --git a/source/client/src/clientStmt.c b/source/client/src/clientStmt.c
new file mode 100644
index 0000000000..8c4cff9251
--- /dev/null
+++ b/source/client/src/clientStmt.c
@@ -0,0 +1,99 @@
+
+#include "clientInt.h"
+#include "clientLog.h"
+#include "clientStmt.h"
+#include "tdef.h"
+
+TAOS_STMT *stmtInit(TAOS *taos) {
+  STscObj* pObj = (STscObj*)taos;
+  STscStmt* pStmt = NULL;
+
+#if 0
+  pStmt = taosMemoryCalloc(1, sizeof(STscStmt));
+  if (pStmt == NULL) {
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscError("failed to allocate memory for statement");
+    return NULL;
+  }
+  pStmt->taos = pObj;
+
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+
+  if (pSql == NULL) {
+    free(pStmt);
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscError("failed to allocate memory for statement");
+    return NULL;
+  }
+
+  if (TSDB_CODE_SUCCESS != tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
+    free(pSql);
+    free(pStmt);
+    terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
+    tscError("failed to malloc payload buffer");
+    return NULL;
+  }
+
+  tsem_init(&pSql->rspSem, 0, 0);
+  pSql->signature   = pSql;
+  pSql->pTscObj     = pObj;
+  pSql->maxRetry    = TSDB_MAX_REPLICA;
+  pStmt->pSql       = pSql;
+  pStmt->last       = STMT_INIT;
+  pStmt->numOfRows  = 0;
+  registerSqlObj(pSql);
+#endif
+
+  return pStmt;
+}
+
+int stmtClose(TAOS_STMT *stmt) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtExec(TAOS_STMT *stmt) {
+  return TSDB_CODE_SUCCESS;
+}
+
+char *stmtErrstr(TAOS_STMT *stmt) {
+  return NULL;
+}
+
+int stmtAffectedRows(TAOS_STMT *stmt) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtBind(TAOS_STMT *stmt, TAOS_BIND *bind) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtPrepare(TAOS_STMT *stmt, const char *sql, unsigned long length) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtSetTbNameTags(TAOS_STMT *stmt, const char *name, TAOS_BIND *tags) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtIsInsert(TAOS_STMT *stmt, int *insert) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtGetParamNum(TAOS_STMT *stmt, int *nums) {
+  return TSDB_CODE_SUCCESS;
+}
+
+int stmtAddBatch(TAOS_STMT *stmt) {
+  return TSDB_CODE_SUCCESS;
+}
+
+TAOS_RES *stmtUseResult(TAOS_STMT *stmt) {
+  return NULL;
+}
+
+int stmtBindBatch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) {
+  return TSDB_CODE_SUCCESS;
+}
+
+
+
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 031ebdaf49..3e37c52c26 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -134,6 +134,42 @@ void *taosDecodeSEpSet(void *buf, SEpSet *pEp) {
 static int32_t tSerializeSClientHbReq(SCoder *pEncoder, const SClientHbReq *pReq) {
   if (tEncodeSClientHbKey(pEncoder, &pReq->connKey) < 0) return -1;
 
+  if (pReq->connKey.connType == CONN_TYPE__QUERY) {
+    int32_t queryNum = 0;
+    if (pReq->query) {
+      queryNum = 1;
+      if (tEncodeI32(pEncoder, queryNum) < 0) return -1;
+      if (tEncodeU32(pEncoder, pReq->query->connId) < 0) return -1;
+      if (tEncodeI32(pEncoder, pReq->query->pid) < 0) return -1;
+      if (tEncodeCStr(pEncoder, pReq->query->app) < 0) return -1;
+      
+      int32_t num = taosArrayGetSize(pReq->query->queryDesc);
+      if (tEncodeI32(pEncoder, num) < 0) return -1;
+      
+      for (int32_t i = 0; i < num; ++i) {
+        SQueryDesc *desc = taosArrayGet(pReq->query->queryDesc, i);
+        if (tEncodeCStr(pEncoder, desc->sql) < 0) return -1;
+        if (tEncodeU64(pEncoder, desc->queryId) < 0) return -1;
+        if (tEncodeI64(pEncoder, desc->useconds) < 0) return -1;
+        if (tEncodeI64(pEncoder, desc->stime) < 0) return -1;
+        if (tEncodeI64(pEncoder, desc->reqRid) < 0) return -1;
+        if (tEncodeI32(pEncoder, desc->pid) < 0) return -1;
+        if (tEncodeCStr(pEncoder, desc->fqdn) < 0) return -1;
+        if (tEncodeI32(pEncoder, desc->subPlanNum) < 0) return -1;
+
+        int32_t snum = desc->subDesc ? taosArrayGetSize(desc->subDesc) : 0;
+        if (tEncodeI32(pEncoder, snum) < 0) return -1;
+        for (int32_t m = 0; m < snum; ++m) {
+          SQuerySubDesc *sDesc = taosArrayGet(desc->subDesc, m);
+          if (tEncodeI64(pEncoder, sDesc->tid) < 0) return -1;
+          if (tEncodeI32(pEncoder, sDesc->status) < 0) return -1;
+        }
+      }
+    } else {
+      if (tEncodeI32(pEncoder, queryNum) < 0) return -1;
+    }
+  }
+  
   int32_t kvNum = taosHashGetSize(pReq->info);
   if (tEncodeI32(pEncoder, kvNum) < 0) return -1;
   void *pIter = taosHashIterate(pReq->info, NULL);
@@ -149,6 +185,53 @@ static int32_t tSerializeSClientHbReq(SCoder *pEncoder, const SClientHbReq *pReq
 static int32_t tDeserializeSClientHbReq(SCoder *pDecoder, SClientHbReq *pReq) {
   if (tDecodeSClientHbKey(pDecoder, &pReq->connKey) < 0) return -1;
 
+  if (pReq->connKey.connType == CONN_TYPE__QUERY) {
+    int32_t queryNum = 0;
+    if (tDecodeI32(pDecoder, &queryNum) < 0) return -1;
+    if (queryNum) {
+      pReq->query = taosMemoryCalloc(1, sizeof(*pReq->query));
+      if (NULL == pReq->query) return -1;
+      if (tDecodeU32(pDecoder, &pReq->query->connId) < 0) return -1;
+      if (tDecodeI32(pDecoder, &pReq->query->pid) < 0) return -1;
+      if (tDecodeCStrTo(pDecoder, pReq->query->app) < 0) return -1;
+
+      int32_t num = 0;
+      if (tDecodeI32(pDecoder, &num) < 0) return -1;
+      if (num > 0) {
+        pReq->query->queryDesc = taosArrayInit(num, sizeof(SQueryDesc));
+        if (NULL == pReq->query->queryDesc) return -1;
+        
+        for (int32_t i = 0; i < num; ++i) {
+          SQueryDesc desc = {0};
+          if (tDecodeCStrTo(pDecoder, desc.sql) < 0) return -1;
+          if (tDecodeU64(pDecoder, &desc.queryId) < 0) return -1;
+          if (tDecodeI64(pDecoder, &desc.useconds) < 0) return -1;
+          if (tDecodeI64(pDecoder, &desc.stime) < 0) return -1;
+          if (tDecodeI64(pDecoder, &desc.reqRid) < 0) return -1;
+          if (tDecodeI32(pDecoder, &desc.pid) < 0) return -1;
+          if (tDecodeCStrTo(pDecoder, desc.fqdn) < 0) return -1;
+          if (tDecodeI32(pDecoder, &desc.subPlanNum) < 0) return -1;
+
+          int32_t snum = 0;
+          if (tDecodeI32(pDecoder, &snum) < 0) return -1;
+          if (snum > 0) {
+            desc.subDesc = taosArrayInit(snum, sizeof(SQuerySubDesc));
+            if (NULL == desc.subDesc) return -1;
+            
+            for (int32_t m = 0; m < snum; ++m) {
+              SQuerySubDesc sDesc = {0};
+              if (tDecodeI64(pDecoder, &sDesc.tid) < 0) return -1;
+              if (tDecodeI32(pDecoder, &sDesc.status) < 0) return -1;
+              taosArrayPush(desc.subDesc, &sDesc);
+            }
+          }
+
+          taosArrayPush(pReq->query->queryDesc, &desc);
+        }
+      }
+    }
+  }
+
   int32_t kvNum = 0;
   if (tDecodeI32(pDecoder, &kvNum) < 0) return -1;
   if (pReq->info == NULL) {
@@ -168,6 +251,20 @@ static int32_t tSerializeSClientHbRsp(SCoder *pEncoder, const SClientHbRsp *pRsp
   if (tEncodeSClientHbKey(pEncoder, &pRsp->connKey) < 0) return -1;
   if (tEncodeI32(pEncoder, pRsp->status) < 0) return -1;
 
+  int32_t queryNum = 0;
+  if (pRsp->query) {
+    queryNum = 1;
+    if (tEncodeI32(pEncoder, queryNum) < 0) return -1;  
+    if (tEncodeU32(pEncoder, pRsp->query->connId) < 0) return -1;
+    if (tEncodeU64(pEncoder, pRsp->query->killRid) < 0) return -1;
+    if (tEncodeI32(pEncoder, pRsp->query->totalDnodes) < 0) return -1;
+    if (tEncodeI32(pEncoder, pRsp->query->onlineDnodes) < 0) return -1;
+    if (tEncodeI8(pEncoder, pRsp->query->killConnection) < 0) return -1;
+    if (tEncodeSEpSet(pEncoder, &pRsp->query->epSet) < 0) return -1;
+  } else {
+    if (tEncodeI32(pEncoder, queryNum) < 0) return -1;  
+  }
+  
   int32_t kvNum = taosArrayGetSize(pRsp->info);
   if (tEncodeI32(pEncoder, kvNum) < 0) return -1;
   for (int32_t i = 0; i < kvNum; i++) {
@@ -182,6 +279,19 @@ static int32_t tDeserializeSClientHbRsp(SCoder *pDecoder, SClientHbRsp *pRsp) {
   if (tDecodeSClientHbKey(pDecoder, &pRsp->connKey) < 0) return -1;
   if (tDecodeI32(pDecoder, &pRsp->status) < 0) return -1;
 
+  int32_t queryNum = 0;
+  if (tDecodeI32(pDecoder, &queryNum) < 0) return -1;
+  if (queryNum) {
+    pRsp->query = taosMemoryCalloc(1, sizeof(*pRsp->query));
+    if (NULL == pRsp->query) return -1;
+    if (tDecodeU32(pDecoder, &pRsp->query->connId) < 0) return -1;
+    if (tDecodeU64(pDecoder, &pRsp->query->killRid) < 0) return -1;
+    if (tDecodeI32(pDecoder, &pRsp->query->totalDnodes) < 0) return -1;
+    if (tDecodeI32(pDecoder, &pRsp->query->onlineDnodes) < 0) return -1;
+    if (tDecodeI8(pDecoder, &pRsp->query->killConnection) < 0) return -1;
+    if (tDecodeSEpSet(pDecoder, &pRsp->query->epSet) < 0) return -1;
+  }
+
   int32_t kvNum = 0;
   if (tDecodeI32(pDecoder, &kvNum) < 0) return -1;
   pRsp->info = taosArrayInit(kvNum, sizeof(SKv));
@@ -224,8 +334,9 @@ int32_t tDeserializeSClientHbBatchReq(void *buf, int32_t bufLen, SClientHbBatchR
 
   int32_t reqNum = 0;
   if (tDecodeI32(&decoder, &reqNum) < 0) return -1;
-  if (pBatchReq->reqs == NULL) {
+  if (reqNum > 0) {
     pBatchReq->reqs = taosArrayInit(reqNum, sizeof(SClientHbReq));
+    if (NULL == pBatchReq->reqs) return -1;
   }
   for (int32_t i = 0; i < reqNum; i++) {
     SClientHbReq req = {0};
@@ -2567,7 +2678,7 @@ int32_t tSerializeSConnectRsp(void *buf, int32_t bufLen, SConnectRsp *pRsp) {
   if (tStartEncode(&encoder) < 0) return -1;
   if (tEncodeI32(&encoder, pRsp->acctId) < 0) return -1;
   if (tEncodeI64(&encoder, pRsp->clusterId) < 0) return -1;
-  if (tEncodeI32(&encoder, pRsp->connId) < 0) return -1;
+  if (tEncodeU32(&encoder, pRsp->connId) < 0) return -1;
   if (tEncodeI8(&encoder, pRsp->superUser) < 0) return -1;
   if (tEncodeI8(&encoder, pRsp->connType) < 0) return -1;
   if (tEncodeSEpSet(&encoder, &pRsp->epSet) < 0) return -1;
@@ -2586,7 +2697,7 @@ int32_t tDeserializeSConnectRsp(void *buf, int32_t bufLen, SConnectRsp *pRsp) {
   if (tStartDecode(&decoder) < 0) return -1;
   if (tDecodeI32(&decoder, &pRsp->acctId) < 0) return -1;
   if (tDecodeI64(&decoder, &pRsp->clusterId) < 0) return -1;
-  if (tDecodeI32(&decoder, &pRsp->connId) < 0) return -1;
+  if (tDecodeU32(&decoder, &pRsp->connId) < 0) return -1;
   if (tDecodeI8(&decoder, &pRsp->superUser) < 0) return -1;
   if (tDecodeI8(&decoder, &pRsp->connType) < 0) return -1;
   if (tDecodeSEpSet(&decoder, &pRsp->epSet) < 0) return -1;
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index 484b6646b5..925197d708 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -91,9 +91,9 @@ static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
   pCfg->keep = pCreate->daysToKeep0;
   pCfg->streamMode = pCreate->streamMode;
   pCfg->isWeak = true;
-  pCfg->tsdbCfg.keep = pCreate->daysToKeep0;
-  pCfg->tsdbCfg.keep1 = pCreate->daysToKeep2;
   pCfg->tsdbCfg.keep2 = pCreate->daysToKeep0;
+  pCfg->tsdbCfg.keep0 = pCreate->daysToKeep2;
+  pCfg->tsdbCfg.keep1 = pCreate->daysToKeep0;
   pCfg->tsdbCfg.lruCacheSize = pCreate->cacheBlockSize;
   pCfg->tsdbCfg.retentions = pCreate->pRetensions;
   pCfg->metaCfg.lruSize = pCreate->cacheBlockSize;
@@ -121,6 +121,8 @@ static void vmGenerateWrapperCfg(SVnodesMgmt *pMgmt, SCreateVnodeReq *pCreate, S
 int32_t vmProcessCreateVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) {
   SRpcMsg        *pReq = &pMsg->rpcMsg;
   SCreateVnodeReq createReq = {0};
+  char            path[TSDB_FILENAME_LEN];
+
   if (tDeserializeSCreateVnodeReq(pReq->pCont, pReq->contLen, &createReq) != 0) {
     terrno = TSDB_CODE_INVALID_MSG;
     return -1;
@@ -143,6 +145,14 @@ int32_t vmProcessCreateVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) {
     return -1;
   }
 
+  // create vnode
+  snprintf(path, TSDB_FILENAME_LEN, "vnode%svnode%d", TD_DIRSEP, vnodeCfg.vgId);
+  if (vnodeCreate(path, &vnodeCfg, pMgmt->pTfs) < 0) {
+    tFreeSCreateVnodeReq(&createReq);
+    dError("vgId:%d, failed to create vnode since %s", createReq.vgId, terrstr());
+    return -1;
+  }
+
   SMsgCb msgCb = pMgmt->pDnode->data.msgCb;
   msgCb.pWrapper = pMgmt->pWrapper;
   msgCb.queueFps[QUERY_QUEUE] = vmPutMsgToQueryQueue;
diff --git a/source/dnode/mnode/impl/inc/mndDb.h b/source/dnode/mnode/impl/inc/mndDb.h
index c0b25d74d1..146c6e2523 100644
--- a/source/dnode/mnode/impl/inc/mndDb.h
+++ b/source/dnode/mnode/impl/inc/mndDb.h
@@ -27,7 +27,7 @@ void    mndCleanupDb(SMnode *pMnode);
 SDbObj *mndAcquireDb(SMnode *pMnode, const char *db);
 void    mndReleaseDb(SMnode *pMnode, SDbObj *pDb);
 int32_t mndValidateDbInfo(SMnode *pMnode, SDbVgVersion *pDbs, int32_t numOfDbs, void **ppRsp, int32_t *pRspLen);
-char   *mnGetDbStr(char *src);
+char   *mndGetDbStr(char *src);
 int32_t mndExtractDbInfo(SMnode *pMnode, SDbObj *pDb, SUseDbRsp *pRsp, const SUseDbReq *pReq);
 
 #ifdef __cplusplus
diff --git a/source/dnode/mnode/impl/inc/mndInt.h b/source/dnode/mnode/impl/inc/mndInt.h
index 11c1b09cc9..7b67308876 100644
--- a/source/dnode/mnode/impl/inc/mndInt.h
+++ b/source/dnode/mnode/impl/inc/mndInt.h
@@ -38,6 +38,10 @@ extern "C" {
 #define mDebug(...) { if (mDebugFlag & DEBUG_DEBUG) { taosPrintLog("MND ", DEBUG_DEBUG, mDebugFlag, __VA_ARGS__); }}
 #define mTrace(...) { if (mDebugFlag & DEBUG_TRACE) { taosPrintLog("MND ", DEBUG_TRACE, mDebugFlag, __VA_ARGS__); }}
 
+#define SYSTABLE_SCH_TABLE_NAME_LEN ((TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
+#define SYSTABLE_SCH_DB_NAME_LEN    ((TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
+#define SYSTABLE_SCH_COL_NAME_LEN    ((TSDB_COL_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
+
 typedef int32_t (*MndMsgFp)(SNodeMsg *pMsg);
 typedef int32_t (*MndInitFp)(SMnode *pMnode);
 typedef void (*MndCleanupFp)(SMnode *pMnode);
@@ -74,7 +78,6 @@ typedef struct {
 } SShowMgmt;
 
 typedef struct {
-  int32_t    connId;
   SCacheObj *cache;
 } SProfileMgmt;
 
@@ -118,6 +121,7 @@ struct SMnode {
   STelemMgmt        telemMgmt;
   SSyncMgmt         syncMgmt;
   SHashObj         *infosMeta;
+  SHashObj         *perfsMeta;
   SGrantInfo        grant;
   MndMsgFp          msgFp[TDMT_MAX];
   SMsgCb            msgCb;
diff --git a/source/dnode/mnode/impl/inc/mndPerfSchema.h b/source/dnode/mnode/impl/inc/mndPerfSchema.h
new file mode 100644
index 0000000000..2c613e253c
--- /dev/null
+++ b/source/dnode/mnode/impl/inc/mndPerfSchema.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TD_MND_PERF_SCHEMA_H_
+#define _TD_MND_PERF_SCHEMA_H_
+
+#include "mndInt.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SPerfsTableSchema {
+  char   *name;
+  int32_t type;
+  int32_t bytes;
+} SPerfsTableSchema;
+
+typedef struct SPerfsTableMeta {
+  char                    *name;
+  const SPerfsTableSchema *schema;
+  int32_t                  colNum;
+} SPerfsTableMeta;
+
+int32_t mndBuildPerfsTableSchema(SMnode *pMnode, const char *dbFName, const char *tbName, STableMetaRsp *pRsp);
+int32_t mndInitPerfs(SMnode *pMnode);
+void mndCleanupPerfs(SMnode *pMnode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_MND_PERF_SCHEMA_H_*/
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index 3db4e9870e..6c797b9044 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -1128,6 +1128,8 @@ static int32_t mndProcessUseDbReq(SNodeMsg *pReq) {
 
       if (taosArrayGetSize(usedbRsp.pVgroupInfos) <= 0) {
         terrno = TSDB_CODE_MND_DB_NOT_EXIST;
+      } else {
+        code = 0;
       }
     } else {
       usedbRsp.vgVersion = usedbReq.vgVersion;
@@ -1340,7 +1342,7 @@ SYNC_DB_OVER:
   return code;
 }
 
-char *mnGetDbStr(char *src) {
+char *mndGetDbStr(char *src) {
   char *pos = strstr(src, TS_PATH_DELIMITER);
   if (pos != NULL) ++pos;
 
@@ -1355,7 +1357,7 @@ static void dumpDbInfoData(SSDataBlock* pBlock, SDbObj *pDb, SShowObj *pShow, in
   int32_t cols = 0;
 
   char* buf = taosMemoryMalloc(pShow->bytes[cols]);
-  char *name = mnGetDbStr(pDb->name);
+  char *name = mndGetDbStr(pDb->name);
   if (name != NULL) {
     STR_WITH_MAXSIZE_TO_VARSTR(buf, name, pShow->bytes[cols]);
   } else {
diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c
index b935939160..f626332fc2 100644
--- a/source/dnode/mnode/impl/src/mndInfoSchema.c
+++ b/source/dnode/mnode/impl/src/mndInfoSchema.c
@@ -15,6 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "mndInfoSchema.h"
+#include "mndInt.h"
 
 #define SYSTABLE_SCH_TABLE_NAME_LEN ((TSDB_TABLE_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
 #define SYSTABLE_SCH_DB_NAME_LEN    ((TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE)
@@ -94,11 +95,13 @@ static const SInfosTableSchema userDBSchema[] = {
 };
 
 static const SInfosTableSchema userFuncSchema[] = {
-    {.name = "name", .bytes = 32, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "name", .bytes = TSDB_FUNC_NAME_LEN - 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "comment", .bytes = PATH_MAX - 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "aggregate", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "comment", .bytes = TSDB_TYPE_STR_MAX_LEN - 1 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
-    {.name = "ntables", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
-    {.name = "precision", .bytes = 2, .type = TSDB_DATA_TYPE_VARCHAR},
-    {.name = "status", .bytes = 10, .type = TSDB_DATA_TYPE_VARCHAR},
+    {.name = "code_len", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "bufsize", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
 };
 
 static const SInfosTableSchema userIdxSchema[] = {
diff --git a/source/dnode/mnode/impl/src/mndPerfSchema.c b/source/dnode/mnode/impl/src/mndPerfSchema.c
new file mode 100644
index 0000000000..38e9e79228
--- /dev/null
+++ b/source/dnode/mnode/impl/src/mndPerfSchema.c
@@ -0,0 +1,174 @@
+/*
+ * 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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "mndPerfSchema.h"
+#include "mndInt.h"
+
+//!!!! Note: only APPEND columns in below tables, NO insert !!!!
+static const SPerfsTableSchema connectionsSchema[] = {
+    {.name = "conn_id", .bytes = 4, .type = TSDB_DATA_TYPE_UINT},
+    {.name = "user", .bytes = TSDB_USER_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "program", .bytes = TSDB_APP_NAME_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "pid", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "end_point", .bytes = TSDB_EP_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "login_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+    {.name = "last_access", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+};
+static const SPerfsTableSchema queriesSchema[] = {
+    {.name = "query_id", .bytes = 4, .type = TSDB_DATA_TYPE_UBIGINT},
+    {.name = "sql", .bytes = TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "user", .bytes = TSDB_USER_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "pid", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "fqdn", .bytes = TSDB_FQDN_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "exec_time", .bytes = 8, .type = TSDB_DATA_TYPE_BIGINT},
+    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+    {.name = "sub_queries", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "sub_query_info", .bytes = TSDB_SHOW_SUBQUERY_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+};
+
+static const SPerfsTableSchema topicSchema[] = {
+    {.name = "topic_name", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "db_name", .bytes = SYSTABLE_SCH_DB_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP},
+    {.name = "sql", .bytes = TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "row_len", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+};
+
+static const SPerfsTableSchema consumerSchema[] = {
+    {.name = "client_id", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "group_id", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "pid", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "status", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    // ep
+    // up time
+    // topics
+};
+
+static const SPerfsTableSchema subscribeSchema[] = {
+    {.name = "topic_name", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "group_id", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+    {.name = "vgroup_id", .bytes = 4, .type = TSDB_DATA_TYPE_INT},
+    {.name = "client_id", .bytes = SYSTABLE_SCH_TABLE_NAME_LEN, .type = TSDB_DATA_TYPE_BINARY},
+};
+
+static const SPerfsTableMeta perfsMeta[] = {
+    {TSDB_PERFS_TABLE_CONNECTIONS, connectionsSchema, tListLen(connectionsSchema)},
+    {TSDB_PERFS_TABLE_QUERIES, queriesSchema, tListLen(queriesSchema)},
+    {TSDB_PERFS_TABLE_TOPICS, topicSchema, tListLen(topicSchema)},
+    {TSDB_PERFS_TABLE_CONSUMERS, consumerSchema, tListLen(consumerSchema)},
+    {TSDB_PERFS_TABLE_SUBSCRIBES, subscribeSchema, tListLen(subscribeSchema)},
+};
+
+// connection/application/
+int32_t mndInitPerfsTableSchema(const SPerfsTableSchema *pSrc, int32_t colNum, SSchema **pDst) {
+  SSchema *schema = taosMemoryCalloc(colNum, sizeof(SSchema));
+  if (NULL == schema) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  for (int32_t i = 0; i < colNum; ++i) {
+    strcpy(schema[i].name, pSrc[i].name);
+
+    schema[i].type = pSrc[i].type;
+    schema[i].colId = i + 1;
+    schema[i].bytes = pSrc[i].bytes;
+  }
+
+  *pDst = schema;
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mndPerfsInitMeta(SHashObj *hash) {
+  STableMetaRsp meta = {0};
+
+  strcpy(meta.dbFName, TSDB_INFORMATION_SCHEMA_DB);
+  meta.tableType = TSDB_SYSTEM_TABLE;
+  meta.sversion = 1;
+  meta.tversion = 1;
+
+  for (int32_t i = 0; i < tListLen(perfsMeta); ++i) {
+    strcpy(meta.tbName, perfsMeta[i].name);
+    meta.numOfColumns = perfsMeta[i].colNum;
+
+    if (mndInitPerfsTableSchema(perfsMeta[i].schema, perfsMeta[i].colNum, &meta.pSchemas)) {
+      return -1;
+    }
+
+    if (taosHashPut(hash, meta.tbName, strlen(meta.tbName), &meta, sizeof(meta))) {
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      return -1;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t mndBuildPerfsTableSchema(SMnode *pMnode, const char *dbFName, const char *tbName, STableMetaRsp *pRsp) {
+  if (NULL == pMnode->perfsMeta) {
+    terrno = TSDB_CODE_MND_NOT_READY;
+    return -1;
+  }
+
+  STableMetaRsp *meta = (STableMetaRsp *)taosHashGet(pMnode->perfsMeta, tbName, strlen(tbName));
+  if (NULL == meta) {
+    mError("invalid performance schema table name:%s", tbName);
+    terrno = TSDB_CODE_MND_INVALID_INFOS_TBL;
+    return -1;
+  }
+
+  *pRsp = *meta;
+
+  pRsp->pSchemas = taosMemoryCalloc(meta->numOfColumns, sizeof(SSchema));
+  if (pRsp->pSchemas == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    pRsp->pSchemas = NULL;
+    return -1;
+  }
+
+  memcpy(pRsp->pSchemas, meta->pSchemas, meta->numOfColumns * sizeof(SSchema));
+
+  return 0;
+}
+
+int32_t mndInitPerfs(SMnode *pMnode) {
+  pMnode->perfsMeta = taosHashInit(20, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
+  if (pMnode->perfsMeta == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  return mndPerfsInitMeta(pMnode->perfsMeta);
+}
+
+void mndCleanupPerfs(SMnode *pMnode) {
+  if (NULL == pMnode->perfsMeta) {
+    return;
+  }
+
+  void *pIter = taosHashIterate(pMnode->perfsMeta, NULL);
+  while (pIter) {
+    STableMetaRsp *meta = (STableMetaRsp *)pIter;
+
+    taosMemoryFreeClear(meta->pSchemas);
+
+    pIter = taosHashIterate(pMnode->perfsMeta, pIter);
+  }
+
+  taosHashCleanup(pMnode->perfsMeta);
+  pMnode->perfsMeta = NULL;
+}
+
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index 353a147a92..826a73afc6 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -24,7 +24,7 @@
 #include "version.h"
 
 typedef struct {
-  int32_t     id;
+  uint32_t    id;
   int8_t      connType;
   char        user[TSDB_USER_LEN];
   char        app[TSDB_APP_NAME_LEN];  // app name that invokes taosc
@@ -35,15 +35,15 @@ typedef struct {
   int8_t      killed;
   int64_t     loginTimeMs;
   int64_t     lastAccessTimeMs;
-  int32_t     queryId;
+  uint64_t    killId;
   int32_t     numOfQueries;
-  SQueryDesc *pQueries;
+  SArray     *pQueries;      //SArray<SQueryDesc>
 } SConnObj;
 
 static SConnObj *mndCreateConn(SMnode *pMnode, const char *user, int8_t connType, uint32_t ip, uint16_t port,
                                int32_t pid, const char *app, int64_t startTime);
 static void      mndFreeConn(SConnObj *pConn);
-static SConnObj *mndAcquireConn(SMnode *pMnode, int32_t connId);
+static SConnObj *mndAcquireConn(SMnode *pMnode, uint32_t connId);
 static void      mndReleaseConn(SMnode *pMnode, SConnObj *pConn);
 static void     *mndGetNextConn(SMnode *pMnode, SCacheIter *pIter);
 static void      mndCancelGetNextConn(SMnode *pMnode, void *pIter);
@@ -91,8 +91,9 @@ static SConnObj *mndCreateConn(SMnode *pMnode, const char *user, int8_t connType
                                int32_t pid, const char *app, int64_t startTime) {
   SProfileMgmt *pMgmt = &pMnode->profileMgmt;
 
-  int32_t connId = atomic_add_fetch_32(&pMgmt->connId, 1);
-  if (connId == 0) atomic_add_fetch_32(&pMgmt->connId, 1);
+  char connStr[255] = {0};
+  int32_t len = snprintf(connStr, sizeof(connStr), "%s%d%d%d%s", user, ip, port, pid, app);
+  int32_t connId = mndGenerateUid(connStr, len);
   if (startTime == 0) startTime = taosGetTimestampMs();
 
   SConnObj connObj = {.id = connId,
@@ -104,7 +105,7 @@ static SConnObj *mndCreateConn(SMnode *pMnode, const char *user, int8_t connType
                       .killed = 0,
                       .loginTimeMs = taosGetTimestampMs(),
                       .lastAccessTimeMs = 0,
-                      .queryId = 0,
+                      .killId = 0,
                       .numOfQueries = 0,
                       .pQueries = NULL};
 
@@ -119,35 +120,35 @@ static SConnObj *mndCreateConn(SMnode *pMnode, const char *user, int8_t connType
     mError("conn:%d, failed to put into cache since %s, user:%s", connId, user, terrstr());
     return NULL;
   } else {
-    mTrace("conn:%d, is created, data:%p user:%s", pConn->id, pConn, user);
+    mTrace("conn:%u, is created, data:%p user:%s", pConn->id, pConn, user);
     return pConn;
   }
 }
 
 static void mndFreeConn(SConnObj *pConn) {
   taosMemoryFreeClear(pConn->pQueries);
-  mTrace("conn:%d, is destroyed, data:%p", pConn->id, pConn);
+  mTrace("conn:%u, is destroyed, data:%p", pConn->id, pConn);
 }
 
-static SConnObj *mndAcquireConn(SMnode *pMnode, int32_t connId) {
+static SConnObj *mndAcquireConn(SMnode *pMnode, uint32_t connId) {
   SProfileMgmt *pMgmt = &pMnode->profileMgmt;
 
-  SConnObj *pConn = taosCacheAcquireByKey(pMgmt->cache, &connId, sizeof(int32_t));
+  SConnObj *pConn = taosCacheAcquireByKey(pMgmt->cache, &connId, sizeof(connId));
   if (pConn == NULL) {
-    mDebug("conn:%d, already destroyed", connId);
+    mDebug("conn:%u, already destroyed", connId);
     return NULL;
   }
 
   int32_t keepTime = tsShellActivityTimer * 3;
   pConn->lastAccessTimeMs = keepTime * 1000 + (uint64_t)taosGetTimestampMs();
 
-  mTrace("conn:%d, acquired from cache, data:%p", pConn->id, pConn);
+  mTrace("conn:%u, acquired from cache, data:%p", pConn->id, pConn);
   return pConn;
 }
 
 static void mndReleaseConn(SMnode *pMnode, SConnObj *pConn) {
   if (pConn == NULL) return;
-  mTrace("conn:%d, released from cache, data:%p", pConn->id, pConn);
+  mTrace("conn:%u, released from cache, data:%p", pConn->id, pConn);
 
   SProfileMgmt *pMgmt = &pMnode->profileMgmt;
   taosCacheRelease(pMgmt->cache, (void **)&pConn, false);
@@ -212,6 +213,8 @@ static int32_t mndProcessConnectReq(SNodeMsg *pReq) {
     goto CONN_OVER;
   }
 
+  mndAcquireConn(pMnode, pConn->id);
+
   SConnectRsp connectRsp = {0};
   connectRsp.acctId = pUser->acctId;
   connectRsp.superUser = pUser->superUser;
@@ -232,7 +235,7 @@ static int32_t mndProcessConnectReq(SNodeMsg *pReq) {
   pReq->rspLen = contLen;
   pReq->pRsp = pRsp;
 
-  mDebug("user:%s, login from %s, conn:%d, app:%s", pReq->user, ip, pConn->id, connReq.app);
+  mDebug("user:%s, login from %s:%d, conn:%u, app:%s", pReq->user, ip, pConn->port, pConn->id, connReq.app);
 
   code = 0;
 
@@ -245,22 +248,13 @@ CONN_OVER:
   return code;
 }
 
-static int32_t mndSaveQueryStreamList(SConnObj *pConn, SHeartBeatReq *pReq) {
-  pConn->numOfQueries = 0;
-  int32_t numOfQueries = htonl(pReq->numOfQueries);
+static int32_t mndSaveQueryList(SConnObj *pConn, SQueryHbReqBasic *pBasic) {
+  taosArrayDestroyEx(pConn->pQueries, tFreeClientHbQueryDesc);
 
-  if (numOfQueries > 0) {
-    if (pConn->pQueries == NULL) {
-      pConn->pQueries = taosMemoryCalloc(sizeof(SQueryDesc), QUERY_SAVE_SIZE);
-    }
-
-    pConn->numOfQueries = TMIN(QUERY_SAVE_SIZE, numOfQueries);
-
-    int32_t saveSize = pConn->numOfQueries * sizeof(SQueryDesc);
-    if (saveSize > 0 && pConn->pQueries != NULL) {
-      memcpy(pConn->pQueries, pReq->pData, saveSize);
-    }
-  }
+  pConn->pQueries = pBasic->queryDesc;
+  pBasic->queryDesc = NULL;
+  
+  pConn->numOfQueries =  pBasic->queryDesc ? taosArrayGetSize(pBasic->queryDesc) : 0;
 
   return TSDB_CODE_SUCCESS;
 }
@@ -330,6 +324,111 @@ static SClientHbRsp *mndMqHbBuildRsp(SMnode *pMnode, SClientHbReq *pReq) {
   return NULL;
 }
 
+static int32_t mndProcessQueryHeartBeat(SMnode *pMnode, SRpcMsg *pMsg, SClientHbReq *pHbReq, SClientHbBatchRsp *pBatchRsp) {
+  SProfileMgmt *pMgmt = &pMnode->profileMgmt;
+  SClientHbRsp hbRsp = {.connKey = pHbReq->connKey, .status = 0, .info = NULL, .query = NULL};
+
+  if (pHbReq->query) {
+    SQueryHbReqBasic *pBasic = pHbReq->query;
+
+    SRpcConnInfo connInfo = {0};
+    rpcGetConnInfo(pMsg->handle, &connInfo);
+
+    SConnObj *pConn = mndAcquireConn(pMnode, pBasic->connId);
+    if (pConn == NULL) {    
+      pConn = mndCreateConn(pMnode, connInfo.user, CONN_TYPE__QUERY, connInfo.clientIp, connInfo.clientPort, pBasic->pid, pBasic->app, 0);
+      if (pConn == NULL) {
+        mError("user:%s, conn:%u is freed and failed to create new since %s", connInfo.user, pBasic->connId, terrstr());
+        return -1;
+      } else {
+        mDebug("user:%s, conn:%u is freed and create a new conn:%u", connInfo.user, pBasic->connId, pConn->id);
+      }
+    } else if (pConn->killed) {
+      mError("user:%s, conn:%u is already killed", connInfo.user, pConn->id);
+      mndReleaseConn(pMnode, pConn);      
+      terrno = TSDB_CODE_MND_INVALID_CONNECTION;
+      return -1;
+    }
+
+    SQueryHbRspBasic *rspBasic = taosMemoryCalloc(1, sizeof(SQueryHbRspBasic));
+    if (rspBasic == NULL) {
+      mndReleaseConn(pMnode, pConn);
+      terrno = TSDB_CODE_OUT_OF_MEMORY;
+      mError("user:%s, conn:%u failed to process hb while since %s", pConn->user, pBasic->connId, terrstr());
+      return -1;
+    }
+
+    mndSaveQueryList(pConn, pBasic);
+    if (pConn->killed != 0) {
+      rspBasic->killConnection = 1;
+    }
+
+    if (pConn->killId != 0) {
+      rspBasic->killRid = pConn->killId;
+      pConn->killId = 0;
+    }
+
+    rspBasic->connId = pConn->id;
+    rspBasic->totalDnodes = 1;  //TODO
+    rspBasic->onlineDnodes = 1; //TODO
+    mndGetMnodeEpSet(pMnode, &rspBasic->epSet);
+    mndReleaseConn(pMnode, pConn);
+
+    hbRsp.query = rspBasic;
+  }
+
+  int32_t kvNum = taosHashGetSize(pHbReq->info);
+  if (NULL == pHbReq->info || kvNum <= 0) {
+    taosArrayPush(pBatchRsp->rsps, &hbRsp);  
+    return TSDB_CODE_SUCCESS;
+  }
+
+  hbRsp.info = taosArrayInit(kvNum, sizeof(SKv));
+  if (NULL == hbRsp.info) {
+    mError("taosArrayInit %d rsp kv failed", kvNum);
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return -1;
+  }
+
+  void *pIter = taosHashIterate(pHbReq->info, NULL);
+  while (pIter != NULL) {
+    SKv *kv = pIter;
+
+    switch (kv->key) {
+      case HEARTBEAT_KEY_DBINFO: {
+        void   *rspMsg = NULL;
+        int32_t rspLen = 0;
+        mndValidateDbInfo(pMnode, kv->value, kv->valueLen / sizeof(SDbVgVersion), &rspMsg, &rspLen);
+        if (rspMsg && rspLen > 0) {
+          SKv kv1 = {.key = HEARTBEAT_KEY_DBINFO, .valueLen = rspLen, .value = rspMsg};
+          taosArrayPush(hbRsp.info, &kv1);
+        }
+        break;
+      }
+      case HEARTBEAT_KEY_STBINFO: {
+        void   *rspMsg = NULL;
+        int32_t rspLen = 0;
+        mndValidateStbInfo(pMnode, kv->value, kv->valueLen / sizeof(SSTableMetaVersion), &rspMsg, &rspLen);
+        if (rspMsg && rspLen > 0) {
+          SKv kv1 = {.key = HEARTBEAT_KEY_STBINFO, .valueLen = rspLen, .value = rspMsg};
+          taosArrayPush(hbRsp.info, &kv1);
+        }
+        break;
+      }
+      default:
+        mError("invalid kv key:%d", kv->key);
+        hbRsp.status = TSDB_CODE_MND_APP_ERROR;
+        break;
+    }
+
+    pIter = taosHashIterate(pHbReq->info, pIter);
+  }
+
+  taosArrayPush(pBatchRsp->rsps, &hbRsp);
+
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t mndProcessHeartBeatReq(SNodeMsg *pReq) {
   SMnode *pMnode = pReq->pNode;
 
@@ -345,50 +444,9 @@ static int32_t mndProcessHeartBeatReq(SNodeMsg *pReq) {
   int32_t sz = taosArrayGetSize(batchReq.reqs);
   for (int i = 0; i < sz; i++) {
     SClientHbReq *pHbReq = taosArrayGet(batchReq.reqs, i);
-    if (pHbReq->connKey.hbType == HEARTBEAT_TYPE_QUERY) {
-      int32_t kvNum = taosHashGetSize(pHbReq->info);
-      if (NULL == pHbReq->info || kvNum <= 0) {
-        continue;
-      }
-
-      SClientHbRsp hbRsp = {.connKey = pHbReq->connKey, .status = 0, .info = taosArrayInit(kvNum, sizeof(SKv))};
-
-      void *pIter = taosHashIterate(pHbReq->info, NULL);
-      while (pIter != NULL) {
-        SKv *kv = pIter;
-
-        switch (kv->key) {
-          case HEARTBEAT_KEY_DBINFO: {
-            void   *rspMsg = NULL;
-            int32_t rspLen = 0;
-            mndValidateDbInfo(pMnode, kv->value, kv->valueLen / sizeof(SDbVgVersion), &rspMsg, &rspLen);
-            if (rspMsg && rspLen > 0) {
-              SKv kv1 = {.key = HEARTBEAT_KEY_DBINFO, .valueLen = rspLen, .value = rspMsg};
-              taosArrayPush(hbRsp.info, &kv1);
-            }
-            break;
-          }
-          case HEARTBEAT_KEY_STBINFO: {
-            void   *rspMsg = NULL;
-            int32_t rspLen = 0;
-            mndValidateStbInfo(pMnode, kv->value, kv->valueLen / sizeof(SSTableMetaVersion), &rspMsg, &rspLen);
-            if (rspMsg && rspLen > 0) {
-              SKv kv1 = {.key = HEARTBEAT_KEY_STBINFO, .valueLen = rspLen, .value = rspMsg};
-              taosArrayPush(hbRsp.info, &kv1);
-            }
-            break;
-          }
-          default:
-            mError("invalid kv key:%d", kv->key);
-            hbRsp.status = TSDB_CODE_MND_APP_ERROR;
-            break;
-        }
-
-        pIter = taosHashIterate(pHbReq->info, pIter);
-      }
-
-      taosArrayPush(batchRsp.rsps, &hbRsp);
-    } else if (pHbReq->connKey.hbType == HEARTBEAT_TYPE_MQ) {
+    if (pHbReq->connKey.connType == CONN_TYPE__QUERY) {
+      mndProcessQueryHeartBeat(pMnode, &pReq->rpcMsg, pHbReq, &batchRsp);
+    } else if (pHbReq->connKey.connType == CONN_TYPE__TMQ) {
       SClientHbRsp *pRsp = mndMqHbBuildRsp(pMnode, pHbReq);
       if (pRsp != NULL) {
         taosArrayPush(batchRsp.rsps, pRsp);
@@ -416,73 +474,8 @@ static int32_t mndProcessHeartBeatReq(SNodeMsg *pReq) {
   taosArrayDestroy(batchRsp.rsps);
   pReq->rspLen = tlen;
   pReq->pRsp = buf;
+
   return 0;
-
-#if 0
-  SMnode       *pMnode = pReq->pNode;
-  SProfileMgmt *pMgmt = &pMnode->profileMgmt;
-
-  SHeartBeatReq *pHeartbeat = pReq->rpcMsg.pCont;
-  pHeartbeat->connId = htonl(pHeartbeat->connId);
-  pHeartbeat->pid = htonl(pHeartbeat->pid);
-
-  SConnObj *pConn = mndAcquireConn(pMnode, pHeartbeat->connId);
-  if (pConn == NULL) {
-    pConn = mndCreateConn(pMnode, &info, pHeartbeat->pid, pHeartbeat->app, 0);
-    if (pConn == NULL) {
-      mError("user:%s, conn:%d is freed and failed to create new since %s", pReq->user, pHeartbeat->connId, terrstr());
-      return -1;
-    } else {
-      mDebug("user:%s, conn:%d is freed and create a new conn:%d", pReq->user, pHeartbeat->connId, pConn->id);
-    }
-  } else if (pConn->killed) {
-    mError("user:%s, conn:%d is already killed", pReq->user, pConn->id);
-    terrno = TSDB_CODE_MND_INVALID_CONNECTION;
-    return -1;
-  } else {
-    if (pConn->ip != info.clientIp || pConn->port != info.clientPort /* || strcmp(pConn->user, info.user) != 0 */) {
-      char oldIpStr[40];
-      char newIpStr[40];
-      taosIpPort2String(pConn->ip, pConn->port, oldIpStr);
-      taosIpPort2String(info.clientIp, info.clientPort, newIpStr);
-      mError("conn:%d, incoming conn user:%s ip:%s, not match exist user:%s ip:%s", pConn->id, info.user, newIpStr,
-             pConn->user, oldIpStr);
-
-      if (pMgmt->connId < pConn->id) pMgmt->connId = pConn->id + 1;
-      taosCacheRelease(pMgmt->cache, (void **)&pConn, false);
-      terrno = TSDB_CODE_MND_INVALID_CONNECTION;
-      return -1;
-    }
-  }
-
-  SHeartBeatRsp *pRsp = rpcMallocCont(sizeof(SHeartBeatRsp));
-  if (pRsp == NULL) {
-    mndReleaseConn(pMnode, pConn);
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    mError("user:%s, conn:%d failed to process hb while since %s", pReq->user, pHeartbeat->connId, terrstr());
-    return -1;
-  }
-
-  mndSaveQueryStreamList(pConn, pHeartbeat);
-  if (pConn->killed != 0) {
-    pRsp->killConnection = 1;
-  }
-
-  if (pConn->queryId != 0) {
-    pRsp->queryId = htonl(pConn->queryId);
-    pConn->queryId = 0;
-  }
-
-  pRsp->connId = htonl(pConn->id);
-  pRsp->totalDnodes = htonl(1);
-  pRsp->onlineDnodes = htonl(1);
-  mndGetMnodeEpSet(pMnode, &pRsp->epSet);
-  mndReleaseConn(pMnode, pConn);
-
-  pReq->contLen = sizeof(SConnectRsp);
-  pReq->pRsp = pRsp;
-  return 0;
-#endif
 }
 
 static int32_t mndProcessKillQueryReq(SNodeMsg *pReq) {
@@ -513,7 +506,7 @@ static int32_t mndProcessKillQueryReq(SNodeMsg *pReq) {
     return -1;
   } else {
     mInfo("connId:%d, queryId:%d is killed by user:%s", killReq.connId, killReq.queryId, pReq->user);
-    pConn->queryId = killReq.queryId;
+    pConn->killId = killReq.queryId;
     taosCacheRelease(pMgmt->cache, (void **)&pConn, false);
     return 0;
   }
@@ -571,7 +564,7 @@ static int32_t mndRetrieveConns(SNodeMsg *pReq, SShowObj *pShow, char *data, int
     cols = 0;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pConn->id;
+    *(uint32_t *)pWrite = pConn->id;
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
@@ -613,6 +606,7 @@ static int32_t mndRetrieveConns(SNodeMsg *pReq, SShowObj *pShow, char *data, int
 static int32_t mndRetrieveQueries(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
   SMnode   *pMnode = pReq->pNode;
   int32_t   numOfRows = 0;
+#if 0
   SConnObj *pConn = NULL;
   int32_t   cols = 0;
   char     *pWrite;
@@ -709,6 +703,7 @@ static int32_t mndRetrieveQueries(SNodeMsg *pReq, SShowObj *pShow, char *data, i
   }
 
   pShow->numOfRows += numOfRows;
+#endif  
   return numOfRows;
 }
 
diff --git a/source/dnode/mnode/impl/src/mndShow.c b/source/dnode/mnode/impl/src/mndShow.c
index 617cebf61d..1a14c94640 100644
--- a/source/dnode/mnode/impl/src/mndShow.c
+++ b/source/dnode/mnode/impl/src/mndShow.c
@@ -131,6 +131,13 @@ static int32_t mndProcessRetrieveSysTableReq(SNodeMsg *pReq) {
     req.type = retrieveReq.type;
     strncpy(req.db, retrieveReq.db, tListLen(req.db));
 
+    STableMetaRsp *pMeta = (STableMetaRsp *)taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb) + 1);
+    if (pMeta == NULL) {
+      terrno = TSDB_CODE_MND_INVALID_INFOS_TBL;
+      mError("failed to process show-retrieve req:%p since %s", pShow, terrstr());
+      return -1;
+    }
+
     pShow = mndCreateShowObj(pMnode, &req);
     if (pShow == NULL) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
@@ -138,7 +145,7 @@ static int32_t mndProcessRetrieveSysTableReq(SNodeMsg *pReq) {
       return -1;
     }
 
-    pShow->pMeta = (STableMetaRsp *)taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb) + 1);
+    pShow->pMeta = pMeta;
     pShow->numOfColumns = pShow->pMeta->numOfColumns;
     int32_t offset = 0;
 
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 92a67fd7e9..0ce73005e8 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -18,6 +18,7 @@
 #include "mndDb.h"
 #include "mndDnode.h"
 #include "mndInfoSchema.h"
+#include "mndPerfSchema.h"
 #include "mndMnode.h"
 #include "mndShow.h"
 #include "mndTrans.h"
@@ -1516,6 +1517,11 @@ static int32_t mndProcessTableMetaReq(SNodeMsg *pReq) {
     if (mndBuildInsTableSchema(pMnode, infoReq.dbFName, infoReq.tbName, &metaRsp) != 0) {
       goto RETRIEVE_META_OVER;
     }
+  } else if (0 == strcmp(infoReq.dbFName, TSDB_PERFORMANCE_SCHEMA_DB)) {
+    mDebug("performance_schema table:%s.%s, start to retrieve meta", infoReq.dbFName, infoReq.tbName);
+    if (mndBuildPerfsTableSchema(pMnode, infoReq.dbFName, infoReq.tbName, &metaRsp) != 0) {
+      goto RETRIEVE_META_OVER;
+    }
   } else {
     mDebug("stb:%s.%s, start to retrieve meta", infoReq.dbFName, infoReq.tbName);
     if (mndBuildStbSchema(pMnode, infoReq.dbFName, infoReq.tbName, &metaRsp) != 0) {
diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c
index 537ddc03c3..59fe7d16b9 100644
--- a/source/dnode/mnode/impl/src/mndTrans.c
+++ b/source/dnode/mnode/impl/src/mndTrans.c
@@ -58,7 +58,7 @@ static void    mndTransSendRpcRsp(SMnode *pMnode, STrans *pTrans);
 static int32_t mndProcessTransReq(SNodeMsg *pReq);
 static int32_t mndProcessKillTransReq(SNodeMsg *pReq);
 
-static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows);
+static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows);
 static void    mndCancelGetNextTrans(SMnode *pMnode, void *pIter);
 
 int32_t mndInitTrans(SMnode *pMnode) {
@@ -73,7 +73,7 @@ int32_t mndInitTrans(SMnode *pMnode) {
   mndSetMsgHandle(pMnode, TDMT_MND_TRANS_TIMER, mndProcessTransReq);
   mndSetMsgHandle(pMnode, TDMT_MND_KILL_TRANS, mndProcessKillTransReq);
 
-//  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans);
+  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans);
   mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndCancelGetNextTrans);
   return sdbSetTable(pMnode->pSdb, table);
 }
@@ -1259,7 +1259,7 @@ void mndTransPullup(SMnode *pMnode) {
   sdbWriteFile(pMnode->pSdb);
 }
 
-static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) {
+static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
   SMnode *pMnode = pReq->pNode;
   SSdb   *pSdb = pMnode->pSdb;
   int32_t numOfRows = 0;
@@ -1273,34 +1273,34 @@ static int32_t mndRetrieveTrans(SNodeMsg *pReq, SShowObj *pShow, char *data, int
 
     cols = 0;
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int32_t *)pWrite = pTrans->id;
-    cols++;
+    SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)&pTrans->id, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pTrans->createdTime;
-    cols++;
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)&pTrans->createdTime, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_TO_VARSTR(pWrite, mndTransStr(pTrans->stage));
-    cols++;
+    char stage[TSDB_TRANS_STAGE_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(stage, mndTransStr(pTrans->stage), pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)stage, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    char *name = mnGetDbStr(pTrans->dbname);
-    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, name, pShow->bytes[cols]);
-    cols++;
+    char dbname[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(dbname, mndGetDbStr(pTrans->dbname), pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)dbname, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_TO_VARSTR(pWrite, mndTransType(pTrans->transType));
-    cols++;
+    char transType[TSDB_TRANS_TYPE_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(dbname, mndTransType(pTrans->transType), pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)transType, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    *(int64_t *)pWrite = pTrans->lastExecTime;
-    cols++;
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)&pTrans->lastExecTime, false);
 
-    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    STR_TO_VARSTR(pWrite, pTrans->lastError);
-    cols++;
+    char lastError[TSDB_TRANS_ERROR_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_WITH_MAXSIZE_TO_VARSTR(dbname, pTrans->lastError, pShow->bytes[cols]);
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+    colDataAppend(pColInfo, numOfRows, (const char *)lastError, false);
 
     numOfRows++;
     sdbRelease(pSdb, pTrans);
diff --git a/source/dnode/mnode/impl/src/mnode.c b/source/dnode/mnode/impl/src/mnode.c
index f765b0ce11..3ac1c522b2 100644
--- a/source/dnode/mnode/impl/src/mnode.c
+++ b/source/dnode/mnode/impl/src/mnode.c
@@ -23,6 +23,7 @@
 #include "mndDnode.h"
 #include "mndFunc.h"
 #include "mndInfoSchema.h"
+#include "mndPerfSchema.h"
 #include "mndMnode.h"
 #include "mndOffset.h"
 #include "mndProfile.h"
@@ -210,6 +211,7 @@ static int32_t mndInitSteps(SMnode *pMnode, bool deploy) {
   if (mndAllocStep(pMnode, "mnode-stb", mndInitStb, mndCleanupStb) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-stb", mndInitSma, mndCleanupSma) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-infos", mndInitInfos, mndCleanupInfos) != 0) return -1;
+  if (mndAllocStep(pMnode, "mnode-perfs", mndInitPerfs, mndCleanupPerfs) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-db", mndInitDb, mndCleanupDb) != 0) return -1;
   if (mndAllocStep(pMnode, "mnode-func", mndInitFunc, mndCleanupFunc) != 0) return -1;
   if (deploy) {
diff --git a/source/dnode/mnode/impl/test/CMakeLists.txt b/source/dnode/mnode/impl/test/CMakeLists.txt
index 9b669b303a..15f2aed22a 100644
--- a/source/dnode/mnode/impl/test/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/CMakeLists.txt
@@ -1,17 +1,17 @@
 enable_testing()
 
-#add_subdirectory(user)
 add_subdirectory(acct)
-#add_subdirectory(trans)
-#add_subdirectory(qnode)
-#add_subdirectory(snode)
 add_subdirectory(bnode)
-#add_subdirectory(show)
-#add_subdirectory(profile)
-#add_subdirectory(dnode)
-#add_subdirectory(mnode)
-#add_subdirectory(db)
-#add_subdirectory(stb)
-#add_subdirectory(sma)
-#add_subdirectory(func)
-#add_subdirectory(topic)
+add_subdirectory(db)
+add_subdirectory(dnode)
+add_subdirectory(func)
+add_subdirectory(mnode)
+add_subdirectory(profile)
+add_subdirectory(qnode)
+add_subdirectory(show)
+add_subdirectory(sma)
+add_subdirectory(snode)
+add_subdirectory(stb)
+add_subdirectory(topic)
+add_subdirectory(trans)
+add_subdirectory(user)
diff --git a/source/dnode/mnode/impl/test/db/CMakeLists.txt b/source/dnode/mnode/impl/test/db/CMakeLists.txt
index 1a5b4d3936..3f6a80835f 100644
--- a/source/dnode/mnode/impl/test/db/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/db/CMakeLists.txt
@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_db
-#    COMMAND mnode_test_db
-#)
+add_test(
+    NAME dbTest
+    COMMAND dbTest
+)
diff --git a/source/dnode/mnode/impl/test/db/db.cpp b/source/dnode/mnode/impl/test/db/db.cpp
index 0282663b17..adba6ca434 100644
--- a/source/dnode/mnode/impl/test/db/db.cpp
+++ b/source/dnode/mnode/impl/test/db/db.cpp
@@ -26,29 +26,8 @@ class MndTestDb : public ::testing::Test {
 Testbase MndTestDb::test;
 
 TEST_F(MndTestDb, 01_ShowDb) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN - 1 + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "vgroups");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_INT, 4, "ntables");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_SMALLINT, 2, "replica");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_SMALLINT, 2, "quorum");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_SMALLINT, 2, "days");
-  CHECK_SCHEMA(7, TSDB_DATA_TYPE_BINARY, 24 + VARSTR_HEADER_SIZE, "keep0,keep1,keep2");
-  CHECK_SCHEMA(8, TSDB_DATA_TYPE_INT, 4, "cache");
-  CHECK_SCHEMA(9, TSDB_DATA_TYPE_INT, 4, "blocks");
-  CHECK_SCHEMA(10, TSDB_DATA_TYPE_INT, 4, "minrows");
-  CHECK_SCHEMA(11, TSDB_DATA_TYPE_INT, 4, "maxrows");
-  CHECK_SCHEMA(12, TSDB_DATA_TYPE_TINYINT, 1, "wallevel");
-  CHECK_SCHEMA(13, TSDB_DATA_TYPE_INT, 4, "fsync");
-  CHECK_SCHEMA(14, TSDB_DATA_TYPE_TINYINT, 1, "comp");
-  CHECK_SCHEMA(15, TSDB_DATA_TYPE_TINYINT, 1, "cachelast");
-  CHECK_SCHEMA(16, TSDB_DATA_TYPE_BINARY, 3 + VARSTR_HEADER_SIZE, "precision");
-//  CHECK_SCHEMA(17, TSDB_DATA_TYPE_TINYINT, 1, "update");
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 0);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 2);
 }
 
 TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
@@ -58,7 +37,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     createReq.numOfVgroups = 2;
     createReq.cacheBlockSize = 16;
     createReq.totalBlocks = 10;
-    createReq.daysPerFile = 10;
+    createReq.daysPerFile = 1000;
     createReq.daysToKeep0 = 3650;
     createReq.daysToKeep1 = 3650;
     createReq.daysToKeep2 = 3650;
@@ -66,6 +45,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     createReq.maxRows = 4096;
     createReq.commitTime = 3600;
     createReq.fsyncPeriod = 3000;
+    createReq.ttl = 0;
     createReq.walLevel = 1;
     createReq.precision = 0;
     createReq.compression = 2;
@@ -74,6 +54,9 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     createReq.update = 0;
     createReq.cacheLastRow = 0;
     createReq.ignoreExist = 1;
+    createReq.streamMode = 0;
+    createReq.singleSTable = 0;
+    createReq.numOfRetensions = 0;
 
     int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
@@ -84,47 +67,11 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
-  CheckTimestamp();
-  CheckInt16(2);                      // vgroups
-  CheckInt32(0);                      // ntables
-  CheckInt16(1);                      // replica
-  CheckInt16(1);                      // quorum
-  CheckInt16(10);                     // days
-  CheckBinary("3650,3650,3650", 24);  // days
-  CheckInt32(16);                     // cache
-  CheckInt32(10);                     // blocks
-  CheckInt32(100);                    // minrows
-  CheckInt32(4096);                   // maxrows
-  CheckInt8(1);                       // wallevel
-  CheckInt32(3000);                   // fsync
-  CheckInt8(2);                       // comp
-  CheckInt8(0);                       // cachelast
-  CheckBinary("ms", 3);               // precision
-  CheckInt8(0);                       // update
-
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_VGROUP, "1.d1");
-  CHECK_META("show vgroups", 4);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "vgId");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_INT, 4, "tables");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "v1_dnode");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, 9 + VARSTR_HEADER_SIZE, "v1_status");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_VGROUP, "vgroups", "1.d1");
   EXPECT_EQ(test.GetShowRows(), 2);
-  CheckInt32(2);
-  CheckInt32(3);
-  IgnoreInt32();
-  IgnoreInt32();
-  CheckInt16(1);
-  CheckInt16(1);
-  CheckBinary("master", 9);
-  CheckBinary("master", 9);
 
   {
     SAlterDbReq alterdbReq = {0};
@@ -147,55 +94,14 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
-  CheckTimestamp();
-  CheckInt16(2);                   // vgroups
-  CheckInt32(0);                   // tables
-  CheckInt16(1);                   // replica
-  CheckInt16(2);                   // quorum
-  CheckInt16(10);                  // days
-  CheckBinary("300,400,500", 24);  // days
-  CheckInt32(16);                  // cache
-  CheckInt32(12);                  // blocks
-  CheckInt32(100);                 // minrows
-  CheckInt32(4096);                // maxrows
-  CheckInt8(2);                    // wallevel
-  CheckInt32(4000);                // fsync
-  CheckInt8(2);                    // comp
-  CheckInt8(1);                    // cachelast
-  CheckBinary("ms", 3);            // precision
-  CheckInt8(0);                    // update
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
   // restart
   test.Restart();
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("d1", TSDB_DB_NAME_LEN - 1);
-  CheckTimestamp();
-  CheckInt16(2);                   // vgroups
-  CheckInt32(0);                   // tables
-  CheckInt16(1);                   // replica
-  CheckInt16(2);                   // quorum
-  CheckInt16(10);                  // days
-  CheckBinary("300,400,500", 24);  // days
-  CheckInt32(16);                  // cache
-  CheckInt32(12);                  // blocks
-  CheckInt32(100);                 // minrows
-  CheckInt32(4096);                // maxrows
-  CheckInt8(2);                    // wallevel
-  CheckInt32(4000);                // fsync
-  CheckInt8(2);                    // comp
-  CheckInt8(1);                    // cachelast
-  CheckBinary("ms", 3);            // precision
-  CheckInt8(0);                    // update
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
   {
     SDropDbReq dropdbReq = {0};
@@ -214,11 +120,8 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) {
     EXPECT_STREQ(dropdbRsp.db, "1.d1");
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 0);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 2);
 }
 
 TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
@@ -228,7 +131,7 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     createReq.numOfVgroups = 2;
     createReq.cacheBlockSize = 16;
     createReq.totalBlocks = 10;
-    createReq.daysPerFile = 10;
+    createReq.daysPerFile = 1000;
     createReq.daysToKeep0 = 3650;
     createReq.daysToKeep1 = 3650;
     createReq.daysToKeep2 = 3650;
@@ -236,6 +139,7 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     createReq.maxRows = 4096;
     createReq.commitTime = 3600;
     createReq.fsyncPeriod = 3000;
+    createReq.ttl = 0;
     createReq.walLevel = 1;
     createReq.precision = 0;
     createReq.compression = 2;
@@ -244,6 +148,9 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     createReq.update = 0;
     createReq.cacheLastRow = 0;
     createReq.ignoreExist = 1;
+    createReq.streamMode = 0;
+    createReq.singleSTable = 0;
+    createReq.numOfRetensions = 0;
 
     int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq);
     void*   pReq = rpcMallocCont(contLen);
@@ -254,12 +161,8 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DB, "");
-  CHECK_META("show databases", 17);
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckBinary("d2", TSDB_DB_NAME_LEN - 1);
+  test.SendShowReq(TSDB_MGMT_TABLE_DB, "user_databases", "");
+  EXPECT_EQ(test.GetShowRows(), 3);
 
   uint64_t d2_uid = 0;
 
diff --git a/source/dnode/mnode/impl/test/dnode/CMakeLists.txt b/source/dnode/mnode/impl/test/dnode/CMakeLists.txt
index 16e08d6c35..d064df90bc 100644
--- a/source/dnode/mnode/impl/test/dnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/dnode/CMakeLists.txt
@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_dnode
-#    COMMAND mnode_test_dnode
-#)
+add_test(
+    NAME mdnodeTest
+    COMMAND mdnodeTest
+)
diff --git a/source/dnode/mnode/impl/test/dnode/mdnode.cpp b/source/dnode/mnode/impl/test/dnode/mdnode.cpp
index f575556345..a4cbc201a9 100644
--- a/source/dnode/mnode/impl/test/dnode/mdnode.cpp
+++ b/source/dnode/mnode/impl/test/dnode/mdnode.cpp
@@ -51,27 +51,8 @@ TestServer MndTestDnode::server4;
 TestServer MndTestDnode::server5;
 
 TEST_F(MndTestDnode, 01_ShowDnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "vnodes");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_SMALLINT, 2, "support_vnodes");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, 10 + VARSTR_HEADER_SIZE, "status");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_BINARY, 24 + VARSTR_HEADER_SIZE, "offline_reason");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckInt16(1);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckBinary("", 24);
 }
 
 TEST_F(MndTestDnode, 02_ConfigDnode) {
@@ -162,25 +143,8 @@ TEST_F(MndTestDnode, 03_Create_Dnode) {
 
   taosMsleep(1300);
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckInt16(1);
-  CheckInt16(2);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9024", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
 }
 
 TEST_F(MndTestDnode, 04_Drop_Dnode) {
@@ -236,19 +200,9 @@ TEST_F(MndTestDnode, 04_Drop_Dnode) {
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 
-  CheckInt16(1);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckBinary("", 24);
-
   taosMsleep(2000);
   server2.Stop();
   server2.DoStart();
@@ -298,40 +252,9 @@ TEST_F(MndTestDnode, 05_Create_Drop_Restart_Dnode) {
   }
 
   taosMsleep(1300);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 4);
 
-  CheckInt16(1);
-  CheckInt16(3);
-  CheckInt16(4);
-  CheckInt16(5);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9025", TSDB_EP_LEN);
-  CheckBinary("localhost:9026", TSDB_EP_LEN);
-  CheckBinary("localhost:9027", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-
   // restart
   uInfo("stop all server");
   test.Restart();
@@ -341,37 +264,6 @@ TEST_F(MndTestDnode, 05_Create_Drop_Restart_Dnode) {
   server5.Restart();
 
   taosMsleep(1300);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 4);
-
-  CheckInt16(1);
-  CheckInt16(3);
-  CheckInt16(4);
-  CheckInt16(5);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9025", TSDB_EP_LEN);
-  CheckBinary("localhost:9026", TSDB_EP_LEN);
-  CheckBinary("localhost:9027", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
 }
diff --git a/source/dnode/mnode/impl/test/func/CMakeLists.txt b/source/dnode/mnode/impl/test/func/CMakeLists.txt
index 26b0a60968..ecb4f851be 100644
--- a/source/dnode/mnode/impl/test/func/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/func/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. FUNC_SRC)
-add_executable(mnode_test_func ${FUNC_SRC})
+aux_source_directory(. MNODE_FUNC_TEST_SRC)
+add_executable(funcTest ${MNODE_FUNC_TEST_SRC})
 target_link_libraries(
-    mnode_test_func
+    funcTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_func
-    COMMAND mnode_test_func
+    NAME funcTest
+    COMMAND funcTest
 )
diff --git a/source/dnode/mnode/impl/test/func/func.cpp b/source/dnode/mnode/impl/test/func/func.cpp
index f34f77de0c..6b9c410738 100644
--- a/source/dnode/mnode/impl/test/func/func.cpp
+++ b/source/dnode/mnode/impl/test/func/func.cpp
@@ -26,18 +26,7 @@ class MndTestFunc : public ::testing::Test {
 Testbase MndTestFunc::test;
 
 TEST_F(MndTestFunc, 01_Show_Func) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_FUNC_NAME_LEN + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, PATH_MAX + VARSTR_HEADER_SIZE, "comment");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_INT, 4, "aggregate");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_TYPE_STR_MAX_LEN + VARSTR_HEADER_SIZE, "outputtype");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_INT, 4, "code_len");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_INT, 4, "bufsize");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -194,19 +183,8 @@ TEST_F(MndTestFunc, 02_Create_Func) {
     }
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("f1", TSDB_FUNC_NAME_LEN);
-  CheckBinaryByte('m', TSDB_FUNC_COMMENT_LEN);
-  CheckInt32(0);
-  CheckBinary("SMALLINT", TSDB_TYPE_STR_MAX_LEN);
-  CheckTimestamp();
-  CheckInt32(TSDB_FUNC_CODE_LEN);
-  CheckInt32(4);
 }
 
 TEST_F(MndTestFunc, 03_Retrieve_Func) {
@@ -331,10 +309,7 @@ TEST_F(MndTestFunc, 03_Retrieve_Func) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-    CHECK_META("show functions", 7);
-
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -529,20 +504,12 @@ TEST_F(MndTestFunc, 04_Drop_Func) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 
   // restart
   test.Restart();
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_FUNC, "");
-  CHECK_META("show functions", 7);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_FUNC, "user_functions", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("f2", TSDB_FUNC_NAME_LEN);
 }
diff --git a/source/dnode/mnode/impl/test/mnode/CMakeLists.txt b/source/dnode/mnode/impl/test/mnode/CMakeLists.txt
index 4d9b473291..94c25281b2 100644
--- a/source/dnode/mnode/impl/test/mnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/mnode/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. MTEST_SRC)
-add_executable(mnode_test_mnode ${MTEST_SRC})
+aux_source_directory(. MNODE_MNODE_TEST_SRC)
+add_executable(mmnodeTest ${MNODE_MNODE_TEST_SRC})
 target_link_libraries(
-    mnode_test_mnode
+    mmnodeTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_mnode
-    COMMAND mnode_test_mnode
+    NAME mmnodeTest
+    COMMAND mmnodeTest
 )
diff --git a/source/dnode/mnode/impl/test/mnode/mnode.cpp b/source/dnode/mnode/impl/test/mnode/mnode.cpp
index dd2867f7f9..444c674667 100644
--- a/source/dnode/mnode/impl/test/mnode/mnode.cpp
+++ b/source/dnode/mnode/impl/test/mnode/mnode.cpp
@@ -39,23 +39,8 @@ Testbase   MndTestMnode::test;
 TestServer MndTestMnode::server2;
 
 TEST_F(MndTestMnode, 01_ShowDnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_MNODE, "");
-  CHECK_META("show mnodes", 5);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, 12 + VARSTR_HEADER_SIZE, "role");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_TIMESTAMP, 8, "role_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_MNODE, "mnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckInt16(1);
-  CheckBinary("localhost:9028", TSDB_EP_LEN);
-  CheckBinary("master", 12);
-  CheckTimestamp();
-  IgnoreTimestamp();
 }
 
 TEST_F(MndTestMnode, 02_Create_Mnode_Invalid_Id) {
@@ -104,8 +89,7 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     ASSERT_EQ(pRsp->code, 0);
 
     taosMsleep(1300);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -122,20 +106,8 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_MNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_MNODE, "mnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9028", TSDB_EP_LEN);
-    CheckBinary("localhost:9029", TSDB_EP_LEN);
-    CheckBinary("master", 12);
-    CheckBinary("slave", 12);
-    CheckTimestamp();
-    CheckTimestamp();
-    IgnoreTimestamp();
-    IgnoreTimestamp();
   }
 
   {
@@ -151,15 +123,8 @@ TEST_F(MndTestMnode, 04_Create_Mnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_MNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_MNODE, "mnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9028", TSDB_EP_LEN);
-    CheckBinary("master", 12);
-    CheckTimestamp();
-    IgnoreTimestamp();
   }
 
   {
diff --git a/source/dnode/mnode/impl/test/profile/CMakeLists.txt b/source/dnode/mnode/impl/test/profile/CMakeLists.txt
index 88d7366b7d..8b811ebfed 100644
--- a/source/dnode/mnode/impl/test/profile/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/profile/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. PROFILE_SRC)
-add_executable(mnode_test_profile ${PROFILE_SRC})
+aux_source_directory(. MNODE_PROFILE_TEST_SRC)
+add_executable(profileTest ${MNODE_PROFILE_TEST_SRC})
 target_link_libraries(
-    mnode_test_profile
+    profileTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_profile
-    COMMAND mnode_test_profile
+    NAME profileTest
+    COMMAND profileTest
 )
diff --git a/source/dnode/mnode/impl/test/profile/profile.cpp b/source/dnode/mnode/impl/test/profile/profile.cpp
index 14b31e5282..2c3be2135b 100644
--- a/source/dnode/mnode/impl/test/profile/profile.cpp
+++ b/source/dnode/mnode/impl/test/profile/profile.cpp
@@ -46,7 +46,7 @@ TEST_F(MndTestProfile, 01_ConnectMsg) {
 
   EXPECT_EQ(connectRsp.acctId, 1);
   EXPECT_GT(connectRsp.clusterId, 0);
-  EXPECT_EQ(connectRsp.connId, 1);
+  EXPECT_NE(connectRsp.connId, 0);
   EXPECT_EQ(connectRsp.superUser, 1);
 
   EXPECT_EQ(connectRsp.epSet.inUse, 0);
@@ -74,32 +74,16 @@ TEST_F(MndTestProfile, 02_ConnectMsg_InvalidDB) {
 }
 
 TEST_F(MndTestProfile, 03_ConnectMsg_Show) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_CONNS, "");
-  CHECK_META("show connections", 7);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "connId");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "user");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, TSDB_APP_NAME_LEN + VARSTR_HEADER_SIZE, "program");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_INT, 4, "pid");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE, "ip:port");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "login_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_TIMESTAMP, 8, "last_access");
-
-  test.SendShowRetrieveReq();
-  EXPECT_EQ(test.GetShowRows(), 1);
-  CheckInt32(1);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("mnode_test_profile", TSDB_APP_NAME_LEN);
-  CheckInt32(1234);
-  IgnoreBinary(TSDB_IPv4ADDR_LEN + 6);
-  CheckTimestamp();
-  CheckTimestamp();
+  test.SendShowReq(TSDB_MGMT_TABLE_CONNS, "connections", "");
+  EXPECT_EQ(test.GetShowRows(), 0);
 }
 
 TEST_F(MndTestProfile, 04_HeartBeatMsg) {
   SClientHbBatchReq batchReq = {0};
   batchReq.reqs = taosArrayInit(0, sizeof(SClientHbReq));
   SClientHbReq req = {0};
-  req.connKey = {.connId = 123, .hbType = HEARTBEAT_TYPE_MQ};
+  req.connKey.tscRid = 123;
+  req.connKey.connType = CONN_TYPE__TMQ;
   req.info = taosHashInit(64, hbKeyHashFunc, 1, HASH_ENTRY_LOCK);
   SKv kv = {0};
   kv.key = 123;
@@ -311,24 +295,6 @@ TEST_F(MndTestProfile, 08_KillQueryMsg_InvalidConn) {
 }
 
 TEST_F(MndTestProfile, 09_KillQueryMsg) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_QUERIES, "");
-  CHECK_META("show queries", 14);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "queryId");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_INT, 4, "connId");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "user");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE, "ip:port");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, 22 + VARSTR_HEADER_SIZE, "qid");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "created_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_BIGINT, 8, "time");
-  CHECK_SCHEMA(7, TSDB_DATA_TYPE_BINARY, 18 + VARSTR_HEADER_SIZE, "sql_obj_id");
-  CHECK_SCHEMA(8, TSDB_DATA_TYPE_INT, 4, "pid");
-  CHECK_SCHEMA(9, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "ep");
-  CHECK_SCHEMA(10, TSDB_DATA_TYPE_BOOL, 1, "stable_query");
-  CHECK_SCHEMA(11, TSDB_DATA_TYPE_INT, 4, "sub_queries");
-  CHECK_SCHEMA(12, TSDB_DATA_TYPE_BINARY, TSDB_SHOW_SUBQUERY_LEN + VARSTR_HEADER_SIZE, "sub_query_info");
-  CHECK_SCHEMA(13, TSDB_DATA_TYPE_BINARY, TSDB_SHOW_SQL_LEN + VARSTR_HEADER_SIZE, "sql");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_QUERIES, "queries", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
diff --git a/source/dnode/mnode/impl/test/qnode/CMakeLists.txt b/source/dnode/mnode/impl/test/qnode/CMakeLists.txt
index 77ac39e409..8259f9f47d 100644
--- a/source/dnode/mnode/impl/test/qnode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/qnode/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. QTEST_SRC)
-add_executable(mnode_test_qnode ${QTEST_SRC})
+aux_source_directory(. MNODE_QNODE_TEST_SRC)
+add_executable(mqnodeTest ${MNODE_QNODE_TEST_SRC})
 target_link_libraries(
-    mnode_test_qnode
+    mqnodeTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_qnode
-    COMMAND mnode_test_qnode
+    NAME mqnodeTest
+    COMMAND mqnodeTest
 )
diff --git a/source/dnode/mnode/impl/test/qnode/qnode.cpp b/source/dnode/mnode/impl/test/qnode/qnode.cpp
index be214cacf2..7240e0f183 100644
--- a/source/dnode/mnode/impl/test/qnode/qnode.cpp
+++ b/source/dnode/mnode/impl/test/qnode/qnode.cpp
@@ -39,14 +39,7 @@ Testbase   MndTestQnode::test;
 TestServer MndTestQnode::server2;
 
 TEST_F(MndTestQnode, 01_Show_Qnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-  CHECK_META("show qnodes", 3);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -76,14 +69,8 @@ TEST_F(MndTestQnode, 02_Create_Qnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9014", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
@@ -115,8 +102,7 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     ASSERT_EQ(pRsp->code, 0);
 
     taosMsleep(1300);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -132,16 +118,8 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9014", TSDB_EP_LEN);
-    CheckBinary("localhost:9015", TSDB_EP_LEN);
-    CheckTimestamp();
-    CheckTimestamp();
   }
 
   {
@@ -156,13 +134,8 @@ TEST_F(MndTestQnode, 03_Drop_Qnode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9014", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
diff --git a/source/dnode/mnode/impl/test/show/CMakeLists.txt b/source/dnode/mnode/impl/test/show/CMakeLists.txt
index cc0706ca50..69e93e7086 100644
--- a/source/dnode/mnode/impl/test/show/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/show/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. SHOW_SRC)
-add_executable(mnode_test_show ${SHOW_SRC})
+aux_source_directory(. MNODE_SHOW_TEST_SRC)
+add_executable(showTest ${MNODE_SHOW_TEST_SRC})
 target_link_libraries(
-    mnode_test_show
+    showTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_show
-    COMMAND mnode_test_show
+    NAME showTest
+    COMMAND showTest
 )
diff --git a/source/dnode/mnode/impl/test/show/show.cpp b/source/dnode/mnode/impl/test/show/show.cpp
index a57d99a257..201a42e3ef 100644
--- a/source/dnode/mnode/impl/test/show/show.cpp
+++ b/source/dnode/mnode/impl/test/show/show.cpp
@@ -34,9 +34,9 @@ TEST_F(MndTestShow, 01_ShowMsg_InvalidMsgMax) {
   tSerializeSShowReq(pReq, contLen, &showReq);
   tFreeSShowReq(&showReq);
 
-  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SHOW, pReq, contLen);
+  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SYSTABLE_RETRIEVE, pReq, contLen);
   ASSERT_NE(pRsp, nullptr);
-  ASSERT_EQ(pRsp->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+  ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_MSG);
 }
 
 TEST_F(MndTestShow, 02_ShowMsg_InvalidMsgStart) {
@@ -48,9 +48,9 @@ TEST_F(MndTestShow, 02_ShowMsg_InvalidMsgStart) {
   tSerializeSShowReq(pReq, contLen, &showReq);
   tFreeSShowReq(&showReq);
 
-  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SHOW, pReq, contLen);
+  SRpcMsg* pRsp = test.SendReq(TDMT_MND_SYSTABLE_RETRIEVE, pReq, contLen);
   ASSERT_NE(pRsp, nullptr);
-  ASSERT_EQ(pRsp->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+  ASSERT_EQ(pRsp->code, TSDB_CODE_INVALID_MSG);
 }
 
 TEST_F(MndTestShow, 03_ShowMsg_Conn) {
@@ -67,42 +67,11 @@ TEST_F(MndTestShow, 03_ShowMsg_Conn) {
   ASSERT_NE(pRsp, nullptr);
   ASSERT_EQ(pRsp->code, 0);
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_CONNS, "");
-
-  STableMetaRsp* pMeta = test.GetShowMeta();
-  EXPECT_STREQ(pMeta->tbName, "show connections");
-  EXPECT_EQ(pMeta->numOfTags, 0);
-  EXPECT_EQ(pMeta->numOfColumns, 7);
-  EXPECT_EQ(pMeta->precision, 0);
-  EXPECT_EQ(pMeta->tableType, 0);
-  EXPECT_EQ(pMeta->update, 0);
-  EXPECT_EQ(pMeta->sversion, 0);
-  EXPECT_EQ(pMeta->tversion, 0);
-  EXPECT_EQ(pMeta->tuid, 0);
-  EXPECT_EQ(pMeta->suid, 0);
-
-  test.SendShowRetrieveReq();
-
-  SRetrieveTableRsp* pRetrieveRsp = test.GetRetrieveRsp();
-  EXPECT_EQ(pRetrieveRsp->numOfRows, 1);
-  EXPECT_EQ(pRetrieveRsp->useconds, 0);
-  EXPECT_EQ(pRetrieveRsp->completed, 1);
-  EXPECT_EQ(pRetrieveRsp->precision, TSDB_TIME_PRECISION_MILLI);
-  EXPECT_EQ(pRetrieveRsp->compressed, 0);
-  EXPECT_EQ(pRetrieveRsp->compLen, 0);
+  test.SendShowReq(TSDB_MGMT_TABLE_CONNS, "connections", "");
+  // EXPECT_EQ(test.GetShowRows(), 1);
 }
 
 TEST_F(MndTestShow, 04_ShowMsg_Cluster) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_CLUSTER, "");
-  CHECK_META( "show cluster", 3);
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BIGINT, 8, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_CLUSTER, "cluster", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  IgnoreInt64();
-  IgnoreBinary(TSDB_CLUSTER_ID_LEN);
-  CheckTimestamp();
 }
\ No newline at end of file
diff --git a/source/dnode/mnode/impl/test/sma/CMakeLists.txt b/source/dnode/mnode/impl/test/sma/CMakeLists.txt
index 943695abf3..3f9ec123a8 100644
--- a/source/dnode/mnode/impl/test/sma/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/sma/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. SMA_SRC)
-add_executable(mnode_test_sma ${SMA_SRC})
+aux_source_directory(. MNODE_SMA_TEST_SRC)
+add_executable(smaTest ${MNODE_SMA_TEST_SRC})
 target_link_libraries(
-    mnode_test_sma
+    smaTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_sma
-    COMMAND mnode_test_sma
+    NAME smaTest
+    COMMAND smaTest
 )
diff --git a/source/dnode/mnode/impl/test/sma/sma.cpp b/source/dnode/mnode/impl/test/sma/sma.cpp
index 4b0e33a323..4f3b0d6e37 100644
--- a/source/dnode/mnode/impl/test/sma/sma.cpp
+++ b/source/dnode/mnode/impl/test/sma/sma.cpp
@@ -207,7 +207,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
     pReq = BuildCreateStbReq(stbname, &contLen);
     pRsp = test.SendReq(TDMT_MND_CREATE_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables",dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
   }
@@ -216,7 +216,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
     pReq = BuildCreateTSmaReq(smaname, stbname, 0, "expr", "tagsFilter", "sql", "ast", &contLen);
     pRsp = test.SendReq(TDMT_MND_CREATE_SMA, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_INDEX, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_INDEX, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
   }
@@ -225,7 +225,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
   test.Restart();
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_INDEX, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_INDEX, dbname);
     CHECK_META("show indexes", 3);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
@@ -239,7 +239,7 @@ TEST_F(MndTestSma, 01_Create_Show_Meta_Drop_Restart_Stb) {
      pReq = BuildDropTSmaReq(smaname, 0, &contLen);
     pRsp = test.SendReq(TDMT_MND_DROP_SMA, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_INDEX, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_INDEX, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 0);
   }
@@ -263,10 +263,8 @@ TEST_F(MndTestSma, 02_Create_Show_Meta_Drop_Restart_BSma) {
     pReq = BuildCreateBSmaStbReq(stbname, &contLen);
     pRsp = test.SendReq(TDMT_MND_CREATE_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables",dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-//    CheckBinary("bsmastb", TSDB_TABLE_NAME_LEN);
   }
 
   test.Restart();
@@ -281,8 +279,7 @@ TEST_F(MndTestSma, 02_Create_Show_Meta_Drop_Restart_BSma) {
     pReq = BuildDropStbReq(stbname, &contLen);
     pRsp = test.SendReq(TDMT_MND_DROP_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables",dbname);
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
diff --git a/source/dnode/mnode/impl/test/snode/CMakeLists.txt b/source/dnode/mnode/impl/test/snode/CMakeLists.txt
index 44a5f35f94..9c60da364c 100644
--- a/source/dnode/mnode/impl/test/snode/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/snode/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. STEST_SRC)
-add_executable(mnode_test_snode ${STEST_SRC})
+aux_source_directory(. MNODE_SNODE_TEST_SRC)
+add_executable(msnodeTest ${MNODE_SNODE_TEST_SRC})
 target_link_libraries(
-    mnode_test_snode
+    msnodeTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_snode
-    COMMAND mnode_test_snode
+    NAME msnodeTest
+    COMMAND msnodeTest
 )
diff --git a/source/dnode/mnode/impl/test/snode/snode.cpp b/source/dnode/mnode/impl/test/snode/snode.cpp
index 7d24d89154..3742c06b0a 100644
--- a/source/dnode/mnode/impl/test/snode/snode.cpp
+++ b/source/dnode/mnode/impl/test/snode/snode.cpp
@@ -39,14 +39,7 @@ Testbase   MndTestSnode::test;
 TestServer MndTestSnode::server2;
 
 TEST_F(MndTestSnode, 01_Show_Snode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-  CHECK_META("show snodes", 3);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
   EXPECT_EQ(test.GetShowRows(), 0);
 }
 
@@ -76,14 +69,8 @@ TEST_F(MndTestSnode, 02_Create_Snode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-    CHECK_META("show snodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9016", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
@@ -115,8 +102,7 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     ASSERT_EQ(pRsp->code, 0);
 
     taosMsleep(1300);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -132,16 +118,8 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckInt16(1);
-    CheckInt16(2);
-    CheckBinary("localhost:9016", TSDB_EP_LEN);
-    CheckBinary("localhost:9017", TSDB_EP_LEN);
-    CheckTimestamp();
-    CheckTimestamp();
   }
 
   {
@@ -156,13 +134,8 @@ TEST_F(MndTestSnode, 03_Drop_Snode) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_SNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_SNODE, "snodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckInt16(1);
-    CheckBinary("localhost:9016", TSDB_EP_LEN);
-    CheckTimestamp();
   }
 
   {
diff --git a/source/dnode/mnode/impl/test/stb/CMakeLists.txt b/source/dnode/mnode/impl/test/stb/CMakeLists.txt
index 70e20d3411..d2fe387997 100644
--- a/source/dnode/mnode/impl/test/stb/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/stb/CMakeLists.txt
@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_stb
-#    COMMAND mnode_test_stb
-#)
+add_test(
+    NAME stbTest
+    COMMAND stbTest
+)
diff --git a/source/dnode/mnode/impl/test/stb/stb.cpp b/source/dnode/mnode/impl/test/stb/stb.cpp
index f45c0795cd..f8f8799c9f 100644
--- a/source/dnode/mnode/impl/test/stb/stb.cpp
+++ b/source/dnode/mnode/impl/test/stb/stb.cpp
@@ -43,7 +43,7 @@ void* MndTestStb::BuildCreateDbReq(const char* dbname, int32_t* pContLen) {
   createReq.numOfVgroups = 2;
   createReq.cacheBlockSize = 16;
   createReq.totalBlocks = 10;
-  createReq.daysPerFile = 10;
+  createReq.daysPerFile = 1000;
   createReq.daysToKeep0 = 3650;
   createReq.daysToKeep1 = 3650;
   createReq.daysToKeep2 = 3650;
@@ -314,19 +314,8 @@ TEST_F(MndTestStb, 01_Create_Show_Meta_Drop_Restart_Stb) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    CHECK_META("show stables", 4);
-    CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE, "name");
-    CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-    CHECK_SCHEMA(2, TSDB_DATA_TYPE_INT, 4, "columns");
-    CHECK_SCHEMA(3, TSDB_DATA_TYPE_INT, 4, "tags");
-
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   // ----- meta ------
@@ -407,15 +396,8 @@ TEST_F(MndTestStb, 01_Create_Show_Meta_Drop_Restart_Stb) {
   test.Restart();
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    CHECK_META("show stables", 4);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -432,9 +414,7 @@ TEST_F(MndTestStb, 01_Create_Show_Meta_Drop_Restart_Stb) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    CHECK_META("show stables", 4);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
@@ -496,13 +476,7 @@ TEST_F(MndTestStb, 02_Alter_Stb_AddTag) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
-    EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(4);
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
   }
 
   {
@@ -542,13 +516,8 @@ TEST_F(MndTestStb, 03_Alter_Stb_DropTag) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(2);
   }
 
   {
@@ -611,13 +580,8 @@ TEST_F(MndTestStb, 04_Alter_Stb_AlterTagName) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -668,13 +632,8 @@ TEST_F(MndTestStb, 05_Alter_Stb_AlterTagBytes) {
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_ALTER_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -734,13 +693,8 @@ TEST_F(MndTestStb, 06_Alter_Stb_AddColumn) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(3);
-    CheckInt32(3);
   }
 
   {
@@ -799,13 +753,8 @@ TEST_F(MndTestStb, 07_Alter_Stb_DropColumn) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
@@ -862,13 +811,8 @@ TEST_F(MndTestStb, 08_Alter_Stb_AlterTagBytes) {
     SRpcMsg* pRsp = test.SendReq(TDMT_MND_ALTER_STB, pReq, contLen);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_STB, dbname);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_STB, "user_stables", dbname);
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckBinary("stb", TSDB_TABLE_NAME_LEN);
-    CheckTimestamp();
-    CheckInt32(2);
-    CheckInt32(3);
   }
 
   {
diff --git a/source/dnode/mnode/impl/test/topic/CMakeLists.txt b/source/dnode/mnode/impl/test/topic/CMakeLists.txt
index 63a77713d6..076228ec9d 100644
--- a/source/dnode/mnode/impl/test/topic/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/topic/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. TOPIC_SRC)
-add_executable(mnode_test_topic ${TOPIC_SRC})
+aux_source_directory(. MNODE_TOPIC_TEST_SRC)
+add_executable(topicTest ${MNODE_TOPIC_TEST_SRC})
 target_link_libraries(
-    mnode_test_topic
+    topicTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_topic
-    COMMAND mnode_test_topic
+    NAME topicTest
+    COMMAND topicTest
 )
diff --git a/source/dnode/mnode/impl/test/topic/topic.cpp b/source/dnode/mnode/impl/test/topic/topic.cpp
index 2111d61e3f..ee47a3c8b4 100644
--- a/source/dnode/mnode/impl/test/topic/topic.cpp
+++ b/source/dnode/mnode/impl/test/topic/topic.cpp
@@ -101,7 +101,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  { test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, ""); }
+  { test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, ""); }
 
   {
     int32_t  contLen = 0;
@@ -128,7 +128,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
   }
 
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     CHECK_META("show topics", 3);
 
     CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE, "name");
@@ -145,7 +145,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     // restart
     test.Restart();
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 1);
 
@@ -169,7 +169,7 @@ TEST_F(MndTestTopic, 01_Create_Topic) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_TOPIC_NOT_EXIST);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TOPICS, dbname);
+    test.SendShowReq(TSDB_MGMT_TABLE_TOPICS, dbname);
     test.SendShowRetrieveReq();
     EXPECT_EQ(test.GetShowRows(), 0);
   }
diff --git a/source/dnode/mnode/impl/test/trans/CMakeLists.txt b/source/dnode/mnode/impl/test/trans/CMakeLists.txt
index d7c9756794..fa0ef9f263 100644
--- a/source/dnode/mnode/impl/test/trans/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/trans/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. TRANS_SRC)
-add_executable(mnode_test_trans ${TRANS_SRC})
+aux_source_directory(. MNODE_TRANS_TEST_SRC)
+add_executable(transTest ${MNODE_TRANS_TEST_SRC})
 target_link_libraries(
-    mnode_test_trans
+    transTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_trans
-    COMMAND mnode_test_trans
+    NAME transTest
+    COMMAND transTest
 )
diff --git a/source/dnode/mnode/impl/test/trans/trans.cpp b/source/dnode/mnode/impl/test/trans/trans.cpp
index 560b30d13c..bcf6fe8536 100644
--- a/source/dnode/mnode/impl/test/trans/trans.cpp
+++ b/source/dnode/mnode/impl/test/trans/trans.cpp
@@ -26,11 +26,11 @@ class MndTestTrans : public ::testing::Test {
   }
 
   static void KillThenRestartServer() {
-    char    file[PATH_MAX] = "/tmp/mnode_test_trans/mnode/data/sdb.data";
+    char      file[PATH_MAX] = "/tmp/mnode_test_trans/mnode/data/sdb.data";
     TdFilePtr pFile = taosOpenFile(file, TD_FILE_READ);
-    int32_t size = 3 * 1024 * 1024;
-    void*   buffer = taosMemoryMalloc(size);
-    int32_t readLen = taosReadFile(pFile, buffer, size);
+    int32_t   size = 3 * 1024 * 1024;
+    void*     buffer = taosMemoryMalloc(size);
+    int32_t   readLen = taosReadFile(pFile, buffer, size);
     if (readLen < 0 || readLen == size) {
       ASSERT(1);
     }
@@ -65,18 +65,7 @@ TestServer MndTestTrans::server2;
 
 TEST_F(MndTestTrans, 00_Create_User_Crash) {
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TRANS, "");
-    CHECK_META("show trans", 7);
-
-    CHECK_SCHEMA(0, TSDB_DATA_TYPE_INT, 4, "id");
-    CHECK_SCHEMA(1, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-    CHECK_SCHEMA(2, TSDB_DATA_TYPE_BINARY, TSDB_TRANS_STAGE_LEN + VARSTR_HEADER_SIZE, "stage");
-    CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_DB_NAME_LEN - 1 + VARSTR_HEADER_SIZE, "db");
-    CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, TSDB_TRANS_TYPE_LEN + VARSTR_HEADER_SIZE, "type");
-    CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "last_exec_time");
-    CHECK_SCHEMA(6, TSDB_DATA_TYPE_BINARY, TSDB_TRANS_ERROR_LEN - 1 + VARSTR_HEADER_SIZE, "last_error");
-
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_TRANS, "trans", "");
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
@@ -109,26 +98,13 @@ TEST_F(MndTestTrans, 01_Create_User_Crash) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
 
   KillThenRestartServer();
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckBinary("u1", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("normal", 10);
-  CheckBinary("super", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
 }
 
 TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
@@ -144,9 +120,7 @@ TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 
@@ -163,9 +137,7 @@ TEST_F(MndTestTrans, 02_Create_Qnode1_Crash) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_QNODE_ALREADY_EXIST);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 }
@@ -185,8 +157,7 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
     ASSERT_EQ(pRsp->code, 0);
 
     taosMsleep(1300);
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -208,18 +179,8 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
 
   {
     // show trans
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TRANS, "");
-    CHECK_META("show trans", 7);
-    test.SendShowRetrieveReq();
-
+    test.SendShowReq(TSDB_MGMT_TABLE_TRANS, "trans", "");
     EXPECT_EQ(test.GetShowRows(), 1);
-    CheckInt32(4);
-    CheckTimestamp();
-    CheckBinary("undoAction", TSDB_TRANS_STAGE_LEN);
-    CheckBinary("", TSDB_DB_NAME_LEN - 1);
-    CheckBinary("create-qnode", TSDB_TRANS_TYPE_LEN);
-    CheckTimestamp();
-    CheckBinary("Unable to establish connection", TSDB_TRANS_ERROR_LEN - 1);
   }
 
   // kill trans
@@ -238,8 +199,7 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
 
   // show trans
   {
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_TRANS, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_TRANS, "trans", "");
     EXPECT_EQ(test.GetShowRows(), 0);
   }
 
@@ -258,11 +218,9 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
     ASSERT_EQ(pRsp->code, TSDB_CODE_RPC_NETWORK_UNAVAIL);
   }
 
-  uInfo("======== kill and restart server")
-  KillThenRestartServer();
+  uInfo("======== kill and restart server") KillThenRestartServer();
 
-  uInfo("======== server2 start")
-  server2.DoStart();
+  uInfo("======== server2 start") server2.DoStart();
 
   uInfo("======== server2 started")
 
@@ -286,14 +244,11 @@ TEST_F(MndTestTrans, 03_Create_Qnode2_Crash) {
 
     ASSERT_NE(retry, retryMax);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_QNODE, "");
-    CHECK_META("show qnodes", 3);
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_QNODE, "qnodes", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 }
 
-
 // create db
 // partial create stb
 // drop db failed
diff --git a/source/dnode/mnode/impl/test/user/CMakeLists.txt b/source/dnode/mnode/impl/test/user/CMakeLists.txt
index c6aeef7221..b39ea0e73f 100644
--- a/source/dnode/mnode/impl/test/user/CMakeLists.txt
+++ b/source/dnode/mnode/impl/test/user/CMakeLists.txt
@@ -1,11 +1,11 @@
-aux_source_directory(. USER_SRC)
-add_executable(mnode_test_user ${USER_SRC})
+aux_source_directory(. MNODE_USER_TEST_SRC)
+add_executable(userTest ${MNODE_USER_TEST_SRC})
 target_link_libraries(
-    mnode_test_user
+    userTest
     PUBLIC sut
 )
 
 add_test(
-    NAME mnode_test_user
-    COMMAND mnode_test_user
+    NAME userTest
+    COMMAND userTest
 )
diff --git a/source/dnode/mnode/impl/test/user/user.cpp b/source/dnode/mnode/impl/test/user/user.cpp
index 97a144fdee..4e7f3c0213 100644
--- a/source/dnode/mnode/impl/test/user/user.cpp
+++ b/source/dnode/mnode/impl/test/user/user.cpp
@@ -26,21 +26,8 @@ class MndTestUser : public ::testing::Test {
 Testbase MndTestUser::test;
 
 TEST_F(MndTestUser, 01_Show_User) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "name");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, 10 + VARSTR_HEADER_SIZE, "privilege");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_BINARY, TSDB_USER_LEN + VARSTR_HEADER_SIZE, "account");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
 }
 
 TEST_F(MndTestUser, 02_Create_User) {
@@ -99,18 +86,8 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckBinary("u1", TSDB_USER_LEN);
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("normal", 10);
-    CheckBinary("super", 10);
-    CheckTimestamp();
-    CheckTimestamp();
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("root", TSDB_USER_LEN);
   }
 
   {
@@ -125,8 +102,7 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 
@@ -144,18 +120,8 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 2);
-
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("u2", TSDB_USER_LEN);
-    CheckBinary("super", 10);
-    CheckBinary("super", 10);
-    CheckTimestamp();
-    CheckTimestamp();
-    CheckBinary("root", TSDB_USER_LEN);
-    CheckBinary("root", TSDB_USER_LEN);
   }
 
   {
@@ -170,8 +136,7 @@ TEST_F(MndTestUser, 02_Create_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 }
@@ -191,8 +156,7 @@ TEST_F(MndTestUser, 03_Alter_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 2);
   }
 
@@ -437,8 +401,7 @@ TEST_F(MndTestUser, 03_Alter_User) {
     ASSERT_NE(pRsp, nullptr);
     ASSERT_EQ(pRsp->code, 0);
 
-    test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-    test.SendShowRetrieveReq();
+    test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
     EXPECT_EQ(test.GetShowRows(), 1);
   }
 }
@@ -497,10 +460,7 @@ TEST_F(MndTestUser, 05_Drop_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 }
 
@@ -533,25 +493,9 @@ TEST_F(MndTestUser, 06_Create_Drop_Alter_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 3);
 
-  CheckBinary("u1", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("normal", 10);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-
   {
     SAlterUserReq alterReq = {0};
     alterReq.alterType = TSDB_ALTER_USER_PASSWD;
@@ -567,25 +511,8 @@ TEST_F(MndTestUser, 06_Create_Drop_Alter_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 3);
-
-  CheckBinary("u1", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("normal", 10);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-
   {
     SDropUserReq dropReq = {0};
     strcpy(dropReq.user, "u1");
@@ -599,37 +526,13 @@ TEST_F(MndTestUser, 06_Create_Drop_Alter_User) {
     ASSERT_EQ(pRsp->code, 0);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
 
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
-
   // restart
   test.Restart();
 
   taosMsleep(1000);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_USER, "");
-  CHECK_META("show users", 4);
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_USER, "user_users", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("u2", TSDB_USER_LEN);
-  CheckBinary("super", 10);
-  CheckBinary("normal", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("root", TSDB_USER_LEN);
-  CheckBinary("root", TSDB_USER_LEN);
 }
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 3ab007e3a2..c0e458219c 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -4,13 +4,13 @@ target_sources(
     vnode
     PRIVATE
     # vnode
+    "src/vnd/vnodeOpen.c"
     "src/vnd/vnodeArenaMAImpl.c"
     "src/vnd/vnodeBufferPool.c"
     # "src/vnd/vnodeBufferPool2.c"
     "src/vnd/vnodeCfg.c"
     "src/vnd/vnodeCommit.c"
     "src/vnd/vnodeInt.c"
-    "src/vnd/vnodeMain.c"
     "src/vnd/vnodeQuery.c"
     "src/vnd/vnodeStateMgr.c"
     "src/vnd/vnodeWrite.c"
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 76fc09ca1d..303376dba4 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -42,11 +42,12 @@ typedef struct STsdbCfg  STsdbCfg;  // todo: remove
 typedef struct STqCfg    STqCfg;    // todo: remove
 typedef struct SVnodeCfg SVnodeCfg;
 
-int     vnodeInit();
+int     vnodeInit(int nthreads);
 void    vnodeCleanup();
+int     vnodeCreate(const char *path, SVnodeCfg *pCfg, STfs *pTfs);
+void    vnodeDestroy(const char *path);
 SVnode *vnodeOpen(const char *path, const SVnodeCfg *pVnodeCfg);
 void    vnodeClose(SVnode *pVnode);
-void    vnodeDestroy(const char *path);
 void    vnodePreprocessWriteReqs(SVnode *pVnode, SArray *pMsgs);
 int     vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
 int     vnodeProcessCMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
@@ -123,12 +124,12 @@ struct STsdbCfg {
   int8_t   precision;
   int8_t   update;
   int8_t   compression;
-  int32_t  daysPerFile;
-  int32_t  minRowsPerFileBlock;
-  int32_t  maxRowsPerFileBlock;
-  int32_t  keep;
-  int32_t  keep1;
+  int32_t  days;
+  int32_t  minRows;
+  int32_t  maxRows;
   int32_t  keep2;
+  int32_t  keep0;
+  int32_t  keep1;
   uint64_t lruCacheSize;
   SArray  *retentions;
 };
diff --git a/source/dnode/vnode/src/inc/vnd.h b/source/dnode/vnode/src/inc/vnd.h
index 1cdb38b650..cb40900e81 100644
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
@@ -30,6 +30,8 @@ extern "C" {
 #define vTrace(...) do { if (vDebugFlag & DEBUG_TRACE) { taosPrintLog("VND ", DEBUG_TRACE, vDebugFlag, __VA_ARGS__); }}    while(0)
 // clang-format on
 
+// vnodeCfg ====================
+
 // vnodeModule ====================
 int vnodeScheduleTask(int (*execute)(void*), void* arg);
 
@@ -38,6 +40,11 @@ int  vnodeQueryOpen(SVnode* pVnode);
 void vnodeQueryClose(SVnode* pVnode);
 int  vnodeGetTableMeta(SVnode* pVnode, SRpcMsg* pMsg);
 
+// vnodeCommit ====================
+int vnodeSaveInfo(const char* dir, const SVnodeInfo* pCfg);
+int vnodeCommitInfo(const char* dir, const SVnodeInfo* pInfo);
+int vnodeLoadInfo(const char* dir, SVnodeInfo* pInfo);
+
 #if 1
 // SVBufPool
 int   vnodeOpenBufPool(SVnode* pVnode);
@@ -75,9 +82,9 @@ void            vmaFree(SVMemAllocator* pVMA, void* ptr);
 bool            vmaIsFull(SVMemAllocator* pVMA);
 
 // vnodeCfg.h
-extern const SVnodeCfg defaultVnodeOptions;
+extern const SVnodeCfg vnodeCfgDefault;
 
-int  vnodeValidateOptions(const SVnodeCfg*);
+int  vnodeCheckCfg(const SVnodeCfg*);
 void vnodeOptionsCopy(SVnodeCfg* pDest, const SVnodeCfg* pSrc);
 
 // For commit
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index f988df01cb..e95878b04e 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -27,6 +27,7 @@
 #include "tdbInt.h"
 #include "tfs.h"
 #include "tglobal.h"
+#include "tjson.h"
 #include "tlist.h"
 #include "tlockfree.h"
 #include "tlosertree.h"
@@ -43,6 +44,7 @@
 extern "C" {
 #endif
 
+typedef struct SVnodeInfo   SVnodeInfo;
 typedef struct SMeta        SMeta;
 typedef struct STsdb        STsdb;
 typedef struct STQ          STQ;
@@ -72,6 +74,11 @@ struct SVState {
   int64_t applied;
 };
 
+struct SVnodeInfo {
+  SVnodeCfg config;
+  SVState   state;
+};
+
 struct SVnode {
   int32_t    vgId;
   char*      path;
diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c
index eb32663387..a1edb7cd9c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c
@@ -55,7 +55,7 @@ typedef struct {
 #define TSDB_COMMIT_BUF(ch)          TSDB_READ_BUF(&((ch)->readh))
 #define TSDB_COMMIT_COMP_BUF(ch)     TSDB_READ_COMP_BUF(&((ch)->readh))
 #define TSDB_COMMIT_EXBUF(ch)        TSDB_READ_EXBUF(&((ch)->readh))
-#define TSDB_COMMIT_DEFAULT_ROWS(ch) TSDB_DEFAULT_BLOCK_ROWS(TSDB_COMMIT_REPO(ch)->config.maxRowsPerFileBlock)
+#define TSDB_COMMIT_DEFAULT_ROWS(ch) TSDB_DEFAULT_BLOCK_ROWS(TSDB_COMMIT_REPO(ch)->config.maxRows)
 #define TSDB_COMMIT_TXN_VERSION(ch)  FS_TXN_VERSION(REPO_FS(TSDB_COMMIT_REPO(ch)))
 
 static void tsdbStartCommit(STsdb *pRepo);
@@ -217,14 +217,14 @@ void tsdbGetRtnSnap(STsdb *pRepo, SRtn *pRtn) {
   TSKEY     minKey, midKey, maxKey, now;
 
   now = taosGetTimestamp(pCfg->precision);
-  minKey = now - pCfg->keep * tsTickPerDay[pCfg->precision];
-  midKey = now - pCfg->keep2 * tsTickPerDay[pCfg->precision];
-  maxKey = now - pCfg->keep1 * tsTickPerDay[pCfg->precision];
+  minKey = now - pCfg->keep2 * tsTickPerDay[pCfg->precision];
+  midKey = now - pCfg->keep1 * tsTickPerDay[pCfg->precision];
+  maxKey = now - pCfg->keep0 * tsTickPerDay[pCfg->precision];
 
   pRtn->minKey = minKey;
-  pRtn->minFid = (int)(TSDB_KEY_FID(minKey, pCfg->daysPerFile, pCfg->precision));
-  pRtn->midFid = (int)(TSDB_KEY_FID(midKey, pCfg->daysPerFile, pCfg->precision));
-  pRtn->maxFid = (int)(TSDB_KEY_FID(maxKey, pCfg->daysPerFile, pCfg->precision));
+  pRtn->minFid = (int)(TSDB_KEY_FID(minKey, pCfg->days, pCfg->precision));
+  pRtn->midFid = (int)(TSDB_KEY_FID(midKey, pCfg->days, pCfg->precision));
+  pRtn->maxFid = (int)(TSDB_KEY_FID(maxKey, pCfg->days, pCfg->precision));
   tsdbDebug("vgId:%d now:%" PRId64 " minKey:%" PRId64 " minFid:%d, midFid:%d, maxFid:%d", REPO_ID(pRepo), now, minKey,
             pRtn->minFid, pRtn->midFid, pRtn->maxFid);
 }
@@ -286,7 +286,7 @@ static int tsdbInitCommitH(SCommitH *pCommith, STsdb *pRepo) {
     return -1;
   }
 
-  pCommith->pDataCols = tdNewDataCols(0, pCfg->maxRowsPerFileBlock);
+  pCommith->pDataCols = tdNewDataCols(0, pCfg->maxRows);
   if (pCommith->pDataCols == NULL) {
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
     tsdbDestroyCommitH(pCommith);
@@ -319,7 +319,7 @@ static int tsdbNextCommitFid(SCommitH *pCommith) {
     if (nextKey == TSDB_DATA_TIMESTAMP_NULL) {
       continue;
     } else {
-      int tfid = (int)(TSDB_KEY_FID(nextKey, pCfg->daysPerFile, pCfg->precision));
+      int tfid = (int)(TSDB_KEY_FID(nextKey, pCfg->days, pCfg->precision));
       if (fid == TSDB_IVLD_FID || fid > tfid) {
         fid = tfid;
       }
@@ -346,7 +346,7 @@ static int tsdbCommitToFile(SCommitH *pCommith, SDFileSet *pSet, int fid) {
   ASSERT(pSet == NULL || pSet->fid == fid);
 
   tsdbResetCommitFile(pCommith);
-  tsdbGetFidKeyRange(pCfg->daysPerFile, pCfg->precision, fid, &(pCommith->minKey), &(pCommith->maxKey));
+  tsdbGetFidKeyRange(pCfg->days, pCfg->precision, fid, &(pCommith->minKey), &(pCommith->maxKey));
 
   // Set and open files
   if (tsdbSetAndOpenCommitFile(pCommith, pSet, fid) < 0) {
@@ -1210,8 +1210,8 @@ int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFile *pDF
   int64_t       offset = 0, offsetAggr = 0;
   int           rowsToWrite = pDataCols->numOfRows;
 
-  ASSERT(rowsToWrite > 0 && rowsToWrite <= pCfg->maxRowsPerFileBlock);
-  ASSERT((!isLast) || rowsToWrite < pCfg->minRowsPerFileBlock);
+  ASSERT(rowsToWrite > 0 && rowsToWrite <= pCfg->maxRows);
+  ASSERT((!isLast) || rowsToWrite < pCfg->minRows);
 
   // Make buffer space
   if (tsdbMakeRoom(ppBuf, tsdbBlockStatisSize(pDataCols->numOfCols, SBlockVerLatest)) < 0) {
@@ -1460,7 +1460,7 @@ static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLi
 
     if (pCommith->pDataCols->numOfRows <= 0) break;
 
-    if (toData || pCommith->pDataCols->numOfRows >= pCfg->minRowsPerFileBlock) {
+    if (toData || pCommith->pDataCols->numOfRows >= pCfg->minRows) {
       pDFile = TSDB_COMMIT_DATA_FILE(pCommith);
       isLast = false;
     } else {
@@ -1619,7 +1619,7 @@ static int tsdbMergeBlockData(SCommitH *pCommith, SCommitIter *pIter, SDataCols
     if (pCommith->pDataCols->numOfRows == 0) break;
 
     if (isLastOneBlock) {
-      if (pCommith->pDataCols->numOfRows < pCfg->minRowsPerFileBlock) {
+      if (pCommith->pDataCols->numOfRows < pCfg->minRows) {
         pDFile = TSDB_COMMIT_LAST_FILE(pCommith);
         isLast = true;
       } else {
@@ -1667,7 +1667,8 @@ static void tsdbLoadAndMergeFromCache(SDataCols *pDataCols, int *iter, SCommitIt
         if (tdGetColDataOfRow(&sVal, pDataCols->cols + i, *iter, pDataCols->bitmapMode) < 0) {
           TASSERT(0);
         }
-        tdAppendValToDataCol(pTarget->cols + i, sVal.valType, sVal.val, pTarget->numOfRows, pTarget->maxPoints, pTarget->bitmapMode);
+        tdAppendValToDataCol(pTarget->cols + i, sVal.valType, sVal.val, pTarget->numOfRows, pTarget->maxPoints,
+                             pTarget->bitmapMode);
       }
 
       ++pTarget->numOfRows;
@@ -1774,11 +1775,11 @@ static bool tsdbCanAddSubBlock(SCommitH *pCommith, SBlock *pBlock, SMergeInfo *p
 
   ASSERT(mergeRows > 0);
 
-  if (pBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS && pInfo->nOperations <= pCfg->maxRowsPerFileBlock) {
+  if (pBlock->numOfSubBlocks < TSDB_MAX_SUBBLOCKS && pInfo->nOperations <= pCfg->maxRows) {
     if (pBlock->last) {
-      if (pCommith->isLFileSame && mergeRows < pCfg->minRowsPerFileBlock) return true;
+      if (pCommith->isLFileSame && mergeRows < pCfg->minRows) return true;
     } else {
-      if (pCommith->isDFileSame && mergeRows <= pCfg->maxRowsPerFileBlock) return true;
+      if (pCommith->isDFileSame && mergeRows <= pCfg->maxRows) return true;
     }
   }
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index bd3888864d..866c02cbb3 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -190,8 +190,8 @@ static int tsdbAddDFileSetToStatus(SFSStatus *pStatus, const SDFileSet *pSet) {
 
 // ================== STsdbFS
 STsdbFS *tsdbNewFS(const STsdbCfg *pCfg) {
-  int      keep = pCfg->keep;
-  int      days = pCfg->daysPerFile;
+  int      keep = pCfg->keep2;
+  int      days = pCfg->days;
   int      maxFSet = TSDB_MAX_FSETS(keep, days);
   STsdbFS *pfs;
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbMemTable.c b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
index 5a477e646c..5f401c9b2b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMemTable.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMemTable.c
@@ -19,9 +19,9 @@ static int      tsdbScanAndConvertSubmitMsg(STsdb *pTsdb, SSubmitReq *pMsg);
 static int      tsdbMemTableInsertTbData(STsdb *pRepo, SSubmitBlk *pBlock, int32_t *pAffectedRows);
 static STbData *tsdbNewTbData(tb_uid_t uid);
 static void     tsdbFreeTbData(STbData *pTbData);
-static char *   tsdbGetTsTupleKey(const void *data);
+static char    *tsdbGetTsTupleKey(const void *data);
 static int      tsdbTbDataComp(const void *arg1, const void *arg2);
-static char *   tsdbTbDataGetUid(const void *arg);
+static char    *tsdbTbDataGetUid(const void *arg);
 static int      tsdbAppendTableRowToCols(STable *pTable, SDataCols *pCols, STSchema **ppSchema, STSRow *row);
 
 STsdbMemTable *tsdbNewMemTable(STsdb *pTsdb) {
@@ -74,7 +74,7 @@ void tsdbFreeMemTable(STsdb *pTsdb, STsdbMemTable *pMemTable) {
 }
 
 int tsdbMemTableInsert(STsdb *pTsdb, STsdbMemTable *pMemTable, SSubmitReq *pMsg, SSubmitRsp *pRsp) {
-  SSubmitBlk *   pBlock = NULL;
+  SSubmitBlk    *pBlock = NULL;
   SSubmitMsgIter msgIter = {0};
   int32_t        affectedrows = 0, numOfRows = 0;
 
@@ -119,12 +119,12 @@ int tsdbLoadDataFromCache(STable *pTable, SSkipListIterator *pIter, TSKEY maxKey
                           TKEY *filterKeys, int nFilterKeys, bool keepDup, SMergeInfo *pMergeInfo) {
   ASSERT(maxRowsToRead > 0 && nFilterKeys >= 0);
   if (pIter == NULL) return 0;
-  STSchema * pSchema = NULL;
+  STSchema  *pSchema = NULL;
   TSKEY      rowKey = 0;
   TSKEY      fKey = 0;
   bool       isRowDel = false;
   int        filterIter = 0;
-  STSRow *   row = NULL;
+  STSRow    *row = NULL;
   SMergeInfo mInfo;
 
   if (pMergeInfo == NULL) pMergeInfo = &mInfo;
@@ -259,12 +259,12 @@ static int tsdbScanAndConvertSubmitMsg(STsdb *pTsdb, SSubmitReq *pMsg) {
   ASSERT(pMsg != NULL);
   // STsdbMeta *    pMeta = pTsdb->tsdbMeta;
   SSubmitMsgIter msgIter = {0};
-  SSubmitBlk *   pBlock = NULL;
+  SSubmitBlk    *pBlock = NULL;
   SSubmitBlkIter blkIter = {0};
-  STSRow *       row = NULL;
+  STSRow        *row = NULL;
   TSKEY          now = taosGetTimestamp(pTsdb->config.precision);
-  TSKEY          minKey = now - tsTickPerDay[pTsdb->config.precision] * pTsdb->config.keep;
-  TSKEY          maxKey = now + tsTickPerDay[pTsdb->config.precision] * pTsdb->config.daysPerFile;
+  TSKEY          minKey = now - tsTickPerDay[pTsdb->config.precision] * pTsdb->config.keep2;
+  TSKEY          maxKey = now + tsTickPerDay[pTsdb->config.precision] * pTsdb->config.days;
 
   terrno = TSDB_CODE_SUCCESS;
   pMsg->length = htonl(pMsg->length);
@@ -332,9 +332,9 @@ static int tsdbMemTableInsertTbData(STsdb *pTsdb, SSubmitBlk *pBlock, int32_t *p
   // STable          *pTable = NULL;
   SSubmitBlkIter blkIter = {0};
   STsdbMemTable *pMemTable = pTsdb->mem;
-  void *         tptr;
-  STbData *      pTbData;
-  STSRow *       row;
+  void          *tptr;
+  STbData       *pTbData;
+  STSRow        *row;
   TSKEY          keyMin;
   TSKEY          keyMax;
 
@@ -504,7 +504,7 @@ int tsdbInsertDataToMemTable(STsdbMemTable *pMemTable, SSubmitReq *pMsg) {
 #include "tskiplist.h"
 
 #define TSDB_DATA_SKIPLIST_LEVEL 5
-#define TSDB_MAX_INSERT_BATCH 512
+#define TSDB_MAX_INSERT_BATCH    512
 
 typedef struct {
   int32_t  totalLen;
diff --git a/source/dnode/vnode/src/tsdb/tsdbOptions.c b/source/dnode/vnode/src/tsdb/tsdbOptions.c
index 2c57a7406e..3560c9feaa 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOptions.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOptions.c
@@ -17,12 +17,12 @@
 
 const STsdbCfg defautlTsdbOptions = {.precision = 0,
                                      .lruCacheSize = 0,
-                                     .daysPerFile = 10,
-                                     .minRowsPerFileBlock = 100,
-                                     .maxRowsPerFileBlock = 4096,
-                                     .keep = 3650,
-                                     .keep1 = 3650,
+                                     .days = 10,
+                                     .minRows = 100,
+                                     .maxRows = 4096,
                                      .keep2 = 3650,
+                                     .keep0 = 3650,
+                                     .keep1 = 3650,
                                      .update = 0,
                                      .compression = TWO_STAGE_COMP};
 
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 9509dfa462..1314ef7d1e 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -314,7 +314,7 @@ static int64_t getEarliestValidTimestamp(STsdb* pTsdb) {
   STsdbCfg* pCfg = &pTsdb->config;
 
   int64_t now = taosGetTimestamp(pCfg->precision);
-  return now - (tsTickPerDay[pCfg->precision] * pCfg->keep) + 1;  // needs to add one tick
+  return now - (tsTickPerDay[pCfg->precision] * pCfg->keep2) + 1;  // needs to add one tick
 }
 
 static void setQueryTimewindow(STsdbReadHandle* pTsdbReadHandle, STsdbQueryCond* pCond) {
@@ -404,7 +404,7 @@ static STsdbReadHandle* tsdbQueryTablesImpl(STsdb* tsdb, STsdbQueryCond* pCond,
     pReadHandle->defaultLoadColumn = getDefaultLoadColumns(pReadHandle, true);
   }
 
-  pReadHandle->pDataCols = tdNewDataCols(1000, pReadHandle->pTsdb->config.maxRowsPerFileBlock);
+  pReadHandle->pDataCols = tdNewDataCols(1000, pReadHandle->pTsdb->config.maxRows);
   if (pReadHandle->pDataCols == NULL) {
     tsdbError("%p failed to malloc buf for pDataCols, %s", pReadHandle, pReadHandle->idStr);
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
@@ -2199,7 +2199,7 @@ static int32_t getFirstFileDataBlock(STsdbReadHandle* pTsdbReadHandle, bool* exi
       break;
     }
 
-    tsdbGetFidKeyRange(pCfg->daysPerFile, pCfg->precision, pTsdbReadHandle->pFileGroup->fid, &win.skey, &win.ekey);
+    tsdbGetFidKeyRange(pCfg->days, pCfg->precision, pTsdbReadHandle->pFileGroup->fid, &win.skey, &win.ekey);
 
     // current file are not overlapped with query time window, ignore remain files
     if ((ASCENDING_TRAVERSE(pTsdbReadHandle->order) && win.skey > pTsdbReadHandle->window.ekey) ||
@@ -2295,7 +2295,7 @@ int32_t tsdbGetFileBlocksDistInfo(tsdbReaderT* queryHandle, STableBlockDistInfo*
   // find the start data block in file
   pTsdbReadHandle->locateStart = true;
   STsdbCfg* pCfg = &pTsdbReadHandle->pTsdb->config;
-  int32_t   fid = getFileIdFromKey(pTsdbReadHandle->window.skey, pCfg->daysPerFile, pCfg->precision);
+  int32_t   fid = getFileIdFromKey(pTsdbReadHandle->window.skey, pCfg->days, pCfg->precision);
 
   tsdbRLockFS(pFileHandle);
   tsdbFSIterInit(&pTsdbReadHandle->fileIter, pFileHandle, pTsdbReadHandle->order);
@@ -2321,7 +2321,7 @@ int32_t tsdbGetFileBlocksDistInfo(tsdbReaderT* queryHandle, STableBlockDistInfo*
       break;
     }
 
-    tsdbGetFidKeyRange(pCfg->daysPerFile, pCfg->precision, pTsdbReadHandle->pFileGroup->fid, &win.skey, &win.ekey);
+    tsdbGetFidKeyRange(pCfg->days, pCfg->precision, pTsdbReadHandle->pFileGroup->fid, &win.skey, &win.ekey);
 
     // current file are not overlapped with query time window, ignore remain files
     if ((ascTraverse && win.skey > pTsdbReadHandle->window.ekey) ||
@@ -2396,7 +2396,7 @@ static int32_t getDataBlocksInFiles(STsdbReadHandle* pTsdbReadHandle, bool* exis
   if (!pTsdbReadHandle->locateStart) {
     pTsdbReadHandle->locateStart = true;
     STsdbCfg* pCfg = &pTsdbReadHandle->pTsdb->config;
-    int32_t   fid = getFileIdFromKey(pTsdbReadHandle->window.skey, pCfg->daysPerFile, pCfg->precision);
+    int32_t   fid = getFileIdFromKey(pTsdbReadHandle->window.skey, pCfg->days, pCfg->precision);
 
     tsdbRLockFS(pFileHandle);
     tsdbFSIterInit(&pTsdbReadHandle->fileIter, pFileHandle, pTsdbReadHandle->order);
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
index e31ede09cc..0b5a53dd9c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c
@@ -43,14 +43,14 @@ int tsdbInitReadH(SReadH *pReadh, STsdb *pRepo) {
     return -1;
   }
 
-  pReadh->pDCols[0] = tdNewDataCols(0, pCfg->maxRowsPerFileBlock);
+  pReadh->pDCols[0] = tdNewDataCols(0, pCfg->maxRows);
   if (pReadh->pDCols[0] == NULL) {
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
     tsdbDestroyReadH(pReadh);
     return -1;
   }
 
-  pReadh->pDCols[1] = tdNewDataCols(0, pCfg->maxRowsPerFileBlock);
+  pReadh->pDCols[1] = tdNewDataCols(0, pCfg->maxRows);
   if (pReadh->pDCols[1] == NULL) {
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
     tsdbDestroyReadH(pReadh);
@@ -276,8 +276,8 @@ int tsdbLoadBlockData(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo) {
   return 0;
 }
 
-int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo, const int16_t *colIds,
-                          int numOfColsIds, bool mergeBitmap) {
+int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo, const int16_t *colIds, int numOfColsIds,
+                          bool mergeBitmap) {
   ASSERT(pBlock->numOfSubBlocks > 0);
   int8_t update = pReadh->pRepo->config.update;
 
@@ -513,7 +513,7 @@ static int tsdbLoadBlockDataImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *pDat
 
   tdResetDataCols(pDataCols);
 
-  if(tsdbIsSupBlock(pBlock)) {
+  if (tsdbIsSupBlock(pBlock)) {
     tdDataColsSetBitmapI(pDataCols);
   }
 
@@ -710,7 +710,7 @@ static int tsdbLoadBlockDataColsImpl(SReadH *pReadh, SBlock *pBlock, SDataCols *
 
   tdResetDataCols(pDataCols);
 
-  if(tsdbIsSupBlock(pBlock)) {
+  if (tsdbIsSupBlock(pBlock)) {
     tdDataColsSetBitmapI(pDataCols);
   }
 
@@ -836,7 +836,7 @@ static int tsdbLoadColData(SReadH *pReadh, SDFile *pDFile, SBlock *pBlock, SBloc
   }
 
   if (tsdbCheckAndDecodeColumnData(pDataCol, pReadh->pBuf, pBlockCol->len, pBlockCol->blen, pBlock->algorithm,
-                                   pBlock->numOfRows, tLenBitmap, pCfg->maxRowsPerFileBlock, pReadh->pCBuf,
+                                   pBlock->numOfRows, tLenBitmap, pCfg->maxRows, pReadh->pCBuf,
                                    (int32_t)taosTSizeof(pReadh->pCBuf)) < 0) {
     tsdbError("vgId:%d file %s is broken at column %d offset %" PRId64, REPO_ID(pRepo), TSDB_FILE_FULL_NAME(pDFile),
               pBlockCol->colId, offset);
diff --git a/source/dnode/vnode/src/tsdb/tsdbSma.c b/source/dnode/vnode/src/tsdb/tsdbSma.c
index 7de5a0d5a9..7abdf22073 100644
--- a/source/dnode/vnode/src/tsdb/tsdbSma.c
+++ b/source/dnode/vnode/src/tsdb/tsdbSma.c
@@ -106,7 +106,8 @@ struct SSmaStat {
 
 // expired window
 static int32_t  tsdbUpdateExpiredWindowImpl(STsdb *pTsdb, SSubmitReq *pMsg, int64_t version);
-static int32_t  tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey, int64_t version);
+static int32_t  tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey,
+                                     int64_t version);
 static int32_t  tsdbInitSmaStat(SSmaStat **pSmaStat);
 static void    *tsdbFreeSmaStatItem(SSmaStatItem *pSmaStatItem);
 static int32_t  tsdbDestroySmaState(SSmaStat *pSmaStat);
@@ -197,7 +198,7 @@ static SPoolMem *openPool() {
 
 static void clearPool(SPoolMem *pPool) {
   if (!pPool) return;
-  
+
   SPoolMem *pMem;
 
   do {
@@ -544,7 +545,8 @@ 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, int64_t version) {
+static int32_t tsdbSetExpiredWindow(STsdb *pTsdb, SHashObj *pItemsHash, int64_t indexUid, int64_t winSKey,
+                                    int64_t version) {
   SSmaStatItem *pItem = taosHashGet(pItemsHash, &indexUid, sizeof(indexUid));
   if (pItem == NULL) {
     // TODO: use TSDB_SMA_STAT_EXPIRED and update by stream computing later
@@ -946,7 +948,7 @@ static int32_t tsdbSetTSmaDataFile(STSmaWriteH *pSmaH, int64_t indexUid, int32_t
  */
 static int32_t tsdbGetTSmaDays(STsdb *pTsdb, int64_t interval, int32_t storageLevel) {
   STsdbCfg *pCfg = REPO_CFG(pTsdb);
-  int32_t   daysPerFile = pCfg->daysPerFile;
+  int32_t   daysPerFile = pCfg->days;
 
   if (storageLevel == SMA_STORAGE_LEVEL_TSDB) {
     int32_t days = SMA_STORAGE_TSDB_TIMES * (interval / tsTickPerDay[pCfg->precision]);
diff --git a/source/dnode/vnode/src/vnd/vnodeCfg.c b/source/dnode/vnode/src/vnd/vnodeCfg.c
index ef417cabc6..34b983c20c 100644
--- a/source/dnode/vnode/src/vnd/vnodeCfg.c
+++ b/source/dnode/vnode/src/vnd/vnodeCfg.c
@@ -15,14 +15,15 @@
 
 #include "vnodeInt.h"
 
-const SVnodeCfg defaultVnodeOptions = {
-    .wsize = 96 * 1024 * 1024, .ssize = 1 * 1024 * 1024, .lsize = 1024, .walCfg = {.level = TAOS_WAL_WRITE}}; /* TODO */
+const SVnodeCfg vnodeCfgDefault = {
+    .wsize = 96 * 1024 * 1024, .ssize = 1 * 1024 * 1024, .lsize = 1024, .walCfg = {.level = TAOS_WAL_WRITE}};
 
-int vnodeValidateOptions(const SVnodeCfg *pVnodeOptions) {
+int vnodeCheckCfg(const SVnodeCfg *pCfg) {
   // TODO
   return 0;
 }
 
+#if 1  //======================================================================
 void vnodeOptionsCopy(SVnodeCfg *pDest, const SVnodeCfg *pSrc) {
   memcpy((void *)pDest, (void *)pSrc, sizeof(SVnodeCfg));
 }
@@ -46,3 +47,5 @@ int vnodeValidateTableHash(SVnodeCfg *pVnodeOptions, char *tableFName) {
 
   return TSDB_CODE_SUCCESS;
 }
+
+#endif
\ No newline at end of file
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index b4c3725a5e..fa249d3ba1 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -15,11 +15,128 @@
 
 #include "vnodeInt.h"
 
+#define VND_INFO_FNAME     "vnode.json"
+#define VND_INFO_FNAME_TMP "vnode_tmp.json"
+
+static int  vnodeEncodeInfo(const SVnodeInfo *pInfo, char **ppData);
+static int  vnodeDecodeInfo(uint8_t *pData, SVnodeInfo *pInfo);
 static int  vnodeStartCommit(SVnode *pVnode);
 static int  vnodeEndCommit(SVnode *pVnode);
 static int  vnodeCommit(void *arg);
 static void vnodeWaitCommit(SVnode *pVnode);
 
+int vnodeSaveInfo(const char *dir, const SVnodeInfo *pInfo) {
+  char      fname[TSDB_FILENAME_LEN];
+  TdFilePtr pFile;
+  char     *data;
+
+  snprintf(fname, TSDB_FILENAME_LEN, "%s%s%s", dir, TD_DIRSEP, VND_INFO_FNAME_TMP);
+
+  // encode info
+  data = NULL;
+
+  if (vnodeEncodeInfo(pInfo, &data) < 0) {
+    return -1;
+  }
+
+  // save info to a vnode_tmp.json
+  pFile = taosOpenFile(fname, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+  if (pFile == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosWriteFile(pFile, data, strlen(data)) < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  if (taosFsyncFile(pFile) < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  taosCloseFile(&pFile);
+
+  // free info binary
+  taosMemoryFree(data);
+
+  vInfo("vgId: %d vnode info is saved, fname: %s", pInfo->config.vgId, fname);
+
+  return 0;
+
+_err:
+  taosCloseFile(&pFile);
+  taosMemoryFree(data);
+  return -1;
+}
+
+int vnodeCommitInfo(const char *dir, const SVnodeInfo *pInfo) {
+  char fname[TSDB_FILENAME_LEN];
+  char tfname[TSDB_FILENAME_LEN];
+
+  snprintf(fname, TSDB_FILENAME_LEN, "%s%s%s", dir, TD_DIRSEP, VND_INFO_FNAME);
+  snprintf(tfname, TSDB_FILENAME_LEN, "%s%s%s", dir, TD_DIRSEP, VND_INFO_FNAME_TMP);
+
+  if (taosRenameFile(tfname, fname) < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  vInfo("vgId: %d vnode info is committed", pInfo->config.vgId);
+
+  return 0;
+}
+
+int vnodeLoadInfo(const char *dir, SVnodeInfo *pInfo) {
+  char      fname[TSDB_FILENAME_LEN];
+  TdFilePtr pFile = NULL;
+  char     *pData = NULL;
+  int64_t   size;
+
+  snprintf(fname, TSDB_FILENAME_LEN, "%s%s%s", dir, TD_DIRSEP, VND_INFO_FNAME);
+
+  // read info
+  pFile = taosOpenFile(fname, TD_FILE_READ);
+  if (pFile == NULL) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    return -1;
+  }
+
+  if (taosFStatFile(pFile, &size, NULL) < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  pData = taosMemoryMalloc(size);
+  if (pData == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    goto _err;
+  }
+
+  if (taosReadFile(pFile, pData, size) < 0) {
+    terrno = TAOS_SYSTEM_ERROR(errno);
+    goto _err;
+  }
+
+  taosCloseFile(&pFile);
+
+  // decode info
+  if (vnodeDecodeInfo(pData, pInfo) < 0) {
+    taosMemoryFree(pData);
+    return -1;
+  }
+
+  taosMemoryFree(pData);
+
+  return 0;
+
+_err:
+  taosCloseFile(&pFile);
+  taosMemoryFree(pData);
+  return -1;
+}
+
 int vnodeAsyncCommit(SVnode *pVnode) {
   vnodeWaitCommit(pVnode);
 
@@ -60,4 +177,133 @@ static int vnodeEndCommit(SVnode *pVnode) {
   return 0;
 }
 
-static FORCE_INLINE void vnodeWaitCommit(SVnode *pVnode) { tsem_wait(&pVnode->canCommit); }
\ No newline at end of file
+static FORCE_INLINE void vnodeWaitCommit(SVnode *pVnode) { tsem_wait(&pVnode->canCommit); }
+
+static int vnodeEncodeConfig(const void *pObj, SJson *pJson) {
+  const SVnodeCfg *pCfg = (SVnodeCfg *)pObj;
+
+  if (tjsonAddIntegerToObject(pJson, "vgId", pCfg->vgId) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "dbId", pCfg->dbId) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "wsize", pCfg->wsize) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "ssize", pCfg->ssize) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "lsize", pCfg->lsize) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "isHeap", pCfg->isHeapAllocator) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "ttl", pCfg->ttl) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "keep", pCfg->keep) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "streamMode", pCfg->streamMode) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "isWeak", pCfg->isWeak) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "precision", pCfg->tsdbCfg.precision) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "update", pCfg->tsdbCfg.update) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "compression", pCfg->tsdbCfg.compression) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "daysPerFile", pCfg->tsdbCfg.days) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "minRows", pCfg->tsdbCfg.minRows) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "maxRows", pCfg->tsdbCfg.maxRows) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "keep0", pCfg->tsdbCfg.keep0) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "keep1", pCfg->tsdbCfg.keep1) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "keep2", pCfg->tsdbCfg.keep2) < 0) return -1;
+  if (tjsonAddIntegerToObject(pJson, "lruCacheSize", pCfg->tsdbCfg.lruCacheSize) < 0) return -1;
+
+  return 0;
+}
+
+static int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
+  SVnodeCfg *pCfg = (SVnodeCfg *)pObj;
+
+  if (tjsonGetNumberValue(pJson, "vgId", pCfg->vgId) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "dbId", pCfg->dbId) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "wsize", pCfg->wsize) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "ssize", pCfg->ssize) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "lsize", pCfg->lsize) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "isHeap", pCfg->isHeapAllocator) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "ttl", pCfg->ttl) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "keep", pCfg->keep) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "streamMode", pCfg->streamMode) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "isWeak", pCfg->isWeak) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "precision", pCfg->tsdbCfg.precision) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "update", pCfg->tsdbCfg.update) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "compression", pCfg->tsdbCfg.compression) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "daysPerFile", pCfg->tsdbCfg.days) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "minRows", pCfg->tsdbCfg.minRows) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "maxRows", pCfg->tsdbCfg.maxRows) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "keep0", pCfg->tsdbCfg.keep0) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "keep1", pCfg->tsdbCfg.keep1) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "keep2", pCfg->tsdbCfg.keep2) < 0) return -1;
+  if (tjsonGetNumberValue(pJson, "lruCacheSize", pCfg->tsdbCfg.lruCacheSize) < 0) return -1;
+
+  return 0;
+}
+
+static int vnodeEncodeState(const void *pObj, SJson *pJson) {
+  const SVState *pState = (SVState *)pObj;
+
+  if (tjsonAddIntegerToObject(pJson, "commit version", pState->committed) < 0) return -1;
+
+  return 0;
+}
+
+static int vnodeDecodeState(const SJson *pJson, void *pObj) {
+  SVState *pState = (SVState *)pObj;
+
+  if (tjsonGetNumberValue(pJson, "commit version", pState->committed) < 0) return -1;
+
+  return 0;
+}
+
+static int vnodeEncodeInfo(const SVnodeInfo *pInfo, char **ppData) {
+  SJson *pJson;
+  char  *pData;
+
+  *ppData = NULL;
+
+  pJson = tjsonCreateObject();
+  if (pJson == NULL) {
+    return -1;
+  }
+
+  if (tjsonAddObject(pJson, "config", vnodeEncodeConfig, (void *)&pInfo->config) < 0) {
+    goto _err;
+  }
+
+  if (tjsonAddObject(pJson, "state", vnodeEncodeState, (void *)&pInfo->state) < 0) {
+    goto _err;
+  }
+
+  pData = tjsonToString(pJson);
+  if (pData == NULL) {
+    goto _err;
+  }
+
+  tjsonDelete(pJson);
+
+  *ppData = pData;
+  return 0;
+
+_err:
+  tjsonDelete(pJson);
+  return -1;
+}
+
+static int vnodeDecodeInfo(uint8_t *pData, SVnodeInfo *pInfo) {
+  SJson *pJson = NULL;
+
+  pJson = tjsonCreateObject();
+  if (pJson == NULL) {
+    return -1;
+  }
+
+  if (tjsonToObject(pJson, "config", vnodeDecodeConfig, (void *)&pInfo->config) < 0) {
+    goto _err;
+  }
+
+  if (tjsonToObject(pJson, "state", vnodeDecodeState, (void *)&pInfo->state) < 0) {
+    goto _err;
+  }
+
+  tjsonDelete(pJson);
+
+  return 0;
+
+_err:
+  tjsonDelete(pJson);
+  return -1;
+}
diff --git a/source/dnode/vnode/src/vnd/vnodeMain.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
similarity index 80%
rename from source/dnode/vnode/src/vnd/vnodeMain.c
rename to source/dnode/vnode/src/vnd/vnodeOpen.c
index 2fd848a39d..241c26ab1c 100644
--- a/source/dnode/vnode/src/vnd/vnodeMain.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -20,11 +20,42 @@ static void    vnodeFree(SVnode *pVnode);
 static int     vnodeOpenImpl(SVnode *pVnode);
 static void    vnodeCloseImpl(SVnode *pVnode);
 
+int vnodeCreate(const char *path, SVnodeCfg *pCfg, STfs *pTfs) {
+  SVnodeInfo info = {0};
+  char       dir[TSDB_FILENAME_LEN];
+
+  // TODO: check if directory exists
+
+  // check config
+  if (vnodeCheckCfg(pCfg) < 0) {
+    vError("vgId: %d failed to create vnode since: %s", pCfg->vgId, tstrerror(terrno));
+    return -1;
+  }
+
+  // create vnode env
+  if (tfsMkdir(pTfs, path) < 0) {
+    vError("vgId: %d failed to create vnode since: %s", pCfg->vgId, tstrerror(terrno));
+    return -1;
+  }
+
+  snprintf(dir, TSDB_FILENAME_LEN, "%s%s%s", tfsGetPrimaryPath(pTfs), TD_DIRSEP, path);
+  info.config = *pCfg;
+
+  if (vnodeSaveInfo(dir, &info) < 0 || vnodeCommitInfo(dir, &info) < 0) {
+    vError("vgId: %d failed to save vnode config since %s", pCfg->vgId, tstrerror(terrno));
+    return -1;
+  }
+
+  vInfo("vgId: %d vnode is created", pCfg->vgId);
+
+  return 0;
+}
+
 SVnode *vnodeOpen(const char *path, const SVnodeCfg *pVnodeCfg) {
   SVnode *pVnode = NULL;
 
   // Set default options
-  SVnodeCfg cfg = defaultVnodeOptions;
+  SVnodeCfg cfg = vnodeCfgDefault;
   if (pVnodeCfg != NULL) {
     cfg.vgId = pVnodeCfg->vgId;
     cfg.msgCb = pVnodeCfg->msgCb;
@@ -36,7 +67,7 @@ SVnode *vnodeOpen(const char *path, const SVnodeCfg *pVnodeCfg) {
   }
 
   // Validate options
-  if (vnodeValidateOptions(&cfg) < 0) {
+  if (vnodeCheckCfg(&cfg) < 0) {
     // TODO
     return NULL;
   }
diff --git a/source/libs/catalog/inc/catalogInt.h b/source/libs/catalog/inc/catalogInt.h
index 09f51dc03e..8938084724 100644
--- a/source/libs/catalog/inc/catalogInt.h
+++ b/source/libs/catalog/inc/catalogInt.h
@@ -227,20 +227,20 @@ typedef struct SCtgAction {
 #define CTG_FLAG_STB          0x1
 #define CTG_FLAG_NOT_STB      0x2
 #define CTG_FLAG_UNKNOWN_STB  0x4
-#define CTG_FLAG_INF_DB       0x8
+#define CTG_FLAG_SYS_DB       0x8
 #define CTG_FLAG_FORCE_UPDATE 0x10
 
 #define CTG_FLAG_IS_STB(_flag) ((_flag) & CTG_FLAG_STB)
 #define CTG_FLAG_IS_NOT_STB(_flag) ((_flag) & CTG_FLAG_NOT_STB)
 #define CTG_FLAG_IS_UNKNOWN_STB(_flag) ((_flag) & CTG_FLAG_UNKNOWN_STB)
-#define CTG_FLAG_IS_INF_DB(_flag) ((_flag) & CTG_FLAG_INF_DB)
+#define CTG_FLAG_IS_SYS_DB(_flag) ((_flag) & CTG_FLAG_SYS_DB)
 #define CTG_FLAG_IS_FORCE_UPDATE(_flag) ((_flag) & CTG_FLAG_FORCE_UPDATE)
-#define CTG_FLAG_SET_INF_DB(_flag) ((_flag) |= CTG_FLAG_INF_DB)
+#define CTG_FLAG_SET_SYS_DB(_flag) ((_flag) |= CTG_FLAG_SYS_DB)
 #define CTG_FLAG_SET_STB(_flag, tbType) do { (_flag) |= ((tbType) == TSDB_SUPER_TABLE) ? CTG_FLAG_STB : ((tbType) > TSDB_SUPER_TABLE ? CTG_FLAG_NOT_STB : CTG_FLAG_UNKNOWN_STB); } while (0)
 #define CTG_FLAG_MAKE_STB(_isStb) (((_isStb) == 1) ? CTG_FLAG_STB : ((_isStb) == 0 ? CTG_FLAG_NOT_STB : CTG_FLAG_UNKNOWN_STB))
 #define CTG_FLAG_MATCH_STB(_flag, tbType) (CTG_FLAG_IS_UNKNOWN_STB(_flag) || (CTG_FLAG_IS_STB(_flag) && (tbType) == TSDB_SUPER_TABLE) || (CTG_FLAG_IS_NOT_STB(_flag) && (tbType) != TSDB_SUPER_TABLE))
 
-#define CTG_IS_INF_DBNAME(_dbname) ((*(_dbname) == 'i') && (0 == strcmp(_dbname, TSDB_INFORMATION_SCHEMA_DB)))
+#define CTG_IS_SYS_DBNAME(_dbname) (((*(_dbname) == 'i') && (0 == strcmp(_dbname, TSDB_INFORMATION_SCHEMA_DB))) || ((*(_dbname) == 'p') && (0 == strcmp(_dbname, TSDB_PERFORMANCE_SCHEMA_DB))))
 
 #define CTG_META_SIZE(pMeta) (sizeof(STableMeta) + ((pMeta)->tableInfo.numOfTags + (pMeta)->tableInfo.numOfColumns) * sizeof(SSchema))
 
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 2aa858fe06..21e0be40a4 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -217,7 +217,7 @@ int32_t ctgPushRmDBMsgInQueue(SCatalog* pCtg, const char *dbFName, int64_t dbId)
   }
 
   char *p = strchr(dbFName, '.');
-  if (p && CTG_IS_INF_DBNAME(p + 1)) {
+  if (p && CTG_IS_SYS_DBNAME(p + 1)) {
     dbFName = p + 1;
   }
 
@@ -304,7 +304,7 @@ int32_t ctgPushUpdateVgMsgInQueue(SCatalog* pCtg, const char *dbFName, int64_t d
   }
 
   char *p = strchr(dbFName, '.');
-  if (p && CTG_IS_INF_DBNAME(p + 1)) {
+  if (p && CTG_IS_SYS_DBNAME(p + 1)) {
     dbFName = p + 1;
   }
 
@@ -336,7 +336,7 @@ int32_t ctgPushUpdateTblMsgInQueue(SCatalog* pCtg, STableMetaOutput *output, boo
   }
 
   char *p = strchr(output->dbFName, '.');
-  if (p && CTG_IS_INF_DBNAME(p + 1)) {
+  if (p && CTG_IS_SYS_DBNAME(p + 1)) {
     memmove(output->dbFName, p + 1, strlen(p + 1));
   }
 
@@ -410,7 +410,7 @@ void ctgWReleaseVgInfo(SCtgDBCache *dbCache) {
 
 int32_t ctgAcquireDBCacheImpl(SCatalog* pCtg, const char *dbFName, SCtgDBCache **pCache, bool acquire) {
   char *p = strchr(dbFName, '.');
-  if (p && CTG_IS_INF_DBNAME(p + 1)) {
+  if (p && CTG_IS_SYS_DBNAME(p + 1)) {
     dbFName = p + 1;
   }
 
@@ -688,7 +688,7 @@ int32_t ctgGetTableMetaFromCache(SCatalog* pCtg, const SName* pTableName, STable
   }
 
   char dbFName[TSDB_DB_FNAME_LEN] = {0};
-  if (CTG_FLAG_IS_INF_DB(flag)) {
+  if (CTG_FLAG_IS_SYS_DB(flag)) {
     strcpy(dbFName, pTableName->dbname);
   } else {
     tNameGetFullDbName(pTableName, dbFName);
@@ -1721,7 +1721,7 @@ int32_t ctgRefreshTblMeta(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps,
   SVgroupInfo vgroupInfo = {0};
   int32_t code = 0;
 
-  if (!CTG_FLAG_IS_INF_DB(flag)) {
+  if (!CTG_FLAG_IS_SYS_DB(flag)) {
     CTG_ERR_RET(catalogGetTableHashVgroup(pCtg, pTrans, pMgmtEps, pTableName, &vgroupInfo));
   }
 
@@ -1732,7 +1732,7 @@ int32_t ctgRefreshTblMeta(SCatalog* pCtg, void *pTrans, const SEpSet* pMgmtEps,
     CTG_ERR_RET(TSDB_CODE_CTG_MEM_ERROR);
   }
 
-  if (CTG_FLAG_IS_INF_DB(flag)) {
+  if (CTG_FLAG_IS_SYS_DB(flag)) {
     ctgDebug("will refresh tbmeta, supposed in information_schema, tbName:%s", tNameGetTableName(pTableName));
 
     CTG_ERR_JRET(ctgGetTableMetaFromMnodeImpl(pCtg, pTrans, pMgmtEps, (char *)pTableName->dbname, (char *)pTableName->tname, output));
@@ -1820,8 +1820,8 @@ int32_t ctgGetTableMeta(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, cons
   uint64_t suid = 0;
   STableMetaOutput *output = NULL;
 
-  if (CTG_IS_INF_DBNAME(pTableName->dbname)) {
-    CTG_FLAG_SET_INF_DB(flag);
+  if (CTG_IS_SYS_DBNAME(pTableName->dbname)) {
+    CTG_FLAG_SET_SYS_DB(flag);
   }
 
   CTG_ERR_RET(ctgGetTableMetaFromCache(pCtg, pTableName, pTableMeta, &inCache, flag, &dbId));
@@ -1829,7 +1829,7 @@ int32_t ctgGetTableMeta(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, cons
   int32_t tbType = 0;
 
   if (inCache) {
-    if (CTG_FLAG_MATCH_STB(flag, (*pTableMeta)->tableType) && ((!CTG_FLAG_IS_FORCE_UPDATE(flag)) || (CTG_FLAG_IS_INF_DB(flag)))) {
+    if (CTG_FLAG_MATCH_STB(flag, (*pTableMeta)->tableType) && ((!CTG_FLAG_IS_FORCE_UPDATE(flag)) || (CTG_FLAG_IS_SYS_DB(flag)))) {
       goto _return;
     }
 
@@ -1885,7 +1885,7 @@ _return:
 
   if (CTG_TABLE_NOT_EXIST(code) && inCache) {
     char dbFName[TSDB_DB_FNAME_LEN] = {0};
-    if (CTG_FLAG_IS_INF_DB(flag)) {
+    if (CTG_FLAG_IS_SYS_DB(flag)) {
       strcpy(dbFName, pTableName->dbname);
     } else {
       tNameGetFullDbName(pTableName, dbFName);
@@ -2633,7 +2633,7 @@ int32_t catalogGetTableDistVgInfo(SCatalog* pCtg, void *pRpc, const SEpSet* pMgm
     CTG_API_LEAVE(TSDB_CODE_CTG_INVALID_INPUT);
   }
 
-  if (CTG_IS_INF_DBNAME(pTableName->dbname)) {
+  if (CTG_IS_SYS_DBNAME(pTableName->dbname)) {
     ctgError("no valid vgInfo for db, dbname:%s", pTableName->dbname);
     CTG_API_LEAVE(TSDB_CODE_CTG_INVALID_INPUT);
   }
@@ -2666,7 +2666,7 @@ _return:
 int32_t catalogGetTableHashVgroup(SCatalog *pCtg, void *pTrans, const SEpSet *pMgmtEps, const SName *pTableName, SVgroupInfo *pVgroup) {
   CTG_API_ENTER();
 
-  if (CTG_IS_INF_DBNAME(pTableName->dbname)) {
+  if (CTG_IS_SYS_DBNAME(pTableName->dbname)) {
     ctgError("no valid vgInfo for db, dbname:%s", pTableName->dbname);
     CTG_API_LEAVE(TSDB_CODE_CTG_INVALID_INPUT);
   }
diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index 8d88b94d6c..1f3c003dfb 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -42,10 +42,6 @@
 
 #define curTimeWindowIndex(_winres)        ((_winres)->curIndex)
 
-struct SColumnFilterElem;
-
-typedef bool (*__filter_func_t)(struct SColumnFilterElem* pFilter, const char* val1, const char* val2, int16_t type);
-
 typedef struct SGroupResInfo {
   int32_t totalGroup;
   int32_t currentGroup;
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index cbd2dc66f5..ea2939055e 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -38,8 +38,6 @@ extern "C" {
 #include "tpagedbuf.h"
 #include "tmsg.h"
 
-struct SColumnFilterElem;
-
 typedef int32_t (*__block_search_fn_t)(char* data, int32_t num, int64_t key, int32_t order);
 
 #define IS_QUERY_KILLED(_q) ((_q)->code == TSDB_CODE_TSC_QUERY_CANCELLED)
@@ -225,8 +223,6 @@ typedef struct STaskRuntimeEnv {
   void*           qinfo;
   uint8_t         scanFlag;  // denotes reversed scan of data or not
   void*           pTsdbReadHandle;
-
-  int32_t         prevGroupId;  // previous executed group id
   bool            enableGroupData;
   SDiskbasedBuf*  pResultBuf;           // query result buffer based on blocked-wised disk file
   SHashObj*       pResultRowHashTable;  // quick locate the window object for each result
@@ -241,8 +237,6 @@ typedef struct STaskRuntimeEnv {
 
   char*           tagVal;  // tag value of current data block
   struct SScalarFunctionSupport* scalarSup;
-
-  SSDataBlock*    outputBuf;
   STableGroupInfo tableqinfoGroupInfo;  // this is a group array list, including SArray<STableQueryInfo*> structure
   struct SOperatorInfo* proot;
   SGroupResInfo   groupResInfo;
@@ -250,7 +244,6 @@ typedef struct STaskRuntimeEnv {
 
   STableQueryInfo* current;
   SResultInfo      resultInfo;
-  SHashObj*        pTableRetrieveTsMap;
   struct SUdfInfo* pUdfInfo;
 } STaskRuntimeEnv;
 
@@ -350,6 +343,7 @@ typedef struct STableScanInfo {
   int64_t         elapsedTime;
   int32_t         prevGroupId;  // previous table group id
   int32_t         scanFlag;  // table scan flag to denote if it is a repeat/reverse/main scan
+  int32_t         dataBlockLoadFlag;
 } STableScanInfo;
 
 typedef struct STagScanInfo {
@@ -549,8 +543,6 @@ typedef struct SStateWindowOperatorInfo {
 
 typedef struct SSortedMergeOperatorInfo {
   SOptrBasicInfo   binfo;
-  bool             hasVarCol;
-  
   SArray*          pSortInfo;
   int32_t          numOfSources;
   SSortHandle     *pSortHandle;
@@ -582,6 +574,24 @@ typedef struct SSortOperatorInfo {
   uint64_t           totalElapsed;  // total elapsed time
 } SSortOperatorInfo;
 
+typedef struct SJoinOperatorInfo {
+  SSDataBlock       *pRes;
+  int32_t            joinType;
+
+  SSDataBlock       *pLeft;
+  int32_t            leftPos;
+  SColumnInfo        leftCol;
+
+  SSDataBlock       *pRight;
+  int32_t            rightPos;
+  SColumnInfo        rightCol;
+
+  SNode             *pOnCondition;
+//  SJoinStatus       *status;
+//  int32_t            numOfUpstream;
+//  SRspResultInfo     resultInfo;
+} SJoinOperatorInfo;
+
 int32_t operatorDummyOpenFn(SOperatorInfo* pOperator);
 void operatorDummyCloseFn(void* param, int32_t numOfCols);
 int32_t appendDownstream(SOperatorInfo* p, SOperatorInfo** pDownstream, int32_t num);
@@ -600,7 +610,7 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock);
 SqlFunctionCtx* createSqlFunctionCtx(SExprInfo* pExprInfo, int32_t numOfOutput, int32_t** rowCellInfoOffset);
 
 SOperatorInfo* createExchangeOperatorInfo(const SNodeList* pSources, SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo);
-SOperatorInfo* createTableScanOperatorInfo(void* pTsdbReadHandle, int32_t order, int32_t numOfCols, int32_t repeatTime,
+SOperatorInfo* createTableScanOperatorInfo(void* pTsdbReadHandle, int32_t order, int32_t numOfCols, int32_t dataLoadFlag, int32_t repeatTime,
                                            int32_t reverseTime, SArray* pColMatchInfo, SSDataBlock* pResBlock, SNode* pCondition, SExecTaskInfo* pTaskInfo);
 SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock,
                                            SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
@@ -628,6 +638,8 @@ SOperatorInfo* createPartitionOperatorInfo(SOperatorInfo* downstream, SExprInfo*
                                            SExecTaskInfo* pTaskInfo, const STableGroupInfo* pTableGroupInfo);
 SOperatorInfo* createTimeSliceOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock, SExecTaskInfo* pTaskInfo);
 
+SOperatorInfo* createJoinOperatorInfo(SOperatorInfo** pDownstream, int32_t numOfDownstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SNode* pOnCondition, SExecTaskInfo* pTaskInfo);
+
 #if 0
 SOperatorInfo* createTableSeqScanOperatorInfo(void* pTsdbReadHandle, STaskRuntimeEnv* pRuntimeEnv);
 SOperatorInfo* createMultiTableTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorInfo* downstream,
@@ -635,9 +647,6 @@ SOperatorInfo* createMultiTableTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntim
 SOperatorInfo* createAllMultiTableTimeIntervalOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SOperatorInfo* downstream,
                                                            SExprInfo* pExpr, int32_t numOfOutput);
 SOperatorInfo* createTagScanOperatorInfo(SReaderHandle* pReaderHandle, SExprInfo* pExpr, int32_t numOfOutput);
-
-SOperatorInfo* createJoinOperatorInfo(SOperatorInfo** pdownstream, int32_t numOfDownstream, SSchema* pSchema,
-                                      int32_t numOfOutput);
 #endif
 
 void projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSDataBlock* pSrcBlock, SqlFunctionCtx* pCtx, int32_t numOfOutput, SArray* pPseudoList);
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 14acff3204..3e2f95a27c 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -271,7 +271,7 @@ static int compareRowData(const void* a, const void* b, const void* userData) {
 }
 
 // setup the output buffer for each operator
-SSDataBlock* createOutputBuf_rv1(SDataBlockDescNode* pNode) {
+SSDataBlock* createResDataBlock(SDataBlockDescNode* pNode) {
   int32_t numOfCols = LIST_LENGTH(pNode->pSlots);
 
   SSDataBlock* pBlock = taosMemoryCalloc(1, sizeof(SSDataBlock));
@@ -2004,7 +2004,7 @@ static int32_t updateBlockLoadStatus(STaskAttr* pQuery, int32_t status) {
   bool hasFirstLastFunc = false;
   bool hasOtherFunc = false;
 
-  if (status == BLK_DATA_ALL_NEEDED || status == BLK_DATA_DISCARD) {
+  if (status == BLK_DATA_DATA_LOAD || status == BLK_DATA_FILTEROUT) {
     return status;
   }
 
@@ -2023,11 +2023,11 @@ static int32_t updateBlockLoadStatus(STaskAttr* pQuery, int32_t status) {
     }
   }
 
-  if (hasFirstLastFunc && status == BLK_DATA_NO_NEEDED) {
+  if (hasFirstLastFunc && status == BLK_DATA_NOT_LOAD) {
     if (!hasOtherFunc) {
-      return BLK_DATA_DISCARD;
+      return BLK_DATA_FILTEROUT;
     } else {
-      return BLK_DATA_ALL_NEEDED;
+      return BLK_DATA_DATA_LOAD;
     }
   }
 
@@ -2360,7 +2360,7 @@ static void         doSetTagValueInParam(void* pTable, int32_t tagColId, SVarian
 
 static uint32_t doFilterByBlockTimeWindow(STableScanInfo* pTableScanInfo, SSDataBlock* pBlock) {
   SqlFunctionCtx* pCtx = pTableScanInfo->pCtx;
-  uint32_t        status = BLK_DATA_NO_NEEDED;
+  uint32_t        status = BLK_DATA_NOT_LOAD;
 
   int32_t numOfOutput = pTableScanInfo->numOfOutput;
   for (int32_t i = 0; i < numOfOutput; ++i) {
@@ -2369,11 +2369,11 @@ static uint32_t doFilterByBlockTimeWindow(STableScanInfo* pTableScanInfo, SSData
 
     // group by + first/last should not apply the first/last block filter
     if (functionId < 0) {
-      status |= BLK_DATA_ALL_NEEDED;
+      status |= BLK_DATA_DATA_LOAD;
       return status;
     } else {
       //      status |= aAggs[functionId].dataReqFunc(&pTableScanInfo->pCtx[i], &pBlock->info.window, colId);
-      //      if ((status & BLK_DATA_ALL_NEEDED) == BLK_DATA_ALL_NEEDED) {
+      //      if ((status & BLK_DATA_DATA_LOAD) == BLK_DATA_DATA_LOAD) {
       //        return status;
       //      }
     }
@@ -2384,7 +2384,7 @@ static uint32_t doFilterByBlockTimeWindow(STableScanInfo* pTableScanInfo, SSData
 
 int32_t loadDataBlockOnDemand(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableScanInfo, SSDataBlock* pBlock,
                               uint32_t* status) {
-  *status = BLK_DATA_NO_NEEDED;
+  *status = BLK_DATA_NOT_LOAD;
 
   pBlock->pDataBlock = NULL;
   pBlock->pBlockAgg = NULL;
@@ -2397,36 +2397,15 @@ int32_t loadDataBlockOnDemand(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableSc
   pCost->totalBlocks += 1;
   pCost->totalRows += pBlock->info.rows;
 #if 0
-  if (pRuntimeEnv->pTsBuf != NULL) {
-    (*status) = BLK_DATA_ALL_NEEDED;
-
-    if (pQueryAttr->stableQuery) {  // todo refactor
-      SExprInfo*   pExprInfo = &pTableScanInfo->pExpr[0];
-      int16_t      tagId = (int16_t)pExprInfo->base.param[0].i;
-      SColumnInfo* pColInfo = doGetTagColumnInfoById(pQueryAttr->tagColList, pQueryAttr->numOfTags, tagId);
-
-      // compare tag first
-      SVariant t = {0};
-      doSetTagValueInParam(pRuntimeEnv->current->pTable, tagId, &t, pColInfo->type, pColInfo->bytes);
-      setTimestampListJoinInfo(pRuntimeEnv, &t, pRuntimeEnv->current);
-
-      STSElem elem = tsBufGetElem(pRuntimeEnv->pTsBuf);
-      if (!tsBufIsValidElem(&elem) || (tsBufIsValidElem(&elem) && (taosVariantCompare(&t, elem.tag) != 0))) {
-        (*status) = BLK_DATA_DISCARD;
-        return TSDB_CODE_SUCCESS;
-      }
-    }
-  }
-
   // Calculate all time windows that are overlapping or contain current data block.
   // If current data block is contained by all possible time window, do not load current data block.
   if (/*pQueryAttr->pFilters || */pQueryAttr->groupbyColumn || pQueryAttr->sw.gap > 0 ||
       (QUERY_IS_INTERVAL_QUERY(pQueryAttr) && overlapWithTimeWindow(pTaskInfo, &pBlock->info))) {
-    (*status) = BLK_DATA_ALL_NEEDED;
+    (*status) = BLK_DATA_DATA_LOAD;
   }
 
   // check if this data block is required to load
-  if ((*status) != BLK_DATA_ALL_NEEDED) {
+  if ((*status) != BLK_DATA_DATA_LOAD) {
     bool needFilter = true;
 
     // the pCtx[i] result is belonged to previous time window since the outputBuf has not been set yet,
@@ -2458,18 +2437,18 @@ int32_t loadDataBlockOnDemand(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableSc
     if (needFilter) {
       (*status) = doFilterByBlockTimeWindow(pTableScanInfo, pBlock);
     } else {
-      (*status) = BLK_DATA_ALL_NEEDED;
+      (*status) = BLK_DATA_DATA_LOAD;
     }
   }
 
   SDataBlockInfo* pBlockInfo = &pBlock->info;
 //  *status = updateBlockLoadStatus(pRuntimeEnv->pQueryAttr, *status);
 
-  if ((*status) == BLK_DATA_NO_NEEDED || (*status) == BLK_DATA_DISCARD) {
+  if ((*status) == BLK_DATA_NOT_LOAD || (*status) == BLK_DATA_FILTEROUT) {
     //qDebug("QInfo:0x%"PRIx64" data block discard, brange:%" PRId64 "-%" PRId64 ", rows:%d", pQInfo->qId, pBlockInfo->window.skey,
 //           pBlockInfo->window.ekey, pBlockInfo->rows);
     pCost->discardBlocks += 1;
-  } else if ((*status) == BLK_DATA_STATIS_NEEDED) {
+  } else if ((*status) == BLK_DATA_SMA_LOAD) {
     // this function never returns error?
     pCost->loadBlockStatis += 1;
 //    tsdbRetrieveDataBlockStatisInfo(pTableScanInfo->pTsdbReadHandle, &pBlock->pBlockAgg);
@@ -2479,7 +2458,7 @@ int32_t loadDataBlockOnDemand(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableSc
       pCost->totalCheckedRows += pBlock->info.rows;
     }
   } else {
-    assert((*status) == BLK_DATA_ALL_NEEDED);
+    assert((*status) == BLK_DATA_DATA_LOAD);
 
     // load the data block statistics to perform further filter
     pCost->loadBlockStatis += 1;
@@ -2511,7 +2490,7 @@ int32_t loadDataBlockOnDemand(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableSc
             pCost->discardBlocks += 1;
             //qDebug("QInfo:0x%"PRIx64" data block discard, brange:%" PRId64 "-%" PRId64 ", rows:%d", pQInfo->qId,
 //                   pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
-            (*status) = BLK_DATA_DISCARD;
+            (*status) = BLK_DATA_FILTEROUT;
             return TSDB_CODE_SUCCESS;
           }
         }
@@ -2523,7 +2502,7 @@ int32_t loadDataBlockOnDemand(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableSc
 //      pCost->discardBlocks += 1;
 //      qDebug("QInfo:0x%"PRIx64" data block discard, brange:%" PRId64 "-%" PRId64 ", rows:%d", pQInfo->qId, pBlockInfo->window.skey,
 //             pBlockInfo->window.ekey, pBlockInfo->rows);
-//      (*status) = BLK_DATA_DISCARD;
+//      (*status) = BLK_DATA_FILTEROUT;
 //      return TSDB_CODE_SUCCESS;
 //    }
 
@@ -6539,8 +6518,6 @@ static SSDataBlock* doTagScan(SOperatorInfo* pOperator, bool* newgroup) {
 
 SOperatorInfo* createTagScanOperatorInfo(STaskRuntimeEnv* pRuntimeEnv, SExprInfo* pExpr, int32_t numOfOutput) {
   STagScanInfo* pInfo = taosMemoryCalloc(1, sizeof(STagScanInfo));
-  //  pInfo->pRes = createOutputBuf(pExpr, numOfOutput, pResultInfo->capacity);
-
   size_t numOfGroup = GET_NUM_OF_TABLEGROUP(pRuntimeEnv);
   assert(numOfGroup == 0 || numOfGroup == 1);
 
@@ -6600,10 +6577,10 @@ bool validateExprColumnInfo(SQueriedTableInfo* pTableInfo, SExprBasicInfo* pExpr
 static SResSchema createResSchema(int32_t type, int32_t bytes, int32_t slotId, int32_t scale, int32_t precision,
                                   const char* name) {
   SResSchema s = {0};
-  s.scale  = scale;
-  s.type   = type;
-  s.bytes  = bytes;
-  s.slotId = slotId;
+  s.scale     = scale;
+  s.type      = type;
+  s.bytes     = bytes;
+  s.slotId    = slotId;
   s.precision = precision;
   strncpy(s.name, name, tListLen(s.name));
 
@@ -6679,8 +6656,7 @@ SExprInfo* createExprInfo(SNodeList* pNodeList, SNodeList* pGroupKeys, int32_t*
       SFunctionNode* pFuncNode = (SFunctionNode*)pTargetNode->pExpr;
 
       SDataType* pType = &pFuncNode->node.resType;
-      pExp->base.resSchema = createResSchema(pType->type, pType->bytes, pTargetNode->slotId, pType->scale,
-                                             pType->precision, pFuncNode->node.aliasName);
+      pExp->base.resSchema = createResSchema(pType->type, pType->bytes, pTargetNode->slotId, pType->scale, pType->precision, pFuncNode->node.aliasName);
 
       pExp->pExpr->_function.functionId = pFuncNode->funcId;
       pExp->pExpr->_function.pFunctNode = pFuncNode;
@@ -6756,22 +6732,27 @@ static SArray* createIndexMap(SNodeList* pNodeList);
 static SArray* extractPartitionColInfo(SNodeList* pNodeList);
 
 SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, SReadHandle* pHandle,
-                                        uint64_t queryId, uint64_t taskId, STableGroupInfo* pTableGroupInfo) {
+                                  uint64_t queryId, uint64_t taskId, STableGroupInfo* pTableGroupInfo) {
   if (pPhyNode->pChildren == NULL || LIST_LENGTH(pPhyNode->pChildren) == 0) {
     int32_t type = nodeType(pPhyNode);
     if (QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN == type) {
       SScanPhysiNode* pScanPhyNode = (SScanPhysiNode*)pPhyNode;
+      STableScanPhysiNode* pTableScanNode = (STableScanPhysiNode* ) 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);
-      SSDataBlock* pResBlock = createOutputBuf_rv1(pScanPhyNode->node.pOutputDataBlockDesc);
+      tsdbReaderT pDataReader = doCreateDataReader(pTableScanNode, pHandle, pTableGroupInfo, (uint64_t)queryId, taskId);
+      if (pDataReader == NULL) {
+        return NULL;
+      }
 
-      return createTableScanOperatorInfo(pDataReader, pScanPhyNode->order, numOfCols, pScanPhyNode->count,
+      SArray* pColList = extractColMatchInfo(pScanPhyNode->pScanCols, pScanPhyNode->node.pOutputDataBlockDesc, &numOfCols);
+      SSDataBlock* pResBlock = createResDataBlock(pScanPhyNode->node.pOutputDataBlockDesc);
+
+      return createTableScanOperatorInfo(pDataReader, pScanPhyNode->order, numOfCols, pTableScanNode->dataRequired, pScanPhyNode->count,
                                          pScanPhyNode->reverse, pColList, pResBlock, pScanPhyNode->node.pConditions, pTaskInfo);
     } else if (QUERY_NODE_PHYSICAL_PLAN_EXCHANGE == type) {
       SExchangePhysiNode* pExchange = (SExchangePhysiNode*)pPhyNode;
-      SSDataBlock*        pResBlock = createOutputBuf_rv1(pExchange->node.pOutputDataBlockDesc);
+      SSDataBlock*        pResBlock = createResDataBlock(pExchange->node.pOutputDataBlockDesc);
       return createExchangeOperatorInfo(pExchange->pSrcEndPoints, pResBlock, pTaskInfo);
     } else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN == type) {
       SScanPhysiNode* pScanPhyNode = (SScanPhysiNode*)pPhyNode;  // simple child table.
@@ -6779,7 +6760,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
       int32_t code = doCreateTableGroup(pHandle->meta, pScanPhyNode->tableType, pScanPhyNode->uid, pTableGroupInfo, queryId, taskId);
       SArray* tableIdList = extractTableIdList(pTableGroupInfo);
 
-      SSDataBlock* pResBlock = createOutputBuf_rv1(pScanPhyNode->node.pOutputDataBlockDesc);
+      SSDataBlock* pResBlock = createResDataBlock(pScanPhyNode->node.pOutputDataBlockDesc);
 
       int32_t numOfCols = 0;
       SArray* pColList = extractColMatchInfo(pScanPhyNode->pScanCols, pScanPhyNode->node.pOutputDataBlockDesc, &numOfCols);
@@ -6788,7 +6769,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
       return pOperator;
     } else if (QUERY_NODE_PHYSICAL_PLAN_SYSTABLE_SCAN == type) {
       SSystemTableScanPhysiNode* pSysScanPhyNode = (SSystemTableScanPhysiNode*)pPhyNode;
-      SSDataBlock*               pResBlock = createOutputBuf_rv1(pSysScanPhyNode->scan.node.pOutputDataBlockDesc);
+      SSDataBlock*               pResBlock = createResDataBlock(pSysScanPhyNode->scan.node.pOutputDataBlockDesc);
 
       struct SScanPhysiNode* pScanNode = &pSysScanPhyNode->scan;
       SArray*                colList = extractScanColumnId(pScanNode->pScanCols);
@@ -6802,26 +6783,29 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     }
   }
 
+  int32_t num = 0;
   int32_t type = nodeType(pPhyNode);
-  size_t size = LIST_LENGTH(pPhyNode->pChildren);
-  ASSERT(size == 1);
+  size_t  size = LIST_LENGTH(pPhyNode->pChildren);
 
-  SPhysiNode*    pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, 0);
-  SOperatorInfo* op = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
-  int32_t        num = 0;
+  SOperatorInfo** ops = taosMemoryCalloc(size, POINTER_BYTES);
+  for(int32_t i = 0; i < size; ++i) {
+    SPhysiNode* pChildNode = (SPhysiNode*)nodesListGetNode(pPhyNode->pChildren, i);
+    ops[i] = createOperatorTree(pChildNode, pTaskInfo, pHandle, queryId, taskId, pTableGroupInfo);
+  }
 
+  SOperatorInfo* pOptr = NULL;
   if (QUERY_NODE_PHYSICAL_PLAN_PROJECT == type) {
     SProjectPhysiNode* pProjPhyNode = (SProjectPhysiNode*) pPhyNode;
     SExprInfo*   pExprInfo = createExprInfo(pProjPhyNode->pProjections, NULL, &num);
 
-    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
     SLimit limit = {.limit = pProjPhyNode->limit, .offset = pProjPhyNode->offset};
     SLimit slimit = {.limit = pProjPhyNode->slimit, .offset = pProjPhyNode->soffset};
-    return createProjectOperatorInfo(op, pExprInfo, num, pResBlock, &limit, &slimit, pTaskInfo);
+    pOptr = createProjectOperatorInfo(ops[0], pExprInfo, num, pResBlock, &limit, &slimit, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_AGG == type) {
     SAggPhysiNode* pAggNode = (SAggPhysiNode*)pPhyNode;
     SExprInfo*     pExprInfo = createExprInfo(pAggNode->pAggFuncs, pAggNode->pGroupKeys, &num);
-    SSDataBlock*   pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    SSDataBlock*   pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
 
     SExprInfo* pScalarExprInfo = NULL;
     int32_t numOfScalarExpr = 0;
@@ -6831,15 +6815,15 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
         pScalarExprInfo = createExprInfo(pAggNode->pExprs, NULL, &numOfScalarExpr);
       }
 
-      return createGroupOperatorInfo(op, pExprInfo, num, pResBlock, pColList, pAggNode->node.pConditions, pScalarExprInfo, numOfScalarExpr, pTaskInfo, NULL);
+      pOptr = createGroupOperatorInfo(ops[0], pExprInfo, num, pResBlock, pColList, pAggNode->node.pConditions, pScalarExprInfo, numOfScalarExpr, pTaskInfo, NULL);
     } else {
-      return createAggregateOperatorInfo(op, pExprInfo, num, pResBlock, pTaskInfo, pTableGroupInfo);
+      pOptr = createAggregateOperatorInfo(ops[0], pExprInfo, num, pResBlock, pTaskInfo, pTableGroupInfo);
     }
   } else if (QUERY_NODE_PHYSICAL_PLAN_INTERVAL == type) {
     SIntervalPhysiNode* pIntervalPhyNode = (SIntervalPhysiNode*)pPhyNode;
 
     SExprInfo*   pExprInfo = createExprInfo(pIntervalPhyNode->window.pFuncs, NULL, &num);
-    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
 
     SInterval interval = {
         .interval     = pIntervalPhyNode->interval,
@@ -6851,33 +6835,39 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
     };
 
     int32_t primaryTsSlotId = ((SColumnNode*) pIntervalPhyNode->window.pTspk)->slotId;
-    return createIntervalOperatorInfo(op, pExprInfo, num, pResBlock, &interval, primaryTsSlotId, pTableGroupInfo, pTaskInfo);
+    pOptr = createIntervalOperatorInfo(ops[0], pExprInfo, num, pResBlock, &interval, primaryTsSlotId, pTableGroupInfo, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_SORT == type) {
     SSortPhysiNode* pSortPhyNode = (SSortPhysiNode*)pPhyNode;
 
-    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
     SArray*      info = createSortInfo(pSortPhyNode->pSortKeys, pSortPhyNode->pTargets);
     SArray*      slotMap = createIndexMap(pSortPhyNode->pTargets);
-    return createSortOperatorInfo(op, pResBlock, info, slotMap, pTaskInfo);
+    pOptr = createSortOperatorInfo(ops[0], pResBlock, info, slotMap, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_SESSION_WINDOW == type) {
     SSessionWinodwPhysiNode* pSessionNode = (SSessionWinodwPhysiNode*)pPhyNode;
 
     SExprInfo*   pExprInfo = createExprInfo(pSessionNode->window.pFuncs, NULL, &num);
-    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-    return createSessionAggOperatorInfo(op, pExprInfo, num, pResBlock, pSessionNode->gap, pTaskInfo);
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
+    pOptr = createSessionAggOperatorInfo(ops[0], pExprInfo, num, pResBlock, pSessionNode->gap, pTaskInfo);
   } else if (QUERY_NODE_PHYSICAL_PLAN_PARTITION == type) {
     SPartitionPhysiNode* pPartNode = (SPartitionPhysiNode*) pPhyNode;
     SArray* pColList = extractPartitionColInfo(pPartNode->pPartitionKeys);
-    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
 
     SExprInfo* pExprInfo = createExprInfo(pPartNode->pTargets, NULL, &num);
-    return createPartitionOperatorInfo(op, pExprInfo, num, pResBlock, pColList, pTaskInfo, NULL);
-  } else if (QUERY_NODE_STATE_WINDOW == type) {
+    pOptr = createPartitionOperatorInfo(ops[0], pExprInfo, num, pResBlock, pColList, pTaskInfo, NULL);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_STATE_WINDOW == type) {
     SStateWinodwPhysiNode* pStateNode = (SStateWinodwPhysiNode*) pPhyNode;
 
     SExprInfo* pExprInfo = createExprInfo(pStateNode->window.pFuncs, NULL, &num);
-    SSDataBlock* pResBlock = createOutputBuf_rv1(pPhyNode->pOutputDataBlockDesc);
-    return createStatewindowOperatorInfo(op, pExprInfo, num, pResBlock, pTaskInfo);
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
+    pOptr = createStatewindowOperatorInfo(ops[0], pExprInfo, num, pResBlock, pTaskInfo);
+  } else if (QUERY_NODE_PHYSICAL_PLAN_JOIN == type) {
+    SJoinPhysiNode* pJoinNode = (SJoinPhysiNode*) pPhyNode;
+    SSDataBlock* pResBlock = createResDataBlock(pPhyNode->pOutputDataBlockDesc);
+
+    SExprInfo* pExprInfo = createExprInfo(pJoinNode->pTargets, NULL, &num);
+    pOptr = createJoinOperatorInfo(ops, size, pExprInfo, num, pResBlock, pJoinNode->pOnConditions, pTaskInfo);
   } else {
     ASSERT(0);
   } /*else if (pPhyNode->info.type == OP_MultiTableAggregate) {
@@ -6890,7 +6880,9 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
        return createMultiTableAggOperatorInfo(op, pPhyNode->pTargets, pTaskInfo, pTableGroupInfo);
      }
    }*/
-  return NULL;
+
+  taosMemoryFree(ops);
+  return pOptr;
 }
 
 static tsdbReaderT createDataReaderImpl(STableScanPhysiNode* pTableScanNode, STableGroupInfo* pGroupInfo,
@@ -7374,4 +7366,135 @@ int32_t getOperatorExplainExecInfo(SOperatorInfo *operatorInfo, SExplainExecInfo
   return TSDB_CODE_SUCCESS;
 }
 
+static SSDataBlock* doMergeJoin(struct SOperatorInfo* pOperator, bool* newgroup) {
+  SJoinOperatorInfo* pJoinInfo = pOperator->info;
+//  SOptrBasicInfo* pInfo = &pJoinInfo->binfo;
 
+  SSDataBlock* pRes = pJoinInfo->pRes;
+  blockDataCleanup(pRes);
+  blockDataEnsureCapacity(pRes, 4096);
+
+  int32_t nrows = 0;
+
+  while (1) {
+    bool prevVal = *newgroup;
+
+    if (pJoinInfo->pLeft == NULL || pJoinInfo->leftPos >= pJoinInfo->pLeft->info.rows) {
+      SOperatorInfo* ds1 = pOperator->pDownstream[0];
+      publishOperatorProfEvent(ds1, QUERY_PROF_BEFORE_OPERATOR_EXEC);
+      pJoinInfo->pLeft = ds1->getNextFn(ds1, newgroup);
+      publishOperatorProfEvent(ds1, QUERY_PROF_AFTER_OPERATOR_EXEC);
+
+      pJoinInfo->leftPos = 0;
+      if (pJoinInfo->pLeft == NULL) {
+        setTaskStatus(pOperator->pTaskInfo, TASK_COMPLETED);
+        break;
+      }
+    }
+
+    if (pJoinInfo->pRight == NULL || pJoinInfo->rightPos >= pJoinInfo->pRight->info.rows) {
+      SOperatorInfo* ds2 = pOperator->pDownstream[1];
+      publishOperatorProfEvent(ds2, QUERY_PROF_BEFORE_OPERATOR_EXEC);
+      pJoinInfo->pRight = ds2->getNextFn(ds2, newgroup);
+      publishOperatorProfEvent(ds2, QUERY_PROF_AFTER_OPERATOR_EXEC);
+
+      pJoinInfo->rightPos = 0;
+      if (pJoinInfo->pRight == NULL) {
+        setTaskStatus(pOperator->pTaskInfo, TASK_COMPLETED);
+        break;
+      }
+    }
+
+    SColumnInfoData* pLeftCol = taosArrayGet(pJoinInfo->pLeft->pDataBlock, pJoinInfo->leftCol.slotId);
+    char* pLeftVal  = colDataGetData(pLeftCol, pJoinInfo->leftPos);
+
+    SColumnInfoData* pRightCol = taosArrayGet(pJoinInfo->pRight->pDataBlock, pJoinInfo->rightCol.slotId);
+    char* pRightVal = colDataGetData(pRightCol, pJoinInfo->rightPos);
+
+    // only the timestamp match support for ordinary table
+      ASSERT(pLeftCol->info.type == TSDB_DATA_TYPE_TIMESTAMP);
+      if (*(int64_t*) pLeftVal == *(int64_t*) pRightVal) {
+        for(int32_t i = 0; i < pOperator->numOfOutput; ++i) {
+          SColumnInfoData* pDst = taosArrayGet(pRes->pDataBlock, i);
+
+          SExprInfo* pExprInfo = &pOperator->pExpr[i];
+
+          int32_t blockId = pExprInfo->base.pParam[0].pCol->dataBlockId;
+          int32_t slotId = pExprInfo->base.pParam[0].pCol->slotId;
+
+          SColumnInfoData* pSrc = NULL;
+          if (pJoinInfo->pLeft->info.blockId == blockId) {
+            pSrc = taosArrayGet(pJoinInfo->pLeft->pDataBlock, slotId);
+          } else {
+            pSrc = taosArrayGet(pJoinInfo->pRight->pDataBlock, slotId);
+          }
+
+          if (colDataIsNull_s(pSrc, pJoinInfo->leftPos)) {
+            colDataAppendNULL(pDst, nrows);
+          } else {
+            char* p = colDataGetData(pSrc, pJoinInfo->leftPos);
+            colDataAppend(pDst, nrows, p, false);
+          }
+        }
+
+        pJoinInfo->leftPos += 1;
+        pJoinInfo->rightPos += 1;
+
+        nrows += 1;
+      } else if (*(int64_t*) pLeftVal < *(int64_t*) pRightVal) {
+        pJoinInfo->leftPos += 1;
+
+        if (pJoinInfo->leftPos >= pJoinInfo->pLeft->info.rows) {
+          continue;
+        }
+      } else if (*(int64_t*) pLeftVal > *(int64_t*) pRightVal) {
+        pJoinInfo->rightPos += 1;
+        if (pJoinInfo->rightPos >= pJoinInfo->pRight->info.rows) {
+          continue;
+        }
+      }
+
+    // the pDataBlock are always the same one, no need to call this again
+    pRes->info.rows = nrows;
+    if (pRes->info.rows >= pOperator->resultInfo.threshold) {
+      break;
+    }
+  }
+
+  return (pRes->info.rows > 0) ? pRes : NULL;
+}
+
+SOperatorInfo* createJoinOperatorInfo(SOperatorInfo** pDownstream, int32_t numOfDownstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SNode* pOnCondition, SExecTaskInfo* pTaskInfo) {
+  SJoinOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(SJoinOperatorInfo));
+  SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo));
+  if (pOperator == NULL || pInfo == NULL) {
+    goto _error;
+  }
+
+  pOperator->resultInfo.capacity = 4096;
+  pOperator->resultInfo.threshold = 4096 * 0.75;
+
+//  initResultRowInf
+//  o(&pInfo->binfo.resultRowInfo, 8);
+  pInfo->pRes             = pResBlock;
+
+  pOperator->name         = "JoinOperator";
+  pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_JOIN;
+  pOperator->blockingOptr = true;
+  pOperator->status       = OP_NOT_OPENED;
+  pOperator->pExpr        = pExprInfo;
+  pOperator->numOfOutput  = numOfCols;
+  pOperator->info         = pInfo;
+  pOperator->pTaskInfo    = pTaskInfo;
+  pOperator->getNextFn    = doMergeJoin;
+  pOperator->closeFn      = destroyBasicOperatorInfo;
+
+  int32_t code = appendDownstream(pOperator, pDownstream, numOfDownstream);
+  return pOperator;
+
+  _error:
+  taosMemoryFree(pInfo);
+  taosMemoryFree(pOperator);
+  pTaskInfo->code = TSDB_CODE_OUT_OF_MEMORY;
+  return NULL;
+}
\ No newline at end of file
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 0286b6e6e9..3de9d9020e 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -64,16 +64,19 @@ static void setupQueryRangeForReverseScan(STableScanInfo* pTableScanInfo) {
 #endif
 }
 
-int32_t loadDataBlock(SExecTaskInfo* pTaskInfo, STableScanInfo* pTableScanInfo, SSDataBlock* pBlock, uint32_t* status) {
+int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanInfo* pTableScanInfo, SSDataBlock* pBlock, uint32_t* status) {
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+  STableScanInfo* pInfo = pOperator->info;
+
   STaskCostInfo* pCost = &pTaskInfo->cost;
 
   pCost->totalBlocks += 1;
+  pCost->loadBlocks  += 1;
+
   pCost->totalRows += pBlock->info.rows;
-
   pCost->totalCheckedRows += pBlock->info.rows;
-  pCost->loadBlocks += 1;
 
-  *status = BLK_DATA_ALL_NEEDED;
+  *status = pInfo->dataBlockLoadFlag;
 
   SArray* pCols = tsdbRetrieveDataBlock(pTableScanInfo->dataReader, NULL);
   if (pCols == NULL) {
@@ -138,15 +141,15 @@ static SSDataBlock* doTableScanImpl(SOperatorInfo* pOperator, bool* newgroup) {
     //    }
 
     // this function never returns error?
-    uint32_t status = BLK_DATA_ALL_NEEDED;
-    int32_t  code = loadDataBlock(pTaskInfo, pTableScanInfo, pBlock, &status);
+    uint32_t status = BLK_DATA_DATA_LOAD;
+    int32_t  code = loadDataBlock(pOperator, pTableScanInfo, pBlock, &status);
     //    int32_t  code = loadDataBlockOnDemand(pOperator->pRuntimeEnv, pTableScanInfo, pBlock, &status);
     if (code != TSDB_CODE_SUCCESS) {
       longjmp(pOperator->pTaskInfo->env, code);
     }
 
     // current block is ignored according to filter result by block statistics data, continue load the next block
-    if (status == BLK_DATA_DISCARD || pBlock->info.rows == 0) {
+    if (status == BLK_DATA_FILTEROUT || pBlock->info.rows == 0) {
       continue;
     }
 
@@ -217,7 +220,7 @@ static SSDataBlock* doTableScan(SOperatorInfo* pOperator, bool* newgroup) {
   return p;
 }
 
-SOperatorInfo* createTableScanOperatorInfo(void* pTsdbReadHandle, int32_t order, int32_t numOfOutput,
+SOperatorInfo* createTableScanOperatorInfo(void* pTsdbReadHandle, int32_t order, int32_t numOfOutput, int32_t dataLoadFlag,
                                            int32_t repeatTime, int32_t reverseTime, SArray* pColMatchInfo, SSDataBlock* pResBlock,
                                            SNode* pCondition, SExecTaskInfo* pTaskInfo) {
   assert(repeatTime > 0);
@@ -232,6 +235,7 @@ SOperatorInfo* createTableScanOperatorInfo(void* pTsdbReadHandle, int32_t order,
     return NULL;
   }
 
+  pInfo->dataBlockLoadFlag= dataLoadFlag;
   pInfo->pResBlock        = pResBlock;
   pInfo->pFilterNode      = pCondition;
   pInfo->dataReader       = pTsdbReadHandle;
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 9d434222ff..bba5145812 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -796,6 +796,26 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .sprocessFunc = timeDiffFunction,
     .finalizeFunc = NULL
   },
+  {
+    .name = "now",
+    .type = FUNCTION_TYPE_NOW,
+    .classification = FUNC_MGT_SCALAR_FUNC | FUNC_MGT_DATETIME_FUNC,
+    .translateFunc = translateTimePseudoColumn,
+    .getEnvFunc   = NULL,
+    .initFunc     = NULL,
+    .sprocessFunc = nowFunction,
+    .finalizeFunc = NULL
+  },
+  {
+    .name = "today",
+    .type = FUNCTION_TYPE_TODAY,
+    .classification = FUNC_MGT_SCALAR_FUNC | FUNC_MGT_DATETIME_FUNC,
+    .translateFunc = translateTimePseudoColumn,
+    .getEnvFunc   = NULL,
+    .initFunc     = NULL,
+    .sprocessFunc = todayFunction,
+    .finalizeFunc = NULL
+  },
   {
     .name = "_rowts",
     .type = FUNCTION_TYPE_ROWTS,
@@ -866,16 +886,6 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
     .sprocessFunc = winDurFunction,
     .finalizeFunc = NULL
   },
-  {
-    .name = "now",
-    .type = FUNCTION_TYPE_NOW,
-    .classification = FUNC_MGT_SCALAR_FUNC | FUNC_MGT_DATETIME_FUNC,
-    .translateFunc = translateTimePseudoColumn,
-    .getEnvFunc   = getTimePseudoFuncEnv,
-    .initFunc     = NULL,
-    .sprocessFunc = winDurFunction,
-    .finalizeFunc = NULL
-  },
   {
     .name = "to_json",
     .type = FUNCTION_TYPE_TO_JSON,
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 50c65439c0..71e8bcc842 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -58,9 +58,9 @@ void functionFinalize(SqlFunctionCtx *pCtx) {
 EFuncDataRequired countDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow) {
   SNode* pParam = nodesListGetNode(pFunc->pParameterList, 0);
   if (QUERY_NODE_COLUMN == nodeType(pParam) && PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pParam)->colId) {
-    return FUNC_DATA_REQUIRED_NO_NEEDED;
+    return FUNC_DATA_REQUIRED_NOT_LOAD;
   }
-  return FUNC_DATA_REQUIRED_STATIS_NEEDED;
+  return FUNC_DATA_REQUIRED_STATIS_LOAD;
 }
 
 bool getCountFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c
index 9bcbbb5d5a..9500064949 100644
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
@@ -78,10 +78,10 @@ int32_t fmGetFuncResultType(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
 
 EFuncDataRequired fmFuncDataRequired(SFunctionNode* pFunc, STimeWindow* pTimeWindow) {
   if (pFunc->funcId < 0 || pFunc->funcId >= funcMgtBuiltinsNum) {
-    return FUNC_DATA_REQUIRED_ALL_NEEDED;
+    return FUNC_DATA_REQUIRED_DATA_LOAD;
   }
   if (NULL == funcMgtBuiltins[pFunc->funcId].dataRequiredFunc) {
-    return FUNC_DATA_REQUIRED_ALL_NEEDED;
+    return FUNC_DATA_REQUIRED_DATA_LOAD;
   }
   return funcMgtBuiltins[pFunc->funcId].dataRequiredFunc(pFunc, pTimeWindow);
 }
diff --git a/source/libs/function/src/taggfunction.c b/source/libs/function/src/taggfunction.c
index 60566d00d8..e001ef4071 100644
--- a/source/libs/function/src/taggfunction.c
+++ b/source/libs/function/src/taggfunction.c
@@ -557,14 +557,14 @@ static void count_func_merge(SqlFunctionCtx *pCtx) {
  */
 int32_t countRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
   if (colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   } else {
-    return BLK_DATA_STATIS_NEEDED;
+    return BLK_DATA_SMA_LOAD;
   }
 }
 
 int32_t noDataRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
-  return BLK_DATA_NO_NEEDED;
+  return BLK_DATA_NOT_LOAD;
 }
 #define LIST_ADD_N_DOUBLE_FLOAT(x, ctx, p, t, numOfElem, tsdbType)              \
   do {                                                                \
@@ -743,76 +743,76 @@ static void sum_func_merge(SqlFunctionCtx *pCtx) {
 }
 
 static int32_t statisRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
-  return BLK_DATA_STATIS_NEEDED;
+  return BLK_DATA_SMA_LOAD;
 }
 
 static int32_t dataBlockRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
-  return BLK_DATA_ALL_NEEDED;
+  return BLK_DATA_DATA_LOAD;
 }
 
 // todo: if column in current data block are null, opt for this case
 static int32_t firstFuncRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
   if (pCtx->order == TSDB_ORDER_DESC) {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   }
   
   // no result for first query, data block is required
   if (GET_RES_INFO(pCtx) == NULL || GET_RES_INFO(pCtx)->numOfRes <= 0) {
-    return BLK_DATA_ALL_NEEDED;
+    return BLK_DATA_DATA_LOAD;
   } else {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   }
 }
 
 static int32_t lastFuncRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
   if (pCtx->order != pCtx->param[0].i) {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   }
   
   if (GET_RES_INFO(pCtx) == NULL || GET_RES_INFO(pCtx)->numOfRes <= 0) {
-    return BLK_DATA_ALL_NEEDED;
+    return BLK_DATA_DATA_LOAD;
   } else {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   }
 }
 
 static int32_t firstDistFuncRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
   if (pCtx->order == TSDB_ORDER_DESC) {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   }
 
   // not initialized yet, it is the first block, load it.
   if (pCtx->pOutput == NULL) {
-    return BLK_DATA_ALL_NEEDED;
+    return BLK_DATA_DATA_LOAD;
   }
 
   // the pCtx should be set to current Ctx and output buffer before call this function. Otherwise, pCtx->pOutput is
   // the previous windowRes output buffer, not current unloaded block. In this case, the following filter is invalid
   SFirstLastInfo *pInfo = (SFirstLastInfo*) (pCtx->pOutput + pCtx->inputBytes);
   if (pInfo->hasResult != DATA_SET_FLAG) {
-    return BLK_DATA_ALL_NEEDED;
+    return BLK_DATA_DATA_LOAD;
   } else {  // data in current block is not earlier than current result
-    return (pInfo->ts <= w->skey) ? BLK_DATA_NO_NEEDED : BLK_DATA_ALL_NEEDED;
+    return (pInfo->ts <= w->skey) ? BLK_DATA_NOT_LOAD : BLK_DATA_DATA_LOAD;
   }
 }
 
 static int32_t lastDistFuncRequired(SqlFunctionCtx *pCtx, STimeWindow* w, int32_t colId) {
   if (pCtx->order != pCtx->param[0].i) {
-    return BLK_DATA_NO_NEEDED;
+    return BLK_DATA_NOT_LOAD;
   }
 
   // not initialized yet, it is the first block, load it.
   if (pCtx->pOutput == NULL) {
-    return BLK_DATA_ALL_NEEDED;
+    return BLK_DATA_DATA_LOAD;
   }
 
   // the pCtx should be set to current Ctx and output buffer before call this function. Otherwise, pCtx->pOutput is
   // the previous windowRes output buffer, not current unloaded block. In this case, the following filter is invalid
   SFirstLastInfo *pInfo = (SFirstLastInfo*) (pCtx->pOutput + pCtx->inputBytes);
   if (pInfo->hasResult != DATA_SET_FLAG) {
-    return BLK_DATA_ALL_NEEDED;
+    return BLK_DATA_DATA_LOAD;
   } else {
-    return (pInfo->ts > w->ekey) ? BLK_DATA_NO_NEEDED : BLK_DATA_ALL_NEEDED;
+    return (pInfo->ts > w->ekey) ? BLK_DATA_NOT_LOAD : BLK_DATA_DATA_LOAD;
   }
 }
 
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index d4457a056e..758f9d5d6f 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -1226,7 +1226,7 @@ void valueNodeToVariant(const SValueNode* pNode, SVariant* pVal) {
     case TSDB_DATA_TYPE_NCHAR:
     case TSDB_DATA_TYPE_VARCHAR:
     case TSDB_DATA_TYPE_VARBINARY:
-      pVal->pz = pNode->datum.p;
+      pVal->pz = pNode->datum.p + VARSTR_HEADER_SIZE;
       break;
     case TSDB_DATA_TYPE_JSON:
     case TSDB_DATA_TYPE_DECIMAL:
diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 160bc8e075..ebd07669c3 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -93,6 +93,7 @@ SNode* createOperatorNode(SAstCreateContext* pCxt, EOperatorType type, SNode* pL
 SNode* createBetweenAnd(SAstCreateContext* pCxt, SNode* pExpr, SNode* pLeft, SNode* pRight);
 SNode* createNotBetweenAnd(SAstCreateContext* pCxt, SNode* pExpr, SNode* pLeft, SNode* pRight);
 SNode* createFunctionNode(SAstCreateContext* pCxt, const SToken* pFuncName, SNodeList* pParameterList);
+SNode* createFunctionNodeNoParam(SAstCreateContext* pCxt, const SToken* pFuncName);
 SNode* createCastFunctionNode(SAstCreateContext* pCxt, SNode* pExpr, SDataType dt);
 SNode* createNodeListNode(SAstCreateContext* pCxt, SNodeList* pList);
 SNode* createNodeListNodeEx(SAstCreateContext* pCxt, SNode* p1, SNode* p2);
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index e1d5597e3b..91ac6ce2d2 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -592,8 +592,6 @@ expression_list(A) ::= expression_list(B) NK_COMMA expression(C).
 column_reference(A) ::= column_name(B).                                           { A = createRawExprNode(pCxt, &B, createColumnNode(pCxt, NULL, &B)); }
 column_reference(A) ::= table_name(B) NK_DOT column_name(C).                      { A = createRawExprNodeExt(pCxt, &B, &C, createColumnNode(pCxt, &B, &C)); }
 
-pseudo_column(A) ::= NOW(B).                                                      { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
-pseudo_column(A) ::= TODAY(B).                                                    { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
 pseudo_column(A) ::= ROWTS(B).                                                    { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
 pseudo_column(A) ::= TBNAME(B).                                                   { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
 pseudo_column(A) ::= QSTARTTS(B).                                                 { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
@@ -605,6 +603,12 @@ pseudo_column(A) ::= WDURATION(B).
 function_expression(A) ::= function_name(B) NK_LP expression_list(C) NK_RP(D).    { A = createRawExprNodeExt(pCxt, &B, &D, createFunctionNode(pCxt, &B, C)); }
 function_expression(A) ::= star_func(B) NK_LP star_func_para_list(C) NK_RP(D).    { A = createRawExprNodeExt(pCxt, &B, &D, createFunctionNode(pCxt, &B, C)); }
 function_expression(A) ::= CAST(B) NK_LP expression(C) AS type_name(D) NK_RP(E).  { A = createRawExprNodeExt(pCxt, &B, &E, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, C), D)); }
+function_expression(A) ::= noarg_func(B) NK_LP NK_RP(C).                          { A = createRawExprNodeExt(pCxt, &B, &C, createFunctionNode(pCxt, &B, NULL)); }
+
+%type noarg_func                                                                  { SToken }
+%destructor noarg_func                                                            { }
+noarg_func(A) ::= NOW(B).                                                         { A = B; }
+noarg_func(A) ::= TODAY(B).                                                       { A = B; }
 
 %type star_func                                                                   { SToken }
 %destructor star_func                                                             { }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index e229cfc751..f2b8b73a87 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -367,6 +367,39 @@ SNode* createFunctionNode(SAstCreateContext* pCxt, const SToken* pFuncName, SNod
   return (SNode*)func;
 }
 
+SNode* createFunctionNodeNoParam(SAstCreateContext* pCxt, const SToken* pFuncName) {
+  SFunctionNode* func = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION);
+  CHECK_OUT_OF_MEM(func);
+  char buf[64] = {0};
+
+  int32_t dataType;
+  switch (pFuncName->type) {
+    case TK_NOW: {
+      int64_t ts = taosGetTimestamp(TSDB_TIME_PRECISION_MILLI);
+      snprintf(buf, sizeof(buf), "%"PRId64, ts);
+      dataType = TSDB_DATA_TYPE_BIGINT;
+      break;
+    }
+    case TK_TODAY: {
+      int64_t ts = taosGetTimestampToday(TSDB_TIME_PRECISION_MILLI);
+      snprintf(buf, sizeof(buf), "%"PRId64, ts);
+      dataType = TSDB_DATA_TYPE_BIGINT;
+      break;
+    }
+    //case TK_TIMEZONE: {
+    //  strncpy(buf, tsTimezoneStr, strlen(tsTimezoneStr));
+    //  dataType = TSDB_DATA_TYPE_BINARY;
+    //  break;
+    //}
+  }
+  SToken token = {.type = pFuncName->type, .n = strlen(buf), .z = buf};
+
+  SNodeList *pParameterList = createNodeList(pCxt, createValueNode(pCxt, dataType, &token));
+  strncpy(func->functionName, pFuncName->z, pFuncName->n);
+  func->pParameterList = pParameterList;
+  return (SNode*)func;
+}
+
 SNode* createCastFunctionNode(SAstCreateContext* pCxt, SNode* pExpr, SDataType dt) {
   SFunctionNode* func = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION);
   CHECK_OUT_OF_MEM(func);
diff --git a/source/libs/parser/src/parInsert.c b/source/libs/parser/src/parInsert.c
index 9e53eee5c8..acc597d61b 100644
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
@@ -223,11 +223,15 @@ static int32_t createSName(SName* pName, SToken* pTableName, SParseContext* pPar
   return code;
 }
 
-static int32_t getTableMeta(SInsertParseContext* pCxt, SToken* pTname) {
+static int32_t getTableMetaImpl(SInsertParseContext* pCxt, SToken* pTname, bool isStb) {
   SParseContext* pBasicCtx = pCxt->pComCxt;
   SName name = {0};
   createSName(&name, pTname, pBasicCtx, &pCxt->msg);  
-  CHECK_CODE(catalogGetTableMeta(pBasicCtx->pCatalog, pBasicCtx->pTransporter, &pBasicCtx->mgmtEpSet, &name, &pCxt->pTableMeta));
+  if (isStb) {
+    CHECK_CODE(catalogGetSTableMeta(pBasicCtx->pCatalog, pBasicCtx->pTransporter, &pBasicCtx->mgmtEpSet, &name, &pCxt->pTableMeta));
+  } else {
+    CHECK_CODE(catalogGetTableMeta(pBasicCtx->pCatalog, pBasicCtx->pTransporter, &pBasicCtx->mgmtEpSet, &name, &pCxt->pTableMeta));
+  }
   SVgroupInfo vg;
   CHECK_CODE(catalogGetTableHashVgroup(pBasicCtx->pCatalog, pBasicCtx->pTransporter, &pBasicCtx->mgmtEpSet, &name, &vg));
   CHECK_CODE(taosHashPut(pCxt->pVgroupsHashObj, (const char*)&vg.vgId, sizeof(vg.vgId), (char*)&vg, sizeof(vg)));
@@ -235,6 +239,15 @@ static int32_t getTableMeta(SInsertParseContext* pCxt, SToken* pTname) {
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t getTableMeta(SInsertParseContext* pCxt, SToken* pTname) {
+  return getTableMetaImpl(pCxt, pTname, false);
+}
+
+static int32_t getSTableMeta(SInsertParseContext* pCxt, SToken* pTname) {
+  return getTableMetaImpl(pCxt, pTname, true);
+}
+
+
 static int32_t findCol(SToken* pColname, int32_t start, int32_t end, SSchema* pSchema) {
   while (start < end) {
     if (strlen(pSchema[start].name) == pColname->n && strncmp(pColname->z, pSchema[start].name, pColname->n) == 0) {
@@ -818,7 +831,7 @@ static int32_t parseUsingClause(SInsertParseContext* pCxt, SToken* pTbnameToken)
   SToken sToken;
   // pSql -> stb_name [(tag1_name, ...)] TAGS (tag1_value, ...)
   NEXT_TOKEN(pCxt->pSql, sToken);
-  CHECK_CODE(getTableMeta(pCxt, &sToken));
+  CHECK_CODE(getSTableMeta(pCxt, &sToken));
   if (TSDB_SUPER_TABLE != pCxt->pTableMeta->tableType) {
     return buildInvalidOperationMsg(&pCxt->msg, "create table only from super table is allowed");
   }
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index f1f2f591a8..2d1535e439 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -2319,6 +2319,10 @@ static int32_t extractSelectResultSchema(const SSelectStmt* pSelect, int32_t* nu
   return TSDB_CODE_SUCCESS;
 }
 
+static int8_t extractResultTsPrecision(const SSelectStmt* pSelect) {
+  return pSelect->precision;
+}
+
 static int32_t extractExplainResultSchema(int32_t* numOfCols, SSchema** pSchema) {
   *numOfCols = 1;
   *pSchema = taosMemoryCalloc((*numOfCols), sizeof(SSchema));
@@ -2340,19 +2344,19 @@ static int32_t extractDescribeResultSchema(int32_t* numOfCols, SSchema** pSchema
 
   (*pSchema)[0].type = TSDB_DATA_TYPE_BINARY;
   (*pSchema)[0].bytes = DESCRIBE_RESULT_FIELD_LEN;
-  strcpy((*pSchema)[0].name, "Field");
+  strcpy((*pSchema)[0].name, "field");
 
   (*pSchema)[1].type = TSDB_DATA_TYPE_BINARY;
   (*pSchema)[1].bytes = DESCRIBE_RESULT_TYPE_LEN;
-  strcpy((*pSchema)[1].name, "Type");
+  strcpy((*pSchema)[1].name, "type");
 
   (*pSchema)[2].type = TSDB_DATA_TYPE_INT;
   (*pSchema)[2].bytes = tDataTypes[TSDB_DATA_TYPE_INT].bytes;
-  strcpy((*pSchema)[2].name, "Length");
+  strcpy((*pSchema)[2].name, "length");
 
   (*pSchema)[3].type = TSDB_DATA_TYPE_BINARY;
   (*pSchema)[3].bytes = DESCRIBE_RESULT_NOTE_LEN;
-  strcpy((*pSchema)[3].name, "Note");
+  strcpy((*pSchema)[3].name, "note");
 
   return TSDB_CODE_SUCCESS;
 }
@@ -3033,6 +3037,8 @@ static int32_t setQuery(STranslateContext* pCxt, SQuery* pQuery) {
     if (TSDB_CODE_SUCCESS != extractResultSchema(pQuery->pRoot, &pQuery->numOfResCols, &pQuery->pResSchema)) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
+
+    pQuery->precision = extractResultTsPrecision((SSelectStmt*) pQuery->pRoot);
   }
 
   if (NULL != pCxt->pDbs) {
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index 587d17fd8e..80aad1dc66 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 332
+#define YYNOCODE 333
 #define YYACTIONTYPE unsigned short int
 #define ParseTOKENTYPE  SToken 
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  SNodeList* yy64;
-  int32_t yy116;
-  SNode* yy192;
-  ENullOrder yy225;
-  bool yy273;
-  SAlterOption yy277;
-  SToken yy353;
-  EFillMode yy358;
-  EJoinType yy372;
-  EOperatorType yy412;
-  EOrder yy530;
-  SDataType yy536;
+  SAlterOption yy11;
+  int32_t yy100;
+  EJoinType yy162;
+  EOperatorType yy218;
+  EOrder yy326;
+  SDataType yy430;
+  SNode* yy452;
+  SNodeList* yy478;
+  SToken yy479;
+  EFillMode yy540;
+  ENullOrder yy595;
+  bool yy659;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -132,17 +132,17 @@ typedef union {
 #define ParseCTX_PARAM
 #define ParseCTX_FETCH
 #define ParseCTX_STORE
-#define YYNSTATE             566
-#define YYNRULE              431
+#define YYNSTATE             568
+#define YYNRULE              432
 #define YYNTOKEN             219
-#define YY_MAX_SHIFT         565
-#define YY_MIN_SHIFTREDUCE   839
-#define YY_MAX_SHIFTREDUCE   1269
-#define YY_ERROR_ACTION      1270
-#define YY_ACCEPT_ACTION     1271
-#define YY_NO_ACTION         1272
-#define YY_MIN_REDUCE        1273
-#define YY_MAX_REDUCE        1703
+#define YY_MAX_SHIFT         567
+#define YY_MIN_SHIFTREDUCE   842
+#define YY_MAX_SHIFTREDUCE   1273
+#define YY_ERROR_ACTION      1274
+#define YY_ACCEPT_ACTION     1275
+#define YY_NO_ACTION         1276
+#define YY_MIN_REDUCE        1277
+#define YY_MAX_REDUCE        1708
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -209,541 +209,545 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (1905)
+#define YY_ACTTAB_COUNT (1929)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   268, 1543,  285, 1573, 1557,  317,   26,  203,   53,  123,
- /*    10 */   464, 1285,   33,   31,  480, 1539, 1546, 1543,  288, 1543,
- /*    20 */   277,   99, 1092,   77,  479, 1476, 1478,   69, 1573, 1388,
- /*    30 */   380, 1539, 1545, 1539, 1545,  444, 1442,  409, 1090, 1393,
- /*    40 */  1117,  105,  267, 1682,  434,  463, 1370, 1440, 1385, 1529,
- /*    50 */    12,   33,   31, 1212, 1557,  121,  136, 1098,  359,  277,
- /*    60 */  1680, 1092,  441, 1396,  143, 1113, 1682,   73, 1558,  466,
- /*    70 */  1560, 1561,  462,  479,    1, 1682, 1621, 1090, 1573, 1681,
- /*    80 */   270, 1617,  131, 1680,  323,  464,  927,  104,  136,   12,
- /*    90 */    51, 1473, 1680,   50,  199,  463, 1098,  562,  145, 1529,
- /*   100 */   424, 1648,   33,   31,  445,  929,  445,  106,  281, 1091,
- /*   110 */   277,  511, 1092,    1,  248, 1115,  121,   72, 1558,  466,
- /*   120 */  1560, 1561,  462,  102, 1395,  480, 1621,   36, 1090,  467,
- /*   130 */   249, 1617,  280,  514,  321, 1485,  562,  196, 1628,  440,
- /*   140 */    12,  439, 1682,  876, 1682,  875, 1093, 1098, 1091, 1384,
- /*   150 */  1393, 1176,  510,  509,  508,  136,  507,  136,  198, 1680,
- /*   160 */  1557, 1680,  124,  877,    1,  516, 1351, 1096, 1097, 1181,
- /*   170 */  1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149,  459,
- /*   180 */  1153, 1154, 1155, 1156, 1573, 1093,  395,  562,  389,   55,
- /*   190 */   266,  464,  394,  174, 1529,  101,  137,  390,  388, 1091,
- /*   200 */   391,  463, 1296,   23,  435, 1529, 1096, 1097,  425, 1141,
- /*   210 */  1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149,  459, 1153,
- /*   220 */  1154, 1155, 1156,  246, 1558,  466, 1560, 1561,  462,   33,
- /*   230 */    31,   34,   32,   30,   29,   28, 1093,  277,   53, 1092,
- /*   240 */   287,  137,   34,   32,   30,   29,   28, 1529,  121,  137,
- /*   250 */    34,   32,   30,   29,   28, 1090, 1395, 1096, 1097, 1389,
- /*   260 */  1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149,  459,
- /*   270 */  1153, 1154, 1155, 1156, 1098,   33,   31, 1157,  479,  480,
- /*   280 */   250, 1371,  316,  277,  315, 1092, 1322,  308,  322,   87,
- /*   290 */  1550,    7,   86,   85,   84,   83,   82,   81,   80,   79,
- /*   300 */    78, 1090, 1548,  480, 1393, 1128,  310,   34,   32,   30,
- /*   310 */    29,   28,   77, 1174,  562, 1369,  431,  100, 1442,  387,
- /*   320 */  1098,  383,  558,  557,  282,  137, 1091, 1236, 1393, 1440,
- /*   330 */   359,  260,   36,  137,   30,   29,   28,    7,  538,  537,
- /*   340 */   536,  535,  292,  386,  534,  533,  532,  107,  527,  526,
- /*   350 */   525,  524,  523,  522,  521,  520,  114,  100,    9,    8,
- /*   360 */   562,  383, 1175, 1093,  516,  428, 1234, 1235, 1237, 1238,
- /*   370 */  1226,  225, 1091,  261, 1423,  259,  258, 1266,  382,  345,
- /*   380 */  1180,  436,  432,  386, 1096, 1097, 1116, 1141, 1142, 1143,
- /*   390 */  1144, 1145, 1146, 1147, 1148, 1149,  459, 1153, 1154, 1155,
- /*   400 */  1156, 1271,   33,   31,  441, 1325,  385,  384, 1295, 1093,
- /*   410 */   277,  875, 1092,  137,   25,  275, 1169, 1170, 1171, 1172,
- /*   420 */  1173, 1177, 1178, 1179, 1118,  147,  146,  378, 1090,  104,
- /*   430 */  1096, 1097, 1188, 1141, 1142, 1143, 1144, 1145, 1146, 1147,
- /*   440 */  1148, 1149,  459, 1153, 1154, 1155, 1156, 1098,   33,   31,
- /*   450 */   284,  283,  480, 1529,  293, 1265,  277,  395, 1092,  389,
- /*   460 */  1106,  330,  506,  394,    7,  102,  101, 1312,  390,  388,
- /*   470 */    62,  391,  448,  480, 1090, 1442, 1099, 1393,  443,  132,
- /*   480 */  1628, 1629,  331, 1633,  530,  127, 1477,  562,  311,  396,
- /*   490 */    22, 1386, 1682, 1098, 1294, 1098, 1434,  480, 1393, 1091,
- /*   500 */    34,   32,   30,   29,   28,  136,  358,  393,  392, 1680,
- /*   510 */     1,  965,  503,  502,  501,  969,  500,  971,  972,  499,
- /*   520 */   974,  496, 1393,  980,  493,  982,  983,  490,  487,  247,
- /*   530 */  1293, 1113,  290,  562,  480,  481, 1093,  449,  338, 1529,
- /*   540 */   121,  350,  184, 1390,  519, 1091, 1365, 1102, 1395, 1292,
- /*   550 */   351,   34,   32,   30,   29,   28, 1291, 1096, 1097, 1393,
- /*   560 */  1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149,  459,
- /*   570 */  1153, 1154, 1155, 1156,  452, 1529, 1290,  480,  513,  512,
- /*   580 */  1289, 1442, 1093,    6, 1107,   24, 1510,  531,  529,  250,
- /*   590 */  1640, 1207, 1441, 1114, 1529,   34,   32,   30,   29,   28,
- /*   600 */   518, 1529, 1393, 1096, 1097, 1110, 1141, 1142, 1143, 1144,
- /*   610 */  1145, 1146, 1147, 1148, 1149,  459, 1153, 1154, 1155, 1156,
- /*   620 */  1557, 1529, 1174,  349, 1288, 1529,  344,  343,  342,  341,
- /*   630 */   340,  416,  337,  336,  335,  334,  333,  329,  328,  327,
- /*   640 */   326,  325,  324, 1635, 1573,  122, 1287, 1211,  480,  480,
- /*   650 */   231,  444,   34,   32,   30,   29,   28,  477,  478, 1635,
- /*   660 */   112,  463,  229, 1518,  420, 1529, 1632, 1635,  480, 1529,
- /*   670 */   480, 1175, 1368, 1393, 1393,  148, 1273,  217,  417,  291,
- /*   680 */   450,  447, 1631,   73, 1558,  466, 1560, 1561,  462, 1180,
- /*   690 */  1630, 1529, 1621, 1393,  456, 1393,  270, 1617,  131,  300,
- /*   700 */    96,   95,   94,   93,   92,   91,   90,   89,   88, 1382,
- /*   710 */    34,   32,   30,   29,   28, 1128, 1284, 1649, 1274,  453,
- /*   720 */  1283,  407,  418,   25,  275, 1169, 1170, 1171, 1172, 1173,
- /*   730 */  1177, 1178, 1179,  106,  405, 1207, 1307,  511,   71,   87,
- /*   740 */  1557, 1282,   86,   85,   84,   83,   82,   81,   80,   79,
- /*   750 */    78, 1442, 1281, 1280, 1305, 1279, 1278,  289,  398,  514,
- /*   760 */  1682, 1529, 1440,  467, 1573, 1529,   49,   48,  320, 1486,
- /*   770 */   142,  464, 1378,  136, 1277,  314,  401, 1680,  510,  509,
- /*   780 */   508,  463,  507, 1276,   47, 1529, 1529,  256, 1233,  306,
- /*   790 */  1557,  302,  298,  139, 1092, 1380, 1219, 1529, 1529,  441,
- /*   800 */  1529, 1529, 1115,   73, 1558,  466, 1560, 1561,  462, 1162,
- /*   810 */  1090, 1166, 1621,  901, 1573, 1115,  270, 1617, 1694, 1529,
- /*   820 */  1352,  464,  165,  137,  104,  163, 1101, 1655, 1529, 1098,
- /*   830 */   167,  463,  902,  166,  169, 1529,  120,  168,  171, 1557,
- /*   840 */  1210,  170, 1078, 1079, 1376,  187,  177,    9,    8,  189,
- /*   850 */  1268, 1269,  458,   73, 1558,  466, 1560, 1561,  462,  505,
- /*   860 */   102,   35, 1621, 1573, 1100, 1182,  270, 1617, 1694,  562,
- /*   870 */   464, 1286,  200,  565,  133, 1628, 1629, 1678, 1633,   35,
- /*   880 */   463, 1091,   35, 1150, 1529,  429, 1053,  221, 1557,  206,
- /*   890 */    98,  109, 1435,  208,  410,  472,  554, 1104,  550,  546,
- /*   900 */   542,  220,   73, 1558,  466, 1560, 1561,  462,  193,  110,
- /*   910 */   112, 1621, 1573,  214,  958,  270, 1617, 1694, 1093,  464,
- /*   920 */    47,  441,  377, 1651,  953, 1574, 1639,   70,  442,  463,
- /*   930 */   215,  202,  400, 1529,    2, 1103, 1113,  485,  445, 1096,
- /*   940 */  1097,  986,  295,  299,  255, 1062,  104,  408,  927, 1557,
- /*   950 */   222,  238, 1558,  466, 1560, 1561,  462,  257,  110,  111,
- /*   960 */   476,  173,  990,  997,  403,  332, 1475,  112,  110,  397,
- /*   970 */   144,  996,  113, 1573,   68,  172, 1682,  339,  346,  347,
- /*   980 */   464,  348,  102,  352,   64, 1122,  353, 1557,  423,  136,
- /*   990 */   463,  180,  149, 1680, 1529,  354,  134, 1628, 1629, 1121,
- /*  1000 */  1633,   45,  355,  152,   44, 1120, 1070,  357,  176,  155,
- /*  1010 */   356, 1573,   74, 1558,  466, 1560, 1561,  462,  464,   52,
- /*  1020 */   360, 1621, 1119,  158,  379, 1620, 1617,  381,  463, 1383,
- /*  1030 */   162, 1379, 1529,  164,   97, 1098,  265, 1557, 1514,  411,
- /*  1040 */   115,  223,  116, 1381, 1377,  117, 1557,  419,  118,  175,
- /*  1050 */    74, 1558,  466, 1560, 1561,  462,  412,  179,  421, 1621,
- /*  1060 */   182, 1573, 1118,  455, 1617,  430,  415, 1662,  461, 1661,
- /*  1070 */  1573,  422,  470,    5,  438, 1652,  427,  464,  463,  426,
- /*  1080 */  1642,  185, 1529,  192,  188,  160,  269,  463,  130,    4,
- /*  1090 */   433, 1529,  129, 1557,  376,  103,  372,  368,  364,  159,
- /*  1100 */   245, 1558,  466, 1560, 1561,  462,  460,  457, 1593,  125,
- /*  1110 */  1558,  466, 1560, 1561,  462, 1207, 1117, 1573, 1636,   37,
- /*  1120 */   271,  454,  195,  194,  464,   54,  451,   16,  157, 1602,
- /*  1130 */   473, 1484,  468,   63,  463, 1697, 1483,  469, 1529,  279,
- /*  1140 */  1679,  474,  201,  210,  212,  475,  224, 1394,   61, 1557,
- /*  1150 */   483, 1366,  446, 1695,  226,  561,   74, 1558,  466, 1560,
- /*  1160 */  1561,  462,  219,   43,  232, 1621,  228,  230, 1523,  233,
- /*  1170 */  1618,  128, 1522, 1573,  294, 1519,  296, 1557,  297, 1086,
- /*  1180 */   464, 1087,  140,  301, 1517,  156,  303,  151,  305,  153,
- /*  1190 */   463,  304, 1516,  307, 1529, 1515,  309, 1500,  141,  312,
- /*  1200 */   313, 1573, 1065, 1064, 1494, 1493,  150,  318,  464,  319,
- /*  1210 */  1492, 1491,  241, 1558,  466, 1560, 1561,  462,  463, 1036,
- /*  1220 */  1468, 1467, 1529, 1466, 1465, 1464, 1463, 1462, 1461, 1557,
- /*  1230 */  1460, 1459, 1458, 1457, 1456, 1557,  108, 1452, 1451, 1450,
- /*  1240 */   125, 1558,  466, 1560, 1561,  462, 1455, 1454, 1453,  437,
- /*  1250 */  1449, 1448, 1447, 1573, 1446, 1445, 1444, 1038, 1443, 1573,
- /*  1260 */   464, 1324, 1508, 1502, 1490, 1481,  461, 1372,  894, 1323,
- /*  1270 */   463, 1321,  154, 1319, 1529, 1317,  463,  274,  361,  362,
- /*  1280 */  1529, 1315, 1304,  365, 1696,  366, 1557,  363, 1303, 1300,
- /*  1290 */  1374,  369,  246, 1558,  466, 1560, 1561,  462,  245, 1558,
- /*  1300 */   466, 1560, 1561,  462,  370,   76, 1594, 1002,  374,  367,
- /*  1310 */  1573, 1373,  373,  371, 1557, 1005,  926,  464,  925,  375,
- /*  1320 */  1313,  924,  161,  262,  923,  920, 1308,  463,  528,  919,
- /*  1330 */   530, 1529,  263,  399,  276, 1306,  264,  402, 1573,  404,
- /*  1340 */  1298,  406,   75, 1507,   46,  464, 1299, 1072, 1501,  246,
- /*  1350 */  1558,  466, 1560, 1561,  462,  463,  413,  414,  119, 1529,
- /*  1360 */  1489, 1557,  278, 1488, 1480,   13,   56,  181,    3,   35,
- /*  1370 */   186,   41, 1557,   14,  191,   21,  126,  246, 1558,  466,
- /*  1380 */  1560, 1561,  462, 1232,   38, 1573,  190,   20,   58,   11,
- /*  1390 */  1225, 1548,  464, 1204, 1254,  178, 1573,   57,   39, 1253,
- /*  1400 */  1203,   15,  463,  464, 1259,  272, 1529,  197, 1258, 1257,
- /*  1410 */  1557,  273,  183,  463,  135,    8,   17, 1529,  138, 1152,
- /*  1420 */  1136,   27,   40,   10,  234, 1558,  466, 1560, 1561,  462,
- /*  1430 */  1151,   18, 1479,   19, 1573,  240, 1558,  466, 1560, 1561,
- /*  1440 */   462,  464,  471,  205,  204,  211,   64, 1230,  207,  209,
- /*  1450 */    59,  463,   60, 1108,   42, 1529,  484,  987, 1557,  286,
- /*  1460 */   486,  488,  482, 1167, 1557, 1547,  213,  216,  984,  489,
- /*  1470 */   964,  981,  491,  242, 1558,  466, 1560, 1561,  462,  492,
- /*  1480 */   494,  975, 1573,  495,  497,  465,  973,  979, 1573,  464,
- /*  1490 */   498,  978,  999,  977,  504,  464,   65,  995,  976,  463,
- /*  1500 */   998,   66,   67, 1529,  992,  463,  892,  515,  933, 1529,
- /*  1510 */   517,  218,  908,  915,  914, 1557,  913,  912,  911,  910,
- /*  1520 */   930,  235, 1558,  466, 1560, 1561,  462,  243, 1558,  466,
- /*  1530 */  1560, 1561,  462,  909,  928,  905,  904,  903,  900, 1573,
- /*  1540 */   899,  898,  897, 1320,  539,  540,  464, 1318,  541,  543,
- /*  1550 */   544,  545, 1316,  547,  548,  549,  463,  551,  552,  553,
- /*  1560 */  1529, 1557, 1314, 1302,  555,  556, 1301, 1297,  559,  560,
- /*  1570 */   564, 1094, 1557,  227,  563, 1272, 1272, 1272,  236, 1558,
- /*  1580 */   466, 1560, 1561,  462, 1272, 1573, 1272, 1272, 1272, 1272,
- /*  1590 */  1272, 1272,  464, 1272, 1272, 1272, 1573, 1272, 1272, 1272,
- /*  1600 */  1272, 1272,  463,  464, 1272, 1272, 1529, 1272, 1272, 1272,
- /*  1610 */  1272, 1272, 1272,  463, 1272, 1272, 1272, 1529, 1272, 1557,
- /*  1620 */  1272, 1272, 1272, 1272,  244, 1558,  466, 1560, 1561,  462,
- /*  1630 */  1272, 1272, 1272, 1272, 1272,  237, 1558,  466, 1560, 1561,
- /*  1640 */   462, 1272, 1272, 1573, 1272, 1272, 1272, 1557, 1272, 1272,
- /*  1650 */   464, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272,
- /*  1660 */   463, 1272, 1272, 1272, 1529, 1272, 1272, 1272, 1272, 1272,
- /*  1670 */  1272, 1573, 1272, 1272, 1272, 1272, 1272, 1272,  464, 1272,
- /*  1680 */  1272, 1272, 1569, 1558,  466, 1560, 1561,  462,  463, 1272,
- /*  1690 */  1272, 1272, 1529, 1272, 1272, 1272, 1557, 1272, 1272, 1272,
- /*  1700 */  1272, 1272, 1272, 1272, 1272, 1557, 1272, 1272, 1272, 1272,
- /*  1710 */  1568, 1558,  466, 1560, 1561,  462, 1272, 1272, 1272, 1272,
- /*  1720 */  1573, 1272, 1272, 1272, 1272, 1272, 1272,  464, 1272, 1573,
- /*  1730 */  1272, 1272, 1272, 1272, 1272, 1272,  464,  463, 1272, 1272,
- /*  1740 */  1272, 1529, 1272, 1272, 1272, 1272,  463, 1272, 1272, 1272,
- /*  1750 */  1529, 1557, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1567,
- /*  1760 */  1558,  466, 1560, 1561,  462, 1272, 1272, 1272,  253, 1558,
- /*  1770 */   466, 1560, 1561,  462, 1272, 1573, 1272, 1272, 1272, 1557,
- /*  1780 */  1272, 1272,  464, 1272, 1272, 1272, 1272, 1272, 1272, 1272,
- /*  1790 */  1272, 1272,  463, 1272, 1272, 1272, 1529, 1272, 1272, 1272,
- /*  1800 */  1272, 1272, 1272, 1573, 1272, 1272, 1272, 1272, 1557, 1272,
- /*  1810 */   464, 1272, 1272, 1272,  252, 1558,  466, 1560, 1561,  462,
- /*  1820 */   463, 1272, 1272, 1272, 1529, 1272, 1272, 1272, 1272, 1272,
- /*  1830 */  1272, 1272, 1573, 1272, 1272, 1272, 1557, 1272, 1272,  464,
- /*  1840 */  1272, 1272,  254, 1558,  466, 1560, 1561,  462, 1272,  463,
- /*  1850 */  1272, 1272, 1272, 1529, 1272, 1272, 1272, 1272, 1272, 1272,
- /*  1860 */  1573, 1272, 1272, 1272, 1272, 1272, 1272,  464, 1272, 1272,
- /*  1870 */  1272,  251, 1558,  466, 1560, 1561,  462,  463, 1272, 1272,
- /*  1880 */  1272, 1529, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272,
- /*  1890 */  1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272,  239,
- /*  1900 */  1558,  466, 1560, 1561,  462,
+ /*     0 */  1388, 1687, 1386, 1561,  268,   26,  203,  323,  482, 1275,
+ /*    10 */   469, 1547,   33,   31, 1686, 1561, 1490,   77, 1685, 1300,
+ /*    20 */   277, 1547, 1095,  285,  380, 1543, 1550, 1577,   34,   32,
+ /*    30 */    30,   29,   28, 1397,  466, 1543, 1549,  248, 1093, 1577,
+ /*    40 */  1547,  481,   53,  417,  465, 1533,  466,  441, 1533, 1116,
+ /*    50 */    12,   33,   31, 1216, 1543, 1549,  465, 1101,  481,  277,
+ /*    60 */  1533, 1095,  293, 1393, 1533,  445,  125, 1562,  468, 1564,
+ /*    70 */  1565,  464,  104,  459,    1,  482,  359, 1093,   72, 1562,
+ /*    80 */   468, 1564, 1565,  464,  321,  459, 1375,  418, 1626,   12,
+ /*    90 */   482, 1230,  249, 1622,  124,   36, 1101,  564, 1355,   77,
+ /*   100 */  1397, 1687,   33,   31, 1687,  123,  387, 1289,  102, 1094,
+ /*   110 */   277, 1701, 1095,    1,  136, 1397, 1373,  136, 1685, 1118,
+ /*   120 */    22, 1685,  443,  132, 1633, 1634, 1687, 1638, 1093, 1278,
+ /*   130 */    34,   32,   30,   29,   28,  359,  564, 1329, 1446,  136,
+ /*   140 */    12,  560,  559, 1685,  267, 1577, 1096, 1101, 1094, 1444,
+ /*   150 */    87,  127,  466,   86,   85,   84,   83,   82,   81,   80,
+ /*   160 */    79,   78, 1438,  469,    1,  518,  280, 1099, 1100, 1489,
+ /*   170 */  1144, 1145, 1146, 1147, 1148, 1149, 1150,  461, 1155, 1156,
+ /*   180 */  1157, 1158, 1159, 1160,   53, 1096,  434,  564,  431,  395,
+ /*   190 */   316,  389,  315, 1299,  481,  394,  137,   99,  101, 1094,
+ /*   200 */   390,  388, 1298,  391, 1640, 1392, 1099, 1100,  878, 1144,
+ /*   210 */  1145, 1146, 1147, 1148, 1149, 1150,  461, 1155, 1156, 1157,
+ /*   220 */  1158, 1159, 1160,  100,  378,  137,  441,  383, 1637,   33,
+ /*   230 */    31,   34,   32,   30,   29,   28, 1096,  277, 1533, 1095,
+ /*   240 */   930,  137,   34,   32,   30,   29,   28, 1533,   36,  386,
+ /*   250 */   137,  104, 1522,  436,  432, 1093,  441, 1099, 1100,  932,
+ /*   260 */  1144, 1145, 1146, 1147, 1148, 1149, 1150,  461, 1155, 1156,
+ /*   270 */  1157, 1158, 1159, 1160, 1101,   33,   31, 1161,   55,  266,
+ /*   280 */   250,  104,  174,  277,  435, 1095, 1326,  102,  300,   87,
+ /*   290 */  1297,    7,   86,   85,   84,   83,   82,   81,   80,   79,
+ /*   300 */    78, 1093,  133, 1633, 1634, 1131, 1638,  281,    9,    8,
+ /*   310 */   395, 1120,  389, 1178,  564,  121,  394,  102, 1119,  101,
+ /*   320 */  1101,  390,  388, 1399,  391,  317, 1094, 1240,   30,   29,
+ /*   330 */    28,  260,  134, 1633, 1634, 1533, 1638,    7,  540,  539,
+ /*   340 */   538,  537,  292, 1117,  536,  535,  534,  107,  529,  528,
+ /*   350 */   527,  526,  525,  524,  523,  522,  114,  100,  385,  384,
+ /*   360 */   564,  383, 1179, 1096, 1687,  428, 1238, 1239, 1241, 1242,
+ /*   370 */   137,  225, 1094,  261, 1427,  259,  258,  136,  382, 1296,
+ /*   380 */  1184, 1685, 1192,  386, 1099, 1100,  448, 1144, 1145, 1146,
+ /*   390 */  1147, 1148, 1149, 1150,  461, 1155, 1156, 1157, 1158, 1159,
+ /*   400 */  1160,  449,   33,   31,   34,   32,   30,   29,   28, 1096,
+ /*   410 */   277,   69, 1095,  137,   25,  275, 1173, 1174, 1175, 1176,
+ /*   420 */  1177, 1181, 1182, 1183, 1533,  105,  143,  409, 1093,  198,
+ /*   430 */  1099, 1100, 1389, 1144, 1145, 1146, 1147, 1148, 1149, 1150,
+ /*   440 */   461, 1155, 1156, 1157, 1158, 1159, 1160, 1101,   33,   31,
+ /*   450 */   284,  283,   51, 1215,  288,   50,  277, 1446, 1095,   24,
+ /*   460 */  1109, 1480, 1482,  282,    7,  400, 1687, 1446, 1444,   34,
+ /*   470 */    32,   30,   29,   28, 1093,  482, 1102, 1295, 1481,  136,
+ /*   480 */   408, 1640,  287, 1685,  322,  532,  879,  564,  878,  311,
+ /*   490 */   121,  393,  392, 1101,  173, 1101,  345,  403, 1399, 1094,
+ /*   500 */  1397, 1294,  397,    6, 1293, 1636,  880,  521,  172, 1369,
+ /*   510 */     1,  968,  505,  504,  503,  972,  502,  974,  975,  501,
+ /*   520 */   977,  498, 1533,  983,  495,  985,  986,  492,  489,  247,
+ /*   530 */   120, 1116,  290,  564,   45,  483, 1096,   44,  338,  518,
+ /*   540 */   121,  350,  147,  146,  450, 1094, 1533, 1105, 1399, 1533,
+ /*   550 */   351,   34,   32,   30,   29,   28, 1292, 1099, 1100, 1640,
+ /*   560 */  1144, 1145, 1146, 1147, 1148, 1149, 1150,  461, 1155, 1156,
+ /*   570 */  1157, 1158, 1159, 1160,   34,   32,   30,   29,   28, 1180,
+ /*   580 */  1291,  508, 1096, 1635, 1110,  515,  514,  533,  531,  250,
+ /*   590 */    34,   32,   30,   29,   28,  447, 1121, 1185,    9,    8,
+ /*   600 */    62, 1533, 1288, 1099, 1100, 1113, 1144, 1145, 1146, 1147,
+ /*   610 */  1148, 1149, 1150,  461, 1155, 1156, 1157, 1158, 1159, 1160,
+ /*   620 */  1561, 1390, 1178,  349,  520, 1533,  344,  343,  342,  341,
+ /*   630 */   340,   23,  337,  336,  335,  334,  333,  329,  328,  327,
+ /*   640 */   326,  325,  324,  482, 1577,  482, 1214, 1533,  482,  567,
+ /*   650 */   121,  444,  330, 1131,  331, 1211, 1446,  358, 1400, 1645,
+ /*   660 */  1211,  465,  289,  221, 1287, 1533,   98, 1444, 1397,  482,
+ /*   670 */  1397, 1179,  556, 1397,  552,  548,  544,  220, 1394, 1081,
+ /*   680 */  1082, 1446,  416,   73, 1562,  468, 1564, 1565,  464, 1184,
+ /*   690 */   459,  482, 1445, 1626, 1397,  482, 1290,  270, 1622,  131,
+ /*   700 */   291, 1270, 1286,   70, 1514, 1285,  215,  452, 1477, 1533,
+ /*   710 */  1561,  199,  482,  482,  184,  145, 1397,  424, 1653, 1382,
+ /*   720 */  1397,  479,  480,   25,  275, 1173, 1174, 1175, 1176, 1177,
+ /*   730 */  1181, 1182, 1183, 1223, 1577, 1316,  478, 1397, 1397, 1118,
+ /*   740 */   482,  444,  165,  308,  456,  163, 1284, 1533, 1283,  217,
+ /*   750 */  1533,  465, 1282, 1281, 1166, 1533, 1280,  396,  407,  200,
+ /*   760 */  1118, 1384,  310,  167,  423, 1397,  166,  180, 1561,  169,
+ /*   770 */  1380,  405,  168,   73, 1562,  468, 1564, 1565,  464, 1269,
+ /*   780 */   459,  429, 1073, 1626,  176, 1311,   68,  270, 1622,  131,
+ /*   790 */  1277, 1533, 1577, 1533, 1272, 1273,   64, 1533, 1533,  466,
+ /*   800 */   171, 1533, 1309,  170,  177,  460,  507,  398, 1654,  465,
+ /*   810 */  1356, 1439,  410, 1533,   96,   95,   94,   93,   92,   91,
+ /*   820 */    90,   89,   88,  112,  401,   47, 1561,  420,  377, 1237,
+ /*   830 */  1554,   73, 1562,  468, 1564, 1565,  464,  193,  459,  187,
+ /*   840 */  1656, 1626, 1552,  189,   35,  270, 1622, 1699, 1186,  442,
+ /*   850 */  1577,   35,  453,  122,  904, 1151, 1660,  466,  231,   35,
+ /*   860 */   206, 1170, 1104, 1056,  208, 1578,  160,  465, 1103,  130,
+ /*   870 */   229, 1533,  109,  905,  202,  376,  474,  372,  368,  364,
+ /*   880 */   159,  110,    2,  148, 1561,  214, 1116,  295,  299,   73,
+ /*   890 */  1562,  468, 1564, 1565,  464,  255,  459,  112,  930, 1626,
+ /*   900 */   257,  961, 1065,  270, 1622, 1699,   54,   47, 1577,  157,
+ /*   910 */   222,  956,  332,  487, 1683,  466,  110,  989,  111,  112,
+ /*   920 */   993, 1479, 1000,  999,  110,  465,  144,  339,  113, 1533,
+ /*   930 */   347,  346,  348, 1107,  352,  353, 1125,  149,  354, 1106,
+ /*   940 */  1561, 1124,  355,  152, 1123,  356,   71,   73, 1562,  468,
+ /*   950 */  1564, 1565,  464, 1561,  459,  155,   52, 1626,  360,  357,
+ /*   960 */  1122,  270, 1622, 1699, 1577,  379,  156,  381,  151,  158,
+ /*   970 */   153,  466, 1644, 1387,   49,   48,  320, 1577,  142,  162,
+ /*   980 */  1383,  465,  164,  314,  463, 1533,  265,  150,  115,  116,
+ /*   990 */   445, 1561, 1385, 1381,  465,  256,  117,  306, 1533,  302,
+ /*  1000 */   298,  139,   97,  238, 1562,  468, 1564, 1565,  464,  441,
+ /*  1010 */   459,  118, 1101,  175,  411, 1577,  245, 1562,  468, 1564,
+ /*  1020 */  1565,  464,  466,  459, 1518, 1599,  223,  412,  421, 1687,
+ /*  1030 */   415,  137,  465, 1121,  104,  419, 1533, 1657,  179,  182,
+ /*  1040 */   422,  430,  136,  472, 1667,  185, 1685,  188,  438, 1561,
+ /*  1050 */   427,  269,    5,  445,   74, 1562,  468, 1564, 1565,  464,
+ /*  1060 */   433,  459,  426, 1647, 1626, 1666,    4, 1211, 1625, 1622,
+ /*  1070 */   102,  103,  192, 1577,  129,  194, 1120, 1641,   37, 1561,
+ /*  1080 */   466,   16,  271,  451,  195,  196, 1633,  440,  454,  439,
+ /*  1090 */   465, 1488, 1687, 1684, 1533, 1702,  201, 1607,  470,  471,
+ /*  1100 */   224,  475, 1487, 1577,  210,  136,  279,  212,  476, 1685,
+ /*  1110 */   463,   61,   74, 1562,  468, 1564, 1565,  464,  477,  459,
+ /*  1120 */   465,   63, 1626,  485, 1533, 1370,  455, 1622, 1561, 1398,
+ /*  1130 */   226,  219,  563,   43,  128,  232,  233, 1561,  228, 1095,
+ /*  1140 */   230, 1527,  245, 1562,  468, 1564, 1565,  464,  462,  459,
+ /*  1150 */   457, 1598, 1577, 1526,  294, 1093, 1523,  296,  297,  466,
+ /*  1160 */  1089, 1577, 1090,  140,  301, 1521,  303,  304,  466,  465,
+ /*  1170 */   307,  305, 1520, 1533, 1101, 1561, 1519,  309,  465, 1504,
+ /*  1180 */   141,  312, 1533,  313, 1068, 1067, 1498, 1561, 1497,  318,
+ /*  1190 */   319,  125, 1562,  468, 1564, 1565,  464, 1496,  459, 1577,
+ /*  1200 */    74, 1562,  468, 1564, 1565,  464,  466,  459, 1495, 1472,
+ /*  1210 */  1626, 1577, 1039, 1471,  564, 1623,  465, 1470,  466, 1469,
+ /*  1220 */  1533,  108, 1456,  425, 1468, 1467, 1094, 1466,  465, 1465,
+ /*  1230 */  1464, 1463, 1533, 1462, 1461,  446, 1700, 1460,  246, 1562,
+ /*  1240 */   468, 1564, 1565,  464, 1459,  459, 1561, 1458, 1457, 1455,
+ /*  1250 */   241, 1562,  468, 1564, 1565,  464, 1454,  459, 1453, 1561,
+ /*  1260 */  1452, 1451, 1041, 1096, 1450, 1449, 1448, 1447, 1328, 1512,
+ /*  1270 */  1577,  154, 1376, 1327,  897, 1325,  361,  466, 1506, 1494,
+ /*  1280 */  1485,  362,  363, 1577, 1099, 1100, 1323,  465,  437,  365,
+ /*  1290 */   466, 1533, 1321,  366,  276,  367,  371,  369,  370, 1319,
+ /*  1300 */   465,  373, 1308, 1307, 1533, 1304,  374,  274, 1378,  246,
+ /*  1310 */  1562,  468, 1564, 1565,  464,   76,  459, 1561, 1005,  375,
+ /*  1320 */  1008, 1377,  246, 1562,  468, 1564, 1565,  464,  929,  459,
+ /*  1330 */  1317,  161,  928, 1561,  262,  927,  926, 1312,  923,  263,
+ /*  1340 */  1310, 1577,  922, 1303,  264, 1561,  399,  402,  466,  404,
+ /*  1350 */  1302,  406,  530,   75,  532, 1511,   46, 1577,  465, 1505,
+ /*  1360 */   413, 1075, 1533,  119,  466,  278, 1493, 1492, 1484, 1577,
+ /*  1370 */   186,  178,   38,  414,  465,  181,  466,    3, 1533, 1374,
+ /*  1380 */   246, 1562,  468, 1564, 1565,  464,  465,  459,   56,   35,
+ /*  1390 */  1533,   13, 1561,   40, 1236,   41,  234, 1562,  468, 1564,
+ /*  1400 */  1565,  464,  126,  459,   14, 1561, 1229,  183,  240, 1562,
+ /*  1410 */   468, 1564, 1565,  464, 1208,  459, 1577,  191,  190,   20,
+ /*  1420 */  1552,   57,   21,  466,   39,   15,   11, 1207,  197, 1577,
+ /*  1430 */    58, 1263, 1258,  465,  135, 1257,  466, 1533, 1372,  272,
+ /*  1440 */   106, 1262, 1261, 1561,  513,  273,  465,    8,   17, 1154,
+ /*  1450 */  1533, 1171,  458, 1139,   27,  242, 1562,  468, 1564, 1565,
+ /*  1460 */   464, 1153,  459, 1152,  205,   10,  516, 1577,  235, 1562,
+ /*  1470 */   468, 1564, 1565,  464,  466,  459,  138, 1234,  204,   18,
+ /*  1480 */   467, 1483,   19,  207,  465,  512,  511,  510, 1533,  509,
+ /*  1490 */   209,   59,  211, 1561,  213,   60,  473,   64, 1551,  106,
+ /*  1500 */   216, 1111,   42,  513,  484,  990,  243, 1562,  468, 1564,
+ /*  1510 */  1565,  464,  486,  459,  286,  488,  490, 1577,  987,  984,
+ /*  1520 */   491,  493,  494, 1561,  466,  516,  978,  496,  497,  499,
+ /*  1530 */   976,  500,  982,  967,  465,  981,  980,  506, 1533,  979,
+ /*  1540 */    65, 1002,   66,   67,  512,  511,  510, 1577,  509,  995,
+ /*  1550 */   998, 1001,  895,  936,  466,  517,  236, 1562,  468, 1564,
+ /*  1560 */  1565,  464,  519,  459,  465,  911,  218,  918, 1533,  917,
+ /*  1570 */   916, 1561,  915,  914,  913,  912,  933,  931,  908,  907,
+ /*  1580 */  1561,  543,  906,  903,  902,  901,  244, 1562,  468, 1564,
+ /*  1590 */  1565,  464,  900,  459, 1324, 1577,  541,  542, 1322,  546,
+ /*  1600 */   545, 1320,  466,  547, 1577,  549,  550,  551, 1318,  553,
+ /*  1610 */   554,  466,  465, 1306,  557,  555, 1533,  558, 1305, 1301,
+ /*  1620 */   562,  465,  561,  566, 1097, 1533,  227,  565, 1561, 1276,
+ /*  1630 */  1276, 1276, 1276, 1276,  237, 1562,  468, 1564, 1565,  464,
+ /*  1640 */  1276,  459, 1276, 1573, 1562,  468, 1564, 1565,  464, 1276,
+ /*  1650 */   459, 1276, 1577, 1276, 1276, 1276, 1561, 1276, 1276,  466,
+ /*  1660 */  1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276,  465,
+ /*  1670 */  1276, 1276, 1276, 1533, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1680 */  1577, 1276, 1276, 1276, 1276, 1276, 1276,  466, 1276, 1276,
+ /*  1690 */  1276, 1572, 1562,  468, 1564, 1565,  464,  465,  459, 1276,
+ /*  1700 */  1276, 1533, 1276, 1276, 1276, 1276, 1276, 1561, 1276, 1276,
+ /*  1710 */  1276, 1276, 1276, 1276, 1276, 1276, 1561, 1276, 1276, 1571,
+ /*  1720 */  1562,  468, 1564, 1565,  464, 1276,  459, 1276, 1276, 1276,
+ /*  1730 */  1276, 1577, 1276, 1276, 1276, 1276, 1276, 1276,  466, 1276,
+ /*  1740 */  1577, 1276, 1276, 1276, 1276, 1276, 1276,  466,  465, 1276,
+ /*  1750 */  1276, 1276, 1533, 1276, 1276, 1276, 1276,  465, 1276, 1276,
+ /*  1760 */  1276, 1533, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1770 */   253, 1562,  468, 1564, 1565,  464, 1276,  459, 1276,  252,
+ /*  1780 */  1562,  468, 1564, 1565,  464, 1276,  459, 1561, 1276, 1276,
+ /*  1790 */  1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1800 */  1276, 1276, 1276, 1561, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1810 */  1276, 1577, 1276, 1276, 1276, 1276, 1276, 1276,  466, 1276,
+ /*  1820 */  1276, 1276, 1276, 1276, 1276, 1276, 1276, 1577,  465, 1276,
+ /*  1830 */  1276, 1276, 1533, 1276,  466, 1276, 1276, 1276, 1276, 1276,
+ /*  1840 */  1276, 1276, 1276, 1276,  465, 1276, 1276, 1276, 1533, 1276,
+ /*  1850 */   254, 1562,  468, 1564, 1565,  464, 1276,  459, 1561, 1276,
+ /*  1860 */  1276, 1276, 1276, 1276, 1276, 1276,  251, 1562,  468, 1564,
+ /*  1870 */  1565,  464, 1276,  459, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1880 */  1276, 1276, 1577, 1276, 1276, 1276, 1276, 1276, 1276,  466,
+ /*  1890 */  1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276,  465,
+ /*  1900 */  1276, 1276, 1276, 1533, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1910 */  1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276,
+ /*  1920 */  1276,  239, 1562,  468, 1564, 1565,  464, 1276,  459,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */   250,  267,  250,  246,  222,  272,  295,  296,  230,  221,
- /*    10 */   253,  223,   12,   13,  228,  281,  282,  267,  255,  267,
- /*    20 */    20,  243,   22,  237,   20,  262,  263,  227,  246,  251,
- /*    30 */   244,  281,  282,  281,  282,  253,  246,  272,   38,  253,
- /*    40 */    20,  241,  252,  310,  287,  263,    0,  257,  248,  267,
- /*    50 */    50,   12,   13,   14,  222,  246,  323,   57,   49,   20,
- /*    60 */   327,   22,  228,  254,   47,   20,  310,  285,  286,  287,
- /*    70 */   288,  289,  290,   20,   74,  310,  294,   38,  246,  323,
- /*    80 */   298,  299,  300,  327,  228,  253,   38,  253,  323,   50,
- /*    90 */    73,  253,  327,   76,  312,  263,   57,   97,  260,  267,
- /*   100 */   318,  319,   12,   13,  272,   57,  272,   61,  238,  109,
- /*   110 */    20,   65,   22,   74,  258,   20,  246,  285,  286,  287,
- /*   120 */   288,  289,  290,  289,  254,  228,  294,   74,   38,  263,
- /*   130 */   298,  299,  266,   87,  237,  269,   97,  303,  304,  305,
- /*   140 */    50,  307,  310,   20,  310,   22,  146,   57,  109,  222,
- /*   150 */   253,  132,  106,  107,  108,  323,  110,  323,  138,  327,
- /*   160 */   222,  327,  231,   40,   74,   49,  235,  167,  168,  150,
+ /*     0 */   222,  311,  247,  222,  250,  296,  297,  228,  228,  219,
+ /*    10 */   263,  267,   12,   13,  324,  222,  269,  237,  328,  222,
+ /*    20 */    20,  267,   22,  250,  244,  281,  282,  246,   12,   13,
+ /*    30 */    14,   15,   16,  253,  253,  281,  282,  258,   38,  246,
+ /*    40 */   267,   20,  230,  228,  263,  267,  253,  228,  267,   20,
+ /*    50 */    50,   12,   13,   14,  281,  282,  263,   57,   20,   20,
+ /*    60 */   267,   22,  272,  251,  267,  272,  285,  286,  287,  288,
+ /*    70 */   289,  290,  253,  292,   74,  228,   49,   38,  285,  286,
+ /*    80 */   287,  288,  289,  290,  237,  292,    0,  272,  295,   50,
+ /*    90 */   228,   75,  299,  300,  231,   74,   57,   97,  235,  237,
+ /*   100 */   253,  311,   12,   13,  311,  221,  244,  223,  289,  109,
+ /*   110 */    20,  330,   22,   74,  324,  253,    0,  324,  328,   20,
+ /*   120 */     2,  328,  303,  304,  305,  306,  311,  308,   38,    0,
+ /*   130 */    12,   13,   14,   15,   16,   49,   97,    0,  246,  324,
+ /*   140 */    50,  225,  226,  328,  252,  246,  146,   57,  109,  257,
+ /*   150 */    21,  245,  253,   24,   25,   26,   27,   28,   29,   30,
+ /*   160 */    31,   32,  256,  263,   74,   49,  266,  167,  168,  269,
  /*   170 */   170,  171,  172,  173,  174,  175,  176,  177,  178,  179,
- /*   180 */   180,  181,  182,  183,  246,  146,   52,   97,   54,  155,
- /*   190 */   156,  253,   58,  159,  267,   61,  196,   63,   64,  109,
- /*   200 */    66,  263,  222,  184,   20,  267,  167,  168,  270,  170,
+ /*   180 */   180,  181,  182,  183,  230,  146,  287,   97,  136,   52,
+ /*   190 */   145,   54,  147,  222,   20,   58,  196,  243,   61,  109,
+ /*   200 */    63,   64,  222,   66,  283,  251,  167,  168,   22,  170,
  /*   210 */   171,  172,  173,  174,  175,  176,  177,  178,  179,  180,
- /*   220 */   181,  182,  183,  285,  286,  287,  288,  289,  290,   12,
- /*   230 */    13,   12,   13,   14,   15,   16,  146,   20,  230,   22,
- /*   240 */   238,  196,   12,   13,   14,   15,   16,  267,  246,  196,
- /*   250 */    12,   13,   14,   15,   16,   38,  254,  167,  168,  251,
+ /*   220 */   181,  182,  183,   61,   38,  196,  228,   65,  307,   12,
+ /*   230 */    13,   12,   13,   14,   15,   16,  146,   20,  267,   22,
+ /*   240 */    38,  196,   12,   13,   14,   15,   16,  267,   74,   87,
+ /*   250 */   196,  253,    0,  201,  202,   38,  228,  167,  168,   57,
  /*   260 */   170,  171,  172,  173,  174,  175,  176,  177,  178,  179,
- /*   270 */   180,  181,  182,  183,   57,   12,   13,   14,   20,  228,
- /*   280 */    50,    0,  145,   20,  147,   22,    0,  142,  237,   21,
- /*   290 */    74,   74,   24,   25,   26,   27,   28,   29,   30,   31,
- /*   300 */    32,   38,   86,  228,  253,   75,  161,   12,   13,   14,
- /*   310 */    15,   16,  237,   83,   97,    0,  136,   61,  246,  244,
- /*   320 */    57,   65,  225,  226,  252,  196,  109,  167,  253,  257,
- /*   330 */    49,   35,   74,  196,   14,   15,   16,   74,   52,   53,
- /*   340 */    54,   55,   56,   87,   58,   59,   60,   61,   62,   63,
- /*   350 */    64,   65,   66,   67,   68,   69,   70,   61,    1,    2,
- /*   360 */    97,   65,  132,  146,   49,  205,  206,  207,  208,  209,
- /*   370 */    75,  239,  109,   77,  242,   79,   80,  139,   82,   67,
- /*   380 */   150,  201,  202,   87,  167,  168,   20,  170,  171,  172,
+ /*   270 */   180,  181,  182,  183,   57,   12,   13,   14,  155,  156,
+ /*   280 */    50,  253,  159,   20,   20,   22,    0,  289,   36,   21,
+ /*   290 */   222,   74,   24,   25,   26,   27,   28,   29,   30,   31,
+ /*   300 */    32,   38,  304,  305,  306,   75,  308,  238,    1,    2,
+ /*   310 */    52,   20,   54,   83,   97,  246,   58,  289,   20,   61,
+ /*   320 */    57,   63,   64,  254,   66,  272,  109,  167,   14,   15,
+ /*   330 */    16,   35,  304,  305,  306,  267,  308,   74,   52,   53,
+ /*   340 */    54,   55,   56,   20,   58,   59,   60,   61,   62,   63,
+ /*   350 */    64,   65,   66,   67,   68,   69,   70,   61,  232,  233,
+ /*   360 */    97,   65,  132,  146,  311,  205,  206,  207,  208,  209,
+ /*   370 */   196,  239,  109,   77,  242,   79,   80,  324,   82,  222,
+ /*   380 */   150,  328,   75,   87,  167,  168,    3,  170,  171,  172,
  /*   390 */   173,  174,  175,  176,  177,  178,  179,  180,  181,  182,
- /*   400 */   183,  219,   12,   13,  228,    0,  232,  233,  222,  146,
- /*   410 */    20,   22,   22,  196,  184,  185,  186,  187,  188,  189,
- /*   420 */   190,  191,  192,  193,   20,  113,  114,   38,   38,  253,
- /*   430 */   167,  168,   75,  170,  171,  172,  173,  174,  175,  176,
+ /*   400 */   183,   71,   12,   13,   12,   13,   14,   15,   16,  146,
+ /*   410 */    20,  227,   22,  196,  184,  185,  186,  187,  188,  189,
+ /*   420 */   190,  191,  192,  193,  267,  241,   47,  272,   38,  138,
+ /*   430 */   167,  168,  248,  170,  171,  172,  173,  174,  175,  176,
  /*   440 */   177,  178,  179,  180,  181,  182,  183,   57,   12,   13,
- /*   450 */    12,   13,  228,  267,  272,  217,   20,   52,   22,   54,
- /*   460 */    22,  237,   85,   58,   74,  289,   61,    0,   63,   64,
- /*   470 */   227,   66,    3,  228,   38,  246,   38,  253,  302,  303,
- /*   480 */   304,  305,  237,  307,   71,  245,  257,   97,   75,   22,
- /*   490 */     2,  248,  310,   57,  222,   57,  256,  228,  253,  109,
- /*   500 */    12,   13,   14,   15,   16,  323,  237,  232,  233,  327,
+ /*   450 */    12,   13,   73,    4,  255,   76,   20,  246,   22,    2,
+ /*   460 */    22,  262,  263,  252,   74,    4,  311,  246,  257,   12,
+ /*   470 */    13,   14,   15,   16,   38,  228,   38,  222,  257,  324,
+ /*   480 */    19,  283,  238,  328,  237,   71,   20,   97,   22,   75,
+ /*   490 */   246,  232,  233,   57,   33,   57,   67,   36,  254,  109,
+ /*   500 */   253,  222,   41,   43,  222,  307,   40,  234,   47,  236,
  /*   510 */    74,   88,   89,   90,   91,   92,   93,   94,   95,   96,
- /*   520 */    97,   98,  253,  100,  101,  102,  103,  104,  105,   18,
- /*   530 */   222,   20,  238,   97,  228,   97,  146,   71,   27,  267,
- /*   540 */   246,   30,  138,  237,  234,  109,  236,  109,  254,  222,
- /*   550 */    39,   12,   13,   14,   15,   16,  222,  167,  168,  253,
+ /*   520 */    97,   98,  267,  100,  101,  102,  103,  104,  105,   18,
+ /*   530 */   138,   20,  238,   97,   73,   97,  146,   76,   27,   49,
+ /*   540 */   246,   30,  113,  114,  214,  109,  267,  109,  254,  267,
+ /*   550 */    39,   12,   13,   14,   15,   16,  222,  167,  168,  283,
  /*   560 */   170,  171,  172,  173,  174,  175,  176,  177,  178,  179,
- /*   570 */   180,  181,  182,  183,   71,  267,  222,  228,  232,  233,
- /*   580 */   222,  246,  146,   43,  146,    2,  237,  232,  233,   50,
- /*   590 */   194,  195,  257,   20,  267,   12,   13,   14,   15,   16,
- /*   600 */    57,  267,  253,  167,  168,  167,  170,  171,  172,  173,
+ /*   570 */   180,  181,  182,  183,   12,   13,   14,   15,   16,  132,
+ /*   580 */   222,   85,  146,  307,  146,  232,  233,  232,  233,   50,
+ /*   590 */    12,   13,   14,   15,   16,  212,   20,  150,    1,    2,
+ /*   600 */   227,  267,  222,  167,  168,  167,  170,  171,  172,  173,
  /*   610 */   174,  175,  176,  177,  178,  179,  180,  181,  182,  183,
- /*   620 */   222,  267,   83,  112,  222,  267,  115,  116,  117,  118,
- /*   630 */   119,  275,  121,  122,  123,  124,  125,  126,  127,  128,
- /*   640 */   129,  130,  131,  283,  246,   18,  222,    4,  228,  228,
- /*   650 */    23,  253,   12,   13,   14,   15,   16,  237,  237,  283,
- /*   660 */    71,  263,   35,    0,   75,  267,  306,  283,  228,  267,
- /*   670 */   228,  132,    0,  253,  253,   48,    0,  237,  228,  237,
- /*   680 */   214,  212,  306,  285,  286,  287,  288,  289,  290,  150,
- /*   690 */   306,  267,  294,  253,   50,  253,  298,  299,  300,   36,
- /*   700 */    24,   25,   26,   27,   28,   29,   30,   31,   32,  247,
- /*   710 */    12,   13,   14,   15,   16,   75,  222,  319,    0,  216,
- /*   720 */   222,   21,  272,  184,  185,  186,  187,  188,  189,  190,
- /*   730 */   191,  192,  193,   61,   34,  195,    0,   65,  111,   21,
- /*   740 */   222,  222,   24,   25,   26,   27,   28,   29,   30,   31,
- /*   750 */    32,  246,  222,  222,    0,  222,  222,  252,   22,   87,
- /*   760 */   310,  267,  257,  263,  246,  267,  139,  140,  141,  269,
- /*   770 */   143,  253,  247,  323,  222,  148,   22,  327,  106,  107,
- /*   780 */   108,  263,  110,  222,   71,  267,  267,  160,   75,  162,
- /*   790 */   222,  164,  165,  166,   22,  247,   14,  267,  267,  228,
- /*   800 */   267,  267,   20,  285,  286,  287,  288,  289,  290,   14,
- /*   810 */    38,  167,  294,   38,  246,   20,  298,  299,  300,  267,
- /*   820 */   235,  253,   78,  196,  253,   81,   38,  309,  267,   57,
- /*   830 */    78,  263,   57,   81,   78,  267,  138,   81,   78,  222,
- /*   840 */   197,   81,  157,  158,  247,   71,  247,    1,    2,   75,
- /*   850 */   181,  182,  247,  285,  286,  287,  288,  289,  290,  247,
- /*   860 */   289,   71,  294,  246,   38,   75,  298,  299,  300,   97,
- /*   870 */   253,  223,  330,   19,  303,  304,  305,  309,  307,   71,
- /*   880 */   263,  109,   71,   75,  267,  321,   75,   33,  222,   71,
- /*   890 */    36,   71,  256,   75,  279,   75,   42,  109,   44,   45,
- /*   900 */    46,   47,  285,  286,  287,  288,  289,  290,  315,   71,
- /*   910 */    71,  294,  246,   75,   75,  298,  299,  300,  146,  253,
- /*   920 */    71,  228,  225,  284,   75,  246,  309,   73,  308,  263,
- /*   930 */    76,  324,    4,  267,  311,  109,   20,   71,  272,  167,
- /*   940 */   168,   75,  228,   36,  280,  144,  253,   19,   38,  222,
- /*   950 */   273,  285,  286,  287,  288,  289,  290,  232,   71,   71,
- /*   960 */   106,   33,   75,   75,   36,  228,  228,   71,   71,   41,
- /*   970 */   120,   75,   75,  246,   74,   47,  310,  261,  259,  132,
- /*   980 */   253,  259,  289,  228,   84,   20,  277,  222,  134,  323,
- /*   990 */   263,  137,  230,  327,  267,  263,  303,  304,  305,   20,
- /*  1000 */   307,   73,  271,  230,   76,   20,  152,  264,  154,  230,
- /*  1010 */   253,  246,  285,  286,  287,  288,  289,  290,  253,  230,
- /*  1020 */   228,  294,   20,  230,  224,  298,  299,  246,  263,  246,
- /*  1030 */   246,  246,  267,  246,  228,   57,  224,  222,  267,  153,
- /*  1040 */   246,  277,  246,  246,  246,  246,  222,  271,  246,  227,
- /*  1050 */   285,  286,  287,  288,  289,  290,  276,  227,  253,  294,
- /*  1060 */   227,  246,   20,  298,  299,  204,  263,  320,  253,  320,
- /*  1070 */   246,  264,  203,  211,  210,  284,  267,  253,  263,  199,
- /*  1080 */   317,  268,  267,  316,  268,   33,  267,  263,   36,  198,
- /*  1090 */   267,  267,  314,  222,   42,  253,   44,   45,   46,   47,
- /*  1100 */   285,  286,  287,  288,  289,  290,  291,  292,  293,  285,
- /*  1110 */   286,  287,  288,  289,  290,  195,   20,  246,  283,  120,
- /*  1120 */   218,  215,  301,  313,  253,   73,  213,   74,   76,  297,
- /*  1130 */   135,  268,  267,   74,  263,  331,  268,  267,  267,  267,
- /*  1140 */   326,  265,  325,  253,  227,  264,  242,  253,  227,  222,
- /*  1150 */   249,  236,  328,  329,  228,  224,  285,  286,  287,  288,
- /*  1160 */   289,  290,  227,  274,  240,  294,  229,  220,    0,  240,
- /*  1170 */   299,  278,    0,  246,   64,    0,   38,  222,  163,   38,
- /*  1180 */   253,   38,   38,  163,    0,  133,   38,  135,  163,  137,
- /*  1190 */   263,   38,    0,   38,  267,    0,   38,    0,   74,  150,
- /*  1200 */   149,  246,  109,  146,    0,    0,  154,   53,  253,  142,
- /*  1210 */     0,    0,  285,  286,  287,  288,  289,  290,  263,   86,
- /*  1220 */     0,    0,  267,    0,    0,    0,    0,    0,    0,  222,
- /*  1230 */     0,    0,    0,    0,    0,  222,  120,    0,    0,    0,
- /*  1240 */   285,  286,  287,  288,  289,  290,    0,    0,    0,  322,
- /*  1250 */     0,    0,    0,  246,    0,    0,    0,   22,    0,  246,
- /*  1260 */   253,    0,    0,    0,    0,    0,  253,    0,   51,    0,
- /*  1270 */   263,    0,   43,    0,  267,    0,  263,  270,   38,   36,
- /*  1280 */   267,    0,    0,   38,  329,   36,  222,   43,    0,    0,
- /*  1290 */     0,   38,  285,  286,  287,  288,  289,  290,  285,  286,
- /*  1300 */   287,  288,  289,  290,   36,   83,  293,   22,   36,   43,
- /*  1310 */   246,    0,   38,   43,  222,   38,   38,  253,   38,   43,
- /*  1320 */     0,   38,   81,   22,   38,   38,    0,  263,   71,   38,
- /*  1330 */    71,  267,   22,   39,  270,    0,   22,   38,  246,   22,
- /*  1340 */     0,   22,   20,    0,  138,  253,    0,   38,    0,  285,
- /*  1350 */   286,  287,  288,  289,  290,  263,   22,  138,  151,  267,
- /*  1360 */     0,  222,  270,    0,    0,  200,   74,   43,   71,   71,
- /*  1370 */    75,   71,  222,  200,   71,   71,   74,  285,  286,  287,
- /*  1380 */   288,  289,  290,   75,  194,  246,   74,   74,    4,  200,
- /*  1390 */    75,   86,  253,   75,   38,  135,  246,   74,   71,   38,
- /*  1400 */    75,   71,  263,  253,   75,   38,  267,   86,   38,   38,
- /*  1410 */   222,   38,  133,  263,   86,    2,   71,  267,   86,   75,
- /*  1420 */    22,   74,  138,   74,  285,  286,  287,  288,  289,  290,
- /*  1430 */    75,   74,    0,   74,  246,  285,  286,  287,  288,  289,
- /*  1440 */   290,  253,  136,   75,   86,   43,   84,   75,   74,   74,
- /*  1450 */    74,  263,   74,   22,   74,  267,   38,   75,  222,   38,
- /*  1460 */    74,   38,   85,  167,  222,   86,  133,   86,   75,   74,
- /*  1470 */    22,   75,   38,  285,  286,  287,  288,  289,  290,   74,
- /*  1480 */    38,   75,  246,   74,   38,  169,   75,   99,  246,  253,
- /*  1490 */    74,   99,   38,   99,   87,  253,   74,   38,   99,  263,
- /*  1500 */   109,   74,   74,  267,   22,  263,   51,   50,   57,  267,
- /*  1510 */    72,   71,   22,   38,   38,  222,   38,   38,   38,   38,
- /*  1520 */    57,  285,  286,  287,  288,  289,  290,  285,  286,  287,
- /*  1530 */   288,  289,  290,   38,   38,   38,   38,   38,   38,  246,
- /*  1540 */    38,   38,   38,    0,   38,   36,  253,    0,   43,   38,
- /*  1550 */    36,   43,    0,   38,   36,   43,  263,   38,   36,   43,
- /*  1560 */   267,  222,    0,    0,   38,   37,    0,    0,   22,   21,
- /*  1570 */    20,   22,  222,   22,   21,  332,  332,  332,  285,  286,
- /*  1580 */   287,  288,  289,  290,  332,  246,  332,  332,  332,  332,
- /*  1590 */   332,  332,  253,  332,  332,  332,  246,  332,  332,  332,
- /*  1600 */   332,  332,  263,  253,  332,  332,  267,  332,  332,  332,
- /*  1610 */   332,  332,  332,  263,  332,  332,  332,  267,  332,  222,
- /*  1620 */   332,  332,  332,  332,  285,  286,  287,  288,  289,  290,
- /*  1630 */   332,  332,  332,  332,  332,  285,  286,  287,  288,  289,
- /*  1640 */   290,  332,  332,  246,  332,  332,  332,  222,  332,  332,
- /*  1650 */   253,  332,  332,  332,  332,  332,  332,  332,  332,  332,
- /*  1660 */   263,  332,  332,  332,  267,  332,  332,  332,  332,  332,
- /*  1670 */   332,  246,  332,  332,  332,  332,  332,  332,  253,  332,
- /*  1680 */   332,  332,  285,  286,  287,  288,  289,  290,  263,  332,
- /*  1690 */   332,  332,  267,  332,  332,  332,  222,  332,  332,  332,
- /*  1700 */   332,  332,  332,  332,  332,  222,  332,  332,  332,  332,
- /*  1710 */   285,  286,  287,  288,  289,  290,  332,  332,  332,  332,
- /*  1720 */   246,  332,  332,  332,  332,  332,  332,  253,  332,  246,
- /*  1730 */   332,  332,  332,  332,  332,  332,  253,  263,  332,  332,
- /*  1740 */   332,  267,  332,  332,  332,  332,  263,  332,  332,  332,
- /*  1750 */   267,  222,  332,  332,  332,  332,  332,  332,  332,  285,
- /*  1760 */   286,  287,  288,  289,  290,  332,  332,  332,  285,  286,
- /*  1770 */   287,  288,  289,  290,  332,  246,  332,  332,  332,  222,
- /*  1780 */   332,  332,  253,  332,  332,  332,  332,  332,  332,  332,
- /*  1790 */   332,  332,  263,  332,  332,  332,  267,  332,  332,  332,
- /*  1800 */   332,  332,  332,  246,  332,  332,  332,  332,  222,  332,
- /*  1810 */   253,  332,  332,  332,  285,  286,  287,  288,  289,  290,
- /*  1820 */   263,  332,  332,  332,  267,  332,  332,  332,  332,  332,
- /*  1830 */   332,  332,  246,  332,  332,  332,  222,  332,  332,  253,
- /*  1840 */   332,  332,  285,  286,  287,  288,  289,  290,  332,  263,
- /*  1850 */   332,  332,  332,  267,  332,  332,  332,  332,  332,  332,
- /*  1860 */   246,  332,  332,  332,  332,  332,  332,  253,  332,  332,
- /*  1870 */   332,  285,  286,  287,  288,  289,  290,  263,  332,  332,
- /*  1880 */   332,  267,  332,  332,  332,  332,  332,  332,  332,  332,
- /*  1890 */   332,  332,  332,  332,  332,  332,  332,  332,  332,  285,
- /*  1900 */   286,  287,  288,  289,  290,
+ /*   620 */   222,  248,   83,  112,   57,  267,  115,  116,  117,  118,
+ /*   630 */   119,  184,  121,  122,  123,  124,  125,  126,  127,  128,
+ /*   640 */   129,  130,  131,  228,  246,  228,  197,  267,  228,   19,
+ /*   650 */   246,  253,  237,   75,  237,  195,  246,  237,  254,  194,
+ /*   660 */   195,  263,  252,   33,  222,  267,   36,  257,  253,  228,
+ /*   670 */   253,  132,   42,  253,   44,   45,   46,   47,  237,  157,
+ /*   680 */   158,  246,  275,  285,  286,  287,  288,  289,  290,  150,
+ /*   690 */   292,  228,  257,  295,  253,  228,  223,  299,  300,  301,
+ /*   700 */   237,  139,  222,   73,  237,  222,   76,   71,  253,  267,
+ /*   710 */   222,  313,  228,  228,  138,  260,  253,  319,  320,  247,
+ /*   720 */   253,  237,  237,  184,  185,  186,  187,  188,  189,  190,
+ /*   730 */   191,  192,  193,   14,  246,    0,  106,  253,  253,   20,
+ /*   740 */   228,  253,   78,  142,   50,   81,  222,  267,  222,  237,
+ /*   750 */   267,  263,  222,  222,   14,  267,  222,   22,   21,  331,
+ /*   760 */    20,  247,  161,   78,  134,  253,   81,  137,  222,   78,
+ /*   770 */   247,   34,   81,  285,  286,  287,  288,  289,  290,  217,
+ /*   780 */   292,  322,  152,  295,  154,    0,   74,  299,  300,  301,
+ /*   790 */     0,  267,  246,  267,  181,  182,   84,  267,  267,  253,
+ /*   800 */    78,  267,    0,   81,  247,  247,  247,   22,  320,  263,
+ /*   810 */   235,  256,  279,  267,   24,   25,   26,   27,   28,   29,
+ /*   820 */    30,   31,   32,   71,   22,   71,  222,   75,  225,   75,
+ /*   830 */    74,  285,  286,  287,  288,  289,  290,  316,  292,   71,
+ /*   840 */   284,  295,   86,   75,   71,  299,  300,  301,   75,  309,
+ /*   850 */   246,   71,  216,   18,   38,   75,  310,  253,   23,   71,
+ /*   860 */    71,  167,   38,   75,   75,  246,   33,  263,   38,   36,
+ /*   870 */    35,  267,   71,   57,  325,   42,   75,   44,   45,   46,
+ /*   880 */    47,   71,  312,   48,  222,   75,   20,  228,   36,  285,
+ /*   890 */   286,  287,  288,  289,  290,  280,  292,   71,   38,  295,
+ /*   900 */   232,   75,  144,  299,  300,  301,   73,   71,  246,   76,
+ /*   910 */   273,   75,  228,   71,  310,  253,   71,   75,   71,   71,
+ /*   920 */    75,  228,   75,   75,   71,  263,  120,  261,   75,  267,
+ /*   930 */   132,  259,  259,  109,  228,  277,   20,  230,  263,  109,
+ /*   940 */   222,   20,  271,  230,   20,  253,  111,  285,  286,  287,
+ /*   950 */   288,  289,  290,  222,  292,  230,  230,  295,  228,  264,
+ /*   960 */    20,  299,  300,  301,  246,  224,  133,  246,  135,  230,
+ /*   970 */   137,  253,  310,  246,  139,  140,  141,  246,  143,  246,
+ /*   980 */   246,  263,  246,  148,  253,  267,  224,  154,  246,  246,
+ /*   990 */   272,  222,  246,  246,  263,  160,  246,  162,  267,  164,
+ /*  1000 */   165,  166,  228,  285,  286,  287,  288,  289,  290,  228,
+ /*  1010 */   292,  246,   57,  227,  153,  246,  285,  286,  287,  288,
+ /*  1020 */   289,  290,  253,  292,  267,  294,  277,  276,  253,  311,
+ /*  1030 */   263,  196,  263,   20,  253,  271,  267,  284,  227,  227,
+ /*  1040 */   264,  204,  324,  203,  321,  268,  328,  268,  210,  222,
+ /*  1050 */   267,  267,  211,  272,  285,  286,  287,  288,  289,  290,
+ /*  1060 */   267,  292,  199,  318,  295,  321,  198,  195,  299,  300,
+ /*  1070 */   289,  253,  317,  246,  315,  314,   20,  283,  120,  222,
+ /*  1080 */   253,   74,  218,  213,  302,  304,  305,  306,  215,  308,
+ /*  1090 */   263,  268,  311,  327,  267,  332,  326,  298,  267,  267,
+ /*  1100 */   242,  135,  268,  246,  253,  324,  267,  227,  265,  328,
+ /*  1110 */   253,  227,  285,  286,  287,  288,  289,  290,  264,  292,
+ /*  1120 */   263,   74,  295,  249,  267,  236,  299,  300,  222,  253,
+ /*  1130 */   228,  227,  224,  274,  278,  240,  240,  222,  229,   22,
+ /*  1140 */   220,    0,  285,  286,  287,  288,  289,  290,  291,  292,
+ /*  1150 */   293,  294,  246,    0,   64,   38,    0,   38,  163,  253,
+ /*  1160 */    38,  246,   38,   38,  163,    0,   38,   38,  253,  263,
+ /*  1170 */    38,  163,    0,  267,   57,  222,    0,   38,  263,    0,
+ /*  1180 */    74,  150,  267,  149,  109,  146,    0,  222,    0,   53,
+ /*  1190 */   142,  285,  286,  287,  288,  289,  290,    0,  292,  246,
+ /*  1200 */   285,  286,  287,  288,  289,  290,  253,  292,    0,    0,
+ /*  1210 */   295,  246,   86,    0,   97,  300,  263,    0,  253,    0,
+ /*  1220 */   267,  120,    0,  270,    0,    0,  109,    0,  263,    0,
+ /*  1230 */     0,    0,  267,    0,    0,  329,  330,    0,  285,  286,
+ /*  1240 */   287,  288,  289,  290,    0,  292,  222,    0,    0,    0,
+ /*  1250 */   285,  286,  287,  288,  289,  290,    0,  292,    0,  222,
+ /*  1260 */     0,    0,   22,  146,    0,    0,    0,    0,    0,    0,
+ /*  1270 */   246,   43,    0,    0,   51,    0,   38,  253,    0,    0,
+ /*  1280 */     0,   36,   43,  246,  167,  168,    0,  263,  323,   38,
+ /*  1290 */   253,  267,    0,   36,  270,   43,   43,   38,   36,    0,
+ /*  1300 */   263,   38,    0,    0,  267,    0,   36,  270,    0,  285,
+ /*  1310 */   286,  287,  288,  289,  290,   83,  292,  222,   22,   43,
+ /*  1320 */    38,    0,  285,  286,  287,  288,  289,  290,   38,  292,
+ /*  1330 */     0,   81,   38,  222,   22,   38,   38,    0,   38,   22,
+ /*  1340 */     0,  246,   38,    0,   22,  222,   39,   38,  253,   22,
+ /*  1350 */     0,   22,   71,   20,   71,    0,  138,  246,  263,    0,
+ /*  1360 */    22,   38,  267,  151,  253,  270,    0,    0,    0,  246,
+ /*  1370 */    75,  135,  194,  138,  263,   43,  253,   71,  267,    0,
+ /*  1380 */   285,  286,  287,  288,  289,  290,  263,  292,   74,   71,
+ /*  1390 */   267,  200,  222,  138,   75,   71,  285,  286,  287,  288,
+ /*  1400 */   289,  290,   74,  292,  200,  222,   75,  133,  285,  286,
+ /*  1410 */   287,  288,  289,  290,   75,  292,  246,   71,   74,   74,
+ /*  1420 */    86,   74,   71,  253,   71,   71,  200,   75,   86,  246,
+ /*  1430 */     4,   75,   38,  263,   86,   38,  253,  267,    0,   38,
+ /*  1440 */    61,   38,   38,  222,   65,   38,  263,    2,   71,   75,
+ /*  1450 */   267,  167,   74,   22,   74,  285,  286,  287,  288,  289,
+ /*  1460 */   290,   75,  292,   75,   75,   74,   87,  246,  285,  286,
+ /*  1470 */   287,  288,  289,  290,  253,  292,   86,   75,   86,   74,
+ /*  1480 */   169,    0,   74,   74,  263,  106,  107,  108,  267,  110,
+ /*  1490 */    74,   74,   43,  222,  133,   74,  136,   84,   86,   61,
+ /*  1500 */    86,   22,   74,   65,   85,   75,  285,  286,  287,  288,
+ /*  1510 */   289,  290,   38,  292,   38,   74,   38,  246,   75,   75,
+ /*  1520 */    74,   38,   74,  222,  253,   87,   75,   38,   74,   38,
+ /*  1530 */    75,   74,   99,   22,  263,   99,   99,   87,  267,   99,
+ /*  1540 */    74,   38,   74,   74,  106,  107,  108,  246,  110,   22,
+ /*  1550 */    38,  109,   51,   57,  253,   50,  285,  286,  287,  288,
+ /*  1560 */   289,  290,   72,  292,  263,   22,   71,   38,  267,   38,
+ /*  1570 */    38,  222,   38,   38,   38,   38,   57,   38,   38,   38,
+ /*  1580 */   222,   43,   38,   38,   38,   38,  285,  286,  287,  288,
+ /*  1590 */   289,  290,   38,  292,    0,  246,   38,   36,    0,   36,
+ /*  1600 */    38,    0,  253,   43,  246,   38,   36,   43,    0,   38,
+ /*  1610 */    36,  253,  263,    0,   38,   43,  267,   37,    0,    0,
+ /*  1620 */    21,  263,   22,   20,   22,  267,   22,   21,  222,  333,
+ /*  1630 */   333,  333,  333,  333,  285,  286,  287,  288,  289,  290,
+ /*  1640 */   333,  292,  333,  285,  286,  287,  288,  289,  290,  333,
+ /*  1650 */   292,  333,  246,  333,  333,  333,  222,  333,  333,  253,
+ /*  1660 */   333,  333,  333,  333,  333,  333,  333,  333,  333,  263,
+ /*  1670 */   333,  333,  333,  267,  333,  333,  333,  333,  333,  333,
+ /*  1680 */   246,  333,  333,  333,  333,  333,  333,  253,  333,  333,
+ /*  1690 */   333,  285,  286,  287,  288,  289,  290,  263,  292,  333,
+ /*  1700 */   333,  267,  333,  333,  333,  333,  333,  222,  333,  333,
+ /*  1710 */   333,  333,  333,  333,  333,  333,  222,  333,  333,  285,
+ /*  1720 */   286,  287,  288,  289,  290,  333,  292,  333,  333,  333,
+ /*  1730 */   333,  246,  333,  333,  333,  333,  333,  333,  253,  333,
+ /*  1740 */   246,  333,  333,  333,  333,  333,  333,  253,  263,  333,
+ /*  1750 */   333,  333,  267,  333,  333,  333,  333,  263,  333,  333,
+ /*  1760 */   333,  267,  333,  333,  333,  333,  333,  333,  333,  333,
+ /*  1770 */   285,  286,  287,  288,  289,  290,  333,  292,  333,  285,
+ /*  1780 */   286,  287,  288,  289,  290,  333,  292,  222,  333,  333,
+ /*  1790 */   333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+ /*  1800 */   333,  333,  333,  222,  333,  333,  333,  333,  333,  333,
+ /*  1810 */   333,  246,  333,  333,  333,  333,  333,  333,  253,  333,
+ /*  1820 */   333,  333,  333,  333,  333,  333,  333,  246,  263,  333,
+ /*  1830 */   333,  333,  267,  333,  253,  333,  333,  333,  333,  333,
+ /*  1840 */   333,  333,  333,  333,  263,  333,  333,  333,  267,  333,
+ /*  1850 */   285,  286,  287,  288,  289,  290,  333,  292,  222,  333,
+ /*  1860 */   333,  333,  333,  333,  333,  333,  285,  286,  287,  288,
+ /*  1870 */   289,  290,  333,  292,  333,  333,  333,  333,  333,  333,
+ /*  1880 */   333,  333,  246,  333,  333,  333,  333,  333,  333,  253,
+ /*  1890 */   333,  333,  333,  333,  333,  333,  333,  333,  333,  263,
+ /*  1900 */   333,  333,  333,  267,  333,  333,  333,  333,  333,  333,
+ /*  1910 */   333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
+ /*  1920 */   333,  285,  286,  287,  288,  289,  290,  333,  292,
 };
-#define YY_SHIFT_COUNT    (565)
+#define YY_SHIFT_COUNT    (567)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (1567)
+#define YY_SHIFT_MAX      (1619)
 static const unsigned short int yy_shift_ofst[] = {
- /*     0 */   627,    0,   39,   90,   90,   90,   90,  217,   90,   90,
+ /*     0 */   835,    0,   39,   90,   90,   90,   90,  217,   90,   90,
  /*    10 */   263,  390,  436,  390,  390,  390,  390,  390,  390,  390,
  /*    20 */   390,  390,  390,  390,  390,  390,  390,  390,  390,  390,
- /*    30 */   390,  390,  390,  390,  390,  390,   53,  258,  258,  258,
- /*    40 */    45,  438,  438,  137,    4,    4,  129,  438,    4,    4,
- /*    50 */     4,    4,    4,    4,    9,    4,   95,  184,  129,  366,
- /*    60 */    95,    4,    4,   95,    4,   95,  366,   95,   95,    4,
- /*    70 */   116,  511,  230,  539,  539,  268,  772,  296,  772,  772,
- /*    80 */   772,  772,  772,  772,  772,  772,  772,  772,  772,  772,
- /*    90 */   772,  772,  772,  772,  772,  772,  772,  134,  123,  281,
- /*   100 */    48,   48,   20,   20,   20,  315,   48,   48,  573,  366,
- /*   110 */    95,   95,   95,  377,  543,  423,  423,  423,  423,  423,
- /*   120 */   423,  423,  854,  718,  405,  238,  160,  256,   34,  180,
- /*   130 */   389,  404,  396,  540,  396,  782,  469,  643,  795,  916,
- /*   140 */   907,  910,  801,  916,  916,  850,  847,  847,  916,  965,
- /*   150 */     9,  366,  979,    9,  573,  985,    9,    9,  916,    9,
- /*   160 */  1002,   95,   95,   95,   95,   95,   95,   95,   95,   95,
- /*   170 */    95,   95,  916, 1002,  978,  965,  116,  886,  366,  979,
- /*   180 */   116,  573,  985,  116, 1042,  861,  869,  978,  861,  869,
- /*   190 */   978,  978,  862,  864,  880,  891,  920,  573, 1096,  999,
- /*   200 */   902,  906,  913, 1053,   95,  869,  978,  978,  869,  978,
- /*   210 */   995,  573,  985,  116,  377,  116,  573, 1059,  543,  916,
- /*   220 */   116, 1002, 1905, 1905, 1905, 1905, 1905, 1905,  286, 1052,
- /*   230 */   676,  928,   46,  672,  295,  488,  583,  698,  640,  219,
- /*   240 */   219,  219,  219,  219,  219,  219,  219,   17,  312,  357,
- /*   250 */    19,  320,  320,  320,  320,  663,  145,  413,  744,  752,
- /*   260 */   756,  760,  467,  736,  754,  700,  685,  589,  713,  774,
- /*   270 */   846,  669,  466,  503,  790,  644,  808,  216,  811,  818,
- /*   280 */   820,  838,  839,  788,  826,  849,  866,  887,  888,  896,
- /*   290 */   897,  900,  775, 1168, 1172, 1110, 1175, 1138, 1015, 1141,
- /*   300 */  1143, 1144, 1020, 1184, 1148, 1153, 1025, 1192, 1155, 1195,
- /*   310 */  1158, 1197, 1124, 1049, 1051, 1093, 1057, 1204, 1205, 1154,
- /*   320 */  1067, 1210, 1211, 1133, 1220, 1221, 1223, 1224, 1225, 1226,
- /*   330 */  1227, 1228, 1230, 1231, 1232, 1233, 1234, 1246, 1247, 1248,
- /*   340 */  1116, 1237, 1238, 1239, 1250, 1251, 1252, 1235, 1254, 1255,
- /*   350 */  1256, 1258, 1261, 1262, 1263, 1264, 1265, 1229, 1267, 1217,
- /*   360 */  1269, 1271, 1240, 1243, 1244, 1273, 1245, 1249, 1266, 1275,
- /*   370 */  1253, 1268, 1270, 1281, 1274, 1272, 1276, 1282, 1288, 1289,
- /*   380 */  1290, 1222, 1241, 1277, 1257, 1259, 1285, 1311, 1278, 1280,
- /*   390 */  1283, 1286, 1257, 1259, 1287, 1291, 1320, 1301, 1326, 1310,
- /*   400 */  1294, 1335, 1314, 1299, 1346, 1317, 1340, 1319, 1322, 1343,
- /*   410 */  1206, 1309, 1348, 1207, 1334, 1219, 1260, 1360, 1363, 1284,
- /*   420 */  1364, 1292, 1324, 1279, 1297, 1298, 1165, 1295, 1300, 1308,
- /*   430 */  1302, 1312, 1313, 1315, 1303, 1305, 1323, 1304, 1173, 1318,
- /*   440 */  1325, 1321, 1190, 1327, 1328, 1329, 1330, 1189, 1384, 1356,
- /*   450 */  1361, 1367, 1370, 1371, 1373, 1413, 1296, 1345, 1344, 1347,
- /*   460 */  1355, 1332, 1349, 1357, 1358, 1398, 1316, 1359, 1368, 1372,
- /*   470 */  1374, 1375, 1306, 1376, 1432, 1402, 1333, 1378, 1362, 1379,
- /*   480 */  1381, 1431, 1380, 1377, 1382, 1418, 1421, 1386, 1393, 1423,
- /*   490 */  1395, 1396, 1434, 1405, 1406, 1442, 1409, 1411, 1446, 1416,
- /*   500 */  1388, 1392, 1394, 1399, 1448, 1407, 1422, 1454, 1391, 1427,
- /*   510 */  1428, 1459, 1257, 1259, 1482, 1455, 1457, 1451, 1438, 1440,
- /*   520 */  1475, 1476, 1478, 1479, 1480, 1481, 1495, 1490, 1463, 1257,
- /*   530 */  1496, 1259, 1497, 1498, 1499, 1500, 1502, 1503, 1504, 1543,
- /*   540 */  1506, 1509, 1505, 1547, 1511, 1514, 1508, 1552, 1515, 1518,
- /*   550 */  1512, 1562, 1519, 1522, 1516, 1563, 1526, 1528, 1566, 1567,
- /*   560 */  1546, 1548, 1549, 1551, 1553, 1550,
+ /*    30 */   390,  390,  390,  390,  390,  390,  174,   21,   21,   21,
+ /*    40 */    29,  438,  438,   45,   38,   38,   54,  438,   38,   38,
+ /*    50 */    38,   38,   38,   38,   27,   38,   99,  264,   54,  298,
+ /*    60 */    99,   38,   38,   99,   38,   99,  298,   99,   99,   38,
+ /*    70 */   490,  511,  230,  539,  539,  268, 1117,  296, 1117, 1117,
+ /*    80 */  1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117,
+ /*    90 */  1117, 1117, 1117, 1117, 1117, 1117, 1117,  258,  466,   86,
+ /*   100 */   202,  202,  291,  291,  291,  116,  202,  202,  323,  298,
+ /*   110 */    99,   99,   99,  496,  567,  423,  423,  423,  423,  423,
+ /*   120 */   423,  423,  630,  129,  137,  562,  160,  162,  123,   52,
+ /*   130 */   186,  576,  465,  460,  465,  719,  383,  449,  740,  866,
+ /*   140 */   852,  860,  758,  866,  866,  806,  798,  798,  866,  916,
+ /*   150 */    27,  298,  921,   27,  323,  924,   27,   27,  866,   27,
+ /*   160 */   940,   99,   99,   99,   99,   99,   99,   99,   99,   99,
+ /*   170 */    99,   99,  866,  940,  955,  916,  490,  861,  298,  921,
+ /*   180 */   490,  323,  924,  490, 1013,  837,  840,  955,  837,  840,
+ /*   190 */   955,  955,  841,  838,  863,  868,  872,  323, 1056,  958,
+ /*   200 */   864,  873,  870, 1007,   99,  840,  955,  955,  840,  955,
+ /*   210 */   966,  323,  924,  490,  496,  490,  323, 1047,  567,  866,
+ /*   220 */   490,  940, 1929, 1929, 1929, 1929, 1929, 1929,  286,  833,
+ /*   230 */   790,  461, 1379, 1438,   16,  118,  457,  392,  578,  219,
+ /*   240 */   219,  219,  219,  219,  219,  219,  219,  379,  429,  307,
+ /*   250 */   447,  314,  314,  314,  314,  252,  601,  414,  664,  685,
+ /*   260 */   691,  722,  735,  785,  802,  737,  522,  752,  754,  768,
+ /*   270 */   597,  613,  330,  636,  773,  694,  780,  756,  788,  789,
+ /*   280 */   801,  810,  826,  824,  830,  836,  842,  845,  847,  848,
+ /*   290 */   853,  712,  816, 1141, 1153, 1090, 1156, 1119,  995, 1122,
+ /*   300 */  1124, 1125, 1001, 1165, 1128, 1129, 1008, 1172, 1132, 1176,
+ /*   310 */  1139, 1179, 1106, 1031, 1034, 1075, 1039, 1186, 1188, 1136,
+ /*   320 */  1048, 1197, 1208, 1126, 1209, 1213, 1217, 1219, 1224, 1225,
+ /*   330 */  1227, 1229, 1230, 1231, 1233, 1234, 1237, 1244, 1247, 1248,
+ /*   340 */  1101, 1222, 1249, 1256, 1258, 1260, 1261, 1240, 1264, 1265,
+ /*   350 */  1266, 1267, 1268, 1269, 1278, 1279, 1280, 1228, 1272, 1223,
+ /*   360 */  1273, 1275, 1238, 1245, 1239, 1286, 1251, 1257, 1252, 1292,
+ /*   370 */  1259, 1262, 1253, 1299, 1263, 1270, 1276, 1302, 1303, 1305,
+ /*   380 */  1308, 1232, 1250, 1282, 1281, 1283, 1296, 1321, 1290, 1294,
+ /*   390 */  1297, 1298, 1281, 1283, 1300, 1304, 1330, 1312, 1337, 1317,
+ /*   400 */  1307, 1340, 1322, 1309, 1343, 1327, 1350, 1329, 1333, 1355,
+ /*   410 */  1218, 1323, 1359, 1212, 1338, 1235, 1236, 1366, 1367, 1255,
+ /*   420 */  1368, 1314, 1332, 1274, 1306, 1318, 1191, 1295, 1324, 1319,
+ /*   430 */  1328, 1344, 1345, 1331, 1346, 1334, 1347, 1351, 1204, 1339,
+ /*   440 */  1352, 1342, 1178, 1353, 1348, 1356, 1354, 1226, 1426, 1394,
+ /*   450 */  1397, 1401, 1403, 1404, 1407, 1445, 1284, 1377, 1374, 1378,
+ /*   460 */  1386, 1380, 1388, 1390, 1391, 1405, 1392, 1431, 1311, 1408,
+ /*   470 */  1389, 1402, 1409, 1416, 1360, 1417, 1481, 1449, 1361, 1421,
+ /*   480 */  1413, 1412, 1414, 1479, 1428, 1419, 1430, 1474, 1476, 1441,
+ /*   490 */  1443, 1478, 1446, 1444, 1483, 1448, 1451, 1489, 1454, 1455,
+ /*   500 */  1491, 1457, 1433, 1436, 1437, 1440, 1511, 1450, 1466, 1503,
+ /*   510 */  1442, 1468, 1469, 1512, 1281, 1283, 1527, 1501, 1505, 1496,
+ /*   520 */  1490, 1495, 1529, 1531, 1532, 1534, 1535, 1536, 1537, 1543,
+ /*   530 */  1519, 1281, 1539, 1283, 1540, 1541, 1544, 1545, 1546, 1547,
+ /*   540 */  1554, 1594, 1558, 1561, 1538, 1598, 1562, 1563, 1560, 1601,
+ /*   550 */  1567, 1570, 1564, 1608, 1571, 1574, 1572, 1613, 1576, 1580,
+ /*   560 */  1618, 1619, 1600, 1599, 1602, 1604, 1606, 1603,
 };
 #define YY_REDUCE_COUNT (227)
-#define YY_REDUCE_MIN   (-289)
-#define YY_REDUCE_MAX   (1614)
+#define YY_REDUCE_MIN   (-310)
+#define YY_REDUCE_MAX   (1636)
 static const short yy_reduce_ofst[] = {
- /*     0 */   182, -168, -218,  398,  518,  568,  617,  666,  727,  765,
- /*    10 */   815,  824,  871,  -62,  927,  955, 1007, 1013, 1064, 1092,
- /*    20 */  1139, 1150, 1188, 1236, 1242, 1293, 1339, 1350, 1397, 1425,
- /*    30 */  1474, 1483, 1529, 1557, 1586, 1614, -166,  176,  571,  693,
- /*    40 */   450, -250, -248, -267, -214,   75, -235, -266, -103,   51,
- /*    50 */   224,  245,  269,  306, -222,  349, -210, -243, -244, -134,
- /*    60 */  -130,  420,  421,   72,  440,    2, -237,  505,  294,  442,
- /*    70 */  -200, -144, -289, -289, -289, -212,  -73,  240,  -20,  186,
- /*    80 */   272,  308,  327,  334,  354,  358,  402,  424,  494,  498,
- /*    90 */   519,  530,  531,  533,  534,  552,  561,  -69,   97,    8,
- /*   100 */   174,  275,  360,  376,  384,  243,  346,  355, -162,  500,
- /*   110 */  -191,  229,  335,  132,  310,  462,  525,  548,  597,  599,
- /*   120 */   605,  612,  356,  648,  585,  542,  564,  636,  615,  593,
- /*   130 */   697,  639,  620,  620,  620,  679,  607,  623,  679,  714,
- /*   140 */   664,  725,  677,  737,  738,  716,  719,  722,  755,  709,
- /*   150 */   762,  732,  731,  773,  757,  743,  779,  789,  792,  793,
- /*   160 */   800,  781,  783,  784,  785,  787,  794,  796,  797,  798,
- /*   170 */   799,  802,  806,  812,  771,  764,  822,  780,  803,  776,
- /*   180 */   830,  805,  807,  833,  791,  747,  813,  809,  749,  816,
- /*   190 */   819,  823,  763,  767,  778,  810,  620,  842,  835,  821,
- /*   200 */   804,  814,  817,  832,  679,  863,  865,  870,  868,  872,
- /*   210 */   876,  890,  881,  917,  904,  921,  894,  901,  915,  926,
- /*   220 */   935,  931,  889,  893,  924,  929,  937,  947,
+ /*     0 */  -210, -207,  398,  488,  546,  604,  662,  718,  769,  827,
+ /*    10 */   857,  906,  915,  953,  965, -219, 1037,  731, 1024, 1095,
+ /*    20 */  1111, 1123, 1170, 1183, 1221, 1271, 1301, 1349, 1358, 1406,
+ /*    30 */  1434, 1485, 1494, 1565, 1581, 1636,  781, -181,   -2,   28,
+ /*    40 */  -185, -246, -227,   53, -220, -138,  155, -256, -153,  247,
+ /*    50 */   415,  417,  420,  441,  -46,  467, -108, -101, -310, -100,
+ /*    60 */    69,  484,  485,  211,  512,  244,  199,  410,  294,  463,
+ /*    70 */   184, -221, -291, -291, -291, -116, -222,  -94, -203,  -29,
+ /*    80 */   -20,   68,  157,  255,  279,  282,  334,  358,  380,  442,
+ /*    90 */   480,  483,  524,  526,  530,  531,  534, -137,  -84, -188,
+ /*   100 */   126,  259,  -79,  198,  276,  373,  353,  355,  455, -253,
+ /*   110 */   404,  221,  435,  132,  273, -245,  472,  514,  523,  557,
+ /*   120 */   558,  559,  407,  473,  575,  428,  459,  555,  533,  521,
+ /*   130 */   603,  556,  540,  540,  540,  619,  549,  570,  619,  659,
+ /*   140 */   615,  668,  637,  684,  693,  666,  672,  673,  706,  658,
+ /*   150 */   707,  675,  671,  713,  692,  695,  725,  726,  730,  739,
+ /*   160 */   741,  721,  727,  733,  734,  736,  742,  743,  746,  747,
+ /*   170 */   750,  765,  774,  762,  757,  749,  786,  751,  767,  764,
+ /*   180 */   811,  775,  776,  812,  753,  723,  777,  783,  744,  779,
+ /*   190 */   784,  793,  745,  755,  759,  761,  540,  818,  794,  782,
+ /*   200 */   763,  766,  770,  799,  619,  823,  831,  832,  834,  839,
+ /*   210 */   843,  851,  854,  880,  858,  884,  876,  874,  889,  902,
+ /*   220 */   904,  908,  859,  856,  895,  896,  909,  920,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    10 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    20 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    30 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    40 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    50 */  1270, 1270, 1270, 1270, 1329, 1270, 1270, 1270, 1270, 1270,
- /*    60 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    70 */  1327, 1469, 1270, 1623, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    80 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*    90 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1329,
- /*   100 */  1270, 1270, 1634, 1634, 1634, 1327, 1270, 1270, 1270, 1270,
- /*   110 */  1270, 1270, 1270, 1422, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   120 */  1270, 1270, 1503, 1270, 1270, 1698, 1270, 1375, 1509, 1658,
- /*   130 */  1270, 1650, 1626, 1640, 1627, 1270, 1683, 1643, 1270, 1270,
- /*   140 */  1270, 1270, 1495, 1270, 1270, 1474, 1471, 1471, 1270, 1270,
- /*   150 */  1329, 1270, 1270, 1329, 1270, 1270, 1329, 1329, 1270, 1329,
- /*   160 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   170 */  1270, 1270, 1270, 1270, 1270, 1270, 1327, 1505, 1270, 1270,
- /*   180 */  1327, 1270, 1270, 1327, 1270, 1665, 1663, 1270, 1665, 1663,
- /*   190 */  1270, 1270, 1677, 1673, 1656, 1654, 1640, 1270, 1270, 1270,
- /*   200 */  1701, 1689, 1685, 1270, 1270, 1663, 1270, 1270, 1663, 1270,
- /*   210 */  1482, 1270, 1270, 1327, 1270, 1327, 1270, 1391, 1270, 1270,
- /*   220 */  1327, 1270, 1497, 1511, 1425, 1425, 1330, 1275, 1270, 1270,
- /*   230 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1572,
- /*   240 */  1676, 1675, 1599, 1598, 1597, 1595, 1571, 1270, 1270, 1270,
- /*   250 */  1270, 1565, 1566, 1564, 1563, 1270, 1270, 1270, 1270, 1270,
- /*   260 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   270 */  1624, 1270, 1686, 1690, 1270, 1270, 1270, 1549, 1270, 1270,
- /*   280 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   290 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   300 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   310 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   320 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   330 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   340 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   350 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   360 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   370 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   380 */  1270, 1270, 1270, 1270, 1438, 1437, 1270, 1270, 1270, 1270,
- /*   390 */  1270, 1270, 1356, 1355, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   400 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   410 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   420 */  1270, 1270, 1270, 1270, 1647, 1657, 1270, 1270, 1270, 1270,
- /*   430 */  1270, 1270, 1270, 1270, 1270, 1549, 1270, 1674, 1270, 1633,
- /*   440 */  1629, 1270, 1270, 1625, 1270, 1270, 1684, 1270, 1270, 1270,
- /*   450 */  1270, 1270, 1270, 1270, 1270, 1619, 1270, 1592, 1270, 1270,
- /*   460 */  1270, 1270, 1270, 1270, 1270, 1270, 1559, 1270, 1270, 1270,
- /*   470 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1548,
- /*   480 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1419, 1270, 1270,
- /*   490 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   500 */  1404, 1402, 1401, 1400, 1270, 1397, 1270, 1270, 1270, 1270,
- /*   510 */  1270, 1270, 1428, 1427, 1270, 1270, 1270, 1270, 1270, 1350,
- /*   520 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1341,
- /*   530 */  1270, 1340, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   540 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   550 */  1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270,
- /*   560 */  1270, 1270, 1270, 1270, 1270, 1270,
+ /*     0 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    10 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    20 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    30 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    40 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    50 */  1274, 1274, 1274, 1274, 1333, 1274, 1274, 1274, 1274, 1274,
+ /*    60 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    70 */  1331, 1473, 1274, 1628, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    80 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*    90 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1333,
+ /*   100 */  1274, 1274, 1639, 1639, 1639, 1331, 1274, 1274, 1274, 1274,
+ /*   110 */  1274, 1274, 1274, 1426, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   120 */  1274, 1274, 1507, 1274, 1274, 1703, 1274, 1379, 1513, 1663,
+ /*   130 */  1274, 1655, 1631, 1645, 1632, 1274, 1688, 1648, 1274, 1274,
+ /*   140 */  1274, 1274, 1499, 1274, 1274, 1478, 1475, 1475, 1274, 1274,
+ /*   150 */  1333, 1274, 1274, 1333, 1274, 1274, 1333, 1333, 1274, 1333,
+ /*   160 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   170 */  1274, 1274, 1274, 1274, 1274, 1274, 1331, 1509, 1274, 1274,
+ /*   180 */  1331, 1274, 1274, 1331, 1274, 1670, 1668, 1274, 1670, 1668,
+ /*   190 */  1274, 1274, 1682, 1678, 1661, 1659, 1645, 1274, 1274, 1274,
+ /*   200 */  1706, 1694, 1690, 1274, 1274, 1668, 1274, 1274, 1668, 1274,
+ /*   210 */  1486, 1274, 1274, 1331, 1274, 1331, 1274, 1395, 1274, 1274,
+ /*   220 */  1331, 1274, 1501, 1515, 1429, 1429, 1334, 1279, 1274, 1274,
+ /*   230 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1576,
+ /*   240 */  1681, 1680, 1604, 1603, 1602, 1600, 1575, 1274, 1274, 1274,
+ /*   250 */  1274, 1569, 1570, 1568, 1567, 1274, 1274, 1274, 1274, 1274,
+ /*   260 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   270 */  1629, 1274, 1691, 1695, 1274, 1274, 1274, 1553, 1274, 1274,
+ /*   280 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   290 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   300 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   310 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   320 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   330 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   340 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   350 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   360 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   370 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   380 */  1274, 1274, 1274, 1274, 1442, 1441, 1274, 1274, 1274, 1274,
+ /*   390 */  1274, 1274, 1360, 1359, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   400 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   410 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   420 */  1274, 1274, 1274, 1274, 1652, 1662, 1274, 1274, 1274, 1274,
+ /*   430 */  1274, 1274, 1274, 1274, 1274, 1553, 1274, 1679, 1274, 1638,
+ /*   440 */  1634, 1274, 1274, 1630, 1274, 1274, 1689, 1274, 1274, 1274,
+ /*   450 */  1274, 1274, 1274, 1274, 1274, 1624, 1274, 1597, 1274, 1274,
+ /*   460 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1563, 1274,
+ /*   470 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   480 */  1274, 1552, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1423,
+ /*   490 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   500 */  1274, 1274, 1408, 1406, 1405, 1404, 1274, 1401, 1274, 1274,
+ /*   510 */  1274, 1274, 1274, 1274, 1432, 1431, 1274, 1274, 1274, 1274,
+ /*   520 */  1274, 1354, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   530 */  1274, 1345, 1274, 1344, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   540 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   550 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
+ /*   560 */  1274, 1274, 1274, 1274, 1274, 1274, 1274, 1274,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -1020,16 +1024,16 @@ static const char *const yyTokenName[] = {
   /*  167 */ "NULL",
   /*  168 */ "NK_QUESTION",
   /*  169 */ "NK_ARROW",
-  /*  170 */ "NOW",
-  /*  171 */ "TODAY",
-  /*  172 */ "ROWTS",
-  /*  173 */ "TBNAME",
-  /*  174 */ "QSTARTTS",
-  /*  175 */ "QENDTS",
-  /*  176 */ "WSTARTTS",
-  /*  177 */ "WENDTS",
-  /*  178 */ "WDURATION",
-  /*  179 */ "CAST",
+  /*  170 */ "ROWTS",
+  /*  171 */ "TBNAME",
+  /*  172 */ "QSTARTTS",
+  /*  173 */ "QENDTS",
+  /*  174 */ "WSTARTTS",
+  /*  175 */ "WENDTS",
+  /*  176 */ "WDURATION",
+  /*  177 */ "CAST",
+  /*  178 */ "NOW",
+  /*  179 */ "TODAY",
   /*  180 */ "COUNT",
   /*  181 */ "FIRST",
   /*  182 */ "LAST",
@@ -1142,46 +1146,47 @@ static const char *const yyTokenName[] = {
   /*  289 */ "subquery",
   /*  290 */ "star_func",
   /*  291 */ "star_func_para_list",
-  /*  292 */ "other_para_list",
-  /*  293 */ "star_func_para",
-  /*  294 */ "predicate",
-  /*  295 */ "compare_op",
-  /*  296 */ "in_op",
-  /*  297 */ "in_predicate_value",
-  /*  298 */ "boolean_value_expression",
-  /*  299 */ "boolean_primary",
-  /*  300 */ "common_expression",
-  /*  301 */ "from_clause",
-  /*  302 */ "table_reference_list",
-  /*  303 */ "table_reference",
-  /*  304 */ "table_primary",
-  /*  305 */ "joined_table",
-  /*  306 */ "alias_opt",
-  /*  307 */ "parenthesized_joined_table",
-  /*  308 */ "join_type",
-  /*  309 */ "search_condition",
-  /*  310 */ "query_specification",
-  /*  311 */ "set_quantifier_opt",
-  /*  312 */ "select_list",
-  /*  313 */ "where_clause_opt",
-  /*  314 */ "partition_by_clause_opt",
-  /*  315 */ "twindow_clause_opt",
-  /*  316 */ "group_by_clause_opt",
-  /*  317 */ "having_clause_opt",
-  /*  318 */ "select_sublist",
-  /*  319 */ "select_item",
-  /*  320 */ "fill_opt",
-  /*  321 */ "fill_mode",
-  /*  322 */ "group_by_list",
-  /*  323 */ "query_expression_body",
-  /*  324 */ "order_by_clause_opt",
-  /*  325 */ "slimit_clause_opt",
-  /*  326 */ "limit_clause_opt",
-  /*  327 */ "query_primary",
-  /*  328 */ "sort_specification_list",
-  /*  329 */ "sort_specification",
-  /*  330 */ "ordering_specification_opt",
-  /*  331 */ "null_ordering_opt",
+  /*  292 */ "noarg_func",
+  /*  293 */ "other_para_list",
+  /*  294 */ "star_func_para",
+  /*  295 */ "predicate",
+  /*  296 */ "compare_op",
+  /*  297 */ "in_op",
+  /*  298 */ "in_predicate_value",
+  /*  299 */ "boolean_value_expression",
+  /*  300 */ "boolean_primary",
+  /*  301 */ "common_expression",
+  /*  302 */ "from_clause",
+  /*  303 */ "table_reference_list",
+  /*  304 */ "table_reference",
+  /*  305 */ "table_primary",
+  /*  306 */ "joined_table",
+  /*  307 */ "alias_opt",
+  /*  308 */ "parenthesized_joined_table",
+  /*  309 */ "join_type",
+  /*  310 */ "search_condition",
+  /*  311 */ "query_specification",
+  /*  312 */ "set_quantifier_opt",
+  /*  313 */ "select_list",
+  /*  314 */ "where_clause_opt",
+  /*  315 */ "partition_by_clause_opt",
+  /*  316 */ "twindow_clause_opt",
+  /*  317 */ "group_by_clause_opt",
+  /*  318 */ "having_clause_opt",
+  /*  319 */ "select_sublist",
+  /*  320 */ "select_item",
+  /*  321 */ "fill_opt",
+  /*  322 */ "fill_mode",
+  /*  323 */ "group_by_list",
+  /*  324 */ "query_expression_body",
+  /*  325 */ "order_by_clause_opt",
+  /*  326 */ "slimit_clause_opt",
+  /*  327 */ "limit_clause_opt",
+  /*  328 */ "query_primary",
+  /*  329 */ "sort_specification_list",
+  /*  330 */ "sort_specification",
+  /*  331 */ "ordering_specification_opt",
+  /*  332 */ "null_ordering_opt",
 };
 #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
 
@@ -1491,135 +1496,136 @@ static const char *const yyRuleName[] = {
  /* 299 */ "expression_list ::= expression_list NK_COMMA expression",
  /* 300 */ "column_reference ::= column_name",
  /* 301 */ "column_reference ::= table_name NK_DOT column_name",
- /* 302 */ "pseudo_column ::= NOW",
- /* 303 */ "pseudo_column ::= TODAY",
- /* 304 */ "pseudo_column ::= ROWTS",
- /* 305 */ "pseudo_column ::= TBNAME",
- /* 306 */ "pseudo_column ::= QSTARTTS",
- /* 307 */ "pseudo_column ::= QENDTS",
- /* 308 */ "pseudo_column ::= WSTARTTS",
- /* 309 */ "pseudo_column ::= WENDTS",
- /* 310 */ "pseudo_column ::= WDURATION",
- /* 311 */ "function_expression ::= function_name NK_LP expression_list NK_RP",
- /* 312 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP",
- /* 313 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP",
- /* 314 */ "star_func ::= COUNT",
- /* 315 */ "star_func ::= FIRST",
- /* 316 */ "star_func ::= LAST",
- /* 317 */ "star_func ::= LAST_ROW",
- /* 318 */ "star_func_para_list ::= NK_STAR",
- /* 319 */ "star_func_para_list ::= other_para_list",
- /* 320 */ "other_para_list ::= star_func_para",
- /* 321 */ "other_para_list ::= other_para_list NK_COMMA star_func_para",
- /* 322 */ "star_func_para ::= expression",
- /* 323 */ "star_func_para ::= table_name NK_DOT NK_STAR",
- /* 324 */ "predicate ::= expression compare_op expression",
- /* 325 */ "predicate ::= expression BETWEEN expression AND expression",
- /* 326 */ "predicate ::= expression NOT BETWEEN expression AND expression",
- /* 327 */ "predicate ::= expression IS NULL",
- /* 328 */ "predicate ::= expression IS NOT NULL",
- /* 329 */ "predicate ::= expression in_op in_predicate_value",
- /* 330 */ "compare_op ::= NK_LT",
- /* 331 */ "compare_op ::= NK_GT",
- /* 332 */ "compare_op ::= NK_LE",
- /* 333 */ "compare_op ::= NK_GE",
- /* 334 */ "compare_op ::= NK_NE",
- /* 335 */ "compare_op ::= NK_EQ",
- /* 336 */ "compare_op ::= LIKE",
- /* 337 */ "compare_op ::= NOT LIKE",
- /* 338 */ "compare_op ::= MATCH",
- /* 339 */ "compare_op ::= NMATCH",
- /* 340 */ "compare_op ::= CONTAINS",
- /* 341 */ "in_op ::= IN",
- /* 342 */ "in_op ::= NOT IN",
- /* 343 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
- /* 344 */ "boolean_value_expression ::= boolean_primary",
- /* 345 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 346 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 347 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 348 */ "boolean_primary ::= predicate",
- /* 349 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 350 */ "common_expression ::= expression",
- /* 351 */ "common_expression ::= boolean_value_expression",
- /* 352 */ "from_clause ::= FROM table_reference_list",
- /* 353 */ "table_reference_list ::= table_reference",
- /* 354 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 355 */ "table_reference ::= table_primary",
- /* 356 */ "table_reference ::= joined_table",
- /* 357 */ "table_primary ::= table_name alias_opt",
- /* 358 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 359 */ "table_primary ::= subquery alias_opt",
- /* 360 */ "table_primary ::= parenthesized_joined_table",
- /* 361 */ "alias_opt ::=",
- /* 362 */ "alias_opt ::= table_alias",
- /* 363 */ "alias_opt ::= AS table_alias",
- /* 364 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 365 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 366 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 367 */ "join_type ::=",
- /* 368 */ "join_type ::= INNER",
- /* 369 */ "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",
- /* 370 */ "set_quantifier_opt ::=",
- /* 371 */ "set_quantifier_opt ::= DISTINCT",
- /* 372 */ "set_quantifier_opt ::= ALL",
- /* 373 */ "select_list ::= NK_STAR",
- /* 374 */ "select_list ::= select_sublist",
- /* 375 */ "select_sublist ::= select_item",
- /* 376 */ "select_sublist ::= select_sublist NK_COMMA select_item",
- /* 377 */ "select_item ::= common_expression",
- /* 378 */ "select_item ::= common_expression column_alias",
- /* 379 */ "select_item ::= common_expression AS column_alias",
- /* 380 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 381 */ "where_clause_opt ::=",
- /* 382 */ "where_clause_opt ::= WHERE search_condition",
- /* 383 */ "partition_by_clause_opt ::=",
- /* 384 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
- /* 385 */ "twindow_clause_opt ::=",
- /* 386 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
- /* 387 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP",
- /* 388 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
- /* 389 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
- /* 390 */ "sliding_opt ::=",
- /* 391 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
- /* 392 */ "fill_opt ::=",
- /* 393 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 394 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
- /* 395 */ "fill_mode ::= NONE",
- /* 396 */ "fill_mode ::= PREV",
- /* 397 */ "fill_mode ::= NULL",
- /* 398 */ "fill_mode ::= LINEAR",
- /* 399 */ "fill_mode ::= NEXT",
- /* 400 */ "group_by_clause_opt ::=",
- /* 401 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 402 */ "group_by_list ::= expression",
- /* 403 */ "group_by_list ::= group_by_list NK_COMMA expression",
- /* 404 */ "having_clause_opt ::=",
- /* 405 */ "having_clause_opt ::= HAVING search_condition",
- /* 406 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 407 */ "query_expression_body ::= query_primary",
- /* 408 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
- /* 409 */ "query_primary ::= query_specification",
- /* 410 */ "order_by_clause_opt ::=",
- /* 411 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 412 */ "slimit_clause_opt ::=",
- /* 413 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 414 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 415 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 416 */ "limit_clause_opt ::=",
- /* 417 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 418 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 419 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 420 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 421 */ "search_condition ::= common_expression",
- /* 422 */ "sort_specification_list ::= sort_specification",
- /* 423 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 424 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
- /* 425 */ "ordering_specification_opt ::=",
- /* 426 */ "ordering_specification_opt ::= ASC",
- /* 427 */ "ordering_specification_opt ::= DESC",
- /* 428 */ "null_ordering_opt ::=",
- /* 429 */ "null_ordering_opt ::= NULLS FIRST",
- /* 430 */ "null_ordering_opt ::= NULLS LAST",
+ /* 302 */ "pseudo_column ::= ROWTS",
+ /* 303 */ "pseudo_column ::= TBNAME",
+ /* 304 */ "pseudo_column ::= QSTARTTS",
+ /* 305 */ "pseudo_column ::= QENDTS",
+ /* 306 */ "pseudo_column ::= WSTARTTS",
+ /* 307 */ "pseudo_column ::= WENDTS",
+ /* 308 */ "pseudo_column ::= WDURATION",
+ /* 309 */ "function_expression ::= function_name NK_LP expression_list NK_RP",
+ /* 310 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP",
+ /* 311 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP",
+ /* 312 */ "function_expression ::= noarg_func NK_LP NK_RP",
+ /* 313 */ "noarg_func ::= NOW",
+ /* 314 */ "noarg_func ::= TODAY",
+ /* 315 */ "star_func ::= COUNT",
+ /* 316 */ "star_func ::= FIRST",
+ /* 317 */ "star_func ::= LAST",
+ /* 318 */ "star_func ::= LAST_ROW",
+ /* 319 */ "star_func_para_list ::= NK_STAR",
+ /* 320 */ "star_func_para_list ::= other_para_list",
+ /* 321 */ "other_para_list ::= star_func_para",
+ /* 322 */ "other_para_list ::= other_para_list NK_COMMA star_func_para",
+ /* 323 */ "star_func_para ::= expression",
+ /* 324 */ "star_func_para ::= table_name NK_DOT NK_STAR",
+ /* 325 */ "predicate ::= expression compare_op expression",
+ /* 326 */ "predicate ::= expression BETWEEN expression AND expression",
+ /* 327 */ "predicate ::= expression NOT BETWEEN expression AND expression",
+ /* 328 */ "predicate ::= expression IS NULL",
+ /* 329 */ "predicate ::= expression IS NOT NULL",
+ /* 330 */ "predicate ::= expression in_op in_predicate_value",
+ /* 331 */ "compare_op ::= NK_LT",
+ /* 332 */ "compare_op ::= NK_GT",
+ /* 333 */ "compare_op ::= NK_LE",
+ /* 334 */ "compare_op ::= NK_GE",
+ /* 335 */ "compare_op ::= NK_NE",
+ /* 336 */ "compare_op ::= NK_EQ",
+ /* 337 */ "compare_op ::= LIKE",
+ /* 338 */ "compare_op ::= NOT LIKE",
+ /* 339 */ "compare_op ::= MATCH",
+ /* 340 */ "compare_op ::= NMATCH",
+ /* 341 */ "compare_op ::= CONTAINS",
+ /* 342 */ "in_op ::= IN",
+ /* 343 */ "in_op ::= NOT IN",
+ /* 344 */ "in_predicate_value ::= NK_LP expression_list NK_RP",
+ /* 345 */ "boolean_value_expression ::= boolean_primary",
+ /* 346 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 347 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 348 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 349 */ "boolean_primary ::= predicate",
+ /* 350 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 351 */ "common_expression ::= expression",
+ /* 352 */ "common_expression ::= boolean_value_expression",
+ /* 353 */ "from_clause ::= FROM table_reference_list",
+ /* 354 */ "table_reference_list ::= table_reference",
+ /* 355 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 356 */ "table_reference ::= table_primary",
+ /* 357 */ "table_reference ::= joined_table",
+ /* 358 */ "table_primary ::= table_name alias_opt",
+ /* 359 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 360 */ "table_primary ::= subquery alias_opt",
+ /* 361 */ "table_primary ::= parenthesized_joined_table",
+ /* 362 */ "alias_opt ::=",
+ /* 363 */ "alias_opt ::= table_alias",
+ /* 364 */ "alias_opt ::= AS table_alias",
+ /* 365 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 366 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 367 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 368 */ "join_type ::=",
+ /* 369 */ "join_type ::= INNER",
+ /* 370 */ "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",
+ /* 371 */ "set_quantifier_opt ::=",
+ /* 372 */ "set_quantifier_opt ::= DISTINCT",
+ /* 373 */ "set_quantifier_opt ::= ALL",
+ /* 374 */ "select_list ::= NK_STAR",
+ /* 375 */ "select_list ::= select_sublist",
+ /* 376 */ "select_sublist ::= select_item",
+ /* 377 */ "select_sublist ::= select_sublist NK_COMMA select_item",
+ /* 378 */ "select_item ::= common_expression",
+ /* 379 */ "select_item ::= common_expression column_alias",
+ /* 380 */ "select_item ::= common_expression AS column_alias",
+ /* 381 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 382 */ "where_clause_opt ::=",
+ /* 383 */ "where_clause_opt ::= WHERE search_condition",
+ /* 384 */ "partition_by_clause_opt ::=",
+ /* 385 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
+ /* 386 */ "twindow_clause_opt ::=",
+ /* 387 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
+ /* 388 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP",
+ /* 389 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
+ /* 390 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
+ /* 391 */ "sliding_opt ::=",
+ /* 392 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
+ /* 393 */ "fill_opt ::=",
+ /* 394 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 395 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
+ /* 396 */ "fill_mode ::= NONE",
+ /* 397 */ "fill_mode ::= PREV",
+ /* 398 */ "fill_mode ::= NULL",
+ /* 399 */ "fill_mode ::= LINEAR",
+ /* 400 */ "fill_mode ::= NEXT",
+ /* 401 */ "group_by_clause_opt ::=",
+ /* 402 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 403 */ "group_by_list ::= expression",
+ /* 404 */ "group_by_list ::= group_by_list NK_COMMA expression",
+ /* 405 */ "having_clause_opt ::=",
+ /* 406 */ "having_clause_opt ::= HAVING search_condition",
+ /* 407 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 408 */ "query_expression_body ::= query_primary",
+ /* 409 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
+ /* 410 */ "query_primary ::= query_specification",
+ /* 411 */ "order_by_clause_opt ::=",
+ /* 412 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 413 */ "slimit_clause_opt ::=",
+ /* 414 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 415 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 416 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 417 */ "limit_clause_opt ::=",
+ /* 418 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 419 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 420 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 421 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 422 */ "search_condition ::= common_expression",
+ /* 423 */ "sort_specification_list ::= sort_specification",
+ /* 424 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 425 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
+ /* 426 */ "ordering_specification_opt ::=",
+ /* 427 */ "ordering_specification_opt ::= ASC",
+ /* 428 */ "ordering_specification_opt ::= DESC",
+ /* 429 */ "null_ordering_opt ::=",
+ /* 430 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 431 */ "null_ordering_opt ::= NULLS LAST",
 };
 #endif /* NDEBUG */
 
@@ -1779,32 +1785,32 @@ static void yy_destructor(
     case 287: /* column_reference */
     case 288: /* function_expression */
     case 289: /* subquery */
-    case 293: /* star_func_para */
-    case 294: /* predicate */
-    case 297: /* in_predicate_value */
-    case 298: /* boolean_value_expression */
-    case 299: /* boolean_primary */
-    case 300: /* common_expression */
-    case 301: /* from_clause */
-    case 302: /* table_reference_list */
-    case 303: /* table_reference */
-    case 304: /* table_primary */
-    case 305: /* joined_table */
-    case 307: /* parenthesized_joined_table */
-    case 309: /* search_condition */
-    case 310: /* query_specification */
-    case 313: /* where_clause_opt */
-    case 315: /* twindow_clause_opt */
-    case 317: /* having_clause_opt */
-    case 319: /* select_item */
-    case 320: /* fill_opt */
-    case 323: /* query_expression_body */
-    case 325: /* slimit_clause_opt */
-    case 326: /* limit_clause_opt */
-    case 327: /* query_primary */
-    case 329: /* sort_specification */
+    case 294: /* star_func_para */
+    case 295: /* predicate */
+    case 298: /* in_predicate_value */
+    case 299: /* boolean_value_expression */
+    case 300: /* boolean_primary */
+    case 301: /* common_expression */
+    case 302: /* from_clause */
+    case 303: /* table_reference_list */
+    case 304: /* table_reference */
+    case 305: /* table_primary */
+    case 306: /* joined_table */
+    case 308: /* parenthesized_joined_table */
+    case 310: /* search_condition */
+    case 311: /* query_specification */
+    case 314: /* where_clause_opt */
+    case 316: /* twindow_clause_opt */
+    case 318: /* having_clause_opt */
+    case 320: /* select_item */
+    case 321: /* fill_opt */
+    case 324: /* query_expression_body */
+    case 326: /* slimit_clause_opt */
+    case 327: /* limit_clause_opt */
+    case 328: /* query_primary */
+    case 330: /* sort_specification */
 {
- nodesDestroyNode((yypminor->yy192)); 
+ nodesDestroyNode((yypminor->yy452)); 
 }
       break;
     case 220: /* account_options */
@@ -1828,7 +1834,8 @@ static void yy_destructor(
     case 283: /* table_alias */
     case 284: /* column_alias */
     case 290: /* star_func */
-    case 306: /* alias_opt */
+    case 292: /* noarg_func */
+    case 307: /* alias_opt */
 {
  
 }
@@ -1837,7 +1844,7 @@ static void yy_destructor(
     case 230: /* exists_opt */
     case 273: /* analyze_opt */
     case 275: /* agg_func_opt */
-    case 311: /* set_quantifier_opt */
+    case 312: /* set_quantifier_opt */
 {
  
 }
@@ -1858,16 +1865,16 @@ static void yy_destructor(
     case 270: /* expression_list */
     case 280: /* dnode_list */
     case 291: /* star_func_para_list */
-    case 292: /* other_para_list */
-    case 312: /* select_list */
-    case 314: /* partition_by_clause_opt */
-    case 316: /* group_by_clause_opt */
-    case 318: /* select_sublist */
-    case 322: /* group_by_list */
-    case 324: /* order_by_clause_opt */
-    case 328: /* sort_specification_list */
+    case 293: /* other_para_list */
+    case 313: /* select_list */
+    case 315: /* partition_by_clause_opt */
+    case 317: /* group_by_clause_opt */
+    case 319: /* select_sublist */
+    case 323: /* group_by_list */
+    case 325: /* order_by_clause_opt */
+    case 329: /* sort_specification_list */
 {
- nodesDestroyList((yypminor->yy64)); 
+ nodesDestroyList((yypminor->yy478)); 
 }
       break;
     case 235: /* alter_db_option */
@@ -1881,28 +1888,28 @@ static void yy_destructor(
  
 }
       break;
-    case 295: /* compare_op */
-    case 296: /* in_op */
+    case 296: /* compare_op */
+    case 297: /* in_op */
 {
  
 }
       break;
-    case 308: /* join_type */
+    case 309: /* join_type */
 {
  
 }
       break;
-    case 321: /* fill_mode */
+    case 322: /* fill_mode */
 {
  
 }
       break;
-    case 330: /* ordering_specification_opt */
+    case 331: /* ordering_specification_opt */
 {
  
 }
       break;
-    case 331: /* null_ordering_opt */
+    case 332: /* null_ordering_opt */
 {
  
 }
@@ -2503,135 +2510,136 @@ static const struct {
   {  270,   -3 }, /* (299) expression_list ::= expression_list NK_COMMA expression */
   {  287,   -1 }, /* (300) column_reference ::= column_name */
   {  287,   -3 }, /* (301) column_reference ::= table_name NK_DOT column_name */
-  {  286,   -1 }, /* (302) pseudo_column ::= NOW */
-  {  286,   -1 }, /* (303) pseudo_column ::= TODAY */
-  {  286,   -1 }, /* (304) pseudo_column ::= ROWTS */
-  {  286,   -1 }, /* (305) pseudo_column ::= TBNAME */
-  {  286,   -1 }, /* (306) pseudo_column ::= QSTARTTS */
-  {  286,   -1 }, /* (307) pseudo_column ::= QENDTS */
-  {  286,   -1 }, /* (308) pseudo_column ::= WSTARTTS */
-  {  286,   -1 }, /* (309) pseudo_column ::= WENDTS */
-  {  286,   -1 }, /* (310) pseudo_column ::= WDURATION */
-  {  288,   -4 }, /* (311) function_expression ::= function_name NK_LP expression_list NK_RP */
-  {  288,   -4 }, /* (312) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
-  {  288,   -6 }, /* (313) function_expression ::= CAST NK_LP expression AS type_name NK_RP */
-  {  290,   -1 }, /* (314) star_func ::= COUNT */
-  {  290,   -1 }, /* (315) star_func ::= FIRST */
-  {  290,   -1 }, /* (316) star_func ::= LAST */
-  {  290,   -1 }, /* (317) star_func ::= LAST_ROW */
-  {  291,   -1 }, /* (318) star_func_para_list ::= NK_STAR */
-  {  291,   -1 }, /* (319) star_func_para_list ::= other_para_list */
-  {  292,   -1 }, /* (320) other_para_list ::= star_func_para */
-  {  292,   -3 }, /* (321) other_para_list ::= other_para_list NK_COMMA star_func_para */
-  {  293,   -1 }, /* (322) star_func_para ::= expression */
-  {  293,   -3 }, /* (323) star_func_para ::= table_name NK_DOT NK_STAR */
-  {  294,   -3 }, /* (324) predicate ::= expression compare_op expression */
-  {  294,   -5 }, /* (325) predicate ::= expression BETWEEN expression AND expression */
-  {  294,   -6 }, /* (326) predicate ::= expression NOT BETWEEN expression AND expression */
-  {  294,   -3 }, /* (327) predicate ::= expression IS NULL */
-  {  294,   -4 }, /* (328) predicate ::= expression IS NOT NULL */
-  {  294,   -3 }, /* (329) predicate ::= expression in_op in_predicate_value */
-  {  295,   -1 }, /* (330) compare_op ::= NK_LT */
-  {  295,   -1 }, /* (331) compare_op ::= NK_GT */
-  {  295,   -1 }, /* (332) compare_op ::= NK_LE */
-  {  295,   -1 }, /* (333) compare_op ::= NK_GE */
-  {  295,   -1 }, /* (334) compare_op ::= NK_NE */
-  {  295,   -1 }, /* (335) compare_op ::= NK_EQ */
-  {  295,   -1 }, /* (336) compare_op ::= LIKE */
-  {  295,   -2 }, /* (337) compare_op ::= NOT LIKE */
-  {  295,   -1 }, /* (338) compare_op ::= MATCH */
-  {  295,   -1 }, /* (339) compare_op ::= NMATCH */
-  {  295,   -1 }, /* (340) compare_op ::= CONTAINS */
-  {  296,   -1 }, /* (341) in_op ::= IN */
-  {  296,   -2 }, /* (342) in_op ::= NOT IN */
-  {  297,   -3 }, /* (343) in_predicate_value ::= NK_LP expression_list NK_RP */
-  {  298,   -1 }, /* (344) boolean_value_expression ::= boolean_primary */
-  {  298,   -2 }, /* (345) boolean_value_expression ::= NOT boolean_primary */
-  {  298,   -3 }, /* (346) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
-  {  298,   -3 }, /* (347) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
-  {  299,   -1 }, /* (348) boolean_primary ::= predicate */
-  {  299,   -3 }, /* (349) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
-  {  300,   -1 }, /* (350) common_expression ::= expression */
-  {  300,   -1 }, /* (351) common_expression ::= boolean_value_expression */
-  {  301,   -2 }, /* (352) from_clause ::= FROM table_reference_list */
-  {  302,   -1 }, /* (353) table_reference_list ::= table_reference */
-  {  302,   -3 }, /* (354) table_reference_list ::= table_reference_list NK_COMMA table_reference */
-  {  303,   -1 }, /* (355) table_reference ::= table_primary */
-  {  303,   -1 }, /* (356) table_reference ::= joined_table */
-  {  304,   -2 }, /* (357) table_primary ::= table_name alias_opt */
-  {  304,   -4 }, /* (358) table_primary ::= db_name NK_DOT table_name alias_opt */
-  {  304,   -2 }, /* (359) table_primary ::= subquery alias_opt */
-  {  304,   -1 }, /* (360) table_primary ::= parenthesized_joined_table */
-  {  306,    0 }, /* (361) alias_opt ::= */
-  {  306,   -1 }, /* (362) alias_opt ::= table_alias */
-  {  306,   -2 }, /* (363) alias_opt ::= AS table_alias */
-  {  307,   -3 }, /* (364) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-  {  307,   -3 }, /* (365) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
-  {  305,   -6 }, /* (366) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-  {  308,    0 }, /* (367) join_type ::= */
-  {  308,   -1 }, /* (368) join_type ::= INNER */
-  {  310,   -9 }, /* (369) 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 */
-  {  311,    0 }, /* (370) set_quantifier_opt ::= */
-  {  311,   -1 }, /* (371) set_quantifier_opt ::= DISTINCT */
-  {  311,   -1 }, /* (372) set_quantifier_opt ::= ALL */
-  {  312,   -1 }, /* (373) select_list ::= NK_STAR */
-  {  312,   -1 }, /* (374) select_list ::= select_sublist */
-  {  318,   -1 }, /* (375) select_sublist ::= select_item */
-  {  318,   -3 }, /* (376) select_sublist ::= select_sublist NK_COMMA select_item */
-  {  319,   -1 }, /* (377) select_item ::= common_expression */
-  {  319,   -2 }, /* (378) select_item ::= common_expression column_alias */
-  {  319,   -3 }, /* (379) select_item ::= common_expression AS column_alias */
-  {  319,   -3 }, /* (380) select_item ::= table_name NK_DOT NK_STAR */
-  {  313,    0 }, /* (381) where_clause_opt ::= */
-  {  313,   -2 }, /* (382) where_clause_opt ::= WHERE search_condition */
-  {  314,    0 }, /* (383) partition_by_clause_opt ::= */
-  {  314,   -3 }, /* (384) partition_by_clause_opt ::= PARTITION BY expression_list */
-  {  315,    0 }, /* (385) twindow_clause_opt ::= */
-  {  315,   -6 }, /* (386) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-  {  315,   -4 }, /* (387) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
-  {  315,   -6 }, /* (388) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-  {  315,   -8 }, /* (389) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-  {  268,    0 }, /* (390) sliding_opt ::= */
-  {  268,   -4 }, /* (391) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-  {  320,    0 }, /* (392) fill_opt ::= */
-  {  320,   -4 }, /* (393) fill_opt ::= FILL NK_LP fill_mode NK_RP */
-  {  320,   -6 }, /* (394) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-  {  321,   -1 }, /* (395) fill_mode ::= NONE */
-  {  321,   -1 }, /* (396) fill_mode ::= PREV */
-  {  321,   -1 }, /* (397) fill_mode ::= NULL */
-  {  321,   -1 }, /* (398) fill_mode ::= LINEAR */
-  {  321,   -1 }, /* (399) fill_mode ::= NEXT */
-  {  316,    0 }, /* (400) group_by_clause_opt ::= */
-  {  316,   -3 }, /* (401) group_by_clause_opt ::= GROUP BY group_by_list */
-  {  322,   -1 }, /* (402) group_by_list ::= expression */
-  {  322,   -3 }, /* (403) group_by_list ::= group_by_list NK_COMMA expression */
-  {  317,    0 }, /* (404) having_clause_opt ::= */
-  {  317,   -2 }, /* (405) having_clause_opt ::= HAVING search_condition */
-  {  272,   -4 }, /* (406) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
-  {  323,   -1 }, /* (407) query_expression_body ::= query_primary */
-  {  323,   -4 }, /* (408) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-  {  327,   -1 }, /* (409) query_primary ::= query_specification */
-  {  324,    0 }, /* (410) order_by_clause_opt ::= */
-  {  324,   -3 }, /* (411) order_by_clause_opt ::= ORDER BY sort_specification_list */
-  {  325,    0 }, /* (412) slimit_clause_opt ::= */
-  {  325,   -2 }, /* (413) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-  {  325,   -4 }, /* (414) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-  {  325,   -4 }, /* (415) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  326,    0 }, /* (416) limit_clause_opt ::= */
-  {  326,   -2 }, /* (417) limit_clause_opt ::= LIMIT NK_INTEGER */
-  {  326,   -4 }, /* (418) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-  {  326,   -4 }, /* (419) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-  {  289,   -3 }, /* (420) subquery ::= NK_LP query_expression NK_RP */
-  {  309,   -1 }, /* (421) search_condition ::= common_expression */
-  {  328,   -1 }, /* (422) sort_specification_list ::= sort_specification */
-  {  328,   -3 }, /* (423) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-  {  329,   -3 }, /* (424) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-  {  330,    0 }, /* (425) ordering_specification_opt ::= */
-  {  330,   -1 }, /* (426) ordering_specification_opt ::= ASC */
-  {  330,   -1 }, /* (427) ordering_specification_opt ::= DESC */
-  {  331,    0 }, /* (428) null_ordering_opt ::= */
-  {  331,   -2 }, /* (429) null_ordering_opt ::= NULLS FIRST */
-  {  331,   -2 }, /* (430) null_ordering_opt ::= NULLS LAST */
+  {  286,   -1 }, /* (302) pseudo_column ::= ROWTS */
+  {  286,   -1 }, /* (303) pseudo_column ::= TBNAME */
+  {  286,   -1 }, /* (304) pseudo_column ::= QSTARTTS */
+  {  286,   -1 }, /* (305) pseudo_column ::= QENDTS */
+  {  286,   -1 }, /* (306) pseudo_column ::= WSTARTTS */
+  {  286,   -1 }, /* (307) pseudo_column ::= WENDTS */
+  {  286,   -1 }, /* (308) pseudo_column ::= WDURATION */
+  {  288,   -4 }, /* (309) function_expression ::= function_name NK_LP expression_list NK_RP */
+  {  288,   -4 }, /* (310) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
+  {  288,   -6 }, /* (311) function_expression ::= CAST NK_LP expression AS type_name NK_RP */
+  {  288,   -3 }, /* (312) function_expression ::= noarg_func NK_LP NK_RP */
+  {  292,   -1 }, /* (313) noarg_func ::= NOW */
+  {  292,   -1 }, /* (314) noarg_func ::= TODAY */
+  {  290,   -1 }, /* (315) star_func ::= COUNT */
+  {  290,   -1 }, /* (316) star_func ::= FIRST */
+  {  290,   -1 }, /* (317) star_func ::= LAST */
+  {  290,   -1 }, /* (318) star_func ::= LAST_ROW */
+  {  291,   -1 }, /* (319) star_func_para_list ::= NK_STAR */
+  {  291,   -1 }, /* (320) star_func_para_list ::= other_para_list */
+  {  293,   -1 }, /* (321) other_para_list ::= star_func_para */
+  {  293,   -3 }, /* (322) other_para_list ::= other_para_list NK_COMMA star_func_para */
+  {  294,   -1 }, /* (323) star_func_para ::= expression */
+  {  294,   -3 }, /* (324) star_func_para ::= table_name NK_DOT NK_STAR */
+  {  295,   -3 }, /* (325) predicate ::= expression compare_op expression */
+  {  295,   -5 }, /* (326) predicate ::= expression BETWEEN expression AND expression */
+  {  295,   -6 }, /* (327) predicate ::= expression NOT BETWEEN expression AND expression */
+  {  295,   -3 }, /* (328) predicate ::= expression IS NULL */
+  {  295,   -4 }, /* (329) predicate ::= expression IS NOT NULL */
+  {  295,   -3 }, /* (330) predicate ::= expression in_op in_predicate_value */
+  {  296,   -1 }, /* (331) compare_op ::= NK_LT */
+  {  296,   -1 }, /* (332) compare_op ::= NK_GT */
+  {  296,   -1 }, /* (333) compare_op ::= NK_LE */
+  {  296,   -1 }, /* (334) compare_op ::= NK_GE */
+  {  296,   -1 }, /* (335) compare_op ::= NK_NE */
+  {  296,   -1 }, /* (336) compare_op ::= NK_EQ */
+  {  296,   -1 }, /* (337) compare_op ::= LIKE */
+  {  296,   -2 }, /* (338) compare_op ::= NOT LIKE */
+  {  296,   -1 }, /* (339) compare_op ::= MATCH */
+  {  296,   -1 }, /* (340) compare_op ::= NMATCH */
+  {  296,   -1 }, /* (341) compare_op ::= CONTAINS */
+  {  297,   -1 }, /* (342) in_op ::= IN */
+  {  297,   -2 }, /* (343) in_op ::= NOT IN */
+  {  298,   -3 }, /* (344) in_predicate_value ::= NK_LP expression_list NK_RP */
+  {  299,   -1 }, /* (345) boolean_value_expression ::= boolean_primary */
+  {  299,   -2 }, /* (346) boolean_value_expression ::= NOT boolean_primary */
+  {  299,   -3 }, /* (347) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+  {  299,   -3 }, /* (348) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+  {  300,   -1 }, /* (349) boolean_primary ::= predicate */
+  {  300,   -3 }, /* (350) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+  {  301,   -1 }, /* (351) common_expression ::= expression */
+  {  301,   -1 }, /* (352) common_expression ::= boolean_value_expression */
+  {  302,   -2 }, /* (353) from_clause ::= FROM table_reference_list */
+  {  303,   -1 }, /* (354) table_reference_list ::= table_reference */
+  {  303,   -3 }, /* (355) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+  {  304,   -1 }, /* (356) table_reference ::= table_primary */
+  {  304,   -1 }, /* (357) table_reference ::= joined_table */
+  {  305,   -2 }, /* (358) table_primary ::= table_name alias_opt */
+  {  305,   -4 }, /* (359) table_primary ::= db_name NK_DOT table_name alias_opt */
+  {  305,   -2 }, /* (360) table_primary ::= subquery alias_opt */
+  {  305,   -1 }, /* (361) table_primary ::= parenthesized_joined_table */
+  {  307,    0 }, /* (362) alias_opt ::= */
+  {  307,   -1 }, /* (363) alias_opt ::= table_alias */
+  {  307,   -2 }, /* (364) alias_opt ::= AS table_alias */
+  {  308,   -3 }, /* (365) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+  {  308,   -3 }, /* (366) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+  {  306,   -6 }, /* (367) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+  {  309,    0 }, /* (368) join_type ::= */
+  {  309,   -1 }, /* (369) join_type ::= INNER */
+  {  311,   -9 }, /* (370) 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 */
+  {  312,    0 }, /* (371) set_quantifier_opt ::= */
+  {  312,   -1 }, /* (372) set_quantifier_opt ::= DISTINCT */
+  {  312,   -1 }, /* (373) set_quantifier_opt ::= ALL */
+  {  313,   -1 }, /* (374) select_list ::= NK_STAR */
+  {  313,   -1 }, /* (375) select_list ::= select_sublist */
+  {  319,   -1 }, /* (376) select_sublist ::= select_item */
+  {  319,   -3 }, /* (377) select_sublist ::= select_sublist NK_COMMA select_item */
+  {  320,   -1 }, /* (378) select_item ::= common_expression */
+  {  320,   -2 }, /* (379) select_item ::= common_expression column_alias */
+  {  320,   -3 }, /* (380) select_item ::= common_expression AS column_alias */
+  {  320,   -3 }, /* (381) select_item ::= table_name NK_DOT NK_STAR */
+  {  314,    0 }, /* (382) where_clause_opt ::= */
+  {  314,   -2 }, /* (383) where_clause_opt ::= WHERE search_condition */
+  {  315,    0 }, /* (384) partition_by_clause_opt ::= */
+  {  315,   -3 }, /* (385) partition_by_clause_opt ::= PARTITION BY expression_list */
+  {  316,    0 }, /* (386) twindow_clause_opt ::= */
+  {  316,   -6 }, /* (387) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+  {  316,   -4 }, /* (388) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
+  {  316,   -6 }, /* (389) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+  {  316,   -8 }, /* (390) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+  {  268,    0 }, /* (391) sliding_opt ::= */
+  {  268,   -4 }, /* (392) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+  {  321,    0 }, /* (393) fill_opt ::= */
+  {  321,   -4 }, /* (394) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+  {  321,   -6 }, /* (395) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+  {  322,   -1 }, /* (396) fill_mode ::= NONE */
+  {  322,   -1 }, /* (397) fill_mode ::= PREV */
+  {  322,   -1 }, /* (398) fill_mode ::= NULL */
+  {  322,   -1 }, /* (399) fill_mode ::= LINEAR */
+  {  322,   -1 }, /* (400) fill_mode ::= NEXT */
+  {  317,    0 }, /* (401) group_by_clause_opt ::= */
+  {  317,   -3 }, /* (402) group_by_clause_opt ::= GROUP BY group_by_list */
+  {  323,   -1 }, /* (403) group_by_list ::= expression */
+  {  323,   -3 }, /* (404) group_by_list ::= group_by_list NK_COMMA expression */
+  {  318,    0 }, /* (405) having_clause_opt ::= */
+  {  318,   -2 }, /* (406) having_clause_opt ::= HAVING search_condition */
+  {  272,   -4 }, /* (407) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+  {  324,   -1 }, /* (408) query_expression_body ::= query_primary */
+  {  324,   -4 }, /* (409) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+  {  328,   -1 }, /* (410) query_primary ::= query_specification */
+  {  325,    0 }, /* (411) order_by_clause_opt ::= */
+  {  325,   -3 }, /* (412) order_by_clause_opt ::= ORDER BY sort_specification_list */
+  {  326,    0 }, /* (413) slimit_clause_opt ::= */
+  {  326,   -2 }, /* (414) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+  {  326,   -4 }, /* (415) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+  {  326,   -4 }, /* (416) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  327,    0 }, /* (417) limit_clause_opt ::= */
+  {  327,   -2 }, /* (418) limit_clause_opt ::= LIMIT NK_INTEGER */
+  {  327,   -4 }, /* (419) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+  {  327,   -4 }, /* (420) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+  {  289,   -3 }, /* (421) subquery ::= NK_LP query_expression NK_RP */
+  {  310,   -1 }, /* (422) search_condition ::= common_expression */
+  {  329,   -1 }, /* (423) sort_specification_list ::= sort_specification */
+  {  329,   -3 }, /* (424) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+  {  330,   -3 }, /* (425) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+  {  331,    0 }, /* (426) ordering_specification_opt ::= */
+  {  331,   -1 }, /* (427) ordering_specification_opt ::= ASC */
+  {  331,   -1 }, /* (428) ordering_specification_opt ::= DESC */
+  {  332,    0 }, /* (429) null_ordering_opt ::= */
+  {  332,   -2 }, /* (430) null_ordering_opt ::= NULLS FIRST */
+  {  332,   -2 }, /* (431) null_ordering_opt ::= NULLS LAST */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -2768,28 +2776,28 @@ static YYACTIONTYPE yy_reduce(
   yy_destructor(yypParser,222,&yymsp[0].minor);
         break;
       case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy0); }
         break;
       case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy353, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy479, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
         break;
       case 26: /* cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy353, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy479, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); }
         break;
       case 27: /* cmd ::= DROP USER user_name */
-{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy479); }
         break;
       case 28: /* cmd ::= CREATE DNODE dnode_endpoint */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy353, NULL); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy479, NULL); }
         break;
       case 29: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy479, &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.yy353); }
+{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy479); }
         break;
       case 32: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
 { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); }
@@ -2816,12 +2824,14 @@ static YYACTIONTYPE yy_reduce(
       case 281: /* index_name ::= NK_ID */ yytestcase(yyruleno==281);
       case 282: /* topic_name ::= NK_ID */ yytestcase(yyruleno==282);
       case 283: /* stream_name ::= NK_ID */ yytestcase(yyruleno==283);
-      case 314: /* star_func ::= COUNT */ yytestcase(yyruleno==314);
-      case 315: /* star_func ::= FIRST */ yytestcase(yyruleno==315);
-      case 316: /* star_func ::= LAST */ yytestcase(yyruleno==316);
-      case 317: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==317);
-{ yylhsminor.yy353 = yymsp[0].minor.yy0; }
-  yymsp[0].minor.yy353 = yylhsminor.yy353;
+      case 313: /* noarg_func ::= NOW */ yytestcase(yyruleno==313);
+      case 314: /* noarg_func ::= TODAY */ yytestcase(yyruleno==314);
+      case 315: /* star_func ::= COUNT */ yytestcase(yyruleno==315);
+      case 316: /* star_func ::= FIRST */ yytestcase(yyruleno==316);
+      case 317: /* star_func ::= LAST */ yytestcase(yyruleno==317);
+      case 318: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==318);
+{ yylhsminor.yy479 = yymsp[0].minor.yy0; }
+  yymsp[0].minor.yy479 = yylhsminor.yy479;
         break;
       case 39: /* cmd ::= ALTER LOCAL NK_STRING */
 { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); }
@@ -2854,156 +2864,156 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &yymsp[0].minor.yy0); }
         break;
       case 49: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy273, &yymsp[-1].minor.yy353, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy659, &yymsp[-1].minor.yy479, yymsp[0].minor.yy452); }
         break;
       case 50: /* cmd ::= DROP DATABASE exists_opt db_name */
-{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy273, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy659, &yymsp[0].minor.yy479); }
         break;
       case 51: /* cmd ::= USE db_name */
-{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy479); }
         break;
       case 52: /* cmd ::= ALTER DATABASE db_name alter_db_options */
-{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy353, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy479, yymsp[0].minor.yy452); }
         break;
       case 53: /* not_exists_opt ::= IF NOT EXISTS */
-{ yymsp[-2].minor.yy273 = true; }
+{ yymsp[-2].minor.yy659 = true; }
         break;
       case 54: /* not_exists_opt ::= */
       case 56: /* exists_opt ::= */ yytestcase(yyruleno==56);
       case 222: /* analyze_opt ::= */ yytestcase(yyruleno==222);
       case 230: /* agg_func_opt ::= */ yytestcase(yyruleno==230);
-      case 370: /* set_quantifier_opt ::= */ yytestcase(yyruleno==370);
-{ yymsp[1].minor.yy273 = false; }
+      case 371: /* set_quantifier_opt ::= */ yytestcase(yyruleno==371);
+{ yymsp[1].minor.yy659 = false; }
         break;
       case 55: /* exists_opt ::= IF EXISTS */
-{ yymsp[-1].minor.yy273 = true; }
+{ yymsp[-1].minor.yy659 = true; }
         break;
       case 57: /* db_options ::= */
-{ yymsp[1].minor.yy192 = createDatabaseOptions(pCxt); }
+{ yymsp[1].minor.yy452 = createDatabaseOptions(pCxt); }
         break;
       case 58: /* db_options ::= db_options BLOCKS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pNumOfBlocks = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pNumOfBlocks = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 59: /* db_options ::= db_options CACHE NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pCacheBlockSize = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pCacheBlockSize = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 60: /* db_options ::= db_options CACHELAST NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pCachelast = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pCachelast = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 61: /* db_options ::= db_options COMP NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pCompressionLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pCompressionLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 62: /* db_options ::= db_options DAYS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pDaysPerFile = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pDaysPerFile = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 63: /* db_options ::= db_options DAYS NK_VARIABLE */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pDaysPerFile = (SValueNode*)createDurationValueNode(pCxt, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pDaysPerFile = (SValueNode*)createDurationValueNode(pCxt, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 64: /* db_options ::= db_options FSYNC NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pFsyncPeriod = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pFsyncPeriod = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 65: /* db_options ::= db_options MAXROWS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pMaxRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pMaxRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 66: /* db_options ::= db_options MINROWS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pMinRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pMinRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 67: /* db_options ::= db_options KEEP integer_list */
       case 68: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==68);
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pKeep = yymsp[0].minor.yy64; yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pKeep = yymsp[0].minor.yy478; yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 69: /* db_options ::= db_options PRECISION NK_STRING */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pPrecision = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pPrecision = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 70: /* db_options ::= db_options QUORUM NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pQuorum = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pQuorum = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 71: /* db_options ::= db_options REPLICA NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pReplica = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pReplica = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 72: /* db_options ::= db_options TTL NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 73: /* db_options ::= db_options WAL NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pWalLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pWalLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 74: /* db_options ::= db_options VGROUPS NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pNumOfVgroups = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pNumOfVgroups = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 75: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 76: /* db_options ::= db_options STREAM_MODE NK_INTEGER */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 77: /* db_options ::= db_options RETENTIONS retention_list */
-{ ((SDatabaseOptions*)yymsp[-2].minor.yy192)->pRetentions = yymsp[0].minor.yy64; yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SDatabaseOptions*)yymsp[-2].minor.yy452)->pRetentions = yymsp[0].minor.yy478; yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 78: /* alter_db_options ::= alter_db_option */
-{ yylhsminor.yy192 = createDatabaseOptions(pCxt); yylhsminor.yy192 = setDatabaseAlterOption(pCxt, yylhsminor.yy192, &yymsp[0].minor.yy277); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createDatabaseOptions(pCxt); yylhsminor.yy452 = setDatabaseAlterOption(pCxt, yylhsminor.yy452, &yymsp[0].minor.yy11); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 79: /* alter_db_options ::= alter_db_options alter_db_option */
-{ yylhsminor.yy192 = setDatabaseAlterOption(pCxt, yymsp[-1].minor.yy192, &yymsp[0].minor.yy277); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = setDatabaseAlterOption(pCxt, yymsp[-1].minor.yy452, &yymsp[0].minor.yy11); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 80: /* alter_db_option ::= BLOCKS NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 81: /* alter_db_option ::= FSYNC NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 82: /* alter_db_option ::= KEEP integer_list */
       case 83: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==83);
-{ yymsp[-1].minor.yy277.type = DB_OPTION_KEEP; yymsp[-1].minor.yy277.pList = yymsp[0].minor.yy64; }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_KEEP; yymsp[-1].minor.yy11.pList = yymsp[0].minor.yy478; }
         break;
       case 84: /* alter_db_option ::= WAL NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_WAL; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_WAL; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 85: /* alter_db_option ::= QUORUM NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 86: /* alter_db_option ::= CACHELAST NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 87: /* alter_db_option ::= REPLICA NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 88: /* integer_list ::= NK_INTEGER */
-{ yylhsminor.yy64 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
       case 89: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */
       case 248: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==248);
-{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[-2].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = addNodeToList(pCxt, yymsp[-2].minor.yy478, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[-2].minor.yy478 = yylhsminor.yy478;
         break;
       case 90: /* variable_list ::= NK_VARIABLE */
-{ yylhsminor.yy64 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
       case 91: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */
-{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[-2].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = addNodeToList(pCxt, yymsp[-2].minor.yy478, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[-2].minor.yy478 = yylhsminor.yy478;
         break;
       case 92: /* retention_list ::= retention */
       case 112: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==112);
@@ -3013,11 +3023,11 @@ static YYACTIONTYPE yy_reduce(
       case 203: /* func_name_list ::= func_name */ yytestcase(yyruleno==203);
       case 212: /* func_list ::= func */ yytestcase(yyruleno==212);
       case 272: /* literal_list ::= signed_literal */ yytestcase(yyruleno==272);
-      case 320: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==320);
-      case 375: /* select_sublist ::= select_item */ yytestcase(yyruleno==375);
-      case 422: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==422);
-{ yylhsminor.yy64 = createNodeList(pCxt, yymsp[0].minor.yy192); }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+      case 321: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==321);
+      case 376: /* select_sublist ::= select_item */ yytestcase(yyruleno==376);
+      case 423: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==423);
+{ yylhsminor.yy478 = createNodeList(pCxt, yymsp[0].minor.yy452); }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
       case 93: /* retention_list ::= retention_list NK_COMMA retention */
       case 123: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==123);
@@ -3025,242 +3035,242 @@ static YYACTIONTYPE yy_reduce(
       case 204: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==204);
       case 213: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==213);
       case 273: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==273);
-      case 321: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==321);
-      case 376: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==376);
-      case 423: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==423);
-{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, yymsp[0].minor.yy192); }
-  yymsp[-2].minor.yy64 = yylhsminor.yy64;
+      case 322: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==322);
+      case 377: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==377);
+      case 424: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==424);
+{ yylhsminor.yy478 = addNodeToList(pCxt, yymsp[-2].minor.yy478, yymsp[0].minor.yy452); }
+  yymsp[-2].minor.yy478 = yylhsminor.yy478;
         break;
       case 94: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
-{ yylhsminor.yy192 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 95: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
       case 97: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==97);
-{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy273, yymsp[-5].minor.yy192, yymsp[-3].minor.yy64, yymsp[-1].minor.yy64, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy659, yymsp[-5].minor.yy452, yymsp[-3].minor.yy478, yymsp[-1].minor.yy478, yymsp[0].minor.yy452); }
         break;
       case 96: /* cmd ::= CREATE TABLE multi_create_clause */
-{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy64); }
+{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy478); }
         break;
       case 98: /* cmd ::= DROP TABLE multi_drop_clause */
-{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy64); }
+{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy478); }
         break;
       case 99: /* cmd ::= DROP STABLE exists_opt full_table_name */
-{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy273, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy659, yymsp[0].minor.yy452); }
         break;
       case 100: /* cmd ::= ALTER TABLE alter_table_clause */
       case 101: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==101);
       case 250: /* cmd ::= query_expression */ yytestcase(yyruleno==250);
-{ pCxt->pRootNode = yymsp[0].minor.yy192; }
+{ pCxt->pRootNode = yymsp[0].minor.yy452; }
         break;
       case 102: /* alter_table_clause ::= full_table_name alter_table_options */
-{ yylhsminor.yy192 = createAlterTableOption(pCxt, yymsp[-1].minor.yy192, yymsp[0].minor.yy192); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableOption(pCxt, yymsp[-1].minor.yy452, yymsp[0].minor.yy452); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 103: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-{ yylhsminor.yy192 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy192, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy353, yymsp[0].minor.yy536); }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy452, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy479, yymsp[0].minor.yy430); }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 104: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
-{ yylhsminor.yy192 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy192, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy353); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy452, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy479); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
       case 105: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-{ yylhsminor.yy192 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy192, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy353, yymsp[0].minor.yy536); }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy452, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy479, yymsp[0].minor.yy430); }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 106: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-{ yylhsminor.yy192 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy192, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy452, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy479, &yymsp[0].minor.yy479); }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 107: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-{ yylhsminor.yy192 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy192, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy353, yymsp[0].minor.yy536); }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy452, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy479, yymsp[0].minor.yy430); }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 108: /* alter_table_clause ::= full_table_name DROP TAG column_name */
-{ yylhsminor.yy192 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy192, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy353); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy452, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy479); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
       case 109: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-{ yylhsminor.yy192 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy192, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy353, yymsp[0].minor.yy536); }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy452, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy479, yymsp[0].minor.yy430); }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 110: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-{ yylhsminor.yy192 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy192, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy452, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy479, &yymsp[0].minor.yy479); }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 111: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */
-{ yylhsminor.yy192 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy192, &yymsp[-2].minor.yy353, yymsp[0].minor.yy192); }
-  yymsp[-5].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy452, &yymsp[-2].minor.yy479, yymsp[0].minor.yy452); }
+  yymsp[-5].minor.yy452 = yylhsminor.yy452;
         break;
       case 113: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
       case 116: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==116);
-{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-1].minor.yy64, yymsp[0].minor.yy192); }
-  yymsp[-1].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = addNodeToList(pCxt, yymsp[-1].minor.yy478, yymsp[0].minor.yy452); }
+  yymsp[-1].minor.yy478 = yylhsminor.yy478;
         break;
       case 114: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */
-{ yylhsminor.yy192 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy273, yymsp[-7].minor.yy192, yymsp[-5].minor.yy192, yymsp[-4].minor.yy64, yymsp[-1].minor.yy64); }
-  yymsp[-8].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy659, yymsp[-7].minor.yy452, yymsp[-5].minor.yy452, yymsp[-4].minor.yy478, yymsp[-1].minor.yy478); }
+  yymsp[-8].minor.yy452 = yylhsminor.yy452;
         break;
       case 117: /* drop_table_clause ::= exists_opt full_table_name */
-{ yylhsminor.yy192 = createDropTableClause(pCxt, yymsp[-1].minor.yy273, yymsp[0].minor.yy192); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createDropTableClause(pCxt, yymsp[-1].minor.yy659, yymsp[0].minor.yy452); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 118: /* specific_tags_opt ::= */
       case 149: /* tags_def_opt ::= */ yytestcase(yyruleno==149);
-      case 383: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==383);
-      case 400: /* group_by_clause_opt ::= */ yytestcase(yyruleno==400);
-      case 410: /* order_by_clause_opt ::= */ yytestcase(yyruleno==410);
-{ yymsp[1].minor.yy64 = NULL; }
+      case 384: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==384);
+      case 401: /* group_by_clause_opt ::= */ yytestcase(yyruleno==401);
+      case 411: /* order_by_clause_opt ::= */ yytestcase(yyruleno==411);
+{ yymsp[1].minor.yy478 = NULL; }
         break;
       case 119: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */
-{ yymsp[-2].minor.yy64 = yymsp[-1].minor.yy64; }
+{ yymsp[-2].minor.yy478 = yymsp[-1].minor.yy478; }
         break;
       case 120: /* full_table_name ::= table_name */
-{ yylhsminor.yy192 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy353, NULL); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy479, NULL); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 121: /* full_table_name ::= db_name NK_DOT table_name */
-{ yylhsminor.yy192 = createRealTableNode(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353, NULL); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRealTableNode(pCxt, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy479, NULL); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 124: /* column_def ::= column_name type_name */
-{ yylhsminor.yy192 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy353, yymsp[0].minor.yy536, NULL); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy479, yymsp[0].minor.yy430, NULL); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 125: /* column_def ::= column_name type_name COMMENT NK_STRING */
-{ yylhsminor.yy192 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy353, yymsp[-2].minor.yy536, &yymsp[0].minor.yy0); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy479, yymsp[-2].minor.yy430, &yymsp[0].minor.yy0); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
       case 126: /* type_name ::= BOOL */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_BOOL); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_BOOL); }
         break;
       case 127: /* type_name ::= TINYINT */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_TINYINT); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_TINYINT); }
         break;
       case 128: /* type_name ::= SMALLINT */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
         break;
       case 129: /* type_name ::= INT */
       case 130: /* type_name ::= INTEGER */ yytestcase(yyruleno==130);
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_INT); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_INT); }
         break;
       case 131: /* type_name ::= BIGINT */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_BIGINT); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_BIGINT); }
         break;
       case 132: /* type_name ::= FLOAT */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_FLOAT); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_FLOAT); }
         break;
       case 133: /* type_name ::= DOUBLE */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
         break;
       case 134: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy536 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy430 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
         break;
       case 135: /* type_name ::= TIMESTAMP */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
         break;
       case 136: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy536 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy430 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
         break;
       case 137: /* type_name ::= TINYINT UNSIGNED */
-{ yymsp[-1].minor.yy536 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
+{ yymsp[-1].minor.yy430 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
         break;
       case 138: /* type_name ::= SMALLINT UNSIGNED */
-{ yymsp[-1].minor.yy536 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
+{ yymsp[-1].minor.yy430 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
         break;
       case 139: /* type_name ::= INT UNSIGNED */
-{ yymsp[-1].minor.yy536 = createDataType(TSDB_DATA_TYPE_UINT); }
+{ yymsp[-1].minor.yy430 = createDataType(TSDB_DATA_TYPE_UINT); }
         break;
       case 140: /* type_name ::= BIGINT UNSIGNED */
-{ yymsp[-1].minor.yy536 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
+{ yymsp[-1].minor.yy430 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
         break;
       case 141: /* type_name ::= JSON */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_JSON); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_JSON); }
         break;
       case 142: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy536 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy430 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
         break;
       case 143: /* type_name ::= MEDIUMBLOB */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
         break;
       case 144: /* type_name ::= BLOB */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_BLOB); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_BLOB); }
         break;
       case 145: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy536 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy430 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
         break;
       case 146: /* type_name ::= DECIMAL */
-{ yymsp[0].minor.yy536 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[0].minor.yy430 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 147: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy536 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-3].minor.yy430 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 148: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy536 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-5].minor.yy430 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
         break;
       case 150: /* tags_def_opt ::= tags_def */
-      case 319: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==319);
-      case 374: /* select_list ::= select_sublist */ yytestcase(yyruleno==374);
-{ yylhsminor.yy64 = yymsp[0].minor.yy64; }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+      case 320: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==320);
+      case 375: /* select_list ::= select_sublist */ yytestcase(yyruleno==375);
+{ yylhsminor.yy478 = yymsp[0].minor.yy478; }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
       case 151: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
-{ yymsp[-3].minor.yy64 = yymsp[-1].minor.yy64; }
+{ yymsp[-3].minor.yy478 = yymsp[-1].minor.yy478; }
         break;
       case 152: /* table_options ::= */
-{ yymsp[1].minor.yy192 = createTableOptions(pCxt); }
+{ yymsp[1].minor.yy452 = createTableOptions(pCxt); }
         break;
       case 153: /* table_options ::= table_options COMMENT NK_STRING */
-{ ((STableOptions*)yymsp[-2].minor.yy192)->pComments = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-2].minor.yy452)->pComments = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 154: /* table_options ::= table_options KEEP integer_list */
       case 155: /* table_options ::= table_options KEEP variable_list */ yytestcase(yyruleno==155);
-{ ((STableOptions*)yymsp[-2].minor.yy192)->pKeep = yymsp[0].minor.yy64; yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-2].minor.yy452)->pKeep = yymsp[0].minor.yy478; yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 156: /* table_options ::= table_options TTL NK_INTEGER */
-{ ((STableOptions*)yymsp[-2].minor.yy192)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-2].minor.yy452)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 157: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-{ ((STableOptions*)yymsp[-4].minor.yy192)->pSma = yymsp[-1].minor.yy64; yylhsminor.yy192 = yymsp[-4].minor.yy192; }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-4].minor.yy452)->pSma = yymsp[-1].minor.yy478; yylhsminor.yy452 = yymsp[-4].minor.yy452; }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 158: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */
-{ ((STableOptions*)yymsp[-4].minor.yy192)->pFuncs = yymsp[-1].minor.yy64; yylhsminor.yy192 = yymsp[-4].minor.yy192; }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-4].minor.yy452)->pFuncs = yymsp[-1].minor.yy478; yylhsminor.yy452 = yymsp[-4].minor.yy452; }
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
       case 159: /* table_options ::= table_options FILE_FACTOR NK_FLOAT */
-{ ((STableOptions*)yymsp[-2].minor.yy192)->pFilesFactor = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-2].minor.yy452)->pFilesFactor = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 160: /* table_options ::= table_options DELAY NK_INTEGER */
-{ ((STableOptions*)yymsp[-2].minor.yy192)->pDelay = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((STableOptions*)yymsp[-2].minor.yy452)->pDelay = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 161: /* alter_table_options ::= alter_table_option */
-{ yylhsminor.yy192 = createTableOptions(pCxt); yylhsminor.yy192 = setTableAlterOption(pCxt, yylhsminor.yy192, &yymsp[0].minor.yy277); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createTableOptions(pCxt); yylhsminor.yy452 = setTableAlterOption(pCxt, yylhsminor.yy452, &yymsp[0].minor.yy11); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 162: /* alter_table_options ::= alter_table_options alter_table_option */
-{ yylhsminor.yy192 = setTableAlterOption(pCxt, yymsp[-1].minor.yy192, &yymsp[0].minor.yy277); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = setTableAlterOption(pCxt, yymsp[-1].minor.yy452, &yymsp[0].minor.yy11); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 163: /* alter_table_option ::= COMMENT NK_STRING */
-{ yymsp[-1].minor.yy277.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
         break;
       case 164: /* alter_table_option ::= KEEP integer_list */
       case 165: /* alter_table_option ::= KEEP variable_list */ yytestcase(yyruleno==165);
-{ yymsp[-1].minor.yy277.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy277.pList = yymsp[0].minor.yy64; }
+{ yymsp[-1].minor.yy11.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy11.pList = yymsp[0].minor.yy478; }
         break;
       case 166: /* alter_table_option ::= TTL NK_INTEGER */
-{ yymsp[-1].minor.yy277.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy277.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy11.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy11.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 169: /* col_name ::= column_name */
-{ yylhsminor.yy192 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy353); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy479); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 170: /* cmd ::= SHOW DNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL, NULL); }
@@ -3272,13 +3282,13 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL, NULL); }
         break;
       case 173: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy192, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy452, yymsp[0].minor.yy452); }
         break;
       case 174: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy192, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy452, yymsp[0].minor.yy452); }
         break;
       case 175: /* cmd ::= SHOW db_name_cond_opt VGROUPS */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy192, NULL); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy452, NULL); }
         break;
       case 176: /* cmd ::= SHOW MNODES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT, NULL, NULL); }
@@ -3293,7 +3303,7 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT, NULL, NULL); }
         break;
       case 180: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy192, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy452, yymsp[0].minor.yy452); }
         break;
       case 181: /* cmd ::= SHOW STREAMS */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT, NULL, NULL); }
@@ -3312,13 +3322,13 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT, NULL, NULL); }
         break;
       case 187: /* cmd ::= SHOW CREATE DATABASE db_name */
-{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy479); }
         break;
       case 188: /* cmd ::= SHOW CREATE TABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy452); }
         break;
       case 189: /* cmd ::= SHOW CREATE STABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy452); }
         break;
       case 190: /* cmd ::= SHOW QUERIES */
 { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT, NULL, NULL); }
@@ -3340,133 +3350,133 @@ static YYACTIONTYPE yy_reduce(
         break;
       case 196: /* db_name_cond_opt ::= */
       case 201: /* from_db_opt ::= */ yytestcase(yyruleno==201);
-{ yymsp[1].minor.yy192 = createDefaultDatabaseCondValue(pCxt); }
+{ yymsp[1].minor.yy452 = createDefaultDatabaseCondValue(pCxt); }
         break;
       case 197: /* db_name_cond_opt ::= db_name NK_DOT */
-{ yylhsminor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy353); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy479); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 198: /* like_pattern_opt ::= */
       case 209: /* index_options ::= */ yytestcase(yyruleno==209);
       case 236: /* into_opt ::= */ yytestcase(yyruleno==236);
-      case 381: /* where_clause_opt ::= */ yytestcase(yyruleno==381);
-      case 385: /* twindow_clause_opt ::= */ yytestcase(yyruleno==385);
-      case 390: /* sliding_opt ::= */ yytestcase(yyruleno==390);
-      case 392: /* fill_opt ::= */ yytestcase(yyruleno==392);
-      case 404: /* having_clause_opt ::= */ yytestcase(yyruleno==404);
-      case 412: /* slimit_clause_opt ::= */ yytestcase(yyruleno==412);
-      case 416: /* limit_clause_opt ::= */ yytestcase(yyruleno==416);
-{ yymsp[1].minor.yy192 = NULL; }
+      case 382: /* where_clause_opt ::= */ yytestcase(yyruleno==382);
+      case 386: /* twindow_clause_opt ::= */ yytestcase(yyruleno==386);
+      case 391: /* sliding_opt ::= */ yytestcase(yyruleno==391);
+      case 393: /* fill_opt ::= */ yytestcase(yyruleno==393);
+      case 405: /* having_clause_opt ::= */ yytestcase(yyruleno==405);
+      case 413: /* slimit_clause_opt ::= */ yytestcase(yyruleno==413);
+      case 417: /* limit_clause_opt ::= */ yytestcase(yyruleno==417);
+{ yymsp[1].minor.yy452 = NULL; }
         break;
       case 199: /* like_pattern_opt ::= LIKE NK_STRING */
-{ yymsp[-1].minor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
         break;
       case 200: /* table_name_cond ::= table_name */
-{ yylhsminor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy353); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy479); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 202: /* from_db_opt ::= FROM db_name */
-{ yymsp[-1].minor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy353); }
+{ yymsp[-1].minor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy479); }
         break;
       case 205: /* func_name ::= function_name */
-{ yylhsminor.yy192 = createFunctionNode(pCxt, &yymsp[0].minor.yy353, NULL); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createFunctionNode(pCxt, &yymsp[0].minor.yy479, NULL); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 206: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy273, &yymsp[-3].minor.yy353, &yymsp[-1].minor.yy353, NULL, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy659, &yymsp[-3].minor.yy479, &yymsp[-1].minor.yy479, NULL, yymsp[0].minor.yy452); }
         break;
       case 207: /* 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.yy273, &yymsp[-5].minor.yy353, &yymsp[-3].minor.yy353, yymsp[-1].minor.yy64, NULL); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy659, &yymsp[-5].minor.yy479, &yymsp[-3].minor.yy479, yymsp[-1].minor.yy478, NULL); }
         break;
       case 208: /* cmd ::= DROP INDEX exists_opt index_name ON table_name */
-{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy273, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy659, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy479); }
         break;
       case 210: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */
-{ yymsp[-8].minor.yy192 = createIndexOption(pCxt, yymsp[-6].minor.yy64, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), NULL, yymsp[0].minor.yy192); }
+{ yymsp[-8].minor.yy452 = createIndexOption(pCxt, yymsp[-6].minor.yy478, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), NULL, yymsp[0].minor.yy452); }
         break;
       case 211: /* 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.yy192 = createIndexOption(pCxt, yymsp[-8].minor.yy64, releaseRawExprNode(pCxt, yymsp[-4].minor.yy192), releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), yymsp[0].minor.yy192); }
+{ yymsp[-10].minor.yy452 = createIndexOption(pCxt, yymsp[-8].minor.yy478, releaseRawExprNode(pCxt, yymsp[-4].minor.yy452), releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), yymsp[0].minor.yy452); }
         break;
       case 214: /* func ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy192 = createFunctionNode(pCxt, &yymsp[-3].minor.yy353, yymsp[-1].minor.yy64); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createFunctionNode(pCxt, &yymsp[-3].minor.yy479, yymsp[-1].minor.yy478); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
       case 215: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy273, &yymsp[-2].minor.yy353, yymsp[0].minor.yy192, NULL); }
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy659, &yymsp[-2].minor.yy479, yymsp[0].minor.yy452, NULL); }
         break;
       case 216: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */
-{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy273, &yymsp[-2].minor.yy353, NULL, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy659, &yymsp[-2].minor.yy479, NULL, &yymsp[0].minor.yy479); }
         break;
       case 217: /* cmd ::= DROP TOPIC exists_opt topic_name */
-{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy273, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy659, &yymsp[0].minor.yy479); }
         break;
       case 218: /* cmd ::= DESC full_table_name */
       case 219: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==219);
-{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy452); }
         break;
       case 220: /* cmd ::= RESET QUERY CACHE */
 { pCxt->pRootNode = createResetQueryCacheStmt(pCxt); }
         break;
       case 221: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */
-{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy273, yymsp[-1].minor.yy192, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy659, yymsp[-1].minor.yy452, yymsp[0].minor.yy452); }
         break;
       case 223: /* analyze_opt ::= ANALYZE */
       case 231: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==231);
-      case 371: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==371);
-{ yymsp[0].minor.yy273 = true; }
+      case 372: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==372);
+{ yymsp[0].minor.yy659 = true; }
         break;
       case 224: /* explain_options ::= */
-{ yymsp[1].minor.yy192 = createDefaultExplainOptions(pCxt); }
+{ yymsp[1].minor.yy452 = createDefaultExplainOptions(pCxt); }
         break;
       case 225: /* explain_options ::= explain_options VERBOSE NK_BOOL */
-{ yylhsminor.yy192 = setExplainVerbose(pCxt, yymsp[-2].minor.yy192, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = setExplainVerbose(pCxt, yymsp[-2].minor.yy452, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 226: /* explain_options ::= explain_options RATIO NK_FLOAT */
-{ yylhsminor.yy192 = setExplainRatio(pCxt, yymsp[-2].minor.yy192, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = setExplainRatio(pCxt, yymsp[-2].minor.yy452, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 227: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
-{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy64); }
+{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy478); }
         break;
       case 228: /* cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
-{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-7].minor.yy273, &yymsp[-5].minor.yy353, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy536, yymsp[0].minor.yy116); }
+{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-7].minor.yy659, &yymsp[-5].minor.yy479, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy430, yymsp[0].minor.yy100); }
         break;
       case 229: /* cmd ::= DROP FUNCTION function_name */
-{ pCxt->pRootNode = createDropFunctionStmt(pCxt, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createDropFunctionStmt(pCxt, &yymsp[0].minor.yy479); }
         break;
       case 232: /* bufsize_opt ::= */
-{ yymsp[1].minor.yy116 = 0; }
+{ yymsp[1].minor.yy100 = 0; }
         break;
       case 233: /* bufsize_opt ::= BUFSIZE NK_INTEGER */
-{ yymsp[-1].minor.yy116 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
+{ yymsp[-1].minor.yy100 = strtol(yymsp[0].minor.yy0.z, NULL, 10); }
         break;
       case 234: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */
-{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy273, &yymsp[-4].minor.yy353, yymsp[-3].minor.yy192, yymsp[-2].minor.yy192, yymsp[0].minor.yy192); }
+{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy659, &yymsp[-4].minor.yy479, yymsp[-3].minor.yy452, yymsp[-2].minor.yy452, yymsp[0].minor.yy452); }
         break;
       case 235: /* cmd ::= DROP STREAM exists_opt stream_name */
-{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy273, &yymsp[0].minor.yy353); }
+{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy659, &yymsp[0].minor.yy479); }
         break;
       case 237: /* into_opt ::= INTO full_table_name */
-      case 352: /* from_clause ::= FROM table_reference_list */ yytestcase(yyruleno==352);
-      case 382: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==382);
-      case 405: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==405);
-{ yymsp[-1].minor.yy192 = yymsp[0].minor.yy192; }
+      case 353: /* from_clause ::= FROM table_reference_list */ yytestcase(yyruleno==353);
+      case 383: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==383);
+      case 406: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==406);
+{ yymsp[-1].minor.yy452 = yymsp[0].minor.yy452; }
         break;
       case 238: /* stream_options ::= */
-{ yymsp[1].minor.yy192 = createStreamOptions(pCxt); }
+{ yymsp[1].minor.yy452 = createStreamOptions(pCxt); }
         break;
       case 239: /* stream_options ::= stream_options TRIGGER AT_ONCE */
-{ ((SStreamOptions*)yymsp[-2].minor.yy192)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SStreamOptions*)yymsp[-2].minor.yy452)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 240: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */
-{ ((SStreamOptions*)yymsp[-2].minor.yy192)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SStreamOptions*)yymsp[-2].minor.yy452)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 241: /* stream_options ::= stream_options WATERMARK duration_literal */
-{ ((SStreamOptions*)yymsp[-2].minor.yy192)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy192); yylhsminor.yy192 = yymsp[-2].minor.yy192; }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ ((SStreamOptions*)yymsp[-2].minor.yy452)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy452); yylhsminor.yy452 = yymsp[-2].minor.yy452; }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 242: /* cmd ::= KILL CONNECTION NK_INTEGER */
 { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); }
@@ -3478,36 +3488,36 @@ static YYACTIONTYPE yy_reduce(
 { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
         break;
       case 245: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
-{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy64); }
+{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy478); }
         break;
       case 246: /* cmd ::= SPLIT VGROUP NK_INTEGER */
 { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); }
         break;
       case 247: /* dnode_list ::= DNODE NK_INTEGER */
-{ yymsp[-1].minor.yy64 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+{ yymsp[-1].minor.yy478 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
         break;
       case 249: /* cmd ::= SYNCDB db_name REPLICA */
-{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy353); }
+{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy479); }
         break;
       case 251: /* literal ::= NK_INTEGER */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 252: /* literal ::= NK_FLOAT */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 253: /* literal ::= NK_STRING */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 254: /* literal ::= NK_BOOL */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 255: /* literal ::= TIMESTAMP NK_STRING */
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 256: /* literal ::= duration_literal */
       case 266: /* signed_literal ::= signed */ yytestcase(yyruleno==266);
@@ -3516,461 +3526,463 @@ static YYACTIONTYPE yy_reduce(
       case 286: /* expression ::= column_reference */ yytestcase(yyruleno==286);
       case 287: /* expression ::= function_expression */ yytestcase(yyruleno==287);
       case 288: /* expression ::= subquery */ yytestcase(yyruleno==288);
-      case 344: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==344);
-      case 348: /* boolean_primary ::= predicate */ yytestcase(yyruleno==348);
-      case 350: /* common_expression ::= expression */ yytestcase(yyruleno==350);
-      case 351: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==351);
-      case 353: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==353);
-      case 355: /* table_reference ::= table_primary */ yytestcase(yyruleno==355);
-      case 356: /* table_reference ::= joined_table */ yytestcase(yyruleno==356);
-      case 360: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==360);
-      case 407: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==407);
-      case 409: /* query_primary ::= query_specification */ yytestcase(yyruleno==409);
-{ yylhsminor.yy192 = yymsp[0].minor.yy192; }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+      case 345: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==345);
+      case 349: /* boolean_primary ::= predicate */ yytestcase(yyruleno==349);
+      case 351: /* common_expression ::= expression */ yytestcase(yyruleno==351);
+      case 352: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==352);
+      case 354: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==354);
+      case 356: /* table_reference ::= table_primary */ yytestcase(yyruleno==356);
+      case 357: /* table_reference ::= joined_table */ yytestcase(yyruleno==357);
+      case 361: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==361);
+      case 408: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==408);
+      case 410: /* query_primary ::= query_specification */ yytestcase(yyruleno==410);
+{ yylhsminor.yy452 = yymsp[0].minor.yy452; }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 257: /* literal ::= NULL */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 258: /* literal ::= NK_QUESTION */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 259: /* duration_literal ::= NK_VARIABLE */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 260: /* signed ::= NK_INTEGER */
-{ yylhsminor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 261: /* signed ::= NK_PLUS NK_INTEGER */
-{ yymsp[-1].minor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
         break;
       case 262: /* 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.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
+                                                                                    yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
                                                                                   }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 263: /* signed ::= NK_FLOAT */
-{ yylhsminor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 264: /* signed ::= NK_PLUS NK_FLOAT */
-{ yymsp[-1].minor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
         break;
       case 265: /* 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.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
+                                                                                    yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
                                                                                   }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 267: /* signed_literal ::= NK_STRING */
-{ yylhsminor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 268: /* signed_literal ::= NK_BOOL */
-{ yylhsminor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 269: /* signed_literal ::= TIMESTAMP NK_STRING */
-{ yymsp[-1].minor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
         break;
       case 270: /* signed_literal ::= duration_literal */
-      case 322: /* star_func_para ::= expression */ yytestcase(yyruleno==322);
-      case 377: /* select_item ::= common_expression */ yytestcase(yyruleno==377);
-      case 421: /* search_condition ::= common_expression */ yytestcase(yyruleno==421);
-{ yylhsminor.yy192 = releaseRawExprNode(pCxt, yymsp[0].minor.yy192); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+      case 323: /* star_func_para ::= expression */ yytestcase(yyruleno==323);
+      case 378: /* select_item ::= common_expression */ yytestcase(yyruleno==378);
+      case 422: /* search_condition ::= common_expression */ yytestcase(yyruleno==422);
+{ yylhsminor.yy452 = releaseRawExprNode(pCxt, yymsp[0].minor.yy452); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 271: /* signed_literal ::= NULL */
-{ yymsp[0].minor.yy192 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); }
+{ yymsp[0].minor.yy452 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); }
         break;
       case 289: /* expression ::= NK_LP expression NK_RP */
-      case 349: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==349);
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy192)); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 350: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==350);
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy452)); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 290: /* expression ::= NK_PLUS expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy192));
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy452));
                                                                                   }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 291: /* expression ::= NK_MINUS expression */
 {
-                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy192), NULL));
+                                                                                    SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy452), NULL));
                                                                                   }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
       case 292: /* expression ::= expression NK_PLUS expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); 
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 293: /* expression ::= expression NK_MINUS expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); 
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 294: /* expression ::= expression NK_STAR expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); 
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 295: /* expression ::= expression NK_SLASH expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); 
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 296: /* expression ::= expression NK_REM expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); 
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 297: /* expression ::= column_reference NK_ARROW NK_STRING */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); 
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); 
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
       case 298: /* expression_list ::= expression */
-{ yylhsminor.yy64 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy192)); }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy452)); }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
       case 299: /* expression_list ::= expression_list NK_COMMA expression */
-{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, releaseRawExprNode(pCxt, yymsp[0].minor.yy192)); }
-  yymsp[-2].minor.yy64 = yylhsminor.yy64;
+{ yylhsminor.yy478 = addNodeToList(pCxt, yymsp[-2].minor.yy478, releaseRawExprNode(pCxt, yymsp[0].minor.yy452)); }
+  yymsp[-2].minor.yy478 = yylhsminor.yy478;
         break;
       case 300: /* column_reference ::= column_name */
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy353, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy353)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy479, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy479)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
       case 301: /* column_reference ::= table_name NK_DOT column_name */
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353, createColumnNode(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy353)); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy479, createColumnNode(pCxt, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy479)); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 302: /* pseudo_column ::= NOW */
-      case 303: /* pseudo_column ::= TODAY */ yytestcase(yyruleno==303);
-      case 304: /* pseudo_column ::= ROWTS */ yytestcase(yyruleno==304);
-      case 305: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==305);
-      case 306: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==306);
-      case 307: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==307);
-      case 308: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==308);
-      case 309: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==309);
-      case 310: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==310);
-{ yylhsminor.yy192 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
-  yymsp[0].minor.yy192 = yylhsminor.yy192;
+      case 302: /* pseudo_column ::= ROWTS */
+      case 303: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==303);
+      case 304: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==304);
+      case 305: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==305);
+      case 306: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==306);
+      case 307: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==307);
+      case 308: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==308);
+{ yylhsminor.yy452 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
+  yymsp[0].minor.yy452 = yylhsminor.yy452;
         break;
-      case 311: /* function_expression ::= function_name NK_LP expression_list NK_RP */
-      case 312: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==312);
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy353, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy353, yymsp[-1].minor.yy64)); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+      case 309: /* function_expression ::= function_name NK_LP expression_list NK_RP */
+      case 310: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==310);
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy479, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy479, yymsp[-1].minor.yy478)); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
-      case 313: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy192), yymsp[-1].minor.yy536)); }
-  yymsp[-5].minor.yy192 = yylhsminor.yy192;
+      case 311: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy452), yymsp[-1].minor.yy430)); }
+  yymsp[-5].minor.yy452 = yylhsminor.yy452;
         break;
-      case 318: /* star_func_para_list ::= NK_STAR */
-{ yylhsminor.yy64 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+      case 312: /* function_expression ::= noarg_func NK_LP NK_RP */
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy479, NULL)); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 323: /* star_func_para ::= table_name NK_DOT NK_STAR */
-      case 380: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==380);
-{ yylhsminor.yy192 = createColumnNode(pCxt, &yymsp[-2].minor.yy353, &yymsp[0].minor.yy0); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 319: /* star_func_para_list ::= NK_STAR */
+{ yylhsminor.yy478 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
-      case 324: /* predicate ::= expression compare_op expression */
-      case 329: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==329);
+      case 324: /* star_func_para ::= table_name NK_DOT NK_STAR */
+      case 381: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==381);
+{ yylhsminor.yy452 = createColumnNode(pCxt, &yymsp[-2].minor.yy479, &yymsp[0].minor.yy0); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
+        break;
+      case 325: /* predicate ::= expression compare_op expression */
+      case 330: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==330);
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy412, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy218, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452)));
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 325: /* predicate ::= expression BETWEEN expression AND expression */
+      case 326: /* predicate ::= expression BETWEEN expression AND expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy192), releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy452), releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452)));
                                                                                   }
-  yymsp[-4].minor.yy192 = yylhsminor.yy192;
+  yymsp[-4].minor.yy452 = yylhsminor.yy452;
         break;
-      case 326: /* predicate ::= expression NOT BETWEEN expression AND expression */
+      case 327: /* predicate ::= expression NOT BETWEEN expression AND expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[-5].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[-5].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452)));
                                                                                   }
-  yymsp[-5].minor.yy192 = yylhsminor.yy192;
+  yymsp[-5].minor.yy452 = yylhsminor.yy452;
         break;
-      case 327: /* predicate ::= expression IS NULL */
+      case 328: /* predicate ::= expression IS NULL */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), NULL));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), NULL));
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 328: /* predicate ::= expression IS NOT NULL */
+      case 329: /* predicate ::= expression IS NOT NULL */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy192), NULL));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy452), NULL));
                                                                                   }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
-      case 330: /* compare_op ::= NK_LT */
-{ yymsp[0].minor.yy412 = OP_TYPE_LOWER_THAN; }
+      case 331: /* compare_op ::= NK_LT */
+{ yymsp[0].minor.yy218 = OP_TYPE_LOWER_THAN; }
         break;
-      case 331: /* compare_op ::= NK_GT */
-{ yymsp[0].minor.yy412 = OP_TYPE_GREATER_THAN; }
+      case 332: /* compare_op ::= NK_GT */
+{ yymsp[0].minor.yy218 = OP_TYPE_GREATER_THAN; }
         break;
-      case 332: /* compare_op ::= NK_LE */
-{ yymsp[0].minor.yy412 = OP_TYPE_LOWER_EQUAL; }
+      case 333: /* compare_op ::= NK_LE */
+{ yymsp[0].minor.yy218 = OP_TYPE_LOWER_EQUAL; }
         break;
-      case 333: /* compare_op ::= NK_GE */
-{ yymsp[0].minor.yy412 = OP_TYPE_GREATER_EQUAL; }
+      case 334: /* compare_op ::= NK_GE */
+{ yymsp[0].minor.yy218 = OP_TYPE_GREATER_EQUAL; }
         break;
-      case 334: /* compare_op ::= NK_NE */
-{ yymsp[0].minor.yy412 = OP_TYPE_NOT_EQUAL; }
+      case 335: /* compare_op ::= NK_NE */
+{ yymsp[0].minor.yy218 = OP_TYPE_NOT_EQUAL; }
         break;
-      case 335: /* compare_op ::= NK_EQ */
-{ yymsp[0].minor.yy412 = OP_TYPE_EQUAL; }
+      case 336: /* compare_op ::= NK_EQ */
+{ yymsp[0].minor.yy218 = OP_TYPE_EQUAL; }
         break;
-      case 336: /* compare_op ::= LIKE */
-{ yymsp[0].minor.yy412 = OP_TYPE_LIKE; }
+      case 337: /* compare_op ::= LIKE */
+{ yymsp[0].minor.yy218 = OP_TYPE_LIKE; }
         break;
-      case 337: /* compare_op ::= NOT LIKE */
-{ yymsp[-1].minor.yy412 = OP_TYPE_NOT_LIKE; }
+      case 338: /* compare_op ::= NOT LIKE */
+{ yymsp[-1].minor.yy218 = OP_TYPE_NOT_LIKE; }
         break;
-      case 338: /* compare_op ::= MATCH */
-{ yymsp[0].minor.yy412 = OP_TYPE_MATCH; }
+      case 339: /* compare_op ::= MATCH */
+{ yymsp[0].minor.yy218 = OP_TYPE_MATCH; }
         break;
-      case 339: /* compare_op ::= NMATCH */
-{ yymsp[0].minor.yy412 = OP_TYPE_NMATCH; }
+      case 340: /* compare_op ::= NMATCH */
+{ yymsp[0].minor.yy218 = OP_TYPE_NMATCH; }
         break;
-      case 340: /* compare_op ::= CONTAINS */
-{ yymsp[0].minor.yy412 = OP_TYPE_JSON_CONTAINS; }
+      case 341: /* compare_op ::= CONTAINS */
+{ yymsp[0].minor.yy218 = OP_TYPE_JSON_CONTAINS; }
         break;
-      case 341: /* in_op ::= IN */
-{ yymsp[0].minor.yy412 = OP_TYPE_IN; }
+      case 342: /* in_op ::= IN */
+{ yymsp[0].minor.yy218 = OP_TYPE_IN; }
         break;
-      case 342: /* in_op ::= NOT IN */
-{ yymsp[-1].minor.yy412 = OP_TYPE_NOT_IN; }
+      case 343: /* in_op ::= NOT IN */
+{ yymsp[-1].minor.yy218 = OP_TYPE_NOT_IN; }
         break;
-      case 343: /* in_predicate_value ::= NK_LP expression_list NK_RP */
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy64)); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 344: /* in_predicate_value ::= NK_LP expression_list NK_RP */
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy478)); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 345: /* boolean_value_expression ::= NOT boolean_primary */
+      case 346: /* boolean_value_expression ::= NOT boolean_primary */
 {
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy192), NULL));
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy452), NULL));
                                                                                   }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
-      case 346: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+      case 347: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452)));
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 347: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+      case 348: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
 {
-                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy192);
-                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy192);
-                                                                                    yylhsminor.yy192 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), releaseRawExprNode(pCxt, yymsp[0].minor.yy192)));
+                                                                                    SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy452);
+                                                                                    SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy452);
+                                                                                    yylhsminor.yy452 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), releaseRawExprNode(pCxt, yymsp[0].minor.yy452)));
                                                                                   }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 354: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
-{ yylhsminor.yy192 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy192, yymsp[0].minor.yy192, NULL); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 355: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+{ yylhsminor.yy452 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy452, yymsp[0].minor.yy452, NULL); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 357: /* table_primary ::= table_name alias_opt */
-{ yylhsminor.yy192 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+      case 358: /* table_primary ::= table_name alias_opt */
+{ yylhsminor.yy452 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy479, &yymsp[0].minor.yy479); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
-      case 358: /* table_primary ::= db_name NK_DOT table_name alias_opt */
-{ yylhsminor.yy192 = createRealTableNode(pCxt, &yymsp[-3].minor.yy353, &yymsp[-1].minor.yy353, &yymsp[0].minor.yy353); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+      case 359: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+{ yylhsminor.yy452 = createRealTableNode(pCxt, &yymsp[-3].minor.yy479, &yymsp[-1].minor.yy479, &yymsp[0].minor.yy479); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
-      case 359: /* table_primary ::= subquery alias_opt */
-{ yylhsminor.yy192 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy192), &yymsp[0].minor.yy353); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+      case 360: /* table_primary ::= subquery alias_opt */
+{ yylhsminor.yy452 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy452), &yymsp[0].minor.yy479); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
-      case 361: /* alias_opt ::= */
-{ yymsp[1].minor.yy353 = nil_token;  }
+      case 362: /* alias_opt ::= */
+{ yymsp[1].minor.yy479 = nil_token;  }
         break;
-      case 362: /* alias_opt ::= table_alias */
-{ yylhsminor.yy353 = yymsp[0].minor.yy353; }
-  yymsp[0].minor.yy353 = yylhsminor.yy353;
+      case 363: /* alias_opt ::= table_alias */
+{ yylhsminor.yy479 = yymsp[0].minor.yy479; }
+  yymsp[0].minor.yy479 = yylhsminor.yy479;
         break;
-      case 363: /* alias_opt ::= AS table_alias */
-{ yymsp[-1].minor.yy353 = yymsp[0].minor.yy353; }
+      case 364: /* alias_opt ::= AS table_alias */
+{ yymsp[-1].minor.yy479 = yymsp[0].minor.yy479; }
         break;
-      case 364: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
-      case 365: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==365);
-{ yymsp[-2].minor.yy192 = yymsp[-1].minor.yy192; }
+      case 365: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+      case 366: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==366);
+{ yymsp[-2].minor.yy452 = yymsp[-1].minor.yy452; }
         break;
-      case 366: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-{ yylhsminor.yy192 = createJoinTableNode(pCxt, yymsp[-4].minor.yy372, yymsp[-5].minor.yy192, yymsp[-2].minor.yy192, yymsp[0].minor.yy192); }
-  yymsp[-5].minor.yy192 = yylhsminor.yy192;
+      case 367: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+{ yylhsminor.yy452 = createJoinTableNode(pCxt, yymsp[-4].minor.yy162, yymsp[-5].minor.yy452, yymsp[-2].minor.yy452, yymsp[0].minor.yy452); }
+  yymsp[-5].minor.yy452 = yylhsminor.yy452;
         break;
-      case 367: /* join_type ::= */
-{ yymsp[1].minor.yy372 = JOIN_TYPE_INNER; }
+      case 368: /* join_type ::= */
+{ yymsp[1].minor.yy162 = JOIN_TYPE_INNER; }
         break;
-      case 368: /* join_type ::= INNER */
-{ yymsp[0].minor.yy372 = JOIN_TYPE_INNER; }
+      case 369: /* join_type ::= INNER */
+{ yymsp[0].minor.yy162 = JOIN_TYPE_INNER; }
         break;
-      case 369: /* 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 370: /* 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.yy192 = createSelectStmt(pCxt, yymsp[-7].minor.yy273, yymsp[-6].minor.yy64, yymsp[-5].minor.yy192);
-                                                                                    yymsp[-8].minor.yy192 = addWhereClause(pCxt, yymsp[-8].minor.yy192, yymsp[-4].minor.yy192);
-                                                                                    yymsp[-8].minor.yy192 = addPartitionByClause(pCxt, yymsp[-8].minor.yy192, yymsp[-3].minor.yy64);
-                                                                                    yymsp[-8].minor.yy192 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy192, yymsp[-2].minor.yy192);
-                                                                                    yymsp[-8].minor.yy192 = addGroupByClause(pCxt, yymsp[-8].minor.yy192, yymsp[-1].minor.yy64);
-                                                                                    yymsp[-8].minor.yy192 = addHavingClause(pCxt, yymsp[-8].minor.yy192, yymsp[0].minor.yy192);
+                                                                                    yymsp[-8].minor.yy452 = createSelectStmt(pCxt, yymsp[-7].minor.yy659, yymsp[-6].minor.yy478, yymsp[-5].minor.yy452);
+                                                                                    yymsp[-8].minor.yy452 = addWhereClause(pCxt, yymsp[-8].minor.yy452, yymsp[-4].minor.yy452);
+                                                                                    yymsp[-8].minor.yy452 = addPartitionByClause(pCxt, yymsp[-8].minor.yy452, yymsp[-3].minor.yy478);
+                                                                                    yymsp[-8].minor.yy452 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy452, yymsp[-2].minor.yy452);
+                                                                                    yymsp[-8].minor.yy452 = addGroupByClause(pCxt, yymsp[-8].minor.yy452, yymsp[-1].minor.yy478);
+                                                                                    yymsp[-8].minor.yy452 = addHavingClause(pCxt, yymsp[-8].minor.yy452, yymsp[0].minor.yy452);
                                                                                   }
         break;
-      case 372: /* set_quantifier_opt ::= ALL */
-{ yymsp[0].minor.yy273 = false; }
+      case 373: /* set_quantifier_opt ::= ALL */
+{ yymsp[0].minor.yy659 = false; }
         break;
-      case 373: /* select_list ::= NK_STAR */
-{ yymsp[0].minor.yy64 = NULL; }
+      case 374: /* select_list ::= NK_STAR */
+{ yymsp[0].minor.yy478 = NULL; }
         break;
-      case 378: /* select_item ::= common_expression column_alias */
-{ yylhsminor.yy192 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy192), &yymsp[0].minor.yy353); }
-  yymsp[-1].minor.yy192 = yylhsminor.yy192;
+      case 379: /* select_item ::= common_expression column_alias */
+{ yylhsminor.yy452 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy452), &yymsp[0].minor.yy479); }
+  yymsp[-1].minor.yy452 = yylhsminor.yy452;
         break;
-      case 379: /* select_item ::= common_expression AS column_alias */
-{ yylhsminor.yy192 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), &yymsp[0].minor.yy353); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 380: /* select_item ::= common_expression AS column_alias */
+{ yylhsminor.yy452 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), &yymsp[0].minor.yy479); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 384: /* partition_by_clause_opt ::= PARTITION BY expression_list */
-      case 401: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==401);
-      case 411: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==411);
-{ yymsp[-2].minor.yy64 = yymsp[0].minor.yy64; }
+      case 385: /* partition_by_clause_opt ::= PARTITION BY expression_list */
+      case 402: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==402);
+      case 412: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==412);
+{ yymsp[-2].minor.yy478 = yymsp[0].minor.yy478; }
         break;
-      case 386: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-{ yymsp[-5].minor.yy192 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy192), releaseRawExprNode(pCxt, yymsp[-1].minor.yy192)); }
+      case 387: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+{ yymsp[-5].minor.yy452 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy452), releaseRawExprNode(pCxt, yymsp[-1].minor.yy452)); }
         break;
-      case 387: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
-{ yymsp[-3].minor.yy192 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy192)); }
+      case 388: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
+{ yymsp[-3].minor.yy452 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy452)); }
         break;
-      case 388: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-5].minor.yy192 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy192), NULL, yymsp[-1].minor.yy192, yymsp[0].minor.yy192); }
+      case 389: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-5].minor.yy452 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy452), NULL, yymsp[-1].minor.yy452, yymsp[0].minor.yy452); }
         break;
-      case 389: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-7].minor.yy192 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy192), releaseRawExprNode(pCxt, yymsp[-3].minor.yy192), yymsp[-1].minor.yy192, yymsp[0].minor.yy192); }
+      case 390: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-7].minor.yy452 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy452), releaseRawExprNode(pCxt, yymsp[-3].minor.yy452), yymsp[-1].minor.yy452, yymsp[0].minor.yy452); }
         break;
-      case 391: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
-{ yymsp[-3].minor.yy192 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy192); }
+      case 392: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+{ yymsp[-3].minor.yy452 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy452); }
         break;
-      case 393: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
-{ yymsp[-3].minor.yy192 = createFillNode(pCxt, yymsp[-1].minor.yy358, NULL); }
+      case 394: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+{ yymsp[-3].minor.yy452 = createFillNode(pCxt, yymsp[-1].minor.yy540, NULL); }
         break;
-      case 394: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-{ yymsp[-5].minor.yy192 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy64)); }
+      case 395: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+{ yymsp[-5].minor.yy452 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy478)); }
         break;
-      case 395: /* fill_mode ::= NONE */
-{ yymsp[0].minor.yy358 = FILL_MODE_NONE; }
+      case 396: /* fill_mode ::= NONE */
+{ yymsp[0].minor.yy540 = FILL_MODE_NONE; }
         break;
-      case 396: /* fill_mode ::= PREV */
-{ yymsp[0].minor.yy358 = FILL_MODE_PREV; }
+      case 397: /* fill_mode ::= PREV */
+{ yymsp[0].minor.yy540 = FILL_MODE_PREV; }
         break;
-      case 397: /* fill_mode ::= NULL */
-{ yymsp[0].minor.yy358 = FILL_MODE_NULL; }
+      case 398: /* fill_mode ::= NULL */
+{ yymsp[0].minor.yy540 = FILL_MODE_NULL; }
         break;
-      case 398: /* fill_mode ::= LINEAR */
-{ yymsp[0].minor.yy358 = FILL_MODE_LINEAR; }
+      case 399: /* fill_mode ::= LINEAR */
+{ yymsp[0].minor.yy540 = FILL_MODE_LINEAR; }
         break;
-      case 399: /* fill_mode ::= NEXT */
-{ yymsp[0].minor.yy358 = FILL_MODE_NEXT; }
+      case 400: /* fill_mode ::= NEXT */
+{ yymsp[0].minor.yy540 = FILL_MODE_NEXT; }
         break;
-      case 402: /* group_by_list ::= expression */
-{ yylhsminor.yy64 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); }
-  yymsp[0].minor.yy64 = yylhsminor.yy64;
+      case 403: /* group_by_list ::= expression */
+{ yylhsminor.yy478 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); }
+  yymsp[0].minor.yy478 = yylhsminor.yy478;
         break;
-      case 403: /* group_by_list ::= group_by_list NK_COMMA expression */
-{ yylhsminor.yy64 = addNodeToList(pCxt, yymsp[-2].minor.yy64, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy192))); }
-  yymsp[-2].minor.yy64 = yylhsminor.yy64;
+      case 404: /* group_by_list ::= group_by_list NK_COMMA expression */
+{ yylhsminor.yy478 = addNodeToList(pCxt, yymsp[-2].minor.yy478, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy452))); }
+  yymsp[-2].minor.yy478 = yylhsminor.yy478;
         break;
-      case 406: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+      case 407: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
 { 
-                                                                                    yylhsminor.yy192 = addOrderByClause(pCxt, yymsp[-3].minor.yy192, yymsp[-2].minor.yy64);
-                                                                                    yylhsminor.yy192 = addSlimitClause(pCxt, yylhsminor.yy192, yymsp[-1].minor.yy192);
-                                                                                    yylhsminor.yy192 = addLimitClause(pCxt, yylhsminor.yy192, yymsp[0].minor.yy192);
+                                                                                    yylhsminor.yy452 = addOrderByClause(pCxt, yymsp[-3].minor.yy452, yymsp[-2].minor.yy478);
+                                                                                    yylhsminor.yy452 = addSlimitClause(pCxt, yylhsminor.yy452, yymsp[-1].minor.yy452);
+                                                                                    yylhsminor.yy452 = addLimitClause(pCxt, yylhsminor.yy452, yymsp[0].minor.yy452);
                                                                                   }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
-      case 408: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-{ yylhsminor.yy192 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy192, yymsp[0].minor.yy192); }
-  yymsp[-3].minor.yy192 = yylhsminor.yy192;
+      case 409: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+{ yylhsminor.yy452 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy452, yymsp[0].minor.yy452); }
+  yymsp[-3].minor.yy452 = yylhsminor.yy452;
         break;
-      case 413: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
-      case 417: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==417);
-{ yymsp[-1].minor.yy192 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+      case 414: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+      case 418: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==418);
+{ yymsp[-1].minor.yy452 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
         break;
-      case 414: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-      case 418: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==418);
-{ yymsp[-3].minor.yy192 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+      case 415: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+      case 419: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==419);
+{ yymsp[-3].minor.yy452 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 415: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-      case 419: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==419);
-{ yymsp[-3].minor.yy192 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+      case 416: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+      case 420: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==420);
+{ yymsp[-3].minor.yy452 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
         break;
-      case 420: /* subquery ::= NK_LP query_expression NK_RP */
-{ yylhsminor.yy192 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy192); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 421: /* subquery ::= NK_LP query_expression NK_RP */
+{ yylhsminor.yy452 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy452); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 424: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-{ yylhsminor.yy192 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy192), yymsp[-1].minor.yy530, yymsp[0].minor.yy225); }
-  yymsp[-2].minor.yy192 = yylhsminor.yy192;
+      case 425: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+{ yylhsminor.yy452 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy452), yymsp[-1].minor.yy326, yymsp[0].minor.yy595); }
+  yymsp[-2].minor.yy452 = yylhsminor.yy452;
         break;
-      case 425: /* ordering_specification_opt ::= */
-{ yymsp[1].minor.yy530 = ORDER_ASC; }
+      case 426: /* ordering_specification_opt ::= */
+{ yymsp[1].minor.yy326 = ORDER_ASC; }
         break;
-      case 426: /* ordering_specification_opt ::= ASC */
-{ yymsp[0].minor.yy530 = ORDER_ASC; }
+      case 427: /* ordering_specification_opt ::= ASC */
+{ yymsp[0].minor.yy326 = ORDER_ASC; }
         break;
-      case 427: /* ordering_specification_opt ::= DESC */
-{ yymsp[0].minor.yy530 = ORDER_DESC; }
+      case 428: /* ordering_specification_opt ::= DESC */
+{ yymsp[0].minor.yy326 = ORDER_DESC; }
         break;
-      case 428: /* null_ordering_opt ::= */
-{ yymsp[1].minor.yy225 = NULL_ORDER_DEFAULT; }
+      case 429: /* null_ordering_opt ::= */
+{ yymsp[1].minor.yy595 = NULL_ORDER_DEFAULT; }
         break;
-      case 429: /* null_ordering_opt ::= NULLS FIRST */
-{ yymsp[-1].minor.yy225 = NULL_ORDER_FIRST; }
+      case 430: /* null_ordering_opt ::= NULLS FIRST */
+{ yymsp[-1].minor.yy595 = NULL_ORDER_FIRST; }
         break;
-      case 430: /* null_ordering_opt ::= NULLS LAST */
-{ yymsp[-1].minor.yy225 = NULL_ORDER_LAST; }
+      case 431: /* null_ordering_opt ::= NULLS LAST */
+{ yymsp[-1].minor.yy595 = NULL_ORDER_LAST; }
         break;
       default:
         break;
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 3c60b62434..fd0d2758bf 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -200,7 +200,7 @@ static int32_t createScanLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect
   strcpy(pScan->tableName.tname, pRealTable->table.tableName);
   pScan->showRewrite = pCxt->pPlanCxt->showRewrite;
   pScan->ratio = pRealTable->ratio;
-  pScan->dataRequired = FUNC_DATA_REQUIRED_ALL_NEEDED;
+  pScan->dataRequired = FUNC_DATA_REQUIRED_DATA_LOAD;
 
   // set columns to scan
   SNodeList* pCols = NULL;
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 0be7c42467..8a766ae7e8 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -125,12 +125,12 @@ static int32_t osdMatch(SOptimizeContext* pCxt, SLogicNode* pLogicNode, SOsdInfo
 
 static EFuncDataRequired osdPromoteDataRequired(EFuncDataRequired l , EFuncDataRequired r) {
   switch (l) {
-    case FUNC_DATA_REQUIRED_ALL_NEEDED:
+    case FUNC_DATA_REQUIRED_DATA_LOAD:
       return l;
-    case FUNC_DATA_REQUIRED_STATIS_NEEDED:
-      return FUNC_DATA_REQUIRED_ALL_NEEDED == r ? r : l;
-    case FUNC_DATA_REQUIRED_NO_NEEDED:
-      return FUNC_DATA_REQUIRED_DISCARD == r ? l : r;
+    case FUNC_DATA_REQUIRED_STATIS_LOAD:
+      return FUNC_DATA_REQUIRED_DATA_LOAD == r ? r : l;
+    case FUNC_DATA_REQUIRED_NOT_LOAD:
+      return FUNC_DATA_REQUIRED_FILTEROUT == r ? l : r;
     default:
       break;
   }
@@ -139,9 +139,9 @@ static EFuncDataRequired osdPromoteDataRequired(EFuncDataRequired l , EFuncDataR
 
 static int32_t osdGetDataRequired(SNodeList* pFuncs) {
   if (NULL == pFuncs) {
-    return FUNC_DATA_REQUIRED_ALL_NEEDED;
+    return FUNC_DATA_REQUIRED_DATA_LOAD;
   }
-  EFuncDataRequired dataRequired = FUNC_DATA_REQUIRED_DISCARD;
+  EFuncDataRequired dataRequired = FUNC_DATA_REQUIRED_FILTEROUT;
   SNode* pFunc = NULL;
   FOREACH(pFunc, pFuncs) {
     dataRequired = osdPromoteDataRequired(dataRequired, fmFuncDataRequired((SFunctionNode*)pFunc, NULL));
diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c
index 67871dfe62..a9a360e03e 100644
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
@@ -1020,7 +1020,7 @@ int32_t qwProcessReady(QW_FPARAMS_DEF, SQWMsg *qwMsg) {
   }
   
   if (ctx->phase == QW_PHASE_PRE_QUERY) {
-    ctx->ctrlConnInfo.handle == qwMsg->connInfo.handle;
+    ctx->ctrlConnInfo.handle = qwMsg->connInfo.handle;
     ctx->ctrlConnInfo.ahandle = qwMsg->connInfo.ahandle;
     QW_SET_EVENT_RECEIVED(ctx, QW_EVENT_READY);
     needRsp = false;
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index a3806893c7..97cc80b946 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -1259,6 +1259,22 @@ int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t nowFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  if (inputNum != 1) {
+    return TSDB_CODE_FAILED;
+  }
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 0));
+  return TSDB_CODE_SUCCESS;
+}
+
+int32_t todayFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
+  if (inputNum != 1) {
+    return TSDB_CODE_FAILED;
+  }
+  colDataAppendInt64(pOutput->columnData, pOutput->numOfRows, (int64_t *)colDataGetData(pInput->columnData, 0));
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t atanFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {
   return doScalarFunctionUnique(pInput, inputNum, pOutput, atan);
 }
diff --git a/source/libs/scheduler/inc/schedulerInt.h b/source/libs/scheduler/inc/schedulerInt.h
index 62a96b6438..d1def1bef1 100644
--- a/source/libs/scheduler/inc/schedulerInt.h
+++ b/source/libs/scheduler/inc/schedulerInt.h
@@ -156,8 +156,8 @@ typedef struct SSchJob {
   int32_t          levelNum;
   int32_t          taskNum;
   void            *transport;
-  SArray          *nodeList;   // qnode/vnode list, element is SQueryNodeAddr
-  SArray          *levels;    // Element is SQueryLevel, starting from 0. SArray<SSchLevel>
+  SArray          *nodeList;   // qnode/vnode list, SArray<SQueryNodeAddr>
+  SArray          *levels;    // starting from 0. SArray<SSchLevel>
   SNodeList       *subPlans;  // subplan pointer copied from DAG, no need to free it in scheduler
 
   int32_t          levelIdx;
diff --git a/source/libs/scheduler/src/scheduler.c b/source/libs/scheduler/src/scheduler.c
index c5258afcc1..4e59e1bea6 100644
--- a/source/libs/scheduler/src/scheduler.c
+++ b/source/libs/scheduler/src/scheduler.c
@@ -14,12 +14,12 @@
  */
 
 #include "catalog.h"
+#include "command.h"
 #include "query.h"
 #include "schedulerInt.h"
 #include "tmsg.h"
 #include "tref.h"
 #include "trpc.h"
-#include "command.h"
 
 SSchedulerMgmt schMgmt = {0};
 
@@ -68,8 +68,8 @@ int32_t schInitTask(SSchJob *pJob, SSchTask *pTask, SSubplan *pPlan, SSchLevel *
 }
 
 int32_t schInitJob(SSchJob **pSchJob, SQueryPlan *pDag, void *transport, SArray *pNodeList, const char *sql,
-                              int64_t startTs, bool syncSchedule) {
-  int32_t code = 0;
+                   int64_t startTs, bool syncSchedule) {
+  int32_t  code = 0;
   SSchJob *pJob = taosMemoryCalloc(1, sizeof(SSchJob));
   if (NULL == pJob) {
     qError("QID:%" PRIx64 " calloc %d failed", pDag->queryId, (int32_t)sizeof(SSchJob));
@@ -141,7 +141,6 @@ _return:
   SCH_RET(code);
 }
 
-
 void schFreeRpcCtx(SRpcCtx *pCtx) {
   if (NULL == pCtx) {
     return;
@@ -1047,12 +1046,12 @@ _return:
 
 int32_t schProcessOnExplainDone(SSchJob *pJob, SSchTask *pTask, SRetrieveTableRsp *pRsp) {
   SCH_TASK_DLOG("got explain rsp, rows:%d, complete:%d", htonl(pRsp->numOfRows), pRsp->completed);
-  
+
   atomic_store_32(&pJob->resNumOfRows, htonl(pRsp->numOfRows));
   atomic_store_ptr(&pJob->resData, pRsp);
 
   SCH_SET_TASK_STATUS(pTask, JOB_TASK_STATUS_SUCCEED);
-  
+
   schProcessOnDataFetched(pJob);
 
   return TSDB_CODE_SUCCESS;
@@ -1146,7 +1145,7 @@ int32_t schHandleResponseMsg(SSchJob *pJob, SSchTask *pTask, int32_t msgType, ch
       if (NULL == msg) {
         SCH_ERR_JRET(TSDB_CODE_QRY_INVALID_INPUT);
       }
-      
+
       if (!SCH_IS_EXPLAIN_JOB(pJob)) {
         SCH_TASK_ELOG("invalid msg received for none explain query, msg type:%s", TMSG_INFO(msgType));
         SCH_ERR_JRET(TSDB_CODE_QRY_INVALID_INPUT);
@@ -1180,13 +1179,13 @@ int32_t schHandleResponseMsg(SSchJob *pJob, SSchTask *pTask, int32_t msgType, ch
       }
 
       if (SCH_IS_EXPLAIN_JOB(pJob)) {
-        if (rsp->completed) {          
+        if (rsp->completed) {
           SRetrieveTableRsp *pRsp = NULL;
           SCH_ERR_JRET(qExecExplainEnd(pJob->explainCtx, &pRsp));
           if (pRsp) {
             SCH_ERR_JRET(schProcessOnExplainDone(pJob, pTask, pRsp));
           }
-          
+
           return TSDB_CODE_SUCCESS;
         }
 
@@ -1238,23 +1237,24 @@ _return:
 }
 
 int32_t schGetTaskFromTaskList(SHashObj *pTaskList, uint64_t taskId, SSchTask **pTask) {
-   int32_t s = taosHashGetSize(pTaskList);
-   if (s <= 0) {
-     return TSDB_CODE_SUCCESS;
-   }
-   
-   SSchTask **task = taosHashGet(pTaskList, &taskId, sizeof(taskId));
-   if (NULL == task || NULL == (*task)) {
-     return TSDB_CODE_SUCCESS;
-   }
+  int32_t s = taosHashGetSize(pTaskList);
+  if (s <= 0) {
+    return TSDB_CODE_SUCCESS;
+  }
 
-   *pTask = *task;
+  SSchTask **task = taosHashGet(pTaskList, &taskId, sizeof(taskId));
+  if (NULL == task || NULL == (*task)) {
+    return TSDB_CODE_SUCCESS;
+  }
 
-   return TSDB_CODE_SUCCESS;
+  *pTask = *task;
+
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t schUpdateTaskExecNodeHandle(SSchTask *pTask, void *handle, int32_t rspCode) {
-  if (rspCode || NULL == pTask->execNodes || taosArrayGetSize(pTask->execNodes) > 1 || taosArrayGetSize(pTask->execNodes) <= 0) {
+  if (rspCode || NULL == pTask->execNodes || taosArrayGetSize(pTask->execNodes) > 1 ||
+      taosArrayGetSize(pTask->execNodes) <= 0) {
     return TSDB_CODE_SUCCESS;
   }
 
@@ -1264,7 +1264,6 @@ int32_t schUpdateTaskExecNodeHandle(SSchTask *pTask, void *handle, int32_t rspCo
   return TSDB_CODE_SUCCESS;
 }
 
-
 int32_t schHandleCallback(void *param, const SDataBuf *pMsg, int32_t msgType, int32_t rspCode) {
   int32_t                code = 0;
   SSchTaskCallbackParam *pParam = (SSchTaskCallbackParam *)param;
@@ -1282,13 +1281,15 @@ int32_t schHandleCallback(void *param, const SDataBuf *pMsg, int32_t msgType, in
     if (TDMT_VND_EXPLAIN_RSP == msgType) {
       schGetTaskFromTaskList(pJob->succTasks, pParam->taskId, &pTask);
     } else {
-      SCH_JOB_ELOG("task not found in execTask list, refId:%" PRIx64 ", taskId:%" PRIx64, pParam->refId, pParam->taskId);
+      SCH_JOB_ELOG("task not found in execTask list, refId:%" PRIx64 ", taskId:%" PRIx64, pParam->refId,
+                   pParam->taskId);
       SCH_ERR_JRET(TSDB_CODE_SCH_INTERNAL_ERROR);
     }
   }
-  
+
   if (NULL == pTask) {
-    SCH_JOB_ELOG("task not found in execList & succList, refId:%" PRIx64 ", taskId:%" PRIx64, pParam->refId, pParam->taskId);
+    SCH_JOB_ELOG("task not found in execList & succList, refId:%" PRIx64 ", taskId:%" PRIx64, pParam->refId,
+                 pParam->taskId);
     SCH_ERR_JRET(TSDB_CODE_SCH_INTERNAL_ERROR);
   }
 
@@ -1444,7 +1445,7 @@ int32_t schGetCallbackFp(int32_t msgType, __async_send_cb_fn_t *fp) {
 }
 
 int32_t schGenerateTaskCallBackAHandle(SSchJob *pJob, SSchTask *pTask, int32_t msgType, SMsgSendInfo **pMsgSendInfo) {
-  int32_t code = 0;
+  int32_t       code = 0;
   SMsgSendInfo *msgSendInfo = taosMemoryCalloc(1, sizeof(SMsgSendInfo));
   if (NULL == msgSendInfo) {
     SCH_TASK_ELOG("calloc %d failed", (int32_t)sizeof(SMsgSendInfo));
@@ -1565,7 +1566,7 @@ _return:
 }
 
 int32_t schMakeQueryRpcCtx(SSchJob *pJob, SSchTask *pTask, SRpcCtx *pCtx) {
-  int32_t                code = 0;
+  int32_t       code = 0;
   SMsgSendInfo *pReadyMsgSendInfo = NULL;
   SMsgSendInfo *pExplainMsgSendInfo = NULL;
 
@@ -1578,7 +1579,7 @@ int32_t schMakeQueryRpcCtx(SSchJob *pJob, SSchTask *pTask, SRpcCtx *pCtx) {
   SCH_ERR_JRET(schGenerateTaskCallBackAHandle(pJob, pTask, TDMT_VND_RES_READY, &pReadyMsgSendInfo));
   SCH_ERR_JRET(schGenerateTaskCallBackAHandle(pJob, pTask, TDMT_VND_EXPLAIN, &pExplainMsgSendInfo));
 
-  int32_t msgType = TDMT_VND_RES_READY_RSP;
+  int32_t    msgType = TDMT_VND_RES_READY_RSP;
   SRpcCtxVal ctxVal = {.val = pReadyMsgSendInfo, .clone = schCloneSMsgSendInfo, .freeFunc = schFreeRpcCtxVal};
   if (taosHashPut(pCtx->args, &msgType, sizeof(msgType), &ctxVal, sizeof(ctxVal))) {
     SCH_TASK_ELOG("taosHashPut msg %d to rpcCtx failed", msgType);
@@ -1599,7 +1600,7 @@ int32_t schMakeQueryRpcCtx(SSchJob *pJob, SSchTask *pTask, SRpcCtx *pCtx) {
 _return:
 
   taosHashCleanup(pCtx->args);
-  
+
   if (pReadyMsgSendInfo) {
     taosMemoryFreeClear(pReadyMsgSendInfo->param);
     taosMemoryFreeClear(pReadyMsgSendInfo);
@@ -1818,7 +1819,7 @@ _return:
     taosMemoryFreeClear(pMsgSendInfo->param);
     taosMemoryFreeClear(pMsgSendInfo);
   }
-  
+
   SCH_RET(code);
 }
 
@@ -2319,7 +2320,7 @@ _return:
 }
 
 int32_t schExecStaticExplain(void *transport, SArray *pNodeList, SQueryPlan *pDag, int64_t *job, const char *sql,
-                              bool syncSchedule) {
+                             bool syncSchedule) {
   qDebug("QID:0x%" PRIx64 " job started", pDag->queryId);
 
   int32_t  code = 0;
@@ -2608,7 +2609,7 @@ int32_t schedulerFetchRows(int64_t job, void **pData) {
     if (!(pJob->attr.explainMode == EXPLAIN_MODE_STATIC)) {
       SCH_ERR_JRET(schFetchFromRemote(pJob));
       tsem_wait(&pJob->rspSem);
-    } 
+    }
   } else {
     SCH_JOB_ELOG("job status error for fetch, status:%s", jobTaskStatusStr(status));
     SCH_ERR_JRET(TSDB_CODE_SCH_STATUS_ERROR);
@@ -2655,6 +2656,33 @@ _return:
   SCH_RET(code);
 }
 
+int32_t schedulerGetTasksStatus(int64_t job, SArray *pSub) {
+  int32_t  code = 0;
+  SSchJob *pJob = schAcquireJob(job);
+  if (NULL == pJob) {
+    qDebug("acquire job from jobRef list failed, may not started or dropped, refId:%" PRIx64, job);
+    SCH_ERR_RET(TSDB_CODE_SCH_STATUS_ERROR);
+  }
+
+  if (pJob->status < JOB_TASK_STATUS_NOT_START || pJob->levelNum <= 0 || NULL == pJob->levels) {
+    qDebug("job not initialized or not executable job, refId:%" PRIx64, job);
+    SCH_ERR_RET(TSDB_CODE_SCH_STATUS_ERROR);
+  }
+
+  for (int32_t i = pJob->levelNum - 1; i >= 0; --i) {
+    SSchLevel *pLevel = taosArrayGet(pJob->levels, i);
+
+    for (int32_t m = 0; m < pLevel->taskNum; ++m) {
+      SSchTask     *pTask = taosArrayGet(pLevel->subTasks, m);
+      SQuerySubDesc subDesc = {.tid = pTask->taskId, .status = pTask->status};
+
+      taosArrayPush(pSub, &subDesc);
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
 int32_t scheduleCancelJob(int64_t job) {
   SSchJob *pJob = schAcquireJob(job);
   if (NULL == pJob) {
@@ -2672,7 +2700,7 @@ int32_t scheduleCancelJob(int64_t job) {
 void schedulerFreeJob(int64_t job) {
   SSchJob *pJob = schAcquireJob(job);
   if (NULL == pJob) {
-    qError("acquire job from jobRef list failed, may be dropped, refId:%" PRIx64, job);
+    qDebug("acquire job from jobRef list failed, may be dropped, refId:%" PRIx64, job);
     return;
   }
 
@@ -2706,15 +2734,17 @@ void schedulerFreeTaskList(SArray *taskList) {
 void schedulerDestroy(void) {
   if (schMgmt.jobRef) {
     SSchJob *pJob = taosIterateRef(schMgmt.jobRef, 0);
-
+    int64_t refId = 0;
+    
     while (pJob) {
+      refId = pJob->refId;
+      
       taosRemoveRef(schMgmt.jobRef, pJob->refId);
 
-      pJob = taosIterateRef(schMgmt.jobRef, pJob->refId);
+      pJob = taosIterateRef(schMgmt.jobRef, refId);
     }
 
     taosCloseRef(schMgmt.jobRef);
     schMgmt.jobRef = 0;
   }
 }
-
diff --git a/source/libs/transport/src/transComm.c b/source/libs/transport/src/transComm.c
index 3078324c6b..ef9cccccb7 100644
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@@ -292,7 +292,7 @@ void* transCtxDumpBrokenlinkVal(STransCtx* ctx, int32_t* msgType) {
 
 void transQueueInit(STransQueue* queue, void (*freeFunc)(const void* arg)) {
   queue->q = taosArrayInit(2, sizeof(void*));
-  queue->freeFunc = freeFunc;
+  queue->freeFunc = (void (*)(const void*))freeFunc;
 }
 bool transQueuePush(STransQueue* queue, void* arg) {
   if (queue->q == NULL) {
diff --git a/source/libs/transport/test/transportTests.cpp b/source/libs/transport/test/transportTests.cpp
index ce795b1763..2488dda3f6 100644
--- a/source/libs/transport/test/transportTests.cpp
+++ b/source/libs/transport/test/transportTests.cpp
@@ -156,14 +156,14 @@ TEST_F(TransCtxEnv, mergeTest) {
     STransCtx *src = (STransCtx *)taosMemoryCalloc(1, sizeof(STransCtx));
     transCtxInit(src);
     {
-      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = taosMemoryFree};
+      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = (void (*)(const void*))taosMemoryFree};
       val1.val = taosMemoryMalloc(12);
 
       taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
       key++;
     }
     {
-      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = taosMemoryFree};
+      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = (void (*)(const void*))taosMemoryFree};
       val1.val = taosMemoryMalloc(12);
       taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
       key++;
@@ -176,14 +176,14 @@ TEST_F(TransCtxEnv, mergeTest) {
     STransCtx *src = (STransCtx *)taosMemoryCalloc(1, sizeof(STransCtx));
     transCtxInit(src);
     {
-      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = taosMemoryFree};
+      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = (void (*)(const void*))taosMemoryFree};
       val1.val = taosMemoryMalloc(12);
 
       taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
       key++;
     }
     {
-      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = taosMemoryFree};
+      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = (void (*)(const void*))taosMemoryFree};
       val1.val = taosMemoryMalloc(12);
       taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
       key++;
@@ -198,7 +198,7 @@ TEST_F(TransCtxEnv, mergeTest) {
     STransCtx *src = (STransCtx *)taosMemoryCalloc(1, sizeof(STransCtx));
     transCtxInit(src);
     {
-      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = taosMemoryFree};
+      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = (void (*)(const void*))taosMemoryFree};
       val1.val = taosMemoryCalloc(1, 11);
       memcpy(val1.val, val.c_str(), val.size());
 
@@ -206,7 +206,7 @@ TEST_F(TransCtxEnv, mergeTest) {
       key++;
     }
     {
-      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = taosMemoryFree};
+      STransCtxVal val1 = {.val = NULL, .clone = NULL, .freeFunc = (void (*)(const void*))taosMemoryFree};
       val1.val = taosMemoryCalloc(1, 11);
       memcpy(val1.val, val.c_str(), val.size());
       taosHashPut(src->args, &key, sizeof(key), &val1, sizeof(val1));
diff --git a/source/os/src/osMemory.c b/source/os/src/osMemory.c
index 3545aabdca..cd756b45e2 100644
--- a/source/os/src/osMemory.c
+++ b/source/os/src/osMemory.c
@@ -156,7 +156,7 @@ void *taosMemoryStrDup(void *ptr) {
 }
 
 
-void taosMemoryFree(const void *ptr) {
+void taosMemoryFree(void *ptr) {
   if (ptr == NULL) return;
 
 #ifdef USE_TD_MEMORY
@@ -166,10 +166,10 @@ void taosMemoryFree(const void *ptr) {
     // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo));
     free(pTdMemoryInfo);
   } else {
-    free((void*)ptr);
+    free(ptr);
   }
 #else
-  return free((void*)ptr);
+  return free(ptr);
 #endif
 }
 
diff --git a/source/util/src/tarray.c b/source/util/src/tarray.c
index a74b26a386..4477a5cacd 100644
--- a/source/util/src/tarray.c
+++ b/source/util/src/tarray.c
@@ -303,6 +303,21 @@ void taosArrayClear(SArray* pArray) {
   pArray->size = 0;
 }
 
+void taosArrayClearEx(SArray* pArray, void (*fp)(void*)) {
+  if (pArray == NULL) return;
+  if (fp == NULL) {
+    pArray->size = 0;
+    return;
+  }
+
+  for (int32_t i = 0; i < pArray->size; ++i) {
+    fp(TARRAY_GET_ELEM(pArray, i));
+  }
+
+  pArray->size = 0;
+}
+
+
 void* taosArrayDestroy(SArray* pArray) {
   if (pArray) {
     taosMemoryFree(pArray->pData);
diff --git a/tests/script/tsim/query/session.sim b/tests/script/tsim/query/session.sim
index 3aee838625..d4920ea255 100644
--- a/tests/script/tsim/query/session.sim
+++ b/tests/script/tsim/query/session.sim
@@ -288,7 +288,7 @@ endi
 
 print ================> syntax error check not active ================> reactive
 sql_error select * from dev_001 session(ts,1w)
-sql select count(*) from st session(ts,1w)
+sql_error select count(*) from st session(ts,1w)
 sql_error select count(*) from dev_001 group by tagtype session(ts,1w)
 sql select count(*) from dev_001 session(ts,1n)
 sql select count(*) from dev_001 session(ts,1y)
diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim
index 70a9719b40..74bc444da2 100644
--- a/tests/script/tsim/query/stddev.sim
+++ b/tests/script/tsim/query/stddev.sim
@@ -1,17 +1,16 @@
 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/exec.sh -n dnode1 -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
+    $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
@@ -23,108 +22,410 @@ endi
 
 sql connect
 
-$dbPrefix = db
-$tbPrefix = ctb
-$mtPrefix = stb
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql drop database $db -x step1
-step1:
-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
-    $cc = $x * 60000
-    $ms = 1601481600000 + $cc
-
-    sql insert into $tb values ($ms , $x ) 
-    $x = $x + 1
-  endw 
- 
-  $i = $i + 1
-endw 
-
-sleep 100
-
-print =============== step2
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select stddev(tbcol) from $tb
-print ===> $data00
-if $data00 != 5.766281297 then 
-  return -1
-endi
-
-print =============== step3
-$cc = 4 * 60000
-$ms = 1601481600000 + $cc
-
-print ===> select stddev(tbcol) from $tb where ts <= $ms
-sql select stddev(tbcol) from $tb where ts <= $ms
-print ====> $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1.414213562 then 
-  return -1
-endi
-
-print =============== step4
-sql select stddev(tbcol) as b from $tb
-print ===> $data00
-if $data00 != 5.766281297 then 
-  return -1
-endi
-
-print =============== step5
-sql select _wstartts, stddev(tbcol) as b from $tb interval(1m)
-print ===> $data01 
-if $data01 != 0.000000000 then
-  print expect 0.000000000, actual: $data01
-  return -1
-endi
-
-sql select _wstartts, stddev(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 5.766281297 then 
-  return -1
-endi
-
-print =============== step6
-$cc = 4 * 60000
-$ms = 1601481600000 + $cc
-
-print select _wstartts, stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
-sql select _wstartts, stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data01
-if $data01 != 0.000000000 then 
-  return -1
-endi
-
-print $data00 , $data10 ,  $data20 , $data30 , $data40  , $data50 , $data60
-
-if $rows != 5 then
-  print expect 5, actual: $rows
-  return -1
-endi
-
-print =============== clear
-sql drop database $db
+print =============== create database
+sql create database db
 sql show databases
+if $rows != 3 then
+  return -1
+endi
+
+sql use db
+
+print =============== create super table and child table
+sql create table stb1 (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp) tags (t1 int)
+sql show stables
+print $rows $data00 $data01 $data02
 if $rows != 1 then
   return -1
 endi
 
+sql create table ct1 using stb1 tags ( 1 )
+sql create table ct2 using stb1 tags ( 2 )
+sql create table ct3 using stb1 tags ( 3 )
+sql create table ct4 using stb1 tags ( 4 )
+sql show tables
+print $rows $data00 $data10 $data20
+if $rows != 4 then
+  return -1
+endi
+
+sql create table t1 (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
+
+print =============== insert data into child table ct1 (s)
+sql insert into ct1 values ( '2022-01-01 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now+1a )
+sql insert into ct1 values ( '2022-01-01 01:01:06.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now+2a )
+sql insert into ct1 values ( '2022-01-01 01:01:10.000', 3, 33333, 333, 33, 3.33, 33.33, 0, "binary3", "nchar3", now+3a )
+sql insert into ct1 values ( '2022-01-01 01:01:16.000', 4, 44444, 444, 44, 4.44, 44.44, 1, "binary4", "nchar4", now+4a )
+sql insert into ct1 values ( '2022-01-01 01:01:20.000', 5, 55555, 555, 55, 5.55, 55.55, 0, "binary5", "nchar5", now+5a )
+sql insert into ct1 values ( '2022-01-01 01:01:26.000', 6, 66666, 666, 66, 6.66, 66.66, 1, "binary6", "nchar6", now+6a )
+sql insert into ct1 values ( '2022-01-01 01:01:30.000', 7, 00000, 000, 00, 0.00, 00.00, 1, "binary7", "nchar7", now+7a )
+sql insert into ct1 values ( '2022-01-01 01:01:36.000', 8, -88888, -888, -88, -8.88, -88.88, 0, "binary8", "nchar8", now+8a )
+
+print =============== insert data into child table ct4 (y)
+sql insert into ct4 values ( '2019-01-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+sql insert into ct4 values ( '2019-10-21 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now+1a )
+sql insert into ct4 values ( '2019-12-31 01:01:01.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now+2a )
+sql insert into ct4 values ( '2020-01-01 01:01:06.000', 3, 33333, 333, 33, 3.33, 33.33, 0, "binary3", "nchar3", now+3a )
+sql insert into ct4 values ( '2020-05-07 01:01:10.000', 4, 44444, 444, 44, 4.44, 44.44, 1, "binary4", "nchar4", now+4a )
+sql insert into ct4 values ( '2020-09-30 01:01:16.000', 5, 55555, 555, 55, 5.55, 55.55, 0, "binary5", "nchar5", now+5a )
+sql insert into ct4 values ( '2020-12-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+sql insert into ct4 values ( '2021-02-01 01:01:20.000', 6, 66666, 666, 66, 6.66, 66.66, 1, "binary6", "nchar6", now+6a )
+sql insert into ct4 values ( '2021-10-28 01:01:26.000', 7, 00000, 000, 00, 0.00, 00.00, 1, "binary7", "nchar7", "1970-01-01 08:00:00.000" )
+sql insert into ct4 values ( '2021-12-01 01:01:30.000', 8, -88888, -888, -88, -8.88, -88.88, 0, "binary8", "nchar8", "1969-01-01 01:00:00.000" )
+sql insert into ct4 values ( '2022-02-31 01:01:36.000', 9, -99999999999999999, -999, -99, -9.99, -999999999999999999999.99, 1, "binary9", "nchar9", "1900-01-01 00:00:00.000" )
+sql insert into ct4 values ( '2022-05-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
+
+print =============== insert data into child table t1
+sql insert into t1 values ( '2020-10-21 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now+1a )
+sql insert into t1 values ( '2020-12-31 01:01:01.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now+2a )
+sql insert into t1 values ( '2021-01-01 01:01:06.000', 3, 33333, 333, 33, 3.33, 33.33, 0, "binary3", "nchar3", now+3a )
+sql insert into t1 values ( '2021-05-07 01:01:10.000', 4, 44444, 444, 44, 4.44, 44.44, 1, "binary4", "nchar4", now+4a )
+sql insert into t1 values ( '2021-09-30 01:01:16.000', 5, 55555, 555, 55, 5.55, 55.55, 0, "binary5", "nchar5", now+5a )
+sql insert into t1 values ( '2022-02-01 01:01:20.000', 6, 66666, 666, 66, 6.66, 66.66, 1, "binary6", "nchar6", now+6a )
+sql insert into t1 values ( '2022-10-28 01:01:26.000', 7, 00000, 000, 00, 0.00, 00.00, 1, "binary7", "nchar7", "1970-01-01 08:00:00.000" )
+sql insert into t1 values ( '2022-12-01 01:01:30.000', 8, -88888, -888, -88, -8.88, -88.88, 0, "binary8", "nchar8", "1969-01-01 01:00:00.000" )
+sql insert into t1 values ( '2022-12-31 01:01:36.000', 9, -99999999999999999, -999, -99, -9.99, -999999999999999999999.99, 1, "binary9", "nchar9", "1900-01-01 00:00:00.000" )
+
+print ================ start query ======================
+
+print =============== step1
+print =====sql : select stddev(c1) as b from ct4
+sql select stddev(c1) as b from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1) as b from t1
+sql select stddev(c1) as b from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select _wstartts, stddev(c1) as b from ct4 interval(1y)
+sql select _wstartts, stddev(c1) as b from ct4 interval(1y)
+print ===> $rows
+if $rows != 4 then
+  return -1
+endi
+
+print =====sql : select _wstartts, stddev(c1) as b from t1 interval(1y)
+sql select _wstartts, stddev(c1) as b from t1 interval(1y)
+print ===> $rows
+if $rows != 3 then
+  return -1
+endi
+
+print =====select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+sql select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+# print ===> $rows
+# if $rows != 3 then
+#   return -1
+# endi
+
+print =====select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+sql select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+# print ===> $rows
+# if $rows != 3 then
+#   return -1
+# endi
+
+print =====sql : select stddev(c1) a1, sum(c1) b1 from ct4
+sql select stddev(c1) a1, sum(c1) b1 from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1) a1, sum(c1) b1 from t1
+sql select stddev(c1) a1, sum(c1) b1 from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1)+sum(c1) b1 from ct4
+sql  select stddev(c1)+sum(c1) b1 from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1)+sum(c1) b1 from t1
+sql  select stddev(c1)+sum(c1) b1 from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c2) from ct4
+sql  select stddev(c2) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c2) from t1
+sql  select stddev(c2) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c3) from ct4
+sql  select stddev(c3) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c3) from t1
+sql  select stddev(c3) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c4) from ct4
+sql  select stddev(c4) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c4) from t1
+sql  select stddev(c4) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c5) from ct4
+sql  select stddev(c5) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c5) from t1
+sql  select stddev(c5) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c6) from ct4
+sql  select stddev(c6) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c6) from t1
+sql  select stddev(c6) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c7) from ct4
+sql_error  select stddev(c7) from ct4
+# print ===> $rows
+# if $rows != 1 then
+#   return -1
+# endi
+
+print =====sql : select stddev(c7) from t1
+sql_error  select stddev(c7) from t1
+# print ===> $rows
+# if $rows != 1 then
+#   return -1
+# endi
+
+#=================================================
+print =============== stop and restart taosd
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s start
+
+$loop_cnt = 0
+check_dnode_ready_0:
+	  $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_0
+endi
+
+print =============== step2 after wal
+print =====sql : select stddev(c1) as b from ct4
+sql select stddev(c1) as b from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1) as b from t1
+sql select stddev(c1) as b from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select _wstartts, stddev(c1) as b from ct4 interval(1y)
+sql select _wstartts, stddev(c1) as b from ct4 interval(1y)
+print ===> $rows
+if $rows != 4 then
+  return -1
+endi
+
+print =====sql : select _wstartts, stddev(c1) as b from t1 interval(1y)
+sql select _wstartts, stddev(c1) as b from t1 interval(1y)
+print ===> $rows
+if $rows != 3 then
+  return -1
+endi
+
+print =====select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+sql select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+print ===> $rows
+if $rows != 3 then
+  return -1
+endi
+
+print =====select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+sql select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+print ===> $rows
+if $rows != 3 then
+  return -1
+endi
+
+print =====sql : select stddev(c1) a1, sum(c1) b1 from ct4
+sql select stddev(c1) a1, sum(c1) b1 from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1) a1, sum(c1) b1 from t1
+sql select stddev(c1) a1, sum(c1) b1 from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1)+sum(c1) b1 from ct4
+sql  select stddev(c1)+sum(c1) b1 from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c1)+sum(c1) b1 from t1
+sql  select stddev(c1)+sum(c1) b1 from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c2) from ct4
+sql  select stddev(c2) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c2) from t1
+sql  select stddev(c2) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c3) from ct4
+sql  select stddev(c3) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c3) from t1
+sql  select stddev(c3) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c4) from ct4
+sql  select stddev(c4) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c4) from t1
+sql  select stddev(c4) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c5) from ct4
+sql  select stddev(c5) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c5) from t1
+sql  select stddev(c5) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c6) from ct4
+sql  select stddev(c6) from ct4
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c6) from t1
+sql  select stddev(c6) from t1
+print ===> $rows
+if $rows != 1 then
+  return -1
+endi
+
+print =====sql : select stddev(c7) from ct4
+sql_error  select stddev(c7) from ct4
+# print ===> $rows
+# if $rows != 1 then
+#   return -1
+# endi
+
+print =====sql : select stddev(c7) from t1
+sql_error  select stddev(c7) from t1
+# print ===> $rows
+# if $rows != 1 then
+#   return -1
+# endi
+
+print =============== clear
+sql drop database db
+sql show databases
+if $rows != 2 then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 1809d99209..ac2010efa3 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -344,6 +344,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 
     atomic_store_64(&result, 0);
     freeResultWithRid(oresult);
+    taos_free_result(pSql);    
+    
     return;
   }