From 7ea23a33bc09a32eb293158c23dcaea81aa24513 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 9 May 2023 16:37:08 +0800
Subject: [PATCH 01/58] enh: optimize time line function validation

---
 include/libs/nodes/querynodes.h           | 94 ++++++++++++-----------
 source/libs/nodes/src/nodesCloneFuncs.c   |  2 +-
 source/libs/parser/inc/parUtil.h          |  1 +
 source/libs/parser/src/parAstCreater.c    |  2 +-
 source/libs/parser/src/parTranslater.c    | 39 ++++++----
 source/libs/parser/src/parUtil.c          | 11 +++
 source/libs/parser/test/parSelectTest.cpp |  9 +++
 7 files changed, 98 insertions(+), 60 deletions(-)

diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 480912a8cf..54c9d88a5e 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -241,6 +241,12 @@ typedef enum EFillMode {
   FILL_MODE_NEXT
 } EFillMode;
 
+typedef enum ETimeLineMode {
+  TIME_LINE_NONE = 1,
+  TIME_LINE_MULTI,
+  TIME_LINE_GLOBAL,
+} ETimeLineMode;
+
 typedef struct SFillNode {
   ENodeType   type;  // QUERY_NODE_FILL
   EFillMode   mode;
@@ -263,50 +269,50 @@ typedef struct SCaseWhenNode {
 } SCaseWhenNode;
 
 typedef struct SSelectStmt {
-  ENodeType   type;  // QUERY_NODE_SELECT_STMT
-  bool        isDistinct;
-  SNodeList*  pProjectionList;
-  SNode*      pFromTable;
-  SNode*      pWhere;
-  SNodeList*  pPartitionByList;
-  SNodeList*  pTags;      // for create stream
-  SNode*      pSubtable;  // for create stream
-  SNode*      pWindow;
-  SNodeList*  pGroupByList;  // SGroupingSetNode
-  SNode*      pHaving;
-  SNode*      pRange;
-  SNode*      pEvery;
-  SNode*      pFill;
-  SNodeList*  pOrderByList;  // SOrderByExprNode
-  SLimitNode* pLimit;
-  SLimitNode* pSlimit;
-  STimeWindow timeRange;
-  char        stmtName[TSDB_TABLE_NAME_LEN];
-  uint8_t     precision;
-  int32_t     selectFuncNum;
-  int32_t     returnRows;  // EFuncReturnRows
-  bool        isEmptyResult;
-  bool        isTimeLineResult;
-  bool        isSubquery;
-  bool        hasAggFuncs;
-  bool        hasRepeatScanFuncs;
-  bool        hasIndefiniteRowsFunc;
-  bool        hasMultiRowsFunc;
-  bool        hasSelectFunc;
-  bool        hasSelectValFunc;
-  bool        hasOtherVectorFunc;
-  bool        hasUniqueFunc;
-  bool        hasTailFunc;
-  bool        hasInterpFunc;
-  bool        hasInterpPseudoColFunc;
-  bool        hasLastRowFunc;
-  bool        hasLastFunc;
-  bool        hasTimeLineFunc;
-  bool        hasUdaf;
-  bool        hasStateKey;
-  bool        onlyHasKeepOrderFunc;
-  bool        groupSort;
-  bool        tagScan;
+  ENodeType     type;  // QUERY_NODE_SELECT_STMT
+  bool          isDistinct;
+  SNodeList*    pProjectionList;
+  SNode*        pFromTable;
+  SNode*        pWhere;
+  SNodeList*    pPartitionByList;
+  SNodeList*    pTags;      // for create stream
+  SNode*        pSubtable;  // for create stream
+  SNode*        pWindow;
+  SNodeList*    pGroupByList;  // SGroupingSetNode
+  SNode*        pHaving;
+  SNode*        pRange;
+  SNode*        pEvery;
+  SNode*        pFill;
+  SNodeList*    pOrderByList;  // SOrderByExprNode
+  SLimitNode*   pLimit;
+  SLimitNode*   pSlimit;
+  STimeWindow   timeRange;
+  char          stmtName[TSDB_TABLE_NAME_LEN];
+  uint8_t       precision;
+  int32_t       selectFuncNum;
+  int32_t       returnRows;  // EFuncReturnRows
+  ETimeLineMode timeLineResMode;
+  bool          isEmptyResult;
+  bool          isSubquery;
+  bool          hasAggFuncs;
+  bool          hasRepeatScanFuncs;
+  bool          hasIndefiniteRowsFunc;
+  bool          hasMultiRowsFunc;
+  bool          hasSelectFunc;
+  bool          hasSelectValFunc;
+  bool          hasOtherVectorFunc;
+  bool          hasUniqueFunc;
+  bool          hasTailFunc;
+  bool          hasInterpFunc;
+  bool          hasInterpPseudoColFunc;
+  bool          hasLastRowFunc;
+  bool          hasLastFunc;
+  bool          hasTimeLineFunc;
+  bool          hasUdaf;
+  bool          hasStateKey;
+  bool          onlyHasKeepOrderFunc;
+  bool          groupSort;
+  bool          tagScan;
 } SSelectStmt;
 
 typedef enum ESetOperatorType { SET_OP_TYPE_UNION_ALL = 1, SET_OP_TYPE_UNION } ESetOperatorType;
diff --git a/source/libs/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c
index 0f4e7bde63..ed0f47f68d 100644
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
@@ -667,7 +667,7 @@ static int32_t selectStmtCopy(const SSelectStmt* pSrc, SSelectStmt* pDst) {
   COPY_CHAR_ARRAY_FIELD(stmtName);
   COPY_SCALAR_FIELD(precision);
   COPY_SCALAR_FIELD(isEmptyResult);
-  COPY_SCALAR_FIELD(isTimeLineResult);
+  COPY_SCALAR_FIELD(timeLineResMode);
   COPY_SCALAR_FIELD(hasAggFuncs);
   COPY_SCALAR_FIELD(hasRepeatScanFuncs);
   return TSDB_CODE_SUCCESS;
diff --git a/source/libs/parser/inc/parUtil.h b/source/libs/parser/inc/parUtil.h
index 850571eea1..4130ccc483 100644
--- a/source/libs/parser/inc/parUtil.h
+++ b/source/libs/parser/inc/parUtil.h
@@ -84,6 +84,7 @@ int32_t       getNumOfColumns(const STableMeta* pTableMeta);
 int32_t       getNumOfTags(const STableMeta* pTableMeta);
 STableComInfo getTableInfo(const STableMeta* pTableMeta);
 STableMeta*   tableMetaDup(const STableMeta* pTableMeta);
+int32_t getTableTypeFromTableNode(SNode *pTable);
 
 int32_t trimString(const char* src, int32_t len, char* dst, int32_t dlen);
 int32_t getVnodeSysTableTargetName(int32_t acctId, SNode* pWhere, SName* pName);
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index c53721f865..9a9cd57aeb 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -828,7 +828,7 @@ SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pPr
   select->pProjectionList = pProjectionList;
   select->pFromTable = pTable;
   sprintf(select->stmtName, "%p", select);
-  select->isTimeLineResult = true;
+  select->timeLineResMode = TIME_LINE_GLOBAL;
   select->onlyHasKeepOrderFunc = true;
   select->timeRange = TSWINDOW_INITIALIZER;
   return (SNode*)select;
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 6545c33a27..7692629a9f 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -746,18 +746,18 @@ static SNodeList* getProjectList(const SNode* pNode) {
 
 static bool isTimeLineQuery(SNode* pStmt) {
   if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) {
-    return ((SSelectStmt*)pStmt)->isTimeLineResult;
+    return (TIME_LINE_MULTI == ((SSelectStmt*)pStmt)->timeLineResMode) || (TIME_LINE_GLOBAL == ((SSelectStmt*)pStmt)->timeLineResMode);
   } else {
     return false;
   }
 }
 
 static bool isGlobalTimeLineQuery(SNode* pStmt) {
-  if (!isTimeLineQuery(pStmt)) {
+  if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) {
+    return TIME_LINE_GLOBAL == ((SSelectStmt*)pStmt)->timeLineResMode;
+  } else {
     return false;
   }
-  SSelectStmt* pSelect = (SSelectStmt*)pStmt;
-  return NULL == pSelect->pPartitionByList || NULL != pSelect->pOrderByList;
 }
 
 static bool isPrimaryKeyImpl(SNode* pExpr) {
@@ -1563,7 +1563,7 @@ static int32_t translateTimelineFunc(STranslateContext* pCxt, SFunctionNode* pFu
   }
   SSelectStmt* pSelect = (SSelectStmt*)pCxt->pCurrStmt;
   if (NULL != pSelect->pFromTable && QUERY_NODE_TEMP_TABLE == nodeType(pSelect->pFromTable) &&
-      !isTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
+      !isGlobalTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_ALLOWED_FUNC,
                                    "%s function requires valid time series input", pFunc->functionName);
   }
@@ -2273,7 +2273,7 @@ static int32_t checkAggColCoexist(STranslateContext* pCxt, SSelectStmt* pSelect)
     return TSDB_CODE_SUCCESS;
   }
   if (!pSelect->onlyHasKeepOrderFunc) {
-    pSelect->isTimeLineResult = false;
+    pSelect->timeLineResMode = TIME_LINE_NONE;
   }
   CheckAggColCoexistCxt cxt = {.pTranslateCxt = pCxt, .existCol = false};
   nodesRewriteExprs(pSelect->pProjectionList, doCheckAggColCoexist, &cxt);
@@ -2562,9 +2562,9 @@ static int32_t setTableCacheLastMode(STranslateContext* pCxt, SSelectStmt* pSele
 
 static int32_t checkJoinTable(STranslateContext* pCxt, SJoinTableNode* pJoinTable) {
   if ((QUERY_NODE_TEMP_TABLE == nodeType(pJoinTable->pLeft) &&
-       !isTimeLineQuery(((STempTableNode*)pJoinTable->pLeft)->pSubquery)) ||
+       !isGlobalTimeLineQuery(((STempTableNode*)pJoinTable->pLeft)->pSubquery)) ||
       (QUERY_NODE_TEMP_TABLE == nodeType(pJoinTable->pRight) &&
-       !isTimeLineQuery(((STempTableNode*)pJoinTable->pRight)->pSubquery))) {
+       !isGlobalTimeLineQuery(((STempTableNode*)pJoinTable->pRight)->pSubquery))) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_SUPPORT_JOIN,
                                    "Join requires valid time series input");
   }
@@ -2598,7 +2598,7 @@ static int32_t translateTable(STranslateContext* pCxt, SNode* pTable) {
           pCxt->stableQuery = true;
         }
         if (TSDB_SYSTEM_TABLE == pRealTable->pMeta->tableType && isSelectStmt(pCxt->pCurrStmt)) {
-          ((SSelectStmt*)pCxt->pCurrStmt)->isTimeLineResult = false;
+          ((SSelectStmt*)pCxt->pCurrStmt)->timeLineResMode = TIME_LINE_NONE;
         }
         code = addNamespace(pCxt, pRealTable);
       }
@@ -3071,7 +3071,7 @@ static int32_t translateGroupBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
     return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_GROUPBY_WINDOW_COEXIST);
   }
   pCxt->currClause = SQL_CLAUSE_GROUP_BY;
-  pSelect->isTimeLineResult = false;
+  pSelect->timeLineResMode = TIME_LINE_NONE;
   return translateExprList(pCxt, pSelect->pGroupByList);
 }
 
@@ -3471,7 +3471,18 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) {
 
 static int32_t translatePartitionBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
   pCxt->currClause = SQL_CLAUSE_PARTITION_BY;
-  int32_t code = translateExprList(pCxt, pSelect->pPartitionByList);
+  int32_t code = TSDB_CODE_SUCCESS;
+  
+  if (pSelect->pPartitionByList) {
+    int8_t typeType = getTableTypeFromTableNode(pSelect->pFromTable);
+    SNode* pPar = nodesListGetNode(pSelect->pPartitionByList, 0);
+    if (!((TSDB_NORMAL_TABLE == typeType || TSDB_CHILD_TABLE == typeType) && 
+      1 == pSelect->pPartitionByList->length && (QUERY_NODE_FUNCTION == nodeType(pPar) && FUNCTION_TYPE_TBNAME == ((SFunctionNode*)pPar)->funcType))) {
+      pSelect->timeLineResMode = TIME_LINE_MULTI;
+    }
+    
+    code = translateExprList(pCxt, pSelect->pPartitionByList);
+  }
   if (TSDB_CODE_SUCCESS == code) {
     code = translateExprList(pCxt, pSelect->pTags);
   }
@@ -3600,9 +3611,9 @@ static void resetResultTimeline(SSelectStmt* pSelect) {
   if ((QUERY_NODE_TEMP_TABLE == nodeType(pSelect->pFromTable) &&
        isPrimaryKey((STempTableNode*)pSelect->pFromTable, pOrder)) ||
       (QUERY_NODE_TEMP_TABLE != nodeType(pSelect->pFromTable) && isPrimaryKeyImpl(pOrder))) {
-    pSelect->isTimeLineResult = true;
+    pSelect->timeLineResMode = TIME_LINE_GLOBAL;
   } else {
-    pSelect->isTimeLineResult = false;
+    pSelect->timeLineResMode = TIME_LINE_NONE;
   }
 }
 
@@ -6057,7 +6068,7 @@ static bool isEventWindowQuery(SSelectStmt* pSelect) {
 static int32_t checkStreamQuery(STranslateContext* pCxt, SCreateStreamStmt* pStmt) {
   SSelectStmt* pSelect = (SSelectStmt*)pStmt->pQuery;
   if (TSDB_DATA_TYPE_TIMESTAMP != ((SExprNode*)nodesListGetNode(pSelect->pProjectionList, 0))->resType.type ||
-      !pSelect->isTimeLineResult || crossTableWithoutAggOper(pSelect) || NULL != pSelect->pOrderByList ||
+      !isTimeLineQuery(pStmt->pQuery) || crossTableWithoutAggOper(pSelect) || NULL != pSelect->pOrderByList ||
       crossTableWithUdaf(pSelect) || isEventWindowQuery(pSelect)) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_STREAM_QUERY, "Unsupported stream query");
   }
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index 14da6f8aab..a4062d8407 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -249,6 +249,17 @@ int32_t getNumOfTags(const STableMeta* pTableMeta) { return getTableInfo(pTableM
 
 STableComInfo getTableInfo(const STableMeta* pTableMeta) { return pTableMeta->tableInfo; }
 
+int32_t getTableTypeFromTableNode(SNode *pTable) {
+  if (NULL == pTable) {
+    return -1;
+  }
+  if (QUERY_NODE_REAL_TABLE != nodeType(pTable)) {
+    return -1;
+  }
+  return ((SRealTableNode *)pTable)->pMeta->tableType;
+}
+
+
 STableMeta* tableMetaDup(const STableMeta* pTableMeta) {
   int32_t numOfFields = TABLE_TOTAL_COL_NUM(pTableMeta);
   if (numOfFields > TSDB_MAX_COLUMNS || numOfFields < TSDB_MIN_COLUMNS) {
diff --git a/source/libs/parser/test/parSelectTest.cpp b/source/libs/parser/test/parSelectTest.cpp
index 2d8ce55b72..f2ed7dfa3b 100644
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
@@ -117,6 +117,15 @@ TEST_F(ParserSelectTest, timelineFunc) {
   run("SELECT LAST(*), FIRST(*) FROM t1 INTERVAL(10s)");
 
   run("SELECT diff(c1) FROM t1");
+
+  run("select diff(ts) from (select _wstart as ts, count(*) from st1 partition by tbname interval(1d))", TSDB_CODE_PAR_NOT_ALLOWED_FUNC);
+
+  run("select diff(ts) from (select _wstart as ts, count(*) from st1 partition by tbname interval(1d) order by ts)");
+
+  run("select t1.* from st1s1 t1, (select _wstart as ts, count(*) from st1s2 partition by tbname interval(1d)) WHERE t1.ts = t2.ts", TSDB_CODE_PAR_NOT_SUPPORT_JOIN);
+
+  run("select t1.* from st1s1 t1, (select _wstart as ts, count(*) from st1s2 partition by tbname interval(1d) order by ts) t2 WHERE t1.ts = t2.ts");
+
 }
 
 TEST_F(ParserSelectTest, selectFunc) {

From eb7cd25e2ef6ad472a4fd725ba44bebf46f5b583 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Wed, 10 May 2023 14:34:41 +0800
Subject: [PATCH 02/58] enh: support nest partition by clause

---
 include/libs/nodes/nodes.h              |   3 +
 source/libs/nodes/src/nodesMatchFuncs.c | 180 ++++++++++++++++++++++++
 source/libs/parser/src/parTranslater.c  |  15 ++
 3 files changed, 198 insertions(+)
 create mode 100755 source/libs/nodes/src/nodesMatchFuncs.c

diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h
index 3556a8ac95..320a89030b 100644
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
@@ -321,6 +321,8 @@ void       nodesListInsertList(SNodeList* pTarget, SListCell* pPos, SNodeList* p
 SNode*     nodesListGetNode(SNodeList* pList, int32_t index);
 SListCell* nodesListGetCell(SNodeList* pList, int32_t index);
 void       nodesDestroyList(SNodeList* pList);
+bool       nodesListMatch(const SNodeList* pList, const SNodeList* pSubList);
+
 // Only clear the linked list structure, without releasing the elements inside
 void nodesClearList(SNodeList* pList);
 
@@ -339,6 +341,7 @@ void nodesRewriteExprPostOrder(SNode** pNode, FNodeRewriter rewriter, void* pCon
 void nodesRewriteExprsPostOrder(SNodeList* pList, FNodeRewriter rewriter, void* pContext);
 
 bool nodesEqualNode(const SNode* a, const SNode* b);
+bool nodesMatchNode(const SNode* pSub, const SNode* pNode);
 
 SNode*     nodesCloneNode(const SNode* pNode);
 SNodeList* nodesCloneList(const SNodeList* pList);
diff --git a/source/libs/nodes/src/nodesMatchFuncs.c b/source/libs/nodes/src/nodesMatchFuncs.c
new file mode 100755
index 0000000000..a91fdcdfac
--- /dev/null
+++ b/source/libs/nodes/src/nodesMatchFuncs.c
@@ -0,0 +1,180 @@
+/*
+ * 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 "querynodes.h"
+
+#define MATCH_SCALAR_FIELD(fldname)           \
+  do {                                          \
+    if (p->fldname != pSub->fldname) return false; \
+  } while (0)
+
+#define MATCH_STRING(a, b) (((a) != NULL && (b) != NULL) ? (strcmp((a), (b)) == 0) : (a) == (b))
+
+#define MATCH_VARDATA(a, b)                                                                                   \
+  (((a) != NULL && (b) != NULL)                                                                                 \
+       ? (varDataLen((a)) == varDataLen((b)) && memcmp(varDataVal((a)), varDataVal((b)), varDataLen((a))) == 0) \
+       : (a) == (b))
+
+#define MATCH_STRING_FIELD(fldname)                          \
+  do {                                                         \
+    if (!MATCH_STRING(p->fldname, pSub->fldname)) return false; \
+  } while (0)
+
+#define MATCH_VARDATA_FIELD(fldname)                          \
+  do {                                                          \
+    if (!MATCH_VARDATA(p->fldname, pSub->fldname)) return false; \
+  } while (0)
+
+#define MATCH_OBJECT_FIELD(fldname, matchFunc)          \
+  do {                                                    \
+    if (!matchFunc(p->fldname, pSub->fldname)) return false; \
+  } while (0)
+
+#define MATCH_NODE_FIELD(fldname)                            \
+  do {                                                         \
+    if (!nodesMatchNode(pSub->fldname, p->fldname)) return false; \
+  } while (0)
+
+#define MATCH_NODE_LIST_FIELD(fldname)                          \
+  do {                                                            \
+    if (!nodesListMatch(p->fldname, pSub->fldname)) return false; \
+  } while (0)
+
+    
+bool nodesListMatchExists(const SNodeList* pList, const SNode* pTarget) {
+  if (NULL == pList || NULL == pTarget) {
+    return false;
+  }
+  SNode* node = NULL;
+  bool exists = false;
+  FOREACH(node, pList) {
+    if (nodesMatchNode(node, pTarget)) {
+      exists = true;
+      break;
+    }
+  }
+
+  return exists;
+}
+
+bool nodesListMatch(const SNodeList* pList, const SNodeList* pSubList) {
+  if (pList == pSubList) {
+    return true;
+  }
+
+  if (NULL == pList || NULL == pSubList) {
+    return false;
+  }
+
+  if (pList->length != pSubList->length) {
+    return false;
+  }
+
+  SNode* node = NULL;
+  bool match = false;
+  FOREACH(node, pList) {
+    if (!nodesListMatchExists(pSubList, node)) {
+      break;
+    }
+  }
+  return match;
+}
+
+static bool columnNodeMatch(const SColumnNode* pSub, const SColumnNode* p) {
+  MATCH_STRING_FIELD(dbName);
+  if (0 == strcmp(p->colName, pSub->node.aliasName)) {
+    return true;
+  }
+  return false;
+}
+
+static bool valueNodeMatch(const SValueNode* pSub, const SValueNode* p) {
+  return nodesEqualNode((SNode*)pSub, (SNode*)p);
+}
+
+static bool operatorNodeMatch(const SOperatorNode* pSub, const SOperatorNode* p) {
+  MATCH_SCALAR_FIELD(opType);
+  MATCH_NODE_FIELD(pLeft);
+  MATCH_NODE_FIELD(pRight);
+  return true;
+}
+
+static bool logicConditionNodeMatch(const SLogicConditionNode* pSub, const SLogicConditionNode* p) {
+  MATCH_SCALAR_FIELD(condType);
+  MATCH_NODE_LIST_FIELD(pParameterList);
+  return true;
+}
+
+static bool functionNodeMatch(const SFunctionNode* pSub, const SFunctionNode* p) {
+  MATCH_SCALAR_FIELD(funcId);
+  MATCH_STRING_FIELD(functionName);
+  MATCH_NODE_LIST_FIELD(pParameterList);
+  return true;
+}
+
+static bool whenThenNodeMatch(const SWhenThenNode* pSub, const SWhenThenNode* p) {
+  MATCH_NODE_FIELD(pWhen);
+  MATCH_NODE_FIELD(pThen);
+  return true;
+}
+
+static bool caseWhenNodeMatch(const SCaseWhenNode* pSub, const SCaseWhenNode* p) {
+  MATCH_NODE_FIELD(pCase);
+  MATCH_NODE_FIELD(pElse);
+  MATCH_NODE_LIST_FIELD(pWhenThenList);
+  return true;
+}
+
+bool nodesMatchNode(const SNode* pSub, const SNode* p) {
+  if (pSub == p) {
+    return true;
+  }
+
+  if (NULL == pSub || NULL == p) {
+    return false;
+  }
+
+  if (nodeType(pSub) != nodeType(p)) {
+    return false;
+  }
+
+  switch (nodeType(p)) {
+    case QUERY_NODE_COLUMN:
+      return columnNodeMatch((const SColumnNode*)pSub, (const SColumnNode*)p);
+    case QUERY_NODE_VALUE:
+      return valueNodeMatch((const SValueNode*)pSub, (const SValueNode*)p);
+    case QUERY_NODE_OPERATOR:
+      return operatorNodeMatch((const SOperatorNode*)pSub, (const SOperatorNode*)p);
+    case QUERY_NODE_LOGIC_CONDITION:
+      return logicConditionNodeMatch((const SLogicConditionNode*)pSub, (const SLogicConditionNode*)p);
+    case QUERY_NODE_FUNCTION:
+      return functionNodeMatch((const SFunctionNode*)pSub, (const SFunctionNode*)p);
+    case QUERY_NODE_WHEN_THEN:
+      return whenThenNodeMatch((const SWhenThenNode*)pSub, (const SWhenThenNode*)p);
+    case QUERY_NODE_CASE_WHEN:
+      return caseWhenNodeMatch((const SCaseWhenNode*)pSub, (const SCaseWhenNode*)p);
+    case QUERY_NODE_REAL_TABLE:
+    case QUERY_NODE_TEMP_TABLE:
+    case QUERY_NODE_JOIN_TABLE:
+    case QUERY_NODE_GROUPING_SET:
+    case QUERY_NODE_ORDER_BY_EXPR:
+    case QUERY_NODE_LIMIT:
+      return false;
+    default:
+      break;
+  }
+
+  return false;
+}
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 7692629a9f..9bf94308e1 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -760,6 +760,21 @@ static bool isGlobalTimeLineQuery(SNode* pStmt) {
   }
 }
 
+static bool isTimeLineAlignedQuery(SNode* pStmt) {
+  SSelectStmt *pSelect = (SSelectStmt *)pStmt;
+  SSelectStmt *pSub = (SSelectStmt *)((STempTableNode*)pSelect->pFromTable)->pSubquery;
+  if (isGlobalTimeLineQuery((SNode*)pSub)) {
+    return true;
+  }
+  if (!isTimeLineQuery((SNode*)pSub)) {
+    return false;
+  }
+  if (nodesListMatch(pSelect->pPartitionByList, pSub->pPartitionByList)) {
+    return true;
+  }
+  return false;
+}
+
 static bool isPrimaryKeyImpl(SNode* pExpr) {
   if (QUERY_NODE_COLUMN == nodeType(pExpr)) {
     return (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pExpr)->colId);

From 7d23b176e593cdbf198b77876248e803076ae5dc Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 11 May 2023 09:09:32 +0800
Subject: [PATCH 03/58] meta/table: new api metaTrimTables for vnode split

---
 source/dnode/vnode/src/meta/metaTable.c | 44 ++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 3325f4055c..9562b1f462 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -837,22 +837,50 @@ int metaDropTable(SMeta *pMeta, int64_t version, SVDropTbReq *pReq, SArray *tbUi
   return 0;
 }
 
+static void metaDropTables(SMeta *pMeta, SArray *tbUids) {
+  metaWLock(pMeta);
+  for (int i = 0; i < TARRAY_SIZE(tbUids); ++i) {
+    tb_uid_t uid = *(tb_uid_t *)taosArrayGet(tbUids, i);
+    metaDropTableByUid(pMeta, uid, NULL);
+    metaDebug("batch drop table:%" PRId64, uid);
+  }
+  metaULock(pMeta);
+}
+
+int metaTrimTables(SMeta *pMeta, int64_t version) {
+  int32_t code = 0;
+
+  SArray *tbUids = taosArrayInit(8, sizeof(int64_t));
+  if (tbUids == NULL) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
+  // code = metaFilterTableByHash(pMeta, /*ttl, */ tbUids);
+  if (code != 0) {
+    goto end;
+  }
+  if (TARRAY_SIZE(tbUids) == 0) {
+    goto end;
+  }
+
+  metaDropTables(pMeta, tbUids);
+
+end:
+  taosArrayDestroy(tbUids);
+
+  return code;
+}
+
 int metaTtlDropTable(SMeta *pMeta, int64_t ttl, SArray *tbUids) {
   int ret = metaTtlSmaller(pMeta, ttl, tbUids);
   if (ret != 0) {
     return ret;
   }
-  if (taosArrayGetSize(tbUids) == 0) {
+  if (TARRAY_SIZE(tbUids) == 0) {
     return 0;
   }
 
-  metaWLock(pMeta);
-  for (int i = 0; i < taosArrayGetSize(tbUids); ++i) {
-    tb_uid_t *uid = (tb_uid_t *)taosArrayGet(tbUids, i);
-    metaDropTableByUid(pMeta, *uid, NULL);
-    metaDebug("ttl drop table:%" PRId64, *uid);
-  }
-  metaULock(pMeta);
+  metaDropTables(pMeta, tbUids);
   return 0;
 }
 

From e70c433a5911130caf9274ab3c3d98d7693775b6 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 26 May 2023 08:44:23 +0800
Subject: [PATCH 04/58] enh: support time line query from union/union all
 subquery

---
 include/libs/nodes/querynodes.h           |  1 +
 source/libs/executor/src/sortoperator.c   |  1 +
 source/libs/nodes/src/nodesMatchFuncs.c   |  4 +--
 source/libs/parser/src/parTranslater.c    | 36 +++++++++++++++++++----
 source/libs/parser/test/parSelectTest.cpp |  4 +++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index 4b46808c5a..12890571f9 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -327,6 +327,7 @@ typedef struct SSetOperator {
   SNode*           pLimit;
   char             stmtName[TSDB_TABLE_NAME_LEN];
   uint8_t          precision;
+  ETimeLineMode    timeLineResMode;  
 } SSetOperator;
 
 typedef enum ESqlClause {
diff --git a/source/libs/executor/src/sortoperator.c b/source/libs/executor/src/sortoperator.c
index 718bb596c5..f6827e4a5f 100644
--- a/source/libs/executor/src/sortoperator.c
+++ b/source/libs/executor/src/sortoperator.c
@@ -153,6 +153,7 @@ SSDataBlock* getSortedBlockData(SSortHandle* pHandle, SSDataBlock* pDataBlock, i
       colDataAssign(pDst, pSrc, p->info.rows, &pDataBlock->info);
     }
 
+    pDataBlock->info.dataLoad = 1;
     pDataBlock->info.rows = p->info.rows;
   }
 
diff --git a/source/libs/nodes/src/nodesMatchFuncs.c b/source/libs/nodes/src/nodesMatchFuncs.c
index a91fdcdfac..401c7aad28 100755
--- a/source/libs/nodes/src/nodesMatchFuncs.c
+++ b/source/libs/nodes/src/nodesMatchFuncs.c
@@ -83,9 +83,10 @@ bool nodesListMatch(const SNodeList* pList, const SNodeList* pSubList) {
   }
 
   SNode* node = NULL;
-  bool match = false;
+  bool match = true;
   FOREACH(node, pList) {
     if (!nodesListMatchExists(pSubList, node)) {
+      match = false;
       break;
     }
   }
@@ -93,7 +94,6 @@ bool nodesListMatch(const SNodeList* pList, const SNodeList* pSubList) {
 }
 
 static bool columnNodeMatch(const SColumnNode* pSub, const SColumnNode* p) {
-  MATCH_STRING_FIELD(dbName);
   if (0 == strcmp(p->colName, pSub->node.aliasName)) {
     return true;
   }
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index ce28848b9c..42717765f6 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -752,6 +752,8 @@ static SNodeList* getProjectList(const SNode* pNode) {
 static bool isTimeLineQuery(SNode* pStmt) {
   if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) {
     return (TIME_LINE_MULTI == ((SSelectStmt*)pStmt)->timeLineResMode) || (TIME_LINE_GLOBAL == ((SSelectStmt*)pStmt)->timeLineResMode);
+  } else if (QUERY_NODE_SET_OPERATOR == nodeType(pStmt)) {
+    return TIME_LINE_GLOBAL == ((SSetOperator*)pStmt)->timeLineResMode;
   } else {
     return false;
   }
@@ -760,6 +762,8 @@ static bool isTimeLineQuery(SNode* pStmt) {
 static bool isGlobalTimeLineQuery(SNode* pStmt) {
   if (QUERY_NODE_SELECT_STMT == nodeType(pStmt)) {
     return TIME_LINE_GLOBAL == ((SSelectStmt*)pStmt)->timeLineResMode;
+  } else if (QUERY_NODE_SET_OPERATOR == nodeType(pStmt)) {
+    return TIME_LINE_GLOBAL == ((SSetOperator*)pStmt)->timeLineResMode;
   } else {
     return false;
   }
@@ -767,13 +771,16 @@ static bool isGlobalTimeLineQuery(SNode* pStmt) {
 
 static bool isTimeLineAlignedQuery(SNode* pStmt) {
   SSelectStmt *pSelect = (SSelectStmt *)pStmt;
-  SSelectStmt *pSub = (SSelectStmt *)((STempTableNode*)pSelect->pFromTable)->pSubquery;
-  if (isGlobalTimeLineQuery((SNode*)pSub)) {
+  if (isGlobalTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
     return true;
   }
-  if (!isTimeLineQuery((SNode*)pSub)) {
+  if (!isTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
     return false;
   }
+  if (QUERY_NODE_SELECT_STMT != nodeType(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
+    return false;
+  }
+  SSelectStmt *pSub = (SSelectStmt *)((STempTableNode*)pSelect->pFromTable)->pSubquery;
   if (nodesListMatch(pSelect->pPartitionByList, pSub->pPartitionByList)) {
     return true;
   }
@@ -1582,7 +1589,7 @@ static int32_t translateTimelineFunc(STranslateContext* pCxt, SFunctionNode* pFu
   }
   SSelectStmt* pSelect = (SSelectStmt*)pCxt->pCurrStmt;
   if (NULL != pSelect->pFromTable && QUERY_NODE_TEMP_TABLE == nodeType(pSelect->pFromTable) &&
-      !isGlobalTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
+      !isGlobalTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery) && !isTimeLineAlignedQuery(pCxt->pCurrStmt)) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_ALLOWED_FUNC,
                                    "%s function requires valid time series input", pFunc->functionName);
   }
@@ -3828,8 +3835,13 @@ static int32_t translateSetOperProject(STranslateContext* pCxt, SSetOperator* pS
       pLeftExpr = pLeftFuncExpr;
     }
     snprintf(pRightExpr->aliasName, sizeof(pRightExpr->aliasName), "%s", pLeftExpr->aliasName);
-    if (TSDB_CODE_SUCCESS != nodesListMakeStrictAppend(&pSetOperator->pProjectionList,
-                                                       createSetOperProject(pSetOperator->stmtName, pLeft))) {
+    SNode* pProj = createSetOperProject(pSetOperator->stmtName, pLeft);
+    if (QUERY_NODE_COLUMN == nodeType(pLeft) && QUERY_NODE_COLUMN == nodeType(pRight) 
+      && ((SColumnNode*)pLeft)->colId == PRIMARYKEY_TIMESTAMP_COL_ID
+      && ((SColumnNode*)pRight)->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
+      ((SColumnNode*)pProj)->colId = PRIMARYKEY_TIMESTAMP_COL_ID;
+    }
+    if (TSDB_CODE_SUCCESS != nodesListMakeStrictAppend(&pSetOperator->pProjectionList, pProj)) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
   }
@@ -3841,6 +3853,10 @@ static uint8_t calcSetOperatorPrecision(SSetOperator* pSetOperator) {
 }
 
 static int32_t translateSetOperOrderBy(STranslateContext* pCxt, SSetOperator* pSetOperator) {
+  if (NULL == pSetOperator->pOrderByList || pSetOperator->pOrderByList->length <= 0) {
+    return TSDB_CODE_SUCCESS;
+  }
+
   bool    other;
   int32_t code = translateOrderByPosition(pCxt, pSetOperator->pProjectionList, pSetOperator->pOrderByList, &other);
   if (TSDB_CODE_SUCCESS == code) {
@@ -3853,6 +3869,14 @@ static int32_t translateSetOperOrderBy(STranslateContext* pCxt, SSetOperator* pS
   if (TSDB_CODE_SUCCESS == code) {
     code = replaceOrderByAlias(pCxt, pSetOperator->pProjectionList, pSetOperator->pOrderByList);
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    SNode* pOrder = ((SOrderByExprNode*)nodesListGetNode(pSetOperator->pOrderByList, 0))->pExpr;
+    if (isPrimaryKeyImpl(pOrder)) {
+      pSetOperator->timeLineResMode = TIME_LINE_GLOBAL;
+    } else {
+      pSetOperator->timeLineResMode = TIME_LINE_NONE;
+    }
+  }
   return code;
 }
 
diff --git a/source/libs/parser/test/parSelectTest.cpp b/source/libs/parser/test/parSelectTest.cpp
index f2ed7dfa3b..d1d5b00037 100644
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
@@ -334,6 +334,10 @@ TEST_F(ParserSelectTest, subquery) {
   run("SELECT SUM(a) FROM (SELECT MAX(c1) a, _wstart FROM st1s1 PARTITION BY TBNAME INTERVAL(1m) ORDER BY _WSTART) "
       "INTERVAL(1n)");
 
+  run("SELECT diff(a) FROM (SELECT _wstart, tag1, tag2, MAX(c1) a FROM st1 PARTITION BY tag1 INTERVAL(1m)) PARTITION BY tag1");
+
+  run("SELECT diff(a) FROM (SELECT _wstart, tag1, tag2, MAX(c1) a FROM st1 PARTITION BY tag1 INTERVAL(1m)) PARTITION BY tag2", TSDB_CODE_PAR_NOT_ALLOWED_FUNC);
+
   run("SELECT _C0 FROM (SELECT _ROWTS, ts FROM st1s1)");
 
   run("SELECT ts FROM (SELECT t1.ts FROM st1s1 t1)");

From ee4709bb4b8c30ba2fe9f997496628b0d169d8c6 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Fri, 26 May 2023 16:01:42 +0800
Subject: [PATCH 05/58] chore: update docs about support row/columns width up
 to 64KB

---
 docs/en/12-taos-sql/01-data-type.md                 | 2 +-
 docs/en/12-taos-sql/03-table.md                     | 2 +-
 docs/en/12-taos-sql/19-limit.md                     | 2 +-
 docs/en/14-reference/13-schemaless/13-schemaless.md | 2 +-
 docs/zh/12-taos-sql/01-data-type.md                 | 4 ++--
 docs/zh/12-taos-sql/03-table.md                     | 2 +-
 docs/zh/12-taos-sql/19-limit.md                     | 2 +-
 docs/zh/14-reference/13-schemaless/13-schemaless.md | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/en/12-taos-sql/01-data-type.md b/docs/en/12-taos-sql/01-data-type.md
index 70bea97dba..13007d5bb1 100644
--- a/docs/en/12-taos-sql/01-data-type.md
+++ b/docs/en/12-taos-sql/01-data-type.md
@@ -45,7 +45,7 @@ In TDengine, the data types below can be used when specifying a column or tag.
 :::note
 
 - Only ASCII visible characters are suggested to be used in a column or tag of BINARY type. Multi-byte characters must be stored in NCHAR type.
-- The length of BINARY can be up to 16,374 bytes. The string value must be quoted with single quotes. You must specify a length in bytes for a BINARY value, for example binary(20) for up to twenty single-byte characters. If the data exceeds the specified length, an error will occur. The literal single quote inside the string must be preceded with back slash like `\'`
+- The length of BINARY can be up to 16,374(data column is 65,517 and tag column is 16,382 since version 3.0.5.0) bytes. The string value must be quoted with single quotes. You must specify a length in bytes for a BINARY value, for example binary(20) for up to twenty single-byte characters. If the data exceeds the specified length, an error will occur. The literal single quote inside the string must be preceded with back slash like `\'`
 - Numeric values in SQL statements will be determined as integer or float type according to whether there is decimal point or whether scientific notation is used, so attention must be paid to avoid overflow. For example, 9999999999999999999 will be considered as overflow because it exceeds the upper limit of long integer, but 9999999999999999999.0 will be considered as a legal float number.
 
 :::
diff --git a/docs/en/12-taos-sql/03-table.md b/docs/en/12-taos-sql/03-table.md
index f61d1f5147..7f39fb5867 100644
--- a/docs/en/12-taos-sql/03-table.md
+++ b/docs/en/12-taos-sql/03-table.md
@@ -45,7 +45,7 @@ table_option: {
 
 1. The first column of a table MUST be of type TIMESTAMP. It is automatically set as the primary key.
 2. The maximum length of the table name is 192 bytes.
-3. The maximum length of each row is 48k bytes, please note that the extra 2 bytes used by each BINARY/NCHAR column are also counted.
+3. The maximum length of each row is 48k(64k since version 3.0.5.0) bytes, please note that the extra 2 bytes used by each BINARY/NCHAR column are also counted.
 4. The name of the subtable can only consist of characters from the English alphabet, digits and underscore. Table names can't start with a digit. Table names are case insensitive.
 5. The maximum length in bytes must be specified when using BINARY or NCHAR types.
 6. Escape character "\`" can be used to avoid the conflict between table names and reserved keywords, above rules will be bypassed when using escape character on table names, but the upper limit for the name length is still valid. The table names specified using escape character are case sensitive.
diff --git a/docs/en/12-taos-sql/19-limit.md b/docs/en/12-taos-sql/19-limit.md
index 654fae7560..22ad2055e4 100644
--- a/docs/en/12-taos-sql/19-limit.md
+++ b/docs/en/12-taos-sql/19-limit.md
@@ -26,7 +26,7 @@ The following characters cannot occur in a password: single quotation marks ('),
 
 - Maximum length of database name is 64 bytes
 - Maximum length of table name is 192 bytes, excluding the database name prefix and the separator.
-- Maximum length of each data row is 48K bytes. Note that the upper limit includes the extra 2 bytes consumed by each column of BINARY/NCHAR type.
+- Maximum length of each data row is 48K(64K since version 3.0.5.0) bytes. Note that the upper limit includes the extra 2 bytes consumed by each column of BINARY/NCHAR type.
 - The maximum length of a column name is 64 bytes.
 - Maximum number of columns is 4096. There must be at least 2 columns, and the first column must be timestamp.
 - The maximum length of a tag name is 64 bytes
diff --git a/docs/en/14-reference/13-schemaless/13-schemaless.md b/docs/en/14-reference/13-schemaless/13-schemaless.md
index aad0e63a42..3ae9098a73 100644
--- a/docs/en/14-reference/13-schemaless/13-schemaless.md
+++ b/docs/en/14-reference/13-schemaless/13-schemaless.md
@@ -90,7 +90,7 @@ You can configure smlChildTableName in taos.cfg to specify table names, for exam
    Note: TDengine 3.0.3.0 and later automatically detect whether order is consistent. This parameter is no longer used.
 
 :::tip
-All processing logic of schemaless will still follow TDengine's underlying restrictions on data structures, such as the total length of each row of data cannot exceed 48 KB and the total length of a tag value cannot exceed 16 KB. See [TDengine SQL Boundary Limits](/taos-sql/limit) for specific constraints in this area.
+All processing logic of schemaless will still follow TDengine's underlying restrictions on data structures, such as the total length of each row of data cannot exceed 48 KB(64 KB since version 3.0.5.0) and the total length of a tag value cannot exceed 16 KB. See [TDengine SQL Boundary Limits](/taos-sql/limit) for specific constraints in this area.
 :::
 
 ## Time resolution recognition
diff --git a/docs/zh/12-taos-sql/01-data-type.md b/docs/zh/12-taos-sql/01-data-type.md
index f014573ca6..4a4c1d6ec6 100644
--- a/docs/zh/12-taos-sql/01-data-type.md
+++ b/docs/zh/12-taos-sql/01-data-type.md
@@ -45,9 +45,9 @@ CREATE DATABASE db_name PRECISION 'ns';
 
 :::note
 
-- 表的每行长度不能超过 48KB（注意：每个 BINARY/NCHAR 类型的列还会额外占用 2 个字节的存储位置）。
+- 表的每行长度不能超过 48KB（从 3.0.5.0 版本开始为 64KB）（注意：每个 BINARY/NCHAR 类型的列还会额外占用 2 个字节的存储位置）。
 - 虽然 BINARY 类型在底层存储上支持字节型的二进制字符，但不同编程语言对二进制数据的处理方式并不保证一致，因此建议在 BINARY 类型中只存储 ASCII 可见字符，而避免存储不可见字符。多字节的数据，例如中文字符，则需要使用 NCHAR 类型进行保存。如果强行使用 BINARY 类型保存中文字符，虽然有时也能正常读写，但并不带有字符集信息，很容易出现数据乱码甚至数据损坏等情况。
-- BINARY 类型理论上最长可以有 16,374 字节。BINARY 仅支持字符串输入，字符串两端需使用单引号引用。使用时须指定大小，如 BINARY(20) 定义了最长为 20 个单字节字符的字符串，每个字符占 1 字节的存储空间，总共固定占用 20 字节的空间，此时如果用户字符串超出 20 字节将会报错。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示，即 `\'`。
+- BINARY 类型理论上最长可以有 16,374（从 3.0.5.0 版本开始，数据列为 65,517，标签列为 16,382） 字节。BINARY 仅支持字符串输入，字符串两端需使用单引号引用。使用时须指定大小，如 BINARY(20) 定义了最长为 20 个单字节字符的字符串，每个字符占 1 字节的存储空间，总共固定占用 20 字节的空间，此时如果用户字符串超出 20 字节将会报错。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示，即 `\'`。
 - SQL 语句中的数值类型将依据是否存在小数点，或使用科学计数法表示，来判断数值类型是否为整型或者浮点型，因此在使用时要注意相应类型越界的情况。例如，9999999999999999999 会认为超过长整型的上边界而溢出，而 9999999999999999999.0 会被认为是有效的浮点数。
 
 :::
diff --git a/docs/zh/12-taos-sql/03-table.md b/docs/zh/12-taos-sql/03-table.md
index 5687c7e740..2e66ac4002 100644
--- a/docs/zh/12-taos-sql/03-table.md
+++ b/docs/zh/12-taos-sql/03-table.md
@@ -43,7 +43,7 @@ table_option: {
 
 1. 表的第一个字段必须是 TIMESTAMP，并且系统自动将其设为主键；
 2. 表名最大长度为 192；
-3. 表的每行长度不能超过 48KB;（注意：每个 BINARY/NCHAR 类型的列还会额外占用 2 个字节的存储位置）
+3. 表的每行长度不能超过 48KB（从 3.0.5.0 版本开始为 64KB）;（注意：每个 BINARY/NCHAR 类型的列还会额外占用 2 个字节的存储位置）
 4. 子表名只能由字母、数字和下划线组成，且不能以数字开头，不区分大小写
 5. 使用数据类型 binary 或 nchar，需指定其最长的字节数，如 binary(20)，表示 20 字节；
 6. 为了兼容支持更多形式的表名，TDengine 引入新的转义符 "\`"，可以让表名与关键词不冲突，同时不受限于上述表名称合法性约束检查。但是同样具有长度限制要求。使用转义字符以后，不再对转义字符中的内容进行大小写统一。
diff --git a/docs/zh/12-taos-sql/19-limit.md b/docs/zh/12-taos-sql/19-limit.md
index 7b6692f1b7..e5a492580e 100644
--- a/docs/zh/12-taos-sql/19-limit.md
+++ b/docs/zh/12-taos-sql/19-limit.md
@@ -26,7 +26,7 @@ description: 合法字符集和命名中的限制规则
 
 - 数据库名最大长度为 64 字节
 - 表名最大长度为 192 字节，不包括数据库名前缀和分隔符
-- 每行数据最大长度 48KB （注意：数据行内每个 BINARY/NCHAR 类型的列还会额外占用 2 个字节的存储位置）
+- 每行数据最大长度 48KB（从 3.0.5.0 版本开始为 64KB） （注意：数据行内每个 BINARY/NCHAR 类型的列还会额外占用 2 个字节的存储位置）
 - 列名最大长度为 64 字节
 - 最多允许 4096 列，最少需要 2 列，第一列必须是时间戳。
 - 标签名最大长度为 64 字节
diff --git a/docs/zh/14-reference/13-schemaless/13-schemaless.md b/docs/zh/14-reference/13-schemaless/13-schemaless.md
index e5f232c1fc..6c2007938b 100644
--- a/docs/zh/14-reference/13-schemaless/13-schemaless.md
+++ b/docs/zh/14-reference/13-schemaless/13-schemaless.md
@@ -87,7 +87,7 @@ st,t1=3,t2=4,t3=t3 c1=3i64,c3="passit",c2=false,c4=4f64 1626006833639000000
 
 :::tip
 无模式所有的处理逻辑，仍会遵循 TDengine 对数据结构的底层限制，例如每行数据的总长度不能超过
-48KB，标签值的总长度不超过16KB。这方面的具体限制约束请参见 [TDengine SQL 边界限制](/taos-sql/limit)
+48KB（从 3.0.5.0 版本开始为 64KB），标签值的总长度不超过16KB。这方面的具体限制约束请参见 [TDengine SQL 边界限制](/taos-sql/limit)
 
 :::
 

From 57c301553bdb88785e9028dc809b1d99b6c0617d Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 29 May 2023 16:40:30 +0800
Subject: [PATCH 06/58] feat(query): support single point interp syntax

---
 source/libs/parser/inc/parAst.h        |    1 +
 source/libs/parser/inc/sql.y           |    2 +
 source/libs/parser/src/parAstCreater.c |    5 +
 source/libs/parser/src/sql.c           | 1566 ++++++++++++------------
 4 files changed, 794 insertions(+), 780 deletions(-)

diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 43765c8112..e49d7b5a1d 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -127,6 +127,7 @@ SNode* createIntervalWindowNode(SAstCreateContext* pCxt, SNode* pInterval, SNode
 SNode* createFillNode(SAstCreateContext* pCxt, EFillMode mode, SNode* pValues);
 SNode* createGroupingSetNode(SAstCreateContext* pCxt, SNode* pNode);
 SNode* createInterpTimeRange(SAstCreateContext* pCxt, SNode* pStart, SNode* pEnd);
+SNode* createInterpTimePoint(SAstCreateContext* pCxt, SNode* pPoint);
 SNode* createWhenThenNode(SAstCreateContext* pCxt, SNode* pWhen, SNode* pThen);
 SNode* createCaseWhenNode(SAstCreateContext* pCxt, SNode* pCase, SNodeList* pWhenThenList, SNode* pElse);
 
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 9b8393f624..48e2b12b72 100755
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -1095,6 +1095,8 @@ having_clause_opt(A) ::= HAVING search_condition(B).
 range_opt(A) ::= .                                                                { A = NULL; }
 range_opt(A) ::=
   RANGE NK_LP expr_or_subquery(B) NK_COMMA expr_or_subquery(C) NK_RP.             { A = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, B), releaseRawExprNode(pCxt, C)); }
+range_opt(A) ::=
+  RANGE NK_LP expr_or_subquery(B) NK_RP.                                          { A = createInterpTimePoint(pCxt, releaseRawExprNode(pCxt, B)); }
 
 every_opt(A) ::= .                                                                { A = NULL; }
 every_opt(A) ::= EVERY NK_LP duration_literal(B) NK_RP.                           { A = releaseRawExprNode(pCxt, B); }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 4223455b65..5ae6c85312 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -684,6 +684,11 @@ SNode* createInterpTimeRange(SAstCreateContext* pCxt, SNode* pStart, SNode* pEnd
   return createBetweenAnd(pCxt, createPrimaryKeyCol(pCxt, NULL), pStart, pEnd);
 }
 
+SNode* createInterpTimePoint(SAstCreateContext* pCxt, SNode* pPoint) {
+  CHECK_PARSER_STATUS(pCxt);
+  return createOperatorNode(pCxt, OP_TYPE_EQUAL, createPrimaryKeyCol(pCxt, NULL), pPoint);
+}
+
 SNode* createWhenThenNode(SAstCreateContext* pCxt, SNode* pWhen, SNode* pThen) {
   CHECK_PARSER_STATUS(pCxt);
   SWhenThenNode* pWhenThen = (SWhenThenNode*)nodesMakeNode(QUERY_NODE_WHEN_THEN);
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index 43ef166c41..ecf3b16672 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -141,17 +141,17 @@ typedef union {
 #define ParseCTX_STORE
 #define YYFALLBACK 1
 #define YYNSTATE             792
-#define YYNRULE              595
-#define YYNRULE_WITH_ACTION  595
+#define YYNRULE              596
+#define YYNRULE_WITH_ACTION  596
 #define YYNTOKEN             337
 #define YY_MAX_SHIFT         791
-#define YY_MIN_SHIFTREDUCE   1169
-#define YY_MAX_SHIFTREDUCE   1763
-#define YY_ERROR_ACTION      1764
-#define YY_ACCEPT_ACTION     1765
-#define YY_NO_ACTION         1766
-#define YY_MIN_REDUCE        1767
-#define YY_MAX_REDUCE        2361
+#define YY_MIN_SHIFTREDUCE   1170
+#define YY_MAX_SHIFTREDUCE   1765
+#define YY_ERROR_ACTION      1766
+#define YY_ACCEPT_ACTION     1767
+#define YY_NO_ACTION         1768
+#define YY_MIN_REDUCE        1769
+#define YY_MAX_REDUCE        2364
 /************* End control #defines *******************************************/
 #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
 
@@ -220,278 +220,278 @@ typedef union {
 *********** Begin parsing tables **********************************************/
 #define YY_ACTTAB_COUNT (2716)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */  2173,  169, 2337,   38,  303, 2332,  170,  445, 1779, 1885,
- /*    10 */   660,  444,   48,   46, 1691, 1933,  181, 2337, 2151, 1790,
- /*    20 */   399, 2336, 1540,   41,   40, 2333, 2335,   47,   45,   44,
- /*    30 */    43,   42, 2159, 1621, 1567, 1538,  366, 2046, 2191,   41,
- /*    40 */    40,  451, 2155,   47,   45,   44,   43,   42,  402,  663,
- /*    50 */  2141, 1568,  698, 1566,  620,  526,  164, 2332,  527, 1803,
- /*    60 */  2173,  218, 1616,  380, 1946,  529,  167, 1810,   19, 2141,
- /*    70 */   699, 1995, 2338,  188, 1947, 1546,  184, 2333,  646, 2157,
- /*    80 */   396, 2106, 2337,  358, 2172, 2332,  345, 2208, 1984,  692,
- /*    90 */   110, 2174,  702, 2176, 2177,  697,  620,  692, 2191, 2332,
- /*   100 */   788, 2336,  185,   15, 2261, 2333, 2334,  220,  395, 2257,
- /*   110 */  2141,  529,  698, 1810, 2338,  188,   48,   46, 1753, 2333,
- /*   120 */   646,  190,  682, 1944,  399, 1789, 1540, 1650,  251, 2287,
- /*   130 */    47,   45,   44,   43,   42,  668, 1567, 1621,  205, 1538,
- /*   140 */  1623, 1624,  133, 2063, 2172,  682, 1944, 2208, 1304,  566,
- /*   150 */   110, 2174,  702, 2176, 2177,  697, 2124,  692, 2061,  669,
- /*   160 */   145, 1565,  152, 2232, 2261,  193, 1616,  668,  395, 2257,
- /*   170 */  1596, 1606,   19, 1395, 1396, 2141, 1622, 1625,   84, 1546,
- /*   180 */  1920,   83,  657,  142, 1651, 1768,  284,  541, 1306, 2056,
- /*   190 */  1541,  123, 1539,  681,  122,  121,  120,  119,  118,  117,
- /*   200 */   116,  115,  114,  262,  788,  668,  123,   15, 2173,  122,
+ /*     0 */  2175,  169, 2340,   38,  303, 2335,  170,  445, 1781, 1887,
+ /*    10 */   660,  444,   48,   46, 1692, 1935,  181, 2340, 2153, 1792,
+ /*    20 */   399, 2339, 1541,   41,   40, 2336, 2338,   47,   45,   44,
+ /*    30 */    43,   42, 2161, 1622, 1568, 1539,  366, 2048, 2193,   41,
+ /*    40 */    40,  451, 2157,   47,   45,   44,   43,   42,  402,  663,
+ /*    50 */  2143, 1569,  698, 1567,  620,  526,  164, 2335,  527, 1805,
+ /*    60 */  2175,  218, 1617,  380, 1948,  529,  167, 1812,   19, 2143,
+ /*    70 */   699, 1997, 2341,  188, 1949, 1547,  184, 2336,  646, 2159,
+ /*    80 */   396, 2108, 2340,  358, 2174, 2335,  345, 2210, 1986,  692,
+ /*    90 */   110, 2176,  702, 2178, 2179,  697,  620,  692, 2193, 2335,
+ /*   100 */   788, 2339,  185,   15, 2263, 2336, 2337,  220,  395, 2259,
+ /*   110 */  2143,  529,  698, 1812, 2341,  188,   48,   46, 1755, 2336,
+ /*   120 */   646,  190,  682, 1946,  399, 1791, 1541, 1651,  251, 2289,
+ /*   130 */    47,   45,   44,   43,   42,  668, 1568, 1622,  205, 1539,
+ /*   140 */  1624, 1625,  133, 2065, 2174,  682, 1946, 2210, 1305,  566,
+ /*   150 */   110, 2176,  702, 2178, 2179,  697, 2129,  692, 2063,  669,
+ /*   160 */   145, 1566,  152, 2234, 2263,  193, 1617,  668,  395, 2259,
+ /*   170 */  1597, 1607,   19, 1396, 1397, 2143, 1623, 1626,   84, 1547,
+ /*   180 */  1922,   83,  657,  142, 1652, 1770,  284,  541, 1307, 2058,
+ /*   190 */  1542,  123, 1540,  681,  122,  121,  120,  119,  118,  117,
+ /*   200 */   116,  115,  114,  262,  788,  421,  123,   15, 2175,  122,
  /*   210 */   121,  120,  119,  118,  117,  116,  115,  114,  699,  666,
- /*   220 */  1812, 2056, 1544, 1545, 1767, 1595, 1598, 1599, 1600, 1601,
- /*   230 */  1602, 1603, 1604, 1605,  694,  690, 1614, 1615, 1617, 1618,
- /*   240 */  1619, 1620,    2,  681, 1623, 1624, 2191,  737,  132,  131,
- /*   250 */   130,  129,  128,  127,  126,  125,  124,  677, 2141, 2056,
- /*   260 */   698,   37,  397, 1645, 1646, 1647, 1648, 1649, 1653, 1654,
- /*   270 */  1655, 1656,  543, 2173, 1596, 1606,   51,  682, 1944,   66,
- /*   280 */  1622, 1625,    9,  660,  659,  186, 2269, 2270,  284,  140,
- /*   290 */  2274, 1227, 2172, 1226, 1541, 2208, 1539,  133,  110, 2174,
- /*   300 */   702, 2176, 2177,  697,  571,  692,  138,  531,  682, 1944,
- /*   310 */  2352, 2191, 2261,  528,   41,   40,  395, 2257,   47,   45,
- /*   320 */    44,   43,   42, 2141, 1228,  698, 1544, 1545,   57, 1595,
- /*   330 */  1598, 1599, 1600, 1601, 1602, 1603, 1604, 1605,  694,  690,
- /*   340 */  1614, 1615, 1617, 1618, 1619, 1620,    2,   12,   48,   46,
- /*   350 */  1227, 2173, 1226,  408,  407, 2336,  399, 2172, 1540, 2276,
- /*   360 */  2208,  696, 1922,  110, 2174,  702, 2176, 2177,  697, 1621,
- /*   370 */   692, 1538,  428, 1997,  181,  185, 1547, 2261,   62,  639,
- /*   380 */   379,  395, 2257, 1228, 2063, 2273,   41,   40, 1995, 2191,
- /*   390 */    47,   45,   44,   43,   42, 2047,  392, 1360, 1616, 2060,
- /*   400 */   669, 2141, 2288,  698,   19,  534,  150, 2191,  527, 1803,
- /*   410 */  1730, 1546, 1351,  727,  726,  725, 1355,  724, 1357, 1358,
- /*   420 */   723,  720,   30, 1366,  717, 1368, 1369,  714,  711,  708,
- /*   430 */   667, 1695,  191, 1565,  107, 2172,  788, 1565, 2208,   15,
- /*   440 */   101,  339, 2174,  702, 2176, 2177,  697,  695,  692,  683,
- /*   450 */  2226,  143,   48,   46, 1626,   87,  635,   34,  234, 1936,
- /*   460 */   399,  638, 1540,   41,   40, 1937,  681,   47,   45,   44,
- /*   470 */    43,   42,  368, 1621,  174, 1538, 1623, 1624,  640,  682,
- /*   480 */  1944, 1939,  560,  556,  552,  548, 2042,  233,  285,  393,
- /*   490 */   735,  157,  156,  732,  731,  730,  154,  167, 2173,  449,
- /*   500 */  1202, 1684, 1616, 1565, 1719, 1946, 1596, 1606,  699,   12,
- /*   510 */  2295,   10, 1622, 1625, 2042, 1546,   41,   40,  682, 1944,
- /*   520 */    47,   45,   44,   43,   42, 1564, 1541,   88, 1539,   62,
- /*   530 */   231,   93,  201, 1550,  191,  489, 2191, 1568,  450, 1204,
- /*   540 */   788, 1207, 1208,   49, 1788,  641,  636,  629, 2141,   51,
- /*   550 */   698,  632,  631, 1717, 1718, 1720, 1721, 1722, 1544, 1545,
- /*   560 */   203, 1595, 1598, 1599, 1600, 1601, 1602, 1603, 1604, 1605,
- /*   570 */   694,  690, 1614, 1615, 1617, 1618, 1619, 1620,    2,   62,
- /*   580 */  1623, 1624, 2172, 1450, 1451, 2208,   62, 1597,  110, 2174,
- /*   590 */   702, 2176, 2177,  697, 2141,  692,  209,  208,  230,  224,
- /*   600 */  2352,  523, 2261,  229,  737,  539,  395, 2257, 2173,  521,
- /*   610 */  1596, 1606,  517,  513,  682, 1944, 1622, 1625,  699,  488,
- /*   620 */  2308,  682, 1944,  222,  607, 2151,   52,   62,  294,  295,
- /*   630 */  1541,  648, 1539,  293,  459,  584,  583,  582,  684, 1935,
- /*   640 */  2233,  474,  574,  139,  578, 2127, 2191, 1787,  577, 2155,
- /*   650 */   657,  142, 1549,  576,  581,  374,  373, 2027, 2141,  575,
- /*   660 */   698, 2134, 1544, 1545, 1566, 1595, 1598, 1599, 1600, 1601,
- /*   670 */  1602, 1603, 1604, 1605,  694,  690, 1614, 1615, 1617, 1618,
- /*   680 */  1619, 1620,    2,   48,   46,  191, 2157,  682, 1944,  202,
- /*   690 */  1760,  399, 2172, 1540,  421, 2208,  692, 2141,  110, 2174,
- /*   700 */   702, 2176, 2177,  697, 1621,  692, 1538,  475,  620, 2173,
- /*   710 */  2352, 2332, 2261,  443,  402,  442,  395, 2257, 1921,  699,
- /*   720 */   404,  589,  167, 1990, 1992, 2276, 2338,  188,  682, 1944,
- /*   730 */  1946, 2333,  646, 1616, 1631,  191,  599, 1991, 1992, 2173,
- /*   740 */  1565,  433,  191,  682, 1944,  441, 1546, 2191,  542,  699,
- /*   750 */   247, 2272,  598,  282, 2269,  656,   12,  134,  655, 2141,
- /*   760 */  2332,  698,  405, 1941, 2276,  596,  592,  594,  435,  431,
- /*   770 */   167,  788, 1546,  586,   49,  644,  188, 2191, 1946,  246,
- /*   780 */  2333,  646,  191,  191, 1467, 1468,  747,   48,   46, 2141,
- /*   790 */  2271,  698, 1759, 2172, 1315,  399, 2208, 1540,  250,  111,
- /*   800 */  2174,  702, 2176, 2177,  697, 1652,  692, 1314, 1621, 1552,
- /*   810 */  1538, 1623, 1624, 2261,  657,  142,  469, 2260, 2257,   70,
- /*   820 */  1466, 1469,   69, 2172, 1919,  468, 2208,  728, 1997,  171,
- /*   830 */  2174,  702, 2176, 2177,  697,  389,  692, 1616, 1786, 2173,
- /*   840 */  1210, 1596, 1606, 1995,  682, 1944, 1564, 1622, 1625,  699,
- /*   850 */  1546,  735,  157,  156,  732,  731,  730,  154,  452, 1997,
- /*   860 */   686, 1541, 2233, 1539,  252,  155,  394, 1511, 1512,  621,
- /*   870 */  2298,  453,  498,   36, 1995,  788, 1929, 2191,   15,   41,
- /*   880 */    40, 1931,   35,   47,   45,   44,   43,   42, 2141, 2141,
- /*   890 */  1597,  698, 1657, 1544, 1545, 1927, 1595, 1598, 1599, 1600,
- /*   900 */  1601, 1602, 1603, 1604, 1605,  694,  690, 1614, 1615, 1617,
- /*   910 */  1618, 1619, 1620,    2, 1785, 1623, 1624,  187, 2269, 2270,
- /*   920 */  1765,  140, 2274, 2172, 1784,   56, 2208, 1783, 1782,  171,
- /*   930 */  2174,  702, 2176, 2177,  697,  349,  692, 1563,   44,   43,
- /*   940 */    42, 1997,  259, 2173,  482, 1596, 1606,  496,  403, 1781,
- /*   950 */   495, 1622, 1625,  699, 1997,  627, 1995,  735,  157,  156,
- /*   960 */   732,  731,  730,  154, 2141, 1541,  465, 1539,  497, 1996,
- /*   970 */  2299,  682, 1944,  467, 2141, 1540, 1319, 2141, 2141,   41,
- /*   980 */    40, 2191, 1778,   47,   45,   44,   43,   42, 1538, 1318,
- /*   990 */  1568,  616,  414, 2141, 1777,  698,  413, 1544, 1545, 2141,
- /*  1000 */  1595, 1598, 1599, 1600, 1601, 1602, 1603, 1604, 1605,  694,
- /*  1010 */   690, 1614, 1615, 1617, 1618, 1619, 1620,    2, 1843,  367,
- /*  1020 */  1565,  682, 1944,  657,  142,  580,  579, 2172, 1546, 1948,
- /*  1030 */  2208,  455, 2141,  110, 2174,  702, 2176, 2177,  697,  620,
- /*  1040 */   692,  661, 2332, 1776, 2141, 2352,  570, 2261, 1230, 1231,
- /*  1050 */   569,  395, 2257,  788,  500,  562,  561, 2338,  188,  564,
- /*  1060 */   563,  493, 2333,  646,  487,  486,  485,  484,  481,  480,
+ /*   220 */  1814, 2058, 1545, 1546, 1769, 1596, 1599, 1600, 1601, 1602,
+ /*   230 */  1603, 1604, 1605, 1606,  694,  690, 1615, 1616, 1618, 1619,
+ /*   240 */  1620, 1621,    2,  681, 1624, 1625, 2193,  737,  132,  131,
+ /*   250 */   130,  129,  128,  127,  126,  125,  124, 1923, 2143,  452,
+ /*   260 */   698,   37,  397, 1646, 1647, 1648, 1649, 1650, 1654, 1655,
+ /*   270 */  1656, 1657,  453, 2175, 1597, 1607,   51,  682, 1946,   66,
+ /*   280 */  1623, 1626, 1569,  660,  659,  186, 2271, 2272,  284,  140,
+ /*   290 */  2276, 1228, 2174, 1227, 1542, 2210, 1540,  133,  110, 2176,
+ /*   300 */   702, 2178, 2179,  697,  571,  692,  138,  531,  682, 1946,
+ /*   310 */  2355, 2193, 2263,  528,   41,   40,  395, 2259,   47,   45,
+ /*   320 */    44,   43,   42, 2143, 1229,  698, 1545, 1546,   57, 1596,
+ /*   330 */  1599, 1600, 1601, 1602, 1603, 1604, 1605, 1606,  694,  690,
+ /*   340 */  1615, 1616, 1618, 1619, 1620, 1621,    2,   12,   48,   46,
+ /*   350 */    30, 2175,  144,  408,  407, 2234,  399, 2174, 1541,  729,
+ /*   360 */  2210,  696, 1990,  110, 2176,  702, 2178, 2179,  697, 1622,
+ /*   370 */   692, 1539,  433,   34, 2164,  185, 1548, 2263,   62,   41,
+ /*   380 */    40,  395, 2259,   47,   45,   44,   43,   42,   62, 2193,
+ /*   390 */   735,  157,  156,  732,  731,  730,  154, 1361, 1617,  435,
+ /*   400 */   431, 2143, 2290,  698,   19,  534, 1566,  668,  527, 1805,
+ /*   410 */  1732, 1547, 1352,  727,  726,  725, 1356,  724, 1358, 1359,
+ /*   420 */   723,  720,  681, 1367,  717, 1369, 1370,  714,  711,  708,
+ /*   430 */  2166, 1696,  191, 1566,  202, 2174,  788, 1566, 2210,   15,
+ /*   440 */    52,  339, 2176,  702, 2178, 2179,  697,  695,  692,  683,
+ /*   450 */  2228, 1790,   48,   46, 1627,   87,  635,   36,  234,  677,
+ /*   460 */   399, 2058, 1541,   41,   40,  181,  667,   47,   45,   44,
+ /*   470 */    43,   42,  368, 1622,  174, 1539, 1624, 1625,  101,  682,
+ /*   480 */  1946, 1941,  560,  556,  552,  548, 2049,  233,  285,   62,
+ /*   490 */   735,  157,  156,  732,  731,  730,  154,  543, 2175,  449,
+ /*   500 */  1203, 2143, 1617, 1939, 1720,   51, 1597, 1607,  699, 2278,
+ /*   510 */  2297,   87, 1623, 1626, 2044, 1547,   41,   40,  682, 1946,
+ /*   520 */    47,   45,   44,   43,   42,  737, 1542,   88, 1540,   62,
+ /*   530 */   231,   93,  640, 1551,  191, 2275, 2193, 1942,  450, 1205,
+ /*   540 */   788, 1208, 1209,   49,  191,  641,  636,  629, 2143, 1565,
+ /*   550 */   698,  632,  631, 1718, 1719, 1721, 1722, 1723, 1545, 1546,
+ /*   560 */   201, 1596, 1599, 1600, 1601, 1602, 1603, 1604, 1605, 1606,
+ /*   570 */   694,  690, 1615, 1616, 1618, 1619, 1620, 1621,    2, 1999,
+ /*   580 */  1624, 1625, 2174, 1451, 1452, 2210,  379, 1598,  110, 2176,
+ /*   590 */   702, 2178, 2179,  697, 1997,  692,  191, 2065,  230,  224,
+ /*   600 */  2355,  607, 2263,  229, 1999,  539,  395, 2259, 2175,  392,
+ /*   610 */  1597, 1607, 2062,  669,  682, 1946, 1623, 1626,  699, 1998,
+ /*   620 */  2310,  682, 1946,  222,   12, 2153, 2278,   62,  294,  295,
+ /*   630 */  1542, 1547, 1540,  293,  459,  584,  583,  582,   12, 1937,
+ /*   640 */    10,  474,  574,  139,  578,  191, 2193, 1789,  577, 2157,
+ /*   650 */   657,  142, 2274,  576,  581,  374,  373, 1653, 2143,  575,
+ /*   660 */   698, 2136, 1545, 1546, 1567, 1596, 1599, 1600, 1601, 1602,
+ /*   670 */  1603, 1604, 1605, 1606,  694,  690, 1615, 1616, 1618, 1619,
+ /*   680 */  1620, 1621,    2,   48,   46,  191, 2159,  682, 1946, 2044,
+ /*   690 */  1762,  399, 2174, 1541,  728, 2210,  692, 2143,  110, 2176,
+ /*   700 */   702, 2178, 2179,  697, 1622,  692, 1539,  475,  620, 2175,
+ /*   710 */  2355, 2335, 2263,  443,  393,  442,  395, 2259, 1921,  699,
+ /*   720 */   404,  589,  167, 1992, 1994,  317, 2341,  188, 1976,  523,
+ /*   730 */  1948, 2336,  646, 1617,   35,  203,  599,  521, 1316, 2175,
+ /*   740 */   517,  513,  682, 1946, 1658,  441, 1547, 2193,  402,  699,
+ /*   750 */   247, 1315,  747,  282, 2271,  656,  167,  134,  655, 2143,
+ /*   760 */  2335,  698,  542, 1999, 1948,  107,  592, 1993, 1994,  733,
+ /*   770 */   389,  788, 1990,  586,   49,  644,  188, 2193, 1997,  246,
+ /*   780 */  2336,  646,  143,  191, 1468, 1469, 1931,   48,   46, 2143,
+ /*   790 */  1938,  698, 1761, 2174, 1933,  399, 2210, 1541,  489,  111,
+ /*   800 */  2176,  702, 2178, 2179,  697, 1228,  692, 1227, 1622, 2278,
+ /*   810 */  1539, 1624, 1625, 2263,  657,  142,  498, 2262, 2259,   70,
+ /*   820 */  1467, 1470,   69, 2174,  682, 1946, 2210,  562,  561,  171,
+ /*   830 */  2176,  702, 2178, 2179,  697, 2273,  692, 1617, 1229, 2175,
+ /*   840 */  1788, 1597, 1607,  639, 1943,   14,   13, 1623, 1626,  699,
+ /*   850 */  1547,  735,  157,  156,  732,  731,  730,  154, 1999,  209,
+ /*   860 */   208, 1542,  684, 1540, 2235,  394,   44,   43,   42,  621,
+ /*   870 */  2300, 2193,  570, 1997, 1787,  788,  569, 2193,   15,   41,
+ /*   880 */    40, 1929,  488,   47,   45,   44,   43,   42, 1786, 2143,
+ /*   890 */  2143,  698, 2137, 1545, 1546, 1950, 1596, 1599, 1600, 1601,
+ /*   900 */  1602, 1603, 1604, 1605, 1606,  694,  690, 1615, 1616, 1618,
+ /*   910 */  1619, 1620, 1621,    2,  605, 1624, 1625,  187, 2271, 2272,
+ /*   920 */  1767,  140, 2276, 2174, 2143,  638, 2210, 1785, 1784,  171,
+ /*   930 */  2176,  702, 2178, 2179,  697,  349,  692, 1564, 2143,  620,
+ /*   940 */   682, 1946, 2335, 2175,  482, 1597, 1607,  496, 1665, 1783,
+ /*   950 */   495, 1623, 1626,  699, 1689,  627,  250, 2341,  188,  259,
+ /*   960 */   252,  620, 2336,  646, 2335, 1542,  465, 1540,  497,  256,
+ /*   970 */  2301,  682, 1946,  467,  405, 1541, 1320, 2143, 2143, 2341,
+ /*   980 */   188, 2193,  167, 2044, 2336,  646, 1231, 1232, 1539, 1319,
+ /*   990 */  1948,  616,  414, 2143, 1780,  698,  413, 1545, 1546, 2143,
+ /*  1000 */  1596, 1599, 1600, 1601, 1602, 1603, 1604, 1605, 1606,  694,
+ /*  1010 */   690, 1615, 1616, 1618, 1619, 1620, 1621,    2, 1845,  367,
+ /*  1020 */  2126,  682, 1946,  657,  142, 1512, 1513, 2174, 1547,  207,
+ /*  1030 */  2210,  455,    9,  110, 2176,  702, 2178, 2179,  697,  620,
+ /*  1040 */   692,  661, 2335,  166, 2143, 2355,   54, 2263,    3, 1632,
+ /*  1050 */  2029,  395, 2259,  788,  500, 1566,  649, 2341,  188,  564,
+ /*  1060 */   563,  493, 2336,  646,  487,  486,  485,  484,  481,  480,
  /*  1070 */   479,  478,  477,  473,  472,  471,  470,  348,  462,  461,
- /*  1080 */   460,  652,  457,  456,  365,  759,  757, 1775,  765,  764,
- /*  1090 */   763,  762,  411, 2141,  761,  760,  146,  755,  754,  753,
+ /*  1080 */   460,  693,  457,  456,  365,  580,  579, 1779,  765,  764,
+ /*  1090 */   763,  762,  411, 2339,  761,  760,  146,  755,  754,  753,
  /*  1100 */   752,  751,  750,  749,  159,  745,  744,  743,  410,  409,
- /*  1110 */   740,  739,  738,  177,  176,  168,  682, 1944, 2135, 1774,
- /*  1120 */   323, 1773, 1772,  408,  407,  256,  189, 2269, 2270, 2173,
- /*  1130 */   140, 2274,  371, 1554,  321,   73,  665, 2141,   72,  699,
- /*  1140 */   693, 2326,  261, 1541, 1621, 1539, 1547,   41,   40,  346,
- /*  1150 */  1688,   47,   45,   44,   43,   42, 2042, 1771,  682, 1944,
- /*  1160 */   216,  508,  506,  503,   54,  620,    3, 2191, 2332, 2141,
- /*  1170 */  1597, 2141, 2141, 1616,  649, 1544, 1545, 2173,  298, 2141,
- /*  1180 */  1770,  698,  260, 2338,  188, 2151, 1546,  699, 2333,  646,
- /*  1190 */    41,   40,   14,   13,   47,   45,   44,   43,   42, 2160,
- /*  1200 */    62,  372,  207,  370,  369,   74,  568, 2141,   87, 2155,
- /*  1210 */   689,  688,  605, 2172,  144, 2191, 2208, 2232, 1886,  110,
- /*  1220 */  2174,  702, 2176, 2177,  697,   91,  692, 2141,  570,  698,
- /*  1230 */  2141, 2352,  569, 2261, 1940, 2173,  572,  395, 2257,  109,
- /*  1240 */   148,  729,  135, 1707, 1988,  699, 2157, 2280,  733,  734,
- /*  1250 */   317, 1988, 1988, 1974,  748,   82,  692, 1906, 1302,  620,
- /*  1260 */   239, 2172, 2332,  237, 2208, 2281, 1684,  333, 2174,  702,
- /*  1270 */  2176, 2177,  697, 2191,  692, 1207, 1208, 2338,  188,   81,
- /*  1280 */    80,  448, 2333,  646,  200, 2141, 2173,  698,  241, 1780,
- /*  1290 */   573,  240,  619,  682, 1944, 1664,  699,  440,  438,  243,
- /*  1300 */  2301, 1555,  242, 1550,  245, 1762, 1763,  244,  347, 1830,
- /*  1310 */   642,  429, 1300,  679,  427,  423,  419,  416,  441, 2172,
- /*  1320 */   653,  602, 2208,  601, 2191,  110, 2174,  702, 2176, 2177,
- /*  1330 */   697,  585,  692, 1558, 1560, 1821, 2141, 2352,  698, 2261,
- /*  1340 */  1819,  155,  645,  395, 2257, 2332,  690, 1614, 1615, 1617,
- /*  1350 */  1618, 1619, 1620, 2173,  166,  249,  191,  587,  155,  248,
- /*  1360 */   644,  188,  590,  699, 1642, 2333,  646,  279,   50,   50,
- /*  1370 */  2172,  266,  155, 2208,   50,  291,  110, 2174,  702, 2176,
- /*  1380 */  2177,  697,  633,  692,  682, 1944, 2173,  137, 2236,  106,
- /*  1390 */  2261, 2191,  682, 1944,  395, 2257,  699,  682, 1944,  103,
- /*  1400 */    71, 1506, 2162, 2141,  680,  698, 1687,  153,  155,   14,
- /*  1410 */    13,  650,  304, 2173,   64,  273,   55,  406, 1509,   90,
- /*  1420 */  1548, 1813,  353,  699, 2191,  378,   50,  600, 1716, 1715,
- /*  1430 */   741,  268,  664,   50, 1464,  296, 2141, 2172,  698, 2192,
- /*  1440 */  2208, 1884,  706,  110, 2174,  702, 2176, 2177,  697, 2173,
- /*  1450 */   692, 2191, 1280, 1883,  153, 2234,  155, 2261, 2164,  699,
- /*  1460 */   674,  395, 2257, 2141,  136,  698,  412,  300, 1345,  153,
- /*  1470 */  2172,  783, 1261, 2208, 1658, 2173,  110, 2174,  702, 2176,
- /*  1480 */  2177,  697, 2051,  692, 1804,  699, 1607, 2191,  685,  742,
- /*  1490 */  2261, 1809, 1985,  316,  395, 2257, 2291, 2172,  658, 2141,
- /*  1500 */  2208,  698, 1373,  111, 2174,  702, 2176, 2177,  697,  281,
- /*  1510 */   692, 1278, 1262, 2191, 1377,  278, 1384, 2261,    1,    5,
- /*  1520 */   415,  687, 2257,  420, 1382, 2141,  362,  698, 1571,  158,
- /*  1530 */   437,  436,  196,  700,  439,  198, 2208,  195, 1487,  111,
- /*  1540 */  2174,  702, 2176, 2177,  697,  311,  692,  206,  454, 1568,
- /*  1550 */  2052,  458,  491, 2261, 2173,  463, 1563,  357, 2257, 2172,
- /*  1560 */   476, 2044, 2208,  483,  699,  172, 2174,  702, 2176, 2177,
- /*  1570 */   697,  490,  692,  492,  501,  502,  499, 1551,  210,  504,
- /*  1580 */  2173,  211,  505,  213,  507,  509, 1569,  524,    4,  525,
- /*  1590 */   699,  532, 2191,  533, 1566,  221,  536,  535, 1570,  223,
- /*  1600 */  1572,  537,  565,  538, 2141, 1997,  698,  540,  544,  226,
- /*  1610 */   228,   85,  364,   86, 2115,  232,  647, 2353, 2191,  112,
- /*  1620 */  1995, 2112,  352,  382,  567,  604, 1934,  606, 2111,   89,
- /*  1630 */  2141,  610,  698,  609,  312,  151,  611,  253, 2172,  236,
- /*  1640 */  1930, 2208, 2173,  238,  111, 2174,  702, 2176, 2177,  697,
- /*  1650 */   160,  692,  699,  161, 1932,  255, 1928,  162, 2261, 2173,
- /*  1660 */   163,  614,  257, 2258, 2172, 1494,  617, 2208, 2292,  699,
- /*  1670 */   340, 2174,  702, 2176, 2177,  697,  672,  692, 2173,  615,
- /*  1680 */  2191,  624,  634,  645, 2302,  383, 2332,    8,  699,  630,
- /*  1690 */  2307, 2306, 2141,  264,  698,  267, 2283, 2191,  384,  643,
- /*  1700 */   637,  644,  188,  385,  625,  623, 2333,  646,  622, 2141,
- /*  1710 */  1684,  698,  654,  277,  651,  141, 2191, 2355, 1567,  175,
- /*  1720 */  2331,  390, 2277,  662,  388,  286, 2172,  274, 2141, 2208,
- /*  1730 */   698,   96,  340, 2174,  702, 2176, 2177,  697,  272,  692,
- /*  1740 */  1573,  313, 2057, 2172,  280,  276, 2208,  670,  275,  172,
- /*  1750 */  2174,  702, 2176, 2177,  697,  675,  692,  671, 2071,  314,
- /*  1760 */   676, 2070, 2172,   98, 2173, 2208, 2069,  391,  340, 2174,
- /*  1770 */   702, 2176, 2177,  697,  696,  692,  315, 1945,  100,   61,
- /*  1780 */  2242, 2173,  102,  704, 1989,  318,  784, 1907,  307,  322,
- /*  1790 */   785,  699,  787,   53,  354,  327,  355,  342, 2133,  320,
- /*  1800 */  2173, 2354, 2191,  341, 2132,  331, 2131,   78, 2128,  417,
- /*  1810 */   699,  418, 1531, 1532, 2141,  194,  698,  422, 2126, 2191,
- /*  1820 */   424,  425,  426, 2125,  398,  363, 2123,  430, 2122,  432,
- /*  1830 */  2121, 2141,  434,  698, 2102, 1522,  197, 2101, 2191,  199,
- /*  1840 */  1490,   79, 1489,  400, 2083, 2082, 2081,  446, 2172,  447,
- /*  1850 */  2141, 2208,  698, 2080,  339, 2174,  702, 2176, 2177,  697,
- /*  1860 */  2079,  692, 1441, 2227, 2035, 2172,  147,  608, 2208, 2034,
- /*  1870 */  2032,  340, 2174,  702, 2176, 2177,  697, 2031,  692, 2030,
- /*  1880 */  2033, 2029, 2028, 2026, 2172,  791, 2025, 2208, 2024,  204,
- /*  1890 */   340, 2174,  702, 2176, 2177,  697,  464,  692, 2173,  310,
- /*  1900 */  2023,  466, 2037, 2022, 2021, 2020, 2019, 2018,  699, 2017,
- /*  1910 */  2016, 2015, 2014, 2013, 2012,  180,  149, 2007, 2006, 2005,
- /*  1920 */  2036, 2004, 2003,  781,  777,  773,  769, 2011,  308, 2010,
- /*  1930 */  2009, 2173, 2008, 2002, 2001, 2000, 2191, 1443,  494, 1999,
- /*  1940 */  1998,  699,  350,  351, 1849, 1316, 1320,  212, 2141, 1848,
- /*  1950 */   698,  214, 1847,  215, 1845, 1842, 1841,  511, 1834, 1823,
- /*  1960 */  1312,  510, 1799, 1798, 2173,  227,  514,  512,  108, 2191,
- /*  1970 */  2100,  301, 2090, 2078,  699,  516,  518,  522, 2077, 1209,
- /*  1980 */  2055, 2141,  603,  698, 1923, 2208,  520,  515,  335, 2174,
- /*  1990 */   702, 2176, 2177,  697,  519,  692, 1844,  182, 2161,  217,
- /*  2000 */  2173, 1840, 2191,   77,  678,  547,   76,  183,  530,  219,
- /*  2010 */   699,  545, 1254,  225, 2141, 2172,  698,  546, 2208, 1838,
- /*  2020 */   549,  324, 2174,  702, 2176, 2177,  697,  551,  692, 1836,
- /*  2030 */   550,  554,  553, 2173,  555, 1833,  558,  557, 2191,  288,
- /*  2040 */  1818, 1816,  559,  699,  287, 1817, 1815, 1795, 2172, 1925,
- /*  2050 */  2141, 2208,  698, 1389,  325, 2174,  702, 2176, 2177,  697,
- /*  2060 */    63,  692, 2173, 1924,  254, 1388, 1303, 1301, 1299, 1298,
- /*  2070 */   756, 2191,  699, 1297, 1296, 1831, 1290, 1295,  375, 1292,
- /*  2080 */   758,  235, 1822, 2141, 2172,  698, 1291, 2208,  376, 1820,
- /*  2090 */   326, 2174,  702, 2176, 2177,  697, 1289,  692,  377,  588,
- /*  2100 */  2191,  597,  591, 1794,  593, 1793,  595, 1792,  113, 1516,
- /*  2110 */  1520,   29, 2141, 1518,  698, 1515, 2099, 2172,   58,   67,
- /*  2120 */  2208, 1496, 2173,  332, 2174,  702, 2176, 2177,  697, 2089,
- /*  2130 */   692, 1498,  699,  612, 2076, 2074, 2337,   20,   17,    6,
- /*  2140 */    31, 2173,    7,   21,   22,  271, 2172, 1500,  270, 2208,
- /*  2150 */    33,  699,  336, 2174,  702, 2176, 2177,  697,  613,  692,
- /*  2160 */  2191, 1732,  381,  258,  265,  263,  626,  628,  165, 2162,
- /*  2170 */   618,   65, 2141,  173,  698,   24, 1714, 1706, 1747, 2191,
- /*  2180 */   269, 1746,  386, 1751,   32, 1750,   92,  283,  387, 2173,
- /*  2190 */  2075, 2141,  178,  698, 1752,   60, 1753, 2073, 2072,  699,
- /*  2200 */  1681, 1680, 2054,   95,  289,   94, 2172, 2053, 2173, 2208,
- /*  2210 */    97,   25,  328, 2174,  702, 2176, 2177,  697,  699,  692,
- /*  2220 */    26,  290, 1712,  292,  297, 2172,   68, 2191, 2208,   99,
- /*  2230 */   673,  337, 2174,  702, 2176, 2177,  697,  299,  692, 2141,
- /*  2240 */    23,  698, 1846,  103,   11, 1633, 2191,   13,  302, 1556,
- /*  2250 */    59,  179, 1643, 1611, 1588,   18, 2173, 1632, 2141, 1609,
- /*  2260 */   698, 2211,  691,   39,  192, 1608,  699, 1580,   16,   27,
- /*  2270 */    28,  705,  401, 2172,  701,  707, 2208, 2173,  709,  329,
- /*  2280 */  2174,  702, 2176, 2177,  697, 1374,  692,  699,  703, 1371,
- /*  2290 */   710,  712, 2172, 1370, 2191, 2208,  713,  715,  338, 2174,
- /*  2300 */   702, 2176, 2177,  697,  718,  692, 2141, 1367,  698,  716,
- /*  2310 */   721,  719,  584,  583,  582, 2191, 1361, 1359,  722,  574,
- /*  2320 */   139,  578,  104,  305, 1365,  577,  105, 2141, 1383,  698,
- /*  2330 */   576,  581,  374,  373, 1364, 1363,  575,   75, 1379, 1362,
- /*  2340 */  2172, 1252,  736, 2208, 1284, 2173,  330, 2174,  702, 2176,
- /*  2350 */  2177,  697, 1283,  692, 1282,  699, 1281, 1279, 1277, 1276,
- /*  2360 */  1275, 2172, 1310, 2173, 2208,  746, 1270,  343, 2174,  702,
- /*  2370 */  2176, 2177,  697,  699,  692,  306, 1273, 1272, 1271, 1307,
- /*  2380 */  1269, 1268, 1267, 2191, 1305, 1264, 1263, 1260, 1259, 1258,
- /*  2390 */  1257, 1839,  766, 2173, 1837, 2141,  770,  698,  768,  772,
- /*  2400 */  1835, 2191,  776,  699,  774,  767, 1832,  771,  778,  780,
- /*  2410 */  1814,  775,  782, 2141,  779,  698, 1199, 1791,  309,  786,
- /*  2420 */  1766, 1542,  790,  319, 2173,  789, 1766, 1766, 1766, 2172,
- /*  2430 */  1766, 2191, 2208, 1766,  699,  344, 2174,  702, 2176, 2177,
- /*  2440 */   697, 2173,  692, 2141, 1766,  698, 1766, 2172, 1766, 1766,
- /*  2450 */  2208,  699, 1766, 2185, 2174,  702, 2176, 2177,  697, 1766,
- /*  2460 */   692, 1766, 2191, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
- /*  2470 */  1766, 1766, 1766, 1766, 2141, 1766,  698, 2172, 1766, 2191,
- /*  2480 */  2208, 1766, 1766, 2184, 2174,  702, 2176, 2177,  697, 1766,
- /*  2490 */   692, 2141, 2173,  698, 1766, 1766, 1766, 1766, 1766, 1766,
- /*  2500 */  1766, 1766,  699, 1766, 1766, 1766, 1766, 1766, 2172, 1766,
- /*  2510 */  1766, 2208, 1766, 2173, 2183, 2174,  702, 2176, 2177,  697,
- /*  2520 */  1766,  692, 1766,  699, 1766, 2172, 1766, 1766, 2208, 1766,
- /*  2530 */  2191,  359, 2174,  702, 2176, 2177,  697, 1766,  692, 1766,
- /*  2540 */  2173, 1766, 2141, 1766,  698, 1766, 1766, 1766, 1766, 1766,
- /*  2550 */   699, 2191, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
- /*  2560 */  1766, 1766, 1766, 2141, 1766,  698, 1766, 1766, 1766, 1766,
- /*  2570 */  1766, 1766, 1766, 1766, 1766, 1766, 2172, 1766, 2191, 2208,
- /*  2580 */  1766, 1766,  360, 2174,  702, 2176, 2177,  697, 1766,  692,
- /*  2590 */  2141, 1766,  698, 1766, 1766, 1766, 1766, 2172, 1766, 1766,
- /*  2600 */  2208, 2173, 1766,  356, 2174,  702, 2176, 2177,  697, 1766,
- /*  2610 */   692,  699, 1766, 1766, 1766, 1766, 1766, 1766, 2173, 1766,
- /*  2620 */  1766, 1766, 1766, 1766, 2172, 1766, 1766, 2208,  699, 1766,
- /*  2630 */   361, 2174,  702, 2176, 2177,  697, 1766,  692, 1766, 2191,
- /*  2640 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
- /*  2650 */  1766, 2141, 1766,  698, 1766, 1766, 2191, 1766, 1766, 1766,
- /*  2660 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 2141, 1766,
- /*  2670 */   698, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
- /*  2680 */  1766, 1766, 1766, 1766, 1766,  700, 1766, 1766, 2208, 1766,
- /*  2690 */  1766,  335, 2174,  702, 2176, 2177,  697, 1766,  692, 1766,
- /*  2700 */  1766, 1766, 2172, 1766, 1766, 2208, 1766, 1766,  334, 2174,
- /*  2710 */   702, 2176, 2177,  697, 1766,  692,
+ /*  1110 */   740,  739,  738,  177,  176,  168,  682, 1946, 1888,  686,
+ /*  1120 */   324, 2235,  734,  408,  407, 1990,  189, 2271, 2272, 2175,
+ /*  1130 */   140, 2276,  371, 1555,  321,   73,  665, 2143,   72,  699,
+ /*  1140 */   148, 2328,  135, 1542, 1622, 1540, 1548,   41,   40,  346,
+ /*  1150 */  1211,   47,   45,   44,   43,   42, 1565, 1778,  682, 1946,
+ /*  1160 */   216,  508,  506,  503,   41,   40, 1782, 2193,   47,   45,
+ /*  1170 */    44,   43,   42, 1617, 2303, 1545, 1546, 2175,  298, 2143,
+ /*  1180 */  1777,  698,  682, 1946,   41,   40, 1547,  699,   47,   45,
+ /*  1190 */    44,   43,   42,  748,  682, 1946, 1908,  682, 1946,  633,
+ /*  1200 */    62,  372,  679,  370,  369, 1598,  568, 2143, 1776,  469,
+ /*  1210 */  1688,  688, 1569, 2174,  680, 2193, 2210,  304,  468,  110,
+ /*  1220 */  2176,  702, 2178, 2179,  697, 1566,  692, 2143,  570,  698,
+ /*  1230 */  2143, 2355,  569, 2263, 1999, 2175,  428,  395, 2259,  109,
+ /*  1240 */   279,  403, 1775, 1731,  602,  699,  601, 2282,  273, 1997,
+ /*  1250 */   598, 1685, 2153,  652, 1774,  682, 1946,  689, 2143,  645,
+ /*  1260 */  1708, 2174, 2335,  596, 2210,  594, 2162,  333, 2176,  702,
+ /*  1270 */  2178, 2179,  697, 2193,  692,  406, 2157,  644,  188,   81,
+ /*  1280 */    80,  448, 2336,  646,  200, 2143, 2175,  698,  759,  757,
+ /*  1290 */   249, 1773, 2143,  650,  248,   74,  699,  440,  438, 2283,
+ /*  1300 */  1685, 1556,  619, 1551, 2143, 1772, 1208, 1209,  347,  572,
+ /*  1310 */   642,  429,  155, 2159,  427,  423,  419,  416,  441, 2174,
+ /*  1320 */   573,  137, 2210,  692, 2193,  110, 2176,  702, 2178, 2179,
+ /*  1330 */   697, 1303,  692, 1559, 1561, 1886, 2143, 2355,  698, 2263,
+ /*  1340 */  1924, 2143, 1301,  395, 2259,   82,  690, 1615, 1616, 1618,
+ /*  1350 */  1619, 1620, 1621, 2175,   90, 2143,  191,  353,  239,  260,
+ /*  1360 */   378,  237,  600,  699,  261, 1832, 1550,  155,  155,  648,
+ /*  1370 */  2174,  241,   56, 2210,  240, 1598,  110, 2176,  702, 2178,
+ /*  1380 */  2179,  697,  243,  692,  150,  242, 2175,  585, 2238,  245,
+ /*  1390 */  2263, 2193,  244, 1823,  395, 2259,  699, 1821,   50,  741,
+ /*  1400 */    50, 1262,   91, 2143,  266,  698, 1764, 1765,  155,   14,
+ /*  1410 */    13, 1643,   50, 2175,  291,  587, 1549,  742, 1885,  590,
+ /*  1420 */   106, 1281,   71,  699, 2193, 2194,   55, 1507, 1510,  153,
+ /*  1430 */   103,  155,  412,   64, 1815, 1806, 2143, 2174,  698, 1279,
+ /*  1440 */  2210, 1263,   50,  110, 2176,  702, 2178, 2179,  697, 2175,
+ /*  1450 */   692, 2193, 1811, 2053,   50, 2236,  706, 2263, 1717,  699,
+ /*  1460 */  1716,  395, 2259, 2143,  268,  698, 1987, 2293,  664,  153,
+ /*  1470 */  2174,  155, 1465, 2210,  296, 2175,  110, 2176,  702, 2178,
+ /*  1480 */  2179,  697,  674,  692,  783,  699,  658, 2193,  685,  300,
+ /*  1490 */  2263, 1346,  653, 1659,  395, 2259,  136, 2174,  281, 2143,
+ /*  1500 */  2210,  698, 1608,  111, 2176,  702, 2178, 2179,  697,  278,
+ /*  1510 */   692,    1,  415, 2193,  316,  153, 1374, 2263,    5,  420,
+ /*  1520 */  1572,  687, 2259, 1553,  362, 2143,  437,  698,  195, 1378,
+ /*  1530 */   436, 1385,  196,  700,  439,  198, 2210, 1488,  311,  111,
+ /*  1540 */  2176,  702, 2178, 2179,  697,  206,  692,  454, 1569, 2054,
+ /*  1550 */   458,  491,  463, 2263, 2175, 1564, 1383,  357, 2259, 2174,
+ /*  1560 */   476, 2046, 2210,  483,  699,  172, 2176,  702, 2178, 2179,
+ /*  1570 */   697,  499,  692, 1552,  490,  158,  501,  492,  502,  210,
+ /*  1580 */  2175,  211,  504,  505,  213,  507,  509, 1570,  524,    4,
+ /*  1590 */   699,  525, 2193,  533,  532, 1567,  535,  221,  536,  223,
+ /*  1600 */  1571,  537, 1573,  538, 2143, 1999,  698,  226,  544,  540,
+ /*  1610 */  2117,  228,  364,   85,   86,  565,  647, 2356, 2193,  112,
+ /*  1620 */  1997,  232,  567,  382, 2114,  604, 1936,  352, 2113,  606,
+ /*  1630 */  2143,  312,  698,   89,  610,  151,  253,  609, 2174,  611,
+ /*  1640 */   236, 2210, 2175, 1932,  111, 2176,  702, 2178, 2179,  697,
+ /*  1650 */   238,  692,  699, 1495,  160,  161, 1934, 1930, 2263, 2175,
+ /*  1660 */   257,  162,  163, 2260, 2174,  617,  614, 2210,  634,  699,
+ /*  1670 */   340, 2176,  702, 2178, 2179,  697,  255,  692, 2175,  624,
+ /*  1680 */  2193, 2294,  615,  645, 2309,  383, 2335, 2304,  699,  672,
+ /*  1690 */   630,  264, 2143, 2308,  698,  267,  384, 2193,  637,    8,
+ /*  1700 */   643,  644,  188,  385,  625,  623, 2336,  646,  175, 2143,
+ /*  1710 */  2285,  698,  622,  654,  277, 2358, 2193,  651, 1568, 1685,
+ /*  1720 */   662,  390,  141,  286, 2279,  388, 2174, 1574, 2143, 2210,
+ /*  1730 */   698,  276,  340, 2176,  702, 2178, 2179,  697,  272,  692,
+ /*  1740 */    96,  313, 2059, 2174,  675,  670, 2210,  671, 2073,  172,
+ /*  1750 */  2176,  702, 2178, 2179,  697,  274,  692,  275,  314, 2072,
+ /*  1760 */    61,  676, 2174, 2071, 2175, 2210,  391,   98,  340, 2176,
+ /*  1770 */   702, 2178, 2179,  697,  696,  692, 2334,  315,  280, 2244,
+ /*  1780 */  1947, 2175,  102,  704, 1991,  100,  784, 1909,  318,  307,
+ /*  1790 */   785,  699,   53,  787,  342,  322,  354,  355, 2135, 2134,
+ /*  1800 */  2175, 2357, 2193,  320,  327, 2133,   78,  341,  331, 2130,
+ /*  1810 */   699,  417,  418, 1532, 2143, 1533,  698,  422,  194, 2193,
+ /*  1820 */  2128,  424,  425,  426,  398, 2127,  363, 2125,  430, 2124,
+ /*  1830 */   432, 2143, 2123,  698, 2104,  434, 1523,  197, 2193, 2103,
+ /*  1840 */   199, 1491,   79,  400, 1490, 2085, 2084, 2083, 2174,  446,
+ /*  1850 */  2143, 2210,  698,  447,  339, 2176,  702, 2178, 2179,  697,
+ /*  1860 */  2082,  692, 2081, 2229, 1442, 2174,  147,  608, 2210, 2037,
+ /*  1870 */  2036,  340, 2176,  702, 2178, 2179,  697, 2034,  692, 2033,
+ /*  1880 */  2032, 2035, 2031, 2030, 2174,  791, 2028, 2210, 2027, 2026,
+ /*  1890 */   340, 2176,  702, 2178, 2179,  697,  204,  692, 2175,  310,
+ /*  1900 */   464, 2025,  466, 2039, 2024, 2023, 2022, 2021,  699, 2020,
+ /*  1910 */  2019, 2018, 2017, 2016, 2015,  180,  149, 2009, 2008, 2007,
+ /*  1920 */  2038, 2006, 2005,  781,  777,  773,  769, 2014,  308, 2013,
+ /*  1930 */  2012, 2175, 2011, 2010, 2004, 2003, 2193, 1444, 2002,  494,
+ /*  1940 */  2001,  699, 2000,  350,  351, 1317, 1321, 1851, 2143,  212,
+ /*  1950 */   698, 1850,  214, 1849,  215, 1847, 1844,  511, 1843, 1836,
+ /*  1960 */  1313,  510, 1825, 1801, 2175,  227,  514,  512,  108, 2193,
+ /*  1970 */    63,  301, 1800, 2102,  699,  516,  518, 2092,  520,  522,
+ /*  1980 */  2080, 2143,  603,  698, 1210, 2210,  219,  182,  335, 2176,
+ /*  1990 */   702, 2178, 2179,  697,  515,  692,  217,  519, 2079,   76,
+ /*  2000 */  2175, 2057, 2193, 1925,  678,  547,   77,  225, 2163, 1846,
+ /*  2010 */   699,  183,  530, 1842, 2143, 2174,  698,  545, 2210, 1255,
+ /*  2020 */  1840,  325, 2176,  702, 2178, 2179,  697,  546,  692,  549,
+ /*  2030 */   550,  551, 1838, 2175,  553,  554,  555, 1835, 2193,  288,
+ /*  2040 */   558,  557, 1820,  699,  287, 1818,  559, 1819, 2174, 1817,
+ /*  2050 */  2143, 2210,  698, 1390,  323, 2176,  702, 2178, 2179,  697,
+ /*  2060 */  1797,  692, 2175, 1927,  254, 1389, 1926,  235, 1304, 1302,
+ /*  2070 */  1300, 2193,  699, 1299, 1298, 1297, 1296, 1291, 1833,  375,
+ /*  2080 */   756, 1293, 1824, 2143, 2174,  698, 1292, 2210,  758, 1290,
+ /*  2090 */   326, 2176,  702, 2178, 2179,  697,  376,  692, 1822,  588,
+ /*  2100 */  2193,  377,  591, 1796,  593, 1795,  595, 1794,  597,  113,
+ /*  2110 */  1517, 1519, 2143,   29,  698, 1516, 1521, 2174, 2101,   67,
+ /*  2120 */  2210,   58, 2175,  332, 2176,  702, 2178, 2179,  697, 1497,
+ /*  2130 */   692, 1499,  699, 2091,  612, 2078, 2076, 2340,   17,   20,
+ /*  2140 */     6, 2175,   65,  613,    7,  165, 2174,  381,  258, 2210,
+ /*  2150 */    21,  699,  336, 2176,  702, 2178, 2179,  697,  618,  692,
+ /*  2160 */  2193,   31,  271, 1734,  263,  626, 1501,  628,   22,  265,
+ /*  2170 */   270,   33, 2143,  173,  698, 2164, 1715, 1707, 1749, 2193,
+ /*  2180 */   269,   24, 1748,  386,   32, 1753,   92,  283, 1752, 2175,
+ /*  2190 */   387, 2143, 1754,  698, 1755, 1682,  178, 1681,   60,  699,
+ /*  2200 */    94,   95,   25,  289,  290,  292, 2174, 2077, 2175, 2210,
+ /*  2210 */  2075, 2074,  328, 2176,  702, 2178, 2179,  697,  699,  692,
+ /*  2220 */  2056, 1713,  297,   68, 2055, 2174,   97, 2193, 2210,  299,
+ /*  2230 */   302,  337, 2176,  702, 2178, 2179,  697,  673,  692, 2143,
+ /*  2240 */    59,  698, 1848,  103,   99,   26, 2193,   23,   18,   13,
+ /*  2250 */  1557, 1644, 1634,  179, 1589,   11, 2175,  705, 2143, 1633,
+ /*  2260 */   698, 1612, 2213,  691,  192, 1610,  699,   39,  401, 1609,
+ /*  2270 */    16,   27,   28, 2174, 1581,  707, 2210, 2175, 1375,  329,
+ /*  2280 */  2176,  702, 2178, 2179,  697,  703,  692,  699, 1372,  709,
+ /*  2290 */  1371,  710, 2174,  712, 2193, 2210,  713,  715,  338, 2176,
+ /*  2300 */   702, 2178, 2179,  697,  718,  692, 2143, 1368,  698,  701,
+ /*  2310 */   721,  716,  584,  583,  582, 2193, 1362,  719,  722,  574,
+ /*  2320 */   139,  578, 1360, 1366, 1365,  577,  104, 2143,  305,  698,
+ /*  2330 */   576,  581,  374,  373, 1364, 1384,  575,  105, 1363,   75,
+ /*  2340 */  2174, 1380, 1253, 2210,  736, 2175,  330, 2176,  702, 2178,
+ /*  2350 */  2179,  697, 1285,  692, 1311,  699, 1284, 1283, 1282, 1280,
+ /*  2360 */  1278, 2174, 1277, 2175, 2210, 1276, 1308,  343, 2176,  702,
+ /*  2370 */  2178, 2179,  697,  699,  692,  306, 1274,  746, 1273, 1272,
+ /*  2380 */  1271, 1270, 1269, 2193, 1268, 1306, 1265, 1264, 1261, 1260,
+ /*  2390 */  1259, 1258, 1841, 2175,  766, 2143,  768,  698, 1839,  770,
+ /*  2400 */   772, 2193, 1837,  699,  767,  774,  776, 1834,  778,  771,
+ /*  2410 */   780,  775,  779, 2143, 1816,  698,  782, 1200, 1793,  309,
+ /*  2420 */   786, 1768, 1543,  319, 2175,  789,  790, 1768, 1768, 2174,
+ /*  2430 */  1768, 2193, 2210, 1768,  699,  344, 2176,  702, 2178, 2179,
+ /*  2440 */   697, 2175,  692, 2143, 1768,  698, 1768, 2174, 1768, 1768,
+ /*  2450 */  2210,  699, 1768, 2187, 2176,  702, 2178, 2179,  697, 1768,
+ /*  2460 */   692, 1768, 2193, 1768, 1768, 1768, 1768, 1768, 1768, 1768,
+ /*  2470 */  1768, 1768, 1768, 1768, 2143, 1768,  698, 2174, 1768, 2193,
+ /*  2480 */  2210, 1768, 1768, 2186, 2176,  702, 2178, 2179,  697, 1768,
+ /*  2490 */   692, 2143, 2175,  698, 1768, 1768, 1768, 1768, 1768, 1768,
+ /*  2500 */  1768, 1768,  699, 1768, 1768, 1768, 1768, 1768, 2174, 1768,
+ /*  2510 */  1768, 2210, 1768, 2175, 2185, 2176,  702, 2178, 2179,  697,
+ /*  2520 */  1768,  692, 1768,  699, 1768, 2174, 1768, 1768, 2210, 1768,
+ /*  2530 */  2193,  359, 2176,  702, 2178, 2179,  697, 1768,  692, 1768,
+ /*  2540 */  2175, 1768, 2143, 1768,  698, 1768, 1768, 1768, 1768, 1768,
+ /*  2550 */   699, 2193, 1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768,
+ /*  2560 */  1768, 1768, 1768, 2143, 1768,  698, 1768, 1768, 1768, 1768,
+ /*  2570 */  1768, 1768, 1768, 1768, 1768, 1768, 2174, 1768, 2193, 2210,
+ /*  2580 */  1768, 1768,  360, 2176,  702, 2178, 2179,  697, 1768,  692,
+ /*  2590 */  2143, 1768,  698, 1768, 1768, 1768, 1768, 2174, 1768, 1768,
+ /*  2600 */  2210, 2175, 1768,  356, 2176,  702, 2178, 2179,  697, 1768,
+ /*  2610 */   692,  699, 1768, 1768, 1768, 1768, 1768, 1768, 2175, 1768,
+ /*  2620 */  1768, 1768, 1768, 1768, 2174, 1768, 1768, 2210,  699, 1768,
+ /*  2630 */   361, 2176,  702, 2178, 2179,  697, 1768,  692, 1768, 2193,
+ /*  2640 */  1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768,
+ /*  2650 */  1768, 2143, 1768,  698, 1768, 1768, 2193, 1768, 1768, 1768,
+ /*  2660 */  1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768, 2143, 1768,
+ /*  2670 */   698, 1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768, 1768,
+ /*  2680 */  1768, 1768, 1768, 1768, 1768,  700, 1768, 1768, 2210, 1768,
+ /*  2690 */  1768,  335, 2176,  702, 2178, 2179,  697, 1768,  692, 1768,
+ /*  2700 */  1768, 1768, 2174, 1768, 1768, 2210, 1768, 1768,  334, 2176,
+ /*  2710 */   702, 2178, 2179,  697, 1768,  692,
 };
 static const YYCODETYPE yy_lookahead[] = {
  /*     0 */   340,  359,  456,  445,  446,  459,  339,  409,  341,  367,
@@ -514,229 +514,229 @@ static const YYCODETYPE yy_lookahead[] = {
  /*   170 */   170,  171,   68,  140,  141,  390,  176,  177,  102,   75,
  /*   180 */     0,  105,  349,  350,  169,    0,  172,  401,   75,  403,
  /*   190 */   190,   21,  192,   20,   24,   25,   26,   27,   28,   29,
- /*   200 */    30,   31,   32,  172,  100,  349,   21,  103,  340,   24,
+ /*   200 */    30,   31,   32,  172,  100,   49,   21,  103,  340,   24,
  /*   210 */    25,   26,   27,   28,   29,   30,   31,   32,  350,  401,
  /*   220 */   352,  403,  222,  223,    0,  225,  226,  227,  228,  229,
  /*   230 */   230,  231,  232,  233,  234,  235,  236,  237,  238,  239,
  /*   240 */   240,  241,  242,   20,  140,  141,  378,   67,   24,   25,
- /*   250 */    26,   27,   28,   29,   30,   31,   32,  401,  390,  403,
+ /*   250 */    26,   27,   28,   29,   30,   31,   32,    0,  390,   22,
  /*   260 */   392,  246,  247,  248,  249,  250,  251,  252,  253,  254,
- /*   270 */   255,  256,   67,  340,  170,  171,  103,  349,  350,    4,
- /*   280 */   176,  177,   39,  350,  451,  452,  453,  454,  172,  456,
+ /*   270 */   255,  256,   35,  340,  170,  171,  103,  349,  350,    4,
+ /*   280 */   176,  177,   20,  350,  451,  452,  453,  454,  172,  456,
  /*   290 */   457,   20,  424,   22,  190,  427,  192,  369,  430,  431,
  /*   300 */   432,  433,  434,  435,  376,  437,   35,   14,  349,  350,
  /*   310 */   442,  378,  444,   20,    8,    9,  448,  449,   12,   13,
  /*   320 */    14,   15,   16,  390,   53,  392,  222,  223,  369,  225,
  /*   330 */   226,  227,  228,  229,  230,  231,  232,  233,  234,  235,
  /*   340 */   236,  237,  238,  239,  240,  241,  242,  243,   12,   13,
- /*   350 */    20,  340,   22,   12,   13,    3,   20,  424,   22,  429,
- /*   360 */   427,  350,    0,  430,  431,  432,  433,  434,  435,   33,
- /*   370 */   437,   35,  216,  378,  378,  442,   35,  444,  103,  350,
- /*   380 */   385,  448,  449,   53,  392,  455,    8,    9,  393,  378,
- /*   390 */    12,   13,   14,   15,   16,  399,  404,  100,   62,  407,
- /*   400 */   408,  390,  469,  392,   68,  344,   44,  378,  347,  348,
+ /*   350 */    44,  340,  440,   12,   13,  443,   20,  424,   22,  387,
+ /*   360 */   427,  350,  390,  430,  431,  432,  433,  434,  435,   33,
+ /*   370 */   437,   35,  185,    2,   47,  442,   35,  444,  103,    8,
+ /*   380 */     9,  448,  449,   12,   13,   14,   15,   16,  103,  378,
+ /*   390 */   133,  134,  135,  136,  137,  138,  139,  100,   62,  212,
+ /*   400 */   213,  390,  469,  392,   68,  344,   20,  349,  347,  348,
  /*   410 */   104,   75,  115,  116,  117,  118,  119,  120,  121,  122,
- /*   420 */   123,  124,   44,  126,  127,  128,  129,  130,  131,  132,
- /*   430 */    20,   14,  259,   20,  356,  424,  100,   20,  427,  103,
- /*   440 */   356,  430,  431,  432,  433,  434,  435,  436,  437,  438,
- /*   450 */   439,  373,   12,   13,   14,  358,  175,    2,   33,  381,
- /*   460 */    20,  432,   22,    8,    9,  381,   20,   12,   13,   14,
- /*   470 */    15,   16,  375,   33,   49,   35,  140,  141,   20,  349,
- /*   480 */   350,  384,   57,   58,   59,   60,  350,   62,   62,  370,
- /*   490 */   133,  134,  135,  136,  137,  138,  139,  378,  340,  369,
- /*   500 */     4,  258,   62,   20,  222,  386,  170,  171,  350,  243,
- /*   510 */   352,  245,  176,  177,  350,   75,    8,    9,  349,  350,
- /*   520 */    12,   13,   14,   15,   16,   20,  190,  102,  192,  103,
- /*   530 */   105,  105,  396,  192,  259,   84,  378,   20,  369,   43,
- /*   540 */   100,   45,   46,  103,  340,  264,  265,  266,  390,  103,
+ /*   420 */   123,  124,   20,  126,  127,  128,  129,  130,  131,  132,
+ /*   430 */   103,   14,  259,   20,  172,  424,  100,   20,  427,  103,
+ /*   440 */   103,  430,  431,  432,  433,  434,  435,  436,  437,  438,
+ /*   450 */   439,  340,   12,   13,   14,  358,  175,    2,   33,  401,
+ /*   460 */    20,  403,   22,    8,    9,  378,   20,   12,   13,   14,
+ /*   470 */    15,   16,  375,   33,   49,   35,  140,  141,  356,  349,
+ /*   480 */   350,  384,   57,   58,   59,   60,  399,   62,   62,  103,
+ /*   490 */   133,  134,  135,  136,  137,  138,  139,   67,  340,  369,
+ /*   500 */     4,  390,   62,  381,  222,  103,  170,  171,  350,  429,
+ /*   510 */   352,  358,  176,  177,  350,   75,    8,    9,  349,  350,
+ /*   520 */    12,   13,   14,   15,   16,   67,  190,  102,  192,  103,
+ /*   530 */   105,  105,   20,  192,  259,  455,  378,  384,  369,   43,
+ /*   540 */   100,   45,   46,  103,  259,  264,  265,  266,  390,   20,
  /*   550 */   392,  269,  270,  271,  272,  273,  274,  275,  222,  223,
  /*   560 */   396,  225,  226,  227,  228,  229,  230,  231,  232,  233,
- /*   570 */   234,  235,  236,  237,  238,  239,  240,  241,  242,  103,
- /*   580 */   140,  141,  424,  170,  171,  427,  103,  170,  430,  431,
- /*   590 */   432,  433,  434,  435,  390,  437,  145,  146,  173,  174,
- /*   600 */   442,   49,  444,  178,   67,  180,  448,  449,  340,   57,
- /*   610 */   170,  171,   60,   61,  349,  350,  176,  177,  350,  168,
- /*   620 */   352,  349,  350,  198,  114,  366,  103,  103,  134,  135,
- /*   630 */   190,  279,  192,  139,  369,   70,   71,   72,  441,  380,
- /*   640 */   443,  369,   77,   78,   79,    0,  378,  340,   83,  390,
- /*   650 */   349,  350,   35,   88,   89,   90,   91,    0,  390,   94,
+ /*   570 */   234,  235,  236,  237,  238,  239,  240,  241,  242,  378,
+ /*   580 */   140,  141,  424,  170,  171,  427,  385,  170,  430,  431,
+ /*   590 */   432,  433,  434,  435,  393,  437,  259,  392,  173,  174,
+ /*   600 */   442,  114,  444,  178,  378,  180,  448,  449,  340,  404,
+ /*   610 */   170,  171,  407,  408,  349,  350,  176,  177,  350,  393,
+ /*   620 */   352,  349,  350,  198,  243,  366,  429,  103,  134,  135,
+ /*   630 */   190,   75,  192,  139,  369,   70,   71,   72,  243,  380,
+ /*   640 */   245,  369,   77,   78,   79,  259,  378,  340,   83,  390,
+ /*   650 */   349,  350,  455,   88,   89,   90,   91,  169,  390,   94,
  /*   660 */   392,  409,  222,  223,   20,  225,  226,  227,  228,  229,
  /*   670 */   230,  231,  232,  233,  234,  235,  236,  237,  238,  239,
- /*   680 */   240,  241,  242,   12,   13,  259,  427,  349,  350,  172,
- /*   690 */   182,   20,  424,   22,   49,  427,  437,  390,  430,  431,
+ /*   680 */   240,  241,  242,   12,   13,  259,  427,  349,  350,  350,
+ /*   690 */   182,   20,  424,   22,  114,  427,  437,  390,  430,  431,
  /*   700 */   432,  433,  434,  435,   33,  437,   35,  369,  456,  340,
  /*   710 */   442,  459,  444,  189,  370,  191,  448,  449,    0,  350,
- /*   720 */   388,    4,  378,  391,  392,  429,  474,  475,  349,  350,
- /*   730 */   386,  479,  480,   62,   14,  259,   19,  391,  392,  340,
- /*   740 */    20,  185,  259,  349,  350,  221,   75,  378,  369,  350,
- /*   750 */    33,  455,   21,  452,  453,  454,  243,  456,  457,  390,
- /*   760 */   459,  392,  370,  369,  429,   34,   49,   36,  212,  213,
- /*   770 */   378,  100,   75,   56,  103,  474,  475,  378,  386,   62,
- /*   780 */   479,  480,  259,  259,  140,  141,   75,   12,   13,  390,
- /*   790 */   455,  392,  284,  424,   22,   20,  427,   22,  134,  430,
- /*   800 */   431,  432,  433,  434,  435,  169,  437,   35,   33,  192,
- /*   810 */    35,  140,  141,  444,  349,  350,  159,  448,  449,  102,
- /*   820 */   176,  177,  105,  424,    0,  168,  427,  114,  378,  430,
- /*   830 */   431,  432,  433,  434,  435,  385,  437,   62,  340,  340,
- /*   840 */    14,  170,  171,  393,  349,  350,   20,  176,  177,  350,
- /*   850 */    75,  133,  134,  135,  136,  137,  138,  139,   22,  378,
- /*   860 */   441,  190,  443,  192,  369,   44,  385,  203,  204,  470,
- /*   870 */   471,   35,  100,    2,  393,  100,  379,  378,  103,    8,
- /*   880 */     9,  379,  246,   12,   13,   14,   15,   16,  390,  390,
- /*   890 */   170,  392,  256,  222,  223,  379,  225,  226,  227,  228,
+ /*   720 */   388,    4,  378,  391,  392,  371,  474,  475,  374,   49,
+ /*   730 */   386,  479,  480,   62,  246,  396,   19,   57,   22,  340,
+ /*   740 */    60,   61,  349,  350,  256,  221,   75,  378,  370,  350,
+ /*   750 */    33,   35,   75,  452,  453,  454,  378,  456,  457,  390,
+ /*   760 */   459,  392,  369,  378,  386,  356,   49,  391,  392,  387,
+ /*   770 */   385,  100,  390,   56,  103,  474,  475,  378,  393,   62,
+ /*   780 */   479,  480,  373,  259,  140,  141,  379,   12,   13,  390,
+ /*   790 */   381,  392,  284,  424,  379,   20,  427,   22,   84,  430,
+ /*   800 */   431,  432,  433,  434,  435,   20,  437,   22,   33,  429,
+ /*   810 */    35,  140,  141,  444,  349,  350,  100,  448,  449,  102,
+ /*   820 */   176,  177,  105,  424,  349,  350,  427,  354,  355,  430,
+ /*   830 */   431,  432,  433,  434,  435,  455,  437,   62,   53,  340,
+ /*   840 */   340,  170,  171,  350,  369,    1,    2,  176,  177,  350,
+ /*   850 */    75,  133,  134,  135,  136,  137,  138,  139,  378,  145,
+ /*   860 */   146,  190,  441,  192,  443,  385,   14,   15,   16,  470,
+ /*   870 */   471,  378,  133,  393,  340,  100,  137,  378,  103,    8,
+ /*   880 */     9,  379,  168,   12,   13,   14,   15,   16,  340,  390,
+ /*   890 */   390,  392,  409,  222,  223,  379,  225,  226,  227,  228,
  /*   900 */   229,  230,  231,  232,  233,  234,  235,  236,  237,  238,
- /*   910 */   239,  240,  241,  242,  340,  140,  141,  452,  453,  454,
- /*   920 */   337,  456,  457,  424,  340,  104,  427,  340,  340,  430,
- /*   930 */   431,  432,  433,  434,  435,   18,  437,   20,   14,   15,
- /*   940 */    16,  378,  414,  340,   27,  170,  171,   30,  385,  340,
- /*   950 */    33,  176,  177,  350,  378,  352,  393,  133,  134,  135,
- /*   960 */   136,  137,  138,  139,  390,  190,   49,  192,   51,  393,
- /*   970 */   471,  349,  350,   56,  390,   22,   22,  390,  390,    8,
- /*   980 */     9,  378,  340,   12,   13,   14,   15,   16,   35,   35,
- /*   990 */    20,  369,  409,  390,  340,  392,  413,  222,  223,  390,
+ /*   910 */   239,  240,  241,  242,  409,  140,  141,  452,  453,  454,
+ /*   920 */   337,  456,  457,  424,  390,  432,  427,  340,  340,  430,
+ /*   930 */   431,  432,  433,  434,  435,   18,  437,   20,  390,  456,
+ /*   940 */   349,  350,  459,  340,   27,  170,  171,   30,  104,  340,
+ /*   950 */    33,  176,  177,  350,    4,  352,  134,  474,  475,  414,
+ /*   960 */   369,  456,  479,  480,  459,  190,   49,  192,   51,  379,
+ /*   970 */   471,  349,  350,   56,  370,   22,   22,  390,  390,  474,
+ /*   980 */   475,  378,  378,  350,  479,  480,   54,   55,   35,   35,
+ /*   990 */   386,  369,  409,  390,  340,  392,  413,  222,  223,  390,
  /*  1000 */   225,  226,  227,  228,  229,  230,  231,  232,  233,  234,
  /*  1010 */   235,  236,  237,  238,  239,  240,  241,  242,    0,  102,
- /*  1020 */    20,  349,  350,  349,  350,  363,  364,  424,   75,  379,
- /*  1030 */   427,  114,  390,  430,  431,  432,  433,  434,  435,  456,
- /*  1040 */   437,  369,  459,  340,  390,  442,  133,  444,   54,   55,
- /*  1050 */   137,  448,  449,  100,  100,  354,  355,  474,  475,  354,
+ /*  1020 */     0,  349,  350,  349,  350,  203,  204,  424,   75,  396,
+ /*  1030 */   427,  114,   39,  430,  431,  432,  433,  434,  435,  456,
+ /*  1040 */   437,  369,  459,  172,  390,  442,   42,  444,   44,   14,
+ /*  1050 */     0,  448,  449,  100,  100,   20,   44,  474,  475,  354,
  /*  1060 */   355,  144,  479,  480,  147,  148,  149,  150,  151,  152,
  /*  1070 */   153,  154,  155,  156,  157,  158,  159,  160,  161,  162,
- /*  1080 */   163,   44,  165,  166,  167,  363,  364,  340,   70,   71,
- /*  1090 */    72,   73,   74,  390,   76,   77,   78,   79,   80,   81,
+ /*  1080 */   163,  379,  165,  166,  167,  363,  364,  340,   70,   71,
+ /*  1090 */    72,   73,   74,    3,   76,   77,   78,   79,   80,   81,
  /*  1100 */    82,   83,   84,   85,   86,   87,   88,   89,   90,   91,
- /*  1110 */    92,   93,   94,   95,   96,   18,  349,  350,  409,  340,
- /*  1120 */    23,  340,  340,   12,   13,  379,  452,  453,  454,  340,
+ /*  1110 */    92,   93,   94,   95,   96,   18,  349,  350,  367,  441,
+ /*  1120 */    23,  443,  387,   12,   13,  390,  452,  453,  454,  340,
  /*  1130 */   456,  457,   37,   22,   37,   38,  369,  390,   41,  350,
- /*  1140 */   379,  352,  172,  190,   33,  192,   35,    8,    9,   52,
- /*  1150 */     4,   12,   13,   14,   15,   16,  350,  340,  349,  350,
- /*  1160 */    63,   64,   65,   66,   42,  456,   44,  378,  459,  390,
- /*  1170 */   170,  390,  390,   62,   44,  222,  223,  340,  369,  390,
- /*  1180 */   340,  392,   62,  474,  475,  366,   75,  350,  479,  480,
- /*  1190 */     8,    9,    1,    2,   12,   13,   14,   15,   16,  380,
- /*  1200 */   103,  106,  396,  108,  109,  114,  111,  390,  358,  390,
- /*  1210 */    68,  100,  409,  424,  440,  378,  427,  443,  367,  430,
- /*  1220 */   431,  432,  433,  434,  435,  105,  437,  390,  133,  392,
- /*  1230 */   390,  442,  137,  444,  384,  340,   13,  448,  449,  142,
- /*  1240 */    42,  387,   44,  104,  390,  350,  427,  352,  387,  387,
- /*  1250 */   371,  390,  390,  374,  365,  164,  437,  368,   35,  456,
- /*  1260 */   107,  424,  459,  110,  427,  257,  258,  430,  431,  432,
- /*  1270 */   433,  434,  435,  378,  437,   45,   46,  474,  475,  182,
- /*  1280 */   183,  184,  479,  480,  187,  390,  340,  392,  107,  341,
- /*  1290 */    13,  110,   48,  349,  350,  104,  350,  200,  201,  107,
- /*  1300 */   400,  190,  110,  192,  107,  140,  141,  110,  211,    0,
- /*  1310 */   473,  214,   35,  369,  217,  218,  219,  220,  221,  424,
- /*  1320 */   283,  206,  427,  208,  378,  430,  431,  432,  433,  434,
- /*  1330 */   435,   22,  437,  222,  223,    0,  390,  442,  392,  444,
- /*  1340 */     0,   44,  456,  448,  449,  459,  235,  236,  237,  238,
- /*  1350 */   239,  240,  241,  340,  172,  135,  259,   22,   44,  139,
- /*  1360 */   474,  475,   22,  350,  222,  479,  480,  483,   44,   44,
- /*  1370 */   424,   44,   44,  427,   44,   44,  430,  431,  432,  433,
- /*  1380 */   434,  435,  472,  437,  349,  350,  340,  353,  442,  103,
- /*  1390 */   444,  378,  349,  350,  448,  449,  350,  349,  350,  113,
- /*  1400 */    44,  104,   47,  390,  369,  392,  260,   44,   44,    1,
- /*  1410 */     2,  281,  369,  340,   44,  466,  172,  369,  104,  199,
- /*  1420 */    35,    0,  202,  350,  378,  205,   44,  207,  104,  104,
- /*  1430 */    13,  104,  104,   44,  104,  104,  390,  424,  392,  378,
- /*  1440 */   427,  366,   44,  430,  431,  432,  433,  434,  435,  340,
- /*  1450 */   437,  378,   35,  366,   44,  442,   44,  444,  103,  350,
- /*  1460 */   104,  448,  449,  390,   44,  392,  353,  104,  104,   44,
- /*  1470 */   424,   50,   35,  427,  104,  340,  430,  431,  432,  433,
- /*  1480 */   434,  435,  400,  437,  348,  350,  104,  378,  442,   13,
- /*  1490 */   444,  350,  389,  104,  448,  449,  400,  424,  458,  390,
- /*  1500 */   427,  392,  104,  430,  431,  432,  433,  434,  435,  476,
- /*  1510 */   437,   35,   75,  378,  104,  450,  104,  444,  460,  261,
- /*  1520 */   426,  448,  449,   49,  104,  390,  425,  392,   20,  104,
- /*  1530 */   418,  205,  358,  424,  418,  358,  427,  423,  188,  430,
- /*  1540 */   431,  432,  433,  434,  435,  411,  437,   42,  397,   20,
- /*  1550 */   400,  397,  169,  444,  340,  395,   20,  448,  449,  424,
+ /*  1140 */    42,  352,   44,  190,   33,  192,   35,    8,    9,   52,
+ /*  1150 */    14,   12,   13,   14,   15,   16,   20,  340,  349,  350,
+ /*  1160 */    63,   64,   65,   66,    8,    9,  341,  378,   12,   13,
+ /*  1170 */    14,   15,   16,   62,  400,  222,  223,  340,  369,  390,
+ /*  1180 */   340,  392,  349,  350,    8,    9,   75,  350,   12,   13,
+ /*  1190 */    14,   15,   16,  365,  349,  350,  368,  349,  350,  472,
+ /*  1200 */   103,  106,  369,  108,  109,  170,  111,  390,  340,  159,
+ /*  1210 */   260,  100,   20,  424,  369,  378,  427,  369,  168,  430,
+ /*  1220 */   431,  432,  433,  434,  435,   20,  437,  390,  133,  392,
+ /*  1230 */   390,  442,  137,  444,  378,  340,  216,  448,  449,  142,
+ /*  1240 */   483,  385,  340,  104,  206,  350,  208,  352,  466,  393,
+ /*  1250 */    21,  258,  366,   44,  340,  349,  350,   68,  390,  456,
+ /*  1260 */   104,  424,  459,   34,  427,   36,  380,  430,  431,  432,
+ /*  1270 */   433,  434,  435,  378,  437,  369,  390,  474,  475,  182,
+ /*  1280 */   183,  184,  479,  480,  187,  390,  340,  392,  363,  364,
+ /*  1290 */   135,  340,  390,  281,  139,  114,  350,  200,  201,  257,
+ /*  1300 */   258,  190,   48,  192,  390,  340,   45,   46,  211,   13,
+ /*  1310 */   473,  214,   44,  427,  217,  218,  219,  220,  221,  424,
+ /*  1320 */    13,  353,  427,  437,  378,  430,  431,  432,  433,  434,
+ /*  1330 */   435,   35,  437,  222,  223,  366,  390,  442,  392,  444,
+ /*  1340 */     0,  390,   35,  448,  449,  164,  235,  236,  237,  238,
+ /*  1350 */   239,  240,  241,  340,  199,  390,  259,  202,  107,   62,
+ /*  1360 */   205,  110,  207,  350,  172,    0,   35,   44,   44,  279,
+ /*  1370 */   424,  107,  104,  427,  110,  170,  430,  431,  432,  433,
+ /*  1380 */   434,  435,  107,  437,   44,  110,  340,   22,  442,  107,
+ /*  1390 */   444,  378,  110,    0,  448,  449,  350,    0,   44,   13,
+ /*  1400 */    44,   35,  105,  390,   44,  392,  140,  141,   44,    1,
+ /*  1410 */     2,  222,   44,  340,   44,   22,   35,   13,  366,   22,
+ /*  1420 */   103,   35,   44,  350,  378,  378,  172,  104,  104,   44,
+ /*  1430 */   113,   44,  353,   44,    0,  348,  390,  424,  392,   35,
+ /*  1440 */   427,   75,   44,  430,  431,  432,  433,  434,  435,  340,
+ /*  1450 */   437,  378,  350,  400,   44,  442,   44,  444,  104,  350,
+ /*  1460 */   104,  448,  449,  390,  104,  392,  389,  400,  104,   44,
+ /*  1470 */   424,   44,  104,  427,  104,  340,  430,  431,  432,  433,
+ /*  1480 */   434,  435,  104,  437,   50,  350,  458,  378,  442,  104,
+ /*  1490 */   444,  104,  283,  104,  448,  449,   44,  424,  476,  390,
+ /*  1500 */   427,  392,  104,  430,  431,  432,  433,  434,  435,  450,
+ /*  1510 */   437,  460,  426,  378,  104,   44,  104,  444,  261,   49,
+ /*  1520 */    20,  448,  449,  192,  425,  390,  418,  392,  423,  104,
+ /*  1530 */   205,  104,  358,  424,  418,  358,  427,  188,  411,  430,
+ /*  1540 */   431,  432,  433,  434,  435,   42,  437,  397,   20,  400,
+ /*  1550 */   397,  169,  395,  444,  340,   20,  104,  448,  449,  424,
  /*  1560 */   349,  349,  427,  397,  350,  430,  431,  432,  433,  434,
- /*  1570 */   435,  395,  437,  395,  101,  362,   99,  192,  361,   98,
- /*  1580 */   340,  349,  360,  349,  349,  349,   20,  342,   48,  346,
- /*  1590 */   350,  342,  378,  346,   20,  358,  392,  418,   20,  358,
- /*  1600 */    20,  351,  342,  410,  390,  378,  392,  351,  349,  358,
- /*  1610 */   358,  358,  385,  358,  390,  358,  481,  482,  378,  349,
- /*  1620 */   393,  390,  342,  383,  378,  209,  378,  422,  390,  103,
- /*  1630 */   390,  196,  392,  195,  418,  420,  417,  356,  424,  378,
+ /*  1570 */   435,   99,  437,  192,  395,  104,  101,  395,  362,  361,
+ /*  1580 */   340,  349,   98,  360,  349,  349,  349,   20,  342,   48,
+ /*  1590 */   350,  346,  378,  346,  342,   20,  418,  358,  392,  358,
+ /*  1600 */    20,  351,   20,  410,  390,  378,  392,  358,  349,  351,
+ /*  1610 */   390,  358,  385,  358,  358,  342,  481,  482,  378,  349,
+ /*  1620 */   393,  358,  378,  383,  390,  209,  378,  342,  390,  422,
+ /*  1630 */   390,  418,  392,  103,  196,  420,  356,  195,  424,  417,
  /*  1640 */   378,  427,  340,  378,  430,  431,  432,  433,  434,  435,
- /*  1650 */   378,  437,  350,  378,  378,  416,  378,  378,  444,  340,
- /*  1660 */   378,  392,  356,  449,  424,  194,  349,  427,  400,  350,
- /*  1670 */   430,  431,  432,  433,  434,  435,  267,  437,  340,  415,
- /*  1680 */   378,  390,  268,  456,  400,  383,  459,  276,  350,  390,
- /*  1690 */   465,  465,  390,  405,  392,  405,  468,  378,  390,  181,
- /*  1700 */   390,  474,  475,  285,  278,  277,  479,  480,  262,  390,
- /*  1710 */   258,  392,  282,  426,  280,  350,  378,  484,   20,  465,
- /*  1720 */   478,  383,  429,  349,  351,  356,  424,  464,  390,  427,
- /*  1730 */   392,  356,  430,  431,  432,  433,  434,  435,  467,  437,
- /*  1740 */    20,  405,  403,  424,  477,  462,  427,  390,  463,  430,
- /*  1750 */   431,  432,  433,  434,  435,  174,  437,  390,  390,  405,
- /*  1760 */   402,  390,  424,  356,  340,  427,  390,  390,  430,  431,
- /*  1770 */   432,  433,  434,  435,  350,  437,  374,  350,  356,  103,
- /*  1780 */   447,  340,  103,  382,  390,  349,   36,  368,  356,  338,
- /*  1790 */   343,  350,  342,  412,  406,  372,  406,  419,    0,  357,
- /*  1800 */   340,  482,  378,  372,    0,  372,    0,   42,    0,   35,
- /*  1810 */   350,  215,   35,   35,  390,   35,  392,  215,    0,  378,
- /*  1820 */    35,   35,  215,    0,  383,  215,    0,   35,    0,   22,
- /*  1830 */     0,  390,   35,  392,    0,  210,  198,    0,  378,  198,
- /*  1840 */   192,  199,  190,  383,    0,    0,    0,  186,  424,  185,
- /*  1850 */   390,  427,  392,    0,  430,  431,  432,  433,  434,  435,
- /*  1860 */     0,  437,   47,  439,    0,  424,   42,    1,  427,    0,
+ /*  1650 */   378,  437,  350,  194,  378,  378,  378,  378,  444,  340,
+ /*  1660 */   356,  378,  378,  449,  424,  349,  392,  427,  268,  350,
+ /*  1670 */   430,  431,  432,  433,  434,  435,  416,  437,  340,  390,
+ /*  1680 */   378,  400,  415,  456,  465,  383,  459,  400,  350,  267,
+ /*  1690 */   390,  405,  390,  465,  392,  405,  390,  378,  390,  276,
+ /*  1700 */   181,  474,  475,  285,  278,  277,  479,  480,  465,  390,
+ /*  1710 */   468,  392,  262,  282,  426,  484,  378,  280,   20,  258,
+ /*  1720 */   349,  383,  350,  356,  429,  351,  424,   20,  390,  427,
+ /*  1730 */   392,  462,  430,  431,  432,  433,  434,  435,  467,  437,
+ /*  1740 */   356,  405,  403,  424,  174,  390,  427,  390,  390,  430,
+ /*  1750 */   431,  432,  433,  434,  435,  464,  437,  463,  405,  390,
+ /*  1760 */   103,  402,  424,  390,  340,  427,  390,  356,  430,  431,
+ /*  1770 */   432,  433,  434,  435,  350,  437,  478,  374,  477,  447,
+ /*  1780 */   350,  340,  103,  382,  390,  356,   36,  368,  349,  356,
+ /*  1790 */   343,  350,  412,  342,  419,  338,  406,  406,    0,    0,
+ /*  1800 */   340,  482,  378,  357,  372,    0,   42,  372,  372,    0,
+ /*  1810 */   350,   35,  215,   35,  390,   35,  392,  215,   35,  378,
+ /*  1820 */     0,   35,   35,  215,  383,    0,  215,    0,   35,    0,
+ /*  1830 */    22,  390,    0,  392,    0,   35,  210,  198,  378,    0,
+ /*  1840 */   198,  192,  199,  383,  190,    0,    0,    0,  424,  186,
+ /*  1850 */   390,  427,  392,  185,  430,  431,  432,  433,  434,  435,
+ /*  1860 */     0,  437,    0,  439,   47,  424,   42,    1,  427,    0,
  /*  1870 */     0,  430,  431,  432,  433,  434,  435,    0,  437,    0,
- /*  1880 */     0,    0,    0,    0,  424,   19,    0,  427,    0,  159,
- /*  1890 */   430,  431,  432,  433,  434,  435,   35,  437,  340,   33,
- /*  1900 */     0,  159,    0,    0,    0,    0,    0,    0,  350,    0,
+ /*  1880 */     0,    0,    0,    0,  424,   19,    0,  427,    0,    0,
+ /*  1890 */   430,  431,  432,  433,  434,  435,  159,  437,  340,   33,
+ /*  1900 */    35,    0,  159,    0,    0,    0,    0,    0,  350,    0,
  /*  1910 */     0,    0,    0,    0,    0,   49,   42,    0,    0,    0,
  /*  1920 */     0,    0,    0,   57,   58,   59,   60,    0,   62,    0,
- /*  1930 */     0,  340,    0,    0,    0,    0,  378,   22,  143,    0,
- /*  1940 */     0,  350,   48,   48,    0,   22,   22,   62,  390,    0,
- /*  1950 */   392,   62,    0,   62,    0,    0,    0,   49,    0,    0,
+ /*  1930 */     0,  340,    0,    0,    0,    0,  378,   22,    0,  143,
+ /*  1940 */     0,  350,    0,   48,   48,   22,   22,    0,  390,   62,
+ /*  1950 */   392,    0,   62,    0,   62,    0,    0,   49,    0,    0,
  /*  1960 */    35,   35,    0,    0,  340,  181,   35,   39,  102,  378,
- /*  1970 */     0,  105,    0,    0,  350,   39,   35,   35,    0,   14,
- /*  1980 */     0,  390,  424,  392,    0,  427,   39,   49,  430,  431,
- /*  1990 */   432,  433,  434,  435,   49,  437,    0,   44,   47,   42,
- /*  2000 */   340,    0,  378,   39,  138,   39,   39,   47,   47,   40,
- /*  2010 */   350,   35,   69,   39,  390,  424,  392,   49,  427,    0,
- /*  2020 */    35,  430,  431,  432,  433,  434,  435,   39,  437,    0,
- /*  2030 */    49,   49,   35,  340,   39,    0,   49,   35,  378,  173,
- /*  2040 */     0,    0,   39,  350,  178,    0,    0,    0,  424,    0,
+ /*  1970 */   112,  105,    0,    0,  350,   39,   35,    0,   39,   35,
+ /*  1980 */     0,  390,  424,  392,   14,  427,   40,   44,  430,  431,
+ /*  1990 */   432,  433,  434,  435,   49,  437,   42,   49,    0,   39,
+ /*  2000 */   340,    0,  378,    0,  138,   39,   39,   39,   47,    0,
+ /*  2010 */   350,   47,   47,    0,  390,  424,  392,   35,  427,   69,
+ /*  2020 */     0,  430,  431,  432,  433,  434,  435,   49,  437,   35,
+ /*  2030 */    49,   39,    0,  340,   35,   49,   39,    0,  378,  173,
+ /*  2040 */    49,   35,    0,  350,  178,    0,   39,    0,  424,    0,
  /*  2050 */   390,  427,  392,   35,  430,  431,  432,  433,  434,  435,
- /*  2060 */   112,  437,  340,    0,  198,   22,   35,   35,   35,   35,
- /*  2070 */    44,  378,  350,   35,   35,    0,   22,   35,   22,   35,
- /*  2080 */    44,  110,    0,  390,  424,  392,   35,  427,   22,    0,
- /*  2090 */   430,  431,  432,  433,  434,  435,   35,  437,   22,   51,
- /*  2100 */   378,   22,   35,    0,   35,    0,   35,    0,   20,   35,
- /*  2110 */   104,  103,  390,   35,  392,   35,    0,  424,  172,  103,
- /*  2120 */   427,   35,  340,  430,  431,  432,  433,  434,  435,    0,
- /*  2130 */   437,   22,  350,   22,    0,    0,    3,   44,  263,   48,
- /*  2140 */   103,  340,   48,   44,   44,   47,  424,  197,   44,  427,
- /*  2150 */    44,  350,  430,  431,  432,  433,  434,  435,  172,  437,
- /*  2160 */   378,  104,  172,  174,  104,  103,  101,   99,  193,   47,
- /*  2170 */   179,    3,  390,  103,  392,   44,  104,  104,   35,  378,
- /*  2180 */   103,   35,   35,   35,  103,   35,  103,   47,   35,  340,
- /*  2190 */     0,  390,   47,  392,  104,   44,  104,    0,    0,  350,
- /*  2200 */   104,  104,    0,   39,   47,  103,  424,    0,  340,  427,
- /*  2210 */    39,  103,  430,  431,  432,  433,  434,  435,  350,  437,
- /*  2220 */    44,  104,  104,  103,  103,  424,  103,  378,  427,  103,
- /*  2230 */   175,  430,  431,  432,  433,  434,  435,  173,  437,  390,
- /*  2240 */   263,  392,    0,  113,  244,  101,  378,    2,   47,   22,
- /*  2250 */   257,   47,  222,  104,   22,  263,  340,  101,  390,  104,
- /*  2260 */   392,  103,  103,  103,   47,  104,  350,  104,  103,  103,
- /*  2270 */   103,   35,   35,  424,  224,  103,  427,  340,   35,  430,
- /*  2280 */   431,  432,  433,  434,  435,  104,  437,  350,  114,  104,
- /*  2290 */   103,   35,  424,  104,  378,  427,  103,   35,  430,  431,
- /*  2300 */   432,  433,  434,  435,   35,  437,  390,  104,  392,  103,
- /*  2310 */    35,  103,   70,   71,   72,  378,  104,  104,  103,   77,
- /*  2320 */    78,   79,  103,   44,  125,   83,  103,  390,   35,  392,
- /*  2330 */    88,   89,   90,   91,  125,  125,   94,  103,   22,  125,
- /*  2340 */   424,   69,   68,  427,   35,  340,  430,  431,  432,  433,
- /*  2350 */   434,  435,   35,  437,   35,  350,   35,   35,   35,   35,
- /*  2360 */    35,  424,   75,  340,  427,   97,   22,  430,  431,  432,
- /*  2370 */   433,  434,  435,  350,  437,   44,   35,   35,   35,   75,
- /*  2380 */    35,   35,   35,  378,   35,   35,   35,   35,   35,   22,
- /*  2390 */    35,    0,   35,  340,    0,  390,   35,  392,   39,   39,
- /*  2400 */     0,  378,   39,  350,   35,   49,    0,   49,   35,   39,
- /*  2410 */     0,   49,   35,  390,   49,  392,   35,    0,   22,   21,
- /*  2420 */   485,   22,   20,   22,  340,   21,  485,  485,  485,  424,
+ /*  2060 */     0,  437,  340,    0,  198,   22,    0,  110,   35,   35,
+ /*  2070 */    35,  378,  350,   35,   35,   35,   35,   22,    0,   22,
+ /*  2080 */    44,   35,    0,  390,  424,  392,   35,  427,   44,   35,
+ /*  2090 */   430,  431,  432,  433,  434,  435,   22,  437,    0,   51,
+ /*  2100 */   378,   22,   35,    0,   35,    0,   35,    0,   22,   20,
+ /*  2110 */    35,   35,  390,  103,  392,   35,  104,  424,    0,  103,
+ /*  2120 */   427,  172,  340,  430,  431,  432,  433,  434,  435,   35,
+ /*  2130 */   437,   22,  350,    0,   22,    0,    0,    3,  263,   44,
+ /*  2140 */    48,  340,    3,  172,   48,  193,  424,  172,  174,  427,
+ /*  2150 */    44,  350,  430,  431,  432,  433,  434,  435,  179,  437,
+ /*  2160 */   378,  103,   47,  104,  103,  101,  197,   99,   44,  104,
+ /*  2170 */    44,   44,  390,  103,  392,   47,  104,  104,   35,  378,
+ /*  2180 */   103,   44,   35,   35,  103,   35,  103,   47,   35,  340,
+ /*  2190 */    35,  390,  104,  392,  104,  104,   47,  104,   44,  350,
+ /*  2200 */   103,   39,  103,   47,  104,  103,  424,    0,  340,  427,
+ /*  2210 */     0,    0,  430,  431,  432,  433,  434,  435,  350,  437,
+ /*  2220 */     0,  104,  103,  103,    0,  424,   39,  378,  427,  173,
+ /*  2230 */    47,  430,  431,  432,  433,  434,  435,  175,  437,  390,
+ /*  2240 */   257,  392,    0,  113,  103,   44,  378,  263,  263,    2,
+ /*  2250 */    22,  222,  101,   47,   22,  244,  340,   35,  390,  101,
+ /*  2260 */   392,  104,  103,  103,   47,  104,  350,  103,   35,  104,
+ /*  2270 */   103,  103,  103,  424,  104,  103,  427,  340,  104,  430,
+ /*  2280 */   431,  432,  433,  434,  435,  114,  437,  350,  104,   35,
+ /*  2290 */   104,  103,  424,   35,  378,  427,  103,   35,  430,  431,
+ /*  2300 */   432,  433,  434,  435,   35,  437,  390,  104,  392,  224,
+ /*  2310 */    35,  103,   70,   71,   72,  378,  104,  103,  103,   77,
+ /*  2320 */    78,   79,  104,  125,  125,   83,  103,  390,   44,  392,
+ /*  2330 */    88,   89,   90,   91,  125,   35,   94,  103,  125,  103,
+ /*  2340 */   424,   22,   69,  427,   68,  340,  430,  431,  432,  433,
+ /*  2350 */   434,  435,   35,  437,   75,  350,   35,   35,   35,   35,
+ /*  2360 */    35,  424,   35,  340,  427,   35,   75,  430,  431,  432,
+ /*  2370 */   433,  434,  435,  350,  437,   44,   35,   97,   35,   35,
+ /*  2380 */    22,   35,   35,  378,   35,   35,   35,   35,   35,   35,
+ /*  2390 */    22,   35,    0,  340,   35,  390,   39,  392,    0,   35,
+ /*  2400 */    39,  378,    0,  350,   49,   35,   39,    0,   35,   49,
+ /*  2410 */    39,   49,   49,  390,    0,  392,   35,   35,    0,   22,
+ /*  2420 */    21,  485,   22,   22,  340,   21,   20,  485,  485,  424,
  /*  2430 */   485,  378,  427,  485,  350,  430,  431,  432,  433,  434,
  /*  2440 */   435,  340,  437,  390,  485,  392,  485,  424,  485,  485,
  /*  2450 */   427,  350,  485,  430,  431,  432,  433,  434,  435,  485,
@@ -770,7 +770,7 @@ static const YYCODETYPE yy_lookahead[] = {
  /*  2730 */   485,  485,  485,  485,  485,  485,  485,  485,  485,  485,
  /*  2740 */   485,  485,  485,  485,  485,  485,  485,  485,  485,  485,
  /*  2750 */   485,  485,  485,  485,  485,  485,  485,  485,  485,  485,
- /*  2760 */   485,  485,  485,  337,  337,  337,  337,  337,  337,  337,
+ /*  2760 */   485,  485,  485,  485,  337,  337,  337,  337,  337,  337,
  /*  2770 */   337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
  /*  2780 */   337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
  /*  2790 */   337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
@@ -803,88 +803,88 @@ static const YYCODETYPE yy_lookahead[] = {
 };
 #define YY_SHIFT_COUNT    (791)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (2417)
+#define YY_SHIFT_MAX      (2418)
 static const unsigned short int yy_shift_ofst[] = {
  /*     0 */  1097,    0,  104,    0,  336,  336,  336,  336,  336,  336,
  /*    10 */   336,  336,  336,  336,  336,  336,  440,  671,  671,  775,
  /*    20 */   671,  671,  671,  671,  671,  671,  671,  671,  671,  671,
  /*    30 */   671,  671,  671,  671,  671,  671,  671,  671,  671,  671,
  /*    40 */   671,  671,  671,  671,  671,  671,  671,  671,  671,  671,
- /*    50 */   671,  173,  483,  524,  446,  426,  476,  523,  476,  446,
- /*    60 */   446, 1111,  476, 1111, 1111,  275,  476,  141,  644,  223,
+ /*    50 */   671,  173,  386,  524,  402,  426,  285,  337,  285,  402,
+ /*    60 */   402, 1111,  285, 1111, 1111,  275,  285,  141,  644,  223,
  /*    70 */   223,  644,  496,  496,  413,   33,  293,  293,  223,  223,
- /*    80 */   223,  223,  223,  223,  223,  410,  223,  223,  205,  141,
- /*    90 */   223,  223,  458,  223,  141,  223,  410,  223,  410,  141,
- /*   100 */   223,  223,  141,  223,  141,  141,  141,  223,  537,  917,
+ /*    80 */   223,  223,  223,  223,  223,  446,  223,  223,  430,  141,
+ /*    90 */   223,  223,  512,  223,  141,  223,  446,  223,  446,  141,
+ /*   100 */   223,  223,  141,  223,  141,  141,  141,  223,  458,  917,
  /*   110 */    15,   15,  565,  170,  953,  953,  953,  953,  953,  953,
  /*   120 */   953,  953,  953,  953,  953,  953,  953,  953,  953,  953,
- /*   130 */   953,  953,  953, 1095,   14,  413,   33,  994,  994,  113,
- /*   140 */   116,  116,  116,  180,  266,  266,  113,  505,  505,  505,
- /*   150 */   205,  510,  513,  141,  697,  141,  697,  697,  713,  711,
+ /*   130 */   953,  953,  953, 1095,   14,  413,   33,  932,  932,  113,
+ /*   140 */   116,  116,  116,  180,  395,  395,  113,  529,  529,  529,
+ /*   150 */   430,  487,  381,  141,  556,  141,  556,  556,  580,  677,
  /*   160 */   297,  297,  297,  297,  297,  297,  297,  297, 1866, 2242,
- /*   170 */   185,   31,  508,  282,  271,  281,  341,  341,  417,  720,
- /*   180 */   330,  517, 1230,  826,  913,  970, 1008,  243,  352, 1008,
- /*   190 */  1122, 1146, 1000, 1258, 1474, 1508, 1326,  205, 1508,  205,
- /*   200 */  1350, 1505, 1529, 1505, 1383, 1536, 1536, 1505, 1383, 1383,
- /*   210 */  1473, 1477, 1536, 1481, 1536, 1536, 1536, 1566, 1540, 1566,
- /*   220 */  1540, 1508,  205, 1574,  205, 1578, 1580,  205, 1578,  205,
- /*   230 */   205,  205, 1536,  205, 1566,  141,  141,  141,  141,  141,
- /*   240 */   141,  141,  141,  141,  141,  141, 1536, 1566,  697,  697,
- /*   250 */   697, 1416, 1526, 1508,  537, 1435, 1438, 1574,  537, 1471,
- /*   260 */  1536, 1529, 1529,  697, 1414, 1409,  697, 1414, 1409,  697,
- /*   270 */   697,  141, 1411, 1518, 1414, 1426, 1428, 1446, 1258, 1418,
- /*   280 */  1430, 1434, 1452,  505, 1698, 1536, 1578,  537,  537, 1720,
- /*   290 */  1409,  697,  697,  697,  697,  697, 1409,  697, 1581,  537,
- /*   300 */   713,  537,  505, 1676, 1679,  697,  711, 1536,  537, 1750,
- /*   310 */  1566, 2716, 2716, 2716, 2716, 2716, 2716, 2716, 2716, 2716,
- /*   320 */  1018,  425,  224,  717,  306,  378, 1139,  718,  455,  871,
- /*   330 */  1182,  824,  971,  971,  971,  971,  971,  971,  971,  971,
- /*   340 */   971,  357, 1220,  118,  118,  451,  552,  556,  657,   76,
- /*   350 */   772,  954,  731,  664,  494,  494,  924, 1191,  636,  924,
- /*   360 */   924,  924,  645,  156,  821,  836, 1198, 1091,  362, 1153,
- /*   370 */  1181, 1192, 1197, 1223, 1277, 1309, 1335, 1340, 1115, 1297,
- /*   380 */  1314, 1120, 1324, 1325, 1327, 1165, 1130, 1037, 1244, 1328,
- /*   390 */  1330, 1331, 1356, 1363, 1364, 1408, 1370, 1142, 1382, 1355,
- /*   400 */  1389, 1398, 1410, 1412, 1420, 1425, 1286,  617, 1385, 1417,
- /*   410 */  1476, 1437, 1421, 1798, 1804, 1806, 1765, 1808, 1774, 1596,
- /*   420 */  1777, 1778, 1780, 1602, 1818, 1785, 1786, 1607, 1823, 1610,
- /*   430 */  1826, 1792, 1828, 1807, 1830, 1797, 1625, 1834, 1638, 1837,
- /*   440 */  1641, 1642, 1648, 1652, 1844, 1845, 1846, 1661, 1664, 1853,
- /*   450 */  1860, 1815, 1864, 1869, 1870, 1824, 1877, 1879, 1880, 1881,
- /*   460 */  1882, 1883, 1886, 1888, 1730, 1861, 1900, 1742, 1902, 1903,
- /*   470 */  1904, 1905, 1906, 1907, 1909, 1910, 1911, 1912, 1913, 1914,
- /*   480 */  1927, 1929, 1930, 1932, 1874, 1917, 1918, 1919, 1920, 1921,
- /*   490 */  1922, 1915, 1933, 1934, 1935, 1795, 1939, 1940, 1923, 1894,
- /*   500 */  1924, 1895, 1944, 1885, 1925, 1949, 1889, 1952, 1891, 1954,
- /*   510 */  1955, 1926, 1908, 1928, 1956, 1931, 1938, 1936, 1958, 1941,
- /*   520 */  1945, 1947, 1959, 1942, 1962, 1957, 1967, 1953, 1951, 1960,
- /*   530 */  1965, 1961, 1963, 1969, 1964, 1970, 1972, 1973, 1974, 1784,
- /*   540 */  1978, 1980, 1984, 1943, 1996, 2001, 1976, 1968, 1966, 2019,
- /*   550 */  1985, 1981, 1988, 2029, 1997, 1982, 1995, 2035, 2002, 1987,
- /*   560 */  2003, 2040, 2041, 2045, 2046, 2047, 2049, 1948, 1971, 2018,
- /*   570 */  2043, 2063, 2031, 2032, 2033, 2034, 2038, 2039, 2042, 2026,
- /*   580 */  2036, 2044, 2051, 2054, 2061, 2075, 2056, 2082, 2066, 2048,
- /*   590 */  2089, 2076, 2067, 2103, 2069, 2105, 2071, 2107, 2079, 2088,
- /*   600 */  2074, 2078, 2080, 2006, 2008, 2116, 1946, 2016, 1950, 2086,
- /*   610 */  2109, 2129, 1975, 2111, 1986, 1989, 2134, 2135, 1990, 1991,
- /*   620 */  2133, 2093, 1875, 2037, 2057, 2062, 2091, 2065, 2094, 2068,
- /*   630 */  2060, 2099, 2100, 2072, 2070, 2077, 2081, 2073, 2104, 2098,
- /*   640 */  2122, 2083, 2106, 1977, 2090, 2092, 2168, 2131, 1992, 2143,
- /*   650 */  2146, 2147, 2148, 2150, 2153, 2096, 2097, 2140, 1993, 2151,
- /*   660 */  2145, 2190, 2197, 2198, 2202, 2102, 2164, 1951, 2157, 2108,
- /*   670 */  2117, 2118, 2120, 2121, 2055, 2123, 2207, 2171, 2064, 2126,
- /*   680 */  2130, 1951, 2201, 2176, 2144, 2000, 2156, 2245, 2227, 2030,
- /*   690 */  2158, 2149, 2159, 2155, 2160, 2161, 2204, 2165, 2166, 2217,
- /*   700 */  2163, 2232, 2050, 2167, 2174, 2181, 2236, 2237, 2172, 2185,
- /*   710 */  2243, 2187, 2189, 2256, 2193, 2203, 2262, 2206, 2212, 2269,
- /*   720 */  2208, 2213, 2275, 2215, 2199, 2209, 2210, 2214, 2219, 2279,
- /*   730 */  2223, 2293, 2234, 2279, 2279, 2316, 2272, 2274, 2309, 2317,
- /*   740 */  2319, 2321, 2322, 2323, 2324, 2325, 2287, 2268, 2331, 2341,
- /*   750 */  2342, 2343, 2344, 2345, 2346, 2347, 2304, 2026, 2349, 2036,
- /*   760 */  2350, 2351, 2352, 2353, 2367, 2355, 2391, 2357, 2356, 2359,
- /*   770 */  2394, 2361, 2358, 2360, 2400, 2369, 2362, 2363, 2406, 2373,
- /*   780 */  2365, 2370, 2410, 2377, 2381, 2417, 2396, 2398, 2399, 2401,
- /*   790 */  2404, 2402,
+ /*   170 */   185,   31,  508,  282,  271,  281,  341,  341,  417, 1035,
+ /*   180 */   785,  262, 1261, 1136,  739, 1192, 1042,  993, 1090, 1042,
+ /*   190 */  1004,  950, 1205, 1257, 1470, 1500, 1325,  430, 1500,  430,
+ /*   200 */  1349, 1503, 1528, 1503, 1382, 1535, 1535, 1503, 1382, 1382,
+ /*   210 */  1475, 1472, 1535, 1484, 1535, 1535, 1535, 1567, 1541, 1567,
+ /*   220 */  1541, 1500,  430, 1575,  430, 1580, 1582,  430, 1580,  430,
+ /*   230 */   430,  430, 1535,  430, 1567,  141,  141,  141,  141,  141,
+ /*   240 */   141,  141,  141,  141,  141,  141, 1535, 1567,  556,  556,
+ /*   250 */   556, 1416, 1530, 1500,  458, 1438, 1442, 1575,  458, 1459,
+ /*   260 */  1535, 1528, 1528,  556, 1400, 1422,  556, 1400, 1422,  556,
+ /*   270 */   556,  141, 1423, 1519, 1400, 1426, 1428, 1450, 1257, 1418,
+ /*   280 */  1431, 1437, 1461,  529, 1698, 1535, 1580,  458,  458, 1707,
+ /*   290 */  1422,  556,  556,  556,  556,  556, 1422,  556, 1570,  458,
+ /*   300 */   580,  458,  529, 1657, 1679,  556,  677, 1535,  458, 1750,
+ /*   310 */  1567, 2716, 2716, 2716, 2716, 2716, 2716, 2716, 2716, 2716,
+ /*   320 */  1018,  425,  224,  306,  717, 1139, 1156,  257,  371,  455,
+ /*   330 */   871,  718, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176,
+ /*   340 */  1176,  357, 1155,  118,  118,  714,  680,  187, 1050,   76,
+ /*   350 */   716,  954, 1229,  822,  494,  494,  852,  844,  488,  852,
+ /*   360 */   852,  852,  156, 1020, 1268,  237, 1098, 1181, 1340, 1251,
+ /*   370 */  1264, 1275, 1282, 1296, 1307, 1365, 1393, 1397, 1038, 1323,
+ /*   380 */  1324, 1297, 1354, 1356, 1360, 1266, 1012, 1209, 1254, 1364,
+ /*   390 */  1368, 1370, 1378, 1385, 1387, 1408, 1389, 1189, 1398,  327,
+ /*   400 */  1410, 1412, 1425, 1427, 1452, 1471, 1317, 1331, 1381, 1386,
+ /*   410 */  1404, 1366, 1434, 1798, 1799, 1805, 1764, 1809, 1776, 1597,
+ /*   420 */  1778, 1780, 1783, 1602, 1820, 1786, 1787, 1608, 1825, 1611,
+ /*   430 */  1827, 1793, 1829, 1808, 1832, 1800, 1626, 1834, 1639, 1839,
+ /*   440 */  1642, 1643, 1649, 1654, 1845, 1846, 1847, 1663, 1668, 1860,
+ /*   450 */  1862, 1817, 1869, 1870, 1877, 1824, 1879, 1880, 1881, 1882,
+ /*   460 */  1883, 1886, 1888, 1889, 1737, 1865, 1901, 1743, 1903, 1904,
+ /*   470 */  1905, 1906, 1907, 1909, 1910, 1911, 1912, 1913, 1914, 1927,
+ /*   480 */  1929, 1930, 1932, 1933, 1874, 1917, 1918, 1919, 1920, 1921,
+ /*   490 */  1922, 1915, 1934, 1935, 1938, 1796, 1940, 1942, 1923, 1895,
+ /*   500 */  1924, 1896, 1947, 1887, 1925, 1951, 1890, 1953, 1892, 1955,
+ /*   510 */  1956, 1926, 1908, 1928, 1958, 1931, 1945, 1936, 1959, 1941,
+ /*   520 */  1948, 1939, 1962, 1944, 1963, 1954, 1960, 1943, 1961, 1964,
+ /*   530 */  1970, 1965, 1972, 1946, 1967, 1973, 1977, 1980, 1968, 1784,
+ /*   540 */  1998, 2001, 2003, 1950, 2009, 2013, 1982, 1978, 1966, 2020,
+ /*   550 */  1994, 1981, 1992, 2032, 1999, 1986, 1997, 2037, 2006, 1991,
+ /*   560 */  2007, 2042, 2045, 2047, 2049, 2060, 2063, 1858, 1957, 2018,
+ /*   570 */  2043, 2066, 2033, 2034, 2035, 2038, 2039, 2040, 2041, 2036,
+ /*   580 */  2044, 2046, 2051, 2055, 2054, 2078, 2057, 2082, 2074, 2048,
+ /*   590 */  2098, 2079, 2067, 2103, 2069, 2105, 2071, 2107, 2086, 2089,
+ /*   600 */  2075, 2076, 2080, 2012, 2010, 2118, 1949, 2016, 1969, 2094,
+ /*   610 */  2109, 2133, 1952, 2112, 1971, 1974, 2135, 2136, 1975, 1979,
+ /*   620 */  2134, 2095, 1875, 2058, 2059, 2061, 2092, 2064, 2096, 2068,
+ /*   630 */  2065, 2106, 2124, 2072, 2070, 2077, 2081, 2073, 2126, 2115,
+ /*   640 */  2128, 2083, 2127, 1984, 2088, 2090, 2139, 2137, 1985, 2143,
+ /*   650 */  2147, 2148, 2150, 2153, 2155, 2091, 2093, 2140, 1983, 2154,
+ /*   660 */  2149, 2207, 2210, 2211, 2220, 2097, 2162, 1961, 2156, 2099,
+ /*   670 */  2100, 2117, 2102, 2119, 2062, 2120, 2224, 2187, 2056, 2141,
+ /*   680 */  2130, 1961, 2183, 2201, 2151, 2011, 2158, 2247, 2228, 2029,
+ /*   690 */  2159, 2157, 2160, 2161, 2164, 2165, 2206, 2167, 2168, 2217,
+ /*   700 */  2170, 2232, 2085, 2169, 2171, 2174, 2222, 2233, 2172, 2184,
+ /*   710 */  2254, 2188, 2186, 2258, 2193, 2203, 2262, 2208, 2212, 2269,
+ /*   720 */  2214, 2218, 2275, 2215, 2198, 2199, 2209, 2213, 2223, 2284,
+ /*   730 */  2234, 2300, 2236, 2284, 2284, 2319, 2273, 2276, 2317, 2321,
+ /*   740 */  2322, 2323, 2324, 2325, 2327, 2330, 2279, 2280, 2331, 2341,
+ /*   750 */  2343, 2344, 2358, 2346, 2347, 2349, 2291, 2036, 2350, 2044,
+ /*   760 */  2351, 2352, 2353, 2354, 2368, 2356, 2392, 2359, 2355, 2357,
+ /*   770 */  2398, 2364, 2360, 2361, 2402, 2370, 2362, 2367, 2407, 2373,
+ /*   780 */  2363, 2371, 2414, 2381, 2382, 2418, 2397, 2399, 2400, 2401,
+ /*   790 */  2404, 2406,
 };
 #define YY_REDUCE_COUNT (319)
 #define YY_REDUCE_MIN   (-454)
@@ -895,115 +895,115 @@ static const short yy_reduce_ofst[] = {
  /*    20 */   499, 1240, 1302,  837, 1319, 1338, 1424, 1441, 1460, 1558,
  /*    30 */  1591, 1624, 1660, 1693, 1722, 1782, 1801, 1849, 1868, 1916,
  /*    40 */  1937, 2005, 2023, 2053, 2084, 2101, 2152, 2173, 2200, 2261,
- /*    50 */  2278,  301, 1227, -402, -167, -360,  252,  709,  803,  465,
- /*    60 */   674, -348,  886,  259,  819, -454, -374, -322,   -8, -227,
+ /*    50 */  2278,  301, 1227, -402, -167, -360,  252,  483,  505,  465,
+ /*    60 */   674, -348,  803,  259,  886, -454, -374, -322,  205, -227,
  /*    70 */   -72, -249, -289,   61, -362,  332, -284, -238, -204,  -41,
- /*    80 */   130,  169,  265,  272,  338, -214,  379,  394,   97,   -5,
- /*    90 */   495,  622,   29,  672,  450,  767, -182,  809, -144,  119,
- /*   100 */   944, 1035,  481, 1043,  344,  563,  392, 1048,   78, -308,
- /*   110 */  -442, -442, -358, -333, -321, -215,  204,  307,  498,  574,
- /*   120 */   584,  587,  588,  609,  642,  654,  703,  747,  779,  781,
- /*   130 */   782,  817,  840, -301,  -70,   -4,  346,  701,  705,  662,
- /*   140 */   -70,  296,  335,   84,  197,  419,  722,  136,  164,  806,
- /*   150 */   850, -293,  774, -312,  854,  576,  861,  862,  879,  889,
- /*   160 */  -364,  497,  502,  516,  650,  746,  761,  650,  528,  851,
- /*   170 */   948,  900,  884,  910, 1034,  949, 1075, 1087, 1061, 1061,
- /*   180 */  1113, 1082, 1136, 1141, 1103, 1096, 1040, 1040, 1033, 1040,
- /*   190 */  1065, 1058, 1061, 1094, 1101, 1112, 1114, 1174, 1116, 1177,
- /*   200 */  1134, 1151, 1150, 1154, 1160, 1211, 1212, 1166, 1176, 1178,
- /*   210 */  1213, 1217, 1232, 1222, 1234, 1235, 1236, 1245, 1243, 1249,
- /*   220 */  1247, 1179, 1237, 1204, 1241, 1250, 1193, 1251, 1256, 1252,
- /*   230 */  1253, 1255, 1259, 1257, 1260, 1246, 1248, 1261, 1262, 1265,
- /*   240 */  1272, 1275, 1276, 1278, 1279, 1282, 1270, 1280, 1224, 1231,
- /*   250 */  1238, 1205, 1215, 1216, 1281, 1219, 1239, 1269, 1306, 1264,
- /*   260 */  1317, 1268, 1284, 1291, 1225, 1288, 1299, 1226, 1290, 1308,
- /*   270 */  1310, 1061, 1228, 1271, 1254, 1263, 1285, 1283, 1287, 1233,
- /*   280 */  1242, 1267, 1040, 1365, 1293, 1374, 1373, 1369, 1375, 1339,
- /*   290 */  1336, 1357, 1367, 1368, 1371, 1376, 1354, 1377, 1358, 1407,
- /*   300 */  1402, 1422, 1427, 1333, 1401, 1394, 1419, 1436, 1432, 1447,
- /*   310 */  1450, 1381, 1378, 1388, 1390, 1423, 1431, 1433, 1442, 1451,
+ /*    80 */   130,  169,  265,  272,  338, -214,  393,  475,   97,  201,
+ /*    90 */   591,  622,  493,  672,  385,  767, -182,  809,   58,  344,
+ /*   100 */   833,  845,  480,  848,  378,  856,  604,  906,  409, -308,
+ /*   110 */  -442, -442, -358, -333, -321, -215,  111,  307,  500,  534,
+ /*   120 */   548,  587,  588,  609,  654,  747,  817,  840,  868,  902,
+ /*   130 */   914,  951,  965, -301,   80,   87,  376,  473,  705,  722,
+ /*   140 */    80,  197,  380,  122,  421,  678,  925,  164,  339,  633,
+ /*   150 */   153, -293,  -88, -312,  -28,  226,  382,  735,  354,  828,
+ /*   160 */  -364,  407,  415,  502,  516,  590,  702,  516,  545,  751,
+ /*   170 */   825,  774,  757,  727,  968,  782,  969, 1052, 1047, 1047,
+ /*   180 */  1079, 1053, 1087, 1102, 1077, 1067, 1028, 1028, 1022, 1028,
+ /*   190 */  1059, 1051, 1047, 1086, 1099, 1108, 1105, 1174, 1116, 1177,
+ /*   200 */  1127, 1150, 1149, 1153, 1157, 1211, 1212, 1166, 1179, 1182,
+ /*   210 */  1216, 1218, 1232, 1223, 1235, 1236, 1237, 1246, 1245, 1252,
+ /*   220 */  1247, 1178, 1239, 1206, 1241, 1250, 1193, 1249, 1258, 1253,
+ /*   230 */  1255, 1256, 1259, 1263, 1273, 1244, 1248, 1262, 1265, 1272,
+ /*   240 */  1276, 1277, 1278, 1279, 1283, 1284, 1270, 1285, 1220, 1234,
+ /*   250 */  1238, 1207, 1215, 1213, 1280, 1222, 1260, 1274, 1304, 1267,
+ /*   260 */  1316, 1281, 1287, 1289, 1219, 1286, 1300, 1228, 1290, 1306,
+ /*   270 */  1308, 1047, 1242, 1271, 1243, 1291, 1294, 1269, 1288, 1231,
+ /*   280 */  1298, 1301, 1028, 1372, 1295, 1371, 1374, 1367, 1384, 1339,
+ /*   290 */  1336, 1355, 1357, 1358, 1369, 1373, 1353, 1376, 1359, 1411,
+ /*   300 */  1403, 1429, 1430, 1332, 1401, 1394, 1419, 1439, 1433, 1447,
+ /*   310 */  1451, 1380, 1375, 1390, 1391, 1432, 1435, 1436, 1446, 1457,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    10 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    20 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    30 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    40 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    50 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    60 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*    70 */  1764, 1764, 1764, 1764, 2045, 1764, 1764, 1764, 1764, 1764,
- /*    80 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1853, 1764,
- /*    90 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   100 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1851, 2038,
- /*   110 */  2263, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   120 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   130 */  1764, 1764, 1764, 1764, 2275, 1764, 1764, 1827, 1827, 1764,
- /*   140 */  2275, 2275, 2275, 1851, 2235, 2235, 1764, 1764, 1764, 1764,
- /*   150 */  1853, 2105, 1764, 1764, 1764, 1764, 1764, 1764, 1973, 1764,
- /*   160 */  1764, 1764, 1764, 1764, 1997, 1764, 1764, 1764, 2097, 1764,
- /*   170 */  1764, 2300, 2356, 1764, 1764, 2303, 1764, 1764, 1764, 1764,
- /*   180 */  1764, 2050, 1764, 1764, 1926, 2290, 2267, 2281, 2340, 2268,
- /*   190 */  2265, 2284, 1764, 2294, 1764, 1764, 2119, 1853, 1764, 1853,
- /*   200 */  2084, 2043, 1764, 2043, 2040, 1764, 1764, 2043, 2040, 2040,
- /*   210 */  1915, 1911, 1764, 1909, 1764, 1764, 1764, 1764, 1811, 1764,
- /*   220 */  1811, 1764, 1853, 1764, 1853, 1764, 1764, 1853, 1764, 1853,
- /*   230 */  1853, 1853, 1764, 1853, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   240 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   250 */  1764, 2117, 2103, 1764, 1851, 2095, 2093, 1764, 1851, 2091,
- /*   260 */  1764, 1764, 1764, 1764, 2311, 2309, 1764, 2311, 2309, 1764,
- /*   270 */  1764, 1764, 2325, 2321, 2311, 2329, 2327, 2296, 2294, 2359,
- /*   280 */  2346, 2342, 2281, 1764, 1764, 1764, 1764, 1851, 1851, 1764,
- /*   290 */  2309, 1764, 1764, 1764, 1764, 1764, 2309, 1764, 1764, 1851,
- /*   300 */  1764, 1851, 1764, 1764, 1942, 1764, 1764, 1764, 1851, 1796,
- /*   310 */  1764, 2086, 2108, 2068, 2068, 1976, 1976, 1976, 1854, 1769,
- /*   320 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   330 */  1764, 1764, 2324, 2323, 2190, 1764, 2239, 2238, 2237, 2228,
- /*   340 */  2189, 1938, 1764, 2188, 2187, 1764, 1764, 1764, 1764, 1764,
- /*   350 */  1764, 1764, 1764, 1764, 2059, 2058, 2181, 1764, 1764, 2182,
- /*   360 */  2180, 2179, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   370 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   380 */  1764, 1764, 1764, 1764, 1764, 1764, 2343, 2347, 1764, 1764,
- /*   390 */  1764, 1764, 1764, 1764, 1764, 2264, 1764, 1764, 1764, 2163,
- /*   400 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   410 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   420 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   430 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   440 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   450 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   460 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   470 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   480 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   490 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   500 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   510 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   520 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1801, 2168, 1764,
- /*   530 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   540 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   550 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   560 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   570 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1892,
- /*   580 */  1891, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   590 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   600 */  1764, 1764, 1764, 2172, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   610 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   620 */  2339, 2297, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   630 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   640 */  2163, 1764, 2322, 1764, 1764, 2337, 1764, 2341, 1764, 1764,
- /*   650 */  1764, 1764, 1764, 1764, 1764, 2274, 2270, 1764, 1764, 2266,
- /*   660 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 2171, 1764, 1764,
- /*   670 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   680 */  1764, 2162, 1764, 2225, 1764, 1764, 1764, 2259, 1764, 1764,
- /*   690 */  2210, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   700 */  2172, 1764, 2175, 1764, 1764, 1764, 1764, 1764, 1970, 1764,
- /*   710 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   720 */  1764, 1764, 1764, 1764, 1954, 1952, 1951, 1950, 1764, 1983,
- /*   730 */  1764, 1764, 1764, 1979, 1978, 1764, 1764, 1764, 1764, 1764,
- /*   740 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1872, 1764,
- /*   750 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1864, 1764, 1863,
- /*   760 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   770 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   780 */  1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764, 1764,
- /*   790 */  1764, 1764,
+ /*     0 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    10 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    20 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    30 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    40 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    50 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    60 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*    70 */  1766, 1766, 1766, 1766, 2047, 1766, 1766, 1766, 1766, 1766,
+ /*    80 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1855, 1766,
+ /*    90 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   100 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1853, 2040,
+ /*   110 */  2265, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   120 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   130 */  1766, 1766, 1766, 1766, 2277, 1766, 1766, 1829, 1829, 1766,
+ /*   140 */  2277, 2277, 2277, 1853, 2237, 2237, 1766, 1766, 1766, 1766,
+ /*   150 */  1855, 2107, 1766, 1766, 1766, 1766, 1766, 1766, 1975, 1766,
+ /*   160 */  1766, 1766, 1766, 1766, 1999, 1766, 1766, 1766, 2099, 1766,
+ /*   170 */  1766, 2302, 2359, 1766, 1766, 2305, 1766, 1766, 1766, 1766,
+ /*   180 */  1766, 2052, 1766, 1766, 1928, 2292, 2269, 2283, 2343, 2270,
+ /*   190 */  2267, 2286, 1766, 2296, 1766, 1766, 2121, 1855, 1766, 1855,
+ /*   200 */  2086, 2045, 1766, 2045, 2042, 1766, 1766, 2045, 2042, 2042,
+ /*   210 */  1917, 1913, 1766, 1911, 1766, 1766, 1766, 1766, 1813, 1766,
+ /*   220 */  1813, 1766, 1855, 1766, 1855, 1766, 1766, 1855, 1766, 1855,
+ /*   230 */  1855, 1855, 1766, 1855, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   240 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   250 */  1766, 2119, 2105, 1766, 1853, 2097, 2095, 1766, 1853, 2093,
+ /*   260 */  1766, 1766, 1766, 1766, 2313, 2311, 1766, 2313, 2311, 1766,
+ /*   270 */  1766, 1766, 2327, 2323, 2313, 2332, 2329, 2298, 2296, 2362,
+ /*   280 */  2349, 2345, 2283, 1766, 1766, 1766, 1766, 1853, 1853, 1766,
+ /*   290 */  2311, 1766, 1766, 1766, 1766, 1766, 2311, 1766, 1766, 1853,
+ /*   300 */  1766, 1853, 1766, 1766, 1944, 1766, 1766, 1766, 1853, 1798,
+ /*   310 */  1766, 2088, 2110, 2070, 2070, 1978, 1978, 1978, 1856, 1771,
+ /*   320 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   330 */  1766, 1766, 2326, 2325, 2192, 1766, 2241, 2240, 2239, 2230,
+ /*   340 */  2191, 1940, 1766, 2190, 2189, 1766, 1766, 1766, 1766, 1766,
+ /*   350 */  1766, 1766, 1766, 1766, 2061, 2060, 2183, 1766, 1766, 2184,
+ /*   360 */  2182, 2181, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   370 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   380 */  1766, 1766, 1766, 1766, 1766, 1766, 2346, 2350, 1766, 1766,
+ /*   390 */  1766, 1766, 1766, 1766, 1766, 2266, 1766, 1766, 1766, 2165,
+ /*   400 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   410 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   420 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   430 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   440 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   450 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   460 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   470 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   480 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   490 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   500 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   510 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   520 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1803, 2170, 1766,
+ /*   530 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   540 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   550 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   560 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   570 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1894,
+ /*   580 */  1893, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   590 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   600 */  1766, 1766, 1766, 2174, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   610 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   620 */  2342, 2299, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   630 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   640 */  2165, 1766, 2324, 1766, 1766, 2340, 1766, 2344, 1766, 1766,
+ /*   650 */  1766, 1766, 1766, 1766, 1766, 2276, 2272, 1766, 1766, 2268,
+ /*   660 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 2173, 1766, 1766,
+ /*   670 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   680 */  1766, 2164, 1766, 2227, 1766, 1766, 1766, 2261, 1766, 1766,
+ /*   690 */  2212, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   700 */  2174, 1766, 2177, 1766, 1766, 1766, 1766, 1766, 1972, 1766,
+ /*   710 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   720 */  1766, 1766, 1766, 1766, 1956, 1954, 1953, 1952, 1766, 1985,
+ /*   730 */  1766, 1766, 1766, 1981, 1980, 1766, 1766, 1766, 1766, 1766,
+ /*   740 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1874, 1766,
+ /*   750 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1866, 1766, 1865,
+ /*   760 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   770 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   780 */  1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766, 1766,
+ /*   790 */  1766, 1766,
 };
 /********** End of lemon-generated parsing tables *****************************/
 
@@ -2501,39 +2501,40 @@ static const char *const yyRuleName[] = {
  /* 559 */ "having_clause_opt ::= HAVING search_condition",
  /* 560 */ "range_opt ::=",
  /* 561 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP",
- /* 562 */ "every_opt ::=",
- /* 563 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP",
- /* 564 */ "query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 565 */ "query_simple ::= query_specification",
- /* 566 */ "query_simple ::= union_query_expression",
- /* 567 */ "union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery",
- /* 568 */ "union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery",
- /* 569 */ "query_simple_or_subquery ::= query_simple",
- /* 570 */ "query_simple_or_subquery ::= subquery",
- /* 571 */ "query_or_subquery ::= query_expression",
- /* 572 */ "query_or_subquery ::= subquery",
- /* 573 */ "order_by_clause_opt ::=",
- /* 574 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 575 */ "slimit_clause_opt ::=",
- /* 576 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 577 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 578 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 579 */ "limit_clause_opt ::=",
- /* 580 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 581 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 582 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 583 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 584 */ "subquery ::= NK_LP subquery NK_RP",
- /* 585 */ "search_condition ::= common_expression",
- /* 586 */ "sort_specification_list ::= sort_specification",
- /* 587 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 588 */ "sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt",
- /* 589 */ "ordering_specification_opt ::=",
- /* 590 */ "ordering_specification_opt ::= ASC",
- /* 591 */ "ordering_specification_opt ::= DESC",
- /* 592 */ "null_ordering_opt ::=",
- /* 593 */ "null_ordering_opt ::= NULLS FIRST",
- /* 594 */ "null_ordering_opt ::= NULLS LAST",
+ /* 562 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_RP",
+ /* 563 */ "every_opt ::=",
+ /* 564 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP",
+ /* 565 */ "query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 566 */ "query_simple ::= query_specification",
+ /* 567 */ "query_simple ::= union_query_expression",
+ /* 568 */ "union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery",
+ /* 569 */ "union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery",
+ /* 570 */ "query_simple_or_subquery ::= query_simple",
+ /* 571 */ "query_simple_or_subquery ::= subquery",
+ /* 572 */ "query_or_subquery ::= query_expression",
+ /* 573 */ "query_or_subquery ::= subquery",
+ /* 574 */ "order_by_clause_opt ::=",
+ /* 575 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 576 */ "slimit_clause_opt ::=",
+ /* 577 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 578 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 579 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 580 */ "limit_clause_opt ::=",
+ /* 581 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 582 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 583 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 584 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 585 */ "subquery ::= NK_LP subquery NK_RP",
+ /* 586 */ "search_condition ::= common_expression",
+ /* 587 */ "sort_specification_list ::= sort_specification",
+ /* 588 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 589 */ "sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt",
+ /* 590 */ "ordering_specification_opt ::=",
+ /* 591 */ "ordering_specification_opt ::= ASC",
+ /* 592 */ "ordering_specification_opt ::= DESC",
+ /* 593 */ "null_ordering_opt ::=",
+ /* 594 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 595 */ "null_ordering_opt ::= NULLS LAST",
 };
 #endif /* NDEBUG */
 
@@ -3716,39 +3717,40 @@ static const YYCODETYPE yyRuleInfoLhs[] = {
    468,  /* (559) having_clause_opt ::= HAVING search_condition */
    463,  /* (560) range_opt ::= */
    463,  /* (561) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
-   464,  /* (562) every_opt ::= */
-   464,  /* (563) every_opt ::= EVERY NK_LP duration_literal NK_RP */
-   474,  /* (564) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
-   475,  /* (565) query_simple ::= query_specification */
-   475,  /* (566) query_simple ::= union_query_expression */
-   479,  /* (567) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
-   479,  /* (568) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
-   480,  /* (569) query_simple_or_subquery ::= query_simple */
-   480,  /* (570) query_simple_or_subquery ::= subquery */
-   409,  /* (571) query_or_subquery ::= query_expression */
-   409,  /* (572) query_or_subquery ::= subquery */
-   476,  /* (573) order_by_clause_opt ::= */
-   476,  /* (574) order_by_clause_opt ::= ORDER BY sort_specification_list */
-   477,  /* (575) slimit_clause_opt ::= */
-   477,  /* (576) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-   477,  /* (577) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-   477,  /* (578) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-   478,  /* (579) limit_clause_opt ::= */
-   478,  /* (580) limit_clause_opt ::= LIMIT NK_INTEGER */
-   478,  /* (581) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-   478,  /* (582) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-   456,  /* (583) subquery ::= NK_LP query_expression NK_RP */
-   456,  /* (584) subquery ::= NK_LP subquery NK_RP */
-   352,  /* (585) search_condition ::= common_expression */
-   481,  /* (586) sort_specification_list ::= sort_specification */
-   481,  /* (587) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-   482,  /* (588) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
-   483,  /* (589) ordering_specification_opt ::= */
-   483,  /* (590) ordering_specification_opt ::= ASC */
-   483,  /* (591) ordering_specification_opt ::= DESC */
-   484,  /* (592) null_ordering_opt ::= */
-   484,  /* (593) null_ordering_opt ::= NULLS FIRST */
-   484,  /* (594) null_ordering_opt ::= NULLS LAST */
+   463,  /* (562) range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
+   464,  /* (563) every_opt ::= */
+   464,  /* (564) every_opt ::= EVERY NK_LP duration_literal NK_RP */
+   474,  /* (565) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
+   475,  /* (566) query_simple ::= query_specification */
+   475,  /* (567) query_simple ::= union_query_expression */
+   479,  /* (568) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
+   479,  /* (569) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
+   480,  /* (570) query_simple_or_subquery ::= query_simple */
+   480,  /* (571) query_simple_or_subquery ::= subquery */
+   409,  /* (572) query_or_subquery ::= query_expression */
+   409,  /* (573) query_or_subquery ::= subquery */
+   476,  /* (574) order_by_clause_opt ::= */
+   476,  /* (575) order_by_clause_opt ::= ORDER BY sort_specification_list */
+   477,  /* (576) slimit_clause_opt ::= */
+   477,  /* (577) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+   477,  /* (578) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+   477,  /* (579) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+   478,  /* (580) limit_clause_opt ::= */
+   478,  /* (581) limit_clause_opt ::= LIMIT NK_INTEGER */
+   478,  /* (582) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+   478,  /* (583) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+   456,  /* (584) subquery ::= NK_LP query_expression NK_RP */
+   456,  /* (585) subquery ::= NK_LP subquery NK_RP */
+   352,  /* (586) search_condition ::= common_expression */
+   481,  /* (587) sort_specification_list ::= sort_specification */
+   481,  /* (588) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+   482,  /* (589) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
+   483,  /* (590) ordering_specification_opt ::= */
+   483,  /* (591) ordering_specification_opt ::= ASC */
+   483,  /* (592) ordering_specification_opt ::= DESC */
+   484,  /* (593) null_ordering_opt ::= */
+   484,  /* (594) null_ordering_opt ::= NULLS FIRST */
+   484,  /* (595) null_ordering_opt ::= NULLS LAST */
 };
 
 /* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
@@ -4316,39 +4318,40 @@ static const signed char yyRuleInfoNRhs[] = {
    -2,  /* (559) having_clause_opt ::= HAVING search_condition */
     0,  /* (560) range_opt ::= */
    -6,  /* (561) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
-    0,  /* (562) every_opt ::= */
-   -4,  /* (563) every_opt ::= EVERY NK_LP duration_literal NK_RP */
-   -4,  /* (564) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
-   -1,  /* (565) query_simple ::= query_specification */
-   -1,  /* (566) query_simple ::= union_query_expression */
-   -4,  /* (567) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
-   -3,  /* (568) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
-   -1,  /* (569) query_simple_or_subquery ::= query_simple */
-   -1,  /* (570) query_simple_or_subquery ::= subquery */
-   -1,  /* (571) query_or_subquery ::= query_expression */
-   -1,  /* (572) query_or_subquery ::= subquery */
-    0,  /* (573) order_by_clause_opt ::= */
-   -3,  /* (574) order_by_clause_opt ::= ORDER BY sort_specification_list */
-    0,  /* (575) slimit_clause_opt ::= */
-   -2,  /* (576) slimit_clause_opt ::= SLIMIT NK_INTEGER */
-   -4,  /* (577) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-   -4,  /* (578) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-    0,  /* (579) limit_clause_opt ::= */
-   -2,  /* (580) limit_clause_opt ::= LIMIT NK_INTEGER */
-   -4,  /* (581) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
-   -4,  /* (582) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-   -3,  /* (583) subquery ::= NK_LP query_expression NK_RP */
-   -3,  /* (584) subquery ::= NK_LP subquery NK_RP */
-   -1,  /* (585) search_condition ::= common_expression */
-   -1,  /* (586) sort_specification_list ::= sort_specification */
-   -3,  /* (587) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
-   -3,  /* (588) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
-    0,  /* (589) ordering_specification_opt ::= */
-   -1,  /* (590) ordering_specification_opt ::= ASC */
-   -1,  /* (591) ordering_specification_opt ::= DESC */
-    0,  /* (592) null_ordering_opt ::= */
-   -2,  /* (593) null_ordering_opt ::= NULLS FIRST */
-   -2,  /* (594) null_ordering_opt ::= NULLS LAST */
+   -4,  /* (562) range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
+    0,  /* (563) every_opt ::= */
+   -4,  /* (564) every_opt ::= EVERY NK_LP duration_literal NK_RP */
+   -4,  /* (565) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
+   -1,  /* (566) query_simple ::= query_specification */
+   -1,  /* (567) query_simple ::= union_query_expression */
+   -4,  /* (568) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
+   -3,  /* (569) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
+   -1,  /* (570) query_simple_or_subquery ::= query_simple */
+   -1,  /* (571) query_simple_or_subquery ::= subquery */
+   -1,  /* (572) query_or_subquery ::= query_expression */
+   -1,  /* (573) query_or_subquery ::= subquery */
+    0,  /* (574) order_by_clause_opt ::= */
+   -3,  /* (575) order_by_clause_opt ::= ORDER BY sort_specification_list */
+    0,  /* (576) slimit_clause_opt ::= */
+   -2,  /* (577) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+   -4,  /* (578) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+   -4,  /* (579) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+    0,  /* (580) limit_clause_opt ::= */
+   -2,  /* (581) limit_clause_opt ::= LIMIT NK_INTEGER */
+   -4,  /* (582) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+   -4,  /* (583) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+   -3,  /* (584) subquery ::= NK_LP query_expression NK_RP */
+   -3,  /* (585) subquery ::= NK_LP subquery NK_RP */
+   -1,  /* (586) search_condition ::= common_expression */
+   -1,  /* (587) sort_specification_list ::= sort_specification */
+   -3,  /* (588) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+   -3,  /* (589) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
+    0,  /* (590) ordering_specification_opt ::= */
+   -1,  /* (591) ordering_specification_opt ::= ASC */
+   -1,  /* (592) ordering_specification_opt ::= DESC */
+    0,  /* (593) null_ordering_opt ::= */
+   -2,  /* (594) null_ordering_opt ::= NULLS FIRST */
+   -2,  /* (595) null_ordering_opt ::= NULLS LAST */
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -4564,9 +4567,9 @@ static YYACTIONTYPE yy_reduce(
       case 544: /* fill_opt ::= */ yytestcase(yyruleno==544);
       case 558: /* having_clause_opt ::= */ yytestcase(yyruleno==558);
       case 560: /* range_opt ::= */ yytestcase(yyruleno==560);
-      case 562: /* every_opt ::= */ yytestcase(yyruleno==562);
-      case 575: /* slimit_clause_opt ::= */ yytestcase(yyruleno==575);
-      case 579: /* limit_clause_opt ::= */ yytestcase(yyruleno==579);
+      case 563: /* every_opt ::= */ yytestcase(yyruleno==563);
+      case 576: /* slimit_clause_opt ::= */ yytestcase(yyruleno==576);
+      case 580: /* limit_clause_opt ::= */ yytestcase(yyruleno==580);
 { yymsp[1].minor.yy242 = NULL; }
         break;
       case 45: /* with_opt ::= WITH search_condition */
@@ -4941,7 +4944,7 @@ static YYACTIONTYPE yy_reduce(
       case 465: /* when_then_list ::= when_then_expr */ yytestcase(yyruleno==465);
       case 520: /* select_list ::= select_item */ yytestcase(yyruleno==520);
       case 531: /* partition_list ::= partition_item */ yytestcase(yyruleno==531);
-      case 586: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==586);
+      case 587: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==587);
 { yylhsminor.yy174 = createNodeList(pCxt, yymsp[0].minor.yy242); }
   yymsp[0].minor.yy174 = yylhsminor.yy174;
         break;
@@ -4956,7 +4959,7 @@ static YYACTIONTYPE yy_reduce(
       case 460: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==460);
       case 521: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==521);
       case 532: /* partition_list ::= partition_list NK_COMMA partition_item */ yytestcase(yyruleno==532);
-      case 587: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==587);
+      case 588: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==588);
 { yylhsminor.yy174 = addNodeToList(pCxt, yymsp[-2].minor.yy174, yymsp[0].minor.yy242); }
   yymsp[-2].minor.yy174 = yylhsminor.yy174;
         break;
@@ -5065,7 +5068,7 @@ static YYACTIONTYPE yy_reduce(
       case 338: /* tag_def_or_ref_opt ::= */ yytestcase(yyruleno==338);
       case 529: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==529);
       case 554: /* group_by_clause_opt ::= */ yytestcase(yyruleno==554);
-      case 573: /* order_by_clause_opt ::= */ yytestcase(yyruleno==573);
+      case 574: /* order_by_clause_opt ::= */ yytestcase(yyruleno==574);
 { yymsp[1].minor.yy174 = NULL; }
         break;
       case 176: /* specific_cols_opt ::= NK_LP col_name_list NK_RP */
@@ -5526,7 +5529,7 @@ static YYACTIONTYPE yy_reduce(
         break;
       case 351: /* subtable_opt ::= SUBTABLE NK_LP expression NK_RP */
       case 543: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ yytestcase(yyruleno==543);
-      case 563: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==563);
+      case 564: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==564);
 { yymsp[-3].minor.yy242 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy242); }
         break;
       case 354: /* cmd ::= KILL CONNECTION NK_INTEGER */
@@ -5602,10 +5605,10 @@ static YYACTIONTYPE yy_reduce(
       case 502: /* table_reference ::= table_primary */ yytestcase(yyruleno==502);
       case 503: /* table_reference ::= joined_table */ yytestcase(yyruleno==503);
       case 507: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==507);
-      case 565: /* query_simple ::= query_specification */ yytestcase(yyruleno==565);
-      case 566: /* query_simple ::= union_query_expression */ yytestcase(yyruleno==566);
-      case 569: /* query_simple_or_subquery ::= query_simple */ yytestcase(yyruleno==569);
-      case 571: /* query_or_subquery ::= query_expression */ yytestcase(yyruleno==571);
+      case 566: /* query_simple ::= query_specification */ yytestcase(yyruleno==566);
+      case 567: /* query_simple ::= union_query_expression */ yytestcase(yyruleno==567);
+      case 570: /* query_simple_or_subquery ::= query_simple */ yytestcase(yyruleno==570);
+      case 572: /* query_or_subquery ::= query_expression */ yytestcase(yyruleno==572);
 { yylhsminor.yy242 = yymsp[0].minor.yy242; }
   yymsp[0].minor.yy242 = yylhsminor.yy242;
         break;
@@ -5667,9 +5670,9 @@ static YYACTIONTYPE yy_reduce(
       case 461: /* star_func_para ::= expr_or_subquery */ yytestcase(yyruleno==461);
       case 523: /* select_item ::= common_expression */ yytestcase(yyruleno==523);
       case 533: /* partition_item ::= expr_or_subquery */ yytestcase(yyruleno==533);
-      case 570: /* query_simple_or_subquery ::= subquery */ yytestcase(yyruleno==570);
-      case 572: /* query_or_subquery ::= subquery */ yytestcase(yyruleno==572);
-      case 585: /* search_condition ::= common_expression */ yytestcase(yyruleno==585);
+      case 571: /* query_simple_or_subquery ::= subquery */ yytestcase(yyruleno==571);
+      case 573: /* query_or_subquery ::= subquery */ yytestcase(yyruleno==573);
+      case 586: /* search_condition ::= common_expression */ yytestcase(yyruleno==586);
 { yylhsminor.yy242 = releaseRawExprNode(pCxt, yymsp[0].minor.yy242); }
   yymsp[0].minor.yy242 = yylhsminor.yy242;
         break;
@@ -5683,7 +5686,7 @@ static YYACTIONTYPE yy_reduce(
         break;
       case 411: /* expression ::= NK_LP expression NK_RP */
       case 495: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==495);
-      case 584: /* subquery ::= NK_LP subquery NK_RP */ yytestcase(yyruleno==584);
+      case 585: /* subquery ::= NK_LP subquery NK_RP */ yytestcase(yyruleno==585);
 { yylhsminor.yy242 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy242)); }
   yymsp[-2].minor.yy242 = yylhsminor.yy242;
         break;
@@ -6000,7 +6003,7 @@ static YYACTIONTYPE yy_reduce(
         break;
       case 530: /* partition_by_clause_opt ::= PARTITION BY partition_list */
       case 555: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==555);
-      case 574: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==574);
+      case 575: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==575);
 { yymsp[-2].minor.yy174 = yymsp[0].minor.yy174; }
         break;
       case 537: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
@@ -6056,7 +6059,10 @@ static YYACTIONTYPE yy_reduce(
       case 561: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */
 { yymsp[-5].minor.yy242 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy242), releaseRawExprNode(pCxt, yymsp[-1].minor.yy242)); }
         break;
-      case 564: /* query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
+      case 562: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_RP */
+{ yymsp[-3].minor.yy242 = createInterpTimePoint(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy242)); }
+        break;
+      case 565: /* query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */
 {
                                                                                     yylhsminor.yy242 = addOrderByClause(pCxt, yymsp[-3].minor.yy242, yymsp[-2].minor.yy174);
                                                                                     yylhsminor.yy242 = addSlimitClause(pCxt, yylhsminor.yy242, yymsp[-1].minor.yy242);
@@ -6064,50 +6070,50 @@ static YYACTIONTYPE yy_reduce(
                                                                                   }
   yymsp[-3].minor.yy242 = yylhsminor.yy242;
         break;
-      case 567: /* union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
+      case 568: /* union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */
 { yylhsminor.yy242 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy242, yymsp[0].minor.yy242); }
   yymsp[-3].minor.yy242 = yylhsminor.yy242;
         break;
-      case 568: /* union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
+      case 569: /* union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */
 { yylhsminor.yy242 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy242, yymsp[0].minor.yy242); }
   yymsp[-2].minor.yy242 = yylhsminor.yy242;
         break;
-      case 576: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
-      case 580: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==580);
+      case 577: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+      case 581: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==581);
 { yymsp[-1].minor.yy242 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
         break;
-      case 577: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
-      case 581: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==581);
+      case 578: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+      case 582: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==582);
 { yymsp[-3].minor.yy242 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
         break;
-      case 578: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
-      case 582: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==582);
+      case 579: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+      case 583: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==583);
 { yymsp[-3].minor.yy242 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
         break;
-      case 583: /* subquery ::= NK_LP query_expression NK_RP */
+      case 584: /* subquery ::= NK_LP query_expression NK_RP */
 { yylhsminor.yy242 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy242); }
   yymsp[-2].minor.yy242 = yylhsminor.yy242;
         break;
-      case 588: /* sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
+      case 589: /* sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */
 { yylhsminor.yy242 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy242), yymsp[-1].minor.yy48, yymsp[0].minor.yy687); }
   yymsp[-2].minor.yy242 = yylhsminor.yy242;
         break;
-      case 589: /* ordering_specification_opt ::= */
+      case 590: /* ordering_specification_opt ::= */
 { yymsp[1].minor.yy48 = ORDER_ASC; }
         break;
-      case 590: /* ordering_specification_opt ::= ASC */
+      case 591: /* ordering_specification_opt ::= ASC */
 { yymsp[0].minor.yy48 = ORDER_ASC; }
         break;
-      case 591: /* ordering_specification_opt ::= DESC */
+      case 592: /* ordering_specification_opt ::= DESC */
 { yymsp[0].minor.yy48 = ORDER_DESC; }
         break;
-      case 592: /* null_ordering_opt ::= */
+      case 593: /* null_ordering_opt ::= */
 { yymsp[1].minor.yy687 = NULL_ORDER_DEFAULT; }
         break;
-      case 593: /* null_ordering_opt ::= NULLS FIRST */
+      case 594: /* null_ordering_opt ::= NULLS FIRST */
 { yymsp[-1].minor.yy687 = NULL_ORDER_FIRST; }
         break;
-      case 594: /* null_ordering_opt ::= NULLS LAST */
+      case 595: /* null_ordering_opt ::= NULLS LAST */
 { yymsp[-1].minor.yy687 = NULL_ORDER_LAST; }
         break;
       default:

From b83a4b14e7c73fcb0327eaf7412003445eefd686 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 29 May 2023 17:34:35 +0800
Subject: [PATCH 07/58] allow omit every clause for single point interp

---
 source/libs/parser/src/parTranslater.c | 33 ++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 39dab556f3..b2adbedd47 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3466,6 +3466,22 @@ static int32_t createDefaultFillNode(STranslateContext* pCxt, SNode** pOutput) {
   return TSDB_CODE_SUCCESS;
 }
 
+static int32_t createDefaultEveryNode(STranslateContext* pCxt, SNode** pOutput) {
+  SValueNode* pEvery = (SValueNode*)nodesMakeNode(QUERY_NODE_VALUE);
+  if (NULL == pEvery) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+
+  pEvery->node.resType.type = TSDB_DATA_TYPE_BIGINT;
+  pEvery->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes;
+  pEvery->isDuration = true;
+  pEvery->literal = taosStrdup("1s");
+
+
+  *pOutput = (SNode*)pEvery;
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t checkEvery(STranslateContext* pCxt, SValueNode* pInterval) {
   int32_t len = strlen(pInterval->literal);
 
@@ -3481,7 +3497,12 @@ static int32_t checkEvery(STranslateContext* pCxt, SValueNode* pInterval) {
 static int32_t translateInterpEvery(STranslateContext* pCxt, SNode** pEvery) {
   int32_t code = TSDB_CODE_SUCCESS;
 
-  code = checkEvery(pCxt, (SValueNode*)(*pEvery));
+  if (NULL == *pEvery) {
+    code = createDefaultEveryNode(pCxt, pEvery);
+  }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = checkEvery(pCxt, (SValueNode*)(*pEvery));
+  }
   if (TSDB_CODE_SUCCESS == code) {
     code = translateExpr(pCxt, pEvery);
   }
@@ -3527,8 +3548,12 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) {
   }
 
   if (NULL == pSelect->pRange || NULL == pSelect->pEvery || NULL == pSelect->pFill) {
-    return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE,
-                                   "Missing RANGE clause, EVERY clause or FILL clause");
+    if (QUERY_NODE_OPERATOR == nodeType(pSelect->pRange) && pSelect->pEvery == NULL) {
+      // single point interp every can be omitted
+    } else {
+      return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE,
+                                     "Missing RANGE clause, EVERY clause or FILL clause");
+    }
   }
 
   int32_t code = translateExpr(pCxt, &pSelect->pRange);
@@ -3744,7 +3769,7 @@ static int32_t translateSelectFrom(STranslateContext* pCxt, SSelectStmt* pSelect
   if (TSDB_CODE_SUCCESS == code) {
     code = replaceTbName(pCxt, pSelect);
   }
-  
+
   return code;
 }
 

From 9501d4f4177373d826ec967e967829789e36f05e Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Mon, 29 May 2023 19:44:11 +0800
Subject: [PATCH 08/58] feat: allow user to reset root passwd

---
 include/common/tglobal.h                 | 1 +
 source/common/src/tglobal.c              | 3 +++
 source/dnode/mnode/impl/src/mndProfile.c | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 157e37f080..6a7e36fcbb 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -83,6 +83,7 @@ extern int64_t tsVndCommitMaxIntervalMs;
 // mnode
 extern int64_t tsMndSdbWriteDelta;
 extern int64_t tsMndLogRetention;
+extern bool    tsMndSkipGrant;
 
 // monitor
 extern bool     tsEnableMonitor;
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index c648f8551a..a43643a924 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -72,6 +72,7 @@ int64_t tsVndCommitMaxIntervalMs = 600 * 1000;
 // mnode
 int64_t tsMndSdbWriteDelta = 200;
 int64_t tsMndLogRetention = 2000;
+bool    tsMndSkipGrant = false;
 
 // monitor
 bool     tsEnableMonitor = true;
@@ -489,6 +490,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
 
   if (cfgAddInt64(pCfg, "mndSdbWriteDelta", tsMndSdbWriteDelta, 20, 10000, 0) != 0) return -1;
   if (cfgAddInt64(pCfg, "mndLogRetention", tsMndLogRetention, 500, 10000, 0) != 0) return -1;
+  if (cfgAddBool(pCfg, "skipGrant", tsMndSkipGrant, 0) != 0) return -1;
 
   if (cfgAddBool(pCfg, "monitor", tsEnableMonitor, 0) != 0) return -1;
   if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 200000, 0) != 0) return -1;
@@ -887,6 +889,7 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
 
   tsMndSdbWriteDelta = cfgGetItem(pCfg, "mndSdbWriteDelta")->i64;
   tsMndLogRetention = cfgGetItem(pCfg, "mndLogRetention")->i64;
+  tsMndSkipGrant = cfgGetItem(pCfg, "skipGrant")->bval;
 
   tsStartUdfd = cfgGetItem(pCfg, "udf")->bval;
   tstrncpy(tsUdfdResFuncs, cfgGetItem(pCfg, "udfdResFuncs")->str, sizeof(tsUdfdResFuncs));
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index 01dd223b5f..a1d815189c 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -245,7 +245,7 @@ static int32_t mndProcessConnectReq(SRpcMsg *pReq) {
     goto _OVER;
   }
 
-  if (strncmp(connReq.passwd, pUser->pass, TSDB_PASSWORD_LEN - 1) != 0) {
+  if (strncmp(connReq.passwd, pUser->pass, TSDB_PASSWORD_LEN - 1) != 0 && !tsMndSkipGrant) {
     mGError("user:%s, failed to login from %s since invalid pass, input:%s", pReq->info.conn.user, ip, connReq.passwd);
     code = TSDB_CODE_MND_AUTH_FAILURE;
     goto _OVER;

From 1009c8096711b269f7d76bbe6fca11daf008c732 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 30 May 2023 14:21:32 +0800
Subject: [PATCH 09/58] fix bug

---
 source/libs/parser/src/parTranslater.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index b2adbedd47..fb269020de 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3548,7 +3548,7 @@ static int32_t translateInterp(STranslateContext* pCxt, SSelectStmt* pSelect) {
   }
 
   if (NULL == pSelect->pRange || NULL == pSelect->pEvery || NULL == pSelect->pFill) {
-    if (QUERY_NODE_OPERATOR == nodeType(pSelect->pRange) && pSelect->pEvery == NULL) {
+    if (pSelect->pRange != NULL && QUERY_NODE_OPERATOR == nodeType(pSelect->pRange) && pSelect->pEvery == NULL) {
       // single point interp every can be omitted
     } else {
       return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_INTERP_CLAUSE,

From 0dc8baede48f7669ef42ed8a051a5f6a0f0d25d7 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 30 May 2023 14:21:47 +0800
Subject: [PATCH 10/58] add test cases

---
 tests/system-test/2-query/interp.py | 1149 ++++++++++++++++++++++++++-
 1 file changed, 1148 insertions(+), 1 deletion(-)

diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index 121d4dcff6..061cc38b51 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -32,6 +32,12 @@ class TDTestCase:
         ctbname3_null = "ctb3_null"
         stbname_null = "stb_null"
 
+        tbname_single = "tb_single"
+        ctbname1_single = "ctb1_single"
+        ctbname2_single = "ctb2_single"
+        ctbname3_single = "ctb3_single"
+        stbname_single = "stb_single"
+
         tdSql.prepare()
 
         tdLog.printNoPrefix("==========step1:create table")
@@ -4020,7 +4026,7 @@ class TDTestCase:
         tdLog.printNoPrefix("======step 15: test interp pseudo columns")
         tdSql.error(f"select _irowts, c6 from {dbname}.{tbname}")
 
-        tdLog.printNoPrefix("======step 15: test interp in nested query")
+        tdLog.printNoPrefix("======step 16: test interp in nested query")
         tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{stbname}) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
         tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1}) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 
@@ -4038,6 +4044,1147 @@ class TDTestCase:
 
         tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select {ctbname1}.ts,{ctbname1}.c0 from {dbname}.{ctbname1}, {dbname}.{ctbname2} where {ctbname1}.ts = {ctbname2}.ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 
+        tdLog.printNoPrefix("======step 17: test interp single point")
+        tdSql.execute(
+            f'''create table if not exists {dbname}.{tbname_single}
+            (ts timestamp, c0 int)
+            '''
+        )
+
+        tdSql.execute(f"insert into {dbname}.{tbname_single} values ('2020-02-01 00:00:01', 1)")
+        tdSql.execute(f"insert into {dbname}.{tbname_single} values ('2020-02-01 00:00:03', 3)")
+        tdSql.execute(f"insert into {dbname}.{tbname_single} values ('2020-02-01 00:00:05', 5)")
+
+        tdSql.execute(
+            f'''create table if not exists {dbname}.{stbname_single}
+            (ts timestamp, c0 int, c1 float, c2 bool) tags (t0 int)
+            '''
+        )
+
+        tdSql.execute(
+            f'''create table if not exists {dbname}.{ctbname1_single} using {dbname}.{stbname_single} tags(1)
+            '''
+        )
+
+        tdSql.execute(
+            f'''create table if not exists {dbname}.{ctbname2_single} using {dbname}.{stbname_single} tags(2)
+            '''
+        )
+
+        tdSql.execute(
+            f'''create table if not exists {dbname}.{ctbname3_single} using {dbname}.{stbname_single} tags(3)
+            '''
+        )
+
+        tdSql.execute(f"insert into {dbname}.{ctbname1_single} values ('2020-02-01 00:00:01', 1, 1.0, true)")
+
+        tdSql.execute(f"insert into {dbname}.{ctbname2_single} values ('2020-02-01 00:00:03', 3, 3.0, false)")
+
+        tdSql.execute(f"insert into {dbname}.{ctbname3_single} values ('2020-02-01 00:00:05', 5, 5.0, true)")
+
+        # normal table
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(prev)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00') fill(prev)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(next)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06') fill(next)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:00') fill(linear)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:01') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 2)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:02') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 2)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:03') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 4)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:04') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 4)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:05') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{tbname_single} range('2020-02-01 00:00:06') fill(linear)")
+        tdSql.checkRows(0)
+
+        #super table
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06') fill(null)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06') fill(value, 0)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(prev)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00') fill(prev)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(next)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06') fill(next)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:00') fill(linear)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:01') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 2)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:02') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 2)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:03') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 4)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:04') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 4)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:05') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} range('2020-02-01 00:00:06') fill(linear)")
+        tdSql.checkRows(0)
+
+        # partition by tbname
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(null)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:00.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00') fill(null)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:00.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(null)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        for i in range(1, 3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:01.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01') fill(null)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        for i in range(1, 3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:01.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(null)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:02.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02') fill(null)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:02.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(null)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:06.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06') fill(null)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:06.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, None)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(value,0)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:00.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00') fill(value,0)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:00.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(value,0)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        for i in range(1, 3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:01.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01') fill(value,0)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        for i in range(1, 3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:01.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(value,0)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:02.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02') fill(value,0)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:02.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(value,0)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:06.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06') fill(value,0)")
+        tdSql.checkRows(3)
+        for i in range(3):
+          tdSql.checkData(i,  0, '2020-02-01 00:00:06.000')
+          tdSql.checkData(i,  1, True)
+          tdSql.checkData(i,  2, 0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(prev)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00') fill(prev)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02') fill(prev)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(prev)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(1,  1, False)
+        tdSql.checkData(1,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:03') fill(prev)")
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(1,  1, False)
+        tdSql.checkData(1,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(prev)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:04') fill(prev)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(prev)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(2,  1, False)
+        tdSql.checkData(2,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:05') fill(prev)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(2,  1, False)
+        tdSql.checkData(2,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(prev)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(2,  1, True)
+        tdSql.checkData(2,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06') fill(prev)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:06.000')
+        tdSql.checkData(2,  1, True)
+        tdSql.checkData(2,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(next)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06') fill(next)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:05') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:04') fill(next)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:04.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(next)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:03') fill(next)")
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(next)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02') fill(next)")
+        tdSql.checkRows(2)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 3)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:02.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(next)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(2,  1, True)
+        tdSql.checkData(2,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01') fill(next)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(2,  1, True)
+        tdSql.checkData(2,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00', '2020-02-01 00:00:00') every(1s) fill(next)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(2,  1, True)
+        tdSql.checkData(2,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00') fill(next)")
+        tdSql.checkRows(3)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(0,  1, True)
+        tdSql.checkData(0,  2, 1)
+        tdSql.checkData(1,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(1,  1, True)
+        tdSql.checkData(1,  2, 3)
+        tdSql.checkData(2,  0, '2020-02-01 00:00:00.000')
+        tdSql.checkData(2,  1, True)
+        tdSql.checkData(2,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:00') fill(linear)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01', '2020-02-01 00:00:01') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:01') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:01.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 1)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02', '2020-02-01 00:00:02') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:02') fill(linear)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:03', '2020-02-01 00:00:03') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:03') fill(linear)")
+        tdSql.checkData(0,  0, '2020-02-01 00:00:03.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 3)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:04', '2020-02-01 00:00:04') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:04') fill(linear)")
+        tdSql.checkRows(0)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:05', '2020-02-01 00:00:05') every(1s) fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:05') fill(linear)")
+        tdSql.checkRows(1)
+        tdSql.checkData(0,  0, '2020-02-01 00:00:05.000')
+        tdSql.checkData(0,  1, False)
+        tdSql.checkData(0,  2, 5)
+
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06', '2020-02-01 00:00:06') every(1s) fill(linear)")
+        tdSql.checkRows(0)
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from {dbname}.{stbname_single} partition by tbname range('2020-02-01 00:00:06') fill(linear)")
+        tdSql.checkRows(0)
+
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")

From 83e9be2e40abf0ae1fbfbb25c48afb915eb1b631 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 30 May 2023 14:39:31 +0800
Subject: [PATCH 11/58] change zh docs

---
 docs/zh/12-taos-sql/06-select.md   | 2 +-
 docs/zh/12-taos-sql/10-function.md | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/zh/12-taos-sql/06-select.md b/docs/zh/12-taos-sql/06-select.md
index 870df73471..5bc67755f0 100644
--- a/docs/zh/12-taos-sql/06-select.md
+++ b/docs/zh/12-taos-sql/06-select.md
@@ -55,7 +55,7 @@ window_clause: {
   | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [WATERMARK(watermark_val)] [FILL(fill_mod_and_val)]
 
 interp_clause:
-    RANGE(ts_val, ts_val) EVERY(every_val) FILL(fill_mod_and_val)
+    RANGE(ts_val [, ts_val]) EVERY(every_val) FILL(fill_mod_and_val)
 
 partition_by_clause:
     PARTITION BY expr [, expr] ...
diff --git a/docs/zh/12-taos-sql/10-function.md b/docs/zh/12-taos-sql/10-function.md
index b4785dc5e6..416d41614d 100644
--- a/docs/zh/12-taos-sql/10-function.md
+++ b/docs/zh/12-taos-sql/10-function.md
@@ -890,9 +890,10 @@ ignore_null_values: {
 - INTERP 用于在指定时间断面获取指定列的记录值，如果该时间断面不存在符合条件的行数据，那么会根据 FILL 参数的设定进行插值。
 - INTERP 的输入数据为指定列的数据，可以通过条件语句（where 子句）来对原始列数据进行过滤，如果没有指定过滤条件则输入为全部数据。
 - INTERP 需要同时与 RANGE，EVERY 和 FILL 关键字一起使用。
-- INTERP 的输出时间范围根据 RANGE(timestamp1,timestamp2)字段来指定，需满足 timestamp1 <= timestamp2。其中 timestamp1（必选值）为输出时间范围的起始值，即如果 timestamp1 时刻符合插值条件则 timestamp1 为输出的第一条记录，timestamp2（必选值）为输出时间范围的结束值，即输出的最后一条记录的 timestamp 不能大于 timestamp2。
+- INTERP 的输出时间范围根据 RANGE(timestamp1, timestamp2)字段来指定，需满足 timestamp1 <= timestamp2。其中 timestamp1 为输出时间范围的起始值，即如果 timestamp1 时刻符合插值条件则 timestamp1 为输出的第一条记录，timestamp2 为输出时间范围的结束值，即输出的最后一条记录的 timestamp 不能大于 timestamp2。
 - INTERP 根据 EVERY(time_unit) 字段来确定输出时间范围内的结果条数，即从 timestamp1 开始每隔固定长度的时间（time_unit 值）进行插值，time_unit 可取值时间单位：1a(毫秒)，1s(秒)，1m(分)，1h(小时)，1d(天)，1w(周)。例如 EVERY(500a) 将对于指定数据每500毫秒间隔进行一次插值.
 - INTERP 根据 FILL 字段来决定在每个符合输出条件的时刻如何进行插值。关于 FILL 子句如何使用请参考 [FILL 子句](../distinguished/#fill-子句)
+- INTERP 可以在 RANGE 字段中只指定唯一的时间戳对单个时间点进行插值，在这种情况下，EVERY 字段可以省略。例如：SELECT INTERP(col) FROM tb RANGE('2023-01-01 00:00:00') FILL(linear).
 - INTERP 作用于超级表时, 会将该超级表下的所有子表数据按照主键列排序后进行插值计算，也可以搭配 PARTITION BY tbname 使用，将结果强制规约到单个时间线。
 - INTERP 可以与伪列 _irowts 一起使用，返回插值点所对应的时间戳(3.0.2.0版本以后支持)。
 - INTERP 可以与伪列 _isfilled 一起使用，显示返回结果是否为原始记录或插值算法产生的数据(3.0.3.0版本以后支持)。

From 34fa89da0df5bb6fc90324f34177284d2a73306c Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 30 May 2023 14:50:03 +0800
Subject: [PATCH 12/58] add en docs

---
 docs/en/12-taos-sql/06-select.md   | 2 +-
 docs/en/12-taos-sql/10-function.md | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/en/12-taos-sql/06-select.md b/docs/en/12-taos-sql/06-select.md
index ea0d7abc16..b28d5acb18 100644
--- a/docs/en/12-taos-sql/06-select.md
+++ b/docs/en/12-taos-sql/06-select.md
@@ -55,7 +55,7 @@ window_clause: {
   | INTERVAL(interval_val [, interval_offset]) [SLIDING (sliding_val)] [WATERMARK(watermark_val)] [FILL(fill_mod_and_val)]
 
 interp_clause:
-    RANGE(ts_val, ts_val) EVERY(every_val) FILL(fill_mod_and_val)
+    RANGE(ts_val [, ts_val]) EVERY(every_val) FILL(fill_mod_and_val)
 
 partition_by_clause:
     PARTITION BY expr [, expr] ...
diff --git a/docs/en/12-taos-sql/10-function.md b/docs/en/12-taos-sql/10-function.md
index b469da8f55..b517bcb3cc 100644
--- a/docs/en/12-taos-sql/10-function.md
+++ b/docs/en/12-taos-sql/10-function.md
@@ -889,9 +889,10 @@ ignore_null_values: {
 - `INTERP` is used to get the value that matches the specified time slice from a column. If no such value exists an interpolation value will be returned based on `FILL` parameter.
 - The input data of `INTERP` is the value of the specified column and a `where` clause can be used to filter the original data. If no `where` condition is specified then all original data is the input.
 - `INTERP` must be used along with `RANGE`, `EVERY`, `FILL` keywords.
-- The output time range of `INTERP` is specified by `RANGE(timestamp1,timestamp2)` parameter, with timestamp1 <= timestamp2. timestamp1 is the starting point of the output time range and must be specified. timestamp2 is the ending point of the output time range and must be specified.
+- The output time range of `INTERP` is specified by `RANGE(timestamp1,timestamp2)` parameter, with timestamp1 <= timestamp2. timestamp1 is the starting point of the output time range. timestamp2 is the ending point of the output time range.
 - The number of rows in the result set of `INTERP` is determined by the parameter `EVERY(time_unit)`. Starting from timestamp1, one interpolation is performed for every time interval specified `time_unit` parameter. The parameter `time_unit` must be an integer, with no quotes, with a time unit of: a(millisecond)), s(second), m(minute), h(hour), d(day), or w(week). For example, `EVERY(500a)` will interpolate every 500 milliseconds.
 - Interpolation is performed based on `FILL` parameter. For more information about FILL clause, see [FILL Clause](../distinguished/#fill-clause).
+- When only one timestamp value is specified in `RANGE` clause, `INTERP` is used to generate interpolation at this point in time. In this case, `EVERY` clause can be omitted. For example, SELECT INTERP(col) FROM tb RANGE('2023-01-01 00:00:00') FILL(linear).
 - `INTERP` can be applied to supertable by interpolating primary key sorted data of all its childtables. It can also be used with `partition by tbname` when applied to supertable to generate interpolation on each single timeline.
 - Pseudocolumn `_irowts` can be used along with `INTERP` to return the timestamps associated with interpolation points(support after version 3.0.2.0).
 - Pseudocolumn `_isfilled` can be used along with `INTERP` to indicate whether the results are original records or data points generated by interpolation algorithm(support after version 3.0.3.0).
@@ -902,7 +903,7 @@ ignore_null_values: {
 - We want to downsample every 1 hour and use a linear fill for missing values. Note the order in which the "partition by" clause and the "range", "every" and "fill" parameters are used.
 
 ```sql
-SELECT _irowts,INTERP(current) FROM test.meters PARTITION BY TBNAME RANGE('2017-07-22 00:00:00','2017-07-24 12:25:00') EVERY(1h) FILL(LINEAR) 
+SELECT _irowts,INTERP(current) FROM test.meters PARTITION BY TBNAME RANGE('2017-07-22 00:00:00','2017-07-24 12:25:00') EVERY(1h) FILL(LINEAR)
 ```
 
 ### LAST

From 60100a0fb6dd54f920bf8a5535b0cce01d80c9f3 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Wed, 31 May 2023 15:34:32 +0800
Subject: [PATCH 13/58] feature: add user priv when create db, remove priv
 check with create_dbs

---
 source/dnode/mnode/impl/inc/mndUser.h         |  2 +
 source/dnode/mnode/impl/src/mndDb.c           | 22 ++++-
 source/dnode/mnode/impl/src/mndUser.c         |  4 +-
 source/libs/catalog/src/ctgUtil.c             |  3 +
 .../script/tsim/user/privilege_create_db.sim  | 97 +++++++++++++++++++
 tests/script/win-test-file                    |  1 +
 6 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 tests/script/tsim/user/privilege_create_db.sim

diff --git a/source/dnode/mnode/impl/inc/mndUser.h b/source/dnode/mnode/impl/inc/mndUser.h
index aa7f97f087..93ae38e554 100644
--- a/source/dnode/mnode/impl/inc/mndUser.h
+++ b/source/dnode/mnode/impl/inc/mndUser.h
@@ -40,6 +40,8 @@ int32_t   mndValidateUserPassInfo(SMnode *pMnode, SUserPassVersion *pUsers, int3
 int32_t   mndUserRemoveDb(SMnode *pMnode, STrans *pTrans, char *db);
 int32_t   mndUserRemoveTopic(SMnode *pMnode, STrans *pTrans, char *topic);
 
+int32_t   mndUserDupObj(SUserObj *pUser, SUserObj *pNew);
+void      mndUserFreeObj(SUserObj *pUser);
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index a451ae9df5..70214e80a5 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -446,7 +446,8 @@ static int32_t mndSetCreateDbUndoLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pD
   return 0;
 }
 
-static int32_t mndSetCreateDbCommitLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroups) {
+static int32_t mndSetCreateDbCommitLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroups,
+                                        SUserObj *pUserDuped) {
   SSdbRaw *pDbRaw = mndDbActionEncode(pDb);
   if (pDbRaw == NULL) return -1;
   if (mndTransAppendCommitlog(pTrans, pDbRaw) != 0) return -1;
@@ -459,6 +460,13 @@ static int32_t mndSetCreateDbCommitLogs(SMnode *pMnode, STrans *pTrans, SDbObj *
     if (sdbSetRawStatus(pVgRaw, SDB_STATUS_READY) != 0) return -1;
   }
 
+  if (pUserDuped) {
+    SSdbRaw *pUserRaw = mndUserActionEncode(pUserDuped);
+    if (pUserRaw == NULL) return -1;
+    if (mndTransAppendCommitlog(pTrans, pUserRaw) != 0) return -1;
+    if (sdbSetRawStatus(pUserRaw, SDB_STATUS_READY) != 0) return -1;
+  }
+
   return 0;
 }
 
@@ -565,6 +573,15 @@ static int32_t mndCreateDb(SMnode *pMnode, SRpcMsg *pReq, SCreateDbReq *pCreate,
     return -1;
   }
 
+  // add database privileges for user
+  SUserObj newUserObj = {0}, *pNewUserDuped = NULL;
+  if (!pUser->superUser) {
+    if (mndUserDupObj(pUser, &newUserObj) != 0) goto _OVER;
+    taosHashPut(newUserObj.readDbs, dbObj.name, strlen(dbObj.name) + 1, dbObj.name, TSDB_FILENAME_LEN);
+    taosHashPut(newUserObj.writeDbs, dbObj.name, strlen(dbObj.name) + 1, dbObj.name, TSDB_FILENAME_LEN);
+    pNewUserDuped = &newUserObj;
+  }
+
   int32_t code = -1;
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_DB, pReq, "create-db");
   if (pTrans == NULL) goto _OVER;
@@ -577,7 +594,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SRpcMsg *pReq, SCreateDbReq *pCreate,
   mndTransSetOper(pTrans, MND_OPER_CREATE_DB);
   if (mndSetCreateDbRedoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
   if (mndSetCreateDbUndoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
-  if (mndSetCreateDbCommitLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
+  if (mndSetCreateDbCommitLogs(pMnode, pTrans, &dbObj, pVgroups, pNewUserDuped) != 0) goto _OVER;
   if (mndSetCreateDbRedoActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
   if (mndSetCreateDbUndoActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER;
   if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER;
@@ -586,6 +603,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SRpcMsg *pReq, SCreateDbReq *pCreate,
 
 _OVER:
   taosMemoryFree(pVgroups);
+  mndUserFreeObj(&newUserObj);
   mndTransDrop(pTrans);
   return code;
 }
diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c
index 3da594109a..90d16a0a81 100644
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
@@ -488,7 +488,7 @@ SHashObj *mndDupUseDbHash(SHashObj *pOld) {
   return pNew;
 }
 
-static int32_t mndUserDupObj(SUserObj *pUser, SUserObj *pNew) {
+int32_t mndUserDupObj(SUserObj *pUser, SUserObj *pNew) {
   memcpy(pNew, pUser, sizeof(SUserObj));
   pNew->authVersion++;
   pNew->updateTime = taosGetTimestampMs();
@@ -508,7 +508,7 @@ static int32_t mndUserDupObj(SUserObj *pUser, SUserObj *pNew) {
   return 0;
 }
 
-static void mndUserFreeObj(SUserObj *pUser) {
+void mndUserFreeObj(SUserObj *pUser) {
   taosHashCleanup(pUser->readDbs);
   taosHashCleanup(pUser->writeDbs);
   taosHashCleanup(pUser->topics);
diff --git a/source/libs/catalog/src/ctgUtil.c b/source/libs/catalog/src/ctgUtil.c
index cf864e8643..6f4347a49c 100644
--- a/source/libs/catalog/src/ctgUtil.c
+++ b/source/libs/catalog/src/ctgUtil.c
@@ -1555,10 +1555,13 @@ int32_t ctgChkSetAuthRes(SCatalog* pCtg, SCtgAuthReq* req, SCtgAuthRsp* res) {
   char dbFName[TSDB_DB_FNAME_LEN];
   tNameGetFullDbName(&pReq->tbName, dbFName);
 
+  // since that we add read/write previliges when create db, there is no need to check createdDbs
+#if 0
   if (pInfo->createdDbs && taosHashGet(pInfo->createdDbs, dbFName, strlen(dbFName))) {
     pRes->pass = true;
     return TSDB_CODE_SUCCESS;
   }
+#endif
 
   switch (pReq->type) {
     case AUTH_TYPE_READ: {
diff --git a/tests/script/tsim/user/privilege_create_db.sim b/tests/script/tsim/user/privilege_create_db.sim
new file mode 100644
index 0000000000..c81bd1b258
--- /dev/null
+++ b/tests/script/tsim/user/privilege_create_db.sim
@@ -0,0 +1,97 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ========================root user create user
+sql create user u1 pass "taosdata"
+sql create user u2 pass "taosdata"
+sql create database test
+sql select * from information_schema.ins_user_privileges where user_name == "root"
+if $rows != 1 then
+  return -1
+endi
+
+print =============connect with u1
+sql connect u1
+sql create database u1_d1
+sql use u1_d1
+sql create table u1_d1.t1(ts timestamp, c2 int)
+sql use information_schema
+sql select * from ins_user_privileges where user_name == "u1" order by privilege
+if $rows != 2 then
+  return -1
+endi
+if $data01 != read then
+  return -1
+endi
+if $data11 != write then
+  return -1
+endi
+if $data02 != u1_d1 then
+  return -1
+endi
+if $data12 != u1_d1 then
+  return -1
+endi
+
+sql_error grant all on *.* to u1
+sql_error grant all on test.* to u1
+
+print =============connect with u2
+sql connect u2
+sql create database u2_d1
+sql use u2_d1
+sql create table u2_d1.t1(ts timestamp, c2 int)
+sql use information_schema
+sql select * from ins_user_privileges where user_name == "u2" order by privilege
+if $rows != 2 then
+  return -1
+endi
+if $data01 != read then
+  return -1
+endi
+if $data11 != write then
+  return -1
+endi
+if $data02 != u2_d1 then
+  return -1
+endi
+if $data12 != u2_d1 then
+  return -1
+endi
+
+sql_error select * from u1_d1.t1
+sql_error revoke read on u2_d1.* from u2
+
+print =============connect with root, revoke read from u1, all from u2
+sql connect
+sql revoke read on u1_d1.* from u1
+sql revoke all on u2_d1.* from u2
+sleep 1000
+
+print =============connect with u1
+sql connect u1
+sql insert into u1_d1.t1 values(now, 1)
+sql_error select * from u1_d1.t1;
+
+print =============connect with u2
+sql connect u2
+sql_error select * from u2_d1.t1;
+sql_error insert into u2_d1.t1 values(now, 1)
+
+print =============connect with root, grant read to u1, all to u2
+sql connect
+sql grant read on u1_d1.* to u1
+sql grant all on u2_d1.* to u2
+
+sleep 1000
+print =============connect with u1
+sql connect u1
+sql select * from u1_d1.t1;
+sql insert into u1_d1.t1 values(now, 2)
+
+print =============connect with u2
+sql connect u2
+sql select * from u2_d1.t1;
+sql insert into u2_d1.t1 values(now, 2)
diff --git a/tests/script/win-test-file b/tests/script/win-test-file
index b7fbbed5c1..adef71cb45 100644
--- a/tests/script/win-test-file
+++ b/tests/script/win-test-file
@@ -4,6 +4,7 @@
 ./test.sh -f tsim/user/privilege_sysinfo.sim
 ./test.sh -f tsim/user/privilege_topic.sim
 ./test.sh -f tsim/user/privilege_table.sim
+./test.sh -f tsim/user/privilege_create_db.sim
 ./test.sh -f tsim/db/alter_option.sim
 rem ./test.sh -f tsim/db/alter_replica_13.sim
 ./test.sh -f tsim/db/alter_replica_31.sim

From fb2f367aacd17f9128996097e4b074f37dfe2199 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 1 Jun 2023 08:13:32 +0800
Subject: [PATCH 14/58] meta/split: trim invalidated uids

---
 source/dnode/vnode/src/inc/vnodeInt.h   | 16 +++----
 source/dnode/vnode/src/meta/metaTable.c | 55 ++++++++++++++++++++++---
 source/dnode/vnode/src/vnd/vnodeSvr.c   | 17 ++++----
 3 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index db285dc124..0bfdf33019 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -107,10 +107,10 @@ struct SQueryNode {
 typedef SVCreateTbReq   STbCfg;
 typedef SVCreateTSmaReq SSmaCfg;
 
-SMTbCursor *metaOpenTbCursor(void *pVnode);
-void        metaCloseTbCursor(SMTbCursor *pTbCur);
-int32_t     metaTbCursorNext(SMTbCursor *pTbCur, ETableType jumpTableType);
-int32_t     metaTbCursorPrev(SMTbCursor *pTbCur, ETableType jumpTableType);
+SMTbCursor* metaOpenTbCursor(void* pVnode);
+void        metaCloseTbCursor(SMTbCursor* pTbCur);
+int32_t     metaTbCursorNext(SMTbCursor* pTbCur, ETableType jumpTableType);
+int32_t     metaTbCursorPrev(SMTbCursor* pTbCur, ETableType jumpTableType);
 
 #endif
 
@@ -146,6 +146,7 @@ int             metaAlterSTable(SMeta* pMeta, int64_t version, SVCreateStbReq* p
 int             metaDropSTable(SMeta* pMeta, int64_t verison, SVDropStbReq* pReq, SArray* tbUidList);
 int             metaCreateTable(SMeta* pMeta, int64_t version, SVCreateTbReq* pReq, STableMetaRsp** pMetaRsp);
 int             metaDropTable(SMeta* pMeta, int64_t version, SVDropTbReq* pReq, SArray* tbUids, int64_t* tbUid);
+int32_t         metaTrimTables(SMeta* pMeta);
 int             metaTtlDropTable(SMeta* pMeta, int64_t ttl, SArray* tbUids);
 int             metaAlterTable(SMeta* pMeta, int64_t version, SVAlterTbReq* pReq, STableMetaRsp* pMetaRsp);
 SSchemaWrapper* metaGetTableSchema(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock);
@@ -154,8 +155,8 @@ int32_t         metaGetTbTSchemaEx(SMeta* pMeta, tb_uid_t suid, tb_uid_t uid, in
 int             metaGetTableEntryByName(SMetaReader* pReader, const char* name);
 int             metaAlterCache(SMeta* pMeta, int32_t nPage);
 
-int32_t         metaUidCacheClear(SMeta* pMeta, uint64_t suid);
-int32_t         metaTbGroupCacheClear(SMeta *pMeta, uint64_t suid);
+int32_t metaUidCacheClear(SMeta* pMeta, uint64_t suid);
+int32_t metaTbGroupCacheClear(SMeta* pMeta, uint64_t suid);
 
 int metaAddIndexToSTable(SMeta* pMeta, int64_t version, SVCreateStbReq* pReq);
 int metaDropIndexFromSTable(SMeta* pMeta, int64_t version, SDropIndexReq* pReq);
@@ -175,7 +176,7 @@ void*         metaGetIdx(SMeta* pMeta);
 void*         metaGetIvtIdx(SMeta* pMeta);
 int           metaTtlSmaller(SMeta* pMeta, uint64_t time, SArray* uidList);
 
-void metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
+void metaReaderInit(SMetaReader* pReader, SMeta* pMeta, int32_t flags);
 
 int32_t metaCreateTSma(SMeta* pMeta, int64_t version, SSmaCfg* pCfg);
 int32_t metaDropTSma(SMeta* pMeta, int64_t indexUid);
@@ -491,7 +492,6 @@ struct SCompactInfo {
 
 void initStorageAPI(SStorageAPI* pAPI);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 4f9f0c688e..20cf423182 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -848,7 +848,52 @@ static void metaDropTables(SMeta *pMeta, SArray *tbUids) {
   metaULock(pMeta);
 }
 
-int metaTrimTables(SMeta *pMeta, int64_t version) {
+static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
+  int32_t code = 0;
+  // 1, tranverse table's
+  // 2, validate table name using vnodeValidateTableHash
+  // 3, push invalidated table's uid into uidList
+
+  TBC *pCur;
+  code = tdbTbcOpen(pMeta->pTbDb, &pCur, NULL);
+  if (code < 0) {
+    return code;
+  }
+
+  code = tdbTbcMoveToFirst(pCur);
+  if (code) {
+    tdbTbcClose(pCur);
+    return code;
+  }
+
+  void *pData = NULL;
+  int   nData = 0;
+
+  while (1) {
+    int32_t ret = tdbTbcNext(pCur, NULL, NULL, &pData, &nData);
+    if (ret < 0) {
+      break;
+    }
+
+    SMetaEntry me = {0};
+    SDecoder   dc = {0};
+    tDecoderInit(&dc, pData, nData);
+    metaDecodeEntry(&dc, &me);
+    if (me.type == TSDB_CHILD_TABLE) {
+      int32_t ret = vnodeValidateTableHash(pMeta->pVnode, me.name);
+      if (TSDB_CODE_VND_HASH_MISMATCH == ret) {
+        taosArrayPush(uidList, &me.uid);
+      }
+    }
+    tDecoderClear(&dc);
+  }
+  tdbFree(pData);
+  tdbTbcClose(pCur);
+
+  return 0;
+}
+
+int32_t metaTrimTables(SMeta *pMeta) {
   int32_t code = 0;
 
   SArray *tbUids = taosArrayInit(8, sizeof(int64_t));
@@ -856,7 +901,7 @@ int metaTrimTables(SMeta *pMeta, int64_t version) {
     return TSDB_CODE_OUT_OF_MEMORY;
   }
 
-  // code = metaFilterTableByHash(pMeta, /*ttl, */ tbUids);
+  code = metaFilterTableByHash(pMeta, tbUids);
   if (code != 0) {
     goto end;
   }
@@ -1027,7 +1072,7 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
 
     metaUpdateStbStats(pMeta, e.ctbEntry.suid, -1);
     metaUidCacheClear(pMeta, e.ctbEntry.suid);
-    metaTbGroupCacheClear(pMeta, e.ctbEntry.suid);    
+    metaTbGroupCacheClear(pMeta, e.ctbEntry.suid);
   } else if (e.type == TSDB_NORMAL_TABLE) {
     // drop schema.db (todo)
 
@@ -1039,7 +1084,7 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type) {
 
     metaStatsCacheDrop(pMeta, uid);
     metaUidCacheClear(pMeta, uid);
-    metaTbGroupCacheClear(pMeta, uid);        
+    metaTbGroupCacheClear(pMeta, uid);
     --pMeta->pVnode->config.vndStats.numOfSTables;
   }
 
@@ -1460,7 +1505,7 @@ static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pA
               ((STag *)(ctbEntry.ctbEntry.pTags))->len, pMeta->txn);
 
   metaUidCacheClear(pMeta, ctbEntry.ctbEntry.suid);
-  metaTbGroupCacheClear(pMeta, ctbEntry.ctbEntry.suid);        
+  metaTbGroupCacheClear(pMeta, ctbEntry.ctbEntry.suid);
 
   metaULock(pMeta);
 
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index b950437f23..c3fb5e5ad4 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -245,11 +245,11 @@ _exit:
 static int32_t vnodePreProcessDeleteMsg(SVnode *pVnode, SRpcMsg *pMsg) {
   int32_t code = 0;
 
-  int32_t     size;
-  int32_t     ret;
-  uint8_t    *pCont;
-  SEncoder   *pCoder = &(SEncoder){0};
-  SDeleteRes  res = {0};
+  int32_t    size;
+  int32_t    ret;
+  uint8_t   *pCont;
+  SEncoder  *pCoder = &(SEncoder){0};
+  SDeleteRes res = {0};
 
   SReadHandle handle = {.config = &pVnode->config, .vnode = pVnode, .pMsgCb = &pVnode->msgCb};
   initStorageAPI(&handle.api);
@@ -316,8 +316,7 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t ver, SRpcMsg
     return -1;
   }
 
-  vDebug("vgId:%d, start to process write request %s, index:%" PRId64, TD_VID(pVnode), TMSG_INFO(pMsg->msgType),
-         ver);
+  vDebug("vgId:%d, start to process write request %s, index:%" PRId64, TD_VID(pVnode), TMSG_INFO(pMsg->msgType), ver);
 
   ASSERT(pVnode->state.applyTerm <= pMsg->info.conn.applyTerm);
   ASSERT(pVnode->state.applied + 1 == ver);
@@ -1479,6 +1478,7 @@ static int32_t vnodeConsolidateAlterHashRange(SVnode *pVnode, int64_t ver) {
         pVnode->config.hashBegin, pVnode->config.hashEnd, ver);
 
   // TODO: trim meta of tables from TDB per hash range [pVnode->config.hashBegin, pVnode->config.hashEnd]
+  code = metaTrimTables(pVnode->pMeta);
 
   return code;
 }
@@ -1492,8 +1492,7 @@ static int32_t vnodeProcessAlterConfirmReq(SVnode *pVnode, int64_t ver, void *pR
 
   code = vnodeConsolidateAlterHashRange(pVnode, ver);
   if (code < 0) {
-    vError("vgId:%d, failed to consolidate alter hashrange since %s. version:%" PRId64, TD_VID(pVnode), terrstr(),
-           ver);
+    vError("vgId:%d, failed to consolidate alter hashrange since %s. version:%" PRId64, TD_VID(pVnode), terrstr(), ver);
     goto _exit;
   }
   pVnode->config.hashChange = false;

From 9b9bf2de6897a1453dfc31b9a13e77125a606d09 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 1 Jun 2023 10:41:01 +0800
Subject: [PATCH 15/58] meta/tbc: key cannot be null

---
 source/dnode/vnode/src/meta/metaTable.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index 20cf423182..eb169fbdc2 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -866,11 +866,11 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
     return code;
   }
 
-  void *pData = NULL;
-  int   nData = 0;
+  void *pData = NULL, *pKey = NULL;
+  int   nData = 0, nKey = 0;
 
   while (1) {
-    int32_t ret = tdbTbcNext(pCur, NULL, NULL, &pData, &nData);
+    int32_t ret = tdbTbcNext(pCur, &pKey, &nKey, &pData, &nData);
     if (ret < 0) {
       break;
     }
@@ -879,7 +879,7 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
     SDecoder   dc = {0};
     tDecoderInit(&dc, pData, nData);
     metaDecodeEntry(&dc, &me);
-    if (me.type == TSDB_CHILD_TABLE) {
+    if (me.type != TSDB_SUPER_TABLE) {
       int32_t ret = vnodeValidateTableHash(pMeta->pVnode, me.name);
       if (TSDB_CODE_VND_HASH_MISMATCH == ret) {
         taosArrayPush(uidList, &me.uid);
@@ -888,6 +888,7 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
     tDecoderClear(&dc);
   }
   tdbFree(pData);
+  tdbFree(pKey);
   tdbTbcClose(pCur);
 
   return 0;

From 8c00af5c1715ed81d4559e733c5c2f42e3aad64f Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Thu, 1 Jun 2023 18:19:17 +0800
Subject: [PATCH 16/58] other: add jdbc consumer demo

---
 examples/JDBC/consumer-demo/pom.xml           | 70 +++++++++++++++++
 examples/JDBC/consumer-demo/readme.md         | 52 +++++++++++++
 .../src/main/java/com/taosdata/Bean.java      | 43 ++++++++++
 .../java/com/taosdata/BeanDeserializer.java   |  6 ++
 .../src/main/java/com/taosdata/Config.java    | 78 +++++++++++++++++++
 .../main/java/com/taosdata/ConsumerDemo.java  | 65 ++++++++++++++++
 .../src/main/java/com/taosdata/Worker.java    | 60 ++++++++++++++
 7 files changed, 374 insertions(+)
 create mode 100644 examples/JDBC/consumer-demo/pom.xml
 create mode 100644 examples/JDBC/consumer-demo/readme.md
 create mode 100644 examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
 create mode 100644 examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
 create mode 100644 examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
 create mode 100644 examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
 create mode 100644 examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java

diff --git a/examples/JDBC/consumer-demo/pom.xml b/examples/JDBC/consumer-demo/pom.xml
new file mode 100644
index 0000000000..aa3cb154e5
--- /dev/null
+++ b/examples/JDBC/consumer-demo/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.taosdata</groupId>
+    <artifactId>consumer</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.1.1-jre</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>ConsumerDemo</id>
+                        <configuration>
+                            <finalName>ConsumerDemo</finalName>
+                            <archive>
+                                <manifest>
+                                    <mainClass>com.taosdata.ConsumerDemo</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/examples/JDBC/consumer-demo/readme.md b/examples/JDBC/consumer-demo/readme.md
new file mode 100644
index 0000000000..77742ab605
--- /dev/null
+++ b/examples/JDBC/consumer-demo/readme.md
@@ -0,0 +1,52 @@
+# How to Run the Consumer Demo Code On Linux OS
+TDengine's Consumer demo project is organized in a Maven way so that users can easily compile, package and run the project. If you don't have Maven on your server, you may install it using
+```
+sudo apt-get install maven
+```
+
+## Install TDengine Client
+Make sure you have already installed a tdengine client on your current develop environment.
+Download the tdengine package on our website: ``https://www.taosdata.com/cn/all-downloads/`` and install the client.
+
+## Run Consumer Demo using mvn plugin
+run command:
+```
+mvn clean compile exec:java -Dexec.mainClass="com.taosdata.ConsumerDemo"
+```
+
+## Custom configuration
+```shell
+# the host of TDengine server
+export TAOS_HOST="127.0.0.1"
+
+# the port of TDengine server
+export TAOS_PORT="6041"
+
+# the consumer type, can be "ws" or "jni"
+export TAOS_TYPE="ws"
+
+# the number of consumers
+export TAOS_JDBC_CONSUMER_NUM="1"
+
+# the number of processors to consume
+export TAOS_JDBC_PROCESSOR_NUM="2"
+
+# the number of records to be consumed per processor per second
+export TAOS_JDBC_RATE_PER_PROCESSOR="1000"
+
+# poll wait time in ms
+export TAOS_JDBC_POLL_SLEEP="100"
+```
+
+## Run Consumer Demo using jar
+
+To compile the demo project, go to the source directory ``TDengine/tests/examples/JDBC/consumer-demo`` and execute
+```
+mvn clean package assembly:single
+```
+
+To run ConsumerDemo.jar, go to ``TDengine/tests/examples/JDBC/consumer-demo`` and execute
+```
+java -jar target/ConsumerDemo-jar-with-dependencies.jar
+```
+
diff --git a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
new file mode 100644
index 0000000000..2f2467b371
--- /dev/null
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Bean.java
@@ -0,0 +1,43 @@
+package com.taosdata;
+
+import java.sql.Timestamp;
+
+public class Bean {
+    private Timestamp ts;
+    private Integer c1;
+    private String c2;
+
+    public Timestamp getTs() {
+        return ts;
+    }
+
+    public void setTs(Timestamp ts) {
+        this.ts = ts;
+    }
+
+    public Integer getC1() {
+        return c1;
+    }
+
+    public void setC1(Integer c1) {
+        this.c1 = c1;
+    }
+
+    public String getC2() {
+        return c2;
+    }
+
+    public void setC2(String c2) {
+        this.c2 = c2;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("Bean {");
+        sb.append("ts=").append(ts);
+        sb.append(", c1=").append(c1);
+        sb.append(", c2='").append(c2).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}
diff --git a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
new file mode 100644
index 0000000000..478af9e70d
--- /dev/null
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/BeanDeserializer.java
@@ -0,0 +1,6 @@
+package com.taosdata;
+
+import com.taosdata.jdbc.tmq.ReferenceDeserializer;
+
+public class BeanDeserializer extends ReferenceDeserializer<Bean> {
+}
diff --git a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
new file mode 100644
index 0000000000..08579926e3
--- /dev/null
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Config.java
@@ -0,0 +1,78 @@
+package com.taosdata;
+
+public class Config {
+    public static final String TOPIC = "test_consumer";
+    public static final String TAOS_HOST = "127.0.0.1";
+    public static final String TAOS_PORT = "6041";
+    public static final String TAOS_TYPE = "ws";
+    public static final int TAOS_JDBC_CONSUMER_NUM = 1;
+    public static final int TAOS_JDBC_PROCESSOR_NUM = 2;
+    public static final int TAOS_JDBC_RATE_PER_PROCESSOR = 1000;
+    public static final int TAOS_JDBC_POLL_SLEEP = 100;
+
+    private final int consumerNum;
+    private final int processCapacity;
+    private final int rate;
+    private final int pollSleep;
+    private final String type;
+    private final String host;
+    private final String port;
+
+    public Config(String type, String host, String port, int consumerNum, int processCapacity, int rate, int pollSleep) {
+        this.type = type;
+        this.consumerNum = consumerNum;
+        this.processCapacity = processCapacity;
+        this.rate = rate;
+        this.pollSleep = pollSleep;
+        this.host = host;
+        this.port = port;
+    }
+
+    public int getConsumerNum() {
+        return consumerNum;
+    }
+
+    public int getProcessCapacity() {
+        return processCapacity;
+    }
+
+    public int getRate() {
+        return rate;
+    }
+
+    public int getPollSleep() {
+        return pollSleep;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public static Config getFromENV() {
+        String host = System.getenv("TAOS_HOST") != null ? System.getenv("TAOS_HOST") : TAOS_HOST;
+        String port = System.getenv("TAOS_PORT") != null ? System.getenv("TAOS_PORT") : TAOS_PORT;
+        String type = System.getenv("TAOS_TYPE") != null ? System.getenv("TAOS_TYPE") : TAOS_TYPE;
+
+        String c = System.getenv("TAOS_JDBC_CONSUMER_NUM");
+        int num = c != null ? Integer.parseInt(c) : TAOS_JDBC_CONSUMER_NUM;
+
+        String p = System.getenv("TAOS_JDBC_PROCESSOR_NUM");
+        int capacity = p != null ? Integer.parseInt(p) : TAOS_JDBC_PROCESSOR_NUM;
+
+        String r = System.getenv("TAOS_JDBC_RATE_PER_PROCESSOR");
+        int rate = r != null ? Integer.parseInt(r) : TAOS_JDBC_RATE_PER_PROCESSOR;
+
+        String s = System.getenv("TAOS_JDBC_POLL_SLEEP");
+        int sleep = s != null ? Integer.parseInt(s) : TAOS_JDBC_POLL_SLEEP;
+
+        return new Config(type, host, port, num, capacity, rate, sleep);
+    }
+}
diff --git a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
new file mode 100644
index 0000000000..7c7719c639
--- /dev/null
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/ConsumerDemo.java
@@ -0,0 +1,65 @@
+package com.taosdata;
+
+import com.taosdata.jdbc.tmq.TMQConstants;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.taosdata.Config.*;
+
+public class ConsumerDemo {
+    public static void main(String[] args) throws SQLException {
+        // Config
+        Config config = Config.getFromENV();
+        // Generated data
+        mockData();
+
+        Properties prop = new Properties();
+        prop.setProperty(TMQConstants.CONNECT_TYPE, config.getType());
+        prop.setProperty(TMQConstants.BOOTSTRAP_SERVERS, config.getHost() + ":" + config.getPort());
+        prop.setProperty(TMQConstants.CONNECT_USER, "root");
+        prop.setProperty(TMQConstants.CONNECT_PASS, "taosdata");
+        prop.setProperty(TMQConstants.MSG_WITH_TABLE_NAME, "true");
+        prop.setProperty(TMQConstants.ENABLE_AUTO_COMMIT, "true");
+        prop.setProperty(TMQConstants.GROUP_ID, "gId");
+        prop.setProperty(TMQConstants.VALUE_DESERIALIZER, "com.taosdata.BeanDeserializer");
+        for (int i = 0; i < config.getConsumerNum() - 1; i++) {
+            new Thread(new Worker(prop, config)).start();
+        }
+        new Worker(prop, config).run();
+    }
+
+    public static void mockData() throws SQLException {
+        String dbName = "test_consumer";
+        String tableName = "st";
+        String url = "jdbc:TAOS-RS://" + TAOS_HOST + ":" + TAOS_PORT + "/?user=root&password=taosdata&batchfetch=true";
+        Connection connection = DriverManager.getConnection(url);
+        Statement statement = connection.createStatement();
+        statement.executeUpdate("create database if not exists " + dbName + " WAL_RETENTION_PERIOD 3650");
+        statement.executeUpdate("use " + dbName);
+        statement.executeUpdate("create table if not exists " + tableName + " (ts timestamp, c1 int, c2 nchar(100)) ");
+        statement.executeUpdate("create topic if not exists " + TOPIC + " as select ts, c1, c2 from " + tableName);
+
+        ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(r -> {
+            Thread t = new Thread(r);
+            t.setName("mock-data-thread-" + t.getId());
+            return t;
+        });
+        AtomicInteger atomic = new AtomicInteger();
+        scheduledExecutorService.scheduleWithFixedDelay(() -> {
+            int i = atomic.getAndIncrement();
+            try {
+                statement.executeUpdate("insert into " + tableName + " values(now, " + i + ",'" + i + "')");
+            } catch (SQLException e) {
+                // ignore
+            }
+        }, 0, 10, TimeUnit.MILLISECONDS);
+    }
+}
diff --git a/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
new file mode 100644
index 0000000000..f6e21cd729
--- /dev/null
+++ b/examples/JDBC/consumer-demo/src/main/java/com/taosdata/Worker.java
@@ -0,0 +1,60 @@
+package com.taosdata;
+
+import com.google.common.util.concurrent.RateLimiter;
+import com.taosdata.jdbc.tmq.ConsumerRecord;
+import com.taosdata.jdbc.tmq.ConsumerRecords;
+import com.taosdata.jdbc.tmq.TaosConsumer;
+
+import java.sql.SQLException;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Semaphore;
+
+public class Worker implements Runnable {
+
+    int sleepTime;
+    int rate;
+
+    ForkJoinPool pool = new ForkJoinPool();
+    Semaphore semaphore;
+
+    TaosConsumer<Bean> consumer;
+
+    public Worker(Properties prop, Config config) throws SQLException {
+        consumer = new TaosConsumer<>(prop);
+        consumer.subscribe(Collections.singletonList(Config.TOPIC));
+        semaphore = new Semaphore(config.getProcessCapacity());
+        sleepTime = config.getPollSleep();
+        rate = config.getRate();
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.interrupted()) {
+            try {
+                // 控制请求频率
+                if (semaphore.tryAcquire()) {
+                    ConsumerRecords<Bean> records = consumer.poll(Duration.ofMillis(sleepTime));
+                    pool.submit(() -> {
+                        RateLimiter limiter = RateLimiter.create(rate);
+                        try {
+                            for (ConsumerRecord<Bean> record : records) {
+                                // 流量控制
+                                limiter.acquire();
+                                // 业务处理数据
+                                System.out.println("[" + LocalDateTime.now() + "] Thread id:" + Thread.currentThread().getId() + " -> " + record.value());
+                            }
+                        } finally {
+                            semaphore.release();
+                        }
+                    });
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

From 6dda2e94f403e87888c77f095bf87fedb3743b2e Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 2 Jun 2023 11:42:25 +0800
Subject: [PATCH 17/58] fix: distinct primary timestamp issue

---
 source/libs/parser/src/parAstCreater.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index b707f217e3..a4068930fe 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -828,7 +828,7 @@ SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pPr
   select->pProjectionList = pProjectionList;
   select->pFromTable = pTable;
   sprintf(select->stmtName, "%p", select);
-  select->timeLineResMode = TIME_LINE_GLOBAL;
+  select->timeLineResMode = select->isDistinct ? TIME_LINE_NONE : TIME_LINE_GLOBAL;
   select->onlyHasKeepOrderFunc = true;
   select->timeRange = TSWINDOW_INITIALIZER;
   return (SNode*)select;

From 532e02fb2adf4aa3e8e4ae5bd7b86c3b0c221dbd Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Mon, 5 Jun 2023 10:47:15 +0800
Subject: [PATCH 18/58] enh: improve filter performance

---
 include/common/tdatablock.h            |  1 +
 source/common/src/tdatablock.c         | 23 +++++++++++++++++++++++
 source/libs/executor/src/executorInt.c | 12 +-----------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 33c571fc1b..53fc07c3f3 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -178,6 +178,7 @@ int32_t getJsonValueLen(const char* data);
 
 int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, bool isNull);
 int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, bool isNull);
+int32_t colDataReassignVal(SColumnInfoData* pColumnInfoData, uint32_t dstRowIdx, uint32_t srcRowIdx, const char* pData);
 int32_t colDataSetNItems(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, uint32_t numOfRows, bool trimValue);
 int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int32_t* capacity,
                         const SColumnInfoData* pSource, int32_t numOfRow2);
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 311c79381c..a6a54a8347 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -126,6 +126,29 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const
   return 0;
 }
 
+int32_t colDataReassignVal(SColumnInfoData* pColumnInfoData, uint32_t dstRowIdx, uint32_t srcRowIdx, const char* pData) {
+  int32_t type = pColumnInfoData->info.type;
+  if (IS_VAR_DATA_TYPE(type)) {
+    int32_t dataLen = 0;
+    if (type == TSDB_DATA_TYPE_JSON) {
+      dataLen = getJsonValueLen(pData);
+    } else {
+      dataLen = varDataTLen(pData);
+    }
+
+    SVarColAttr* pAttr = &pColumnInfoData->varmeta;
+
+    uint32_t len = pColumnInfoData->varmeta.length;
+    pColumnInfoData->varmeta.offset[dstRowIdx] = pColumnInfoData->varmeta.offset[srcRowIdx];
+  } else {
+    memcpy(pColumnInfoData->pData + pColumnInfoData->info.bytes * dstRowIdx, pData, pColumnInfoData->info.bytes);
+    colDataClearNull_f(pColumnInfoData->nullbitmap, dstRowIdx);
+  }
+
+  return 0;
+}
+
+
 int32_t colDataReserve(SColumnInfoData* pColumnInfoData, size_t newSize) {
   if (!IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
     return TSDB_CODE_SUCCESS;
diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c
index 4f1a0254e4..ce7a117543 100644
--- a/source/libs/executor/src/executorInt.c
+++ b/source/libs/executor/src/executorInt.c
@@ -573,18 +573,8 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
           if (colDataIsNull_var(pDst, j)) {
             colDataSetNull_var(pDst, numOfRows);
           } else {
-            // fix address sanitizer error. p1 may point to memory that will change during realloc of colDataSetVal, first copy it to p2
             char* p1 = colDataGetVarData(pDst, j);
-            int32_t len = 0;
-            if (pDst->info.type == TSDB_DATA_TYPE_JSON) {
-              len = getJsonValueLen(p1);
-            } else {
-              len = varDataTLen(p1);
-            }
-            char* p2 = taosMemoryMalloc(len);
-            memcpy(p2, p1, len);
-            colDataSetVal(pDst, numOfRows, p2, false);
-            taosMemoryFree(p2);
+            colDataReassignVal(pDst, numOfRows, j, p1);
           }
           numOfRows += 1;
           j += 1;

From 8aa2e96d4ed9bc8c2837bfb10340f7431f573f7e Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Mon, 5 Jun 2023 11:26:45 +0800
Subject: [PATCH 19/58] fix: test case issue

---
 tests/system-test/2-query/interp.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index 121d4dcff6..a29a521574 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -4028,13 +4028,13 @@ class TDTestCase:
         tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1}) partition by tbname range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 
         tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union select * from {dbname}.{ctbname2}) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
-        tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union select * from {dbname}.{ctbname2} order by ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union select * from {dbname}.{ctbname2} order by ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 
         tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union all select * from {dbname}.{ctbname2}) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
-        tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union all select * from {dbname}.{ctbname2} order by ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union all select * from {dbname}.{ctbname2} order by ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 
         tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union all select * from {dbname}.{ctbname2}) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
-        tdSql.error(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union all select * from {dbname}.{ctbname2} order by ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
+        tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select * from {dbname}.{ctbname1} union all select * from {dbname}.{ctbname2} order by ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 
         tdSql.query(f"select _irowts, _isfilled, interp(c0) from (select {ctbname1}.ts,{ctbname1}.c0 from {dbname}.{ctbname1}, {dbname}.{ctbname2} where {ctbname1}.ts = {ctbname2}.ts) range('2020-02-01 00:00:00', '2020-02-01 00:00:14') every(1s) fill(null)")
 

From 74d5f029697cac47d63eb43ec52765c50572f9de Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 5 Jun 2023 04:56:07 +0000
Subject: [PATCH 20/58] fix invalid free

---
 include/libs/function/function.h              |  1 +
 include/libs/stream/tstream.h                 |  1 -
 source/libs/stream/inc/streamInc.h            |  7 ++++--
 source/libs/stream/src/streamBackendRocksdb.c | 18 +++++++++-----
 source/libs/stream/src/streamMeta.c           |  3 +--
 source/libs/stream/src/streamState.c          | 24 +++++++++----------
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/include/libs/function/function.h b/include/libs/function/function.h
index e015f4182e..c92ce254a8 100644
--- a/include/libs/function/function.h
+++ b/include/libs/function/function.h
@@ -163,6 +163,7 @@ typedef struct {
   int64_t                  checkPointId;
   int32_t                  taskId;
   int64_t                  streamId;
+  int64_t                  streamBackendRid;
 } SStreamState;
 
 typedef struct SFunctionStateStore {
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index 8316e6ef50..3222a125dd 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -344,7 +344,6 @@ typedef struct SStreamMeta {
   SRWLatch     lock;
   int32_t      walScanCounter;
   void*        streamBackend;
-  int32_t      streamBackendId;
   int64_t      streamBackendRid;
   SHashObj*    pTaskBackendUnique;
 } SStreamMeta;
diff --git a/source/libs/stream/inc/streamInc.h b/source/libs/stream/inc/streamInc.h
index 2c1956998a..c7ee308b61 100644
--- a/source/libs/stream/inc/streamInc.h
+++ b/source/libs/stream/inc/streamInc.h
@@ -36,8 +36,9 @@ static SStreamGlobalEnv streamEnv;
 int32_t streamDispatchStreamBlock(SStreamTask* pTask);
 
 SStreamDataBlock* createStreamDataFromDispatchMsg(const SStreamDispatchReq* pReq, int32_t blockType, int32_t srcVg);
-SStreamDataBlock* createStreamBlockFromResults(SStreamQueueItem* pItem, SStreamTask* pTask, int64_t resultSize, SArray* pRes);
-void    destroyStreamDataBlock(SStreamDataBlock* pBlock);
+SStreamDataBlock* createStreamBlockFromResults(SStreamQueueItem* pItem, SStreamTask* pTask, int64_t resultSize,
+                                               SArray* pRes);
+void              destroyStreamDataBlock(SStreamDataBlock* pBlock);
 
 int32_t streamRetrieveReqToData(const SStreamRetrieveReq* pReq, SStreamDataBlock* pData);
 int32_t streamDispatchAllBlocks(SStreamTask* pTask, const SStreamDataBlock* data);
@@ -53,6 +54,8 @@ int32_t streamDispatchOneRecoverFinishReq(SStreamTask* pTask, const SStreamRecov
 
 SStreamQueueItem* streamMergeQueueItem(SStreamQueueItem* dst, SStreamQueueItem* pElem);
 
+extern int32_t streamBackendId;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index b3995f020b..d190f4b43e 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -16,7 +16,9 @@
 #include "streamBackendRocksdb.h"
 #include "executor.h"
 #include "query.h"
+#include "streamInc.h"
 #include "tcommon.h"
+#include "tref.h"
 
 typedef struct SCompactFilteFactory {
   void* status;
@@ -79,7 +81,7 @@ const char* compareParKeyName(void* name);
 const char* comparePartagKeyName(void* name);
 
 void* streamBackendInit(const char* path) {
-  qDebug("init stream backend");
+  qDebug("start to init stream backend at %s", path);
   SBackendHandle* pHandle = calloc(1, sizeof(SBackendHandle));
   pHandle->list = tdListNew(sizeof(SCfComparator));
   taosThreadMutexInit(&pHandle->mutex, NULL);
@@ -129,6 +131,7 @@ void* streamBackendInit(const char* path) {
   if (cfs != NULL) {
     rocksdb_list_column_families_destroy(cfs, nCf);
   }
+  qDebug("succ to init stream backend at %s, backend:%p", path, pHandle);
 
   return (void*)pHandle;
 _EXIT:
@@ -141,6 +144,7 @@ _EXIT:
   rocksdb_compactionfilterfactory_destroy(pHandle->filterFactory);
   tdListFree(pHandle->list);
   free(pHandle);
+  qDebug("failed to init stream backend at %s", path);
   return NULL;
 }
 void streamBackendCleanup(void* arg) {
@@ -180,7 +184,7 @@ void streamBackendCleanup(void* arg) {
   taosThreadMutexDestroy(&pHandle->cfMutex);
 
   taosMemoryFree(pHandle);
-
+  qDebug("destroy stream backend backend:%p", pHandle);
   return;
 }
 SListNode* streamBackendAddCompare(void* backend, void* arg) {
@@ -803,7 +807,8 @@ int32_t streamStateOpenBackendCf(void* backend, char* name, char** cfs, int32_t
   return 0;
 }
 int streamStateOpenBackend(void* backend, SStreamState* pState) {
-  qInfo("start to open backend, %p 0x%" PRIx64 "-%d", pState, pState->streamId, pState->taskId);
+  qInfo("start to open state %p on backend %p 0x%" PRIx64 "-%d", pState, backend, pState->streamId, pState->taskId);
+  taosAcquireRef(streamBackendId, pState->streamBackendRid);
   SBackendHandle* handle = backend;
 
   sprintf(pState->pTdbState->idstr, "0x%" PRIx64 "-%d", pState->streamId, pState->taskId);
@@ -866,7 +871,7 @@ int streamStateOpenBackend(void* backend, SStreamState* pState) {
   SCfComparator compare = {.comp = pCompare, .numOfComp = cfLen};
   pState->pTdbState->pComparNode = streamBackendAddCompare(handle, &compare);
   // rocksdb_writeoptions_disable_WAL(pState->pTdbState->writeOpts, 1);
-  qInfo("succ to open backend, %p, 0x%" PRIx64 "-%d", pState, pState->streamId, pState->taskId);
+  qInfo("succ to open state %p on backend, %p, 0x%" PRIx64 "-%d", pState, handle, pState->streamId, pState->taskId);
   return 0;
 }
 
@@ -882,8 +887,8 @@ void streamStateCloseBackend(SStreamState* pState, bool remove) {
   taosThreadMutexUnlock(&pHandle->cfMutex);
 
   char* status[] = {"close", "drop"};
-  qInfo("start to %s backend, %p, 0x%" PRIx64 "-%d", status[remove == false ? 0 : 1], pState, pState->streamId,
-        pState->taskId);
+  qInfo("start to %s state %p on backend %p 0x%" PRIx64 "-%d", status[remove == false ? 0 : 1], pState, pHandle,
+        pState->streamId, pState->taskId);
   if (pState->pTdbState->rocksdb == NULL) {
     return;
   }
@@ -938,6 +943,7 @@ void streamStateCloseBackend(SStreamState* pState, bool remove) {
 
   taosThreadRwlockDestroy(&pState->pTdbState->rwLock);
   pState->pTdbState->rocksdb = NULL;
+  taosReleaseRef(streamBackendId, pState->streamBackendRid);
 }
 void streamStateDestroyCompar(void* arg) {
   SCfComparator* comp = (SCfComparator*)arg;
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index 8c26052fdb..ed9f99cf78 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -20,7 +20,7 @@
 #include "ttimer.h"
 
 static TdThreadOnce streamMetaModuleInit = PTHREAD_ONCE_INIT;
-static int32_t      streamBackendId = 0;
+int32_t             streamBackendId = 0;
 static void         streamMetaEnvInit() { streamBackendId = taosOpenRef(20, streamBackendCleanup); }
 
 void streamMetaInit() { taosThreadOnce(&streamMetaModuleInit, streamMetaEnvInit); }
@@ -79,7 +79,6 @@ SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandF
   pMeta->vgId = vgId;
   pMeta->ahandle = ahandle;
   pMeta->expandFunc = expandFunc;
-  pMeta->streamBackendId = streamBackendId;
 
   memset(streamPath, 0, len);
   sprintf(streamPath, "%s/%s", pMeta->path, "state");
diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c
index 71a21ac150..0b91936f53 100644
--- a/source/libs/stream/src/streamState.c
+++ b/source/libs/stream/src/streamState.c
@@ -106,7 +106,7 @@ SStreamState* streamStateOpen(char* path, void* pTask, bool specPath, int32_t sz
   }
 
   SStreamTask* pStreamTask = pTask;
-  char statePath[1024];
+  char         statePath[1024];
   if (!specPath) {
     sprintf(statePath, "%s/%d", path, pStreamTask->id.taskId);
   } else {
@@ -119,10 +119,10 @@ SStreamState* streamStateOpen(char* path, void* pTask, bool specPath, int32_t sz
 
 #ifdef USE_ROCKSDB
   SStreamMeta* pMeta = pStreamTask->pMeta;
-  taosAcquireRef(pMeta->streamBackendId, pMeta->streamBackendRid);
+  pState->streamBackendRid = pMeta->streamBackendRid;
   int code = streamStateOpenBackend(pMeta->streamBackend, pState);
   if (code == -1) {
-    taosReleaseRef(pMeta->streamBackendId, pMeta->streamBackendRid);
+    taosReleaseRef(streamBackendId, pMeta->streamBackendRid);
     taosMemoryFree(pState);
     pState = NULL;
   }
@@ -224,7 +224,7 @@ void streamStateClose(SStreamState* pState, bool remove) {
 #ifdef USE_ROCKSDB
   // streamStateCloseBackend(pState);
   streamStateDestroy(pState, remove);
-  taosReleaseRef(pTask->pMeta->streamBackendId, pTask->pMeta->streamBackendRid);
+  //taosReleaseRef(pTask->pMeta->streamBackendId, pTask->pMeta->streamBackendRid);
 #else
   tdbCommit(pState->pTdbState->db, pState->pTdbState->txn);
   tdbPostCommit(pState->pTdbState->db, pState->pTdbState->txn);
@@ -278,10 +278,10 @@ int32_t streamStateCommit(SStreamState* pState) {
 
 int32_t streamStateFuncPut(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen) {
 #ifdef USE_ROCKSDB
-  void* pVal = NULL;
-  int32_t len = 0;
-  int32_t code = getRowBuff(pState->pFileState, (void*)key, sizeof(SWinKey), &pVal, &len);
-  char* buf = ((SRowBuffPos*)pVal)->pRowBuff;
+  void*    pVal = NULL;
+  int32_t  len = 0;
+  int32_t  code = getRowBuff(pState->pFileState, (void*)key, sizeof(SWinKey), &pVal, &len);
+  char*    buf = ((SRowBuffPos*)pVal)->pRowBuff;
   uint32_t rowSize = streamFileStateGeSelectRowSize(pState->pFileState);
   memcpy(buf + len - rowSize, value, vLen);
   return code;
@@ -291,10 +291,10 @@ int32_t streamStateFuncPut(SStreamState* pState, const SWinKey* key, const void*
 }
 int32_t streamStateFuncGet(SStreamState* pState, const SWinKey* key, void** ppVal, int32_t* pVLen) {
 #ifdef USE_ROCKSDB
-  void* pVal = NULL;
-  int32_t len = 0;
-  int32_t code = getRowBuff(pState->pFileState, (void*)key, sizeof(SWinKey), (void**)(&pVal), &len);
-  char* buf = ((SRowBuffPos*)pVal)->pRowBuff;
+  void*    pVal = NULL;
+  int32_t  len = 0;
+  int32_t  code = getRowBuff(pState->pFileState, (void*)key, sizeof(SWinKey), (void**)(&pVal), &len);
+  char*    buf = ((SRowBuffPos*)pVal)->pRowBuff;
   uint32_t rowSize = streamFileStateGeSelectRowSize(pState->pFileState);
   *ppVal = buf + len - rowSize;
   return code;

From 3108ecf84be54b1eea9718591072230c5f3f03ca Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 5 Jun 2023 06:38:17 +0000
Subject: [PATCH 21/58] fix invalid free

---
 source/libs/stream/src/streamBackendRocksdb.c | 5 +++--
 source/libs/stream/src/streamState.c          | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index d190f4b43e..9f1cab56e7 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -82,7 +82,7 @@ const char* comparePartagKeyName(void* name);
 
 void* streamBackendInit(const char* path) {
   qDebug("start to init stream backend at %s", path);
-  SBackendHandle* pHandle = calloc(1, sizeof(SBackendHandle));
+  SBackendHandle* pHandle = taosMemoryCalloc(1, sizeof(SBackendHandle));
   pHandle->list = tdListNew(sizeof(SCfComparator));
   taosThreadMutexInit(&pHandle->mutex, NULL);
   taosThreadMutexInit(&pHandle->cfMutex, NULL);
@@ -121,6 +121,7 @@ void* streamBackendInit(const char* path) {
     if (err != NULL) {
       qError("failed to open rocksdb, path:%s, reason:%s", path, err);
       taosMemoryFreeClear(err);
+      goto _EXIT;
     }
   } else {
     /*
@@ -887,7 +888,7 @@ void streamStateCloseBackend(SStreamState* pState, bool remove) {
   taosThreadMutexUnlock(&pHandle->cfMutex);
 
   char* status[] = {"close", "drop"};
-  qInfo("start to %s state %p on backend %p 0x%" PRIx64 "-%d", status[remove == false ? 0 : 1], pState, pHandle,
+  qInfo("start to close %s state %p on backend %p 0x%" PRIx64 "-%d", status[remove == false ? 0 : 1], pState, pHandle,
         pState->streamId, pState->taskId);
   if (pState->pTdbState->rocksdb == NULL) {
     return;
diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c
index 0b91936f53..967c7733c9 100644
--- a/source/libs/stream/src/streamState.c
+++ b/source/libs/stream/src/streamState.c
@@ -222,9 +222,7 @@ _err:
 void streamStateClose(SStreamState* pState, bool remove) {
   SStreamTask* pTask = pState->pTdbState->pOwner;
 #ifdef USE_ROCKSDB
-  // streamStateCloseBackend(pState);
   streamStateDestroy(pState, remove);
-  //taosReleaseRef(pTask->pMeta->streamBackendId, pTask->pMeta->streamBackendRid);
 #else
   tdbCommit(pState->pTdbState->db, pState->pTdbState->txn);
   tdbPostCommit(pState->pTdbState->db, pState->pTdbState->txn);

From 3e524d9aa363410ddb913c2007dd3a92e4591ea0 Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Mon, 5 Jun 2023 15:02:00 +0800
Subject: [PATCH 22/58] docs: add assignments and seek offset

---
 docs/en/14-reference/03-connector/06-rust.mdx | 14 +++++++++++++-
 docs/zh/08-connector/26-rust.mdx              | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/docs/en/14-reference/03-connector/06-rust.mdx b/docs/en/14-reference/03-connector/06-rust.mdx
index 99c3d2c066..6af91d01ac 100644
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
@@ -499,6 +499,18 @@ The TMQ is of [futures::Stream](https://docs.rs/futures/latest/futures/stream/in
 }
 ```
 
+Get assignments：
+
+```rust
+let assignments = consumer.assignments().await.unwrap();
+```
+
+Seek offset：
+
+```rust
+consumer.offset_seek(topic, vgroup_id, offset).await;
+```
+
 Unsubscribe:
 
 ```rust
@@ -513,7 +525,7 @@ The following parameters can be configured for the TMQ DSN. Only `group.id` is m
 - `enable.auto.commit`: Automatically commits. This can be enabled when data consistency is not essential.
 - `auto.commit.interval.ms`: Interval for automatic commits.
   
-For more information, see [GitHub sample file](https://github.com/taosdata/taos-connector-rust/blob/main/examples/subscribe.rs).
+For more information, see [GitHub sample file](https://github.com/taosdata/TDengine/blob/3.0/docs/examples/rust/nativeexample/examples/subscribe_demo.rs).
 
 For information about other structure APIs, see the [Rust documentation](https://docs.rs/taos).
 
diff --git a/docs/zh/08-connector/26-rust.mdx b/docs/zh/08-connector/26-rust.mdx
index 41a429b026..095271e7da 100644
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
@@ -502,6 +502,18 @@ TMQ 消息队列是一个 [futures::Stream](https://docs.rs/futures/latest/futur
 }
 ```
 
+获取消费进度：
+
+```rust
+let assignments = consumer.assignments().await.unwrap();
+```
+
+按照指定的进度消费：
+
+```rust
+consumer.offset_seek(topic, vgroup_id, offset).await;
+```
+
 停止订阅：
 
 ```rust
@@ -516,7 +528,7 @@ consumer.unsubscribe().await;
 - `enable.auto.commit`: 当设置为 `true` 时，将启用自动标记模式，当对数据一致性不敏感时，可以启用此方式。
 - `auto.commit.interval.ms`: 自动标记的时间间隔。
   
-完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/taos-connector-rust/blob/main/examples/subscribe.rs).
+完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/TDengine/blob/3.0/docs/examples/rust/nativeexample/examples/subscribe_demo.rs).
 
 其他相关结构体 API 使用说明请移步 Rust 文档托管网页：<https://docs.rs/taos>。
 

From b1800a2bd5e6dd625d0328062abf5e86c247c065 Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Mon, 5 Jun 2023 15:12:58 +0800
Subject: [PATCH 23/58] docs: add version requirements

---
 docs/zh/08-connector/26-rust.mdx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/zh/08-connector/26-rust.mdx b/docs/zh/08-connector/26-rust.mdx
index 095271e7da..9bb444d9e8 100644
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
@@ -504,12 +504,17 @@ TMQ 消息队列是一个 [futures::Stream](https://docs.rs/futures/latest/futur
 
 获取消费进度：
 
+版本要求 connector-rust >= v0.8.8， TDengine >= 3.0.5.0
+
 ```rust
 let assignments = consumer.assignments().await.unwrap();
 ```
 
 按照指定的进度消费：
 
+版本要求 connector-rust >= v0.8.8， TDengine >= 3.0.5.0
+
+
 ```rust
 consumer.offset_seek(topic, vgroup_id, offset).await;
 ```

From 985362d94c3370e3a56c0a3cd5e3581814f16e60 Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Mon, 5 Jun 2023 15:16:03 +0800
Subject: [PATCH 24/58] docs: add version

---
 docs/en/14-reference/03-connector/06-rust.mdx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/14-reference/03-connector/06-rust.mdx b/docs/en/14-reference/03-connector/06-rust.mdx
index 6af91d01ac..650d0d516d 100644
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
@@ -501,12 +501,16 @@ The TMQ is of [futures::Stream](https://docs.rs/futures/latest/futures/stream/in
 
 Get assignments：
 
+Version requirements connector-rust >= v0.8.8， TDengine >= 3.0.5.0
+
 ```rust
 let assignments = consumer.assignments().await.unwrap();
 ```
 
 Seek offset：
 
+Version requirements connector-rust >= v0.8.8， TDengine >= 3.0.5.0
+
 ```rust
 consumer.offset_seek(topic, vgroup_id, offset).await;
 ```

From 8ccfb2907997171aff471568477f24cea4be136d Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Mon, 5 Jun 2023 15:16:13 +0800
Subject: [PATCH 25/58] docs: fmt lines

---
 docs/zh/08-connector/26-rust.mdx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/zh/08-connector/26-rust.mdx b/docs/zh/08-connector/26-rust.mdx
index 9bb444d9e8..e1e94e068f 100644
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
@@ -514,7 +514,6 @@ let assignments = consumer.assignments().await.unwrap();
 
 版本要求 connector-rust >= v0.8.8， TDengine >= 3.0.5.0
 
-
 ```rust
 consumer.offset_seek(topic, vgroup_id, offset).await;
 ```

From 3d0b02f5d637f7ab54951ce2c195fb44ec30c04b Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Mon, 5 Jun 2023 15:17:07 +0800
Subject: [PATCH 26/58] docs: fmt lines

---
 docs/en/14-reference/03-connector/06-rust.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/14-reference/03-connector/06-rust.mdx b/docs/en/14-reference/03-connector/06-rust.mdx
index 650d0d516d..fb7c368df1 100644
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
@@ -501,7 +501,7 @@ The TMQ is of [futures::Stream](https://docs.rs/futures/latest/futures/stream/in
 
 Get assignments：
 
-Version requirements connector-rust >= v0.8.8， TDengine >= 3.0.5.0
+Version requirements connector-rust >= v0.8.8, TDengine >= 3.0.5.0
 
 ```rust
 let assignments = consumer.assignments().await.unwrap();
@@ -509,7 +509,7 @@ let assignments = consumer.assignments().await.unwrap();
 
 Seek offset：
 
-Version requirements connector-rust >= v0.8.8， TDengine >= 3.0.5.0
+Version requirements connector-rust >= v0.8.8, TDengine >= 3.0.5.0
 
 ```rust
 consumer.offset_seek(topic, vgroup_id, offset).await;

From be34546edd8935917f05e663dede14a0b919e5af Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 5 Jun 2023 15:19:06 +0800
Subject: [PATCH 27/58] enh: enable interp fill value support scarlar
 expression

---
 source/libs/parser/src/parTranslater.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index c10ee5d988..57f708c5cd 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -707,6 +707,10 @@ static bool isWindowPseudoColumnFunc(const SNode* pNode) {
   return (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsWindowPseudoColumnFunc(((SFunctionNode*)pNode)->funcId));
 }
 
+static bool isInterpFunc(const SNode* pNode) {
+  return (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsInterpFunc(((SFunctionNode*)pNode)->funcId));
+}
+
 static bool isInterpPseudoColumnFunc(const SNode* pNode) {
   return (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsInterpPseudoColumnFunc(((SFunctionNode*)pNode)->funcId));
 }
@@ -3006,7 +3010,7 @@ static int32_t translateOrderBy(STranslateContext* pCxt, SSelectStmt* pSelect) {
 }
 
 static EDealRes needFillImpl(SNode* pNode, void* pContext) {
-  if (isAggFunc(pNode) && FUNCTION_TYPE_GROUP_KEY != ((SFunctionNode*)pNode)->funcType) {
+  if ((isAggFunc(pNode) || isInterpFunc(pNode)) && FUNCTION_TYPE_GROUP_KEY != ((SFunctionNode*)pNode)->funcType) {
     *(bool*)pContext = true;
     return DEAL_RES_END;
   }
@@ -3517,6 +3521,9 @@ static int32_t translateInterpFill(STranslateContext* pCxt, SSelectStmt* pSelect
   if (TSDB_CODE_SUCCESS == code) {
     code = checkFill(pCxt, (SFillNode*)pSelect->pFill, (SValueNode*)pSelect->pEvery, true);
   }
+  if (TSDB_CODE_SUCCESS == code) {
+    code = checkFillValues(pCxt, (SFillNode*)pSelect->pFill, pSelect->pProjectionList);
+  }
 
   return code;
 }

From d02746d86f3773664e990490e767ed2b717ed8e1 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Mon, 5 Jun 2023 15:24:39 +0800
Subject: [PATCH 28/58] fix(query/sys): pause/resume with sys scan operator

---
 include/libs/executor/storageapi.h         | 218 +++++++++++----------
 source/dnode/vnode/src/inc/vnodeInt.h      |  17 +-
 source/dnode/vnode/src/meta/metaQuery.c    |  78 +++++---
 source/dnode/vnode/src/vnd/vnodeInitApi.c  |  28 +--
 source/libs/executor/src/sysscanoperator.c |  43 ++--
 5 files changed, 221 insertions(+), 163 deletions(-)

diff --git a/include/libs/executor/storageapi.h b/include/libs/executor/storageapi.h
index 4cfbf2c2fa..e2944d13da 100644
--- a/include/libs/executor/storageapi.h
+++ b/include/libs/executor/storageapi.h
@@ -16,13 +16,13 @@
 #ifndef TDENGINE_STORAGEAPI_H
 #define TDENGINE_STORAGEAPI_H
 
-#include "tsimplehash.h"
-#include "tscalablebf.h"
-#include "taosdef.h"
-#include "tmsg.h"
-#include "tcommon.h"
-#include "index.h"
 #include "function.h"
+#include "index.h"
+#include "taosdef.h"
+#include "tcommon.h"
+#include "tmsg.h"
+#include "tscalablebf.h"
+#include "tsimplehash.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,7 +46,7 @@ typedef struct SMetaEntry {
   int8_t   type;
   int8_t   flags;  // TODO: need refactor?
   tb_uid_t uid;
-  char *   name;
+  char*    name;
   union {
     struct {
       SSchemaWrapper schemaRow;
@@ -57,43 +57,45 @@ typedef struct SMetaEntry {
       int64_t  ctime;
       int32_t  ttlDays;
       int32_t  commentLen;
-      char *   comment;
+      char*    comment;
       tb_uid_t suid;
-      uint8_t *pTags;
+      uint8_t* pTags;
     } ctbEntry;
     struct {
       int64_t        ctime;
       int32_t        ttlDays;
       int32_t        commentLen;
-      char *         comment;
+      char*          comment;
       int32_t        ncid;  // next column id
       SSchemaWrapper schemaRow;
     } ntbEntry;
     struct {
-      STSma *tsma;
+      STSma* tsma;
     } smaEntry;
   };
 
-  uint8_t *pBuf;
+  uint8_t* pBuf;
 } SMetaEntry;
 
 typedef struct SMetaReader {
-  int32_t             flags;
-  void *              pMeta;
-  SDecoder            coder;
-  SMetaEntry          me;
-  void *              pBuf;
-  int32_t             szBuf;
-  struct SStoreMeta*  pAPI;
+  int32_t            flags;
+  void*              pMeta;
+  SDecoder           coder;
+  SMetaEntry         me;
+  void*              pBuf;
+  int32_t            szBuf;
+  struct SStoreMeta* pAPI;
 } SMetaReader;
 
 typedef struct SMTbCursor {
-  void *      pDbc;
-  void *      pKey;
-  void *      pVal;
+  void*       pMeta;
+  void*       pDbc;
+  void*       pKey;
+  void*       pVal;
   int32_t     kLen;
   int32_t     vLen;
   SMetaReader mr;
+  int8_t      paused;
 } SMTbCursor;
 
 typedef struct SRowBuffPos {
@@ -107,22 +109,22 @@ typedef struct SRowBuffPos {
 typedef struct SMetaTableInfo {
   int64_t         suid;
   int64_t         uid;
-  SSchemaWrapper *schema;
+  SSchemaWrapper* schema;
   char            tbName[TSDB_TABLE_NAME_LEN];
 } SMetaTableInfo;
 
 typedef struct SSnapContext {
-  SMeta *     pMeta;     // todo remove it
-  int64_t     snapVersion;
-  void *      pCur;
-  int64_t     suid;
-  int8_t      subType;
-  SHashObj *  idVersion;
-  SHashObj *  suidInfo;
-  SArray *    idList;
-  int32_t     index;
-  bool        withMeta;
-  bool        queryMeta;  // true-get meta, false-get data
+  SMeta*    pMeta;  // todo remove it
+  int64_t   snapVersion;
+  void*     pCur;
+  int64_t   suid;
+  int8_t    subType;
+  SHashObj* idVersion;
+  SHashObj* suidInfo;
+  SArray*   idList;
+  int32_t   index;
+  bool      withMeta;
+  bool      queryMeta;  // true-get meta, false-get data
 } SSnapContext;
 
 typedef struct {
@@ -139,10 +141,9 @@ typedef struct {
 // int32_t tqReaderSeek(STqReader *pReader, int64_t ver, const char *id);
 // bool    tqNextBlockInWal(STqReader* pReader, const char* idstr);
 // bool    tqNextBlockImpl(STqReader *pReader, const char* idstr);
-// int32_t        getTableInfoFromSnapshot(SSnapContext *ctx, void **pBuf, int32_t *contLen, int16_t *type, int64_t *uid);
-// SMetaTableInfo getMetaTableInfoFromSnapshot(SSnapContext *ctx);
-// int32_t        setForSnapShot(SSnapContext *ctx, int64_t uid);
-// int32_t        destroySnapContext(SSnapContext *ctx);
+// int32_t        getTableInfoFromSnapshot(SSnapContext *ctx, void **pBuf, int32_t *contLen, int16_t *type, int64_t
+// *uid); SMetaTableInfo getMetaTableInfoFromSnapshot(SSnapContext *ctx); int32_t        setForSnapShot(SSnapContext
+// *ctx, int64_t uid); int32_t        destroySnapContext(SSnapContext *ctx);
 
 // clang-format off
 /*-------------------------------------------------new api format---------------------------------------------------*/
@@ -219,16 +220,16 @@ typedef struct SStoreTqReader {
   bool (*tqReaderIsQueriedTable)();
   bool (*tqReaderCurrentBlockConsumed)();
 
-  struct SWalReader *(*tqReaderGetWalReader)();  // todo remove it
-  int32_t (*tqReaderRetrieveTaosXBlock)();          // todo remove it
+  struct SWalReader* (*tqReaderGetWalReader)();  // todo remove it
+  int32_t (*tqReaderRetrieveTaosXBlock)();       // todo remove it
 
   int32_t (*tqReaderSetSubmitMsg)();  // todo remove it
   bool (*tqReaderNextBlockFilterOut)();
 } SStoreTqReader;
 
 typedef struct SStoreSnapshotFn {
-  int32_t (*createSnapshot)(SSnapContext *ctx, int64_t uid);
-  int32_t (*destroySnapshot)(SSnapContext *ctx);
+  int32_t (*createSnapshot)(SSnapContext* ctx, int64_t uid);
+  int32_t (*destroySnapshot)(SSnapContext* ctx);
   SMetaTableInfo (*getMetaTableInfoFromSnapshot)(SSnapContext* ctx);
   int32_t (*getTableInfoFromSnapshot)(SSnapContext* ctx, void** pBuf, int32_t* contLen, int16_t* type, int64_t* uid);
 } SStoreSnapshotFn;
@@ -252,42 +253,54 @@ int32_t  metaUidFilterCachePut(SMeta *pMeta, uint64_t suid, const void *pKey, in
                                int32_t payloadLen, double selectivityRatio);
 tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name);
 int32_t  metaGetCachedTbGroup(SMeta* pMeta, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray** pList);
-int32_t  metaPutTbGroupToCache(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload, int32_t payloadLen);
+int32_t  metaPutTbGroupToCache(SMeta* pMeta, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload, int32_t
+payloadLen);
  */
 
 typedef struct SStoreMeta {
-  SMTbCursor *(*openTableMetaCursor)(void *pVnode);                        // metaOpenTbCursor
-  void        (*closeTableMetaCursor)(SMTbCursor *pTbCur);                 // metaCloseTbCursor
-  int32_t     (*cursorNext)(SMTbCursor *pTbCur, ETableType jumpTableType); // metaTbCursorNext
-  int32_t     (*cursorPrev)(SMTbCursor *pTbCur, ETableType jumpTableType); // metaTbCursorPrev
+  SMTbCursor* (*openTableMetaCursor)(void* pVnode);                     // metaOpenTbCursor
+  void (*closeTableMetaCursor)(SMTbCursor* pTbCur);                     // metaCloseTbCursor
+  void (*pauseTableMetaCursor)(SMTbCursor* pTbCur);                     // metaPauseTbCursor
+  void (*resumeTableMetaCursor)(SMTbCursor* pTbCur, int8_t first);      // metaResumeTbCursor
+  int32_t (*cursorNext)(SMTbCursor* pTbCur, ETableType jumpTableType);  // metaTbCursorNext
+  int32_t (*cursorPrev)(SMTbCursor* pTbCur, ETableType jumpTableType);  // metaTbCursorPrev
 
-  int32_t     (*getTableTags)(void *pVnode, uint64_t suid, SArray *uidList);
-  int32_t     (*getTableTagsByUid)(void *pVnode, int64_t suid, SArray *uidList);
-  const void *(*extractTagVal)(const void *tag, int16_t type, STagVal *tagVal);  // todo remove it
+  int32_t (*getTableTags)(void* pVnode, uint64_t suid, SArray* uidList);
+  int32_t (*getTableTagsByUid)(void* pVnode, int64_t suid, SArray* uidList);
+  const void* (*extractTagVal)(const void* tag, int16_t type, STagVal* tagVal);  // todo remove it
 
-  int32_t     (*getTableUidByName)(void *pVnode, char *tbName, uint64_t *uid);
-  int32_t     (*getTableTypeByName)(void *pVnode, char *tbName, ETableType *tbType);
-  int32_t     (*getTableNameByUid)(void *pVnode, uint64_t uid, char *tbName);
-  bool        (*isTableExisted)(void *pVnode, tb_uid_t uid);
+  int32_t (*getTableUidByName)(void* pVnode, char* tbName, uint64_t* uid);
+  int32_t (*getTableTypeByName)(void* pVnode, char* tbName, ETableType* tbType);
+  int32_t (*getTableNameByUid)(void* pVnode, uint64_t uid, char* tbName);
+  bool (*isTableExisted)(void* pVnode, tb_uid_t uid);
 
-  int32_t     (*metaGetCachedTbGroup)(void* pVnode, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray** pList);
-  int32_t     (*metaPutTbGroupToCache)(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload, int32_t payloadLen);
+  int32_t (*metaGetCachedTbGroup)(void* pVnode, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray** pList);
+  int32_t (*metaPutTbGroupToCache)(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
+                                   int32_t payloadLen);
 
-  int32_t     (*getCachedTableList)(void* pVnode, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray* pList1, bool* acquireRes);
-  int32_t     (*putCachedTableList)(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload, int32_t payloadLen, double selectivityRatio);
+  int32_t (*getCachedTableList)(void* pVnode, tb_uid_t suid, const uint8_t* pKey, int32_t keyLen, SArray* pList1,
+                                bool* acquireRes);
+  int32_t (*putCachedTableList)(void* pVnode, uint64_t suid, const void* pKey, int32_t keyLen, void* pPayload,
+                                int32_t payloadLen, double selectivityRatio);
 
-  void       *(*storeGetIndexInfo)();
-  void       *(*getInvertIndex)(void* pVnode);
-  int32_t     (*getChildTableList)(void *pVnode, int64_t suid, SArray *list);  // support filter and non-filter cases. [vnodeGetCtbIdList & vnodeGetCtbIdListByFilter]
-  int32_t     (*storeGetTableList)(void* pVnode, int8_t type, SArray* pList);    // vnodeGetStbIdList  & vnodeGetAllTableList
-  void       *storeGetVersionRange;
-  void       *storeGetLastTimestamp;
+  void* (*storeGetIndexInfo)();
+  void* (*getInvertIndex)(void* pVnode);
+  int32_t (*getChildTableList)(
+      void* pVnode, int64_t suid,
+      SArray* list);  // support filter and non-filter cases. [vnodeGetCtbIdList & vnodeGetCtbIdListByFilter]
+  int32_t (*storeGetTableList)(void* pVnode, int8_t type, SArray* pList);  // vnodeGetStbIdList  & vnodeGetAllTableList
+  void* storeGetVersionRange;
+  void* storeGetLastTimestamp;
 
-  int32_t     (*getTableSchema)(void *pVnode, int64_t uid, STSchema **pSchema, int64_t *suid);  // tsdbGetTableSchema
+  int32_t (*getTableSchema)(void* pVnode, int64_t uid, STSchema** pSchema, int64_t* suid);  // tsdbGetTableSchema
 
   // db name, vgId, numOfTables, numOfSTables
-  int32_t (*getNumOfChildTables)(void* pVnode, int64_t uid, int64_t* numOfTables);  // int32_t metaGetStbStats(SMeta *pMeta, int64_t uid, SMetaStbStats *pInfo);
-  void (*getBasicInfo)(void *pVnode, const char **dbname, int32_t *vgId, int64_t* numOfTables, int64_t* numOfNormalTables);// vnodeGetInfo(void *pVnode, const char **dbname, int32_t *vgId) & metaGetTbNum(SMeta *pMeta) & metaGetNtbNum(SMeta *pMeta);
+  int32_t (*getNumOfChildTables)(
+      void* pVnode, int64_t uid,
+      int64_t* numOfTables);  // int32_t metaGetStbStats(SMeta *pMeta, int64_t uid, SMetaStbStats *pInfo);
+  void (*getBasicInfo)(void* pVnode, const char** dbname, int32_t* vgId, int64_t* numOfTables,
+                       int64_t* numOfNormalTables);  // vnodeGetInfo(void *pVnode, const char **dbname, int32_t *vgId) &
+                                                     // metaGetTbNum(SMeta *pMeta) & metaGetNtbNum(SMeta *pMeta);
 
   int64_t (*getNumOfRowsInMem)(void* pVnode);
   /**
@@ -298,24 +311,24 @@ int32_t vnodeGetStbIdList(void *pVnode, int64_t suid, SArray *list);
 } SStoreMeta;
 
 typedef struct SStoreMetaReader {
-  void    (*initReader)(SMetaReader *pReader, void *pVnode, int32_t flags, SStoreMeta* pAPI);
-  void    (*clearReader)(SMetaReader *pReader);
-  void    (*readerReleaseLock)(SMetaReader *pReader);
-  int32_t (*getTableEntryByUid)(SMetaReader *pReader, tb_uid_t uid);
-  int32_t (*getTableEntryByName)(SMetaReader *pReader, const char *name);
-  int32_t (*getEntryGetUidCache)(SMetaReader *pReader, tb_uid_t uid);
+  void (*initReader)(SMetaReader* pReader, void* pVnode, int32_t flags, SStoreMeta* pAPI);
+  void (*clearReader)(SMetaReader* pReader);
+  void (*readerReleaseLock)(SMetaReader* pReader);
+  int32_t (*getTableEntryByUid)(SMetaReader* pReader, tb_uid_t uid);
+  int32_t (*getTableEntryByName)(SMetaReader* pReader, const char* name);
+  int32_t (*getEntryGetUidCache)(SMetaReader* pReader, tb_uid_t uid);
 } SStoreMetaReader;
 
 typedef struct SUpdateInfo {
-  SArray      *pTsBuckets;
+  SArray*      pTsBuckets;
   uint64_t     numBuckets;
-  SArray      *pTsSBFs;
+  SArray*      pTsSBFs;
   uint64_t     numSBFs;
   int64_t      interval;
   int64_t      watermark;
   TSKEY        minTS;
-  SScalableBf *pCloseWinSBF;
-  SHashObj    *pMap;
+  SScalableBf* pCloseWinSBF;
+  SHashObj*    pMap;
   uint64_t     maxDataVersion;
 } SUpdateInfo;
 
@@ -334,15 +347,15 @@ typedef struct SStateStore {
 
   int32_t (*streamStateAddIfNotExist)(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
   int32_t (*streamStateReleaseBuf)(SStreamState* pState, const SWinKey* key, void* pVal);
-  void    (*streamStateFreeVal)(void* val);
+  void (*streamStateFreeVal)(void* val);
 
   int32_t (*streamStatePut)(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen);
   int32_t (*streamStateGet)(SStreamState* pState, const SWinKey* key, void** pVal, int32_t* pVLen);
-  bool    (*streamStateCheck)(SStreamState* pState, const SWinKey* key);
+  bool (*streamStateCheck)(SStreamState* pState, const SWinKey* key);
   int32_t (*streamStateGetByPos)(SStreamState* pState, void* pos, void** pVal);
   int32_t (*streamStateDel)(SStreamState* pState, const SWinKey* key);
   int32_t (*streamStateClear)(SStreamState* pState);
-  void    (*streamStateSetNumber)(SStreamState* pState, int32_t number);
+  void (*streamStateSetNumber)(SStreamState* pState, int32_t number);
   int32_t (*streamStateSaveInfo)(SStreamState* pState, void* pKey, int32_t keyLen, void* pVal, int32_t vLen);
   int32_t (*streamStateGetInfo)(SStreamState* pState, void* pKey, int32_t keyLen, void** pVal, int32_t* pLen);
 
@@ -353,36 +366,37 @@ typedef struct SStateStore {
   int32_t (*streamStateCurNext)(SStreamState* pState, SStreamStateCur* pCur);
   int32_t (*streamStateCurPrev)(SStreamState* pState, SStreamStateCur* pCur);
 
-  SStreamStateCur*  (*streamStateGetAndCheckCur)(SStreamState* pState, SWinKey* key);
-  SStreamStateCur*  (*streamStateSeekKeyNext)(SStreamState* pState, const SWinKey* key);
-  SStreamStateCur*  (*streamStateFillSeekKeyNext)(SStreamState* pState, const SWinKey* key);
-  SStreamStateCur*  (*streamStateFillSeekKeyPrev)(SStreamState* pState, const SWinKey* key);
-  void   (*streamStateFreeCur)(SStreamStateCur* pCur);
+  SStreamStateCur* (*streamStateGetAndCheckCur)(SStreamState* pState, SWinKey* key);
+  SStreamStateCur* (*streamStateSeekKeyNext)(SStreamState* pState, const SWinKey* key);
+  SStreamStateCur* (*streamStateFillSeekKeyNext)(SStreamState* pState, const SWinKey* key);
+  SStreamStateCur* (*streamStateFillSeekKeyPrev)(SStreamState* pState, const SWinKey* key);
+  void (*streamStateFreeCur)(SStreamStateCur* pCur);
 
   int32_t (*streamStateGetGroupKVByCur)(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);
   int32_t (*streamStateGetKVByCur)(SStreamStateCur* pCur, SWinKey* pKey, const void** pVal, int32_t* pVLen);
 
-  int32_t (*streamStateSessionAddIfNotExist)(SStreamState* pState, SSessionKey* key, TSKEY gap, void** pVal, int32_t* pVLen);
+  int32_t (*streamStateSessionAddIfNotExist)(SStreamState* pState, SSessionKey* key, TSKEY gap, void** pVal,
+                                             int32_t* pVLen);
   int32_t (*streamStateSessionPut)(SStreamState* pState, const SSessionKey* key, const void* value, int32_t vLen);
   int32_t (*streamStateSessionGet)(SStreamState* pState, SSessionKey* key, void** pVal, int32_t* pVLen);
   int32_t (*streamStateSessionDel)(SStreamState* pState, const SSessionKey* key);
   int32_t (*streamStateSessionClear)(SStreamState* pState);
   int32_t (*streamStateSessionGetKVByCur)(SStreamStateCur* pCur, SSessionKey* pKey, void** pVal, int32_t* pVLen);
   int32_t (*streamStateStateAddIfNotExist)(SStreamState* pState, SSessionKey* key, char* pKeyData, int32_t keyDataLen,
-                                     state_key_cmpr_fn fn, void** pVal, int32_t* pVLen);
+                                           state_key_cmpr_fn fn, void** pVal, int32_t* pVLen);
   int32_t (*streamStateSessionGetKeyByRange)(SStreamState* pState, const SSessionKey* range, SSessionKey* curKey);
 
-  SUpdateInfo*   (*updateInfoInit)(int64_t interval, int32_t precision, int64_t watermark);
-  TSKEY   (*updateInfoFillBlockData)(SUpdateInfo *pInfo, SSDataBlock *pBlock, int32_t primaryTsCol);
-  bool    (*updateInfoIsUpdated)(SUpdateInfo *pInfo, uint64_t tableId, TSKEY ts);
-  bool    (*updateInfoIsTableInserted)(SUpdateInfo *pInfo, int64_t tbUid);
-  void    (*updateInfoDestroy)(SUpdateInfo *pInfo);
+  SUpdateInfo* (*updateInfoInit)(int64_t interval, int32_t precision, int64_t watermark);
+  TSKEY (*updateInfoFillBlockData)(SUpdateInfo* pInfo, SSDataBlock* pBlock, int32_t primaryTsCol);
+  bool (*updateInfoIsUpdated)(SUpdateInfo* pInfo, uint64_t tableId, TSKEY ts);
+  bool (*updateInfoIsTableInserted)(SUpdateInfo* pInfo, int64_t tbUid);
+  void (*updateInfoDestroy)(SUpdateInfo* pInfo);
 
-  SUpdateInfo* (*updateInfoInitP)(SInterval *pInterval, int64_t watermark);
-  void        (*updateInfoAddCloseWindowSBF)(SUpdateInfo *pInfo);
-  void        (*updateInfoDestoryColseWinSBF)(SUpdateInfo *pInfo);
-  int32_t     (*updateInfoSerialize)(void *buf, int32_t bufLen, const SUpdateInfo *pInfo);
-  int32_t     (*updateInfoDeserialize)(void *buf, int32_t bufLen, SUpdateInfo *pInfo);
+  SUpdateInfo* (*updateInfoInitP)(SInterval* pInterval, int64_t watermark);
+  void (*updateInfoAddCloseWindowSBF)(SUpdateInfo* pInfo);
+  void (*updateInfoDestoryColseWinSBF)(SUpdateInfo* pInfo);
+  int32_t (*updateInfoSerialize)(void* buf, int32_t bufLen, const SUpdateInfo* pInfo);
+  int32_t (*updateInfoDeserialize)(void* buf, int32_t bufLen, SUpdateInfo* pInfo);
 
   SStreamStateCur* (*streamStateSessionSeekKeyNext)(SStreamState* pState, const SSessionKey* key);
   SStreamStateCur* (*streamStateSessionSeekKeyCurrentPrev)(SStreamState* pState, const SSessionKey* key);
@@ -396,11 +410,11 @@ typedef struct SStateStore {
   bool (*needClearDiskBuff)(struct SStreamFileState* pFileState);
 
   SStreamState* (*streamStateOpen)(char* path, void* pTask, bool specPath, int32_t szPage, int32_t pages);
-  void          (*streamStateClose)(SStreamState* pState, bool remove);
-  int32_t       (*streamStateBegin)(SStreamState* pState);
-  int32_t       (*streamStateCommit)(SStreamState* pState);
-  void          (*streamStateDestroy)(SStreamState* pState, bool remove);
-  int32_t       (*streamStateDeleteCheckPoint)(SStreamState* pState, TSKEY mark);
+  void (*streamStateClose)(SStreamState* pState, bool remove);
+  int32_t (*streamStateBegin)(SStreamState* pState);
+  int32_t (*streamStateCommit)(SStreamState* pState);
+  void (*streamStateDestroy)(SStreamState* pState, bool remove);
+  int32_t (*streamStateDeleteCheckPoint)(SStreamState* pState, TSKEY mark);
 } SStateStore;
 
 typedef struct SStorageAPI {
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index db285dc124..96486ec317 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -107,10 +107,12 @@ struct SQueryNode {
 typedef SVCreateTbReq   STbCfg;
 typedef SVCreateTSmaReq SSmaCfg;
 
-SMTbCursor *metaOpenTbCursor(void *pVnode);
-void        metaCloseTbCursor(SMTbCursor *pTbCur);
-int32_t     metaTbCursorNext(SMTbCursor *pTbCur, ETableType jumpTableType);
-int32_t     metaTbCursorPrev(SMTbCursor *pTbCur, ETableType jumpTableType);
+SMTbCursor* metaOpenTbCursor(void* pVnode);
+void        metaCloseTbCursor(SMTbCursor* pTbCur);
+void        metaPauseTbCursor(SMTbCursor* pTbCur);
+void        metaResumeTbCursor(SMTbCursor* pTbCur, int8_t first);
+int32_t     metaTbCursorNext(SMTbCursor* pTbCur, ETableType jumpTableType);
+int32_t     metaTbCursorPrev(SMTbCursor* pTbCur, ETableType jumpTableType);
 
 #endif
 
@@ -154,8 +156,8 @@ int32_t         metaGetTbTSchemaEx(SMeta* pMeta, tb_uid_t suid, tb_uid_t uid, in
 int             metaGetTableEntryByName(SMetaReader* pReader, const char* name);
 int             metaAlterCache(SMeta* pMeta, int32_t nPage);
 
-int32_t         metaUidCacheClear(SMeta* pMeta, uint64_t suid);
-int32_t         metaTbGroupCacheClear(SMeta *pMeta, uint64_t suid);
+int32_t metaUidCacheClear(SMeta* pMeta, uint64_t suid);
+int32_t metaTbGroupCacheClear(SMeta* pMeta, uint64_t suid);
 
 int metaAddIndexToSTable(SMeta* pMeta, int64_t version, SVCreateStbReq* pReq);
 int metaDropIndexFromSTable(SMeta* pMeta, int64_t version, SDropIndexReq* pReq);
@@ -175,7 +177,7 @@ void*         metaGetIdx(SMeta* pMeta);
 void*         metaGetIvtIdx(SMeta* pMeta);
 int           metaTtlSmaller(SMeta* pMeta, uint64_t time, SArray* uidList);
 
-void metaReaderInit(SMetaReader *pReader, SMeta *pMeta, int32_t flags);
+void metaReaderInit(SMetaReader* pReader, SMeta* pMeta, int32_t flags);
 
 int32_t metaCreateTSma(SMeta* pMeta, int64_t version, SSmaCfg* pCfg);
 int32_t metaDropTSma(SMeta* pMeta, int64_t indexUid);
@@ -491,7 +493,6 @@ struct SCompactInfo {
 
 void initStorageAPI(SStorageAPI* pAPI);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/vnode/src/meta/metaQuery.c b/source/dnode/vnode/src/meta/metaQuery.c
index fa9eea5e29..29fe89c3f2 100644
--- a/source/dnode/vnode/src/meta/metaQuery.c
+++ b/source/dnode/vnode/src/meta/metaQuery.c
@@ -17,8 +17,8 @@
 #include "osMemory.h"
 #include "tencode.h"
 
-void _metaReaderInit(SMetaReader* pReader, void* pVnode, int32_t flags, SStoreMeta* pAPI) {
-  SMeta* pMeta = ((SVnode*)pVnode)->pMeta;
+void _metaReaderInit(SMetaReader *pReader, void *pVnode, int32_t flags, SStoreMeta *pAPI) {
+  SMeta *pMeta = ((SVnode *)pVnode)->pMeta;
   metaReaderInit(pReader, pMeta, flags);
   pReader->pAPI = pAPI;
 }
@@ -71,7 +71,7 @@ _err:
 }
 
 bool metaIsTableExist(void *pVnode, tb_uid_t uid) {
-  SVnode* pVnodeObj = pVnode;
+  SVnode *pVnodeObj = pVnode;
   metaRLock(pVnodeObj->pMeta);  // query uid.idx
 
   if (tdbTbGet(pVnodeObj->pMeta->pUidIdx, &uid, sizeof(uid), NULL, NULL) < 0) {
@@ -143,7 +143,7 @@ tb_uid_t metaGetTableEntryUidByName(SMeta *pMeta, const char *name) {
 int metaGetTableNameByUid(void *pVnode, uint64_t uid, char *tbName) {
   int         code = 0;
   SMetaReader mr = {0};
-  metaReaderInit(&mr, ((SVnode*)pVnode)->pMeta, 0);
+  metaReaderInit(&mr, ((SVnode *)pVnode)->pMeta, 0);
   code = metaReaderGetTableEntryByUid(&mr, uid);
   if (code < 0) {
     metaReaderClear(&mr);
@@ -179,7 +179,7 @@ int metaGetTableUidByName(void *pVnode, char *tbName, uint64_t *uid) {
   SMetaReader *pReader = &mr;
 
   // query name.idx
-  if (tdbTbGet(((SMeta*)pReader->pMeta)->pNameIdx, tbName, strlen(tbName) + 1, &pReader->pBuf, &pReader->szBuf) < 0) {
+  if (tdbTbGet(((SMeta *)pReader->pMeta)->pNameIdx, tbName, strlen(tbName) + 1, &pReader->pBuf, &pReader->szBuf) < 0) {
     terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
     metaReaderClear(&mr);
     return -1;
@@ -195,7 +195,7 @@ int metaGetTableUidByName(void *pVnode, char *tbName, uint64_t *uid) {
 int metaGetTableTypeByName(void *pVnode, char *tbName, ETableType *tbType) {
   int         code = 0;
   SMetaReader mr = {0};
-  metaReaderInit(&mr, ((SVnode*)pVnode)->pMeta, 0);
+  metaReaderInit(&mr, ((SVnode *)pVnode)->pMeta, 0);
 
   code = metaGetTableEntryByName(&mr, tbName);
   if (code == 0) *tbType = mr.me.type;
@@ -221,12 +221,13 @@ SMTbCursor *metaOpenTbCursor(void *pVnode) {
     return NULL;
   }
 
-  SVnode* pVnodeObj = pVnode;
-  metaReaderInit(&pTbCur->mr, pVnodeObj->pMeta, 0);
+  SVnode *pVnodeObj = pVnode;
+  // metaReaderInit(&pTbCur->mr, pVnodeObj->pMeta, 0);
 
-  tdbTbcOpen(pVnodeObj->pMeta->pUidIdx, (TBC **)&pTbCur->pDbc, NULL);
-
-  tdbTbcMoveToFirst((TBC *)pTbCur->pDbc);
+  // tdbTbcMoveToFirst((TBC *)pTbCur->pDbc);
+  pTbCur->pMeta = pVnodeObj->pMeta;
+  pTbCur->paused = 1;
+  metaResumeTbCursor(pTbCur, 1);
   return pTbCur;
 }
 
@@ -234,14 +235,45 @@ void metaCloseTbCursor(SMTbCursor *pTbCur) {
   if (pTbCur) {
     tdbFree(pTbCur->pKey);
     tdbFree(pTbCur->pVal);
-    metaReaderClear(&pTbCur->mr);
-    if (pTbCur->pDbc) {
-      tdbTbcClose((TBC *)pTbCur->pDbc);
+    if (!pTbCur->paused) {
+      metaReaderClear(&pTbCur->mr);
+      if (pTbCur->pDbc) {
+        tdbTbcClose((TBC *)pTbCur->pDbc);
+      }
     }
     taosMemoryFree(pTbCur);
   }
 }
 
+void metaPauseTbCursor(SMTbCursor *pTbCur) {
+  if (!pTbCur->paused) {
+    metaReaderClear(&pTbCur->mr);
+    tdbTbcClose((TBC *)pTbCur->pDbc);
+    pTbCur->paused = 1;
+  }
+}
+void metaResumeTbCursor(SMTbCursor *pTbCur, int8_t first) {
+  if (pTbCur->paused) {
+    metaReaderInit(&pTbCur->mr, pTbCur->pMeta, 0);
+
+    tdbTbcOpen(((SMeta *)pTbCur->pMeta)->pUidIdx, (TBC **)&pTbCur->pDbc, NULL);
+
+    if (first) {
+      tdbTbcMoveToFirst((TBC *)pTbCur->pDbc);
+    } else {
+      int c = 0;
+      tdbTbcMoveTo(pTbCur->pDbc, pTbCur->pKey, pTbCur->kLen, &c);
+      if (c < 0) {
+        tdbTbcMoveToPrev(pTbCur->pDbc);
+      } else {
+        tdbTbcMoveToNext(pTbCur->pDbc);
+      }
+    }
+
+    pTbCur->paused = 0;
+  }
+}
+
 int32_t metaTbCursorNext(SMTbCursor *pTbCur, ETableType jumpTableType) {
   int    ret;
   void  *pBuf;
@@ -974,7 +1006,7 @@ typedef struct {
 } SIdxCursor;
 
 int32_t metaFilterCreateTime(void *pVnode, SMetaFltParam *arg, SArray *pUids) {
-  SMeta         *pMeta = ((SVnode*)pVnode)->pMeta;
+  SMeta         *pMeta = ((SVnode *)pVnode)->pMeta;
   SMetaFltParam *param = arg;
   int32_t        ret = 0;
 
@@ -1034,7 +1066,7 @@ END:
 }
 
 int32_t metaFilterTableName(void *pVnode, SMetaFltParam *arg, SArray *pUids) {
-  SMeta         *pMeta = ((SVnode*)pVnode)->pMeta;
+  SMeta         *pMeta = ((SVnode *)pVnode)->pMeta;
   SMetaFltParam *param = arg;
   int32_t        ret = 0;
   char          *buf = NULL;
@@ -1101,7 +1133,7 @@ END:
   return ret;
 }
 int32_t metaFilterTtl(void *pVnode, SMetaFltParam *arg, SArray *pUids) {
-  SMeta         *pMeta = ((SVnode*)pVnode)->pMeta;
+  SMeta         *pMeta = ((SVnode *)pVnode)->pMeta;
   SMetaFltParam *param = arg;
   int32_t        ret = 0;
   char          *buf = NULL;
@@ -1132,7 +1164,7 @@ END:
   return 0;
 }
 int32_t metaFilterTableIds(void *pVnode, SMetaFltParam *arg, SArray *pUids) {
-  SMeta         *pMeta = ((SVnode*)pVnode)->pMeta;
+  SMeta         *pMeta = ((SVnode *)pVnode)->pMeta;
   SMetaFltParam *param = arg;
 
   SMetaEntry oStbEntry = {0};
@@ -1318,7 +1350,7 @@ static int32_t metaGetTableTagByUid(SMeta *pMeta, int64_t suid, int64_t uid, voi
 }
 
 int32_t metaGetTableTagsByUids(void *pVnode, int64_t suid, SArray *uidList) {
-  SMeta* pMeta = ((SVnode*) pVnode)->pMeta;
+  SMeta        *pMeta = ((SVnode *)pVnode)->pMeta;
   const int32_t LIMIT = 128;
 
   int32_t isLock = false;
@@ -1350,8 +1382,8 @@ int32_t metaGetTableTagsByUids(void *pVnode, int64_t suid, SArray *uidList) {
   return 0;
 }
 
-int32_t metaGetTableTags(void* pVnode, uint64_t suid, SArray *pUidTagInfo) {
-  SMCtbCursor *pCur = metaOpenCtbCursor(((SVnode*)pVnode)->pMeta, suid, 1);
+int32_t metaGetTableTags(void *pVnode, uint64_t suid, SArray *pUidTagInfo) {
+  SMCtbCursor *pCur = metaOpenCtbCursor(((SVnode *)pVnode)->pMeta, suid, 1);
 
   // If len > 0 means there already have uids, and we only want the
   // tags of the specified tables, of which uid in the uid list. Otherwise, all table tags are retrieved and kept
@@ -1456,11 +1488,11 @@ _exit:
   return code;
 }
 
-int32_t metaGetStbStats(void *pVnode, int64_t uid, int64_t* numOfTables) {
+int32_t metaGetStbStats(void *pVnode, int64_t uid, int64_t *numOfTables) {
   int32_t code = 0;
   *numOfTables = 0;
 
-  SVnode* pVnodeObj = pVnode;
+  SVnode *pVnodeObj = pVnode;
   metaRLock(pVnodeObj->pMeta);
 
   // fast path: search cache
diff --git a/source/dnode/vnode/src/vnd/vnodeInitApi.c b/source/dnode/vnode/src/vnd/vnodeInitApi.c
index 526b9b4e2d..d2db6368a2 100644
--- a/source/dnode/vnode/src/vnd/vnodeInitApi.c
+++ b/source/dnode/vnode/src/vnd/vnodeInitApi.c
@@ -13,10 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "storageapi.h"
-#include "vnodeInt.h"
-#include "tstreamUpdate.h"
 #include "meta.h"
+#include "storageapi.h"
+#include "tstreamUpdate.h"
+#include "vnodeInt.h"
 
 static void initTsdbReaderAPI(TsdReader* pReader);
 static void initMetadataAPI(SStoreMeta* pMeta);
@@ -56,10 +56,10 @@ void initTsdbReaderAPI(TsdReader* pReader) {
   pReader->tsdReaderResetStatus = tsdbReaderReset;
 
   pReader->tsdReaderGetDataBlockDistInfo = tsdbGetFileBlocksDistInfo;
-  pReader->tsdReaderGetNumOfInMemRows = tsdbGetNumOfRowsInMemTable;    // todo this function should be moved away
+  pReader->tsdReaderGetNumOfInMemRows = tsdbGetNumOfRowsInMemTable;  // todo this function should be moved away
 
   pReader->tsdSetQueryTableList = tsdbSetTableList;
-  pReader->tsdSetReaderTaskId = (void (*)(void *, const char *))tsdbReaderSetId;
+  pReader->tsdSetReaderTaskId = (void (*)(void*, const char*))tsdbReaderSetId;
 }
 
 void initMetadataAPI(SStoreMeta* pMeta) {
@@ -67,6 +67,8 @@ void initMetadataAPI(SStoreMeta* pMeta) {
 
   pMeta->openTableMetaCursor = metaOpenTbCursor;
   pMeta->closeTableMetaCursor = metaCloseTbCursor;
+  pMeta->pauseTableMetaCursor = metaPauseTbCursor;
+  pMeta->resumeTableMetaCursor = metaResumeTbCursor;
   pMeta->cursorNext = metaTbCursorNext;
   pMeta->cursorPrev = metaTbCursorPrev;
 
@@ -78,7 +80,7 @@ void initMetadataAPI(SStoreMeta* pMeta) {
   pMeta->storeGetIndexInfo = vnodeGetIdx;
   pMeta->getInvertIndex = vnodeGetIvtIdx;
 
-  pMeta->extractTagVal = (const void *(*)(const void *, int16_t, STagVal *))metaGetTableTagVal;
+  pMeta->extractTagVal = (const void* (*)(const void*, int16_t, STagVal*))metaGetTableTagVal;
   pMeta->getTableTags = metaGetTableTags;
   pMeta->getTableTagsByUid = metaGetTableTagsByUids;
 
@@ -86,7 +88,7 @@ void initMetadataAPI(SStoreMeta* pMeta) {
   pMeta->getTableTypeByName = metaGetTableTypeByName;
   pMeta->getTableNameByUid = metaGetTableNameByUid;
 
-  pMeta->getTableSchema = tsdbGetTableSchema;   // todo refactor
+  pMeta->getTableSchema = tsdbGetTableSchema;  // todo refactor
   pMeta->storeGetTableList = vnodeGetTableList;
 
   pMeta->getCachedTableList = metaGetCachedTableUidList;
@@ -106,7 +108,7 @@ void initTqAPI(SStoreTqReader* pTq) {
 
   pTq->tqReaderNextBlockInWal = tqNextBlockInWal;
 
-  pTq->tqNextBlockImpl = tqNextBlockImpl;// todo remove it
+  pTq->tqNextBlockImpl = tqNextBlockImpl;  // todo remove it
 
   pTq->tqReaderAddTables = tqReaderAddTbUidList;
   pTq->tqReaderSetQueryTableList = tqReaderSetTbUidList;
@@ -116,10 +118,10 @@ void initTqAPI(SStoreTqReader* pTq) {
   pTq->tqReaderIsQueriedTable = tqReaderIsQueriedTable;
   pTq->tqReaderCurrentBlockConsumed = tqCurrentBlockConsumed;
 
-  pTq->tqReaderGetWalReader = tqGetWalReader;  // todo remove it
-  pTq->tqReaderRetrieveTaosXBlock = tqRetrieveTaosxBlock;          // todo remove it
+  pTq->tqReaderGetWalReader = tqGetWalReader;              // todo remove it
+  pTq->tqReaderRetrieveTaosXBlock = tqRetrieveTaosxBlock;  // todo remove it
 
-  pTq->tqReaderSetSubmitMsg = tqReaderSetSubmitMsg; // todo remove it
+  pTq->tqReaderSetSubmitMsg = tqReaderSetSubmitMsg;  // todo remove it
   pTq->tqGetResultBlock = tqGetResultBlock;
 
   pTq->tqReaderNextBlockFilterOut = tqNextDataBlockFilterOut;
@@ -199,7 +201,7 @@ void initStateStoreAPI(SStateStore* pStore) {
   pStore->streamStateClose = streamStateClose;
   pStore->streamStateBegin = streamStateBegin;
   pStore->streamStateCommit = streamStateCommit;
-  pStore->streamStateDestroy= streamStateDestroy;
+  pStore->streamStateDestroy = streamStateDestroy;
   pStore->streamStateDeleteCheckPoint = streamStateDeleteCheckPoint;
 }
 
@@ -239,4 +241,4 @@ void initSnapshotFn(SStoreSnapshotFn* pSnapshot) {
   pSnapshot->destroySnapshot = destroySnapContext;
   pSnapshot->getMetaTableInfoFromSnapshot = getMetaTableInfoFromSnapshot;
   pSnapshot->getTableInfoFromSnapshot = getTableInfoFromSnapshot;
-}
\ No newline at end of file
+}
diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index fd766e21f8..23a7d2c9e9 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/source/libs/executor/src/sysscanoperator.c
@@ -25,6 +25,7 @@
 #include "tdatablock.h"
 #include "tmsg.h"
 
+#include "index.h"
 #include "operator.h"
 #include "query.h"
 #include "querytask.h"
@@ -32,7 +33,6 @@
 #include "tcompare.h"
 #include "thash.h"
 #include "ttypes.h"
-#include "index.h"
 
 typedef int (*__optSysFilter)(void* a, void* b, int16_t dtype);
 typedef int32_t (*__sys_filte)(void* pMeta, SNode* cond, SArray* result);
@@ -540,12 +540,12 @@ static SSDataBlock* sysTableScanUserCols(SOperatorInfo* pOperator) {
 
   int32_t restore = pInfo->restore;
   pInfo->restore = false;
-  
+
   while (restore || ((ret = pAPI->metaFn.cursorNext(pInfo->pCur, TSDB_TABLE_MAX)) == 0)) {
     if (restore) {
       restore = false;
     }
-    
+
     char typeName[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
     char tableName[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
 
@@ -626,8 +626,8 @@ static SSDataBlock* sysTableScanUserCols(SOperatorInfo* pOperator) {
 }
 
 static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
-  SExecTaskInfo*     pTaskInfo = pOperator->pTaskInfo;
-  SStorageAPI* pAPI = &pTaskInfo->storageAPI;
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+  SStorageAPI*   pAPI = &pTaskInfo->storageAPI;
 
   SSysTableScanInfo* pInfo = pOperator->info;
   if (pOperator->status == OP_EXEC_DONE) {
@@ -1100,8 +1100,8 @@ int32_t buildSysDbTableInfo(const SSysTableScanInfo* pInfo, int32_t capacity) {
 }
 
 static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) {
-  SExecTaskInfo*     pTaskInfo = pOperator->pTaskInfo;
-  SStorageAPI* pAPI = &pTaskInfo->storageAPI;
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+  SStorageAPI*   pAPI = &pTaskInfo->storageAPI;
 
   SSysTableScanInfo* pInfo = pOperator->info;
 
@@ -1288,11 +1288,16 @@ static SSDataBlock* sysTableBuildUserTablesByUids(SOperatorInfo* pOperator) {
 
 static SSDataBlock* sysTableBuildUserTables(SOperatorInfo* pOperator) {
   SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
-  SStorageAPI* pAPI = &pTaskInfo->storageAPI;
+  SStorageAPI*   pAPI = &pTaskInfo->storageAPI;
+  int8_t         firstMetaCursor = 0;
 
   SSysTableScanInfo* pInfo = pOperator->info;
   if (pInfo->pCur == NULL) {
     pInfo->pCur = pAPI->metaFn.openTableMetaCursor(pInfo->readHandle.vnode);
+    firstMetaCursor = 1;
+  }
+  if (!firstMetaCursor) {
+    pAPI->metaFn.resumeTableMetaCursor(pInfo->pCur, 0);
   }
 
   blockDataCleanup(pInfo->pRes);
@@ -1436,12 +1441,14 @@ static SSDataBlock* sysTableBuildUserTables(SOperatorInfo* pOperator) {
       numOfRows = 0;
 
       if (pInfo->pRes->info.rows > 0) {
+        pAPI->metaFn.pauseTableMetaCursor(pInfo->pCur);
         break;
       }
     }
   }
 
   if (numOfRows > 0) {
+    pAPI->metaFn.pauseTableMetaCursor(pInfo->pCur);
     p->info.rows = numOfRows;
     pInfo->pRes->info.rows = numOfRows;
 
@@ -1485,7 +1492,8 @@ static SSDataBlock* sysTableScanUserTables(SOperatorInfo* pOperator) {
   } else {
     if (pInfo->showRewrite == false) {
       if (pCondition != NULL && pInfo->pIdx == NULL) {
-        SSTabFltArg arg = {.pMeta = pInfo->readHandle.vnode, .pVnode = pInfo->readHandle.vnode, .pAPI = &pTaskInfo->storageAPI};
+        SSTabFltArg arg = {
+            .pMeta = pInfo->readHandle.vnode, .pVnode = pInfo->readHandle.vnode, .pAPI = &pTaskInfo->storageAPI};
 
         SSysTableIndex* idx = taosMemoryMalloc(sizeof(SSysTableIndex));
         idx->init = 0;
@@ -1827,7 +1835,7 @@ void destroySysScanOperator(void* param) {
     pInfo->pIdx = NULL;
   }
 
-  if(pInfo->pSchema) {
+  if (pInfo->pSchema) {
     taosHashCleanup(pInfo->pSchema);
     pInfo->pSchema = NULL;
   }
@@ -2144,7 +2152,7 @@ static int32_t optSysTabFilte(void* arg, SNode* cond, SArray* result) {
   return -1;
 }
 
-static int32_t doGetTableRowSize(SReadHandle *pHandle, uint64_t uid, int32_t* rowLen, const char* idstr) {
+static int32_t doGetTableRowSize(SReadHandle* pHandle, uint64_t uid, int32_t* rowLen, const char* idstr) {
   *rowLen = 0;
 
   SMetaReader mr = {0};
@@ -2194,17 +2202,17 @@ static SSDataBlock* doBlockInfoScan(SOperatorInfo* pOperator) {
 
   SBlockDistInfo* pBlockScanInfo = pOperator->info;
   SExecTaskInfo*  pTaskInfo = pOperator->pTaskInfo;
-  SStorageAPI* pAPI = &pTaskInfo->storageAPI;
+  SStorageAPI*    pAPI = &pTaskInfo->storageAPI;
 
   STableBlockDistInfo blockDistInfo = {.minRows = INT_MAX, .maxRows = INT_MIN};
-  int32_t             code = doGetTableRowSize(&pBlockScanInfo->readHandle, pBlockScanInfo->uid,
-                                               (int32_t*)&blockDistInfo.rowSize, GET_TASKID(pTaskInfo));
+  int32_t code = doGetTableRowSize(&pBlockScanInfo->readHandle, pBlockScanInfo->uid, (int32_t*)&blockDistInfo.rowSize,
+                                   GET_TASKID(pTaskInfo));
   if (code != TSDB_CODE_SUCCESS) {
     T_LONG_JMP(pTaskInfo->env, code);
   }
 
   pAPI->tsdReader.tsdReaderGetDataBlockDistInfo(pBlockScanInfo->pHandle, &blockDistInfo);
-  blockDistInfo.numOfInmemRows = (int32_t) pAPI->tsdReader.tsdReaderGetNumOfInMemRows(pBlockScanInfo->pHandle);
+  blockDistInfo.numOfInmemRows = (int32_t)pAPI->tsdReader.tsdReaderGetNumOfInMemRows(pBlockScanInfo->pHandle);
 
   SSDataBlock* pBlock = pBlockScanInfo->pResBlock;
 
@@ -2289,7 +2297,8 @@ SOperatorInfo* createDataBlockInfoScanOperator(SReadHandle* readHandle, SBlockDi
     size_t num = tableListGetSize(pTableListInfo);
     void*  pList = tableListGetInfo(pTableListInfo, 0);
 
-    code = readHandle->api.tsdReader.tsdReaderOpen(readHandle->vnode, &cond, pList, num, pInfo->pResBlock, (void**)&pInfo->pHandle, pTaskInfo->id.str, false, NULL);
+    code = readHandle->api.tsdReader.tsdReaderOpen(readHandle->vnode, &cond, pList, num, pInfo->pResBlock,
+                                                   (void**)&pInfo->pHandle, pTaskInfo->id.str, false, NULL);
     cleanupQueryTableDataCond(&cond);
     if (code != 0) {
       goto _error;
@@ -2316,4 +2325,4 @@ _error:
   taosMemoryFreeClear(pInfo);
   taosMemoryFreeClear(pOperator);
   return NULL;
-}
\ No newline at end of file
+}

From c77f7f65d2eaa9b7442362fda71658289dbb89e3 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 5 Jun 2023 07:32:28 +0000
Subject: [PATCH 29/58] fix invalid free

---
 source/libs/stream/src/streamBackendRocksdb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index 9f1cab56e7..3335881b37 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -173,15 +173,16 @@ void streamBackendCleanup(void* arg) {
   rocksdb_env_destroy(pHandle->env);
   rocksdb_cache_destroy(pHandle->cache);
 
-  taosThreadMutexDestroy(&pHandle->mutex);
   SListNode* head = tdListPopHead(pHandle->list);
   while (head != NULL) {
     streamStateDestroyCompar(head->data);
     taosMemoryFree(head);
     head = tdListPopHead(pHandle->list);
   }
-  // rocksdb_compactionfilterfactory_destroy(pHandle->filterFactory);
+
   tdListFree(pHandle->list);
+  taosThreadMutexDestroy(&pHandle->mutex);
+
   taosThreadMutexDestroy(&pHandle->cfMutex);
 
   taosMemoryFree(pHandle);

From 046c9e9494b95f945920fbd61dce91685929548d Mon Sep 17 00:00:00 2001
From: t_max <1172915550@qq.com>
Date: Mon, 5 Jun 2023 15:32:28 +0800
Subject: [PATCH 30/58] docs: go connector add tmq assignment and seek

---
 docs/en/14-reference/03-connector/05-go.mdx | 22 +++++++++++++++++++--
 docs/zh/08-connector/20-go.mdx              | 22 +++++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/docs/en/14-reference/03-connector/05-go.mdx b/docs/en/14-reference/03-connector/05-go.mdx
index 0088f23006..7e5023b6a7 100644
--- a/docs/en/14-reference/03-connector/05-go.mdx
+++ b/docs/en/14-reference/03-connector/05-go.mdx
@@ -379,6 +379,15 @@ Note: `tmq.TopicPartition` is reserved for compatibility purpose
 
 Commit information.
 
+* `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
+
+Get Assignment(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
+
+* `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
+Note: `ignoredTimeoutMs` is reserved for compatibility purpose
+
+Seek offset(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
+
 * `func (c *Consumer) Unsubscribe() error`
 
 Unsubscribe.
@@ -468,6 +477,15 @@ Note: `tmq.TopicPartition` is reserved for compatibility purpose
 
 Commit information.
 
+* `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
+
+Get Assignment(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
+
+* `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
+Note: `ignoredTimeoutMs` is reserved for compatibility purpose
+
+Seek offset(TDengine >= 3.0.5.0 and driver-go >= v3.5.0 are required).
+
 * `func (c *Consumer) Unsubscribe() error`
 
 Unsubscribe.
@@ -476,7 +494,7 @@ Unsubscribe.
 
 Close consumer.
 
-For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/3.0/examples/tmqoverws/main.go)
+For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/main/examples/tmqoverws/main.go)
 
 ### parameter binding via WebSocket
 
@@ -524,7 +542,7 @@ For a complete example see [GitHub sample file](https://github.com/taosdata/driv
 
   Closes the parameter binding.
 
-For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/3.0/examples/stmtoverws/main.go)
+For a complete example see [GitHub sample file](https://github.com/taosdata/driver-go/blob/main/examples/stmtoverws/main.go)
 
 ## API Reference
 
diff --git a/docs/zh/08-connector/20-go.mdx b/docs/zh/08-connector/20-go.mdx
index fd6df992b5..5461328182 100644
--- a/docs/zh/08-connector/20-go.mdx
+++ b/docs/zh/08-connector/20-go.mdx
@@ -383,6 +383,15 @@ func main() {
 
  提交消息。
 
+* `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
+
+ 获取消费进度。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
+
+* `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
+注意：出于兼容目的保留 `ignoredTimeoutMs` 参数，当前未使用
+
+ 按照指定的进度消费。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
+
 * `func (c *Consumer) Close() error`
 
  关闭连接。
@@ -468,11 +477,20 @@ func main() {
 
  提交消息。
 
+* `func (c *Consumer) Assignment() (partitions []tmq.TopicPartition, err error)`
+
+ 获取消费进度。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
+
+* `func (c *Consumer) Seek(partition tmq.TopicPartition, ignoredTimeoutMs int) error`
+注意：出于兼容目的保留 `ignoredTimeoutMs` 参数，当前未使用
+
+ 按照指定的进度消费。(需要 TDengine >= 3.0.5.0， driver-go >= v3.5.0)
+
 * `func (c *Consumer) Close() error`
 
  关闭连接。
 
-完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/3.0/examples/tmqoverws/main.go)
+完整订阅示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/main/examples/tmqoverws/main.go)
 
 ### 通过 WebSocket 进行参数绑定
 
@@ -520,7 +538,7 @@ func main() {
 
   结束参数绑定。
 
-完整参数绑定示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/3.0/examples/stmtoverws/main.go)
+完整参数绑定示例参见 [GitHub 示例文件](https://github.com/taosdata/driver-go/blob/main/examples/stmtoverws/main.go)
 
 ## API 参考
 

From 6b670b7f0801b490e7e5e66e25428be233529eb1 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 5 Jun 2023 15:48:15 +0800
Subject: [PATCH 31/58] fix desc

---
 source/libs/parser/src/parTranslater.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 57f708c5cd..be3c41e2ee 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3034,7 +3034,7 @@ static int32_t convertFillValue(STranslateContext* pCxt, SDataType dt, SNodeList
     code = scalarCalculateConstants(pCaseFunc, &pCell->pNode);
   }
   if (TSDB_CODE_SUCCESS == code && QUERY_NODE_VALUE != nodeType(pCell->pNode)) {
-    code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Fill value is just a constant");
+    code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Fill value can only accept constant");
   } else if (TSDB_CODE_SUCCESS != code) {
     code = generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Filled data type mismatch");
   }

From 005182c3c925169d45392feb0755beaf50efca2a Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 5 Jun 2023 16:40:48 +0800
Subject: [PATCH 32/58] fix multiple interp issue

---
 source/libs/parser/src/parTranslater.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index be3c41e2ee..f049af6747 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3041,7 +3041,7 @@ static int32_t convertFillValue(STranslateContext* pCxt, SDataType dt, SNodeList
   return code;
 }
 
-static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeList* pProjectionList) {
+static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeList* pProjectionList, bool isInterpFill) {
   if (FILL_MODE_VALUE != pFill->mode && FILL_MODE_VALUE_F != pFill->mode) {
     return TSDB_CODE_SUCCESS;
   }
@@ -3058,10 +3058,13 @@ static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeL
       if (TSDB_CODE_SUCCESS != code) {
         return code;
       }
-      ++fillNo;
+
+      if (!isInterpFill) {
+        ++fillNo;
+      }
     }
   }
-  if (fillNo != LIST_LENGTH(pFillValues->pNodeList)) {
+  if (!isInterpFill && fillNo != LIST_LENGTH(pFillValues->pNodeList)) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Filled values number mismatch");
   }
   return TSDB_CODE_SUCCESS;
@@ -3072,7 +3075,7 @@ static int32_t translateFillValues(STranslateContext* pCxt, SSelectStmt* pSelect
       NULL == ((SIntervalWindowNode*)pSelect->pWindow)->pFill) {
     return TSDB_CODE_SUCCESS;
   }
-  return checkFillValues(pCxt, (SFillNode*)((SIntervalWindowNode*)pSelect->pWindow)->pFill, pSelect->pProjectionList);
+  return checkFillValues(pCxt, (SFillNode*)((SIntervalWindowNode*)pSelect->pWindow)->pFill, pSelect->pProjectionList, false);
 }
 
 static int32_t rewriteProjectAlias(SNodeList* pProjectionList) {
@@ -3522,7 +3525,7 @@ static int32_t translateInterpFill(STranslateContext* pCxt, SSelectStmt* pSelect
     code = checkFill(pCxt, (SFillNode*)pSelect->pFill, (SValueNode*)pSelect->pEvery, true);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = checkFillValues(pCxt, (SFillNode*)pSelect->pFill, pSelect->pProjectionList);
+    code = checkFillValues(pCxt, (SFillNode*)pSelect->pFill, pSelect->pProjectionList, true);
   }
 
   return code;

From 384aa4d70bc1751037ec9af1be813eba490af5ad Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 5 Jun 2023 16:41:09 +0800
Subject: [PATCH 33/58] add test cases

---
 tests/system-test/2-query/interp.py | 128 ++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index 121d4dcff6..019b449dfd 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -219,6 +219,56 @@ class TDTestCase:
         tdSql.checkData(2, 0, 12)
         tdSql.checkData(3, 0, 12)
 
+        ## test fill value with scalar expression
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, 1 + 2)")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, 1.0 + 2.0)")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, 1 + 2.5)")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, 1 + '2')")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, 1 + '2.0')")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, '3' + 'abc')")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
+        tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(value, '2' + '1abc')")
+        tdSql.checkRows(4)
+        tdSql.checkData(0, 0, 3)
+        tdSql.checkData(1, 0, 3)
+        tdSql.checkData(2, 0, 3)
+        tdSql.checkData(3, 0, 3)
+
         tdLog.printNoPrefix("==========step5:fill prev")
 
         ## {. . .}
@@ -1837,6 +1887,84 @@ class TDTestCase:
         tdSql.checkData(59, 1, 123)
         tdSql.checkData(60, 1, 60)   #
 
+        tdSql.query(f"select interp(c0),interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(value, 123 + 123)")
+        tdSql.checkRows(61)
+        tdSql.checkCols(2)
+        tdSql.checkData(0,  0, 0)    #
+        tdSql.checkData(1,  0, 246)
+        tdSql.checkData(4,  0, 246)
+        tdSql.checkData(5,  0, None) #
+        tdSql.checkData(6,  0, 246)
+        tdSql.checkData(9,  0, 246)
+        tdSql.checkData(10, 0, 10)   #
+        tdSql.checkData(11, 0, 246)
+        tdSql.checkData(14, 0, 246)
+        tdSql.checkData(15, 0, None) #
+        tdSql.checkData(16, 0, 246)
+        tdSql.checkData(19, 0, 246)
+        tdSql.checkData(20, 0, 20)   #
+        tdSql.checkData(21, 0, 246)
+        tdSql.checkData(24, 0, 246)
+        tdSql.checkData(25, 0, None) #
+        tdSql.checkData(26, 0, 246)
+        tdSql.checkData(29, 0, 246)
+        tdSql.checkData(30, 0, 30)   #
+        tdSql.checkData(31, 0, 246)
+        tdSql.checkData(34, 0, 246)
+        tdSql.checkData(35, 0, 35)   #
+        tdSql.checkData(36, 0, 246)
+        tdSql.checkData(39, 0, 246)
+        tdSql.checkData(40, 0, 40)   #
+        tdSql.checkData(41, 0, 246)
+        tdSql.checkData(44, 0, 246)
+        tdSql.checkData(45, 0, None) #
+        tdSql.checkData(46, 0, 246)
+        tdSql.checkData(49, 0, 246)
+        tdSql.checkData(50, 0, 50)   #
+        tdSql.checkData(51, 0, 246)
+        tdSql.checkData(54, 0, 246)
+        tdSql.checkData(55, 0, None) #
+        tdSql.checkData(59, 0, 246)
+        tdSql.checkData(60, 0, 55)   #
+
+        tdSql.checkData(0,  1, None) #
+        tdSql.checkData(1,  1, 246)
+        tdSql.checkData(4,  1, 246)
+        tdSql.checkData(5,  1, None) #
+        tdSql.checkData(6,  1, 246)
+        tdSql.checkData(9,  1, 246)
+        tdSql.checkData(10, 1, 10)   #
+        tdSql.checkData(11, 1, 246)
+        tdSql.checkData(14, 1, 246)
+        tdSql.checkData(15, 1, None) #
+        tdSql.checkData(16, 1, 246)
+        tdSql.checkData(19, 1, 246)
+        tdSql.checkData(20, 1, None) #
+        tdSql.checkData(21, 1, 246)
+        tdSql.checkData(24, 1, 246)
+        tdSql.checkData(25, 1, None) #
+        tdSql.checkData(26, 1, 246)
+        tdSql.checkData(29, 1, 246)
+        tdSql.checkData(30, 1, 30)   #
+        tdSql.checkData(31, 1, 246)
+        tdSql.checkData(34, 1, 246)
+        tdSql.checkData(35, 1, None) #
+        tdSql.checkData(36, 1, 246)
+        tdSql.checkData(39, 1, 246)
+        tdSql.checkData(40, 1, 40)   #
+        tdSql.checkData(41, 1, 246)
+        tdSql.checkData(44, 1, 246)
+        tdSql.checkData(45, 1, 45)   #
+        tdSql.checkData(46, 1, 246)
+        tdSql.checkData(49, 1, 246)
+        tdSql.checkData(50, 1, None) #
+        tdSql.checkData(51, 1, 246)
+        tdSql.checkData(54, 1, 246)
+        tdSql.checkData(55, 1, None) #
+        tdSql.checkData(56, 1, 246)
+        tdSql.checkData(59, 1, 246)
+        tdSql.checkData(60, 1, 60)   #
+
         # test fill prev
         tdSql.query(f"select interp(c0),interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(prev)")
         tdSql.checkRows(61)

From 63c4929089a80190670b2f5d3b15bd251bf36680 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 5 Jun 2023 08:42:00 +0000
Subject: [PATCH 34/58] fix invalid free

---
 source/libs/stream/src/streamBackendRocksdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index 3335881b37..df045eef20 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -144,7 +144,7 @@ _EXIT:
   taosHashCleanup(pHandle->cfInst);
   rocksdb_compactionfilterfactory_destroy(pHandle->filterFactory);
   tdListFree(pHandle->list);
-  free(pHandle);
+  taosMemoryFree(pHandle);
   qDebug("failed to init stream backend at %s", path);
   return NULL;
 }

From 4f2f441816863fdad92a7e37b6ff5d77c46dde4a Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 5 Jun 2023 09:06:50 +0000
Subject: [PATCH 35/58] fix invalid free

---
 include/os/osMemory.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/os/osMemory.h b/include/os/osMemory.h
index 18cd0d9cc6..683d10e926 100644
--- a/include/os/osMemory.h
+++ b/include/os/osMemory.h
@@ -22,21 +22,20 @@ extern "C" {
 
 // If the error is in a third-party library, place this header file under the third-party library header file.
 // When you want to use this feature, you should find or add the same function in the following sectio
-// #if !defined(WINDOWS)
+#if !defined(WINDOWS)
 
-// #ifndef ALLOW_FORBID_FUNC
-// #define malloc  MALLOC_FUNC_TAOS_FORBID
-// #define calloc  CALLOC_FUNC_TAOS_FORBID
-// #define realloc REALLOC_FUNC_TAOS_FORBID
-// #define free    FREE_FUNC_TAOS_FORBID
-// #ifdef strdup
-// #undef strdup
-// #define strdup STRDUP_FUNC_TAOS_FORBID
-// #endif
-// #endif  // ifndef ALLOW_FORBID_FUNC
-// #endif  // if !defined(WINDOWS)
+#ifndef ALLOW_FORBID_FUNC
+#define malloc  MALLOC_FUNC_TAOS_FORBID
+#define calloc  CALLOC_FUNC_TAOS_FORBID
+#define realloc REALLOC_FUNC_TAOS_FORBID
+#define free    FREE_FUNC_TAOS_FORBID
+#ifdef strdup
+#undef strdup
+#define strdup STRDUP_FUNC_TAOS_FORBID
+#endif
+#endif  // ifndef ALLOW_FORBID_FUNC
+#endif  // if !defined(WINDOWS)
 
-// // #define taosMemoryFree    malloc
 // #define taosMemoryMalloc  malloc
 // #define taosMemoryCalloc  calloc
 // #define taosMemoryRealloc realloc

From cb024ca069bc0f8852171ac950f9d41b45fd73c0 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 5 Jun 2023 10:52:07 +0000
Subject: [PATCH 36/58] fix invalid free

---
 source/libs/stream/src/tstreamFileState.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/stream/src/tstreamFileState.c b/source/libs/stream/src/tstreamFileState.c
index bc84509728..bfaeca89f6 100644
--- a/source/libs/stream/src/tstreamFileState.c
+++ b/source/libs/stream/src/tstreamFileState.c
@@ -419,7 +419,7 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) {
     if (code != 0 || len == 0 || val == NULL) {
       return TSDB_CODE_FAILED;
     }
-    memcpy(val, buf, len);
+    memcpy(buf, val, len);
     buf[len] = 0;
     maxCheckPointId = atol((char*)buf);
     taosMemoryFree(val);
@@ -433,7 +433,7 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) {
     if (code != 0) {
       return TSDB_CODE_FAILED;
     }
-    memcpy(val, buf, len);
+    memcpy(buf, val, len);
     buf[len] = 0;
     taosMemoryFree(val);
 

From 02b1257b01a3277d20f658f5fb9bb865c5d85af2 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 6 Jun 2023 11:17:02 +0800
Subject: [PATCH 37/58] enh: reassign data column in blocks

---
 include/common/tcommon.h               |  1 +
 source/common/src/tdatablock.c         | 76 +++++++++++++++++++++++---
 source/libs/executor/src/executorInt.c |  1 -
 source/libs/function/src/tudf.c        | 16 +++++-
 4 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index 2f93f8c3e3..d2352e100c 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -231,6 +231,7 @@ typedef struct SColumnInfoData {
   };
   SColumnInfo info;     // column info
   bool        hasNull;  // if current column data has null value.
+  bool        reassigned; // if current column data is reassigned.
 } SColumnInfoData;
 
 typedef struct SQueryTableDataCond {
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index a6a54a8347..24e978b0ea 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -23,6 +23,20 @@
 
 int32_t colDataGetLength(const SColumnInfoData* pColumnInfoData, int32_t numOfRows) {
   if (IS_VAR_DATA_TYPE(pColumnInfoData->info.type)) {
+    if (pColumnInfoData->reassigned) {
+      int32_t totalSize = 0;
+      for (int32_t row = 0; row < numOfRows; ++row) {
+        char* pColData = pColumnInfoData->pData + pColumnInfoData->varmeta.offset[row];
+        int32_t colSize = 0;
+        if (pColumnInfoData->info.type == TSDB_DATA_TYPE_JSON) {
+          colSize = getJsonValueLen(pColData);
+        } else {
+          colSize = varDataTLen(pColData);
+        }
+        totalSize += colSize;
+      }
+      return totalSize;
+    }
     return pColumnInfoData->varmeta.length;
   } else {
     if (pColumnInfoData->info.type == TSDB_DATA_TYPE_NULL) {
@@ -138,8 +152,8 @@ int32_t colDataReassignVal(SColumnInfoData* pColumnInfoData, uint32_t dstRowIdx,
 
     SVarColAttr* pAttr = &pColumnInfoData->varmeta;
 
-    uint32_t len = pColumnInfoData->varmeta.length;
     pColumnInfoData->varmeta.offset[dstRowIdx] = pColumnInfoData->varmeta.offset[srcRowIdx];
+    pColumnInfoData->reassigned = true;
   } else {
     memcpy(pColumnInfoData->pData + pColumnInfoData->info.bytes * dstRowIdx, pData, pColumnInfoData->info.bytes);
     colDataClearNull_f(pColumnInfoData->nullbitmap, dstRowIdx);
@@ -603,8 +617,22 @@ int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock) {
     *(int32_t*)pStart = dataSize;
     pStart += sizeof(int32_t);
 
-    memcpy(pStart, pCol->pData, dataSize);
-    pStart += dataSize;
+    if (pCol->reassigned && IS_VAR_DATA_TYPE(pCol->info.type)) {
+      for (int32_t row = 0; row < numOfRows; ++row) {
+        char* pColData = pCol->pData + pCol->varmeta.offset[row];
+        int32_t colSize = 0;
+        if (pCol->info.type == TSDB_DATA_TYPE_JSON) {
+          colSize = getJsonValueLen(pColData);
+        } else {
+          colSize = varDataTLen(pColData);
+        }
+        memcpy(pStart, pColData, colSize);
+        pStart += colSize;
+      }
+    } else {
+      memcpy(pStart, pCol->pData, dataSize);
+      pStart += dataSize;
+    }    
   }
 
   return 0;
@@ -1764,7 +1792,20 @@ int32_t tEncodeDataBlock(void** buf, const SSDataBlock* pBlock) {
     int32_t len = colDataGetLength(pColData, rows);
     tlen += taosEncodeFixedI32(buf, len);
 
-    tlen += taosEncodeBinary(buf, pColData->pData, len);
+    if (pColData->reassigned && IS_VAR_DATA_TYPE(pColData->info.type)) {
+      for (int32_t row = 0; row < rows; ++row) {
+        char* pData = pColData->pData + pColData->varmeta.offset[row];
+        int32_t colSize = 0;
+        if (pColData->info.type == TSDB_DATA_TYPE_JSON) {
+          colSize = getJsonValueLen(pData);
+        } else {
+          colSize = varDataTLen(pData);
+        }
+        tlen += taosEncodeBinary(buf, pData, colSize);
+      }
+    } else {
+      tlen += taosEncodeBinary(buf, pColData->pData, len);
+    }
   }
   return tlen;
 }
@@ -2525,12 +2566,29 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) {
     data += metaSize;
     dataLen += metaSize;
 
-    colSizes[col] = colDataGetLength(pColRes, numOfRows);
-    dataLen += colSizes[col];
-    if (pColRes->pData != NULL) {
-      memmove(data, pColRes->pData, colSizes[col]);
+     if (pColRes->reassigned && IS_VAR_DATA_TYPE(pColRes->info.type)) {
+        colSizes[col] = 0;
+        for (int32_t row = 0; row < numOfRows; ++row) {
+          char* pColData = pColRes->pData + pColRes->varmeta.offset[row];
+          int32_t colSize = 0;
+          if (pColRes->info.type == TSDB_DATA_TYPE_JSON) {
+            colSize = getJsonValueLen(pColData);
+          } else {
+            colSize = varDataTLen(pColData);
+          }
+          colSizes[col] += colSize;
+          dataLen += colSize;
+          memmove(data, pColData, colSize);
+          data += colSize;
+        }
+    } else {
+      colSizes[col] = colDataGetLength(pColRes, numOfRows);
+      dataLen += colSizes[col];
+      if (pColRes->pData != NULL) {
+        memmove(data, pColRes->pData, colSizes[col]);
+      }
+      data += colSizes[col];
     }
-    data += colSizes[col];
 
     colSizes[col] = htonl(colSizes[col]);
 //    uError("blockEncode col bytes:%d, type:%d, size:%d, htonl size:%d", pColRes->info.bytes, pColRes->info.type, htonl(colSizes[col]), colSizes[col]);
diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c
index ce7a117543..fbc0512a26 100644
--- a/source/libs/executor/src/executorInt.c
+++ b/source/libs/executor/src/executorInt.c
@@ -562,7 +562,6 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const SColumnInfoD
       int32_t numOfRows = 0;
       if (IS_VAR_DATA_TYPE(pDst->info.type)) {
         int32_t j = 0;
-        pDst->varmeta.length = 0;
 
         while (j < totalRows) {
           if (pIndicator[j] == 0) {
diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c
index 6b70422ac8..31a7dfdbc5 100644
--- a/source/libs/function/src/tudf.c
+++ b/source/libs/function/src/tudf.c
@@ -791,7 +791,21 @@ int32_t convertDataBlockToUdfDataBlock(SSDataBlock *block, SUdfDataBlock *udfBlo
       memcpy(udfCol->colData.varLenCol.varOffsets, col->varmeta.offset, udfCol->colData.varLenCol.varOffsetsLen);
       udfCol->colData.varLenCol.payloadLen = colDataGetLength(col, udfBlock->numOfRows);
       udfCol->colData.varLenCol.payload = taosMemoryMalloc(udfCol->colData.varLenCol.payloadLen);
-      memcpy(udfCol->colData.varLenCol.payload, col->pData, udfCol->colData.varLenCol.payloadLen);
+      if (col->reassigned) {
+        for (int32_t row = 0; row < udfCol->colData.numOfRows; ++row) {
+          char* pColData = col->pData + col->varmeta.offset[row];
+          int32_t colSize = 0;
+          if (col->info.type == TSDB_DATA_TYPE_JSON) {
+            colSize = getJsonValueLen(pColData);
+          } else {
+            colSize = varDataTLen(pColData);
+          }
+          memcpy(udfCol->colData.varLenCol.payload, pColData, colSize);
+          udfCol->colData.varLenCol.payload += colSize;
+        }
+      } else {
+        memcpy(udfCol->colData.varLenCol.payload, col->pData, udfCol->colData.varLenCol.payloadLen);
+      }
     } else {
       udfCol->colData.fixLenCol.nullBitmapLen = BitmapLen(udfCol->colData.numOfRows);
       int32_t bitmapLen = udfCol->colData.fixLenCol.nullBitmapLen;

From 472665e4b16f77d1355f77333dc79c4d39c11600 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Tue, 6 Jun 2023 13:06:53 +0800
Subject: [PATCH 38/58] fix: compress core by tDataTypes

---
 include/util/tdef.h              |  2 +-
 source/common/src/ttypes.c       | 10 +++++++++-
 source/libs/parser/src/parUtil.c |  2 +-
 source/util/src/terror.c         |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/util/tdef.h b/include/util/tdef.h
index 0b0569e2d1..37eeb87fdd 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -32,7 +32,7 @@ extern "C" {
 #define TD_VER_MAX UINT64_MAX  // TODO: use the real max version from query handle
 
 // Bytes for each type.
-extern const int32_t TYPE_BYTES[17];
+extern const int32_t TYPE_BYTES[21];
 
 // TODO: replace and remove code below
 #define CHAR_BYTES      sizeof(char)
diff --git a/source/common/src/ttypes.c b/source/common/src/ttypes.c
index 33b972594e..39255cff3a 100644
--- a/source/common/src/ttypes.c
+++ b/source/common/src/ttypes.c
@@ -17,7 +17,7 @@
 #include "ttypes.h"
 #include "tcompression.h"
 
-const int32_t TYPE_BYTES[17] = {
+const int32_t TYPE_BYTES[21] = {
     -1,                      // TSDB_DATA_TYPE_NULL
     CHAR_BYTES,              // TSDB_DATA_TYPE_BOOL
     CHAR_BYTES,              // TSDB_DATA_TYPE_TINYINT
@@ -34,6 +34,10 @@ const int32_t TYPE_BYTES[17] = {
     INT_BYTES,               // TSDB_DATA_TYPE_UINT
     sizeof(uint64_t),        // TSDB_DATA_TYPE_UBIGINT
     TSDB_MAX_JSON_TAG_LEN,   // TSDB_DATA_TYPE_JSON
+    TSDB_MAX_TAGS_LEN,       // TSDB_DATA_TYPE_VARBINARY: placeholder, not implemented
+    TSDB_MAX_TAGS_LEN,       // TSDB_DATA_TYPE_DECIMAL: placeholder, not implemented
+    TSDB_MAX_TAGS_LEN,       // TSDB_DATA_TYPE_BLOB: placeholder, not implemented
+    TSDB_MAX_TAGS_LEN,       // TSDB_DATA_TYPE_MEDIUMBLOB: placeholder, not implemented
     sizeof(VarDataOffsetT),  // TSDB_DATA_TYPE_GEOMETRY
 };
 
@@ -57,6 +61,10 @@ tDataTypeDescriptor tDataTypes[TSDB_DATA_TYPE_MAX] = {
     {TSDB_DATA_TYPE_UINT, 12, INT_BYTES, "INT UNSIGNED", 0, UINT32_MAX, tsCompressInt, tsDecompressInt},
     {TSDB_DATA_TYPE_UBIGINT, 15, LONG_BYTES, "BIGINT UNSIGNED", 0, UINT64_MAX, tsCompressBigint, tsDecompressBigint},
     {TSDB_DATA_TYPE_JSON, 4, TSDB_MAX_JSON_TAG_LEN, "JSON", 0, 0, tsCompressString, tsDecompressString},
+    {TSDB_DATA_TYPE_VARBINARY, 9, 1, "VARBINARY", 0, 0, NULL, NULL},     // placeholder, not implemented
+    {TSDB_DATA_TYPE_DECIMAL, 7, 1, "DECIMAL", 0, 0, NULL, NULL},         // placeholder, not implemented
+    {TSDB_DATA_TYPE_BLOB, 4, 1, "BLOB", 0, 0, NULL, NULL},               // placeholder, not implemented
+    {TSDB_DATA_TYPE_MEDIUMBLOB, 10, 1, "MEDIUMBLOB", 0, 0, NULL, NULL},  // placeholder, not implemented
     {TSDB_DATA_TYPE_GEOMETRY, 8, 1, "GEOMETRY", 0, 0, tsCompressString, tsDecompressString},
 };
 
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index 4a51d3c31c..6aed29b581 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -138,7 +138,7 @@ static char* getSyntaxErrFormat(int32_t errCode) {
     case TSDB_CODE_PAR_CANNOT_DROP_PRIMARY_KEY:
       return "Primary timestamp column cannot be dropped";
     case TSDB_CODE_PAR_INVALID_MODIFY_COL:
-      return "Only binary/nchar column length could be modified, and the length can only be increased, not decreased";
+      return "Only binary/nchar/geometry column length could be modified, and the length can only be increased, not decreased";
     case TSDB_CODE_PAR_INVALID_TBNAME:
       return "Invalid tbname pseudo column";
     case TSDB_CODE_PAR_INVALID_FUNCTION_NAME:
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index e28e67f83a..7a900269e8 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -542,7 +542,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TIMELINE_FUNC,      "Invalid timeline fu
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_PASSWD,             "Invalid password")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_ALTER_TABLE,        "Invalid alter table statement")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_CANNOT_DROP_PRIMARY_KEY,    "Primary timestamp column cannot be dropped")
-TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_MODIFY_COL,         "Only binary/nchar column length could be modified, and the length can only be increased, not decreased")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_MODIFY_COL,         "Only binary/nchar/geometry column length could be modified, and the length can only be increased, not decreased")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_TBNAME,             "Invalid tbname pseudo column")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_FUNCTION_NAME,      "Invalid function name")
 TAOS_DEFINE_ERROR(TSDB_CODE_PAR_COMMENT_TOO_LONG,           "Comment too long")

From b65df61efd04da69aed29444d306844c4bc2b740 Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Tue, 6 Jun 2023 15:42:28 +0800
Subject: [PATCH 39/58] docs: add consuemr demo doc

---
 docs/en/14-reference/03-connector/04-java.mdx | 1 +
 docs/zh/08-connector/14-java.mdx              | 1 +
 examples/JDBC/consumer-demo/readme.md         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/en/14-reference/03-connector/04-java.mdx b/docs/en/14-reference/03-connector/04-java.mdx
index 114026eca0..db49e5f395 100644
--- a/docs/en/14-reference/03-connector/04-java.mdx
+++ b/docs/en/14-reference/03-connector/04-java.mdx
@@ -1256,6 +1256,7 @@ The source code of the sample application is under `TDengine/examples/JDBC`:
 - connectionPools: using taos-jdbcdriver in connection pools such as HikariCP, Druid, dbcp, c3p0, etc.
 - SpringJdbcTemplate: using taos-jdbcdriver in Spring JdbcTemplate.
 - mybatisplus-demo: using taos-jdbcdriver in Springboot + Mybatis.
+- consumer-demo: consumer TDengine data example, the consumption rate can be controlled by parameters.
 
 [JDBC example](https://github.com/taosdata/TDengine/tree/3.0/examples/JDBC)
 
diff --git a/docs/zh/08-connector/14-java.mdx b/docs/zh/08-connector/14-java.mdx
index e4cf4a83e7..46800226d7 100644
--- a/docs/zh/08-connector/14-java.mdx
+++ b/docs/zh/08-connector/14-java.mdx
@@ -1258,6 +1258,7 @@ public static void main(String[] args) throws Exception {
 - connectionPools：HikariCP, Druid, dbcp, c3p0 等连接池中使用 taos-jdbcdriver。
 - SpringJdbcTemplate：Spring JdbcTemplate 中使用 taos-jdbcdriver。
 - mybatisplus-demo：Springboot + Mybatis 中使用 taos-jdbcdriver。
+- consumer-demo：Consumer 消费 TDengine 数据示例，可通过参数控制消费速度。
 
 请参考：[JDBC example](https://github.com/taosdata/TDengine/tree/3.0/examples/JDBC)
 
diff --git a/examples/JDBC/consumer-demo/readme.md b/examples/JDBC/consumer-demo/readme.md
index 77742ab605..c211b017a7 100644
--- a/examples/JDBC/consumer-demo/readme.md
+++ b/examples/JDBC/consumer-demo/readme.md
@@ -4,7 +4,7 @@ TDengine's Consumer demo project is organized in a Maven way so that users can e
 sudo apt-get install maven
 ```
 
-## Install TDengine Client
+## Install TDengine Client and TaosAdapter
 Make sure you have already installed a tdengine client on your current develop environment.
 Download the tdengine package on our website: ``https://www.taosdata.com/cn/all-downloads/`` and install the client.
 

From 201d0f2d18c6a3b3ff77df64e8677f5f6e7f264c Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Tue, 6 Jun 2023 15:35:39 +0800
Subject: [PATCH 40/58] fix stream ci issue

---
 source/libs/executor/inc/executorInt.h        |  1 +
 source/libs/executor/src/scanoperator.c       |  2 +-
 source/libs/executor/src/timewindowoperator.c | 50 ++++++++++---
 .../tsim/stream/distributeInterval0.sim       | 71 ++++++++++++-------
 4 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/source/libs/executor/inc/executorInt.h b/source/libs/executor/inc/executorInt.h
index ffc63a22a8..38890f8c34 100644
--- a/source/libs/executor/inc/executorInt.h
+++ b/source/libs/executor/inc/executorInt.h
@@ -457,6 +457,7 @@ typedef struct SStreamIntervalOperatorInfo {
   int64_t            dataVersion;
   SStateStore        statestore;
   bool               recvGetAll;
+  SHashObj*          pFinalPullDataMap;
 } SStreamIntervalOperatorInfo;
 
 typedef struct SDataGroupInfo {
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index c93b9f4c73..2702cf6861 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1865,7 +1865,7 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
           TSKEY maxTs = pAPI->stateStore.updateInfoFillBlockData(pInfo->pUpdateInfo, pInfo->pRecoverRes, pInfo->primaryTsIndex);
           pInfo->twAggSup.maxTs = TMAX(pInfo->twAggSup.maxTs, maxTs);
         } else {
-          pInfo->pUpdateInfo->maxDataVersion = pTaskInfo->streamInfo.fillHistoryVer2;
+          pInfo->pUpdateInfo->maxDataVersion = TMAX(pInfo->pUpdateInfo->maxDataVersion, pTaskInfo->streamInfo.fillHistoryVer2);
           doCheckUpdate(pInfo, pInfo->pRecoverRes->info.window.ekey, pInfo->pRecoverRes);
         }
       }
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 3a83472079..d6429fd121 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1306,6 +1306,8 @@ static bool doDeleteWindow(SOperatorInfo* pOperator, TSKEY ts, uint64_t groupId)
   return true;
 }
 
+static int32_t getChildIndex(SSDataBlock* pBlock) { return pBlock->info.childId; }
+
 static void doDeleteWindows(SOperatorInfo* pOperator, SInterval* pInterval, SSDataBlock* pBlock, SArray* pUpWins,
                             SSHashObj* pUpdatedMap) {
   SStreamIntervalOperatorInfo* pInfo = pOperator->info;
@@ -1340,8 +1342,14 @@ static void doDeleteWindows(SOperatorInfo* pOperator, SInterval* pInterval, SSDa
       SWinKey  winRes = {.ts = win.skey, .groupId = winGpId};
       void*    chIds = taosHashGet(pInfo->pPullDataMap, &winRes, sizeof(SWinKey));
       if (chIds) {
-        getNextTimeWindow(pInterval, &win, TSDB_ORDER_ASC);
-        continue;
+        int32_t childId = getChildIndex(pBlock);
+        SArray* chArray = *(void**)chIds;
+        int32_t index = taosArraySearchIdx(chArray, &childId, compareInt32Val, TD_EQ);
+        if (index != -1) {
+          qDebug("===stream===try push delete window%" PRId64 "chId:%d ,continue", win.skey, childId);
+          getNextTimeWindow(pInterval, &win, TSDB_ORDER_ASC);
+          continue;
+        }
       }
       bool res = doDeleteWindow(pOperator, win.skey, winGpId);
       if (pUpWins && res) {
@@ -1497,6 +1505,7 @@ void destroyStreamFinalIntervalOperatorInfo(void* param) {
     taosArrayDestroy(*(void**)pIte);
   }
   taosHashCleanup(pInfo->pPullDataMap);
+  taosHashCleanup(pInfo->pFinalPullDataMap);
   taosArrayDestroy(pInfo->pPullWins);
   blockDataDestroy(pInfo->pPullDataRes);
   taosArrayDestroy(pInfo->pDelWins);
@@ -2067,8 +2076,6 @@ void addPullWindow(SHashObj* pMap, SWinKey* pWinRes, int32_t size) {
   taosHashPut(pMap, pWinRes, sizeof(SWinKey), &childIds, sizeof(void*));
 }
 
-static int32_t getChildIndex(SSDataBlock* pBlock) { return pBlock->info.childId; }
-
 static void clearStreamIntervalOperator(SStreamIntervalOperatorInfo* pInfo) {
   tSimpleHashClear(pInfo->aggSup.pResultRowHashTable);
   clearDiskbasedBuf(pInfo->aggSup.pResultBuf);
@@ -2112,7 +2119,7 @@ static void doBuildPullDataBlock(SArray* array, int32_t* pIndex, SSDataBlock* pB
   blockDataUpdateTsWindow(pBlock, 0);
 }
 
-void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SInterval* pInterval) {
+void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SHashObj* pFinalMap, SInterval* pInterval, SArray* pPullWins, int32_t numOfCh, SOperatorInfo* pOperator) {
   SColumnInfoData* pStartCol = taosArrayGet(pBlock->pDataBlock, CALCULATE_START_TS_COLUMN_INDEX);
   TSKEY*           tsData = (TSKEY*)pStartCol->pData;
   SColumnInfoData* pEndCol = taosArrayGet(pBlock->pDataBlock, CALCULATE_END_TS_COLUMN_INDEX);
@@ -2136,6 +2143,22 @@ void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SInterval* pInterval)
             taosArrayDestroy(chArray);
             taosHashRemove(pMap, &winRes, sizeof(SWinKey));
             qDebug("===stream===retrive pull data over.window %" PRId64 , winRes.ts);
+
+            void* pFinalCh = taosHashGet(pFinalMap, &winRes, sizeof(SWinKey));
+            if (pFinalCh) {
+              taosHashRemove(pFinalMap, &winRes, sizeof(SWinKey));
+              doDeleteWindow(pOperator, winRes.ts, winRes.groupId);
+              STimeWindow nextWin = getFinalTimeWindow(winRes.ts, pInterval);
+              SPullWindowInfo pull = {.window = nextWin,
+                                      .groupId = winRes.groupId,
+                                      .calWin.skey = nextWin.skey,
+                                      .calWin.ekey = nextWin.skey};
+              // add pull data request
+              if (savePullWindow(&pull, pPullWins) == TSDB_CODE_SUCCESS) {
+                addPullWindow(pMap, &winRes, numOfCh);
+                qDebug("===stream===prepare final retrive for delete %" PRId64 ", size:%d", winRes.ts, numOfCh);
+              }
+            }
           }
         }
       }
@@ -2144,7 +2167,7 @@ void processPullOver(SSDataBlock* pBlock, SHashObj* pMap, SInterval* pInterval)
   }
 }
 
-static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo) {
+static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo, int32_t childId) {
   int32_t size = taosArrayGetSize(wins);
   for (int32_t i = 0; i < size; i++) {
     SWinKey*    winKey = taosArrayGet(wins, i);
@@ -2161,6 +2184,14 @@ static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo) {
         addPullWindow(pInfo->pPullDataMap, winKey, pInfo->numOfChild);
         qDebug("===stream===prepare retrive for delete %" PRId64 ", size:%d", winKey->ts, pInfo->numOfChild);
       }
+    } else {
+      SArray* chArray = *(void**)chIds;
+      int32_t index = taosArraySearchIdx(chArray, &childId, compareInt32Val, TD_EQ);
+      qDebug("===stream===check final retrive %" PRId64",chid:%d", winKey->ts, index);
+      if (index == -1) {
+        qDebug("===stream===add final retrive %" PRId64, winKey->ts);
+        taosHashPut(pInfo->pFinalPullDataMap, winKey, sizeof(SWinKey), NULL, 0);
+      }
     }
   }
 }
@@ -2554,7 +2585,8 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
       SArray* delWins = taosArrayInit(8, sizeof(SWinKey));
       doDeleteWindows(pOperator, &pInfo->interval, pBlock, delWins, pInfo->pUpdatedMap);
       if (IS_FINAL_OP(pInfo)) {
-        addRetriveWindow(delWins, pInfo);
+        int32_t chId = getChildIndex(pBlock);
+        addRetriveWindow(delWins, pInfo, chId);
         if (pBlock->info.type != STREAM_CLEAR) {
           taosArrayAddAll(pInfo->pDelWins, delWins);
         }
@@ -2589,7 +2621,7 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) {
       }
       continue;
     } else if (pBlock->info.type == STREAM_PULL_OVER && IS_FINAL_OP(pInfo)) {
-      processPullOver(pBlock, pInfo->pPullDataMap, &pInfo->interval);
+      processPullOver(pBlock, pInfo->pPullDataMap, pInfo->pFinalPullDataMap, &pInfo->interval, pInfo->pPullWins, pInfo->numOfChild, pOperator);
       continue;
     } else if (pBlock->info.type == STREAM_CREATE_CHILD_TABLE) {
       return pBlock;
@@ -2772,6 +2804,7 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream,
   pInfo->pullIndex = 0;
   _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY);
   pInfo->pPullDataMap = taosHashInit(64, hashFn, false, HASH_NO_LOCK);
+  pInfo->pFinalPullDataMap = taosHashInit(64, hashFn, false, HASH_NO_LOCK);
   pInfo->pPullDataRes = createSpecialDataBlock(STREAM_RETRIEVE);
   pInfo->ignoreExpiredData = pIntervalPhyNode->window.igExpired;
   pInfo->ignoreExpiredDataSaved = false;
@@ -4963,6 +4996,7 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhys
 
   pInfo->pPhyNode = NULL;  // create new child
   pInfo->pPullDataMap = NULL;
+  pInfo->pFinalPullDataMap = NULL;
   pInfo->pPullWins = NULL;  // SPullWindowInfo
   pInfo->pullIndex = 0;
   pInfo->pPullDataRes = NULL;
diff --git a/tests/script/tsim/stream/distributeInterval0.sim b/tests/script/tsim/stream/distributeInterval0.sim
index 959b32fa59..5bb03c8cbf 100644
--- a/tests/script/tsim/stream/distributeInterval0.sim
+++ b/tests/script/tsim/stream/distributeInterval0.sim
@@ -1,36 +1,11 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
 
 system sh/exec.sh -n dnode1 -s start 
 sleep 50
 sql connect
 
-sql create dnode $hostname2 port 7200
 
-system sh/exec.sh -n dnode2 -s start
-
-print ===== step1
-$x = 0
-step1:
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql select * from information_schema.ins_dnodes
-print ===> $data00 $data01 $data02 $data03 $data04 $data05
-print ===> $data10 $data11 $data12 $data13 $data14 $data15
-if $rows != 2 then
-  return -1
-endi
-if $data(1)[4] != ready then
-  goto step1
-endi
-if $data(2)[4] != ready then
-  goto step1
-endi
 
 print ===== step2
 sql drop stream if exists stream_t1;
@@ -248,10 +223,56 @@ sql insert into ts3 values(1648791223002,2,2,3,1.1);
 sql insert into ts4 values(1648791233003,3,2,3,2.1);
 sql insert into ts3 values(1648791243004,4,2,43,73.1);
 sql insert into ts4 values(1648791213002,24,22,23,4.1);
+
+$loop_count = 0
+loop032:
+
+$loop_count = $loop_count + 1
+if $loop_count == 30 then
+  return -1
+endi
+
+sleep 1000
+print 6-0 select * from streamtST1;
+sql select * from streamtST1;
+
+if $rows != 4 then
+  print =====rows=$rows
+  goto loop032
+endi
+
+if $data01 != 8 then
+  print =6====data01=$data01
+  goto loop032
+endi
+
 sql insert into ts3 values(1648791243005,4,20,3,3.1);
 sql insert into ts4 values(1648791243006,4,2,3,3.1) (1648791243007,4,2,3,3.1) ;
 sql insert into ts3 values(1648791243008,4,2,30,3.1) (1648791243009,4,2,3,3.1)  (1648791243010,4,2,3,3.1)  ;
 sql insert into ts4 values(1648791243011,4,2,3,3.1) (1648791243012,34,32,33,3.1)  (1648791243013,4,2,3,3.1) (1648791243014,4,2,13,3.1);
+
+$loop_count = 0
+loop033:
+
+$loop_count = $loop_count + 1
+if $loop_count == 30 then
+  return -1
+endi
+
+sleep 1000
+print 6-1 select * from streamtST1;
+sql select * from streamtST1;
+
+if $rows != 4 then
+  print =====rows=$rows
+  goto loop033
+endi
+
+if $data01 != 8 then
+  print =6====data01=$data01
+  goto loop033
+endi
+
 sql insert into ts3 values(1648791243005,4,42,3,3.1) (1648791243003,4,2,33,3.1) (1648791243006,4,2,3,3.1) (1648791213001,1,52,13,1.0) (1648791223001,22,22,83,1.1) ;
 
 $loop_count = 0

From 44ed6f0c92b5ee4e12ead7edc23d033b11609f9c Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 6 Jun 2023 18:51:08 +0800
Subject: [PATCH 41/58] release: update default version

---
 cmake/cmake.version                | 2 +-
 docs/en/28-releases/01-tdengine.md | 4 ++++
 docs/zh/28-releases/01-tdengine.md | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cmake/cmake.version b/cmake/cmake.version
index 6d893c0627..3d0dc80902 100644
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@@ -2,7 +2,7 @@
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "3.0.4.3")
+  SET(TD_VER_NUMBER "3.0.5.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
index c7836d1298..a9336697f2 100644
--- a/docs/en/28-releases/01-tdengine.md
+++ b/docs/en/28-releases/01-tdengine.md
@@ -10,6 +10,10 @@ For TDengine 2.x installation packages by version, please visit [here](https://w
 
 import Release from "/components/ReleaseV3";
 
+## 3.0.5.0
+
+<Release type="tdengine" version="3.0.5.0" />
+
 ## 3.0.4.2
 
 <Release type="tdengine" version="3.0.4.2" />
diff --git a/docs/zh/28-releases/01-tdengine.md b/docs/zh/28-releases/01-tdengine.md
index 2b28bae745..3ee19de84f 100644
--- a/docs/zh/28-releases/01-tdengine.md
+++ b/docs/zh/28-releases/01-tdengine.md
@@ -10,6 +10,10 @@ TDengine 2.x 各版本安装包请访问[这里](https://www.taosdata.com/all-do
 
 import Release from "/components/ReleaseV3";
 
+## 3.0.5.0
+
+<Release type="tdengine" version="3.0.5.0" />
+
 ## 3.0.4.2
 
 <Release type="tdengine" version="3.0.4.2" />

From 3cb64f3775e23c72fe29926dc4302c8c8cc37362 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Tue, 6 Jun 2023 19:28:55 +0800
Subject: [PATCH 42/58] fix: prevent projectoperator scanning all rows when
 limit with no group

---
 source/libs/executor/src/groupoperator.c   | 2 ++
 source/libs/executor/src/joinoperator.c    | 5 +++++
 source/libs/executor/src/projectoperator.c | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 7aac639027..c448ea0160 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -647,6 +647,8 @@ uint64_t calcGroupId(char* pData, int32_t len) {
   // NOTE: only extract the initial 8 bytes of the final MD5 digest
   uint64_t id = 0;
   memcpy(&id, context.digest, sizeof(uint64_t));
+  if (0 == id)
+    memcpy(&id, context.digest + 8, sizeof(uint64_t));
   return id;
 }
 
diff --git a/source/libs/executor/src/joinoperator.c b/source/libs/executor/src/joinoperator.c
index 754b5f4737..744e513b96 100644
--- a/source/libs/executor/src/joinoperator.c
+++ b/source/libs/executor/src/joinoperator.c
@@ -183,6 +183,11 @@ void destroyMergeJoinOperator(void* param) {
   SJoinOperatorInfo* pJoinOperator = (SJoinOperatorInfo*)param;
   nodesDestroyNode(pJoinOperator->pCondAfterMerge);
 
+  taosArrayDestroy(pJoinOperator->rowCtx.leftCreatedBlocks);
+  taosArrayDestroy(pJoinOperator->rowCtx.rightCreatedBlocks);
+  taosArrayDestroy(pJoinOperator->rowCtx.leftRowLocations);
+  taosArrayDestroy(pJoinOperator->rowCtx.rightRowLocations);
+
   pJoinOperator->pRes = blockDataDestroy(pJoinOperator->pRes);
   taosMemoryFreeClear(param);
 }
diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c
index dde6f7c0e8..e7de826d4b 100644
--- a/source/libs/executor/src/projectoperator.c
+++ b/source/libs/executor/src/projectoperator.c
@@ -213,6 +213,8 @@ static int32_t doIngroupLimitOffset(SLimitInfo* pLimitInfo, uint64_t groupId, SS
   } else {
     if (limitReached && (pLimitInfo->slimit.limit >= 0 && pLimitInfo->slimit.limit <= pLimitInfo->numOfOutputGroups)) {
       setOperatorCompleted(pOperator);
+    } else if (limitReached && groupId == 0) {
+      setOperatorCompleted(pOperator);
     }
   }
 

From b2029e79a3a4dc6a15f8b8001a33fe30bc0d0f75 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 6 Jun 2023 19:55:44 +0800
Subject: [PATCH 43/58] update taos-tools release version

---
 docs/en/28-releases/02-tools.md | 4 ++++
 docs/zh/28-releases/02-tools.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/docs/en/28-releases/02-tools.md b/docs/en/28-releases/02-tools.md
index 9f8dbfee7e..28c2ff7a7f 100644
--- a/docs/en/28-releases/02-tools.md
+++ b/docs/en/28-releases/02-tools.md
@@ -10,6 +10,10 @@ For other historical version installers, please visit [here](https://www.taosdat
 
 import Release from "/components/ReleaseV3";
 
+## 2.5.1
+
+<Release type="tools" version="2.5.1" />
+
 ## 2.5.0
 
 <Release type="tools" version="2.5.0" />
diff --git a/docs/zh/28-releases/02-tools.md b/docs/zh/28-releases/02-tools.md
index 7f93483ed4..fbd12b1440 100644
--- a/docs/zh/28-releases/02-tools.md
+++ b/docs/zh/28-releases/02-tools.md
@@ -10,6 +10,10 @@ taosTools 各版本安装包下载链接如下：
 
 import Release from "/components/ReleaseV3";
 
+## 2.5.1
+
+<Release type="tools" version="2.5.1" />
+
 ## 2.5.0
 
 <Release type="tools" version="2.5.0" />

From 2ab43ca0d009b9ddcee3153da3fc3f771a3c2520 Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Tue, 6 Jun 2023 17:37:09 +0800
Subject: [PATCH 44/58] semi interval op check data ts

---
 source/libs/executor/src/timewindowoperator.c  | 2 +-
 tests/script/tsim/stream/ignoreExpiredData.sim | 4 ++--
 tests/script/tsim/stream/sliding.sim           | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index d6429fd121..2676e097f9 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2345,7 +2345,7 @@ static void doStreamIntervalAggImpl(SOperatorInfo* pOperatorInfo, SSDataBlock* p
   }
   while (1) {
     bool isClosed = isCloseWindow(&nextWin, &pInfo->twAggSup);
-    if ((pInfo->ignoreExpiredData && isClosed) || !inSlidingWindow(&pInfo->interval, &nextWin, &pSDataBlock->info)) {
+    if ((pInfo->ignoreExpiredData && isClosed && !IS_FINAL_OP(pInfo)) || !inSlidingWindow(&pInfo->interval, &nextWin, &pSDataBlock->info)) {
       startPos = getNexWindowPos(&pInfo->interval, &pSDataBlock->info, tsCols, startPos, nextWin.ekey, &nextWin);
       if (startPos < 0) {
         break;
diff --git a/tests/script/tsim/stream/ignoreExpiredData.sim b/tests/script/tsim/stream/ignoreExpiredData.sim
index 27920dd539..884b7cbb5f 100644
--- a/tests/script/tsim/stream/ignoreExpiredData.sim
+++ b/tests/script/tsim/stream/ignoreExpiredData.sim
@@ -132,12 +132,12 @@ if $loop_count == 10 then
   return -1
 endi
 
-if $data01 != 1 then
+if $data01 != 2 then
   print =====data01=$data01
   goto loop4
 endi
 
-if $data02 != 1 then
+if $data02 != 2 then
   print =====data02=$data02
   goto loop4
 endi
diff --git a/tests/script/tsim/stream/sliding.sim b/tests/script/tsim/stream/sliding.sim
index 3312ccbec4..05eb7dacba 100644
--- a/tests/script/tsim/stream/sliding.sim
+++ b/tests/script/tsim/stream/sliding.sim
@@ -576,13 +576,6 @@ $loop_count = 0
 
 print step 7
 
-loop4:
-sleep 100
-
-$loop_count = $loop_count + 1
-if $loop_count == 10 then
-  return -1
-endi
 
 sql create database test3 vgroups 6;
 sql use test3;

From 1e9c4d5facfaf7dbae9c2d6c30636af6193e563c Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Wed, 7 Jun 2023 10:45:27 +0800
Subject: [PATCH 45/58] opt stream block dispatch

---
 include/common/tdatablock.h             |  1 +
 include/libs/stream/tstream.h           |  1 +
 source/common/src/tdatablock.c          | 24 +++++++---
 source/dnode/vnode/src/tq/tqSink.c      |  6 +--
 source/libs/stream/src/streamDispatch.c | 63 ++++++++++++++++++-------
 source/libs/stream/src/streamTask.c     |  4 ++
 6 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/include/common/tdatablock.h b/include/common/tdatablock.h
index 53fc07c3f3..6cb7d88523 100644
--- a/include/common/tdatablock.h
+++ b/include/common/tdatablock.h
@@ -248,6 +248,7 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq2** pReq, const SSDataBlock* pData
                                     tb_uid_t suid);
 
 char* buildCtbNameByGroupId(const char* stbName, uint64_t groupId);
+int32_t buildCtbNameByGroupIdImpl(const char* stbName, uint64_t groupId, char* pBuf);
 
 static FORCE_INLINE int32_t blockGetEncodeSize(const SSDataBlock* pBlock) {
   return blockDataGetSerialMetaSize(taosArrayGetSize(pBlock->pDataBlock)) + blockDataGetSize(pBlock);
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index 8316e6ef50..51f2de481d 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -327,6 +327,7 @@ struct SStreamTask {
   int64_t             checkpointingId;
   int32_t             checkpointAlignCnt;
   struct SStreamMeta* pMeta;
+  SSHashObj*          pNameMap;
 };
 
 // meta
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 24e978b0ea..033fbb0ef1 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -2465,19 +2465,31 @@ _end:
 }
 
 char* buildCtbNameByGroupId(const char* stbFullName, uint64_t groupId) {
-  if (stbFullName[0] == 0) {
+  char* pBuf = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + 1);
+  if (!pBuf) {
     return NULL;
   }
+  int32_t code = buildCtbNameByGroupIdImpl(stbFullName, groupId, pBuf);
+  if (code != TSDB_CODE_SUCCESS) {
+    taosMemoryFree(pBuf);
+    return NULL;
+  }
+  return pBuf;
+}
+
+int32_t buildCtbNameByGroupIdImpl(const char* stbFullName, uint64_t groupId, char* cname) {
+  if (stbFullName[0] == 0) {
+    return TSDB_CODE_FAILED;
+  }
 
   SArray* tags = taosArrayInit(0, sizeof(SSmlKv));
   if (tags == NULL) {
-    return NULL;
+    return TSDB_CODE_FAILED;
   }
 
-  void* cname = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN + 1);
   if (cname == NULL) {
     taosArrayDestroy(tags);
-    return NULL;
+    return TSDB_CODE_FAILED;
   }
 
   SSmlKv pTag = {.key = "group_id",
@@ -2499,9 +2511,9 @@ char* buildCtbNameByGroupId(const char* stbFullName, uint64_t groupId) {
   taosArrayDestroy(tags);
 
   if ((rname.ctbShortName && rname.ctbShortName[0]) == 0) {
-    return NULL;
+    return TSDB_CODE_FAILED;
   }
-  return rname.ctbShortName;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) {
diff --git a/source/dnode/vnode/src/tq/tqSink.c b/source/dnode/vnode/src/tq/tqSink.c
index db1b5ed902..9349c6eb0d 100644
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@@ -298,10 +298,8 @@ void tqSinkToTablePipeline(SStreamTask* pTask, void* vnode, int64_t ver, void* d
         if (res == TSDB_CODE_SUCCESS) {
           memcpy(ctbName, pTableSinkInfo->tbName, strlen(pTableSinkInfo->tbName));
         } else {
-          char* tmp = buildCtbNameByGroupId(stbFullName, pDataBlock->info.id.groupId);
-          memcpy(ctbName, tmp, strlen(tmp));
-          memcpy(pTableSinkInfo->tbName, tmp, strlen(tmp));
-          taosMemoryFree(tmp);
+          buildCtbNameByGroupIdImpl(stbFullName, pDataBlock->info.id.groupId, ctbName);
+          memcpy(pTableSinkInfo->tbName, ctbName, strlen(ctbName));
           tqDebug("vgId:%d, gropuId:%" PRIu64 " datablock table name is null", TD_VID(pVnode),
                   pDataBlock->info.id.groupId);
         }
diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c
index 9cb0a56644..922a1f5345 100644
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@@ -15,6 +15,13 @@
 
 #include "streamInc.h"
 
+#define MAX_BLOCK_NAME_NUM 1024
+
+typedef struct SBlockName {
+  uint32_t hashValue;
+  char     parTbName[TSDB_TABLE_NAME_LEN];
+} SBlockName;
+
 int32_t tEncodeStreamDispatchReq(SEncoder* pEncoder, const SStreamDispatchReq* pReq) {
   if (tStartEncode(pEncoder) < 0) return -1;
   if (tEncodeI64(pEncoder, pReq->streamId) < 0) return -1;
@@ -331,26 +338,46 @@ FAIL:
 
 int32_t streamSearchAndAddBlock(SStreamTask* pTask, SStreamDispatchReq* pReqs, SSDataBlock* pDataBlock, int32_t vgSz,
                                 int64_t groupId) {
-  char* ctbName = taosMemoryCalloc(1, TSDB_TABLE_FNAME_LEN);
-  if (ctbName == NULL) {
-    return -1;
-  }
-
-  if (pDataBlock->info.parTbName[0]) {
-    snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, pDataBlock->info.parTbName);
-  } else {
-    char* ctbShortName = buildCtbNameByGroupId(pTask->shuffleDispatcher.stbFullName, groupId);
-    snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, ctbShortName);
-    taosMemoryFree(ctbShortName);
-  }
-
+  uint32_t   hashValue = 0;
   SArray* vgInfo = pTask->shuffleDispatcher.dbInfo.pVgroupInfos;
+  if (pTask->pNameMap == NULL) {
+    pTask->pNameMap = tSimpleHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT));
+  }
 
-  /*uint32_t hashValue = MurmurHash3_32(ctbName, strlen(ctbName));*/
-  SUseDbRsp* pDbInfo = &pTask->shuffleDispatcher.dbInfo;
-  uint32_t   hashValue =
-      taosGetTbHashVal(ctbName, strlen(ctbName), pDbInfo->hashMethod, pDbInfo->hashPrefix, pDbInfo->hashSuffix);
-  taosMemoryFree(ctbName);
+  void* pVal = tSimpleHashGet(pTask->pNameMap, &groupId, sizeof(int64_t));
+  if (pVal) {
+    SBlockName* pBln = (SBlockName*)pVal;
+    hashValue = pBln->hashValue;
+    if (!pDataBlock->info.parTbName[0]) {
+      memcpy(pDataBlock->info.parTbName, pBln->parTbName, strlen(pBln->parTbName));
+    }
+  } else {
+    char* ctbName = taosMemoryCalloc(1, TSDB_TABLE_FNAME_LEN);
+    if (ctbName == NULL) {
+      return -1;
+    }
+
+    if (pDataBlock->info.parTbName[0]) {
+      snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, pDataBlock->info.parTbName);
+    } else {
+      buildCtbNameByGroupIdImpl(pTask->shuffleDispatcher.stbFullName, groupId, pDataBlock->info.parTbName);
+      snprintf(ctbName, TSDB_TABLE_NAME_LEN, "%s.%s", pTask->shuffleDispatcher.dbInfo.db, pDataBlock->info.parTbName);
+    }
+
+    SArray* vgInfo = pTask->shuffleDispatcher.dbInfo.pVgroupInfos;
+
+    /*uint32_t hashValue = MurmurHash3_32(ctbName, strlen(ctbName));*/
+    SUseDbRsp* pDbInfo = &pTask->shuffleDispatcher.dbInfo;
+    hashValue =
+        taosGetTbHashVal(ctbName, strlen(ctbName), pDbInfo->hashMethod, pDbInfo->hashPrefix, pDbInfo->hashSuffix);
+    taosMemoryFree(ctbName);
+    SBlockName bln = {0};
+    bln.hashValue = hashValue;
+    memcpy(bln.parTbName, pDataBlock->info.parTbName, strlen(pDataBlock->info.parTbName));
+    if (tSimpleHashGetSize(pTask->pNameMap) < MAX_BLOCK_NAME_NUM) {
+      tSimpleHashPut(pTask->pNameMap, &groupId, sizeof(int64_t), &bln, sizeof(SBlockName));
+    }
+  }
 
   bool found = false;
   // TODO: optimize search
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index a0caffd41f..284d1ecab6 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -224,5 +224,9 @@ void tFreeStreamTask(SStreamTask* pTask) {
     taosMemoryFree((void*)pTask->id.idStr);
   }
 
+  if (pTask->pNameMap) {
+    tSimpleHashCleanup(pTask->pNameMap);
+  }
+
   taosMemoryFree(pTask);
 }

From 09809f2fc099e71cb314e71869aba9f3f6e6358a Mon Sep 17 00:00:00 2001
From: t_max <1172915550@qq.com>
Date: Wed, 7 Jun 2023 11:42:43 +0800
Subject: [PATCH 46/58] docs: go connector version support

---
 docs/en/14-reference/03-connector/05-go.mdx | 2 +-
 docs/zh/08-connector/20-go.mdx              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/14-reference/03-connector/05-go.mdx b/docs/en/14-reference/03-connector/05-go.mdx
index 7e5023b6a7..06d643c6c8 100644
--- a/docs/en/14-reference/03-connector/05-go.mdx
+++ b/docs/en/14-reference/03-connector/05-go.mdx
@@ -29,7 +29,7 @@ REST connections are supported on all platforms that can run Go.
 
 ## Version support
 
-Please refer to [version support list](/reference/connector#version-support)
+Please refer to [version support list](https://github.com/taosdata/driver-go#remind)
 
 ## Supported features
 
diff --git a/docs/zh/08-connector/20-go.mdx b/docs/zh/08-connector/20-go.mdx
index 5461328182..d431be35cb 100644
--- a/docs/zh/08-connector/20-go.mdx
+++ b/docs/zh/08-connector/20-go.mdx
@@ -30,7 +30,7 @@ REST 连接支持所有能运行 Go 的平台。
 
 ## 版本支持
 
-请参考[版本支持列表](../#版本支持)
+请参考[版本支持列表](https://github.com/taosdata/driver-go#remind)
 
 ## 支持的功能特性
 

From 3f26d67cae7442595c6406c1ce5c6b9b1d391d29 Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Wed, 7 Jun 2023 13:50:32 +0800
Subject: [PATCH 47/58] fix: change kafka doc, delete confluent related content

---
 docs/en/20-third-party/11-kafka.md | 290 +++++++++++------------------
 docs/zh/20-third-party/11-kafka.md | 289 +++++++++++-----------------
 2 files changed, 212 insertions(+), 367 deletions(-)

diff --git a/docs/en/20-third-party/11-kafka.md b/docs/en/20-third-party/11-kafka.md
index f09ebb274c..1fc2b57a13 100644
--- a/docs/en/20-third-party/11-kafka.md
+++ b/docs/en/20-third-party/11-kafka.md
@@ -16,165 +16,79 @@ TDengine Source Connector is used to read data from TDengine in real-time and se
 
 ![TDengine Database Kafka Connector -- streaming integration with kafka connect](kafka/streaming-integration-with-kafka-connect.webp)
 
-## What is Confluent?
-
-[Confluent](https://www.confluent.io/) adds many extensions to Kafka. include:
-
-1. Schema Registry
-2. REST Proxy
-3. Non-Java Clients
-4. Many packaged Kafka Connect plugins
-5. GUI for managing and monitoring Kafka - Confluent Control Center
-
-Some of these extensions are available in the community version of Confluent. Some are only available in the enterprise version.
-![TDengine Database Kafka Connector -- Confluent platform](kafka/confluentPlatform.webp)
-
-Confluent Enterprise Edition provides the `confluent` command-line tool to manage various components.
-
 ## Prerequisites
 
 1. Linux operating system
 2. Java 8 and Maven installed
-3. Git is installed
+3. Git/curl/vi is installed
 4. TDengine is installed and started. If not, please refer to [Installation and Uninstallation](/operation/pkg-install)
 
-## Install Confluent
-
-Confluent provides two installation methods: Docker and binary packages. This article only introduces binary package installation.
+## Install Kafka
 
 Execute in any directory:
 
 ````
-curl -O http://packages.confluent.io/archive/7.1/confluent-7.1.1.tar.gz
-tar xzf confluent-7.1.1.tar.gz -C /opt/
+curl -O https://downloads.apache.org/kafka/3.4.0/kafka_2.13-3.4.0.tgz
+tar xzf kafka_2.13-3.4.0.tgz -C /opt/
+ln -s /opt/kafka_2.13-3.4.0 /opt/kafka
 ````
 
-Then you need to add the `$CONFLUENT_HOME/bin` directory to the PATH.
+Then you need to add the `$KAFKA_HOME/bin` directory to the PATH.
 
 ```title=".profile"
-export CONFLUENT_HOME=/opt/confluent-7.1.1
-export PATH=$CONFLUENT_HOME/bin:$PATH
+export KAFKA_HOME=/opt/kafka
+export PATH=$PATH:$KAFKA_HOME/bin
 ```
 
 Users can append the above script to the current user's profile file (~/.profile or ~/.bash_profile)
 
-After the installation is complete, you can enter `confluent version` for simple verification:
-
-```
-# confluent version
-confluent - Confluent CLI
-
-Version:     v2.6.1
-Git Ref:     6d920590
-Build Date:  2022-02-18T06:14:21Z
-Go Version:  go1.17.6 (linux/amd64)
-Development: false
-```
-
 ## Install TDengine Connector plugin
 
 ### Install from source code
 
-```
+```shell
 git clone --branch 3.0 https://github.com/taosdata/kafka-connect-tdengine.git
 cd kafka-connect-tdengine
-mvn clean package
-unzip -d $CONFLUENT_HOME/share/java/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
+mvn clean package -Dmaven.test.skip=true
+unzip -d $KAFKA_HOME/components/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
 ```
 
-The above script first clones the project source code and then compiles and packages it with Maven. After the package is complete, the zip package of the plugin is generated in the `target/components/packages/` directory. Unzip this zip package to plugin path. We used `$CONFLUENT_HOME/share/java/` above because it's a build in plugin path.
+The above script first clones the project source code and then compiles and packages it with Maven. After the package is complete, the zip package of the plugin is generated in the `target/components/packages/` directory. Unzip this zip package to plugin path. We used `$KAFKA_HOME/components/` above because it's a build in plugin path.
 
-### Install with confluent-hub
+### Add configuration file
 
-[Confluent Hub](https://www.confluent.io/hub) provides a service to download Kafka Connect plugins. After TDengine Kafka Connector is published to Confluent Hub, it can be installed using the command tool `confluent-hub`.
-**TDengine Kafka Connector is currently not officially released and cannot be installed in this way**.
+add kafka-connect-tdengine plugin path to `plugin.path` in `$KAFKA_HOME/config/connect-distributed.properties`.
 
-## Start Confluent
-
-```
-confluent local services start
+```properties
+plugin.path=/usr/share/java,/opt/kafka/components
 ```
 
-:::note
-Be sure to install the plugin before starting Confluent. Otherwise, Kafka Connect will fail to discover the plugins.
-:::
+## Start Kafka Services
 
-:::tip
-If a component fails to start, try clearing the data and restarting. The data directory will be printed to the console at startup, e.g.:
+Use command bellow to start all services:
 
-```title="Console output log" {1}
-Using CONFLUENT_CURRENT: /tmp/confluent.106668
-Starting ZooKeeper
-ZooKeeper is [UP]
-Starting Kafka
-Kafka is [UP]
-Starting Schema Registry
-Schema Registry is [UP]
-Starting Kafka REST
-Kafka REST is [UP]
-Starting Connect
-Connect is [UP]
-Starting ksqlDB Server
-ksqlDB Server is [UP]
-Starting Control Center
-Control Center is [UP]
-```
+```shell
+zookeeper-server-start.sh -daemon $KAFKA_HOME/config/zookeeper.properties
 
-To clear data, execute `rm -rf /tmp/confluent.106668`.
-:::
+kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
 
-### Check Confluent Services Status
+connect-distributed.sh -daemon $KAFKA_HOME/config/connect-distributed.properties
 
-Use command bellow to check the status of all service:
-
-```
-confluent local services status
-```
-
-The expected output is:
-```
-Connect is [UP]
-Control Center is [UP]
-Kafka is [UP]
-Kafka REST is [UP]
-ksqlDB Server is [UP]
-Schema Registry is [UP]
-ZooKeeper is [UP]
 ```
 
 ### Check Successfully Loaded Plugin
 
 After Kafka Connect was completely started, you can use bellow command to check if our plugins are installed successfully:
-```
-confluent local services connect plugin list
+
+```shell
+curl http://localhost:8083/connectors
 ```
 
-The output should contains `TDengineSinkConnector` and `TDengineSourceConnector` as bellow:
+The output as bellow:
 
+```txt
+[]
 ```
-Available Connect Plugins:
-[
-  {
-    "class": "com.taosdata.kafka.connect.sink.TDengineSinkConnector",
-    "type": "sink",
-    "version": "1.0.0"
-  },
-  {
-    "class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
-    "type": "source",
-    "version": "1.0.0"
-  },
-......
-```
-
-If not, please check the log file of Kafka Connect. To view the log file path, please execute:
-
-```
-echo `cat /tmp/confluent.current`/connect/connect.stdout
-```
-It should produce a path like:`/tmp/confluent.104086/connect/connect.stdout`
-
-Besides log file `connect.stdout` there is a file named `connect.properties`. At the end of this file you can see the effective `plugin.path` which is a series of paths joined by comma. If Kafka Connect not found our plugins, it's probably because the installed path is not included in `plugin.path`.
 
 ## The use of TDengine Sink Connector
 
@@ -184,40 +98,47 @@ TDengine Sink Connector internally uses TDengine [modeless write interface](/ref
 
 The following example synchronizes the data of the topic meters to the target database power. The data format is the InfluxDB Line protocol format.
 
-### Add configuration file
+### Add Sink Connector configuration file
 
-```
+```shell
 mkdir ~/test
 cd ~/test
-vi sink-demo.properties
+vi sink-demo.json
 ```
 
-sink-demo.properties' content is following:
+sink-demo.json' content is following:
 
-```ini title="sink-demo.properties"
-name=TDengineSinkConnector
-connector.class=com.taosdata.kafka.connect.sink.TDengineSinkConnector
-tasks.max=1
-topics=meters
-connection.url=jdbc:TAOS://127.0.0.1:6030
-connection.user=root
-connection.password=taosdata
-connection.database=power
-db.schemaless=line
-data.precision=ns
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
+```json title="sink-demo.json"
+{
+  "name": "TDengineSinkConnector",
+  "config": {
+    "connector.class":"com.taosdata.kafka.connect.sink.TDengineSinkConnector",
+    "tasks.max": "1",
+    "topics": "meters",
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
+    "connection.user": "root",
+    "connection.password": "taosdata",
+    "connection.database": "power",
+    "db.schemaless": "line",
+    "data.precision": "ns",
+    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+    "value.converter": "org.apache.kafka.connect.storage.StringConverter",
+    "errors.tolerance": "all",
+    "errors.deadletterqueue.topic.name": "dead_letter_topic",
+    "errors.deadletterqueue.topic.replication.factor": 1
+  }
+}
 ```
 
 Key configuration instructions:
 
-1. `topics=meters` and `connection.database=power` means to subscribe to the data of the topic meters and write to the database power.
-2. `db.schemaless=line` means the data in the InfluxDB Line protocol format.
+1. `"topics": "meters"` and `"connection.database": "power"` means to subscribe to the data of the topic meters and write to the database power.
+2. `"db.schemaless": "line"` means the data in the InfluxDB Line protocol format.
 
-### Create Connector instance
+### Create Sink Connector instance
 
-````
-confluent local services connect connector load TDengineSinkConnector --config ./sink-demo.properties
+````shell
+curl -X POST -d @sink-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
 ````
 
 If the above command is executed successfully, the output is as follows:
@@ -237,7 +158,10 @@ If the above command is executed successfully, the output is as follows:
     "tasks.max": "1",
     "topics": "meters",
     "value.converter": "org.apache.kafka.connect.storage.StringConverter",
-    "name": "TDengineSinkConnector"
+    "name": "TDengineSinkConnector",
+    "errors.tolerance": "all",
+    "errors.deadletterqueue.topic.name": "dead_letter_topic",
+    "errors.deadletterqueue.topic.replication.factor": "1",  
   },
   "tasks": [],
   "type": "sink"
@@ -258,7 +182,7 @@ meters,location=California.LoSangeles,groupid=3 current=11.3,voltage=221,phase=0
 Use kafka-console-producer to write test data to the topic `meters`.
 
 ```
-cat test-data.txt | kafka-console-producer --broker-list localhost:9092 --topic meters
+cat test-data.txt | kafka-console-producer.sh --broker-list localhost:9092 --topic meters
 ```
 
 :::note
@@ -269,12 +193,12 @@ TDengine Sink Connector will automatically create the database if the target dat
 
 Use the TDengine CLI to verify that the sync was successful.
 
-```
+```sql
 taos> use power;
 Database changed.
 
 taos> select * from meters;
-              ts               |          current          |          voltage          |           phase           | groupid |            location            |
+              _ts               |          current          |          voltage          |           phase           | groupid |            location            |
 ===============================================================================================================================================================
  2022-03-28 09:56:51.249000000 |              11.800000000 |             221.000000000 |               0.280000000 | 2       | California.LosAngeles          |
  2022-03-28 09:56:51.250000000 |              13.400000000 |             223.000000000 |               0.290000000 | 2       | California.LosAngeles          |
@@ -293,29 +217,34 @@ TDengine Source Connector will convert the data in TDengine data table into [Inf
 
 The following sample program synchronizes the data in the database test to the topic tdengine-source-test.
 
-### Add configuration file
+### Add Source Connector configuration file
 
-```
-vi source-demo.properties
+```shell
+vi source-demo.json
 ```
 
 Input following content:
 
-```ini title="source-demo.properties"
-name=TDengineSourceConnector
-connector.class=com.taosdata.kafka.connect.source.TDengineSourceConnector
-tasks.max=1
-connection.url=jdbc:TAOS://127.0.0.1:6030
-connection.username=root
-connection.password=taosdata
-connection.database=test
-connection.attempts=3
-connection.backoff.ms=5000
-topic.prefix=tdengine-source-
-poll.interval.ms=1000
-fetch.max.rows=100
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
+```json title="source-demo.json"
+{
+  "name":"TDengineSourceConnector",
+    "config":{
+    "connector.class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
+    "tasks.max": 1,
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
+    "connection.username": "root",
+    "connection.password": "taosdata",
+    "connection.database": "test",
+    "connection.attempts": 3,
+    "connection.backoff.ms": 5000,
+    "topic.prefix": "tdengine-source",
+    "poll.interval.ms": 1000,
+    "fetch.max.rows": 100,
+    "topic.per.stable": true,
+    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+    "value.converter": "org.apache.kafka.connect.storage.StringConverter"
+    }
+}
 ```
 
 ### Prepare test data
@@ -340,40 +269,40 @@ INSERT INTO d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-1
 
 Use TDengine CLI to execute SQL script
 
-```
+```shell
 taos -f prepare-source-data.sql
 ```
 
 ### Create Connector instance
 
-````
-confluent local services connect connector load TDengineSourceConnector --config source-demo.properties
-````
+```shell
+curl -X POST -d @source-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
+```
 
 ### View topic data
 
 Use the kafka-console-consumer command-line tool to monitor data in the topic tdengine-source-test. In the beginning, all historical data will be output. After inserting two new data into TDengine, kafka-console-consumer immediately outputs the two new data. The output is in InfluxDB line protocol format.
 
-````
-kafka-console-consumer --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test
+````shell
+kafka-console-consumer.sh --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test-meters
 ````
 
 output:
 
-````
+```txt
 ......
 meters,location="California.SanFrancisco",groupid=2i32 current=10.3f32,voltage=219i32,phase=0.31f32 1538548685000000000
 meters,location="California.SanFrancisco",groupid=2i32 current=12.6f32,voltage=218i32,phase=0.33f32 1538548695000000000
 ......
-````
+```
 
 All historical data is displayed. Switch to the TDengine CLI and insert two new pieces of data:
 
-````
+```sql
 USE test;
 INSERT INTO d1001 VALUES (now, 13.3, 229, 0.38);
 INSERT INTO d1002 VALUES (now, 16.3, 233, 0.22);
-````
+```
 
 Switch back to kafka-console-consumer, and the command line window has printed out the two pieces of data just inserted.
 
@@ -383,16 +312,16 @@ After testing, use the unload command to stop the loaded connector.
 
 View currently active connectors:
 
-````
-confluent local services connect connector status
-````
+```shell
+curl http://localhost:8083/connectors
+```
 
 You should now have two active connectors if you followed the previous steps. Use the following command to unload:
 
-````
-confluent local services connect connector unload TDengineSinkConnector
-confluent local services connect connector unload TDengineSourceConnector
-````
+```shell
+curl -X DELETE http://localhost:8083/connectors/TDengineSinkConnector
+curl -X DELETE http://localhost:8083/connectors/TDengineSourceConnector
+```
 
 ## Configuration reference
 
@@ -430,19 +359,14 @@ The following configuration items apply to TDengine Sink Connector and TDengine
 6. `query.interval.ms`: The time range of reading data from TDengine each time, its unit is millisecond. It should be adjusted according to the data flow in rate, the default value is 1000.
 7. `topic.per.stable`: If it's set to true, it means one super table in TDengine corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix>-<connection.database>-<stable.name>`; if it's set to false, it means the whole DB corresponds to a topic in Kafka, the topic naming rule is `<topic.prefix>-<connection.database>`.
 
-
-
 ## Other notes
 
-1. To install plugin to a customized location, refer to https://docs.confluent.io/home/connect/self-managed/install.html#install-connector-manually.
-2. To use Kafka Connect without confluent, refer to  https://kafka.apache.org/documentation/#connect.
+1. To use Kafka Connect, refer to <https://kafka.apache.org/documentation/#connect>.
 
 ## Feedback
 
-https://github.com/taosdata/kafka-connect-tdengine/issues
+<https://github.com/taosdata/kafka-connect-tdengine/issues>
 
 ## Reference
 
-1. https://www.confluent.io/what-is-apache-kafka
-2. https://developer.confluent.io/learn-kafka/kafka-connect/intro
-3. https://docs.confluent.io/platform/current/platform.html
+1. For more information, see <https://kafka.apache.org/documentation/>
diff --git a/docs/zh/20-third-party/11-kafka.md b/docs/zh/20-third-party/11-kafka.md
index 97e78c2fde..641e2d5174 100644
--- a/docs/zh/20-third-party/11-kafka.md
+++ b/docs/zh/20-third-party/11-kafka.md
@@ -16,169 +16,78 @@ TDengine Source Connector 用于把数据实时地从 TDengine 读出来发送
 
 ![TDengine Database Kafka Connector -- streaming integration with kafka connect](kafka/streaming-integration-with-kafka-connect.webp)
 
-## 什么是 Confluent？
-
-[Confluent](https://www.confluent.io/) 在 Kafka 的基础上增加很多扩展功能。包括：
-
-1. Schema Registry
-2. REST 代理
-3. 非 Java 客户端
-4. 很多打包好的 Kafka Connect 插件
-5. 管理和监控 Kafka 的 GUI —— Confluent 控制中心
-
-这些扩展功能有的包含在社区版本的 Confluent 中，有的只有企业版能用。
-![TDengine Database Kafka Connector -- Confluent introduction](kafka/confluentPlatform.webp)
-
-Confluent 企业版提供了 `confluent` 命令行工具管理各个组件。
-
 ## 前置条件
 
 运行本教程中示例的前提条件。
 
 1. Linux 操作系统
 2. 已安装 Java 8 和 Maven
-3. 已安装 Git
+3. 已安装 Git、curl、vi
 4. 已安装并启动 TDengine。如果还没有可参考[安装和卸载](/operation/pkg-install)
 
-## 安装 Confluent
-
-Confluent 提供了 Docker 和二进制包两种安装方式。本文仅介绍二进制包方式安装。
+## 安装 Kafka
 
 在任意目录下执行：
 
-```
-curl -O http://packages.confluent.io/archive/7.1/confluent-7.1.1.tar.gz
-tar xzf confluent-7.1.1.tar.gz -C /opt/
+```shell
+curl -O https://downloads.apache.org/kafka/3.4.0/kafka_2.13-3.4.0.tgz
+tar xzf kafka_2.13-3.4.0.tgz -C /opt/
+ln -s /opt/kafka_2.13-3.4.0 /opt/kafka
 ```
 
-然后需要把 `$CONFLUENT_HOME/bin` 目录加入 PATH。
+然后需要把 `$KAFKA_HOME/bin` 目录加入 PATH。
 
 ```title=".profile"
-export CONFLUENT_HOME=/opt/confluent-7.1.1
-export PATH=$CONFLUENT_HOME/bin:$PATH
+export KAFKA_HOME=/opt/kafka
+export PATH=$PATH:$KAFKA_HOME/bin
 ```
 
 以上脚本可以追加到当前用户的 profile 文件（~/.profile 或 ~/.bash_profile）
 
-安装完成之后，可以输入`confluent version`做简单验证：
-
-```
-# confluent version
-confluent - Confluent CLI
-
-Version:     v2.6.1
-Git Ref:     6d920590
-Build Date:  2022-02-18T06:14:21Z
-Go Version:  go1.17.6 (linux/amd64)
-Development: false
-```
-
 ## 安装 TDengine Connector 插件
 
-### 从源码安装
+### 编译插件
 
-```
+```shell
 git clone --branch 3.0 https://github.com/taosdata/kafka-connect-tdengine.git
 cd kafka-connect-tdengine
-mvn clean package
-unzip -d $CONFLUENT_HOME/share/java/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
+mvn clean package -Dmaven.test.skip=true
+unzip -d $KAFKA_HOME/components/ target/components/packages/taosdata-kafka-connect-tdengine-*.zip
 ```
 
-以上脚本先 clone 项目源码，然后用 Maven 编译打包。打包完成后在 `target/components/packages/` 目录生成了插件的 zip 包。把这个 zip 包解压到安装插件的路径即可。上面的示例中使用了内置的插件安装路径： `$CONFLUENT_HOME/share/java/`。
+以上脚本先 clone 项目源码，然后用 Maven 编译打包。打包完成后在 `target/components/packages/` 目录生成了插件的 zip 包。把这个 zip 包解压到安装插件的路径即可。上面的示例中使用了内置的插件安装路径： `$KAFKA_HOME/components/`。
 
-### 用 confluent-hub 安装
+### 配置插件
 
-[Confluent Hub](https://www.confluent.io/hub) 提供下载 Kafka Connect 插件的服务。在 TDengine Kafka Connector 发布到 Confluent Hub 后可以使用命令工具 `confluent-hub` 安装。
-**TDengine Kafka Connector 目前没有正式发布，不能用这种方式安装**。
+将 kafka-connect-tdengine 插件加入 `$KAFKA_HOME/config/connect-distributed.properties` 配置文件 plugin.path 中
 
-## 启动 Confluent
-
-```
-confluent local services start
+```properties
+plugin.path=/usr/share/java,/opt/kafka/components
 ```
 
-:::note
-一定要先安装插件再启动 Confluent, 否则加载插件会失败。
-:::
+## 启动 Kafka
 
-:::tip
-若某组件启动失败，可尝试清空数据，重新启动。数据目录在启动时将被打印到控制台，比如 ：
+```shell
+zookeeper-server-start.sh -daemon $KAFKA_HOME/config/zookeeper.properties
 
-```title="控制台输出日志" {1}
-Using CONFLUENT_CURRENT: /tmp/confluent.106668
-Starting ZooKeeper
-ZooKeeper is [UP]
-Starting Kafka
-Kafka is [UP]
-Starting Schema Registry
-Schema Registry is [UP]
-Starting Kafka REST
-Kafka REST is [UP]
-Starting Connect
-Connect is [UP]
-Starting ksqlDB Server
-ksqlDB Server is [UP]
-Starting Control Center
-Control Center is [UP]
+kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties
+
+connect-distributed.sh -daemon $KAFKA_HOME/config/connect-distributed.properties
 ```
 
-清空数据可执行 `rm -rf /tmp/confluent.106668`。
-:::
-
-### 验证各个组件是否启动成功
+### 验证 kafka Connect 是否启动成功
 
 输入命令：
 
-```
-confluent local services status
+```shell
+curl http://localhost:8083/connectors
 ```
 
 如果各组件都启动成功，会得到如下输出：
 
+```txt
+[]
 ```
-Connect is [UP]
-Control Center is [UP]
-Kafka is [UP]
-Kafka REST is [UP]
-ksqlDB Server is [UP]
-Schema Registry is [UP]
-ZooKeeper is [UP]
-```
-
-### 验证插件是否安装成功
-
-在 Kafka Connect 组件完全启动后，可用以下命令列出成功加载的插件：
-
-```
-confluent local services connect plugin list
-```
-
-如果成功安装，会输出如下：
-
-```txt {4,9}
-Available Connect Plugins:
-[
-  {
-    "class": "com.taosdata.kafka.connect.sink.TDengineSinkConnector",
-    "type": "sink",
-    "version": "1.0.0"
-  },
-  {
-    "class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
-    "type": "source",
-    "version": "1.0.0"
-  },
-......
-```
-
-如果插件安装失败，请检查 Kafka Connect 的启动日志是否有异常信息，用以下命令输出日志路径：
-```
-echo `cat /tmp/confluent.current`/connect/connect.stdout
-```
-该命令的输出类似： `/tmp/confluent.104086/connect/connect.stdout`。
-
-与日志文件 `connect.stdout` 同一目录，还有一个文件名为： `connect.properties`。在这个文件的末尾，可以看到最终生效的 `plugin.path`， 它是一系列用逗号分割的路径。如果插件安装失败，很可能是因为实际的安装路径不包含在 `plugin.path` 中。
-
 
 ## TDengine Sink Connector 的使用
 
@@ -188,40 +97,47 @@ TDengine Sink Connector 内部使用 TDengine [无模式写入接口](../../conn
 
 下面的示例将主题 meters 的数据，同步到目标数据库 power。数据格式为 InfluxDB Line 协议格式。
 
-### 添加配置文件
+### 添加 Sink Connector 配置文件
 
-```
+```shell
 mkdir ~/test
 cd ~/test
-vi sink-demo.properties
+vi sink-demo.json
 ```
 
-sink-demo.properties 内容如下：
+sink-demo.json 内容如下：
 
-```ini title="sink-demo.properties"
-name=TDengineSinkConnector
-connector.class=com.taosdata.kafka.connect.sink.TDengineSinkConnector
-tasks.max=1
-topics=meters
-connection.url=jdbc:TAOS://127.0.0.1:6030
-connection.user=root
-connection.password=taosdata
-connection.database=power
-db.schemaless=line
-data.precision=ns
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
+```json title="sink-demo.json"
+{
+  "name": "TDengineSinkConnector",
+  "config": {
+    "connector.class":"com.taosdata.kafka.connect.sink.TDengineSinkConnector",
+    "tasks.max": "1",
+    "topics": "meters",
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
+    "connection.user": "root",
+    "connection.password": "taosdata",
+    "connection.database": "power",
+    "db.schemaless": "line",
+    "data.precision": "ns",
+    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+    "value.converter": "org.apache.kafka.connect.storage.StringConverter",
+    "errors.tolerance": "all",
+    "errors.deadletterqueue.topic.name": "dead_letter_topic",
+    "errors.deadletterqueue.topic.replication.factor": 1
+  }
+}
 ```
 
 关键配置说明：
 
-1. `topics=meters` 和 `connection.database=power`, 表示订阅主题 meters 的数据，并写入数据库 power。
-2. `db.schemaless=line`, 表示使用 InfluxDB Line 协议格式的数据。
+1. `"topics": "meters"` 和 `"connection.database": "power"`, 表示订阅主题 meters 的数据，并写入数据库 power。
+2. `"db.schemaless": "line"`, 表示使用 InfluxDB Line 协议格式的数据。
 
-### 创建 Connector 实例
+### 创建 Sink Connector 实例
 
-```
-confluent local services connect connector load TDengineSinkConnector --config ./sink-demo.properties
+```shell
+curl -X POST -d @sink-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
 ```
 
 若以上命令执行成功，则有如下输出：
@@ -241,7 +157,10 @@ confluent local services connect connector load TDengineSinkConnector --config .
     "tasks.max": "1",
     "topics": "meters",
     "value.converter": "org.apache.kafka.connect.storage.StringConverter",
-    "name": "TDengineSinkConnector"
+    "name": "TDengineSinkConnector",
+    "errors.tolerance": "all",
+    "errors.deadletterqueue.topic.name": "dead_letter_topic",
+    "errors.deadletterqueue.topic.replication.factor": "1",    
   },
   "tasks": [],
   "type": "sink"
@@ -261,8 +180,8 @@ meters,location=California.LosAngeles,groupid=3 current=11.3,voltage=221,phase=0
 
 使用 kafka-console-producer 向主题 meters 添加测试数据。
 
-```
-cat test-data.txt | kafka-console-producer --broker-list localhost:9092 --topic meters
+```shell
+cat test-data.txt | kafka-console-producer.sh --broker-list localhost:9092 --topic meters
 ```
 
 :::note
@@ -273,12 +192,12 @@ cat test-data.txt | kafka-console-producer --broker-list localhost:9092 --topic
 
 使用 TDengine CLI 验证同步是否成功。
 
-```
+```sql
 taos> use power;
 Database changed.
 
 taos> select * from meters;
-              ts               |          current          |          voltage          |           phase           | groupid |            location            |
+              _ts               |          current          |          voltage          |           phase           | groupid |            location            |
 ===============================================================================================================================================================
  2022-03-28 09:56:51.249000000 |              11.800000000 |             221.000000000 |               0.280000000 | 2       | California.LosAngeles          |
  2022-03-28 09:56:51.250000000 |              13.400000000 |             223.000000000 |               0.290000000 | 2       | California.LosAngeles          |
@@ -297,29 +216,34 @@ TDengine Source Connector 会将 TDengine 数据表中的数据转换成 [Influx
 
 下面的示例程序同步数据库 test 中的数据到主题 tdengine-source-test。
 
-### 添加配置文件
+### 添加 Source Connector 配置文件
 
-```
-vi source-demo.properties
+```shell
+vi source-demo.json
 ```
 
 输入以下内容：
 
-```ini title="source-demo.properties"
-name=TDengineSourceConnector
-connector.class=com.taosdata.kafka.connect.source.TDengineSourceConnector
-tasks.max=1
-connection.url=jdbc:TAOS://127.0.0.1:6030
-connection.username=root
-connection.password=taosdata
-connection.database=test
-connection.attempts=3
-connection.backoff.ms=5000
-topic.prefix=tdengine-source-
-poll.interval.ms=1000
-fetch.max.rows=100
-key.converter=org.apache.kafka.connect.storage.StringConverter
-value.converter=org.apache.kafka.connect.storage.StringConverter
+```json title="source-demo.json"
+{
+  "name":"TDengineSourceConnector",
+    "config":{
+    "connector.class": "com.taosdata.kafka.connect.source.TDengineSourceConnector",
+    "tasks.max": 1,
+    "connection.url": "jdbc:TAOS://127.0.0.1:6030",
+    "connection.username": "root",
+    "connection.password": "taosdata",
+    "connection.database": "test",
+    "connection.attempts": 3,
+    "connection.backoff.ms": 5000,
+    "topic.prefix": "tdengine-source",
+    "poll.interval.ms": 1000,
+    "fetch.max.rows": 100,
+    "topic.per.stable": true,
+    "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+    "value.converter": "org.apache.kafka.connect.storage.StringConverter"
+    }
+}
 ```
 
 ### 准备测试数据
@@ -344,27 +268,27 @@ INSERT INTO d1001 USING meters TAGS('California.SanFrancisco', 2) VALUES('2018-1
 
 使用 TDengine CLI, 执行 SQL 文件。
 
-```
+```shell
 taos -f prepare-source-data.sql
 ```
 
-### 创建 Connector 实例
+### 创建 Source Connector 实例
 
-```
-confluent local services connect connector load TDengineSourceConnector --config source-demo.properties
+```shell
+curl -X POST -d @source-demo.json http://localhost:8083/connectors -H "Content-Type: application/json"
 ```
 
 ### 查看 topic 数据
 
 使用 kafka-console-consumer 命令行工具监控主题 tdengine-source-test 中的数据。一开始会输出所有历史数据， 往 TDengine 插入两条新的数据之后，kafka-console-consumer 也立即输出了新增的两条数据。 输出数据 InfluxDB line protocol 的格式。
 
-```
-kafka-console-consumer --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test
+```shell
+kafka-console-consumer.sh --bootstrap-server localhost:9092 --from-beginning --topic tdengine-source-test-meters
 ```
 
 输出：
 
-```
+```txt
 ......
 meters,location="California.SanFrancisco",groupid=2i32 current=10.3f32,voltage=219i32,phase=0.31f32 1538548685000000000
 meters,location="California.SanFrancisco",groupid=2i32 current=12.6f32,voltage=218i32,phase=0.33f32 1538548695000000000
@@ -373,7 +297,7 @@ meters,location="California.SanFrancisco",groupid=2i32 current=12.6f32,voltage=2
 
 此时会显示所有历史数据。切换到 TDengine CLI， 插入两条新的数据：
 
-```
+```sql
 USE test;
 INSERT INTO d1001 VALUES (now, 13.3, 229, 0.38);
 INSERT INTO d1002 VALUES (now, 16.3, 233, 0.22);
@@ -387,15 +311,15 @@ INSERT INTO d1002 VALUES (now, 16.3, 233, 0.22);
 
 查看当前活跃的 connector：
 
-```
-confluent local services connect connector status
+```shell
+curl http://localhost:8083/connectors
 ```
 
 如果按照前述操作，此时应有两个活跃的 connector。使用下面的命令 unload：
 
-```
-confluent local services connect connector unload TDengineSinkConnector
-confluent local services connect connector unload TDengineSourceConnector
+```shell
+curl -X DELETE http://localhost:8083/connectors/TDengineSinkConnector
+curl -X DELETE http://localhost:8083/connectors/TDengineSourceConnector
 ```
 
 ## 配置参考
@@ -442,15 +366,12 @@ confluent local services connect connector unload TDengineSourceConnector
 
 ## 其他说明
 
-1. 插件的安装位置可以自定义，请参考官方文档：https://docs.confluent.io/home/connect/self-managed/install.html#install-connector-manually。
-2. 本教程的示例程序使用了 Confluent 平台，但是 TDengine Kafka Connector 本身同样适用于独立安装的 Kafka, 且配置方法相同。关于如何在独立安装的 Kafka 环境使用 Kafka Connect 插件， 请参考官方文档： https://kafka.apache.org/documentation/#connect。
+1. 关于如何在独立安装的 Kafka 环境使用 Kafka Connect 插件， 请参考官方文档：<https://kafka.apache.org/documentation/#connect>。
 
 ## 问题反馈
 
-无论遇到任何问题，都欢迎在本项目的 Github 仓库反馈： https://github.com/taosdata/kafka-connect-tdengine/issues。
+无论遇到任何问题，都欢迎在本项目的 Github 仓库反馈：<https://github.com/taosdata/kafka-connect-tdengine/issues>。
 
 ## 参考
 
-1. https://www.confluent.io/what-is-apache-kafka
-2. https://developer.confluent.io/learn-kafka/kafka-connect/intro
-3. https://docs.confluent.io/platform/current/platform.html
+1. <https://kafka.apache.org/documentation/>

From 6188f26d57c00d5b85c3a3af8c577d8205820462 Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Wed, 7 Jun 2023 14:14:33 +0800
Subject: [PATCH 48/58] docs: add version history

---
 docs/en/14-reference/03-connector/06-rust.mdx | 9 +++++++--
 docs/zh/08-connector/26-rust.mdx              | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/en/14-reference/03-connector/06-rust.mdx b/docs/en/14-reference/03-connector/06-rust.mdx
index fb7c368df1..4a4ef5ba9c 100644
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
@@ -27,9 +27,14 @@ The source code for the Rust connectors is located on [GitHub](https://github.co
 Native connections are supported on the same platforms as the TDengine client driver.
 Websocket connections are supported on all platforms that can run Go.
 
-## Version support
+## Version history
 
-Please refer to [version support list](/reference/connector#version-support)
+| connector-rust version |  TDengine version |                   major features                    |
+| :----------------: | :--------------: | :--------------------------------------------------: |
+|       v0.8.8       |      3.0.5.0     | TMQ: get assignments and seek offset. |
+|       v0.8.0       |      3.0.4.0     | Support schemaless insert. |
+|       v0.7.6       |      3.0.3.0     | Support req_id in query. |
+|       v0.6.0       |      3.0.0.0     | Base features. |
 
 The Rust Connector is still under rapid development and is not guaranteed to be backward compatible before 1.0. We recommend using TDengine version 3.0 or higher to avoid known issues.
 
diff --git a/docs/zh/08-connector/26-rust.mdx b/docs/zh/08-connector/26-rust.mdx
index e1e94e068f..34e1fbf271 100644
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
@@ -26,9 +26,14 @@ import RustQuery from "../07-develop/04-query-data/_rust.mdx"
 原生连接支持的平台和 TDengine 客户端驱动支持的平台一致。
 Websocket 连接支持所有能运行 Rust 的平台。
 
-## 版本支持
+## 版本历史
 
-请参考[版本支持列表](../#版本支持)
+|   Rust 连接器版本   |   TDengine 版本   |                        主要功能                       |
+| :----------------: | :--------------: | :--------------------------------------------------: |
+|       v0.8.8       |      3.0.5.0     | 消息订阅：获取消费进度及按照指定进度开始消费。 |
+|       v0.8.0       |      3.0.4.0     | 支持无模式写入。 |
+|       v0.7.6       |      3.0.3.0     | 支持在请求中使用 req_id。 |
+|       v0.6.0       |      3.0.0.0     | 基础功能。 |
 
 Rust 连接器仍然在快速开发中，1.0 之前无法保证其向后兼容。建议使用 3.0 版本以上的 TDengine，以避免已知问题。
 

From 3c1b5d3656f4dca671eac9e1a86f724e5fbb3d4d Mon Sep 17 00:00:00 2001
From: Adam Ji <jrgwyz@163.com>
Date: Wed, 7 Jun 2023 16:29:11 +0800
Subject: [PATCH 49/58] docs: update description

---
 docs/en/14-reference/03-connector/06-rust.mdx | 2 +-
 docs/zh/08-connector/26-rust.mdx              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/14-reference/03-connector/06-rust.mdx b/docs/en/14-reference/03-connector/06-rust.mdx
index 4a4ef5ba9c..f32e32f2ad 100644
--- a/docs/en/14-reference/03-connector/06-rust.mdx
+++ b/docs/en/14-reference/03-connector/06-rust.mdx
@@ -31,7 +31,7 @@ Websocket connections are supported on all platforms that can run Go.
 
 | connector-rust version |  TDengine version |                   major features                    |
 | :----------------: | :--------------: | :--------------------------------------------------: |
-|       v0.8.8       |      3.0.5.0     | TMQ: get assignments and seek offset. |
+|       v0.8.8       |      3.0.5.0 or later    | TMQ: Get consuming progress and seek offset to consume. |
 |       v0.8.0       |      3.0.4.0     | Support schemaless insert. |
 |       v0.7.6       |      3.0.3.0     | Support req_id in query. |
 |       v0.6.0       |      3.0.0.0     | Base features. |
diff --git a/docs/zh/08-connector/26-rust.mdx b/docs/zh/08-connector/26-rust.mdx
index 34e1fbf271..a02757b14e 100644
--- a/docs/zh/08-connector/26-rust.mdx
+++ b/docs/zh/08-connector/26-rust.mdx
@@ -30,7 +30,7 @@ Websocket 连接支持所有能运行 Rust 的平台。
 
 |   Rust 连接器版本   |   TDengine 版本   |                        主要功能                       |
 | :----------------: | :--------------: | :--------------------------------------------------: |
-|       v0.8.8       |      3.0.5.0     | 消息订阅：获取消费进度及按照指定进度开始消费。 |
+|       v0.8.8       |      3.0.5.0 or later    | 消息订阅：获取消费进度及按照指定进度开始消费。 |
 |       v0.8.0       |      3.0.4.0     | 支持无模式写入。 |
 |       v0.7.6       |      3.0.3.0     | 支持在请求中使用 req_id。 |
 |       v0.6.0       |      3.0.0.0     | 基础功能。 |

From 2641dfa0e7335dbe38477dcbd87d8672fd261ab2 Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Wed, 7 Jun 2023 16:36:42 +0800
Subject: [PATCH 50/58] docs: jdbc add seek doc

---
 docs/en/14-reference/03-connector/04-java.mdx |  65 ++++----
 docs/zh/08-connector/14-java.mdx              | 141 ++++++++++--------
 2 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/docs/en/14-reference/03-connector/04-java.mdx b/docs/en/14-reference/03-connector/04-java.mdx
index db49e5f395..b820386380 100644
--- a/docs/en/14-reference/03-connector/04-java.mdx
+++ b/docs/en/14-reference/03-connector/04-java.mdx
@@ -32,25 +32,22 @@ TDengine's JDBC driver implementation is as consistent as possible with the rela
 Native connections are supported on the same platforms as the TDengine client driver.
 REST connection supports all platforms that can run Java.
 
-## Version support
-
-Please refer to [version support list](/reference/connector#version-support)
-
 ## Recent update logs
 
-| taos-jdbcdriver version |                                                                   major changes                                                                    |
-| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: |
-|          3.2.1          |                                      JDBC REST connection supports schemaless/prepareStatement over WebSocket                                      |
-|          3.2.0          |                                                          This version has been deprecated                                                          |
-|          3.1.0          |                                             JDBC REST connection supports subscription over WebSocket                                              |
-|      3.0.1 - 3.0.4      | fix the resultSet data is parsed incorrectly sometimes. 3.0.1 is compiled on JDK 11, you are advised to use other version in the JDK 8 environment |
-|          3.0.0          |                                                              Support for TDengine 3.0                                                              |
-|         2.0.42          |                                             fix wasNull interface return value in WebSocket connection                                             |
-|         2.0.41          |                                           fix decode method of username and password in REST connection                                            |
-|     2.0.39 - 2.0.40     |                                                   Add REST connection/request timeout parameters                                                   |
-|         2.0.38          |                                                    JDBC REST connections add bulk pull function                                                    |
-|         2.0.37          |                                                                 Support json tags                                                                  |
-|         2.0.36          |                                                             Support schemaless writing                                                             |
+| taos-jdbcdriver version |                                                                   major changes                                                                    | TDengine Minimum version |
+| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------: |
+|          3.2.1          |                                                           subscription add seek function                                                           |         3.0.5.0          |
+|          3.2.1          |                                      JDBC REST connection supports schemaless/prepareStatement over WebSocket                                      |         3.0.3.0          |
+|          3.2.0          |                                                          This version has been deprecated                                                          |            -             |
+|          3.1.0          |                                             JDBC REST connection supports subscription over WebSocket                                              |            -             |
+|      3.0.1 - 3.0.4      | fix the resultSet data is parsed incorrectly sometimes. 3.0.1 is compiled on JDK 11, you are advised to use other version in the JDK 8 environment |            -             |
+|          3.0.0          |                                                              Support for TDengine 3.0                                                              |         3.0.0.0          |
+|         2.0.42          |                                             fix wasNull interface return value in WebSocket connection                                             |            -             |
+|         2.0.41          |                                           fix decode method of username and password in REST connection                                            |            -             |
+|     2.0.39 - 2.0.40     |                                                   Add REST connection/request timeout parameters                                                   |            -             |
+|         2.0.38          |                                                    JDBC REST connections add bulk pull function                                                    |            -             |
+|         2.0.37          |                                                                 Support json tags                                                                  |            -             |
+|         2.0.36          |                                                             Support schemaless writing                                                             |            -             |
 
 **Note**: adding `batchfetch` to the REST connection and setting it to true will enable the WebSocket connection.
 
@@ -102,6 +99,8 @@ For specific error codes, please refer to.
 | 0x2319     | user is required                                                | The user name information is missing when creating the connection                                                                  |
 | 0x231a     | password is required                                            | Password information is missing when creating a connection                                                                         |
 | 0x231c     | httpEntity is null, sql:                                        | Execution exception occurred during the REST connection                                                                            |
+| 0x231d     | can't create connection with server within                      | Increase the connection time by adding the httpConnectTimeout parameter, or check the connection to the taos adapter.              |
+| 0x231e     | failed to complete the task within the specified time           | Increase the execution time by adding the messageWaitTimeout parameter, or check the connection to the taos adapter.               |
 | 0x2350     | unknown error                                                   | Unknown exception, please return to the developer on github.                                                                       |
 | 0x2352     | Unsupported encoding                                            | An unsupported character encoding set is specified under the native Connection.                                                    |
 | 0x2353     | internal error of database, please see taoslog for more details | An error occurs when the prepare statement is executed on the native connection. Check the taos log to locate the fault.           |
@@ -117,8 +116,8 @@ For specific error codes, please refer to.
 | 0x2376     | failed to set consumer topic, topic name is empty               | During data subscription creation, the subscription topic name is empty. Check that the specified topic name is correct.           |
 | 0x2377     | consumer reference has been destroyed                           | The subscription data transfer channel has been closed. Please check the connection to TDengine.                                   |
 | 0x2378     | consumer create error                                           | Failed to create a data subscription. Check the taos log according to the error message to locate the fault.                       |
-| -          | can't create connection with server within                      | Increase the connection time by adding the httpConnectTimeout parameter, or check the connection to the taos adapter.              |
-| -          | failed to complete the task within the specified time           | Increase the execution time by adding the messageWaitTimeout parameter, or check the connection to the taos adapter.               |
+| 0x2379     | seek offset must not be a negative number                       | The seek interface parameter cannot be negative. Use the correct parameter                                                         |
+| 0x237a     | vGroup not found in result set                                  | subscription is not bound to the VGroup due to the rebalance mechanism                                                             |
 
 - [TDengine Java Connector](https://github.com/taosdata/taos-connector-jdbc/blob/main/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java)
 <!-- - [TDengine_ERROR_CODE](../error-code) -->
@@ -169,7 +168,7 @@ Add following dependency in the `pom.xml` file of your Maven project:
 <dependency>
  <groupId>com.taosdata.jdbc</groupId>
  <artifactId>taos-jdbcdriver</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
 </dependency>
 ```
 
@@ -913,14 +912,15 @@ public class SchemalessWsTest {
 
     public static void main(String[] args) throws SQLException {
         final String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata&batchfetch=true";
-        Connection connection = DriverManager.getConnection(url);
-        init(connection);
+        try(Connection connection = DriverManager.getConnection(url)){
+            init(connection);
 
-        SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless");
-        writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
-        writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
-        writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.SECONDS);
-        System.exit(0);
+            try(SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless")){
+                writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
+                writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
+                writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.SECONDS);
+            }
+        }
     }
 
     private static void init(Connection connection) throws SQLException {
@@ -991,6 +991,17 @@ while(true) {
 
 `poll` obtains one message each time it is run.
 
+#### Assignment subscription Offset
+
+```
+long position(TopicPartition partition) throws SQLException;
+Map<TopicPartition, Long> position(String topic) throws SQLException;
+Map<TopicPartition, Long> beginningOffsets(String topic) throws SQLException;
+Map<TopicPartition, Long> endOffsets(String topic) throws SQLException;
+
+void seek(TopicPartition partition, long offset) throws SQLException;
+```
+
 #### Close subscriptions
 
 ```java
diff --git a/docs/zh/08-connector/14-java.mdx b/docs/zh/08-connector/14-java.mdx
index 46800226d7..f63350ea04 100644
--- a/docs/zh/08-connector/14-java.mdx
+++ b/docs/zh/08-connector/14-java.mdx
@@ -32,25 +32,22 @@ TDengine 的 JDBC 驱动实现尽可能与关系型数据库驱动保持一致
 原生连接支持的平台和 TDengine 客户端驱动支持的平台一致。
 REST 连接支持所有能运行 Java 的平台。
 
-## 版本支持
+## 版本历史
 
-请参考[版本支持列表](../#版本支持)
-
-## 最近更新记录
-
-| taos-jdbcdriver 版本 |                                                                        主要变化                                                                        |
-| :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: |
-|        3.2.1         | 新增功能：WebSocket 连接支持 schemaless 与 prepareStatement 写入。变更：consumer poll 返回结果集为 ConsumerRecord，可通过 value() 获取指定结果集数据。 |
-|        3.2.0         |                                                                存在连接问题，不推荐使用                                                                |
-|        3.1.0         |                                                               WebSocket 连接支持订阅功能                                                               |
-|    3.0.1 - 3.0.4     |                             修复一些情况下结果集数据解析错误的问题。3.0.1 在 JDK 11 环境编译，JDK 8 环境下建议使用其他版本                             |
-|        3.0.0         |                                                                   支持 TDengine 3.0                                                                    |
-|        2.0.42        |                                                        修在 WebSocket 连接中 wasNull 接口返回值                                                        |
-|        2.0.41        |                                                          修正 REST 连接中用户名和密码转码方式                                                          |
-|   2.0.39 - 2.0.40    |                                                              增加 REST 连接/请求 超时设置                                                              |
-|        2.0.38        |                                                             JDBC REST 连接增加批量拉取功能                                                             |
-|        2.0.37        |                                                                  增加对 json tag 支持                                                                  |
-|        2.0.36        |                                                               增加对 schemaless 写入支持                                                               |
+| taos-jdbcdriver 版本 |                                                                        主要变化                                                                        | TDengine 最低版本 |
+| :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------: |
+|        3.2.2         |                                                           新增功能：数据订阅支持 seek 功能。                                                           |      3.0.5.0      |
+|        3.2.1         | 新增功能：WebSocket 连接支持 schemaless 与 prepareStatement 写入。变更：consumer poll 返回结果集为 ConsumerRecord，可通过 value() 获取指定结果集数据。 |      3.0.3.0      |
+|        3.2.0         |                                                                存在连接问题，不推荐使用                                                                |         -         |
+|        3.1.0         |                                                               WebSocket 连接支持订阅功能                                                               |         -         |
+|    3.0.1 - 3.0.4     |                             修复一些情况下结果集数据解析错误的问题。3.0.1 在 JDK 11 环境编译，JDK 8 环境下建议使用其他版本                             |         -         |
+|        3.0.0         |                                                                   支持 TDengine 3.0                                                                    |      3.0.0.0      |
+|        2.0.42        |                                                        修在 WebSocket 连接中 wasNull 接口返回值                                                        |         -         |
+|        2.0.41        |                                                          修正 REST 连接中用户名和密码转码方式                                                          |         -         |
+|   2.0.39 - 2.0.40    |                                                              增加 REST 连接/请求 超时设置                                                              |         -         |
+|        2.0.38        |                                                             JDBC REST 连接增加批量拉取功能                                                             |         -         |
+|        2.0.37        |                                                                  增加对 json tag 支持                                                                  |         -         |
+|        2.0.36        |                                                               增加对 schemaless 写入支持                                                               |         -         |
 
 **注**：REST 连接中增加 `batchfetch` 参数并设置为 true，将开启 WebSocket 连接。
 
@@ -80,45 +77,47 @@ JDBC 连接器可能报错的错误码包括 4 种：
 
 具体的错误码请参考：
 
-| Error Code | Description                                                     | Suggested Actions                                                                       |
-| ---------- | --------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
-| 0x2301     | connection already closed                                       | 连接已经关闭，检查连接情况，或重新创建连接去执行相关指令。                              |
-| 0x2302     | this operation is NOT supported currently!                      | 当前使用接口不支持，可以更换其他连接方式。                                              |
-| 0x2303     | invalid variables                                               | 参数不合法，请检查相应接口规范，调整参数类型及大小。                                    |
-| 0x2304     | statement is closed                                             | statement 已经关闭，请检查 statement 是否关闭后再次使用，或是连接是否正常。             |
-| 0x2305     | resultSet is closed                                             | resultSet 结果集已经释放，请检查 resultSet 是否释放后再次使用。                         |
-| 0x2306     | Batch is empty!                                                 | prepareStatement 添加参数后再执行 executeBatch。                                        |
-| 0x2307     | Can not issue data manipulation statements with executeQuery()  | 更新操作应该使用 executeUpdate()，而不是 executeQuery()。                               |
-| 0x2308     | Can not issue SELECT via executeUpdate()                        | 查询操作应该使用 executeQuery()，而不是 executeUpdate()。                               |
-| 0x230d     | parameter index out of range                                    | 参数越界，请检查参数的合理范围。                                                        |
-| 0x230e     | connection already closed                                       | 连接已经关闭，请检查 Connection 是否关闭后再次使用，或是连接是否正常。                  |
-| 0x230f     | unknown sql type in tdengine                                    | 请检查 TDengine 支持的 Data Type 类型。                                                 |
-| 0x2310     | can't register JDBC-JNI driver                                  | 不能注册 JNI 驱动，请检查 url 是否填写正确。                                            |
-| 0x2312     | url is not set                                                  | 请检查 REST 连接 url 是否填写正确。                                                     |
-| 0x2314     | numeric value out of range                                      | 请检查获取结果集中数值类型是否使用了正确的接口。                                        |
-| 0x2315     | unknown taos type in tdengine                                   | 在 TDengine 数据类型与 JDBC 数据类型转换时，是否指定了正确的 TDengine 数据类型。        |
-| 0x2317     |                                                                 | REST 连接中使用了错误的请求类型。                                                       |
-| 0x2318     |                                                                 | REST 连接中出现了数据传输异常，请检查网络情况并重试。                                   |
-| 0x2319     | user is required                                                | 创建连接时缺少用户名信息                                                                |
-| 0x231a     | password is required                                            | 创建连接时缺少密码信息                                                                  |
-| 0x231c     | httpEntity is null, sql:                                        | REST 连接中执行出现异常                                                                 |
-| 0x2350     | unknown error                                                   | 未知异常，请在 github 反馈给开发人员。                                                  |
-| 0x2352     | Unsupported encoding                                            | 本地连接下指定了不支持的字符编码集                                                      |
-| 0x2353     | internal error of database, please see taoslog for more details | 本地连接执行 prepareStatement 时出现错误，请检查 taos log 进行问题定位。                |
-| 0x2354     | JNI connection is NULL                                          | 本地连接执行命令时，Connection 已经关闭。请检查与 TDengine 的连接情况。                 |
-| 0x2355     | JNI result set is NULL                                          | 本地连接获取结果集，结果集异常，请检查连接情况，并重试。                                |
-| 0x2356     | invalid num of fields                                           | 本地连接获取结果集的 meta 信息不匹配。                                                  |
-| 0x2357     | empty sql string                                                | 填写正确的 SQL 进行执行。                                                               |
-| 0x2359     | JNI alloc memory failed, please see taoslog for more details    | 本地连接分配内存错误，请检查 taos log 进行问题定位。                                    |
-| 0x2371     | consumer properties must not be null!                           | 创建订阅时参数为空，请填写正确的参数。                                                  |
-| 0x2372     | configs contain empty key, failed to set consumer property      | 参数 key 中包含空值，请填写正确的参数。                                                 |
-| 0x2373     | failed to set consumer property,                                | 参数 value 中包含空值，请填写正确的参数。                                               |
-| 0x2375     | topic reference has been destroyed                              | 创建数据订阅过程中，topic 引用被释放。请检查与 TDengine 的连接情况。                    |
-| 0x2376     | failed to set consumer topic, topic name is empty               | 创建数据订阅过程中，订阅 topic 名称为空。请检查指定的 topic 名称是否填写正确。          |
-| 0x2377     | consumer reference has been destroyed                           | 订阅数据传输通道已经关闭，请检查与 TDengine 的连接情况。                                |
-| 0x2378     | consumer create error                                           | 创建数据订阅失败，请根据错误信息检查 taos log 进行问题定位。                            |
-| -          | can't create connection with server within                      | 通过增加参数 httpConnectTimeout 增加连接耗时，或是请检查与 taosAdapter 之间的连接情况。 |
-| -          | failed to complete the task within the specified time           | 通过增加参数 messageWaitTimeout 增加执行耗时，或是请检查与 taosAdapter 之间的连接情况。 |
+| Error Code | Description                                                     | Suggested Actions                                                                         |
+| ---------- | --------------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| 0x2301     | connection already closed                                       | 连接已经关闭，检查连接情况，或重新创建连接去执行相关指令。                                |
+| 0x2302     | this operation is NOT supported currently!                      | 当前使用接口不支持，可以更换其他连接方式。                                                |
+| 0x2303     | invalid variables                                               | 参数不合法，请检查相应接口规范，调整参数类型及大小。                                      |
+| 0x2304     | statement is closed                                             | statement 已经关闭，请检查 statement 是否关闭后再次使用，或是连接是否正常。               |
+| 0x2305     | resultSet is closed                                             | resultSet 结果集已经释放，请检查 resultSet 是否释放后再次使用。                           |
+| 0x2306     | Batch is empty!                                                 | prepareStatement 添加参数后再执行 executeBatch。                                          |
+| 0x2307     | Can not issue data manipulation statements with executeQuery()  | 更新操作应该使用 executeUpdate()，而不是 executeQuery()。                                 |
+| 0x2308     | Can not issue SELECT via executeUpdate()                        | 查询操作应该使用 executeQuery()，而不是 executeUpdate()。                                 |
+| 0x230d     | parameter index out of range                                    | 参数越界，请检查参数的合理范围。                                                          |
+| 0x230e     | connection already closed                                       | 连接已经关闭，请检查 Connection 是否关闭后再次使用，或是连接是否正常。                    |
+| 0x230f     | unknown sql type in tdengine                                    | 请检查 TDengine 支持的 Data Type 类型。                                                   |
+| 0x2310     | can't register JDBC-JNI driver                                  | 不能注册 JNI 驱动，请检查 url 是否填写正确。                                              |
+| 0x2312     | url is not set                                                  | 请检查 REST 连接 url 是否填写正确。                                                       |
+| 0x2314     | numeric value out of range                                      | 请检查获取结果集中数值类型是否使用了正确的接口。                                          |
+| 0x2315     | unknown taos type in tdengine                                   | 在 TDengine 数据类型与 JDBC 数据类型转换时，是否指定了正确的 TDengine 数据类型。          |
+| 0x2317     |                                                                 | REST 连接中使用了错误的请求类型。                                                         |
+| 0x2318     |                                                                 | REST 连接中出现了数据传输异常，请检查网络情况并重试。                                     |
+| 0x2319     | user is required                                                | 创建连接时缺少用户名信息                                                                  |
+| 0x231a     | password is required                                            | 创建连接时缺少密码信息                                                                    |
+| 0x231c     | httpEntity is null, sql:                                        | REST 连接中执行出现异常                                                                   |
+| 0x231d     | can't create connection with server within                      | 通过增加参数 httpConnectTimeout 增加连接耗时，或是请检查与 taosAdapter 之间的连接情况。   |
+| 0x231e     | failed to complete the task within the specified time           | 通过增加参数 messageWaitTimeout 增加执行耗时，或是请检查与 taosAdapter 之间的连接情况。   |
+| 0x2350     | unknown error                                                   | 未知异常，请在 github 反馈给开发人员。                                                    |
+| 0x2352     | Unsupported encoding                                            | 本地连接下指定了不支持的字符编码集                                                        |
+| 0x2353     | internal error of database, please see taoslog for more details | 本地连接执行 prepareStatement 时出现错误，请检查 taos log 进行问题定位。                  |
+| 0x2354     | JNI connection is NULL                                          | 本地连接执行命令时，Connection 已经关闭。请检查与 TDengine 的连接情况。                   |
+| 0x2355     | JNI result set is NULL                                          | 本地连接获取结果集，结果集异常，请检查连接情况，并重试。                                  |
+| 0x2356     | invalid num of fields                                           | 本地连接获取结果集的 meta 信息不匹配。                                                    |
+| 0x2357     | empty sql string                                                | 填写正确的 SQL 进行执行。                                                                 |
+| 0x2359     | JNI alloc memory failed, please see taoslog for more details    | 本地连接分配内存错误，请检查 taos log 进行问题定位。                                      |
+| 0x2371     | consumer properties must not be null!                           | 创建订阅时参数为空，请填写正确的参数。                                                    |
+| 0x2372     | configs contain empty key, failed to set consumer property      | 参数 key 中包含空值，请填写正确的参数。                                                   |
+| 0x2373     | failed to set consumer property,                                | 参数 value 中包含空值，请填写正确的参数。                                                 |
+| 0x2375     | topic reference has been destroyed                              | 创建数据订阅过程中，topic 引用被释放。请检查与 TDengine 的连接情况。                      |
+| 0x2376     | failed to set consumer topic, topic name is empty               | 创建数据订阅过程中，订阅 topic 名称为空。请检查指定的 topic 名称是否填写正确。            |
+| 0x2377     | consumer reference has been destroyed                           | 订阅数据传输通道已经关闭，请检查与 TDengine 的连接情况。                                  |
+| 0x2378     | consumer create error                                           | 创建数据订阅失败，请根据错误信息检查 taos log 进行问题定位。                              |
+| 0x2379     | seek offset must not be a negative number                       | seek 接口参数不能为负值，请使用正确的参数                                                 |
+| 0x237a     | vGroup not found in result set                                  | VGroup 没有分配给当前 consumer，由于 Rebalance 机制导致 Consumer 与 VGroup 不是绑定的关系 |
 
 - [TDengine Java Connector](https://github.com/taosdata/taos-connector-jdbc/blob/main/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java)
 <!-- - [TDengine_ERROR_CODE](../error-code) -->
@@ -169,7 +168,7 @@ Maven 项目中，在 pom.xml 中添加以下依赖：
 <dependency>
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>3.2.1</version>
+  <version>3.2.2</version>
 </dependency>
 ```
 
@@ -916,14 +915,15 @@ public class SchemalessWsTest {
 
     public static void main(String[] args) throws SQLException {
         final String url = "jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata&batchfetch=true";
-        Connection connection = DriverManager.getConnection(url);
-        init(connection);
+        try(Connection connection = DriverManager.getConnection(url)){
+            init(connection);
 
-        SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless");
-        writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
-        writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
-        writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.SECONDS);
-        System.exit(0);
+            try(SchemalessWriter writer = new SchemalessWriter(connection, "test_ws_schemaless")){
+                writer.write(lineDemo, SchemalessProtocolType.LINE, SchemalessTimestampType.NANO_SECONDS);
+                writer.write(telnetDemo, SchemalessProtocolType.TELNET, SchemalessTimestampType.MILLI_SECONDS);
+                writer.write(jsonDemo, SchemalessProtocolType.JSON, SchemalessTimestampType.SECONDS);
+            }
+        }
     }
 
     private static void init(Connection connection) throws SQLException {
@@ -994,6 +994,17 @@ while(true) {
 
 `poll` 每次调用获取一个消息。
 
+#### 指定订阅 Offset
+
+```
+long position(TopicPartition partition) throws SQLException;
+Map<TopicPartition, Long> position(String topic) throws SQLException;
+Map<TopicPartition, Long> beginningOffsets(String topic) throws SQLException;
+Map<TopicPartition, Long> endOffsets(String topic) throws SQLException;
+
+void seek(TopicPartition partition, long offset) throws SQLException;
+```
+
 #### 关闭订阅
 
 ```java

From 150e9ae2960da9c8cc146034c0688f3217a9966a Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 7 Jun 2023 16:55:03 +0800
Subject: [PATCH 51/58] make interp fill multiple col logic same as window fill

---
 source/libs/parser/src/parTranslater.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index f049af6747..5c841deda0 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -3041,7 +3041,7 @@ static int32_t convertFillValue(STranslateContext* pCxt, SDataType dt, SNodeList
   return code;
 }
 
-static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeList* pProjectionList, bool isInterpFill) {
+static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeList* pProjectionList) {
   if (FILL_MODE_VALUE != pFill->mode && FILL_MODE_VALUE_F != pFill->mode) {
     return TSDB_CODE_SUCCESS;
   }
@@ -3059,12 +3059,10 @@ static int32_t checkFillValues(STranslateContext* pCxt, SFillNode* pFill, SNodeL
         return code;
       }
 
-      if (!isInterpFill) {
-        ++fillNo;
-      }
+      ++fillNo;
     }
   }
-  if (!isInterpFill && fillNo != LIST_LENGTH(pFillValues->pNodeList)) {
+  if (fillNo != LIST_LENGTH(pFillValues->pNodeList)) {
     return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_WRONG_VALUE_TYPE, "Filled values number mismatch");
   }
   return TSDB_CODE_SUCCESS;
@@ -3075,7 +3073,7 @@ static int32_t translateFillValues(STranslateContext* pCxt, SSelectStmt* pSelect
       NULL == ((SIntervalWindowNode*)pSelect->pWindow)->pFill) {
     return TSDB_CODE_SUCCESS;
   }
-  return checkFillValues(pCxt, (SFillNode*)((SIntervalWindowNode*)pSelect->pWindow)->pFill, pSelect->pProjectionList, false);
+  return checkFillValues(pCxt, (SFillNode*)((SIntervalWindowNode*)pSelect->pWindow)->pFill, pSelect->pProjectionList);
 }
 
 static int32_t rewriteProjectAlias(SNodeList* pProjectionList) {
@@ -3525,7 +3523,7 @@ static int32_t translateInterpFill(STranslateContext* pCxt, SSelectStmt* pSelect
     code = checkFill(pCxt, (SFillNode*)pSelect->pFill, (SValueNode*)pSelect->pEvery, true);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = checkFillValues(pCxt, (SFillNode*)pSelect->pFill, pSelect->pProjectionList, true);
+    code = checkFillValues(pCxt, (SFillNode*)pSelect->pFill, pSelect->pProjectionList);
   }
 
   return code;

From c612d945ec73114f93623f0116c190608605fc45 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 7 Jun 2023 18:27:29 +0800
Subject: [PATCH 52/58] fix fill value bug

---
 source/libs/executor/src/timesliceoperator.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/src/timesliceoperator.c b/source/libs/executor/src/timesliceoperator.c
index 3e4055876d..2421343bd7 100644
--- a/source/libs/executor/src/timesliceoperator.c
+++ b/source/libs/executor/src/timesliceoperator.c
@@ -257,7 +257,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
 
 
   // output the result
-  bool hasInterp = true;
+  int32_t fillColIndex = 0;
+  bool       hasInterp = true;
   for (int32_t j = 0; j < pExprSup->numOfExprs; ++j) {
     SExprInfo* pExprInfo = &pExprSup->pExprInfo[j];
 
@@ -307,7 +308,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
 
       case TSDB_FILL_SET_VALUE:
       case TSDB_FILL_SET_VALUE_F: {
-        SVariant* pVar = &pSliceInfo->pFillColInfo[j].fillVal;
+        SVariant* pVar = &pSliceInfo->pFillColInfo[fillColIndex].fillVal;
 
         if (pDst->info.type == TSDB_DATA_TYPE_FLOAT) {
           float v = 0;
@@ -342,6 +343,8 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
           }
           colDataSetVal(pDst, rows, (char*)&v, false);
         }
+
+        ++fillColIndex;
         break;
       }
 

From 46baeefea73e2c6edf038482a96e373335d7edef Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 7 Jun 2023 18:39:33 +0800
Subject: [PATCH 53/58] fix test cases

---
 tests/system-test/2-query/interp.py | 190 ++++++++++++++--------------
 1 file changed, 97 insertions(+), 93 deletions(-)

diff --git a/tests/system-test/2-query/interp.py b/tests/system-test/2-query/interp.py
index 019b449dfd..eb6aeec95a 100644
--- a/tests/system-test/2-query/interp.py
+++ b/tests/system-test/2-query/interp.py
@@ -1809,47 +1809,10 @@ class TDTestCase:
         tdSql.checkData(60, 1, 60)   #
 
         # test fill value
-        tdSql.query(f"select interp(c0),interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(value, 123)")
+        tdSql.query(f"select _irowts, interp(c0), _irowts, interp(c1), _irowts from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(value, 123, 456)")
         tdSql.checkRows(61)
-        tdSql.checkCols(2)
-        tdSql.checkData(0,  0, 0)    #
-        tdSql.checkData(1,  0, 123)
-        tdSql.checkData(4,  0, 123)
-        tdSql.checkData(5,  0, None) #
-        tdSql.checkData(6,  0, 123)
-        tdSql.checkData(9,  0, 123)
-        tdSql.checkData(10, 0, 10)   #
-        tdSql.checkData(11, 0, 123)
-        tdSql.checkData(14, 0, 123)
-        tdSql.checkData(15, 0, None) #
-        tdSql.checkData(16, 0, 123)
-        tdSql.checkData(19, 0, 123)
-        tdSql.checkData(20, 0, 20)   #
-        tdSql.checkData(21, 0, 123)
-        tdSql.checkData(24, 0, 123)
-        tdSql.checkData(25, 0, None) #
-        tdSql.checkData(26, 0, 123)
-        tdSql.checkData(29, 0, 123)
-        tdSql.checkData(30, 0, 30)   #
-        tdSql.checkData(31, 0, 123)
-        tdSql.checkData(34, 0, 123)
-        tdSql.checkData(35, 0, 35)   #
-        tdSql.checkData(36, 0, 123)
-        tdSql.checkData(39, 0, 123)
-        tdSql.checkData(40, 0, 40)   #
-        tdSql.checkData(41, 0, 123)
-        tdSql.checkData(44, 0, 123)
-        tdSql.checkData(45, 0, None) #
-        tdSql.checkData(46, 0, 123)
-        tdSql.checkData(49, 0, 123)
-        tdSql.checkData(50, 0, 50)   #
-        tdSql.checkData(51, 0, 123)
-        tdSql.checkData(54, 0, 123)
-        tdSql.checkData(55, 0, None) #
-        tdSql.checkData(59, 0, 123)
-        tdSql.checkData(60, 0, 55)   #
-
-        tdSql.checkData(0,  1, None) #
+        tdSql.checkCols(5)
+        tdSql.checkData(0,  1, 0)    #
         tdSql.checkData(1,  1, 123)
         tdSql.checkData(4,  1, 123)
         tdSql.checkData(5,  1, None) #
@@ -1861,7 +1824,7 @@ class TDTestCase:
         tdSql.checkData(15, 1, None) #
         tdSql.checkData(16, 1, 123)
         tdSql.checkData(19, 1, 123)
-        tdSql.checkData(20, 1, None) #
+        tdSql.checkData(20, 1, 20)   #
         tdSql.checkData(21, 1, 123)
         tdSql.checkData(24, 1, 123)
         tdSql.checkData(25, 1, None) #
@@ -1870,64 +1833,64 @@ class TDTestCase:
         tdSql.checkData(30, 1, 30)   #
         tdSql.checkData(31, 1, 123)
         tdSql.checkData(34, 1, 123)
-        tdSql.checkData(35, 1, None) #
+        tdSql.checkData(35, 1, 35)   #
         tdSql.checkData(36, 1, 123)
         tdSql.checkData(39, 1, 123)
         tdSql.checkData(40, 1, 40)   #
         tdSql.checkData(41, 1, 123)
         tdSql.checkData(44, 1, 123)
-        tdSql.checkData(45, 1, 45)   #
+        tdSql.checkData(45, 1, None) #
         tdSql.checkData(46, 1, 123)
         tdSql.checkData(49, 1, 123)
-        tdSql.checkData(50, 1, None) #
+        tdSql.checkData(50, 1, 50)   #
         tdSql.checkData(51, 1, 123)
         tdSql.checkData(54, 1, 123)
         tdSql.checkData(55, 1, None) #
-        tdSql.checkData(56, 1, 123)
         tdSql.checkData(59, 1, 123)
-        tdSql.checkData(60, 1, 60)   #
+        tdSql.checkData(60, 1, 55)   #
 
-        tdSql.query(f"select interp(c0),interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(value, 123 + 123)")
+        tdSql.checkData(0,  3, None) #
+        tdSql.checkData(1,  3, 456)
+        tdSql.checkData(4,  3, 456)
+        tdSql.checkData(5,  3, None) #
+        tdSql.checkData(6,  3, 456)
+        tdSql.checkData(9,  3, 456)
+        tdSql.checkData(10, 3, 10)   #
+        tdSql.checkData(11, 3, 456)
+        tdSql.checkData(14, 3, 456)
+        tdSql.checkData(15, 3, None) #
+        tdSql.checkData(16, 3, 456)
+        tdSql.checkData(19, 3, 456)
+        tdSql.checkData(20, 3, None) #
+        tdSql.checkData(21, 3, 456)
+        tdSql.checkData(24, 3, 456)
+        tdSql.checkData(25, 3, None) #
+        tdSql.checkData(26, 3, 456)
+        tdSql.checkData(29, 3, 456)
+        tdSql.checkData(30, 3, 30)   #
+        tdSql.checkData(31, 3, 456)
+        tdSql.checkData(34, 3, 456)
+        tdSql.checkData(35, 3, None) #
+        tdSql.checkData(36, 3, 456)
+        tdSql.checkData(39, 3, 456)
+        tdSql.checkData(40, 3, 40)   #
+        tdSql.checkData(41, 3, 456)
+        tdSql.checkData(44, 3, 456)
+        tdSql.checkData(45, 3, 45)   #
+        tdSql.checkData(46, 3, 456)
+        tdSql.checkData(49, 3, 456)
+        tdSql.checkData(50, 3, None) #
+        tdSql.checkData(51, 3, 456)
+        tdSql.checkData(54, 3, 456)
+        tdSql.checkData(55, 3, None) #
+        tdSql.checkData(56, 3, 456)
+        tdSql.checkData(59, 3, 456)
+        tdSql.checkData(60, 3, 60)   #
+
+        tdSql.query(f"select _isfilled, interp(c0), _isfilled, interp(c1), _isfilled from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(value, 123 + 123, 234 + 234)")
         tdSql.checkRows(61)
-        tdSql.checkCols(2)
-        tdSql.checkData(0,  0, 0)    #
-        tdSql.checkData(1,  0, 246)
-        tdSql.checkData(4,  0, 246)
-        tdSql.checkData(5,  0, None) #
-        tdSql.checkData(6,  0, 246)
-        tdSql.checkData(9,  0, 246)
-        tdSql.checkData(10, 0, 10)   #
-        tdSql.checkData(11, 0, 246)
-        tdSql.checkData(14, 0, 246)
-        tdSql.checkData(15, 0, None) #
-        tdSql.checkData(16, 0, 246)
-        tdSql.checkData(19, 0, 246)
-        tdSql.checkData(20, 0, 20)   #
-        tdSql.checkData(21, 0, 246)
-        tdSql.checkData(24, 0, 246)
-        tdSql.checkData(25, 0, None) #
-        tdSql.checkData(26, 0, 246)
-        tdSql.checkData(29, 0, 246)
-        tdSql.checkData(30, 0, 30)   #
-        tdSql.checkData(31, 0, 246)
-        tdSql.checkData(34, 0, 246)
-        tdSql.checkData(35, 0, 35)   #
-        tdSql.checkData(36, 0, 246)
-        tdSql.checkData(39, 0, 246)
-        tdSql.checkData(40, 0, 40)   #
-        tdSql.checkData(41, 0, 246)
-        tdSql.checkData(44, 0, 246)
-        tdSql.checkData(45, 0, None) #
-        tdSql.checkData(46, 0, 246)
-        tdSql.checkData(49, 0, 246)
-        tdSql.checkData(50, 0, 50)   #
-        tdSql.checkData(51, 0, 246)
-        tdSql.checkData(54, 0, 246)
-        tdSql.checkData(55, 0, None) #
-        tdSql.checkData(59, 0, 246)
-        tdSql.checkData(60, 0, 55)   #
-
-        tdSql.checkData(0,  1, None) #
+        tdSql.checkCols(5)
+        tdSql.checkData(0,  1, 0)    #
         tdSql.checkData(1,  1, 246)
         tdSql.checkData(4,  1, 246)
         tdSql.checkData(5,  1, None) #
@@ -1939,7 +1902,7 @@ class TDTestCase:
         tdSql.checkData(15, 1, None) #
         tdSql.checkData(16, 1, 246)
         tdSql.checkData(19, 1, 246)
-        tdSql.checkData(20, 1, None) #
+        tdSql.checkData(20, 1, 20)   #
         tdSql.checkData(21, 1, 246)
         tdSql.checkData(24, 1, 246)
         tdSql.checkData(25, 1, None) #
@@ -1948,22 +1911,59 @@ class TDTestCase:
         tdSql.checkData(30, 1, 30)   #
         tdSql.checkData(31, 1, 246)
         tdSql.checkData(34, 1, 246)
-        tdSql.checkData(35, 1, None) #
+        tdSql.checkData(35, 1, 35)   #
         tdSql.checkData(36, 1, 246)
         tdSql.checkData(39, 1, 246)
         tdSql.checkData(40, 1, 40)   #
         tdSql.checkData(41, 1, 246)
         tdSql.checkData(44, 1, 246)
-        tdSql.checkData(45, 1, 45)   #
+        tdSql.checkData(45, 1, None) #
         tdSql.checkData(46, 1, 246)
         tdSql.checkData(49, 1, 246)
-        tdSql.checkData(50, 1, None) #
+        tdSql.checkData(50, 1, 50)   #
         tdSql.checkData(51, 1, 246)
         tdSql.checkData(54, 1, 246)
         tdSql.checkData(55, 1, None) #
-        tdSql.checkData(56, 1, 246)
         tdSql.checkData(59, 1, 246)
-        tdSql.checkData(60, 1, 60)   #
+        tdSql.checkData(60, 1, 55)   #
+
+        tdSql.checkData(0,  3, None) #
+        tdSql.checkData(1,  3, 468)
+        tdSql.checkData(4,  3, 468)
+        tdSql.checkData(5,  3, None) #
+        tdSql.checkData(6,  3, 468)
+        tdSql.checkData(9,  3, 468)
+        tdSql.checkData(10, 3, 10)   #
+        tdSql.checkData(11, 3, 468)
+        tdSql.checkData(14, 3, 468)
+        tdSql.checkData(15, 3, None) #
+        tdSql.checkData(16, 3, 468)
+        tdSql.checkData(19, 3, 468)
+        tdSql.checkData(20, 3, None) #
+        tdSql.checkData(21, 3, 468)
+        tdSql.checkData(24, 3, 468)
+        tdSql.checkData(25, 3, None) #
+        tdSql.checkData(26, 3, 468)
+        tdSql.checkData(29, 3, 468)
+        tdSql.checkData(30, 3, 30)   #
+        tdSql.checkData(31, 3, 468)
+        tdSql.checkData(34, 3, 468)
+        tdSql.checkData(35, 3, None) #
+        tdSql.checkData(36, 3, 468)
+        tdSql.checkData(39, 3, 468)
+        tdSql.checkData(40, 3, 40)   #
+        tdSql.checkData(41, 3, 468)
+        tdSql.checkData(44, 3, 468)
+        tdSql.checkData(45, 3, 45)   #
+        tdSql.checkData(46, 3, 468)
+        tdSql.checkData(49, 3, 468)
+        tdSql.checkData(50, 3, None) #
+        tdSql.checkData(51, 3, 468)
+        tdSql.checkData(54, 3, 468)
+        tdSql.checkData(55, 3, None) #
+        tdSql.checkData(56, 3, 468)
+        tdSql.checkData(59, 3, 468)
+        tdSql.checkData(60, 3, 60)   #
 
         # test fill prev
         tdSql.query(f"select interp(c0),interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(prev)")
@@ -2138,7 +2138,7 @@ class TDTestCase:
           tdSql.checkData(3, i, None)
           tdSql.checkData(4, i, None)
 
-        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(value, 1)")
+        tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(value, 1, 1, 1, 1)")
         tdSql.checkRows(5)
         tdSql.checkCols(4)
 
@@ -2564,6 +2564,10 @@ class TDTestCase:
         tdSql.error(f"select interp(c0) from {dbname}.{tbname} where _isfilled = true range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
         tdSql.error(f"select interp(c0) from {dbname}.{tbname} where _irowts > 0 range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(null)")
 
+        # fill value number mismatch
+        tdSql.error(f"select interp(c0) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(value, 1, 2)")
+        tdSql.error(f"select interp(c0), interp(c1) from {dbname}.{tbname} range('2020-02-10 00:00:05', '2020-02-15 00:00:05') every(1d) fill(value, 1)")
+
 
 
 

From 9b749b8faa0c2abeb622757161c70ec9112d1989 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 8 Jun 2023 02:43:44 +0000
Subject: [PATCH 54/58] change link op t

---
 contrib/CMakeLists.txt            |  2 +-
 examples/c/CMakeLists.txt         | 12 ++++++------
 source/dnode/vnode/CMakeLists.txt |  2 +-
 source/libs/stream/CMakeLists.txt |  2 +-
 utils/test/c/CMakeLists.txt       | 16 ++++++++--------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 59986a3b3c..fdb9f102f0 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -274,7 +274,7 @@ if(${BUILD_WITH_ROCKSDB})
     option(WITH_TOOLS "" OFF)
     option(WITH_LIBURING "" OFF)
     IF (TD_LINUX) 
-    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
+    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
     ELSE()
     option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
     ENDIF()
diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
index e14c4e60d9..07fc2fd71b 100644
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -42,27 +42,27 @@ IF (TD_LINUX)
     )
 
   target_link_libraries(tmq
-      taos_static
+      taos
       )
 
   target_link_libraries(stream_demo
-      taos_static
+      taos
       )
 
   target_link_libraries(schemaless
-      taos_static
+      taos
       )
 
   target_link_libraries(prepare
-      taos_static
+      taos
       )
   
   target_link_libraries(demo
-      taos_static
+      taos
       )
 
   target_link_libraries(asyncdemo
-      taos_static
+      taos
       )
 
   SET_TARGET_PROPERTIES(tmq PROPERTIES OUTPUT_NAME tmq)
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index b18cb8e282..b7bfc57cd5 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -103,7 +103,7 @@ target_link_libraries(
 
     # PUBLIC bdb
     # PUBLIC scalar
-    PUBLIC rocksdb-shared
+    PUBLIC rocksdb
     PUBLIC transport
     PUBLIC stream
     PUBLIC index
diff --git a/source/libs/stream/CMakeLists.txt b/source/libs/stream/CMakeLists.txt
index fa6c709c8f..d1ef7fe3c1 100644
--- a/source/libs/stream/CMakeLists.txt
+++ b/source/libs/stream/CMakeLists.txt
@@ -11,7 +11,7 @@ if(${BUILD_WITH_ROCKSDB})
   IF (TD_LINUX)
   target_link_libraries(
     stream
-    PUBLIC rocksdb-shared tdb
+    PUBLIC rocksdb tdb
     PRIVATE  os util transport qcom executor wal index
   )
   ELSE() 
diff --git a/utils/test/c/CMakeLists.txt b/utils/test/c/CMakeLists.txt
index 87b0d11d1c..71dfd710a5 100644
--- a/utils/test/c/CMakeLists.txt
+++ b/utils/test/c/CMakeLists.txt
@@ -9,35 +9,35 @@ add_executable(get_db_name_test get_db_name_test.c)
 add_executable(tmq_offset tmqOffset.c)
 target_link_libraries(
     tmq_offset
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
 )
 target_link_libraries(
     create_table
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
 )
 target_link_libraries(
     tmq_demo
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
 )
 target_link_libraries(
     tmq_sim
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
 )
 target_link_libraries(
     tmq_taosx_ci
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
@@ -45,7 +45,7 @@ target_link_libraries(
 
 target_link_libraries(
     write_raw_block_test
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
@@ -53,7 +53,7 @@ target_link_libraries(
 
 target_link_libraries(
     sml_test
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os
@@ -61,7 +61,7 @@ target_link_libraries(
 
 target_link_libraries(
     get_db_name_test
-    PUBLIC taos_static
+    PUBLIC taos
     PUBLIC util
     PUBLIC common
     PUBLIC os

From 4d574ca611f8ced2c37ba4be33bd87f6f6ea04de Mon Sep 17 00:00:00 2001
From: xleili <xlli@taosdata.com>
Date: Wed, 7 Jun 2023 16:57:30 +0800
Subject: [PATCH 55/58] fix: exclude install and remove lbrocksdb.so

---
 packaging/deb/DEBIAN/preinst |  1 -
 packaging/deb/DEBIAN/prerm   |  1 -
 packaging/deb/makedeb.sh     |  2 --
 packaging/rpm/tdengine.spec  |  4 ----
 packaging/tools/install.sh   | 12 ------------
 packaging/tools/makepkg.sh   |  3 ---
 packaging/tools/post.sh      | 10 ----------
 packaging/tools/remove.sh    |  2 --
 8 files changed, 35 deletions(-)

diff --git a/packaging/deb/DEBIAN/preinst b/packaging/deb/DEBIAN/preinst
index d6558d5b3b..904a946e20 100644
--- a/packaging/deb/DEBIAN/preinst
+++ b/packaging/deb/DEBIAN/preinst
@@ -80,5 +80,4 @@ fi
 
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo}rm -f ${install_main_dir}/driver/libtaos.*   || :
-[ -f ${install_main_dir}/driver/librocksdb.* ] && ${csudo}rm -f ${install_main_dir}/driver/librocksdb.*  || :
 [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}rm -f ${install_main_dir}/driver/libtaosws.so   || :
diff --git a/packaging/deb/DEBIAN/prerm b/packaging/deb/DEBIAN/prerm
index 8f8d472867..0d63115a04 100644
--- a/packaging/deb/DEBIAN/prerm
+++ b/packaging/deb/DEBIAN/prerm
@@ -40,7 +40,6 @@ else
     ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :
     [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h     || :
     ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
-    [ -f ${lib_link_dir}/librocksdb.* ] && ${csudo}rm -f ${lib_link_dir}/librocksdb.*  || :
     [ -f ${lib_link_dir}/libtaosws.so ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.so  || :
 
     ${csudo}rm -f ${log_link_dir}            || :
diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 024c69deb1..9f49cf345a 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -31,7 +31,6 @@ cd ${pkg_dir}
 
 libfile="libtaos.so.${tdengine_ver}"
 wslibfile="libtaosws.so"
-rocksdblib="librocksdb.so.8"
 
 # create install dir
 install_home_path="/usr/local/taos"
@@ -95,7 +94,6 @@ fi
 
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_path}/driver
-[ -f ${compile_dir}/build/lib/${rocksdblib} ] && cp ${compile_dir}/build/lib/${rocksdblib}            ${pkg_dir}${install_home_path}/driver ||:
 [ -f ${compile_dir}/build/lib/${wslibfile} ] && cp ${compile_dir}/build/lib/${wslibfile}            ${pkg_dir}${install_home_path}/driver ||:
 cp ${compile_dir}/../include/client/taos.h          ${pkg_dir}${install_home_path}/include
 cp ${compile_dir}/../include/common/taosdef.h       ${pkg_dir}${install_home_path}/include
diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index 2b056c376a..52d5335003 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -45,7 +45,6 @@ echo buildroot: %{buildroot}
 
 libfile="libtaos.so.%{_version}"
 wslibfile="libtaosws.so"
-rocksdblib="librocksdb.so.8"
 
 # create install path, and cp file
 mkdir -p %{buildroot}%{homepath}/bin
@@ -93,7 +92,6 @@ if [ -f %{_compiledir}/build/bin/taosadapter ]; then
 fi
 cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driver
 [ -f %{_compiledir}/build/lib/${wslibfile} ] && cp %{_compiledir}/build/lib/${wslibfile}            %{buildroot}%{homepath}/driver ||:
-[ -f %{_compiledir}/build/lib/${rocksdblib} ] && cp %{_compiledir}/build/lib/${rocksdblib}            %{buildroot}%{homepath}/driver ||:
 cp %{_compiledir}/../include/client/taos.h          %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/common/taosdef.h       %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/util/taoserror.h       %{buildroot}%{homepath}/include
@@ -176,7 +174,6 @@ fi
 
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo}rm -f %{homepath}/driver/libtaos*   || :
-${csudo}rm -f %{homepath}/driver/librocksdb*   || :
 
 #Scripts executed after installation
 %post
@@ -222,7 +219,6 @@ if [ $1 -eq 0 ];then
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :    
     ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
-    ${csudo}rm -f ${lib_link_dir}/librocksdb.*  || :
 
     ${csudo}rm -f ${log_link_dir}            || :
     ${csudo}rm -f ${data_link_dir}           || :
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 9aa019f218..1b47b10520 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -250,30 +250,18 @@ function install_lib() {
   # Remove links
   ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
   ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
-  ${csudo}rm -f ${lib_link_dir}/librocksdb.* || :
-  ${csudo}rm -f ${lib64_link_dir}/librocksdb.* || :
   #${csudo}rm -rf ${v15_java_app_dir}              || :
   ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
   ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
   ${csudo}ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
 
-  ${csudo}ln -sf ${install_main_dir}/driver/librocksdb.* ${lib_link_dir}/librocksdb.so.8
-  ${csudo}ln -sf ${lib_link_dir}/librocksdb.so.8 ${lib_link_dir}/librocksdb.so
-
-  ${csudo}ln -sf ${install_main_dir}/driver/librocksdb.* ${lib_link_dir}/librocksdb.so.8
-  ${csudo}ln -sf ${lib_link_dir}/librocksdb.so.8 ${lib_link_dir}/librocksdb.so
-
-
   [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || :
 
   if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
     ${csudo}ln -sf ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || :
     ${csudo}ln -sf ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || :
 
-    ${csudo}ln -sf ${install_main_dir}/driver/librocksdb.* ${lib64_link_dir}/librocksdb.so.8 || :
-    ${csudo}ln -sf ${lib64_link_dir}/librocksdb.so.8 ${lib64_link_dir}/librocksdb.so || :
-
     [ -f ${install_main_dir}/libtaosws.so ] && ${csudo}ln -sf ${install_main_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || :
   fi
 
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index ab45c684c4..b0537e8bcf 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -111,11 +111,9 @@ fi
 if [ "$osType" == "Darwin" ]; then
     lib_files="${build_dir}/lib/libtaos.${version}.dylib"
     wslib_files="${build_dir}/lib/libtaosws.dylib"
-    rocksdb_lib_files="${build_dir}/lib/librocksdb.dylib.8.1.1"
 else
     lib_files="${build_dir}/lib/libtaos.so.${version}"
     wslib_files="${build_dir}/lib/libtaosws.so"
-    rocksdb_lib_files="${build_dir}/lib/librocksdb.so.8.1.1"
 fi
 header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/libs/function/taosudf.h"
 
@@ -338,7 +336,6 @@ fi
 # Copy driver
 mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" >${install_dir}/driver/vercomp.txt
 [ -f ${wslib_files} ] && cp ${wslib_files} ${install_dir}/driver || :
-[ -f ${rocksdb_lib_files} ] && cp ${rocksdb_lib_files} ${install_dir}/driver || :
 
 # Copy connector
 if [ "$verMode" == "cluster" ]; then
diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index 10de87966f..fc392c9684 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -202,19 +202,10 @@ function install_lib() {
     log_print "start install lib from ${lib_dir} to ${lib_link_dir}"
     ${csudo}rm -f ${lib_link_dir}/libtaos* || :
     ${csudo}rm -f ${lib64_link_dir}/libtaos* || :
-    
-    #rocksdb
-    [ -f ${lib_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib_link_dir}/librocksdb* || :
-    [ -f ${lib64_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib64_link_dir}/librocksdb* || :
-
-    #rocksdb
-    [ -f ${lib_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib_link_dir}/librocksdb* || :
-    [ -f ${lib64_link_dir}/librocksdb* ] && ${csudo}rm -f ${lib64_link_dir}/librocksdb* || :
 
     [ -f ${lib_link_dir}/libtaosws.${lib_file_ext} ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.${lib_file_ext} || :
     [ -f ${lib64_link_dir}/libtaosws.${lib_file_ext} ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.${lib_file_ext} || :
 
-    ${csudo}ln -s ${lib_dir}/librocksdb.* ${lib_link_dir}/librocksdb.${lib_file_ext_1} 2>>${install_log_path} || return 1
     ${csudo}ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.${lib_file_ext_1} 2>>${install_log_path} || return 1
     ${csudo}ln -s ${lib_link_dir}/libtaos.${lib_file_ext_1} ${lib_link_dir}/libtaos.${lib_file_ext} 2>>${install_log_path} || return 1
 
@@ -223,7 +214,6 @@ function install_lib() {
     if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.${lib_file_ext} ]]; then
       ${csudo}ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.${lib_file_ext_1} 2>>${install_log_path} || return 1
       ${csudo}ln -s ${lib64_link_dir}/libtaos.${lib_file_ext_1} ${lib64_link_dir}/libtaos.${lib_file_ext}  2>>${install_log_path} || return 1
-      ${csudo}ln -s ${lib_dir}/librocksdb.* ${lib64_link_dir}/librocksdb.${lib_file_ext_1} 2>>${install_log_path} || return 1
 
       [ -f ${lib_dir}/libtaosws.${lib_file_ext} ] && ${csudo}ln -sf ${lib_dir}/libtaosws.${lib_file_ext} ${lib64_link_dir}/libtaosws.${lib_file_ext} 2>>${install_log_path}
     fi
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index a17b29983c..be2c26c309 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -142,11 +142,9 @@ function clean_local_bin() {
 function clean_lib() {
   # Remove link
   ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
-  ${csudo}rm -f ${lib_link_dir}/librocksdb.* || :
   [ -f ${lib_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib_link_dir}/libtaosws.* || :
 
   ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
-  ${csudo}rm -f ${lib64_link_dir}/librocksdb.* || :
   [ -f ${lib64_link_dir}/libtaosws.* ] && ${csudo}rm -f ${lib64_link_dir}/libtaosws.* || :
   #${csudo}rm -rf ${v15_java_app_dir}           || :
   

From df67a61519c9c84187a4b7ddcbc83165644021ae Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Thu, 8 Jun 2023 16:40:35 +0800
Subject: [PATCH 56/58] docs(driver): TDengine description

---
 docs/en/14-reference/03-connector/04-java.mdx | 28 +++++++++----------
 docs/zh/08-connector/14-java.mdx              | 28 +++++++++----------
 .../src/main/resources/application.properties |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/docs/en/14-reference/03-connector/04-java.mdx b/docs/en/14-reference/03-connector/04-java.mdx
index b820386380..9c5a852c70 100644
--- a/docs/en/14-reference/03-connector/04-java.mdx
+++ b/docs/en/14-reference/03-connector/04-java.mdx
@@ -34,20 +34,20 @@ REST connection supports all platforms that can run Java.
 
 ## Recent update logs
 
-| taos-jdbcdriver version |                                                                   major changes                                                                    | TDengine Minimum version |
-| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------: |
-|          3.2.1          |                                                           subscription add seek function                                                           |         3.0.5.0          |
-|          3.2.1          |                                      JDBC REST connection supports schemaless/prepareStatement over WebSocket                                      |         3.0.3.0          |
-|          3.2.0          |                                                          This version has been deprecated                                                          |            -             |
-|          3.1.0          |                                             JDBC REST connection supports subscription over WebSocket                                              |            -             |
-|      3.0.1 - 3.0.4      | fix the resultSet data is parsed incorrectly sometimes. 3.0.1 is compiled on JDK 11, you are advised to use other version in the JDK 8 environment |            -             |
-|          3.0.0          |                                                              Support for TDengine 3.0                                                              |         3.0.0.0          |
-|         2.0.42          |                                             fix wasNull interface return value in WebSocket connection                                             |            -             |
-|         2.0.41          |                                           fix decode method of username and password in REST connection                                            |            -             |
-|     2.0.39 - 2.0.40     |                                                   Add REST connection/request timeout parameters                                                   |            -             |
-|         2.0.38          |                                                    JDBC REST connections add bulk pull function                                                    |            -             |
-|         2.0.37          |                                                                 Support json tags                                                                  |            -             |
-|         2.0.36          |                                                             Support schemaless writing                                                             |            -             |
+| taos-jdbcdriver version |                                                                   major changes                                                                    | TDengine version |
+| :---------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------: |
+|          3.2.1          |                                                           subscription add seek function                                                           | 3.0.5.0 or later |
+|          3.2.1          |                                      JDBC REST connection supports schemaless/prepareStatement over WebSocket                                      | 3.0.3.0 or later |
+|          3.2.0          |                                                          This version has been deprecated                                                          |        -         |
+|          3.1.0          |                                             JDBC REST connection supports subscription over WebSocket                                              |        -         |
+|      3.0.1 - 3.0.4      | fix the resultSet data is parsed incorrectly sometimes. 3.0.1 is compiled on JDK 11, you are advised to use other version in the JDK 8 environment |        -         |
+|          3.0.0          |                                                              Support for TDengine 3.0                                                              | 3.0.0.0 or later |
+|         2.0.42          |                                             fix wasNull interface return value in WebSocket connection                                             |        -         |
+|         2.0.41          |                                           fix decode method of username and password in REST connection                                            |        -         |
+|     2.0.39 - 2.0.40     |                                                   Add REST connection/request timeout parameters                                                   |        -         |
+|         2.0.38          |                                                    JDBC REST connections add bulk pull function                                                    |        -         |
+|         2.0.37          |                                                                 Support json tags                                                                  |        -         |
+|         2.0.36          |                                                             Support schemaless writing                                                             |        -         |
 
 **Note**: adding `batchfetch` to the REST connection and setting it to true will enable the WebSocket connection.
 
diff --git a/docs/zh/08-connector/14-java.mdx b/docs/zh/08-connector/14-java.mdx
index f63350ea04..1588159b57 100644
--- a/docs/zh/08-connector/14-java.mdx
+++ b/docs/zh/08-connector/14-java.mdx
@@ -34,20 +34,20 @@ REST 连接支持所有能运行 Java 的平台。
 
 ## 版本历史
 
-| taos-jdbcdriver 版本 |                                                                        主要变化                                                                        | TDengine 最低版本 |
-| :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------: |
-|        3.2.2         |                                                           新增功能：数据订阅支持 seek 功能。                                                           |      3.0.5.0      |
-|        3.2.1         | 新增功能：WebSocket 连接支持 schemaless 与 prepareStatement 写入。变更：consumer poll 返回结果集为 ConsumerRecord，可通过 value() 获取指定结果集数据。 |      3.0.3.0      |
-|        3.2.0         |                                                                存在连接问题，不推荐使用                                                                |         -         |
-|        3.1.0         |                                                               WebSocket 连接支持订阅功能                                                               |         -         |
-|    3.0.1 - 3.0.4     |                             修复一些情况下结果集数据解析错误的问题。3.0.1 在 JDK 11 环境编译，JDK 8 环境下建议使用其他版本                             |         -         |
-|        3.0.0         |                                                                   支持 TDengine 3.0                                                                    |      3.0.0.0      |
-|        2.0.42        |                                                        修在 WebSocket 连接中 wasNull 接口返回值                                                        |         -         |
-|        2.0.41        |                                                          修正 REST 连接中用户名和密码转码方式                                                          |         -         |
-|   2.0.39 - 2.0.40    |                                                              增加 REST 连接/请求 超时设置                                                              |         -         |
-|        2.0.38        |                                                             JDBC REST 连接增加批量拉取功能                                                             |         -         |
-|        2.0.37        |                                                                  增加对 json tag 支持                                                                  |         -         |
-|        2.0.36        |                                                               增加对 schemaless 写入支持                                                               |         -         |
+| taos-jdbcdriver 版本 |                                                                        主要变化                                                                        |   TDengine 版本    |
+| :------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------: |
+|        3.2.2         |                                                           新增功能：数据订阅支持 seek 功能。                                                           | 3.0.5.0 及更高版本 |
+|        3.2.1         | 新增功能：WebSocket 连接支持 schemaless 与 prepareStatement 写入。变更：consumer poll 返回结果集为 ConsumerRecord，可通过 value() 获取指定结果集数据。 | 3.0.3.0 及更高版本 |
+|        3.2.0         |                                                                存在连接问题，不推荐使用                                                                |         -          |
+|        3.1.0         |                                                               WebSocket 连接支持订阅功能                                                               |         -          |
+|    3.0.1 - 3.0.4     |                             修复一些情况下结果集数据解析错误的问题。3.0.1 在 JDK 11 环境编译，JDK 8 环境下建议使用其他版本                             |         -          |
+|        3.0.0         |                                                                   支持 TDengine 3.0                                                                    | 3.0.0.0 及更高版本 |
+|        2.0.42        |                                                        修在 WebSocket 连接中 wasNull 接口返回值                                                        |         -          |
+|        2.0.41        |                                                          修正 REST 连接中用户名和密码转码方式                                                          |         -          |
+|   2.0.39 - 2.0.40    |                                                              增加 REST 连接/请求 超时设置                                                              |         -          |
+|        2.0.38        |                                                             JDBC REST 连接增加批量拉取功能                                                             |         -          |
+|        2.0.37        |                                                                  增加对 json tag 支持                                                                  |         -          |
+|        2.0.36        |                                                               增加对 schemaless 写入支持                                                               |         -          |
 
 **注**：REST 连接中增加 `batchfetch` 参数并设置为 true，将开启 WebSocket 连接。
 
diff --git a/examples/JDBC/springbootdemo/src/main/resources/application.properties b/examples/JDBC/springbootdemo/src/main/resources/application.properties
index bf21047395..c523952fb6 100644
--- a/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/examples/JDBC/springbootdemo/src/main/resources/application.properties
@@ -5,7 +5,7 @@
 #spring.datasource.password=taosdata
 # datasource config - JDBC-RESTful
 spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-spring.datasource.url=jdbc:TAOS-RS://localhost:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+spring.datasource.url=jdbc:TAOS-RS://localhost:6041/test
 spring.datasource.username=root
 spring.datasource.password=taosdata
 spring.datasource.druid.initial-size=5

From d5c0ca3163160d568804e0b1b199829d507bce22 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 8 Jun 2023 13:36:52 +0000
Subject: [PATCH 57/58] opt batch write

---
 source/libs/stream/inc/streamBackendRocksdb.h |  5 ++
 source/libs/stream/src/streamBackendRocksdb.c | 54 +++++++++++++------
 source/libs/stream/src/tstreamFileState.c     | 11 +++-
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/source/libs/stream/inc/streamBackendRocksdb.h b/source/libs/stream/inc/streamBackendRocksdb.h
index 1cbd7b042c..da4e442f1a 100644
--- a/source/libs/stream/inc/streamBackendRocksdb.h
+++ b/source/libs/stream/inc/streamBackendRocksdb.h
@@ -122,12 +122,17 @@ char*   streamDefaultIterKey_rocksdb(void* iter, int32_t* len);
 char*   streamDefaultIterVal_rocksdb(void* iter, int32_t* len);
 
 // batch func
+int     streamStateGetCfIdx(SStreamState* pState, const char* funcName);
 void*   streamStateCreateBatch();
 int32_t streamStateGetBatchSize(void* pBatch);
 void    streamStateClearBatch(void* pBatch);
 void    streamStateDestroyBatch(void* pBatch);
 int32_t streamStatePutBatch(SStreamState* pState, const char* cfName, rocksdb_writebatch_t* pBatch, void* key,
                             void* val, int32_t vlen, int64_t ttl);
+
+int32_t streamStatePutBatchOptimize(SStreamState* pState, int32_t cfIdx, rocksdb_writebatch_t* pBatch, void* key,
+                                    void* val, int32_t vlen, int64_t ttl, void* tmpBuf);
+
 int32_t streamStatePutBatch_rocksdb(SStreamState* pState, void* pBatch);
 // int32_t streamDefaultIter_rocksdb(SStreamState* pState, const void* start, const void* end, SArray* result);
 #endif
\ No newline at end of file
diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index df045eef20..4ad208988b 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -210,7 +210,6 @@ void streamBackendDelCompare(void* backend, void* arg) {
 }
 void        streamStateDestroy_rocksdb(SStreamState* pState, bool remove) { streamStateCloseBackend(pState, remove); }
 static bool streamStateIterSeekAndValid(rocksdb_iterator_t* iter, char* buf, size_t len);
-int         streamGetInit(SStreamState* pState, const char* funcName);
 
 // |key|-----value------|
 // |key|ttl|len|userData|
@@ -557,14 +556,20 @@ typedef struct {
 
 int32_t encodeValueFunc(void* value, int32_t vlen, int64_t ttl, char** dest) {
   SStreamValue key = {.unixTimestamp = ttl, .len = vlen, .data = (char*)(value)};
-
-  char*   p = taosMemoryCalloc(1, sizeof(int64_t) + sizeof(int32_t) + key.len);
-  char*   buf = p;
-  int32_t len = 0;
-  len += taosEncodeFixedI64((void**)&buf, key.unixTimestamp);
-  len += taosEncodeFixedI32((void**)&buf, key.len);
-  len += taosEncodeBinary((void**)&buf, (char*)value, vlen);
-  *dest = p;
+  int32_t      len = 0;
+  if (*dest == NULL) {
+    char* p = taosMemoryCalloc(1, sizeof(int64_t) + sizeof(int32_t) + key.len);
+    char* buf = p;
+    len += taosEncodeFixedI64((void**)&buf, key.unixTimestamp);
+    len += taosEncodeFixedI32((void**)&buf, key.len);
+    len += taosEncodeBinary((void**)&buf, (char*)value, vlen);
+    *dest = p;
+  } else {
+    char* buf = *dest;
+    len += taosEncodeFixedI64((void**)&buf, key.unixTimestamp);
+    len += taosEncodeFixedI32((void**)&buf, key.len);
+    len += taosEncodeBinary((void**)&buf, (char*)value, vlen);
+  }
   return len;
 }
 /*
@@ -713,7 +718,7 @@ int32_t streamStateOpenBackendCf(void* backend, char* name, char** cfs, int32_t
       rocksdb_options_set_block_based_table_factory((rocksdb_options_t*)cfOpts[i], tableOpt);
       params[i].tableOpt = tableOpt;
 
-      int      idx = streamGetInit(NULL, funcname);
+      int      idx = streamStateGetCfIdx(NULL, funcname);
       SCfInit* cfPara = &ginitDict[idx];
 
       rocksdb_comparator_t* compare =
@@ -744,7 +749,7 @@ int32_t streamStateOpenBackendCf(void* backend, char* name, char** cfs, int32_t
       char idstr[128] = {0};
       sprintf(idstr, "0x%" PRIx64 "-%d", streamId, taskId);
 
-      int idx = streamGetInit(NULL, funcname);
+      int idx = streamStateGetCfIdx(NULL, funcname);
 
       RocksdbCfInst*  inst = NULL;
       RocksdbCfInst** pInst = taosHashGet(handle->cfInst, idstr, strlen(idstr) + 1);
@@ -955,7 +960,7 @@ void streamStateDestroyCompar(void* arg) {
   taosMemoryFree(comp->comp);
 }
 
-int streamGetInit(SStreamState* pState, const char* funcName) {
+int streamStateGetCfIdx(SStreamState* pState, const char* funcName) {
   int    idx = -1;
   size_t len = strlen(funcName);
   for (int i = 0; i < sizeof(ginitDict) / sizeof(ginitDict[0]); i++) {
@@ -1002,7 +1007,7 @@ bool streamStateIterSeekAndValid(rocksdb_iterator_t* iter, char* buf, size_t len
 }
 rocksdb_iterator_t* streamStateIterCreate(SStreamState* pState, const char* cfName, rocksdb_snapshot_t** snapshot,
                                           rocksdb_readoptions_t** readOpt) {
-  int idx = streamGetInit(pState, cfName);
+  int idx = streamStateGetCfIdx(pState, cfName);
 
   if (snapshot != NULL) {
     *snapshot = (rocksdb_snapshot_t*)rocksdb_create_snapshot(pState->pTdbState->rocksdb);
@@ -1022,7 +1027,7 @@ rocksdb_iterator_t* streamStateIterCreate(SStreamState* pState, const char* cfNa
     code = 0;                                                                                                          \
     char  buf[128] = {0};                                                                                              \
     char* err = NULL;                                                                                                  \
-    int   i = streamGetInit(pState, funcname);                                                                         \
+    int   i = streamStateGetCfIdx(pState, funcname);                                                                   \
     if (i < 0) {                                                                                                       \
       qWarn("streamState failed to get cf name: %s", funcname);                                                        \
       code = -1;                                                                                                       \
@@ -1053,7 +1058,7 @@ rocksdb_iterator_t* streamStateIterCreate(SStreamState* pState, const char* cfNa
     code = 0;                                                                                                          \
     char  buf[128] = {0};                                                                                              \
     char* err = NULL;                                                                                                  \
-    int   i = streamGetInit(pState, funcname);                                                                         \
+    int   i = streamStateGetCfIdx(pState, funcname);                                                                   \
     if (i < 0) {                                                                                                       \
       qWarn("streamState failed to get cf name: %s", funcname);                                                        \
       code = -1;                                                                                                       \
@@ -1101,7 +1106,7 @@ rocksdb_iterator_t* streamStateIterCreate(SStreamState* pState, const char* cfNa
     code = 0;                                                                                                       \
     char  buf[128] = {0};                                                                                           \
     char* err = NULL;                                                                                               \
-    int   i = streamGetInit(pState, funcname);                                                                      \
+    int   i = streamStateGetCfIdx(pState, funcname);                                                                \
     if (i < 0) {                                                                                                    \
       qWarn("streamState failed to get cf name: %s_%s", pState->pTdbState->idstr, funcname);                        \
       code = -1;                                                                                                    \
@@ -2041,7 +2046,7 @@ void    streamStateClearBatch(void* pBatch) { rocksdb_writebatch_clear((rocksdb_
 void    streamStateDestroyBatch(void* pBatch) { rocksdb_writebatch_destroy((rocksdb_writebatch_t*)pBatch); }
 int32_t streamStatePutBatch(SStreamState* pState, const char* cfName, rocksdb_writebatch_t* pBatch, void* key,
                             void* val, int32_t vlen, int64_t ttl) {
-  int i = streamGetInit(pState, cfName);
+  int i = streamStateGetCfIdx(pState, cfName);
 
   if (i < 0) {
     qError("streamState failed to put to cf name:%s", cfName);
@@ -2057,6 +2062,21 @@ int32_t streamStatePutBatch(SStreamState* pState, const char* cfName, rocksdb_wr
   taosMemoryFree(ttlV);
   return 0;
 }
+int32_t streamStatePutBatchOptimize(SStreamState* pState, int32_t cfIdx, rocksdb_writebatch_t* pBatch, void* key,
+                                    void* val, int32_t vlen, int64_t ttl, void* tmpBuf) {
+  char    buf[128] = {0};
+  int32_t klen = ginitDict[cfIdx].enFunc((void*)key, buf);
+  char*   ttlV = tmpBuf;
+  int32_t ttlVLen = ginitDict[cfIdx].enValueFunc(val, vlen, ttl, &ttlV);
+
+  rocksdb_column_family_handle_t* pCf = pState->pTdbState->pHandle[ginitDict[cfIdx].idx];
+  rocksdb_writebatch_put_cf((rocksdb_writebatch_t*)pBatch, pCf, buf, (size_t)klen, ttlV, (size_t)ttlVLen);
+
+  if (tmpBuf == NULL) {
+    taosMemoryFree(ttlV);
+  }
+  return 0;
+}
 int32_t streamStatePutBatch_rocksdb(SStreamState* pState, void* pBatch) {
   char* err = NULL;
   rocksdb_write(pState->pTdbState->rocksdb, pState->pTdbState->writeOpts, (rocksdb_writebatch_t*)pBatch, &err);
diff --git a/source/libs/stream/src/tstreamFileState.c b/source/libs/stream/src/tstreamFileState.c
index bfaeca89f6..dc9a1f80bb 100644
--- a/source/libs/stream/src/tstreamFileState.c
+++ b/source/libs/stream/src/tstreamFileState.c
@@ -350,6 +350,11 @@ int32_t flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot,
   const int32_t BATCH_LIMIT = 256;
   SListNode*    pNode = NULL;
 
+  int idx = streamStateGetCfIdx(pFileState->pFileStore, "state");
+
+  int32_t len = pFileState->rowSize + sizeof(uint64_t) + sizeof(int32_t) + 1;
+  char*   buf = taosMemoryCalloc(1, len);
+
   void* batch = streamStateCreateBatch();
   while ((pNode = tdListNext(&iter)) != NULL && code == TSDB_CODE_SUCCESS) {
     SRowBuffPos* pPos = *(SRowBuffPos**)pNode->data;
@@ -360,9 +365,13 @@ int32_t flushSnapshot(SStreamFileState* pFileState, SStreamSnapshot* pSnapshot,
     }
 
     SStateKey sKey = {.key = *((SWinKey*)pPos->pKey), .opNum = ((SStreamState*)pFileState->pFileStore)->number};
-    code = streamStatePutBatch(pFileState->pFileStore, "state", batch, &sKey, pPos->pRowBuff, pFileState->rowSize, 0);
+    code = streamStatePutBatchOptimize(pFileState->pFileStore, idx, batch, &sKey, pPos->pRowBuff, pFileState->rowSize,
+                                       0, buf);
+    memset(buf, 0, len);
     qDebug("===stream===put %" PRId64 " to disc, res %d", sKey.key.ts, code);
   }
+  taosMemoryFree(buf);
+
   if (streamStateGetBatchSize(batch) > 0) {
     code = streamStatePutBatch_rocksdb(pFileState->pFileStore, batch);
   }

From a67ef8ce916fec2c41b7e573f5338305b9cda94a Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 9 Jun 2023 01:27:08 +0000
Subject: [PATCH 58/58] opt batch write

---
 source/libs/stream/src/streamBackendRocksdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index 4ad208988b..c4e3f147e0 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -877,7 +877,7 @@ int streamStateOpenBackend(void* backend, SStreamState* pState) {
   taosThreadRwlockInit(&pState->pTdbState->rwLock, NULL);
   SCfComparator compare = {.comp = pCompare, .numOfComp = cfLen};
   pState->pTdbState->pComparNode = streamBackendAddCompare(handle, &compare);
-  // rocksdb_writeoptions_disable_WAL(pState->pTdbState->writeOpts, 1);
+  rocksdb_writeoptions_disable_WAL(pState->pTdbState->writeOpts, 1);
   qInfo("succ to open state %p on backend, %p, 0x%" PRIx64 "-%d", pState, handle, pState->streamId, pState->taskId);
   return 0;
 }