From 6bd2a329c682ce66c11c6d4f3797166aa2a4d4d8 Mon Sep 17 00:00:00 2001
From: haoranchen <haoran920c@163.com>
Date: Mon, 31 Jul 2023 10:19:23 +0800
Subject: [PATCH 01/48] Update cases.task

---
 tests/parallel_test/cases.task | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 1ec5102d9b..24f968ee65 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -105,7 +105,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb-funcNFilter.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-1ctb-funcNFilter.py
-#,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-mutilVg-mutilCtb-funcNFilter.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-mutilVg-mutilCtb-funcNFilter.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-mutilVg-mutilCtb.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqAutoCreateTbl.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqDnodeRestart.py

From 4dcdb549c98a29f8aba4e1f743521972f6cf4190 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Thu, 17 Aug 2023 16:41:42 +0800
Subject: [PATCH 02/48] fix: get systable cols error

---
 source/dnode/mnode/impl/src/mndStb.c          | 226 ++++++++++--------
 .../0-others/information_schema.py            |   8 +-
 2 files changed, 132 insertions(+), 102 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 8a6bd079a4..3a60dc46e7 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -3159,137 +3159,161 @@ static int32_t buildDbColsInfoBlock(const SSDataBlock *p, const SSysTableMeta *p
 
   return numOfRows;
 }
+#define BUILD_COL_FOR_INFO_DB 1
+#define BUILD_COL_FOR_PERF_DB 1 << 1
+#define BUILD_COL_FOR_USER_DB 1 << 2
+#define BUILD_COL_FOR_ALL_DB  (BUILD_COL_FOR_INFO_DB | BUILD_COL_FOR_PERF_DB | BUILD_COL_FOR_USER_DB)
 
-static int32_t buildSysDbColsInfo(SSDataBlock *p, char *db, char *tb) {
+static int32_t buildSysDbColsInfo(SSDataBlock *p, int8_t buildWhichDBs, char *tb) {
   size_t               size = 0;
   const SSysTableMeta *pSysDbTableMeta = NULL;
 
-  if (db[0] && strncmp(db, TSDB_INFORMATION_SCHEMA_DB, TSDB_DB_FNAME_LEN) != 0 &&
-      strncmp(db, TSDB_PERFORMANCE_SCHEMA_DB, TSDB_DB_FNAME_LEN) != 0) {
-    return p->info.rows;
+  if (buildWhichDBs & BUILD_COL_FOR_INFO_DB) {
+    getInfosDbMeta(&pSysDbTableMeta, &size);
+    p->info.rows = buildDbColsInfoBlock(p, pSysDbTableMeta, size, TSDB_INFORMATION_SCHEMA_DB, tb);
   }
 
-  getInfosDbMeta(&pSysDbTableMeta, &size);
-  p->info.rows = buildDbColsInfoBlock(p, pSysDbTableMeta, size, TSDB_INFORMATION_SCHEMA_DB, tb);
-
-  getPerfDbMeta(&pSysDbTableMeta, &size);
-  p->info.rows = buildDbColsInfoBlock(p, pSysDbTableMeta, size, TSDB_PERFORMANCE_SCHEMA_DB, tb);
+  if (buildWhichDBs & BUILD_COL_FOR_PERF_DB) {
+    getPerfDbMeta(&pSysDbTableMeta, &size);
+    p->info.rows = buildDbColsInfoBlock(p, pSysDbTableMeta, size, TSDB_PERFORMANCE_SCHEMA_DB, tb);
+  }
 
   return p->info.rows;
 }
 
+static int8_t determineBuildColForWhichDBs(const char* db) {
+  int8_t buildWhichDBs;
+  if (!db[0])
+    buildWhichDBs = BUILD_COL_FOR_ALL_DB;
+  else {
+    char *p = strchr(db, '.');
+    if (p && strcmp(p + 1, TSDB_INFORMATION_SCHEMA_DB) == 0) {
+      buildWhichDBs = BUILD_COL_FOR_INFO_DB;
+    } else if (p && strcmp(p + 1, TSDB_PERFORMANCE_SCHEMA_DB) == 0) {
+      buildWhichDBs = BUILD_COL_FOR_PERF_DB;
+    } else {
+      buildWhichDBs = BUILD_COL_FOR_USER_DB;
+    }
+  }
+  return buildWhichDBs;
+}
+
 static int32_t mndRetrieveStbCol(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
+  uint8_t buildWhichDBs;
   SMnode  *pMnode = pReq->info.node;
   SSdb    *pSdb = pMnode->pSdb;
   SStbObj *pStb = NULL;
-
-
   int32_t numOfRows = 0;
+
+  buildWhichDBs = determineBuildColForWhichDBs(pShow->db);
+
   if (!pShow->sysDbRsp) {
-    numOfRows = buildSysDbColsInfo(pBlock, pShow->db, pShow->filterTb);
+    numOfRows = buildSysDbColsInfo(pBlock, buildWhichDBs, pShow->filterTb);
     mDebug("mndRetrieveStbCol get system table cols, rows:%d, db:%s", numOfRows, pShow->db);
     pShow->sysDbRsp = true;
   }
 
-  SDbObj *pDb = NULL;
-  if (strlen(pShow->db) > 0) {
-    pDb = mndAcquireDb(pMnode, pShow->db);
-    if (pDb == NULL) return terrno;
-  }
-
-  char typeName[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
-  STR_TO_VARSTR(typeName, "SUPER_TABLE");
-  bool fetch = pShow->restore ? false : true;
-  pShow->restore = false;
-  while (numOfRows < rows) {
-    if (fetch) {
-      pShow->pIter = sdbFetch(pSdb, SDB_STB, pShow->pIter, (void **)&pStb);
-      if (pShow->pIter == NULL) break;
-    } else {
-      fetch = true;
-      void  *pKey = taosHashGetKey(pShow->pIter, NULL);
-      pStb = sdbAcquire(pSdb, SDB_STB, pKey);
-      if (!pStb) continue;
+  if (buildWhichDBs & BUILD_COL_FOR_USER_DB) {
+    SDbObj *pDb = NULL;
+    if (strlen(pShow->db) > 0) {
+      pDb = mndAcquireDb(pMnode, pShow->db);
+      if (pDb == NULL && TSDB_CODE_MND_DB_NOT_EXIST != terrno && pBlock->info.rows == 0) return terrno;
     }
 
-    if (pDb != NULL && pStb->dbUid != pDb->uid) {
-      sdbRelease(pSdb, pStb);
-      continue;
-    }
-
-    SName name = {0};
-    char  stbName[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    mndExtractTbNameFromStbFullName(pStb->name, &stbName[VARSTR_HEADER_SIZE], TSDB_TABLE_NAME_LEN);
-    if (pShow->filterTb[0] && strncmp(pShow->filterTb, &stbName[VARSTR_HEADER_SIZE], TSDB_TABLE_NAME_LEN) != 0) {
-      sdbRelease(pSdb, pStb);
-      continue;
-    }
-
-    if ((numOfRows + pStb->numOfColumns) > rows) {
-      pShow->restore = true;
-      if (numOfRows == 0) {
-        mError("mndRetrieveStbCol failed to get stable cols since buf:%d less than result:%d, stable name:%s, db:%s",
-               rows, pStb->numOfColumns, pStb->name, pStb->db);
+    char typeName[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
+    STR_TO_VARSTR(typeName, "SUPER_TABLE");
+    bool fetch = pShow->restore ? false : true;
+    pShow->restore = false;
+    while (numOfRows < rows) {
+      if (fetch) {
+        pShow->pIter = sdbFetch(pSdb, SDB_STB, pShow->pIter, (void **)&pStb);
+        if (pShow->pIter == NULL) break;
+      } else {
+        fetch = true;
+        void *pKey = taosHashGetKey(pShow->pIter, NULL);
+        pStb = sdbAcquire(pSdb, SDB_STB, pKey);
+        if (!pStb) continue;
       }
-      sdbRelease(pSdb, pStb);
-      break;
-    }
 
-    varDataSetLen(stbName, strlen(&stbName[VARSTR_HEADER_SIZE]));
-
-    mDebug("mndRetrieveStbCol get stable cols, stable name:%s, db:%s", pStb->name, pStb->db);
-
-    char db[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-    tNameFromString(&name, pStb->db, T_NAME_ACCT | T_NAME_DB);
-    tNameGetDbName(&name, varDataVal(db));
-    varDataSetLen(db, strlen(varDataVal(db)));
-
-    for (int i = 0; i < pStb->numOfColumns; i++) {
-      int32_t          cols = 0;
-      SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)stbName, false);
-
-      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)db, false);
-
-      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, typeName, false);
-
-      // col name
-      char colName[TSDB_COL_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
-      STR_TO_VARSTR(colName, pStb->pColumns[i].name);
-      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, colName, false);
-
-      // col type
-      int8_t colType = pStb->pColumns[i].type;
-      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      char colTypeStr[VARSTR_HEADER_SIZE + 32];
-      int  colTypeLen = sprintf(varDataVal(colTypeStr), "%s", tDataTypes[colType].name);
-      if (colType == TSDB_DATA_TYPE_VARCHAR) {
-        colTypeLen += sprintf(varDataVal(colTypeStr) + colTypeLen, "(%d)",
-                              (int32_t)(pStb->pColumns[i].bytes - VARSTR_HEADER_SIZE));
-      } else if (colType == TSDB_DATA_TYPE_NCHAR) {
-        colTypeLen += sprintf(varDataVal(colTypeStr) + colTypeLen, "(%d)",
-                              (int32_t)((pStb->pColumns[i].bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE));
+      if (pDb != NULL && pStb->dbUid != pDb->uid) {
+        sdbRelease(pSdb, pStb);
+        continue;
       }
-      varDataSetLen(colTypeStr, colTypeLen);
-      colDataSetVal(pColInfo, numOfRows, (char *)colTypeStr, false);
 
-      pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-      colDataSetVal(pColInfo, numOfRows, (const char *)&pStb->pColumns[i].bytes, false);
-      while (cols < pShow->numOfColumns) {
+      SName name = {0};
+      char  stbName[TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+      mndExtractTbNameFromStbFullName(pStb->name, &stbName[VARSTR_HEADER_SIZE], TSDB_TABLE_NAME_LEN);
+      if (pShow->filterTb[0] && strncmp(pShow->filterTb, &stbName[VARSTR_HEADER_SIZE], TSDB_TABLE_NAME_LEN) != 0) {
+        sdbRelease(pSdb, pStb);
+        continue;
+      }
+
+      if ((numOfRows + pStb->numOfColumns) > rows) {
+        pShow->restore = true;
+        if (numOfRows == 0) {
+          mError("mndRetrieveStbCol failed to get stable cols since buf:%d less than result:%d, stable name:%s, db:%s",
+                 rows, pStb->numOfColumns, pStb->name, pStb->db);
+        }
+        sdbRelease(pSdb, pStb);
+        break;
+      }
+
+      varDataSetLen(stbName, strlen(&stbName[VARSTR_HEADER_SIZE]));
+
+      mDebug("mndRetrieveStbCol get stable cols, stable name:%s, db:%s", pStb->name, pStb->db);
+
+      char db[TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+      tNameFromString(&name, pStb->db, T_NAME_ACCT | T_NAME_DB);
+      tNameGetDbName(&name, varDataVal(db));
+      varDataSetLen(db, strlen(varDataVal(db)));
+
+      for (int i = 0; i < pStb->numOfColumns; i++) {
+        int32_t          cols = 0;
+        SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+        colDataSetVal(pColInfo, numOfRows, (const char *)stbName, false);
+
         pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-        colDataSetNULL(pColInfo, numOfRows);
+        colDataSetVal(pColInfo, numOfRows, (const char *)db, false);
+
+        pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+        colDataSetVal(pColInfo, numOfRows, typeName, false);
+
+        // col name
+        char colName[TSDB_COL_NAME_LEN + VARSTR_HEADER_SIZE] = {0};
+        STR_TO_VARSTR(colName, pStb->pColumns[i].name);
+        pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+        colDataSetVal(pColInfo, numOfRows, colName, false);
+
+        // col type
+        int8_t colType = pStb->pColumns[i].type;
+        pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+        char colTypeStr[VARSTR_HEADER_SIZE + 32];
+        int  colTypeLen = sprintf(varDataVal(colTypeStr), "%s", tDataTypes[colType].name);
+        if (colType == TSDB_DATA_TYPE_VARCHAR) {
+          colTypeLen += sprintf(varDataVal(colTypeStr) + colTypeLen, "(%d)",
+                                (int32_t)(pStb->pColumns[i].bytes - VARSTR_HEADER_SIZE));
+        } else if (colType == TSDB_DATA_TYPE_NCHAR) {
+          colTypeLen += sprintf(varDataVal(colTypeStr) + colTypeLen, "(%d)",
+                                (int32_t)((pStb->pColumns[i].bytes - VARSTR_HEADER_SIZE) / TSDB_NCHAR_SIZE));
+        }
+        varDataSetLen(colTypeStr, colTypeLen);
+        colDataSetVal(pColInfo, numOfRows, (char *)colTypeStr, false);
+
+        pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+        colDataSetVal(pColInfo, numOfRows, (const char *)&pStb->pColumns[i].bytes, false);
+        while (cols < pShow->numOfColumns) {
+          pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
+          colDataSetNULL(pColInfo, numOfRows);
+        }
+        numOfRows++;
       }
-      numOfRows++;
+
+      sdbRelease(pSdb, pStb);
     }
 
-    sdbRelease(pSdb, pStb);
-  }
-
-  if (pDb != NULL) {
-    mndReleaseDb(pMnode, pDb);
+    if (pDb != NULL) {
+      mndReleaseDb(pMnode, pDb);
+    }
   }
 
   pShow->numOfRows += numOfRows;
diff --git a/tests/system-test/0-others/information_schema.py b/tests/system-test/0-others/information_schema.py
index 762361f051..fde4e52f3d 100644
--- a/tests/system-test/0-others/information_schema.py
+++ b/tests/system-test/0-others/information_schema.py
@@ -215,7 +215,13 @@ class TDTestCase:
         for t in range (2):
             tdSql.query(f'select * from information_schema.ins_columns where db_name="db2" and table_type=="NORMAL_TABLE"')
             tdSql.checkEqual(20470,len(tdSql.queryResult))
-            
+
+        tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'")
+        tdSql.checkEqual(195, len(tdSql.queryResult))
+
+        tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'")
+        tdSql.checkEqual(54, len(tdSql.queryResult))
+
     def ins_dnodes_check(self):
         tdSql.execute('drop database if exists db2')
         tdSql.execute('create database if not exists db2 vgroups 1 replica 1')

From 42b12b1e68ca3dd60f0f90873a44255788a2cd86 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Fri, 18 Aug 2023 17:40:34 +0800
Subject: [PATCH 03/48] fix: document issues

---
 docs/en/12-taos-sql/06-select.md        | 7 +++----
 docs/zh/12-taos-sql/06-select.md        | 7 +++----
 docs/zh/12-taos-sql/12-distinguished.md | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 docs/en/12-taos-sql/06-select.md
 mode change 100644 => 100755 docs/zh/12-taos-sql/06-select.md
 mode change 100644 => 100755 docs/zh/12-taos-sql/12-distinguished.md

diff --git a/docs/en/12-taos-sql/06-select.md b/docs/en/12-taos-sql/06-select.md
old mode 100644
new mode 100755
index b28d5acb18..661b4f5dea
--- a/docs/en/12-taos-sql/06-select.md
+++ b/docs/en/12-taos-sql/06-select.md
@@ -167,7 +167,7 @@ The following SQL statement returns the number of subtables within the meters su
 SELECT COUNT(*) FROM (SELECT DISTINCT TBNAME FROM meters);
 ```
 
-In the preceding two statements, only tags can be used as filtering conditions in the WHERE clause. For example:
+In the preceding two statements, only tags can be used as filtering conditions in the WHERE clause. 
 
 **\_QSTART and \_QEND**
 
@@ -209,8 +209,7 @@ You can perform INNER JOIN statements based on the primary key. The following co
 3. For supertables, the ON condition must be equivalent to the primary key. In addition, the tag columns of the tables on which the INNER JOIN is performed must have a one-to-one relationship. You cannot specify an OR condition.
 4. The tables that are included in a JOIN clause must be of the same type (supertable, standard table, or subtable).
 5. You can include subqueries before and after the JOIN keyword.
-6. You cannot include more than ten tables in a JOIN clause.
-7. You cannot include a FILL clause and a JOIN clause in the same statement.
+6. You cannot include a FILL clause and a JOIN clause in the same statement.
 
 ## GROUP BY
 
@@ -355,7 +354,7 @@ SELECT AVG(CASE WHEN voltage < 200 or voltage > 250 THEN 220 ELSE voltage END) F
 
 ## JOIN
 
-TDengine supports the `INTER JOIN` based on the timestamp primary key, that is, the `JOIN` condition must contain the timestamp primary key. As long as the requirement of timestamp-based primary key is met, `INTER JOIN` can be made between normal tables, sub-tables, super tables and sub-queries at will, and there is no limit on the number of tables.
+TDengine supports the `INTER JOIN` based on the timestamp primary key, that is, the `JOIN` condition must contain the timestamp primary key. As long as the requirement of timestamp-based primary key is met, `INTER JOIN` can be made between normal tables, sub-tables, super tables and sub-queries at will, and there is no limit on the number of tables, primary key and other conditions must be combined with `AND` operator.
 
 For standard tables:
 
diff --git a/docs/zh/12-taos-sql/06-select.md b/docs/zh/12-taos-sql/06-select.md
old mode 100644
new mode 100755
index 9560c3c4df..80966cf386
--- a/docs/zh/12-taos-sql/06-select.md
+++ b/docs/zh/12-taos-sql/06-select.md
@@ -167,7 +167,7 @@ SELECT table_name, tag_name, tag_type, tag_value FROM information_schema.ins_tag
 SELECT COUNT(*) FROM (SELECT DISTINCT TBNAME FROM meters);
 ```
 
-以上两个查询均只支持在 WHERE 条件子句中添加针对标签（TAGS）的过滤条件。例如：
+以上两个查询均只支持在 WHERE 条件子句中添加针对标签（TAGS）的过滤条件。
 
 **\_QSTART/\_QEND**
 
@@ -209,8 +209,7 @@ TDengine 支持基于时间戳主键的 INNER JOIN，规则如下：
 3. 对于超级表，ON 条件在时间戳主键的等值条件之外，还要求有可以一一对应的标签列等值条件，不支持 OR 条件。
 4. 参与 JOIN 计算的表只能是同一种类型，即只能都是超级表，或都是子表，或都是普通表。
 5. JOIN 两侧均支持子查询。
-6. 参与 JOIN 的表个数上限为 10 个。
-7. 不支持与 FILL 子句混合使用。
+6. 不支持与 FILL 子句混合使用。
 
 ## GROUP BY
 
@@ -354,7 +353,7 @@ SELECT AVG(CASE WHEN voltage < 200 or voltage > 250 THEN 220 ELSE voltage END) F
 
 ## JOIN 子句
 
-TDengine 支持基于时间戳主键的内连接，即 JOIN 条件必须包含时间戳主键。只要满足基于时间戳主键这个要求，普通表、子表、超级表和子查询之间可以随意的进行内连接，且对表个数没有限制。
+TDengine 支持基于时间戳主键的内连接，即 JOIN 条件必须包含时间戳主键。只要满足基于时间戳主键这个要求，普通表、子表、超级表和子查询之间可以随意的进行内连接，且对表个数没有限制，其它连接条件与主键间必须是 AND 操作。
 
 普通表与普通表之间的 JOIN 操作：
 
diff --git a/docs/zh/12-taos-sql/12-distinguished.md b/docs/zh/12-taos-sql/12-distinguished.md
old mode 100644
new mode 100755
index f750124049..62888cc5f7
--- a/docs/zh/12-taos-sql/12-distinguished.md
+++ b/docs/zh/12-taos-sql/12-distinguished.md
@@ -31,7 +31,7 @@ select max(current) from meters partition by location interval(10m)
 
 ## 窗口切分查询
 
-TDengine 支持按时间窗口切分方式进行聚合结果查询，比如温度传感器每秒采集一次数据，但需查询每隔 10 分钟的温度平均值。这种场景下可以使用窗口子句来获得需要的查询结果。窗口子句用于针对查询的数据集合按照窗口切分成为查询子集并进行聚合，窗口包含时间窗口（time window）、状态窗口（status window）、会话窗口（session window）、条件窗口（event window）四种窗口。其中时间窗口又可划分为滑动时间窗口和翻转时间窗口。
+TDengine 支持按时间窗口切分方式进行聚合结果查询，比如温度传感器每秒采集一次数据，但需查询每隔 10 分钟的温度平均值。这种场景下可以使用窗口子句来获得需要的查询结果。窗口子句用于针对查询的数据集合按照窗口切分成为查询子集并进行聚合，窗口包含时间窗口（time window）、状态窗口（status window）、会话窗口（session window）、事件窗口（event window）四种窗口。其中时间窗口又可划分为滑动时间窗口和翻转时间窗口。
 
 窗口子句语法如下：
 

From 72cce0825b88875e9526cfe74a7c50a3c1ff84b4 Mon Sep 17 00:00:00 2001
From: danielclow <106956386+danielclow@users.noreply.github.com>
Date: Sat, 19 Aug 2023 23:17:20 +0800
Subject: [PATCH 04/48] docs: fix link in grafana doc (#22489)

"...releases/tag/latest" should be "...releases/latest", which will automatically redirect to "...releases/tag/<latest-version>"
---
 docs/en/20-third-party/01-grafana.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/20-third-party/01-grafana.mdx b/docs/en/20-third-party/01-grafana.mdx
index 64acefe6b8..0ccdfe7254 100644
--- a/docs/en/20-third-party/01-grafana.mdx
+++ b/docs/en/20-third-party/01-grafana.mdx
@@ -74,7 +74,7 @@ grafana-cli plugins install tdengine-datasource
 sudo -u grafana grafana-cli plugins install tdengine-datasource
 ```
 
-You can also download zip files from [GitHub](https://github.com/taosdata/grafanaplugin/releases/tag/latest) or [Grafana](https://grafana.com/grafana/plugins/tdengine-datasource/?tab=installation) and install manually. The commands are as follows:
+You can also download zip files from [GitHub](https://github.com/taosdata/grafanaplugin/releases/latest) or [Grafana](https://grafana.com/grafana/plugins/tdengine-datasource/?tab=installation) and install manually. The commands are as follows:
 
 ```bash
 GF_VERSION=3.3.1

From c3e881430857b4a2515d060684caf02d82917eb2 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Sun, 20 Aug 2023 11:31:45 +0800
Subject: [PATCH 05/48] docs: taos api description

---
 docs/zh/08-connector/10-cpp.mdx | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/zh/08-connector/10-cpp.mdx b/docs/zh/08-connector/10-cpp.mdx
index 12bbffa4f9..cec1e685ab 100644
--- a/docs/zh/08-connector/10-cpp.mdx
+++ b/docs/zh/08-connector/10-cpp.mdx
@@ -256,6 +256,12 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
 
   :::
 
+- `TAOS *taos_connect_auth(const char *host, const char *user, const char *auth, const char *db, uint16_t port)`  
+
+  功能同 taos_connect。除 pass 参数替换为 auth 外，其他参数同 taos_connect
+  
+  - auth: 密码取 32 位小写 md5. e.g. 默认密码 taosdata 取 md5 为 dcc5bed04851fec854c035b2e40263b6 
+
 - `char *taos_get_server_info(TAOS *taos)`
 
   获取服务端版本信息。
@@ -272,6 +278,14 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
   - 如果，len 小于 存储db需要的空间（包含最后的'\0'），返回错误，database里赋值截断的数据，以'\0'结尾。
   - 如果，len 大于等于 存储db需要的空间（包含最后的'\0'），返回正常0，database里赋值以'\0‘结尾的db名。
 
+- `int taos_set_notify_cb(TAOS *taos, __taos_notify_fn_t fp, void *param, int type)`
+
+   设置事件通知回调函数。
+
+  - fp 事件通知回调函数指针。函数声明：typedef void (*__taos_notify_fn_t)(void *param, void *ext, int type)；其中， param 为用户自定义参数，ext 为扩展参数(依赖事件通知类型，针对TAOS_NOTIFY_PASSVER 返回用户密码版本)，type 为事件通知类型。
+  - param 用户自定义参数。
+  - type 事件通知类型。取值：1）TAOS_NOTIFY_PASSVER： 用户密码改变。
+
 - `void taos_close(TAOS *taos)`
 
   关闭连接，其中`taos`是 `taos_connect()` 返回的句柄。
@@ -447,6 +461,14 @@ TDengine 的异步 API 均采用非阻塞调用模式。应用程序可以用多
 
   执行准备好的语句。目前，一条语句只能执行一次。
 
+- `int taos_stmt_affected_rows(TAOS_STMT *stmt)`
+ 
+  获取被所执行的 SQL 语句影响的行数。
+
+- `int taos_stmt_affected_rows_once(TAOS_STMT *stmt)`
+
+  获取被所执行的 SQL 语句影响的行数。
+
 - `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
 
   获取语句的结果集。结果集的使用方式与非参数化调用时一致，使用完成后，应对此结果集调用 `taos_free_result()` 以释放资源。

From 7020ac7a0f82ae61fd027e6274b3520d6db0e4c7 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sun, 20 Aug 2023 14:46:24 +0800
Subject: [PATCH 06/48] docs: refine c connector docs (#22491)

* docs: fix taos_init() return type

* docs: refine c interface doc
---
 docs/en/14-reference/03-connector/03-cpp.mdx | 19 ++++++------
 docs/examples/c/multi_bind_example.c         |  4 +--
 docs/examples/c/stmt_example.c               |  6 ++--
 docs/zh/08-connector/10-cpp.mdx              | 32 ++++++--------------
 4 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/docs/en/14-reference/03-connector/03-cpp.mdx b/docs/en/14-reference/03-connector/03-cpp.mdx
index 3e1a0f9545..d6e74e711b 100644
--- a/docs/en/14-reference/03-connector/03-cpp.mdx
+++ b/docs/en/14-reference/03-connector/03-cpp.mdx
@@ -307,21 +307,20 @@ The specific functions related to the interface are as follows (see also the [pr
 
   Parse a SQL command, and bind the parsed result and parameter information to `stmt`. If the parameter length is greater than 0, use this parameter as the length of the SQL command. If it is equal to 0, the length of the SQL command will be determined automatically.
 
-- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
+- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind)`
 
   Not as efficient as `taos_stmt_bind_param_batch()`, but can support non-INSERT type SQL statements.
   To bind parameters, bind points to an array (representing the row of data to be bound), making sure that the number and order of the elements in this array are the same as the parameters in the SQL statement. taos_bind is used similarly to MYSQL_BIND in MySQL, as defined below.
 
   ```c
-  typedef struct TAOS_BIND {
+  typedef struct TAOS_MULTI_BIND {
     int            buffer_type;
-    void *         buffer;
-    uintptr_t      buffer_length;  // not in use
-    uintptr_t *    length;
-    int *          is_null;
-    int            is_unsigned;    // not in use
-    int *          error;          // not in use
-  } TAOS_BIND;
+    void          *buffer;
+    uintptr_t      buffer_length;
+    uint32_t      *length;
+    char          *is_null;
+    int            num;
+  } TAOS_MULTI_BIND;
   ```
 
 - `int taos_stmt_set_tbname(TAOS_STMT* stmt, const char* name)`
@@ -329,7 +328,7 @@ The specific functions related to the interface are as follows (see also the [pr
   (Available in 2.1.1.0 and later versions, only supported for replacing parameter values in INSERT statements)
   When the table name in the SQL command uses `? ` placeholder, you can use this function to bind a specific table name.
 
-- `int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags)`
+- `int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_MULTI_BIND* tags)`
 
   (Available in 2.1.2.0 and later versions, only supported for replacing parameter values in INSERT statements)
   When the table name and TAGS in the SQL command both use `? `, you can use this function to bind the specific table name and the specific TAGS value. The most typical usage scenario is an INSERT statement that uses the automatic table building function (the current version does not support specifying specific TAGS columns.) The number of columns in the TAGS parameter needs to be the same as the number of TAGS requested in the SQL command.
diff --git a/docs/examples/c/multi_bind_example.c b/docs/examples/c/multi_bind_example.c
index 02e6568e9e..3d0bd3ccef 100644
--- a/docs/examples/c/multi_bind_example.c
+++ b/docs/examples/c/multi_bind_example.c
@@ -51,7 +51,7 @@ void insertData(TAOS *taos) {
   int         code = taos_stmt_prepare(stmt, sql, 0);
   checkErrorCode(stmt, code, "failed to execute taos_stmt_prepare");
   // bind table name and tags
-  TAOS_BIND tags[2];
+  TAOS_MULTI_BIND tags[2];
   char     *location = "California.SanFrancisco";
   int       groupId = 2;
   tags[0].buffer_type = TSDB_DATA_TYPE_BINARY;
@@ -144,4 +144,4 @@ int main() {
 }
 
 // output:
-// successfully inserted 2 rows
\ No newline at end of file
+// successfully inserted 2 rows
diff --git a/docs/examples/c/stmt_example.c b/docs/examples/c/stmt_example.c
index 28dae5f9d5..290a6bee66 100644
--- a/docs/examples/c/stmt_example.c
+++ b/docs/examples/c/stmt_example.c
@@ -58,7 +58,7 @@ void insertData(TAOS *taos) {
   int code = taos_stmt_prepare(stmt, sql, 0);
   checkErrorCode(stmt, code, "failed to execute taos_stmt_prepare");
   // bind table name and tags
-  TAOS_BIND tags[2];
+  TAOS_MULTI_BIND tags[2];
   char* location = "California.SanFrancisco";
   int groupId = 2;
   tags[0].buffer_type = TSDB_DATA_TYPE_BINARY;
@@ -82,7 +82,7 @@ void insertData(TAOS *taos) {
     {1648432611749, 12.6, 218, 0.33},
   };
 
-  TAOS_BIND values[4];
+  TAOS_MULTI_BIND values[4];
   values[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
   values[0].buffer_length = sizeof(int64_t);
   values[0].length = &values[0].buffer_length;
@@ -138,4 +138,4 @@ int main() {
 
 
 // output:
-// successfully inserted 2 rows
\ No newline at end of file
+// successfully inserted 2 rows
diff --git a/docs/zh/08-connector/10-cpp.mdx b/docs/zh/08-connector/10-cpp.mdx
index 12bbffa4f9..d23996463a 100644
--- a/docs/zh/08-connector/10-cpp.mdx
+++ b/docs/zh/08-connector/10-cpp.mdx
@@ -396,21 +396,20 @@ TDengine 的异步 API 均采用非阻塞调用模式。应用程序可以用多
 
   解析一条 SQL 语句，将解析结果和参数信息绑定到 stmt 上，如果参数 length 大于 0，将使用此参数作为 SQL 语句的长度，如等于 0，将自动判断 SQL 语句的长度。
 
-- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_BIND *bind)`
+- `int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind)`
 
   不如 `taos_stmt_bind_param_batch()` 效率高，但可以支持非 INSERT 类型的 SQL 语句。
-  进行参数绑定，bind 指向一个数组（代表所要绑定的一行数据），需保证此数组中的元素数量和顺序与 SQL 语句中的参数完全一致。TAOS_BIND 的使用方法与 MySQL 中的 MYSQL_BIND 类似，具体定义如下：
+  进行参数绑定，bind 指向一个数组（代表所要绑定的一行数据），需保证此数组中的元素数量和顺序与 SQL 语句中的参数完全一致。TAOS_MULTI_BIND 的使用方法与 MySQL 中的 MYSQL_BIND 类似，具体定义如下：
 
   ```c
-  typedef struct TAOS_BIND {
+  typedef struct TAOS_MULTI_BIND {
     int            buffer_type;
-    void *         buffer;
-    uintptr_t      buffer_length;  // not in use
-    uintptr_t *    length;
-    int *          is_null;
-    int            is_unsigned;    // not in use
-    int *          error;          // not in use
-  } TAOS_BIND;
+    void          *buffer;
+    uintptr_t      buffer_length;
+    uint32_t      *length;
+    char          *is_null;
+    int            num;             // the number of columns
+  } TAOS_MULTI_BIND;
   ```
 
 - `int taos_stmt_set_tbname(TAOS_STMT* stmt, const char* name)`
@@ -418,7 +417,7 @@ TDengine 的异步 API 均采用非阻塞调用模式。应用程序可以用多
   （2.1.1.0 版本新增，仅支持用于替换 INSERT 语句中的参数值）
   当 SQL 语句中的表名使用了 `?` 占位时，可以使用此函数绑定一个具体的表名。
 
-- `int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags)`
+- `int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_MULTI_BIND* tags)`
 
   （2.1.2.0 版本新增，仅支持用于替换 INSERT 语句中的参数值）
   当 SQL 语句中的表名和 TAGS 都使用了 `?` 占位时，可以使用此函数绑定具体的表名和具体的 TAGS 取值。最典型的使用场景是使用了自动建表功能的 INSERT 语句（目前版本不支持指定具体的 TAGS 列）。TAGS 参数中的列数量需要与 SQL 语句中要求的 TAGS 数量完全一致。
@@ -428,17 +427,6 @@ TDengine 的异步 API 均采用非阻塞调用模式。应用程序可以用多
   （2.1.1.0 版本新增，仅支持用于替换 INSERT 语句中的参数值）
   以多列的方式传递待绑定的数据，需要保证这里传递的数据列的顺序、列的数量与 SQL 语句中的 VALUES 参数完全一致。TAOS_MULTI_BIND 的具体定义如下：
 
-  ```c
-  typedef struct TAOS_MULTI_BIND {
-    int          buffer_type;
-    void *       buffer;
-    uintptr_t    buffer_length;
-    uintptr_t *  length;
-    char *       is_null;
-    int          num;             // the number of columns
-  } TAOS_MULTI_BIND;
-  ```
-
 - `int taos_stmt_add_batch(TAOS_STMT *stmt)`
 
   将当前绑定的参数加入批处理中，调用此函数后，可以再次调用 `taos_stmt_bind_param()` 或 `taos_stmt_bind_param_batch()` 绑定新的参数。需要注意，此函数仅支持 INSERT/IMPORT 语句，如果是 SELECT 等其他 SQL 语句，将返回错误。

From 7856dce03f6aea8b9a620fc0436ad0b4721a776b Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Mon, 21 Aug 2023 00:05:49 +0800
Subject: [PATCH 07/48] docs: taos api description

---
 docs/en/14-reference/03-connector/03-cpp.mdx | 22 ++++++++++++++++++++
 docs/zh/08-connector/10-cpp.mdx              | 16 +++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/docs/en/14-reference/03-connector/03-cpp.mdx b/docs/en/14-reference/03-connector/03-cpp.mdx
index 3e1a0f9545..97048178e2 100644
--- a/docs/en/14-reference/03-connector/03-cpp.mdx
+++ b/docs/en/14-reference/03-connector/03-cpp.mdx
@@ -168,6 +168,12 @@ The base API is used to do things like create database connections and provide a
 
   :::
 
+- `TAOS *taos_connect_auth(const char *host, const char *user, const char *auth, const char *db, uint16_t port)`  
+
+  The function is the same as taos_connect. Except that the pass parameter is replaced by auth, other parameters are the same as taos_connect.
+  
+  - auth: the 32-bit lowercase md5 of the raw password
+
 - `char *taos_get_server_info(TAOS *taos)`
 
   Get server-side version information.
@@ -184,6 +190,14 @@ The base API is used to do things like create database connections and provide a
   - If len is less than the space required to store the db (including the last '\0'), an error is returned. The truncated data assigned in the database ends with '\0'.
   - If len is greater than or equal to the space required to store the db (including the last '\0'), return normal 0, and assign the db name ending with '\0' in the database.
 
+- `int taos_set_notify_cb(TAOS *taos, __taos_notify_fn_t fp, void *param, int type)`
+
+   Set the event callback function.
+
+  - fp: event callback function pointer. Declaration：typedef void (*__taos_notify_fn_t)(void *param, void *ext, int type)；Param is a user-defined parameter, ext is an extended parameter (depending on the event type, and returns the user password version for TAOS_NOTIFY_PASSVER), and type is the event type
+  - param: user-defined parameter
+  - type: event type. Value range: 1) TAOS_NOTIFY_PASSVER: User password changed
+
 - `void taos_close(TAOS *taos)`
 
   Closes the connection, where `taos` is the handle returned by `taos_connect()`.
@@ -358,6 +372,14 @@ The specific functions related to the interface are as follows (see also the [pr
 
   Execute the prepared statement. Currently, a statement can only be executed once.
 
+- `int taos_stmt_affected_rows(TAOS_STMT *stmt)`
+ 
+  Gets the number of rows affected by executing bind statements multiple times.
+
+- `int taos_stmt_affected_rows_once(TAOS_STMT *stmt)`
+
+  Gets the number of rows affected by executing a bind statement once.
+
 - `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
 
   Gets the result set of a statement. Use the result set in the same way as in the non-parametric call. When finished, `taos_free_result()` should be called on this result set to free resources.
diff --git a/docs/zh/08-connector/10-cpp.mdx b/docs/zh/08-connector/10-cpp.mdx
index cec1e685ab..89cf54733a 100644
--- a/docs/zh/08-connector/10-cpp.mdx
+++ b/docs/zh/08-connector/10-cpp.mdx
@@ -258,9 +258,9 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
 
 - `TAOS *taos_connect_auth(const char *host, const char *user, const char *auth, const char *db, uint16_t port)`  
 
-  功能同 taos_connect。除 pass 参数替换为 auth 外，其他参数同 taos_connect
+  功能同 taos_connect。除 pass 参数替换为 auth 外，其他参数同 taos_connect。
   
-  - auth: 密码取 32 位小写 md5. e.g. 默认密码 taosdata 取 md5 为 dcc5bed04851fec854c035b2e40263b6 
+  - auth: 原始密码取 32 位小写 md5
 
 - `char *taos_get_server_info(TAOS *taos)`
 
@@ -280,11 +280,11 @@ int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields)
 
 - `int taos_set_notify_cb(TAOS *taos, __taos_notify_fn_t fp, void *param, int type)`
 
-   设置事件通知回调函数。
+   设置事件回调函数。
 
-  - fp 事件通知回调函数指针。函数声明：typedef void (*__taos_notify_fn_t)(void *param, void *ext, int type)；其中， param 为用户自定义参数，ext 为扩展参数(依赖事件通知类型，针对TAOS_NOTIFY_PASSVER 返回用户密码版本)，type 为事件通知类型。
-  - param 用户自定义参数。
-  - type 事件通知类型。取值：1）TAOS_NOTIFY_PASSVER： 用户密码改变。
+  - fp 事件回调函数指针。函数声明：typedef void (*__taos_notify_fn_t)(void *param, void *ext, int type)；其中， param 为用户自定义参数，ext 为扩展参数(依赖事件类型，针对 TAOS_NOTIFY_PASSVER 返回用户密码版本)，type 为事件类型
+  - param 用户自定义参数
+  - type 事件类型。取值范围：1）TAOS_NOTIFY_PASSVER： 用户密码改变
 
 - `void taos_close(TAOS *taos)`
 
@@ -463,11 +463,11 @@ TDengine 的异步 API 均采用非阻塞调用模式。应用程序可以用多
 
 - `int taos_stmt_affected_rows(TAOS_STMT *stmt)`
  
-  获取被所执行的 SQL 语句影响的行数。
+  获取执行多次绑定语句影响的行数。
 
 - `int taos_stmt_affected_rows_once(TAOS_STMT *stmt)`
 
-  获取被所执行的 SQL 语句影响的行数。
+  获取执行一次绑定语句影响的行数。
 
 - `TAOS_RES* taos_stmt_use_result(TAOS_STMT *stmt)`
 

From aec02a55be7a5c73c6c06f59a055cf85e17257c2 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Fri, 18 Aug 2023 17:16:02 +0800
Subject: [PATCH 08/48] fix: fill last group data between groups

---
 source/libs/executor/src/filloperator.c      |  13 ++
 tests/parallel_test/cases.task               |   1 +
 tests/system-test/2-query/fill_with_group.py | 144 +++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 tests/system-test/2-query/fill_with_group.py

diff --git a/source/libs/executor/src/filloperator.c b/source/libs/executor/src/filloperator.c
index 80c88a803e..be4cb8d2dc 100644
--- a/source/libs/executor/src/filloperator.c
+++ b/source/libs/executor/src/filloperator.c
@@ -64,6 +64,7 @@ typedef struct SFillOperatorInfo {
 static void revisedFillStartKey(SFillOperatorInfo* pInfo, SSDataBlock* pBlock, int32_t order);
 static void destroyFillOperatorInfo(void* param);
 static void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int32_t order, int32_t scanFlag);
+static void fillResetPrevForNewGroup(SFillInfo* pFillInfo);
 
 static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo* pOperator, SFillOperatorInfo* pInfo,
                                                SResultInfo* pResultInfo, int32_t order) {
@@ -84,6 +85,9 @@ static void doHandleRemainBlockForNewGroupImpl(SOperatorInfo* pOperator, SFillOp
   taosFillSetStartInfo(pInfo->pFillInfo, pInfo->pRes->info.rows, ts);
 
   taosFillSetInputDataBlock(pInfo->pFillInfo, pInfo->pRes);
+  if (pInfo->pFillInfo->type == TSDB_FILL_PREV || pInfo->pFillInfo->type == TSDB_FILL_LINEAR) {
+    fillResetPrevForNewGroup(pInfo->pFillInfo);
+  }
 
   int32_t numOfResultRows = pResultInfo->capacity - pResBlock->info.rows;
   taosFillResultDataBlock(pInfo->pFillInfo, pResBlock, numOfResultRows);
@@ -122,6 +126,15 @@ void doApplyScalarCalculation(SOperatorInfo* pOperator, SSDataBlock* pBlock, int
   pInfo->pRes->info.id.groupId = pBlock->info.id.groupId;
 }
 
+static void fillResetPrevForNewGroup(SFillInfo* pFillInfo) {
+  for (int32_t colIdx = 0; colIdx < pFillInfo->numOfCols; ++colIdx) {
+    if (!pFillInfo->pFillCol[colIdx].notFillCol) {
+      SGroupKeys* key = taosArrayGet(pFillInfo->prev.pRowVal, colIdx);
+      key->isNull = true;
+    }
+  }
+}
+
 // todo refactor: decide the start key according to the query time range.
 static void revisedFillStartKey(SFillOperatorInfo* pInfo, SSDataBlock* pBlock, int32_t order) {
   if (order == TSDB_ORDER_ASC) {
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index fc08ff1b32..c3d87315f5 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -760,6 +760,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/blockSMA.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/projectionDesc.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/odbc.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/fill_with_group.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-21561.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-20582.py
 ,,n,system-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/insertMix.py -N 3
diff --git a/tests/system-test/2-query/fill_with_group.py b/tests/system-test/2-query/fill_with_group.py
new file mode 100644
index 0000000000..c1ea9877a2
--- /dev/null
+++ b/tests/system-test/2-query/fill_with_group.py
@@ -0,0 +1,144 @@
+import taos
+import sys
+import time
+import socket
+import os
+import threading
+import math
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+from util.common import *
+# from tmqCommon import *
+
+class TDTestCase:
+    def __init__(self):
+        self.vgroups    = 4
+        self.ctbNum     = 10
+        self.rowsPerTbl = 10000
+        self.duraion = '1h'
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), False)
+
+    def create_database(self,tsql, dbName,dropFlag=1,vgroups=2,replica=1, duration:str='1d'):
+        if dropFlag == 1:
+            tsql.execute("drop database if exists %s"%(dbName))
+
+        tsql.execute("create database if not exists %s vgroups %d replica %d duration %s"%(dbName, vgroups, replica, duration))
+        tdLog.debug("complete to create database %s"%(dbName))
+        return
+
+    def create_stable(self,tsql, paraDict):
+        colString = tdCom.gen_column_type_str(colname_prefix=paraDict["colPrefix"], column_elm_list=paraDict["colSchema"])
+        tagString = tdCom.gen_tag_type_str(tagname_prefix=paraDict["tagPrefix"], tag_elm_list=paraDict["tagSchema"])
+        sqlString = f"create table if not exists %s.%s (%s) tags (%s)"%(paraDict["dbName"], paraDict["stbName"], colString, tagString)
+        tdLog.debug("%s"%(sqlString))
+        tsql.execute(sqlString)
+        return
+
+    def create_ctable(self,tsql=None, dbName='dbx',stbName='stb',ctbPrefix='ctb',ctbNum=1,ctbStartIdx=0):
+        for i in range(ctbNum):
+            sqlString = "create table %s.%s%d using %s.%s tags(%d, 'tb%d', 'tb%d', %d, %d, %d)" % \
+                    (dbName,ctbPrefix,i+ctbStartIdx,dbName,stbName,(i+ctbStartIdx) % 5,i+ctbStartIdx,i+ctbStartIdx,i+ctbStartIdx,i+ctbStartIdx,i+ctbStartIdx)
+            tsql.execute(sqlString)
+
+        tdLog.debug("complete to create %d child tables by %s.%s" %(ctbNum, dbName, stbName))
+        return
+
+    def insert_data(self,tsql,dbName,ctbPrefix,ctbNum,rowsPerTbl,batchNum,startTs,tsStep):
+        tdLog.debug("start to insert data ............")
+        tsql.execute("use %s" %dbName)
+        pre_insert = "insert into "
+        sql = pre_insert
+
+        for i in range(ctbNum):
+            rowsBatched = 0
+            sql += " %s%d values "%(ctbPrefix,i)
+            for j in range(rowsPerTbl):
+                if (i < ctbNum/2):
+                    sql += "(%d, %d, %d, %d,%d,%d,%d,true,'binary%d', 'nchar%d') "%(startTs + j*tsStep, j%10, j%10, j%10, j%10, j%10, j%10, j%10, j%10)
+                else:
+                    sql += "(%d, %d, NULL, %d,NULL,%d,%d,true,'binary%d', 'nchar%d') "%(startTs + j*tsStep, j%10, j%10, j%10, j%10, j%10, j%10)
+                rowsBatched += 1
+                if ((rowsBatched == batchNum) or (j == rowsPerTbl - 1)):
+                    tsql.execute(sql)
+                    rowsBatched = 0
+                    if j < rowsPerTbl - 1:
+                        sql = "insert into %s%d values " %(ctbPrefix,i)
+                    else:
+                        sql = "insert into "
+        if sql != pre_insert:
+            tsql.execute(sql)
+        tdLog.debug("insert data ............ [OK]")
+        return
+
+    def prepareTestEnv(self):
+        tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
+        paraDict = {'dbName':     'test',
+                    'dropFlag':   1,
+                    'vgroups':    2,
+                    'stbName':    'meters',
+                    'colPrefix':  'c',
+                    'tagPrefix':  't',
+                    'colSchema':   [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'FLOAT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'smallint', 'count':1},{'type': 'tinyint', 'count':1},{'type': 'bool', 'count':1},{'type': 'binary', 'len':10, 'count':1},{'type': 'nchar', 'len':10, 'count':1}],
+                    'tagSchema':   [{'type': 'INT', 'count':1},{'type': 'nchar', 'len':20, 'count':1},{'type': 'binary', 'len':20, 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'smallint', 'count':1},{'type': 'DOUBLE', 'count':1}],
+                    'ctbPrefix':  't',
+                    'ctbStartIdx': 0,
+                    'ctbNum':     100,
+                    'rowsPerTbl': 10000,
+                    'batchNum':   3000,
+                    'startTs':    1537146000000,
+                    'tsStep':     600000}
+
+        paraDict['vgroups'] = self.vgroups
+        paraDict['ctbNum'] = self.ctbNum
+        paraDict['rowsPerTbl'] = self.rowsPerTbl
+
+        tdLog.info("create database")
+        self.create_database(tsql=tdSql, dbName=paraDict["dbName"], dropFlag=paraDict["dropFlag"], vgroups=paraDict["vgroups"], replica=self.replicaVar, duration=self.duraion)
+
+        tdLog.info("create stb")
+        self.create_stable(tsql=tdSql, paraDict=paraDict)
+
+        tdLog.info("create child tables")
+        self.create_ctable(tsql=tdSql, dbName=paraDict["dbName"], \
+                stbName=paraDict["stbName"],ctbPrefix=paraDict["ctbPrefix"],\
+                ctbNum=paraDict["ctbNum"],ctbStartIdx=paraDict["ctbStartIdx"])
+        self.insert_data(tsql=tdSql, dbName=paraDict["dbName"],\
+                ctbPrefix=paraDict["ctbPrefix"],ctbNum=paraDict["ctbNum"],\
+                rowsPerTbl=paraDict["rowsPerTbl"],batchNum=paraDict["batchNum"],\
+                startTs=paraDict["startTs"],tsStep=paraDict["tsStep"])
+        return
+
+    def test_partition_by_with_interval_fill_prev_new_group_fill_error(self):
+        ## every table has 1500 rows after fill, 10 tables, total 15000 rows.
+        ## there is no data from 9-17 08:00:00 ~ 9-17 09:00:00, so first 60 rows of every group will be NULL, cause no prev value.
+        sql = "select _wstart, count(*),tbname from meters where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-18 09:00:00.000' partition by tbname interval(1m) fill(PREV) order by tbname, _wstart"
+        tdSql.query(sql)
+        for i in range(0,10):
+            for j in range(0,60):
+                tdSql.checkData(i*1500+j, 1, None)
+
+        sql = "select _wstart, count(*),tbname from meters where ts > '2018-09-17 08:00:00.000' and ts < '2018-09-18 09:00:00.000' partition by tbname interval(1m) fill(LINEAR) order by tbname, _wstart"
+        tdSql.query(sql)
+        for i in range(0,10):
+            for j in range(0,60):
+                tdSql.checkData(i*1500+j, 1, None)
+
+    def run(self):
+        self.prepareTestEnv()
+        self.test_partition_by_with_interval_fill_prev_new_group_fill_error()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+event = threading.Event()
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())

From 124b1e7f9ed577b16513ffffd18185b49248d643 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Mon, 21 Aug 2023 14:31:38 +0800
Subject: [PATCH 09/48] docs: add current_user() in function (#22496)

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

diff --git a/docs/en/12-taos-sql/06-select.md b/docs/en/12-taos-sql/06-select.md
index 661b4f5dea..5902dcb1df 100755
--- a/docs/en/12-taos-sql/06-select.md
+++ b/docs/en/12-taos-sql/06-select.md
@@ -7,7 +7,7 @@ description: This document describes how to query data in TDengine.
 ## Syntax
 
 ```sql
-SELECT {DATABASE() | CLIENT_VERSION() | SERVER_VERSION() | SERVER_STATUS() | NOW() | TODAY() | TIMEZONE()}
+SELECT {DATABASE() | CLIENT_VERSION() | SERVER_VERSION() | SERVER_STATUS() | NOW() | TODAY() | TIMEZONE() | CURRENT_USER() | USER() }
 
 SELECT [DISTINCT] select_list
     from_clause
@@ -300,6 +300,12 @@ SELECT TODAY();
 SELECT TIMEZONE();
 ```
 
+### Obtain Current User
+
+```sql
+SELECT CURRENT_USER();
+```
+
 ## Regular Expression
 
 ### Syntax
diff --git a/docs/en/12-taos-sql/10-function.md b/docs/en/12-taos-sql/10-function.md
index ad6d5d77fb..3e25d2d4ec 100644
--- a/docs/en/12-taos-sql/10-function.md
+++ b/docs/en/12-taos-sql/10-function.md
@@ -1275,6 +1275,14 @@ SELECT SERVER_STATUS();
 
 **Description**: The server status.
 
+### CURRENT_USER
+
+```sql
+SELECT CURRENT_USER();
+```
+
+**Description**: get current user.
+
 
 ## Geometry Functions
 
diff --git a/docs/zh/12-taos-sql/06-select.md b/docs/zh/12-taos-sql/06-select.md
index 80966cf386..8e122da894 100755
--- a/docs/zh/12-taos-sql/06-select.md
+++ b/docs/zh/12-taos-sql/06-select.md
@@ -7,7 +7,7 @@ description: 查询数据的详细语法
 ## 查询语法
 
 ```sql
-SELECT {DATABASE() | CLIENT_VERSION() | SERVER_VERSION() | SERVER_STATUS() | NOW() | TODAY() | TIMEZONE()}
+SELECT {DATABASE() | CLIENT_VERSION() | SERVER_VERSION() | SERVER_STATUS() | NOW() | TODAY() | TIMEZONE() | CURRENT_USER() | USER() }
 
 SELECT [DISTINCT] select_list
     from_clause
@@ -300,6 +300,12 @@ SELECT TODAY();
 SELECT TIMEZONE();
 ```
 
+### 获取当前用户
+
+```sql
+SELECT CURRENT_USER();
+```
+
 ## 正则表达式过滤
 
 ### 语法
diff --git a/docs/zh/12-taos-sql/10-function.md b/docs/zh/12-taos-sql/10-function.md
index 773ea67989..f0ad0c62a5 100644
--- a/docs/zh/12-taos-sql/10-function.md
+++ b/docs/zh/12-taos-sql/10-function.md
@@ -1266,6 +1266,14 @@ SELECT SERVER_STATUS();
 
 **说明**：检测服务端是否所有 dnode 都在线，如果是则返回成功，否则返回无法建立连接的错误。
 
+### CURRENT_USER
+
+```sql
+SELECT CURRENT_USER();
+```
+
+**说明**：获取当前用户。
+
 
 ## Geometry 函数
 

From 1d17270bb48438c6318155f712117b9575d24659 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Mon, 21 Aug 2023 16:44:45 +0800
Subject: [PATCH 10/48] update installation instruction

---
 packaging/tools/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index f9a11f5540..252a634a19 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -935,7 +935,7 @@ function updateProduct() {
     fi
     echo
     echo -e "\033[44;32;1m${productName2} is updated successfully!${NC}"
-    echo -e "\033[44;32;1mTo manage ${productName2} instance, view documentation and explorer features, you need to install ${clientName2}Explorer ${NC}"
+    echo -e "\033[44;32;1mTo manage ${productName2} instance, view documentation or explorer features, please install ${clientName2}Explorer ${NC}"
   else
     install_bin
     install_config
@@ -1028,7 +1028,7 @@ function installProduct() {
     fi
 
     echo -e "\033[44;32;1m${productName2} is installed successfully!${NC}"
-    echo -e "\033[44;32;1mTo manage ${productName2} instance, view documentation and explorer features, you need to install ${clientName2}Explorer ${NC}"
+    echo -e "\033[44;32;1mTo manage ${productName2} instance, view documentation or explorer features, please install ${clientName2}Explorer ${NC}"
     echo
   else # Only install client
     install_bin

From f4ef83b8527d67b5487ce19c6850f534faded743 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Mon, 21 Aug 2023 17:21:18 +0800
Subject: [PATCH 11/48] release 3.1.0.2

---
 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 d5ada35dc3..ee02ef8c07 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.1.0.2.alpha")
+  SET(TD_VER_NUMBER "3.1.0.3.alpha")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)
diff --git a/docs/en/28-releases/01-tdengine.md b/docs/en/28-releases/01-tdengine.md
index 31484dc1c5..ff6a36440f 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://t
 
 import Release from "/components/ReleaseV3";
 
+## 3.1.0.2
+
+<Release type="tdengine" version="3.1.0.2" />
+
 ## 3.1.0.0
 
 :::note IMPORTANT
diff --git a/docs/zh/28-releases/01-tdengine.md b/docs/zh/28-releases/01-tdengine.md
index afdf2a76d3..d316b3ab68 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.1.0.2
+
+<Release type="tdengine" version="3.1.0.2" />
+
 ## 3.1.0.0
 
 <Release type="tdengine" version="3.1.0.0" />

From ac6d031e62fcda4eff8a305e5dddf69b30ac1fc7 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Mon, 21 Aug 2023 17:56:35 +0800
Subject: [PATCH 12/48] fix:do not send unsubscribe msg to taosd if subscribe
 failed

---
 source/client/src/clientTmq.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index b4168046f4..e861bd4b92 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -985,6 +985,10 @@ int32_t tmq_subscription(tmq_t* tmq, tmq_list_t** topics) {
 
 int32_t tmq_unsubscribe(tmq_t* tmq) {
   if(tmq == NULL) return TSDB_CODE_INVALID_PARA;
+  if (tmq->status != TMQ_CONSUMER_STATUS__READY) {
+    tscInfo("consumer:0x%" PRIx64 " not in ready state, unsubscribe it directly", tmq->consumerId);
+    return 0;
+  }
   if (tmq->autoCommit) {
     int32_t rsp = tmq_commit_sync(tmq, NULL);
     if (rsp != 0) {

From c8a88fb70b1efff9b2f6bf4ee6b2cd00a1759b3e Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Mon, 21 Aug 2023 18:48:50 +0800
Subject: [PATCH 13/48] remove community package testing from ubuntu 16

---
 packaging/MPtestJenkinsfile | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/packaging/MPtestJenkinsfile b/packaging/MPtestJenkinsfile
index 0570bae191..1b2e555b88 100644
--- a/packaging/MPtestJenkinsfile
+++ b/packaging/MPtestJenkinsfile
@@ -114,7 +114,7 @@ pipeline {
                             sync_source("${BRANCH_NAME}")
                             sh '''
                             if [ "${verMode}" = "all" ];then
-                                verMode="community enterprise"
+                                verMode="enterprise"
                             fi
                             verModeList=${verMode}                          
                             for verModeSin in ${verModeList}
@@ -123,18 +123,6 @@ pipeline {
                                 bash testpackage.sh  -m ${verModeSin} -f server  -l false -c x64  -v ${version} -o ${baseVersion} -s ${sourcePath}  -t tar 
                                 python3 checkPackageRuning.py
                             done 
-                            '''  
-
-                            sh '''                              
-                            cd ${TDENGINE_ROOT_DIR}/packaging
-                            bash testpackage.sh  -m community -f server  -l true -c x64  -v ${version} -o ${baseVersion} -s ${sourcePath}  -t tar 
-                            python3 checkPackageRuning.py
-                            '''   
-
-                            sh ''' 
-                            cd ${TDENGINE_ROOT_DIR}/packaging
-                            bash testpackage.sh  -m community -f server  -l false -c x64  -v ${version} -o ${baseVersion} -s ${sourcePath}  -t deb 
-                            python3 checkPackageRuning.py
                             '''
                         }
                     }

From 2054640d9ee13550c688a9c98d65a923f78f5007 Mon Sep 17 00:00:00 2001
From: wade zhang <95411902+gccgdb1234@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:55:35 +0800
Subject: [PATCH 14/48] Update 24-show.md

---
 docs/zh/12-taos-sql/24-show.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/zh/12-taos-sql/24-show.md b/docs/zh/12-taos-sql/24-show.md
index 6e102e2356..b7ca9493d4 100644
--- a/docs/zh/12-taos-sql/24-show.md
+++ b/docs/zh/12-taos-sql/24-show.md
@@ -22,6 +22,14 @@ SHOW CLUSTER;
 
 显示当前集群的信息
 
+## SHOW CLUSTER ALIVE
+
+```sql
+SHOW CLUSTER ALIVE;
+```
+
+查询当前集群的状态是否可用，返回值： 0：不可用 1：完全可用 2：部分可用（集群中部分节点下线，但其它节点仍可以正常使用）
+
 ## SHOW CONNECTIONS
 
 ```sql

From b5bd8f7c2353047ade7dc001457e40a644106781 Mon Sep 17 00:00:00 2001
From: wade zhang <95411902+gccgdb1234@users.noreply.github.com>
Date: Tue, 22 Aug 2023 13:57:14 +0800
Subject: [PATCH 15/48] Update 24-show.md

---
 docs/en/12-taos-sql/24-show.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/en/12-taos-sql/24-show.md b/docs/en/12-taos-sql/24-show.md
index b663fbd435..7a58343f24 100644
--- a/docs/en/12-taos-sql/24-show.md
+++ b/docs/en/12-taos-sql/24-show.md
@@ -22,6 +22,14 @@ SHOW CLUSTER;
 
 Shows information about the current cluster.
 
+## SHOW CLUSTER ALIVE
+
+```sql
+SHOW CLUSTER ALIVE;
+```
+
+It is used to check whether the cluster is available or not. Return value: 0 means unavailable, 1 means available, 2 means partially available (some dnodes are offline, the other dnodes are available)
+
 ## SHOW CONNECTIONS
 
 ```sql

From 56626f2e764a091c0839d420939982cfb74994d4 Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Thu, 27 Jul 2023 16:52:08 +0800
Subject: [PATCH 16/48] feat(driver): add committed assignment API for jdbc

---
 .../jni/com_taosdata_jdbc_tmq_TMQConnector.h  |  15 +++
 source/client/src/clientTmqConnector.c        | 108 +++++++++++++++++-
 2 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/source/client/jni/com_taosdata_jdbc_tmq_TMQConnector.h b/source/client/jni/com_taosdata_jdbc_tmq_TMQConnector.h
index 422bcd57ac..ebc4eacdf9 100644
--- a/source/client/jni/com_taosdata_jdbc_tmq_TMQConnector.h
+++ b/source/client/jni/com_taosdata_jdbc_tmq_TMQConnector.h
@@ -92,6 +92,10 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqSubscriptionIm
  */
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitSync(JNIEnv *, jobject, jlong, jlong);
 
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitAllSync(JNIEnv *, jobject, jlong);
+
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitOffsetSyncImp(JNIEnv *, jobject, jlong, jstring,
+                                                                                      jint, jlong);
 /*
  * Class:     com_taosdata_jdbc_tmq_TMQConnector
  * Method:    tmqCommitAsync
@@ -102,6 +106,12 @@ JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitAsync(JN
 JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_consumerCommitAsync(JNIEnv *, jobject, jlong, jlong,
                                                                                    jobject);
 
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_consumerCommitAllAsync(JNIEnv *, jobject, jlong,
+                                                                                      jobject);
+
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_consumerCommitOffsetAsync(JNIEnv *, jobject, jlong,
+                                                                                         jstring, jint, jlong, jobject);
+
 /*
  * Class:     com_taosdata_jdbc_tmq_TMQConnector
  * Method:    tmqUnsubscribeImp
@@ -179,6 +189,11 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqSeekImp(JNIEnv
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqGetTopicAssignmentImp(JNIEnv *, jobject, jlong,
                                                                                         jstring, jobject);
 
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommittedImp(JNIEnv *, jobject, jlong, jstring,
+                                                                                jint);
+
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqPositionImp(JNIEnv *, jobject, jlong, jstring, jint);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/client/src/clientTmqConnector.c b/source/client/src/clientTmqConnector.c
index 6ec82aa6ef..487a86a589 100644
--- a/source/client/src/clientTmqConnector.c
+++ b/source/client/src/clientTmqConnector.c
@@ -291,6 +291,39 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitSync(JNI
   TAOS_RES *res = (TAOS_RES *)jres;
   return tmq_commit_sync(tmq, res);
 }
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitAllSync(JNIEnv *env, jobject jobj, jlong jtmq) {
+  tmq_t *tmq = (tmq_t *)jtmq;
+  if (tmq == NULL) {
+    jniError("jobj:%p, tmq is closed", jobj);
+    return TMQ_CONSUMER_NULL;
+  }
+
+  return tmq_commit_sync(tmq, NULL);
+}
+
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitOffsetSyncImp(JNIEnv *env, jobject jobj,
+                                                                                      jlong jtmq, jstring jtopic,
+                                                                                      jint vgId, jlong offset) {
+  tmq_t *tmq = (tmq_t *)jtmq;
+  if (tmq == NULL) {
+    jniDebug("jobj:%p, tmq is closed", jobj);
+    return TMQ_CONSUMER_NULL;
+  }
+
+  if (jtopic == NULL) {
+    jniDebug("jobj:%p, topic is null", jobj);
+    return TMQ_TOPIC_NULL;
+  }
+  const char *topicName = (*env)->GetStringUTFChars(env, jtopic, NULL);
+
+  int code = tmq_commit_offset_sync(tmq, topicName, vgId, offset);
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, tmq commit offset error, code:%d, msg:%s", jobj, code, tmq_err2str(code));
+  }
+
+  (*env)->ReleaseStringUTFChars(env, jtopic, topicName);
+  return code;
+}
 
 // deprecated
 JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommitAsync(JNIEnv *env, jobject jobj, jlong jtmq,
@@ -319,6 +352,27 @@ JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_consumerCommitAsy
   tmq_commit_async(tmq, res, consumer_callback, offset);
 }
 
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_consumerCommitAllAsync(JNIEnv *env, jobject jobj,
+                                                                                      jlong jtmq, jobject offset) {
+  tmqGlobalMethod(env);
+  tmq_t *tmq = (tmq_t *)jtmq;
+
+  offset = (*env)->NewGlobalRef(env, offset);
+  tmq_commit_async(tmq, NULL, consumer_callback, offset);
+}
+
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_consumerCommitOffsetAsync(JNIEnv *env, jobject jobj,
+                                                                                         jlong jtmq, jstring jtopic,
+                                                                                         jint vgId, jlong offset,
+                                                                                         jobject callback) {
+  tmqGlobalMethod(env);
+  tmq_t      *tmq = (tmq_t *)jtmq;
+  const char *topicName = (*env)->GetStringUTFChars(env, jtopic, NULL);
+
+  callback = (*env)->NewGlobalRef(env, callback);
+  tmq_commit_offset_async(tmq, topicName, vgId, offset, consumer_callback, callback);
+}
+
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqUnsubscribeImp(JNIEnv *env, jobject jobj,
                                                                                  jlong jtmq) {
   tmq_t *tmq = (tmq_t *)jtmq;
@@ -497,9 +551,9 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqGetTopicAssign
   int32_t               res = tmq_get_topic_assignment(tmq, topicName, &pAssign, &numOfAssignment);
 
   if (res != TSDB_CODE_SUCCESS) {
-    (*env)->ReleaseStringUTFChars(env, jtopic, topicName);
     jniError("jobj:%p, tmq get topic assignment error, topic:%s, code:%d, msg:%s", jobj, topicName, res,
              tmq_err2str(res));
+    (*env)->ReleaseStringUTFChars(env, jtopic, topicName);
     tmq_free_assignment(pAssign);
     return (jint)res;
   }
@@ -518,3 +572,55 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqGetTopicAssign
   tmq_free_assignment(pAssign);
   return JNI_SUCCESS;
 }
+
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommittedImp(JNIEnv *env, jobject jobj, jlong jtmq,
+                                                                                jstring jtopic, jint vgId) {
+  tmq_t *tmq = (tmq_t *)jtmq;
+  if (tmq == NULL) {
+    jniDebug("jobj:%p, tmq is closed", jobj);
+    return TMQ_CONSUMER_NULL;
+  }
+
+  if (jtopic == NULL) {
+    jniDebug("jobj:%p, topic is null", jobj);
+    return TMQ_TOPIC_NULL;
+  }
+
+  const char *topicName = (*env)->GetStringUTFChars(env, jtopic, NULL);
+
+  int64_t offset = tmq_committed(tmq, topicName, vgId);
+
+  if (offset < JNI_SUCCESS) {
+    jniError("jobj:%p, tmq get committed offset error, topic:%s, vgId:%d, code:0x%" PRIx64 ", msg:%s", jobj, topicName,
+             vgId, offset, tmq_err2str(offset));
+  }
+
+  (*env)->ReleaseStringUTFChars(env, jtopic, topicName);
+  return (jlong)offset;
+}
+
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqPositionImp(JNIEnv *env, jobject jobj, jlong jtmq,
+                                                                               jstring jtopic, jint vgId) {
+  tmq_t *tmq = (tmq_t *)jtmq;
+  if (tmq == NULL) {
+    jniDebug("jobj:%p, tmq is closed", jobj);
+    return TMQ_CONSUMER_NULL;
+  }
+
+  if (jtopic == NULL) {
+    jniDebug("jobj:%p, topic is null", jobj);
+    return TMQ_TOPIC_NULL;
+  }
+
+  const char *topicName = (*env)->GetStringUTFChars(env, jtopic, NULL);
+
+  int64_t offset = tmq_position(tmq, topicName, vgId);
+
+  if (offset < JNI_SUCCESS) {
+    jniError("jobj:%p, tmq get position error, topic:%s, vgId:%d, code:0x%" PRIx64 ", msg:%s", jobj, topicName, vgId,
+             offset, tmq_err2str(offset));
+  }
+
+  (*env)->ReleaseStringUTFChars(env, jtopic, topicName);
+  return (jlong)offset;
+}
\ No newline at end of file

From fe4e45647ea854cfab9cbc7aabc0054ced5117c0 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 22 Aug 2023 18:29:25 +0800
Subject: [PATCH 17/48] fix: global data sink manager issue

---
 source/libs/executor/src/dataDeleter.c    |  2 ++
 source/libs/executor/src/dataDispatcher.c |  1 +
 source/libs/executor/src/dataInserter.c   |  2 ++
 source/libs/executor/src/dataSinkMgt.c    | 22 ++++++++++++++--------
 source/libs/executor/src/executor.c       |  5 +++--
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/source/libs/executor/src/dataDeleter.c b/source/libs/executor/src/dataDeleter.c
index 11074b0e94..a30dc47029 100644
--- a/source/libs/executor/src/dataDeleter.c
+++ b/source/libs/executor/src/dataDeleter.c
@@ -224,6 +224,8 @@ static int32_t destroyDataSinker(SDataSinkHandle* pHandle) {
   }
   taosCloseQueue(pDeleter->pDataBlocks);
   taosThreadMutexDestroy(&pDeleter->mutex);
+  
+  taosMemoryFree(pDeleter->pManager);
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/source/libs/executor/src/dataDispatcher.c b/source/libs/executor/src/dataDispatcher.c
index 2a22656d8c..56d0ca523a 100644
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
@@ -226,6 +226,7 @@ static int32_t destroyDataSinker(SDataSinkHandle* pHandle) {
   }
   taosCloseQueue(pDispatcher->pDataBlocks);
   taosThreadMutexDestroy(&pDispatcher->mutex);
+  taosMemoryFree(pDispatcher->pManager);
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/source/libs/executor/src/dataInserter.c b/source/libs/executor/src/dataInserter.c
index 646964ebf4..f20293791b 100644
--- a/source/libs/executor/src/dataInserter.c
+++ b/source/libs/executor/src/dataInserter.c
@@ -395,6 +395,8 @@ static int32_t destroyDataSinker(SDataSinkHandle* pHandle) {
   taosMemoryFree(pInserter->pParam);
   taosHashCleanup(pInserter->pCols);
   taosThreadMutexDestroy(&pInserter->mutex);
+  
+  taosMemoryFree(pInserter->pManager);
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/source/libs/executor/src/dataSinkMgt.c b/source/libs/executor/src/dataSinkMgt.c
index 3a972c1c20..f07d176440 100644
--- a/source/libs/executor/src/dataSinkMgt.c
+++ b/source/libs/executor/src/dataSinkMgt.c
@@ -18,12 +18,17 @@
 #include "planner.h"
 #include "tarray.h"
 
-static SDataSinkManager gDataSinkManager = {0};
 SDataSinkStat           gDataSinkStat = {0};
 
-int32_t dsDataSinkMgtInit(SDataSinkMgtCfg* cfg, SStorageAPI* pAPI) {
-  gDataSinkManager.cfg = *cfg;
-  gDataSinkManager.pAPI = pAPI;
+int32_t dsDataSinkMgtInit(SDataSinkMgtCfg* cfg, SStorageAPI* pAPI, void** ppSinkManager) {
+  SDataSinkManager* pSinkManager = taosMemoryMalloc(sizeof(SDataSinkManager));
+  if (NULL == pSinkManager) {
+    return TSDB_CODE_OUT_OF_MEMORY;
+  }
+  pSinkManager->cfg = *cfg;
+  pSinkManager->pAPI = pAPI;
+
+  *ppSinkManager = pSinkManager;
   return 0;  // to avoid compiler eror
 }
 
@@ -33,15 +38,16 @@ int32_t dsDataSinkGetCacheSize(SDataSinkStat* pStat) {
   return 0;
 }
 
-int32_t dsCreateDataSinker(const SDataSinkNode* pDataSink, DataSinkHandle* pHandle, void* pParam, const char* id) {
+int32_t dsCreateDataSinker(void* pSinkManager, const SDataSinkNode* pDataSink, DataSinkHandle* pHandle, void* pParam, const char* id) {
+  SDataSinkManager* pManager = pSinkManager;
   switch ((int)nodeType(pDataSink)) {
     case QUERY_NODE_PHYSICAL_PLAN_DISPATCH:
-      return createDataDispatcher(&gDataSinkManager, pDataSink, pHandle);
+      return createDataDispatcher(pManager, pDataSink, pHandle);
     case QUERY_NODE_PHYSICAL_PLAN_DELETE: {
-      return createDataDeleter(&gDataSinkManager, pDataSink, pHandle, pParam);
+      return createDataDeleter(pManager, pDataSink, pHandle, pParam);
     }
     case QUERY_NODE_PHYSICAL_PLAN_QUERY_INSERT: {
-      return createDataInserter(&gDataSinkManager, pDataSink, pHandle, pParam);
+      return createDataInserter(pManager, pDataSink, pHandle, pParam);
     }
   }
 
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index a6059c7c42..9f5db5d6ae 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -512,7 +512,8 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
   }
 
   SDataSinkMgtCfg cfg = {.maxDataBlockNum = 500, .maxDataBlockNumPerQuery = 50};
-  code = dsDataSinkMgtInit(&cfg, &(*pTask)->storageAPI);
+  void* pSinkManager = NULL;
+  code = dsDataSinkMgtInit(&cfg, &(*pTask)->storageAPI, &pSinkManager);
   if (code != TSDB_CODE_SUCCESS) {
     qError("failed to dsDataSinkMgtInit, code:%s, %s", tstrerror(code), (*pTask)->id.str);
     goto _error;
@@ -527,7 +528,7 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
     }
 
     // pSinkParam has been freed during create sinker.
-    code = dsCreateDataSinker(pSubplan->pDataSink, handle, pSinkParam, (*pTask)->id.str);
+    code = dsCreateDataSinker(pSinkManager, pSubplan->pDataSink, handle, pSinkParam, (*pTask)->id.str);
   }
 
   qDebug("subplan task create completed, TID:0x%" PRIx64 " QID:0x%" PRIx64, taskId, pSubplan->id.queryId);

From 647b57d2641c98102d12826021bf46e870f9d847 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 22 Aug 2023 18:30:11 +0800
Subject: [PATCH 18/48] fix: assign flags during subscribe

---
 source/client/src/clientRawBlockWrite.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c
index dd311db126..ecc586a7e9 100644
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
@@ -687,14 +687,14 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, int32_t metaLen) {
   pReq.pColumns = taosArrayInit(req.schemaRow.nCols, sizeof(SField));
   for (int32_t i = 0; i < req.schemaRow.nCols; i++) {
     SSchema* pSchema = req.schemaRow.pSchema + i;
-    SField   field = {.type = pSchema->type, .bytes = pSchema->bytes};
+    SField   field = {.type = pSchema->type, .bytes = pSchema->bytes, .flags = pSchema->flags};
     strcpy(field.name, pSchema->name);
     taosArrayPush(pReq.pColumns, &field);
   }
   pReq.pTags = taosArrayInit(req.schemaTag.nCols, sizeof(SField));
   for (int32_t i = 0; i < req.schemaTag.nCols; i++) {
     SSchema* pSchema = req.schemaTag.pSchema + i;
-    SField   field = {.type = pSchema->type, .bytes = pSchema->bytes};
+    SField   field = {.type = pSchema->type, .bytes = pSchema->bytes, .flags = pSchema->flags};
     strcpy(field.name, pSchema->name);
     taosArrayPush(pReq.pTags, &field);
   }

From 46a4dfd92ad16cd755b11ad8bee3fd815230710c Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 22 Aug 2023 18:32:52 +0800
Subject: [PATCH 19/48] fix: assign flags during subscribe

---
 source/client/src/clientRawBlockWrite.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c
index ecc586a7e9..9fb89aad77 100644
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
@@ -687,14 +687,14 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, int32_t metaLen) {
   pReq.pColumns = taosArrayInit(req.schemaRow.nCols, sizeof(SField));
   for (int32_t i = 0; i < req.schemaRow.nCols; i++) {
     SSchema* pSchema = req.schemaRow.pSchema + i;
-    SField   field = {.type = pSchema->type, .bytes = pSchema->bytes, .flags = pSchema->flags};
+    SField   field = {.type = pSchema->type, .flags = pSchema->flags, .bytes = pSchema->bytes};
     strcpy(field.name, pSchema->name);
     taosArrayPush(pReq.pColumns, &field);
   }
   pReq.pTags = taosArrayInit(req.schemaTag.nCols, sizeof(SField));
   for (int32_t i = 0; i < req.schemaTag.nCols; i++) {
     SSchema* pSchema = req.schemaTag.pSchema + i;
-    SField   field = {.type = pSchema->type, .bytes = pSchema->bytes, .flags = pSchema->flags};
+    SField   field = {.type = pSchema->type, .flags = pSchema->flags, .bytes = pSchema->bytes};
     strcpy(field.name, pSchema->name);
     taosArrayPush(pReq.pTags, &field);
   }

From cb70861986d90be238be37ebc0ae37989cf74aa5 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 22 Aug 2023 18:40:42 +0800
Subject: [PATCH 20/48] fix: memory leak issue

---
 include/libs/executor/dataSinkMgt.h       |  4 ++--
 source/libs/executor/src/dataDeleter.c    |  2 ++
 source/libs/executor/src/dataDispatcher.c |  9 +++++++--
 source/libs/executor/src/dataInserter.c   | 24 ++++++++++++++---------
 source/libs/executor/src/dataSinkMgt.c    |  3 +++
 source/libs/executor/src/executor.c       | 17 ++++++++--------
 6 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/include/libs/executor/dataSinkMgt.h b/include/libs/executor/dataSinkMgt.h
index 0a9037d21c..29ba019e47 100644
--- a/include/libs/executor/dataSinkMgt.h
+++ b/include/libs/executor/dataSinkMgt.h
@@ -59,7 +59,7 @@ typedef struct SDataSinkMgtCfg {
   uint32_t maxDataBlockNumPerQuery;
 } SDataSinkMgtCfg;
 
-int32_t dsDataSinkMgtInit(SDataSinkMgtCfg* cfg, SStorageAPI* pAPI);
+int32_t dsDataSinkMgtInit(SDataSinkMgtCfg* cfg, SStorageAPI* pAPI, void** ppSinkManager);
 
 typedef struct SInputData {
   const struct SSDataBlock* pData;
@@ -83,7 +83,7 @@ typedef struct SOutputData {
  * @param pHandle output
  * @return error code
  */
-int32_t dsCreateDataSinker(const SDataSinkNode* pDataSink, DataSinkHandle* pHandle, void* pParam, const char* id);
+int32_t dsCreateDataSinker(void* pSinkManager, const SDataSinkNode* pDataSink, DataSinkHandle* pHandle, void* pParam, const char* id);
 
 int32_t dsDataSinkGetCacheSize(SDataSinkStat* pStat);
 
diff --git a/source/libs/executor/src/dataDeleter.c b/source/libs/executor/src/dataDeleter.c
index a30dc47029..960ae14fcf 100644
--- a/source/libs/executor/src/dataDeleter.c
+++ b/source/libs/executor/src/dataDeleter.c
@@ -281,6 +281,8 @@ _end:
   if (deleter != NULL) {
     destroyDataSinker((SDataSinkHandle*)deleter);
     taosMemoryFree(deleter);
+  } else {
+    taosMemoryFree(pManager);
   }
   return code;
 }
diff --git a/source/libs/executor/src/dataDispatcher.c b/source/libs/executor/src/dataDispatcher.c
index 56d0ca523a..409ae50174 100644
--- a/source/libs/executor/src/dataDispatcher.c
+++ b/source/libs/executor/src/dataDispatcher.c
@@ -241,7 +241,7 @@ int32_t createDataDispatcher(SDataSinkManager* pManager, const SDataSinkNode* pD
   SDataDispatchHandle* dispatcher = taosMemoryCalloc(1, sizeof(SDataDispatchHandle));
   if (NULL == dispatcher) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return TSDB_CODE_OUT_OF_MEMORY;
+    goto _return;
   }
   dispatcher->sink.fPut = putDataBlock;
   dispatcher->sink.fEndPut = endPut;
@@ -258,8 +258,13 @@ int32_t createDataDispatcher(SDataSinkManager* pManager, const SDataSinkNode* pD
   if (NULL == dispatcher->pDataBlocks) {
     taosMemoryFree(dispatcher);
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return TSDB_CODE_OUT_OF_MEMORY;
+    goto _return;
   }
   *pHandle = dispatcher;
   return TSDB_CODE_SUCCESS;
+
+_return:
+
+  taosMemoryFree(pManager);
+  return terrno;
 }
diff --git a/source/libs/executor/src/dataInserter.c b/source/libs/executor/src/dataInserter.c
index f20293791b..8a70726cc8 100644
--- a/source/libs/executor/src/dataInserter.c
+++ b/source/libs/executor/src/dataInserter.c
@@ -413,7 +413,7 @@ int32_t createDataInserter(SDataSinkManager* pManager, const SDataSinkNode* pDat
   if (NULL == inserter) {
     taosMemoryFree(pParam);
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    return TSDB_CODE_OUT_OF_MEMORY;
+    goto _return;
   }
 
   SQueryInserterNode* pInserterNode = (SQueryInserterNode*)pDataSink;
@@ -433,23 +433,18 @@ int32_t createDataInserter(SDataSinkManager* pManager, const SDataSinkNode* pDat
   int64_t suid = 0;
   int32_t code = pManager->pAPI->metaFn.getTableSchema(inserter->pParam->readHandle->vnode, pInserterNode->tableId, &inserter->pSchema, &suid);
   if (code) {
-    destroyDataSinker((SDataSinkHandle*)inserter);
-    taosMemoryFree(inserter);
-    return code;
+    terrno = code;
+    goto _return;
   }
 
   if (pInserterNode->stableId != suid) {
-    destroyDataSinker((SDataSinkHandle*)inserter);
-    taosMemoryFree(inserter);
     terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
-    return terrno;
+    goto _return;
   }
 
   inserter->pDataBlocks = taosArrayInit(1, POINTER_BYTES);
   taosThreadMutexInit(&inserter->mutex, NULL);
   if (NULL == inserter->pDataBlocks) {
-    destroyDataSinker((SDataSinkHandle*)inserter);
-    taosMemoryFree(inserter);
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return TSDB_CODE_OUT_OF_MEMORY;
   }
@@ -473,4 +468,15 @@ int32_t createDataInserter(SDataSinkManager* pManager, const SDataSinkNode* pDat
 
   *pHandle = inserter;
   return TSDB_CODE_SUCCESS;
+
+_return:
+
+  if (inserter) {
+    destroyDataSinker((SDataSinkHandle*)inserter);
+    taosMemoryFree(inserter);
+  } else {
+    taosMemoryFree(pManager);
+  }
+  
+  return terrno;  
 }
diff --git a/source/libs/executor/src/dataSinkMgt.c b/source/libs/executor/src/dataSinkMgt.c
index f07d176440..b2cbf4c1a2 100644
--- a/source/libs/executor/src/dataSinkMgt.c
+++ b/source/libs/executor/src/dataSinkMgt.c
@@ -49,8 +49,11 @@ int32_t dsCreateDataSinker(void* pSinkManager, const SDataSinkNode* pDataSink, D
     case QUERY_NODE_PHYSICAL_PLAN_QUERY_INSERT: {
       return createDataInserter(pManager, pDataSink, pHandle, pParam);
     }
+    default:
+      break;
   }
 
+  taosMemoryFree(pSinkManager);
   qError("invalid input node type:%d, %s", nodeType(pDataSink), id);
   return TSDB_CODE_QRY_INVALID_INPUT;
 }
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 9f5db5d6ae..28ee8f4b7a 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -511,19 +511,20 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
     goto _error;
   }
 
-  SDataSinkMgtCfg cfg = {.maxDataBlockNum = 500, .maxDataBlockNumPerQuery = 50};
-  void* pSinkManager = NULL;
-  code = dsDataSinkMgtInit(&cfg, &(*pTask)->storageAPI, &pSinkManager);
-  if (code != TSDB_CODE_SUCCESS) {
-    qError("failed to dsDataSinkMgtInit, code:%s, %s", tstrerror(code), (*pTask)->id.str);
-    goto _error;
-  }
-
   if (handle) {
+    SDataSinkMgtCfg cfg = {.maxDataBlockNum = 500, .maxDataBlockNumPerQuery = 50};
+    void* pSinkManager = NULL;
+    code = dsDataSinkMgtInit(&cfg, &(*pTask)->storageAPI, &pSinkManager);
+    if (code != TSDB_CODE_SUCCESS) {
+      qError("failed to dsDataSinkMgtInit, code:%s, %s", tstrerror(code), (*pTask)->id.str);
+      goto _error;
+    }
+
     void* pSinkParam = NULL;
     code = createDataSinkParam(pSubplan->pDataSink, &pSinkParam, (*pTask), readHandle);
     if (code != TSDB_CODE_SUCCESS) {
       qError("failed to createDataSinkParam, vgId:%d, code:%s, %s", vgId, tstrerror(code), (*pTask)->id.str);
+      taosMemoryFree(pSinkManager);
       goto _error;
     }
 

From 7b5fc0cc64bce6c2a32c45f66603d077c8806143 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 22 Aug 2023 18:59:30 +0800
Subject: [PATCH 21/48] TS-3851: add tdef.h into release package

---
 packaging/deb/DEBIAN/prerm        | 1 +
 packaging/deb/makedeb.sh          | 1 +
 packaging/rpm/tdengine.spec       | 2 ++
 packaging/tools/install.sh        | 3 ++-
 packaging/tools/install_client.sh | 3 ++-
 packaging/tools/make_install.sh   | 5 +++--
 packaging/tools/makeclient.sh     | 2 +-
 packaging/tools/makepkg.sh        | 2 +-
 packaging/tools/post.sh           | 3 ++-
 packaging/tools/preun.sh          | 1 +
 packaging/tools/remove.sh         | 1 +
 packaging/tools/remove_client.sh  | 1 +
 12 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packaging/deb/DEBIAN/prerm b/packaging/deb/DEBIAN/prerm
index 0d63115a04..a474dc4c80 100644
--- a/packaging/deb/DEBIAN/prerm
+++ b/packaging/deb/DEBIAN/prerm
@@ -37,6 +37,7 @@ else
     ${csudo}rm -f ${inc_link_dir}/taos.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
+    ${csudo}rm -f ${inc_link_dir}/tdef.h     || :
     ${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.*  || :
diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 07819159c4..eca75ce71a 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -98,6 +98,7 @@ cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_pat
 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
 cp ${compile_dir}/../include/util/taoserror.h       ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/util/tdef.h       ${pkg_dir}${install_home_path}/include
 cp ${compile_dir}/../include/libs/function/taosudf.h       ${pkg_dir}${install_home_path}/include
 [ -f ${compile_dir}/build/include/taosws.h ] && cp ${compile_dir}/build/include/taosws.h            ${pkg_dir}${install_home_path}/include ||:
 cp -r ${top_dir}/examples/*                         ${pkg_dir}${install_home_path}/examples
diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index 846d17e7f6..e93af2470a 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -95,6 +95,7 @@ cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driv
 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
+cp %{_compiledir}/../include/util/tdef.h       %{buildroot}%{homepath}/include
 cp %{_compiledir}/../include/libs/function/taosudf.h       %{buildroot}%{homepath}/include
 [ -f %{_compiledir}/build/include/taosws.h ] && cp %{_compiledir}/build/include/taosws.h            %{buildroot}%{homepath}/include ||:
 #cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
@@ -217,6 +218,7 @@ if [ $1 -eq 0 ];then
     ${csudo}rm -f ${inc_link_dir}/taos.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
+    ${csudo}rm -f ${inc_link_dir}/tdef.h     || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h     || :    
     ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
 
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 252a634a19..408a5664a8 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -345,7 +345,7 @@ function install_jemalloc() {
 }
 
 function install_header() {
-  ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || :
+  ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/tdef.h ${inc_link_dir}/taosudf.h || :
 
   [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h || :
 
@@ -353,6 +353,7 @@ function install_header() {
   ${csudo}ln -sf ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
   ${csudo}ln -sf ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
   ${csudo}ln -sf ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+  ${csudo}ln -sf ${install_main_dir}/include/tdef.h ${inc_link_dir}/tdef.h
   ${csudo}ln -sf ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h  
 
   [ -f ${install_main_dir}/include/taosws.h ] && ${csudo}ln -sf ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h || :
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index 18ebf9dc8f..c8baab8269 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -180,10 +180,11 @@ function install_lib() {
 }
 
 function install_header() {
-    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h  ${inc_link_dir}/taosudf.h  || :
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/tdef.h ${inc_link_dir}/taoserror.h  ${inc_link_dir}/taosudf.h  || :
     ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
     ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
     ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/tdef.h ${inc_link_dir}/tdef.h
     ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
     ${csudo}ln -s ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h    
 
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 0a5f9d2668..99315b3311 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -348,9 +348,9 @@ function install_lib() {
 
 function install_header() {
   ${csudo}mkdir -p ${inc_link_dir}
-  ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || :
+  ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/tdef.h ${inc_link_dir}/taosudf.h || :
   [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h ||:
-  ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/libs/function/taosudf.h \
+  ${csudo}cp -f ${source_dir}/include/client/taos.h ${source_dir}/include/common/taosdef.h ${source_dir}/include/util/taoserror.h ${source_dir}/include/util/tdef.h ${source_dir}/include/libs/function/taosudf.h \
     ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
 
   if [ -f ${binary_dir}/build/include/taosws.h ]; then
@@ -361,6 +361,7 @@ function install_header() {
   ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h > /dev/null 2>&1
   ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h > /dev/null 2>&1
   ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h > /dev/null 2>&1
+  ${csudo}ln -s ${install_main_dir}/include/tdef.h ${inc_link_dir}/tdef.h > /dev/null 2>&1
   ${csudo}ln -s ${install_main_dir}/include/taosudf.h ${inc_link_dir}/taosudf.h > /dev/null 2>&1
 
   ${csudo}chmod 644 ${install_main_dir}/include/*
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index cd59294fe7..243efd693e 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -83,7 +83,7 @@ else
   wslib_files="${build_dir}/lib/libtaosws.dylib"
 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"
+header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/util/tdef.h ${code_dir}/include/libs/function/taosudf.h"
 wsheader_files="${build_dir}/include/taosws.h"
 
 if [ "$dbName" != "taos" ]; then
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index ad64ca431e..655629b92c 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -115,7 +115,7 @@ else
     lib_files="${build_dir}/lib/libtaos.so.${version}"
     wslib_files="${build_dir}/lib/libtaosws.so"
 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"
+header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/util/tdef.h ${code_dir}/include/libs/function/taosudf.h"
 
 wsheader_files="${build_dir}/include/taosws.h"
 
diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index e79a10c9e9..ceaebfdc7c 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -133,12 +133,13 @@ function kill_taosd() {
 function install_include() {
     log_print "start install include from ${inc_dir} to ${inc_link_dir}"
     ${csudo}mkdir -p ${inc_link_dir}
-    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/taosudf.h || :
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ${inc_link_dir}/tdef.h ${inc_link_dir}/taosudf.h || :
     [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h ||:
 
     ${csudo}ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h
     ${csudo}ln -s ${inc_dir}/taosdef.h ${inc_link_dir}/taosdef.h
     ${csudo}ln -s ${inc_dir}/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}ln -s ${inc_dir}/tdef.h ${inc_link_dir}/tdef.h
     ${csudo}ln -s ${inc_dir}/taosudf.h ${inc_link_dir}/taosudf.h
 
     [ -f ${inc_dir}/taosws.h ] && ${csudo}ln -sf ${inc_dir}/taosws.h ${inc_link_dir}/taosws.h ||:
diff --git a/packaging/tools/preun.sh b/packaging/tools/preun.sh
index 68f6b53c45..25f3d8ce4a 100755
--- a/packaging/tools/preun.sh
+++ b/packaging/tools/preun.sh
@@ -143,6 +143,7 @@ ${csudo}rm -f ${cfg_link_dir}/*.new      || :
 ${csudo}rm -f ${inc_link_dir}/taos.h     || :
 ${csudo}rm -f ${inc_link_dir}/taosdef.h  || :
 ${csudo}rm -f ${inc_link_dir}/taoserror.h || :
+${csudo}rm -f ${inc_link_dir}/tdef.h || :
 ${csudo}rm -f ${inc_link_dir}/taosudf.h || :
 ${csudo}rm -f ${lib_link_dir}/libtaos.*   || :
 ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index eca0c5e973..0e8b036f28 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -155,6 +155,7 @@ function clean_header() {
   ${csudo}rm -f ${inc_link_dir}/taos.h || :
   ${csudo}rm -f ${inc_link_dir}/taosdef.h || :
   ${csudo}rm -f ${inc_link_dir}/taoserror.h || :
+  ${csudo}rm -f ${inc_link_dir}/tdef.h || :
   ${csudo}rm -f ${inc_link_dir}/taosudf.h || :
 
   [ -f ${inc_link_dir}/taosws.h ] && ${csudo}rm -f ${inc_link_dir}/taosws.h || :
diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh
index 2bdb56fac2..695307254d 100755
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
@@ -73,6 +73,7 @@ function clean_header() {
     ${csudo}rm -f ${inc_link_dir}/taos.h           || :
     ${csudo}rm -f ${inc_link_dir}/taosdef.h        || :
     ${csudo}rm -f ${inc_link_dir}/taoserror.h      || :
+    ${csudo}rm -f ${inc_link_dir}/tdef.h      || :
     ${csudo}rm -f ${inc_link_dir}/taosudf.h      || :    
 }
 

From a601cd21bd3f904f9628b40618a0b31cb488fc0e Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 23 Aug 2023 13:31:19 +0800
Subject: [PATCH 22/48] fix: alter stt_trigger bug

---
 source/dnode/vnode/src/tsdb/tsdbCommit2.c | 47 +++++++++++------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index afbe895721..d4cb63fb7b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -235,36 +235,33 @@ static int32_t tsdbCommitOpenReader(SCommitter2 *committer) {
     return 0;
   }
 
-  ASSERT(TARRAY2_SIZE(committer->ctx->fset->lvlArr) == 1);
+  SSttLvl *lvl;
+  TARRAY2_FOREACH(committer->ctx->fset->lvlArr, lvl) {
+    STFileObj *fobj = NULL;
+    TARRAY2_FOREACH(lvl->fobjArr, fobj) {
+      SSttFileReader *sttReader;
 
-  SSttLvl *lvl = TARRAY2_FIRST(committer->ctx->fset->lvlArr);
+      SSttFileReaderConfig config = {
+          .tsdb = committer->tsdb,
+          .szPage = committer->szPage,
+          .file = fobj->f[0],
+      };
 
-  ASSERT(lvl->level == 0);
+      code = tsdbSttFileReaderOpen(fobj->fname, &config, &sttReader);
+      TSDB_CHECK_CODE(code, lino, _exit);
 
-  STFileObj *fobj = NULL;
-  TARRAY2_FOREACH(lvl->fobjArr, fobj) {
-    SSttFileReader *sttReader;
+      code = TARRAY2_APPEND(committer->sttReaderArray, sttReader);
+      TSDB_CHECK_CODE(code, lino, _exit);
 
-    SSttFileReaderConfig config = {
-        .tsdb = committer->tsdb,
-        .szPage = committer->szPage,
-        .file = fobj->f[0],
-    };
+      STFileOp op = {
+          .optype = TSDB_FOP_REMOVE,
+          .fid = fobj->f->fid,
+          .of = fobj->f[0],
+      };
 
-    code = tsdbSttFileReaderOpen(fobj->fname, &config, &sttReader);
-    TSDB_CHECK_CODE(code, lino, _exit);
-
-    code = TARRAY2_APPEND(committer->sttReaderArray, sttReader);
-    TSDB_CHECK_CODE(code, lino, _exit);
-
-    STFileOp op = {
-        .optype = TSDB_FOP_REMOVE,
-        .fid = fobj->f->fid,
-        .of = fobj->f[0],
-    };
-
-    code = TARRAY2_APPEND(committer->fopArray, op);
-    TSDB_CHECK_CODE(code, lino, _exit);
+      code = TARRAY2_APPEND(committer->fopArray, op);
+      TSDB_CHECK_CODE(code, lino, _exit);
+    }
   }
 
 _exit:

From 6b61da1a41eaeab0e56e1ec3bec40d4faf89573e Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Wed, 23 Aug 2023 15:34:46 +0800
Subject: [PATCH 23/48] reload semi session state

---
 source/libs/executor/src/timewindowoperator.c | 79 ++++++++++++++++---
 1 file changed, 70 insertions(+), 9 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 4f793d7064..37f737c2ce 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -3240,6 +3240,31 @@ static int32_t compactSessionWindow(SOperatorInfo* pOperator, SResultWindowInfo*
   return winNum;
 }
 
+static void compactSessionSemiWindow(SOperatorInfo* pOperator, SResultWindowInfo* pCurWin) {
+  SExprSupp*                     pSup = &pOperator->exprSupp;
+  SExecTaskInfo*                 pTaskInfo = pOperator->pTaskInfo;
+  SStorageAPI*                   pAPI = &pOperator->pTaskInfo->storageAPI;
+  SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
+  SResultRow*                    pCurResult = NULL;
+  int32_t                        numOfOutput = pOperator->exprSupp.numOfExprs;
+  SStreamAggSupporter*           pAggSup = &pInfo->streamAggSup;
+  // Just look for the window behind StartIndex
+  while (1) {
+    SResultWindowInfo winInfo = {0};
+    SStreamStateCur*  pCur = getNextSessionWinInfo(pAggSup, NULL, pCurWin, &winInfo);
+    if (!IS_VALID_SESSION_WIN(winInfo) || !isInWindow(pCurWin, winInfo.sessionWin.win.skey, pAggSup->gap) ||
+        !inWinRange(&pAggSup->winRange, &winInfo.sessionWin.win)) {
+      taosMemoryFree(winInfo.pOutputBuf);
+      pAPI->stateStore.streamStateFreeCur(pCur);
+      break;
+    }
+    pCurWin->sessionWin.win.ekey = TMAX(pCurWin->sessionWin.win.ekey, winInfo.sessionWin.win.ekey);
+    doDeleteSessionWindow(pAggSup, &winInfo.sessionWin);
+    pAPI->stateStore.streamStateFreeCur(pCur);
+    taosMemoryFree(winInfo.pOutputBuf);
+  }
+}
+
 int32_t saveSessionOutputBuf(SStreamAggSupporter* pAggSup, SResultWindowInfo* pWinInfo) {
   saveSessionDiscBuf(pAggSup->pState, &pWinInfo->sessionWin, pWinInfo->pOutputBuf, pAggSup->resultRowSize, &pAggSup->stateStore);
   pWinInfo->pOutputBuf = NULL;
@@ -3417,9 +3442,9 @@ void doBuildDeleteDataBlock(SOperatorInfo* pOp, SSHashObj* pStDeleted, SSDataBlo
 }
 
 static void rebuildSessionWindow(SOperatorInfo* pOperator, SArray* pWinArray, SSHashObj* pStUpdated) {
-  SExprSupp*                     pSup = &pOperator->exprSupp;
-  SExecTaskInfo*                 pTaskInfo = pOperator->pTaskInfo;
-  SStorageAPI* pAPI = &pOperator->pTaskInfo->storageAPI;
+  SExprSupp*     pSup = &pOperator->exprSupp;
+  SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
+  SStorageAPI*   pAPI = &pOperator->pTaskInfo->storageAPI;
 
   int32_t                        size = taosArrayGetSize(pWinArray);
   SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
@@ -3446,6 +3471,7 @@ static void rebuildSessionWindow(SOperatorInfo* pOperator, SArray* pWinArray, SS
         int32_t code = getSessionWinBuf(pChAggSup, pCur, &childWin);
 
         if (code == TSDB_CODE_SUCCESS && !inWinRange(&pAggSup->winRange, &childWin.sessionWin.win)) {
+          releaseOutputBuf(pAggSup->pState, NULL, (SResultRow*)childWin.pOutputBuf, &pAggSup->stateStore);
           continue;
         }
 
@@ -3454,6 +3480,7 @@ static void rebuildSessionWindow(SOperatorInfo* pOperator, SArray* pWinArray, SS
             setSessionOutputBuf(pAggSup, pWinKey->win.skey, pWinKey->win.ekey, pWinKey->groupId, &parentWin);
             code = initSessionOutputBuf(&parentWin, &pResult, pSup->pCtx, numOfOutput, pSup->rowEntryInfoOffset);
             if (code != TSDB_CODE_SUCCESS || pResult == NULL) {
+              releaseOutputBuf(pAggSup->pState, NULL, (SResultRow*)childWin.pOutputBuf, &pAggSup->stateStore);
               break;
             }
           }
@@ -3464,7 +3491,9 @@ static void rebuildSessionWindow(SOperatorInfo* pOperator, SArray* pWinArray, SS
           compactFunctions(pSup->pCtx, pChild->exprSupp.pCtx, numOfOutput, pTaskInfo, &pInfo->twAggSup.timeWindowData);
           compactSessionWindow(pOperator, &parentWin, pStUpdated, NULL, true);
           saveResult(parentWin, pStUpdated);
+          releaseOutputBuf(pAggSup->pState, NULL, (SResultRow*)childWin.pOutputBuf, &pAggSup->stateStore);
         } else {
+          releaseOutputBuf(pAggSup->pState, NULL, (SResultRow*)childWin.pOutputBuf, &pAggSup->stateStore);
           break;
         }
       }
@@ -3703,11 +3732,11 @@ static SSDataBlock* doStreamSessionAgg(SOperatorInfo* pOperator) {
 }
 
 void streamSessionReleaseState(SOperatorInfo* pOperator) {
-  if (pOperator->operatorType != QUERY_NODE_PHYSICAL_PLAN_STREAM_SEMI_SESSION) {
-    SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
-    int32_t resSize = taosArrayGetSize(pInfo->historyWins) * sizeof(SSessionKey);
-    pInfo->streamAggSup.stateStore.streamStateSaveInfo(pInfo->streamAggSup.pState, STREAM_SESSION_OP_STATE_NAME, strlen(STREAM_SESSION_OP_STATE_NAME), pInfo->historyWins->pData, resSize);
-  }
+  SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
+  int32_t                        resSize = taosArrayGetSize(pInfo->historyWins) * sizeof(SSessionKey);
+  pInfo->streamAggSup.stateStore.streamStateSaveInfo(pInfo->streamAggSup.pState, STREAM_SESSION_OP_STATE_NAME,
+                                                     strlen(STREAM_SESSION_OP_STATE_NAME), pInfo->historyWins->pData,
+                                                     resSize);
   SOperatorInfo* downstream = pOperator->pDownstream[0];
   if (downstream->fpSet.releaseStreamStateFn) {
     downstream->fpSet.releaseStreamStateFn(downstream);
@@ -3719,6 +3748,33 @@ void resetWinRange(STimeWindow* winRange) {
   winRange->ekey = INT64_MAX;
 }
 
+void streamSessionSemiReloadState(SOperatorInfo* pOperator) {
+  SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
+  SStreamAggSupporter* pAggSup = &pInfo->streamAggSup;
+  resetWinRange(&pAggSup->winRange);
+
+  SResultWindowInfo winInfo = {0};
+  int32_t size = 0;
+  void* pBuf = NULL;
+  int32_t code = pAggSup->stateStore.streamStateGetInfo(pAggSup->pState, STREAM_SESSION_OP_STATE_NAME,
+                                                        strlen(STREAM_SESSION_OP_STATE_NAME), &pBuf, &size);
+  int32_t num = size / sizeof(SSessionKey);
+  SSessionKey* pSeKeyBuf = (SSessionKey*) pBuf;
+  ASSERT(size == num * sizeof(SSessionKey));
+  for (int32_t i = 0; i < num; i++) {
+    SResultWindowInfo winInfo = {0};
+    setSessionOutputBuf(pAggSup, pSeKeyBuf[i].win.skey, pSeKeyBuf[i].win.ekey, pSeKeyBuf[i].groupId, &winInfo);
+    compactSessionSemiWindow(pOperator, &winInfo);
+    saveSessionOutputBuf(pAggSup, &winInfo);
+  }
+  taosMemoryFree(pBuf);
+
+  SOperatorInfo* downstream = pOperator->pDownstream[0];
+  if (downstream->fpSet.reloadStreamStateFn) {
+    downstream->fpSet.reloadStreamStateFn(downstream);
+  }
+}
+
 void streamSessionReloadState(SOperatorInfo* pOperator) {
   SStreamSessionAggOperatorInfo* pInfo = pOperator->info;
   SStreamAggSupporter* pAggSup = &pInfo->streamAggSup;
@@ -3948,6 +4004,11 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) {
   removeSessionResults(pInfo->pStDeleted, pInfo->pUpdated);
   tSimpleHashCleanup(pInfo->pStUpdated);
   pInfo->pStUpdated = NULL;
+
+  if(pInfo->isHistoryOp) {
+    getMaxTsWins(pInfo->pUpdated, pInfo->historyWins);
+  }
+
   initGroupResInfoFromArrayList(&pInfo->groupResInfo, pInfo->pUpdated);
   pInfo->pUpdated = NULL;
   blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity);
@@ -3996,8 +4057,8 @@ SOperatorInfo* createStreamFinalSessionAggOperatorInfo(SOperatorInfo* downstream
     blockDataEnsureCapacity(pInfo->pUpdateRes, 128);
     pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doStreamSessionSemiAgg, NULL,
                                            destroyStreamSessionAggOperatorInfo, optrDefaultBufFn, NULL);
+    setOperatorStreamStateFn(pOperator, streamSessionReleaseState, streamSessionSemiReloadState);
   }
-  setOperatorStreamStateFn(pOperator, streamSessionReleaseState, streamSessionReloadState);
   setOperatorInfo(pOperator, name, pPhyNode->type, false, OP_NOT_OPENED, pInfo, pTaskInfo);
 
   pOperator->operatorType = pPhyNode->type;

From f45d1c69b80f7ec1a69fcd8133526d05962d854e Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Wed, 23 Aug 2023 16:17:52 +0800
Subject: [PATCH 24/48] fix: -t option and wal retention ci

---
 tests/system-test/0-others/walRetention.py | 38 +++++++++++-----------
 tools/shell/src/shellWebsocket.c           |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/system-test/0-others/walRetention.py b/tests/system-test/0-others/walRetention.py
index 5257b7644a..44e64ae5e7 100644
--- a/tests/system-test/0-others/walRetention.py
+++ b/tests/system-test/0-others/walRetention.py
@@ -161,9 +161,18 @@ class VNode :
     # get log size
     def getWalsSize(self):
         size = 0
+        lastSize = 0
+        max = -1
         for walFile in self.walFiles:
-            size += walFile.fsize
-        
+            if self.canDelete(walFile) == False:
+                tdLog.info(f"  calc vnode size {walFile.pathFile} size={walFile.fsize}")
+                size += walFile.fsize
+                if max < walFile.startVer:
+                    max = walFile.startVer
+                    lastSize = walFile.fsize
+
+        size -= lastSize
+        tdLog.info(f" last file size need reduct . lastSize={lastSize}")    
         return size
     
     # vnode
@@ -183,7 +192,7 @@ class VNode :
         delTs = delTsLine.timestamp()
         for walFile in self.walFiles:
             mt = datetime.fromtimestamp(walFile.mtime)
-            info = f" {walFile.pathFile} mt={mt} line={delTsLine}  start={walFile.startVer} snap={self.snapVer} end= {walFile.endVer}"
+            info = f" {walFile.pathFile} size={walFile.fsize} mt={mt} line={delTsLine}  start={walFile.startVer} snap={self.snapVer} end= {walFile.endVer}"
             tdLog.info(info) 
             if walFile.mtime < delTs and self.canDelete(walFile):
                 # wait a moment then check file exist
@@ -199,25 +208,16 @@ class VNode :
         if self.walSize == 0:
             return True
         
+        time.sleep(2)
         vnodeSize = self.getWalsSize()
-        if vnodeSize < self.walSize:
-            tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} ")
+        # need over 20%
+        if vnodeSize < self.walSize * 1.2:
+            tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} need over 20%")
             return True
         
-        # check valid
-        tdLog.info(f" wal size over set. {self.path} real = {vnodeSize} set = {self.walSize} ")
-        for walFile in self.walFiles:
-            if self.canDelete(walFile):
-                # wait a moment then check file exist
-                time.sleep(1) 
-                if os.path.exists(walFile.pathFile):
-                    tdLog.exit(f"  wal file size over .\
-                           \n   wal file = {walFile.pathFile}\
-                           \n   snapVer  = {self.snapVer}\
-                           \n   real     = {vnodeSize} bytes\
-                           \n   set      = {self.walSize} bytes")
-                return False
-        return True
+        # check over
+        tdLog.exit(f" wal size over set. {self.path} real = {vnodeSize} set = {self.walSize} ")
+        return False
 
 
 # insert by async
diff --git a/tools/shell/src/shellWebsocket.c b/tools/shell/src/shellWebsocket.c
index af7f13c69c..791e2c36ff 100644
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
@@ -278,7 +278,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
       }
       if (code == TSDB_CODE_WS_SEND_TIMEOUT
                 || code == TSDB_CODE_WS_RECV_TIMEOUT) {
-        fprintf(stderr, "Hint: use -t to increase the timeout in seconds\n");
+        fprintf(stderr, "Hint: use -T to increase the timeout in seconds\n");
       } else if (code == TSDB_CODE_WS_INTERNAL_ERRO
                     || code == TSDB_CODE_WS_CLOSED) {
         shell.ws_conn = NULL;

From 2aa47dd19101faf46e9de8136710fc118756ecda Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Wed, 23 Aug 2023 16:37:36 +0800
Subject: [PATCH 25/48] fix: walRetention modify info

---
 tests/system-test/0-others/walRetention.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/system-test/0-others/walRetention.py b/tests/system-test/0-others/walRetention.py
index 44e64ae5e7..0fdeb84a5b 100644
--- a/tests/system-test/0-others/walRetention.py
+++ b/tests/system-test/0-others/walRetention.py
@@ -147,13 +147,13 @@ class VNode :
         if self.lastVer != -1 and ret:
             # first wal file ignore
             if walFile.startVer == self.firstVer:
-                tdLog.info(f"  {walFile.pathFile} can del, but is first. snapVer={self.snapVer} firstVer={self.firstVer}")
+                tdLog.info(f"    can del {walFile.pathFile}, but is first. snapVer={self.snapVer} firstVer={self.firstVer}")
                 return False
 
             # ver in stay range 
             smallVer = self.snapVer - self.walStayRange -1
             if walFile.startVer >= smallVer:
-                tdLog.info(f"  {walFile.pathFile} can del, but range not arrived. snapVer={self.snapVer} smallVer={smallVer}")
+                tdLog.info(f"    can del {walFile.pathFile}, but range not arrived. snapVer={self.snapVer} smallVer={smallVer}")
                 return False
 
         return ret
@@ -165,14 +165,16 @@ class VNode :
         max = -1
         for walFile in self.walFiles:
             if self.canDelete(walFile) == False:
-                tdLog.info(f"  calc vnode size {walFile.pathFile} size={walFile.fsize}")
+                tdLog.info(f"  calc vnode size {walFile.pathFile} size={walFile.fsize} startVer={walFile.startVer}")
                 size += walFile.fsize
                 if max < walFile.startVer:
                     max = walFile.startVer
                     lastSize = walFile.fsize
 
-        size -= lastSize
-        tdLog.info(f" last file size need reduct . lastSize={lastSize}")    
+        
+        if lastSize > 0:
+            tdLog.info(f" last file size need reduct . lastSize={lastSize}")
+            size -= lastSize
         return size
     
     # vnode
@@ -212,7 +214,7 @@ class VNode :
         vnodeSize = self.getWalsSize()
         # need over 20%
         if vnodeSize < self.walSize * 1.2:
-            tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} need over 20%")
+            tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize}. allow over 20%.")
             return True
         
         # check over

From 6877e33c8780faad28be232e493fa4f6907af690 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Wed, 23 Aug 2023 16:49:37 +0800
Subject: [PATCH 26/48] fix: query have error get time is last successful

---
 tools/shell/src/shellWebsocket.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/shell/src/shellWebsocket.c b/tools/shell/src/shellWebsocket.c
index 791e2c36ff..ff2e5efdd4 100644
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
@@ -373,8 +373,6 @@ void shellRunSingleCommandWebsocketImp(char *command) {
     } else {
       printf("Query interrupted, %d row(s) in set (%.6fs)\n", numOfRows,
           (et - st)/1E6);
-      printf("Execute: %.2f ms Network: %.2f ms Total: %.2f ms\n",
-             execute_time, net_time, total_time);
     }
   }
   printf("\n");

From 7b9d14aad369f244fe6449e7bf65b4c4a4fa5afc Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 24 Aug 2023 10:34:35 +0800
Subject: [PATCH 27/48] docs: add note to csharp connector docs (#22541)

* docs: fix taos_init() return type

* docs: refine c interface doc

* docs: add platform note to csharp connector.
---
 docs/en/14-reference/03-connector/09-csharp.mdx | 4 ++++
 docs/zh/08-connector/40-csharp.mdx              | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/docs/en/14-reference/03-connector/09-csharp.mdx b/docs/en/14-reference/03-connector/09-csharp.mdx
index 718462295a..203d44fe02 100644
--- a/docs/en/14-reference/03-connector/09-csharp.mdx
+++ b/docs/en/14-reference/03-connector/09-csharp.mdx
@@ -30,6 +30,10 @@ The source code of `TDengine.Connector` is hosted on [GitHub](https://github.com
 
 The supported platforms are the same as those supported by the TDengine client driver.
 
+:::note
+Please note TDengine does not support 32bit Windows any more.
+:::
+
 ## Version support
 
 Please refer to [version support list](/reference/connector#version-support)
diff --git a/docs/zh/08-connector/40-csharp.mdx b/docs/zh/08-connector/40-csharp.mdx
index 3a945e77fd..325c71da88 100644
--- a/docs/zh/08-connector/40-csharp.mdx
+++ b/docs/zh/08-connector/40-csharp.mdx
@@ -29,6 +29,10 @@ import CSAsyncQuery from "../07-develop/04-query-data/_cs_async.mdx"
 
 支持的平台和 TDengine 客户端驱动支持的平台一致。
 
+:::note
+注意 TDengine 不再支持 32 位 Windows 平台。
+:::
+
 ## 版本支持
 
 请参考[版本支持列表](../#版本支持)

From ed70cd1f63fa876aa8c2523e348c262dd2883e40 Mon Sep 17 00:00:00 2001
From: huolibo <huolibo@qq.com>
Date: Thu, 24 Aug 2023 10:55:41 +0800
Subject: [PATCH 28/48] fix: jni error log

---
 source/client/src/clientTmqConnector.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/client/src/clientTmqConnector.c b/source/client/src/clientTmqConnector.c
index 487a86a589..2bea738c23 100644
--- a/source/client/src/clientTmqConnector.c
+++ b/source/client/src/clientTmqConnector.c
@@ -590,7 +590,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_tmq_TMQConnector_tmqCommittedImp(
 
   int64_t offset = tmq_committed(tmq, topicName, vgId);
 
-  if (offset < JNI_SUCCESS) {
+  if (offset < JNI_SUCCESS && offset != -2147467247) {
     jniError("jobj:%p, tmq get committed offset error, topic:%s, vgId:%d, code:0x%" PRIx64 ", msg:%s", jobj, topicName,
              vgId, offset, tmq_err2str(offset));
   }

From 7ebce2814f365e721b9228d33dc974aeb06f5b5a Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Thu, 24 Aug 2023 11:18:10 +0800
Subject: [PATCH 29/48] mem leak

---
 source/libs/executor/src/filloperator.c       |  1 +
 source/libs/executor/src/timewindowoperator.c |  3 +++
 source/libs/stream/src/streamBackendRocksdb.c | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/source/libs/executor/src/filloperator.c b/source/libs/executor/src/filloperator.c
index be4cb8d2dc..bf7da7505a 100644
--- a/source/libs/executor/src/filloperator.c
+++ b/source/libs/executor/src/filloperator.c
@@ -851,6 +851,7 @@ void setFillValueInfo(SSDataBlock* pBlock, TSKEY ts, int32_t rowId, SStreamFillS
       if (hasPrevWindow(pFillSup)) {
         setFillKeyInfo(prevWKey, ts, &pFillSup->interval, pFillInfo);
         pFillInfo->pos = FILL_POS_END;
+        resetFillWindow(&pFillSup->next);
         pFillSup->next.key = pFillSup->cur.key;
         pFillSup->next.pRowVal = pFillSup->cur.pRowVal;
         pFillInfo->preRowKey = INT64_MIN;
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 37f737c2ce..16eaf0649d 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2905,6 +2905,7 @@ void destroyStreamSessionAggOperatorInfo(void* param) {
   SStreamSessionAggOperatorInfo* pInfo = (SStreamSessionAggOperatorInfo*)param;
   cleanupBasicInfo(&pInfo->binfo);
   destroyStreamAggSupporter(&pInfo->streamAggSup);
+  cleanupExprSupp(&pInfo->scalarSupp);
 
   if (pInfo->pChildren != NULL) {
     int32_t size = taosArrayGetSize(pInfo->pChildren);
@@ -4096,6 +4097,7 @@ void destroyStreamStateOperatorInfo(void* param) {
   cleanupBasicInfo(&pInfo->binfo);
   destroyStreamAggSupporter(&pInfo->streamAggSup);
   cleanupGroupResInfo(&pInfo->groupResInfo);
+  cleanupExprSupp(&pInfo->scalarSupp);
   if (pInfo->pChildren != NULL) {
     int32_t size = taosArrayGetSize(pInfo->pChildren);
     for (int32_t i = 0; i < size; i++) {
@@ -4109,6 +4111,7 @@ void destroyStreamStateOperatorInfo(void* param) {
   taosArrayDestroy(pInfo->historyWins);
   tSimpleHashCleanup(pInfo->pSeUpdated);
   tSimpleHashCleanup(pInfo->pSeDeleted);
+  pInfo->pUpdated = taosArrayDestroy(pInfo->pUpdated);
   taosMemoryFreeClear(param);
 }
 
diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index 4a0ce81e68..1981cd76b3 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -1620,19 +1620,22 @@ int32_t streamStateSessionGetKVByCur_rocksdb(SStreamStateCur* pCur, SSessionKey*
   if (len < 0) {
     return -1;
   }
+
+  if (pVLen != NULL) *pVLen = len;
+
+  if (pKTmp->opNum != pCur->number) {
+    taosMemoryFree(val);
+    return -1;
+  }
+  if (pKey->groupId != 0 && pKey->groupId != pKTmp->key.groupId) {
+    taosMemoryFree(val);
+    return -1;
+  }
   if (pVal != NULL) {
     *pVal = (char*)val;
   } else {
     taosMemoryFree(val);
   }
-  if (pVLen != NULL) *pVLen = len;
-
-  if (pKTmp->opNum != pCur->number) {
-    return -1;
-  }
-  if (pKey->groupId != 0 && pKey->groupId != pKTmp->key.groupId) {
-    return -1;
-  }
   *pKey = pKTmp->key;
   return 0;
 }

From 1e108c4178bd6cc4051e2715c9d063b90b8da4ca Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Thu, 24 Aug 2023 11:34:43 +0800
Subject: [PATCH 30/48] mem leak

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

diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index 1981cd76b3..571aca9935 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -1613,6 +1613,9 @@ int32_t streamStateSessionGetKVByCur_rocksdb(SStreamStateCur* pCur, SSessionKey*
   const char* curKey = rocksdb_iter_key(pCur->iter, (size_t*)&kLen);
   stateSessionKeyDecode((void*)&ktmp, (char*)curKey);
 
+  if (pVal != NULL) *pVal = NULL;
+  if (pVLen != NULL) *pVLen = 0;
+
   SStateSessionKey* pKTmp = &ktmp;
   const char*       vval = rocksdb_iter_value(pCur->iter, (size_t*)&vLen);
   char*             val = NULL;
@@ -1621,8 +1624,6 @@ int32_t streamStateSessionGetKVByCur_rocksdb(SStreamStateCur* pCur, SSessionKey*
     return -1;
   }
 
-  if (pVLen != NULL) *pVLen = len;
-
   if (pKTmp->opNum != pCur->number) {
     taosMemoryFree(val);
     return -1;
@@ -1631,11 +1632,14 @@ int32_t streamStateSessionGetKVByCur_rocksdb(SStreamStateCur* pCur, SSessionKey*
     taosMemoryFree(val);
     return -1;
   }
+
   if (pVal != NULL) {
     *pVal = (char*)val;
   } else {
     taosMemoryFree(val);
   }
+
+  if (pVLen != NULL) *pVLen = len;
   *pKey = pKTmp->key;
   return 0;
 }

From 3c8bd57140463a8faf45db4c83fd0b3840c4ad42 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Wed, 23 Aug 2023 14:54:41 +0800
Subject: [PATCH 31/48] fix: fill operator with desc ts order returned 1 more
 rows

---
 source/libs/executor/src/filloperator.c      | 1 +
 tests/system-test/2-query/fill_with_group.py | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/source/libs/executor/src/filloperator.c b/source/libs/executor/src/filloperator.c
index be4cb8d2dc..e8bdd37616 100644
--- a/source/libs/executor/src/filloperator.c
+++ b/source/libs/executor/src/filloperator.c
@@ -177,6 +177,7 @@ static void revisedFillStartKey(SFillOperatorInfo* pInfo, SSDataBlock* pBlock, i
       }
 
       // todo time window chosen problem: t or prev value?
+      if (t > pInfo->pFillInfo->start) t -= pInterval->sliding;
       taosFillUpdateStartTimestampInfo(pInfo->pFillInfo, t);
     }
   }
diff --git a/tests/system-test/2-query/fill_with_group.py b/tests/system-test/2-query/fill_with_group.py
index c1ea9877a2..393102c8ed 100644
--- a/tests/system-test/2-query/fill_with_group.py
+++ b/tests/system-test/2-query/fill_with_group.py
@@ -130,9 +130,18 @@ class TDTestCase:
             for j in range(0,60):
                 tdSql.checkData(i*1500+j, 1, None)
 
+    def test_fill_with_order_by(self):
+        sql = "select _wstart, _wend, count(ts), sum(c1) from meters where ts > '2018-11-25 00:00:00.000' and ts < '2018-11-26 00:00:00.00' interval(1d) fill(NULL) order by _wstart"
+        tdSql.query(sql)
+        tdSql.checkRows(1)
+        sql = "select _wstart, _wend, count(ts), sum(c1) from meters where ts > '2018-11-25 00:00:00.000' and ts < '2018-11-26 00:00:00.00' interval(1d) fill(NULL) order by _wstart desc"
+        tdSql.query(sql)
+        tdSql.checkRows(1)
+
     def run(self):
         self.prepareTestEnv()
         self.test_partition_by_with_interval_fill_prev_new_group_fill_error()
+        self.test_fill_with_order_by()
 
     def stop(self):
         tdSql.close()

From b142979f7fd190c5851d47bd03e0a8c714c6e261 Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Thu, 24 Aug 2023 15:00:09 +0800
Subject: [PATCH 32/48] mem leak

---
 source/common/src/tdatablock.c             | 3 ++-
 source/libs/executor/src/filloperator.c    | 5 ++---
 source/libs/executor/src/groupoperator.c   | 3 ++-
 source/libs/executor/src/projectoperator.c | 4 ++++
 source/libs/executor/src/scanoperator.c    | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 5188b1e27c..f6fce452ed 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1340,8 +1340,9 @@ SSDataBlock* blockCopyOneRow(const SSDataBlock* pDataBlock, int32_t rowIdx) {
   for (int32_t i = 0; i < numOfCols; ++i) {
     SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
     SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, i);
-    void*            pData = colDataGetData(pSrc, rowIdx);
     bool             isNull = colDataIsNull(pSrc, pDataBlock->info.rows, rowIdx, NULL);
+    void*            pData = NULL;
+    if (!isNull) pData = colDataGetData(pSrc, rowIdx);
     colDataSetVal(pDst, 0, pData, isNull);
   }
 
diff --git a/source/libs/executor/src/filloperator.c b/source/libs/executor/src/filloperator.c
index bf7da7505a..7dbdb547d3 100644
--- a/source/libs/executor/src/filloperator.c
+++ b/source/libs/executor/src/filloperator.c
@@ -838,6 +838,7 @@ void setFillValueInfo(SSDataBlock* pBlock, TSKEY ts, int32_t rowId, SStreamFillS
                                       (pFillSup->next.key == pFillInfo->nextRowKey && !hasPrevWindow(pFillSup)))) {
         setFillKeyInfo(ts, nextWKey, &pFillSup->interval, pFillInfo);
         pFillInfo->pos = FILL_POS_START;
+        resetFillWindow(&pFillSup->prev);
         pFillSup->prev.key = pFillSup->cur.key;
         pFillSup->prev.pRowVal = pFillSup->cur.pRowVal;
       } else if (hasPrevWindow(pFillSup)) {
@@ -1230,8 +1231,6 @@ static void doDeleteFillResult(SOperatorInfo* pOperator) {
 
     SWinKey nextKey = {.groupId = groupId, .ts = ts};
     while (pInfo->srcDelRowIndex < pBlock->info.rows) {
-      void*    nextVal = NULL;
-      int32_t  nextLen = 0;
       TSKEY    delTs = tsStarts[pInfo->srcDelRowIndex];
       uint64_t delGroupId = groupIds[pInfo->srcDelRowIndex];
       int32_t  code = TSDB_CODE_SUCCESS;
@@ -1246,7 +1245,7 @@ static void doDeleteFillResult(SOperatorInfo* pOperator) {
       if (delTs == nextKey.ts) {
         code = pAPI->stateStore.streamStateCurNext(pOperator->pTaskInfo->streamInfo.pState, pCur);
         if (code == TSDB_CODE_SUCCESS) {
-          code = pAPI->stateStore.streamStateGetGroupKVByCur(pCur, &nextKey, (const void**)&nextVal, &nextLen);
+          code = pAPI->stateStore.streamStateGetGroupKVByCur(pCur, &nextKey, NULL, NULL);
         }
         // ts will be deleted later
         if (delTs != ts) {
diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c
index 9228c923a6..7d0fafff73 100644
--- a/source/libs/executor/src/groupoperator.c
+++ b/source/libs/executor/src/groupoperator.c
@@ -972,7 +972,8 @@ static SSDataBlock* buildStreamPartitionResult(SOperatorInfo* pOperator) {
       SColumnInfoData* pSrcCol = taosArrayGet(pSrc->pDataBlock, slotId);
       SColumnInfoData* pDestCol = taosArrayGet(pDest->pDataBlock, j);
       bool             isNull = colDataIsNull(pSrcCol, pSrc->info.rows, rowIndex, NULL);
-      char*            pSrcData = colDataGetData(pSrcCol, rowIndex);
+      char*            pSrcData = NULL;
+      if (!isNull) pSrcData = colDataGetData(pSrcCol, rowIndex);
       colDataSetVal(pDestCol, pDest->info.rows, pSrcData, isNull);
     }
     pDest->info.rows++;
diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c
index 1cc377b3ee..7266fb461d 100644
--- a/source/libs/executor/src/projectoperator.c
+++ b/source/libs/executor/src/projectoperator.c
@@ -372,6 +372,10 @@ SSDataBlock* doProjectOperation(SOperatorInfo* pOperator) {
     pOperator->cost.openCost = (taosGetTimestampUs() - st) / 1000.0;
   }
 
+  if (pTaskInfo->execModel == OPTR_EXEC_MODEL_STREAM) {
+    printDataBlock(p, "project");
+  }
+
   return (p->info.rows > 0) ? p : NULL;
 }
 
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index da4bd1e23c..af1740750c 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1247,7 +1247,8 @@ static SSDataBlock* doRangeScan(SStreamScanInfo* pInfo, SSDataBlock* pSDB, int32
             SColumnInfoData* pSrcCol = taosArrayGet(tmpBlock->pDataBlock, j);
             SColumnInfoData* pDestCol = taosArrayGet(pResult->pDataBlock, j);
             bool             isNull = colDataIsNull(pSrcCol, tmpBlock->info.rows, i, NULL);
-            char*            pSrcData = colDataGetData(pSrcCol, i);
+            char*            pSrcData = NULL;
+            if (!isNull) pSrcData = colDataGetData(pSrcCol, i);
             colDataSetVal(pDestCol, pResult->info.rows, pSrcData, isNull);
           }
           pResult->info.rows++;

From 4c6bc4d2c3f33686f138d75101371191cf405f5e Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 24 Aug 2023 16:10:03 +0800
Subject: [PATCH 33/48] fix(stream): continue check wal when meeting empty
 delete block msg.

---
 source/dnode/vnode/src/tq/tqRead.c | 107 +++++++++++++++++------------
 1 file changed, 62 insertions(+), 45 deletions(-)

diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index 43f38ade97..d3157dc3b0 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -296,53 +296,70 @@ int32_t tqReaderSeek(STqReader* pReader, int64_t ver, const char* id) {
 }
 
 int32_t extractMsgFromWal(SWalReader* pReader, void** pItem, int64_t maxVer, const char* id) {
-  int32_t code = walNextValidMsg(pReader);
-  if (code != TSDB_CODE_SUCCESS) {
+  int32_t code = 0;
+  SWalCont* pCont = &pReader->pHead->head;
+
+  while(1) {
+    code = walNextValidMsg(pReader);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+
+    int64_t ver = pCont->version;
+    if (ver > maxVer) {
+      tqDebug("maxVer in WAL:%" PRId64 " reached current:%" PRId64 ", do not scan wal anymore, %s", maxVer, ver, id);
+      return TSDB_CODE_SUCCESS;
+    }
+
+    if (pCont->msgType == TDMT_VND_SUBMIT) {
+      void*   pBody = POINTER_SHIFT(pCont->body, sizeof(SSubmitReq2Msg));
+      int32_t len = pCont->bodyLen - sizeof(SSubmitReq2Msg);
+
+      void* data = taosMemoryMalloc(len);
+      if (data == NULL) {
+        // todo: for all stream in this vnode, keep this offset in the offset files, and wait for a moment, and then retry
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        terrno = code;
+
+        tqError("vgId:%d, failed to copy submit data for stream processing, since out of memory", 0);
+        return code;
+      }
+
+      memcpy(data, pBody, len);
+      SPackedData data1 = (SPackedData){.ver = ver, .msgLen = len, .msgStr = data};
+
+      *pItem = (SStreamQueueItem*)streamDataSubmitNew(&data1, STREAM_INPUT__DATA_SUBMIT);
+      if (*pItem == NULL) {
+        code = TSDB_CODE_OUT_OF_MEMORY;
+        terrno = code;
+        tqError("%s failed to create data submit for stream since out of memory", id);
+        return code;
+      }
+    } else if (pCont->msgType == TDMT_VND_DELETE) {
+      void*   pBody = POINTER_SHIFT(pCont->body, sizeof(SMsgHead));
+      int32_t len = pCont->bodyLen - sizeof(SMsgHead);
+
+      code = extractDelDataBlock(pBody, len, ver, (SStreamRefDataBlock**)pItem);
+      if (code == TSDB_CODE_SUCCESS) {
+        if (*pItem == NULL) {
+          tqDebug("s-task:%s empty delete msg, discard it, len:%d, ver:%" PRId64, id, len, ver);
+          // we need to continue check next data in the wal files.
+          continue;
+        } else {
+          tqDebug("s-task:%s delete msg extract from WAL, len:%d, ver:%" PRId64, id, len, ver);
+        }
+      } else {
+        terrno = code;
+        tqError("s-task:%s extract delete msg from WAL failed, code:%s", id, tstrerror(code));
+        return code;
+      }
+
+    } else {
+      ASSERT(0);
+    }
+
     return code;
   }
-
-  int64_t ver = pReader->pHead->head.version;
-  if (ver > maxVer) {
-    tqDebug("maxVer in WAL:%"PRId64" reached current:%"PRId64", do not scan wal anymore, %s", maxVer, ver, id);
-    return TSDB_CODE_SUCCESS;
-  }
-
-  if (pReader->pHead->head.msgType == TDMT_VND_SUBMIT) {
-    void*   pBody = POINTER_SHIFT(pReader->pHead->head.body, sizeof(SSubmitReq2Msg));
-    int32_t len = pReader->pHead->head.bodyLen - sizeof(SSubmitReq2Msg);
-
-    void* data = taosMemoryMalloc(len);
-    if (data == NULL) {
-      // todo: for all stream in this vnode, keep this offset in the offset files, and wait for a moment, and then retry
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      tqError("vgId:%d, failed to copy submit data for stream processing, since out of memory", 0);
-      return -1;
-    }
-
-    memcpy(data, pBody, len);
-    SPackedData data1 = (SPackedData){.ver = ver, .msgLen = len, .msgStr = data};
-
-    *pItem = (SStreamQueueItem*)streamDataSubmitNew(&data1, STREAM_INPUT__DATA_SUBMIT);
-    if (*pItem == NULL) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      tqError("%s failed to create data submit for stream since out of memory", id);
-      return terrno;
-    }
-  } else if (pReader->pHead->head.msgType == TDMT_VND_DELETE) {
-    void*   pBody = POINTER_SHIFT(pReader->pHead->head.body, sizeof(SMsgHead));
-    int32_t len = pReader->pHead->head.bodyLen - sizeof(SMsgHead);
-
-    code = extractDelDataBlock(pBody, len, ver, (SStreamRefDataBlock**)pItem);
-    if (code != TSDB_CODE_SUCCESS) {
-      tqError("s-task:%s extract delete msg from WAL failed, code:%s", id, tstrerror(code));
-    } else {
-      tqDebug("s-task:%s delete msg extract from WAL, len:%d, ver:%"PRId64, id, len, ver);
-    }
-  } else {
-    ASSERT(0);
-  }
-
-  return 0;
 }
 
 // todo ignore the error in wal?

From 5344efe181f22160a3993051757f9a90aa3c9e8a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 24 Aug 2023 16:22:24 +0800
Subject: [PATCH 34/48] fix(stream): adjust the ptr.

---
 source/dnode/vnode/src/tq/tqRead.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index d3157dc3b0..04e3e8c0df 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -297,7 +297,6 @@ int32_t tqReaderSeek(STqReader* pReader, int64_t ver, const char* id) {
 
 int32_t extractMsgFromWal(SWalReader* pReader, void** pItem, int64_t maxVer, const char* id) {
   int32_t code = 0;
-  SWalCont* pCont = &pReader->pHead->head;
 
   while(1) {
     code = walNextValidMsg(pReader);
@@ -305,7 +304,8 @@ int32_t extractMsgFromWal(SWalReader* pReader, void** pItem, int64_t maxVer, con
       return code;
     }
 
-    int64_t ver = pCont->version;
+    SWalCont* pCont = &pReader->pHead->head;
+    int64_t   ver = pCont->version;
     if (ver > maxVer) {
       tqDebug("maxVer in WAL:%" PRId64 " reached current:%" PRId64 ", do not scan wal anymore, %s", maxVer, ver, id);
       return TSDB_CODE_SUCCESS;

From a72e6fd2196e2f369efb1c9208e2a4d426e333e8 Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Thu, 24 Aug 2023 16:32:34 +0800
Subject: [PATCH 35/48] mem leak

---
 source/dnode/mnode/impl/src/mndStream.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index a0d53ec780..716d00bcaa 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -1564,6 +1564,7 @@ static int32_t mndProcessResumeStreamReq(SRpcMsg *pReq) {
   }
 
   if (pStream->status != STREAM_STATUS__PAUSE) {
+    sdbRelease(pMnode->pSdb, pStream);
     return 0;
   }
 

From 7da464d8b7f6545017297878b5cd35d492d1f3dd Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Thu, 24 Aug 2023 16:36:58 +0800
Subject: [PATCH 36/48] mem leak

---
 source/libs/executor/src/timewindowoperator.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 16eaf0649d..ca47cee95c 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -2922,6 +2922,7 @@ void destroyStreamSessionAggOperatorInfo(void* param) {
   blockDataDestroy(pInfo->pUpdateRes);
   tSimpleHashCleanup(pInfo->pStUpdated);
   tSimpleHashCleanup(pInfo->pStDeleted);
+  pInfo->pUpdated = taosArrayDestroy(pInfo->pUpdated);
 
   taosArrayDestroy(pInfo->historyWins);
   taosMemoryFreeClear(param);

From b83cc11043334f79eac15cf220d406dfdb51205a Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 24 Aug 2023 16:38:53 +0800
Subject: [PATCH 37/48] fix:[TD-25651] reset epoch if consumer changed to avoid
 consumeing no data

---
 source/dnode/vnode/src/tq/tq.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 815e9647b5..c8da7e0b46 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -879,20 +879,8 @@ int32_t tqProcessSubscribeReq(STQ* pTq, int64_t sversion, char* msg, int32_t msg
     } else {
       tqInfo("vgId:%d switch consumer from Id:0x%" PRIx64 " to Id:0x%" PRIx64, req.vgId, pHandle->consumerId, req.newConsumerId);
       atomic_store_64(&pHandle->consumerId, req.newConsumerId);
-      //    atomic_add_fetch_32(&pHandle->epoch, 1);
+      atomic_store_32(&pHandle->epoch, 0);
 
-      // kill executing task
-      //    if(tqIsHandleExec(pHandle)) {
-      //      qTaskInfo_t pTaskInfo = pHandle->execHandle.task;
-      //      if (pTaskInfo != NULL) {
-      //        qKillTask(pTaskInfo, TSDB_CODE_SUCCESS);
-      //      }
-
-      //      if (pHandle->execHandle.subType == TOPIC_SUB_TYPE__COLUMN) {
-      //        qStreamCloseTsdbReader(pTaskInfo);
-      //      }
-      //    }
-      // remove if it has been register in the push manager, and return one empty block to consumer
       tqUnregisterPushHandle(pTq, pHandle);
       ret = tqMetaSaveHandle(pTq, req.subKey, pHandle);
     }

From 3c6870275bdd3162e3d3b204c693805d029997e6 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 24 Aug 2023 16:45:47 +0800
Subject: [PATCH 38/48] fix(parser): update the key words for disk io
 throttling.

---
 docs/en/12-taos-sql/20-keywords.md       |  2 +-
 docs/zh/12-taos-sql/20-keywords.md       |  2 +-
 include/common/ttokendef.h               |  2 +-
 source/libs/parser/inc/sql.y             |  2 +-
 source/libs/parser/src/parTokenizer.c    |  2 +-
 source/libs/parser/src/sql.c             | 12 ++++++------
 source/libs/parser/test/parShowToUse.cpp |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/en/12-taos-sql/20-keywords.md b/docs/en/12-taos-sql/20-keywords.md
index d563181b87..983d4f63c9 100644
--- a/docs/en/12-taos-sql/20-keywords.md
+++ b/docs/en/12-taos-sql/20-keywords.md
@@ -178,7 +178,7 @@ The following list shows all reserved keywords:
 
 - MATCH
 - MAX_DELAY
-- MAX_SPEED
+- BWLIMIT
 - MAXROWS
 - MERGE
 - META
diff --git a/docs/zh/12-taos-sql/20-keywords.md b/docs/zh/12-taos-sql/20-keywords.md
index f52af2f282..e7e926d0b7 100644
--- a/docs/zh/12-taos-sql/20-keywords.md
+++ b/docs/zh/12-taos-sql/20-keywords.md
@@ -178,7 +178,7 @@ description: TDengine 保留关键字的详细列表
 
 - MATCH
 - MAX_DELAY
-- MAX_SPEED
+- BWLIMIT
 - MAXROWS
 - MERGE
 - META
diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
index 8a6b7b5020..f74ced9190 100644
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@@ -113,7 +113,7 @@
 #define TK_TABLE_PREFIX                    95
 #define TK_TABLE_SUFFIX                    96
 #define TK_NK_COLON                        97
-#define TK_MAX_SPEED                       98
+#define TK_BWLIMIT                         98
 #define TK_START                           99
 #define TK_TIMESTAMP                      100
 #define TK_END                            101
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 6c3f589159..43e75e5c5a 100755
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -286,7 +286,7 @@ retention(A) ::= NK_VARIABLE(B) NK_COLON NK_VARIABLE(C).
 %type speed_opt                                                                   { int32_t }
 %destructor speed_opt                                                             { }
 speed_opt(A) ::= .                                                                { A = 0; }
-speed_opt(A) ::= MAX_SPEED NK_INTEGER(B).                                         { A = taosStr2Int32(B.z, NULL, 10); }
+speed_opt(A) ::= BWLIMIT NK_INTEGER(B).                                           { A = taosStr2Int32(B.z, NULL, 10); }
 
 start_opt(A) ::= .                                                                { A = NULL; }
 start_opt(A) ::= START WITH NK_INTEGER(B).                                        { A = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); }
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index ca7ac1a0b6..df01fe5fc8 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -137,7 +137,7 @@ static SKeyword keywordTable[] = {
     {"MATCH",                TK_MATCH},
     {"MAXROWS",              TK_MAXROWS},
     {"MAX_DELAY",            TK_MAX_DELAY},
-    {"MAX_SPEED",            TK_MAX_SPEED},
+    {"BWLIMIT",              TK_BWLIMIT},
     {"MERGE",                TK_MERGE},
     {"META",                 TK_META},
     {"ONLY",                 TK_ONLY},
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index a912fb4e71..755102395a 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -1150,7 +1150,7 @@ static const YYCODETYPE yyFallback[] = {
     0,  /* TABLE_PREFIX => nothing */
     0,  /* TABLE_SUFFIX => nothing */
     0,  /*   NK_COLON => nothing */
-    0,  /*  MAX_SPEED => nothing */
+    0,  /*  BWLIMIT => nothing */
     0,  /*      START => nothing */
     0,  /*  TIMESTAMP => nothing */
   287,  /*        END => ABORT */
@@ -1575,7 +1575,7 @@ static const char *const yyTokenName[] = {
   /*   95 */ "TABLE_PREFIX",
   /*   96 */ "TABLE_SUFFIX",
   /*   97 */ "NK_COLON",
-  /*   98 */ "MAX_SPEED",
+  /*   98 */ "BWLIMIT",
   /*   99 */ "START",
   /*  100 */ "TIMESTAMP",
   /*  101 */ "END",
@@ -2114,7 +2114,7 @@ static const char *const yyRuleName[] = {
  /* 140 */ "retention_list ::= retention_list NK_COMMA retention",
  /* 141 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE",
  /* 142 */ "speed_opt ::=",
- /* 143 */ "speed_opt ::= MAX_SPEED NK_INTEGER",
+ /* 143 */ "speed_opt ::= BWLIMIT NK_INTEGER",
  /* 144 */ "start_opt ::=",
  /* 145 */ "start_opt ::= START WITH NK_INTEGER",
  /* 146 */ "start_opt ::= START WITH NK_STRING",
@@ -3335,7 +3335,7 @@ static const YYCODETYPE yyRuleInfoLhs[] = {
    366,  /* (140) retention_list ::= retention_list NK_COMMA retention */
    369,  /* (141) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
    361,  /* (142) speed_opt ::= */
-   361,  /* (143) speed_opt ::= MAX_SPEED NK_INTEGER */
+   361,  /* (143) speed_opt ::= BWLIMIT NK_INTEGER */
    362,  /* (144) start_opt ::= */
    362,  /* (145) start_opt ::= START WITH NK_INTEGER */
    362,  /* (146) start_opt ::= START WITH NK_STRING */
@@ -3940,7 +3940,7 @@ static const signed char yyRuleInfoNRhs[] = {
    -3,  /* (140) retention_list ::= retention_list NK_COMMA retention */
    -3,  /* (141) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
     0,  /* (142) speed_opt ::= */
-   -2,  /* (143) speed_opt ::= MAX_SPEED NK_INTEGER */
+   -2,  /* (143) speed_opt ::= BWLIMIT NK_INTEGER */
     0,  /* (144) start_opt ::= */
    -3,  /* (145) start_opt ::= START WITH NK_INTEGER */
    -3,  /* (146) start_opt ::= START WITH NK_STRING */
@@ -5016,7 +5016,7 @@ static YYACTIONTYPE yy_reduce(
       case 330: /* bufsize_opt ::= */ yytestcase(yyruleno==330);
 { yymsp[1].minor.yy416 = 0; }
         break;
-      case 143: /* speed_opt ::= MAX_SPEED NK_INTEGER */
+      case 143: /* speed_opt ::= BWLIMIT NK_INTEGER */
       case 331: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ yytestcase(yyruleno==331);
 { yymsp[-1].minor.yy416 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); }
         break;
diff --git a/source/libs/parser/test/parShowToUse.cpp b/source/libs/parser/test/parShowToUse.cpp
index b7bd0e802c..4396f786ff 100644
--- a/source/libs/parser/test/parShowToUse.cpp
+++ b/source/libs/parser/test/parShowToUse.cpp
@@ -286,7 +286,7 @@ TEST_F(ParserShowToUseTest, trimDatabase) {
   run("TRIM DATABASE wxy_db");
 
   setTrimDbReq("wxy_db", 100);
-  run("TRIM DATABASE wxy_db MAX_SPEED 100");
+  run("TRIM DATABASE wxy_db BWLIMIT 100");
 }
 
 TEST_F(ParserShowToUseTest, useDatabase) {

From e5049e042f4cdf939ea14b0f00cb75c405990299 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Thu, 24 Aug 2023 17:28:41 +0800
Subject: [PATCH 39/48] undo remove operation for taosx when build taosd

---
 packaging/tools/make_install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 99315b3311..ea19125bf5 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -158,7 +158,6 @@ function install_bin() {
   ${csudo}rm -f ${bin_link_dir}/udfd || :
   ${csudo}rm -f ${bin_link_dir}/taosdemo || :
   ${csudo}rm -f ${bin_link_dir}/taosdump || :
-  ${csudo}rm -f ${bin_link_dir}/taosx || :
   ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || :
 
   if [ "$osType" != "Darwin" ]; then

From 64959f14e9440049bf4e8e2e39ef95d0230fd8c1 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 24 Aug 2023 18:18:02 +0800
Subject: [PATCH 40/48] fix:dot process in schemaless

---
 source/client/src/clientSml.c | 14 +++++++++++++-
 utils/test/c/sml_test.c       | 13 +++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index ffff3df5d0..8e5c6e7250 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -218,7 +218,16 @@ int32_t smlSetCTableName(SSmlTableInfo *oneTable) {
 
   if (strlen(oneTable->childTableName) == 0) {
     SArray       *dst = taosArrayDup(oneTable->tags, NULL);
-    RandTableName rName = {dst, oneTable->sTableName, (uint8_t)oneTable->sTableNameLen, oneTable->childTableName};
+    ASSERT(oneTable->sTableNameLen < TSDB_TABLE_NAME_LEN);
+    char superName[TSDB_TABLE_NAME_LEN] = {0};
+    RandTableName rName = {dst, NULL, (uint8_t)oneTable->sTableNameLen, oneTable->childTableName};
+    if(tsSmlDot2Underline){
+      memcpy(superName, oneTable->sTableName, oneTable->sTableNameLen);
+      smlStrReplace(superName, oneTable->sTableNameLen);
+      rName.stbFullName = superName;
+    }else{
+      rName.stbFullName = oneTable->sTableName;
+    }
 
     buildChildTableName(&rName);
     taosArrayDestroy(dst);
@@ -230,6 +239,9 @@ void getTableUid(SSmlHandle *info, SSmlLineInfo *currElement, SSmlTableInfo *tin
   char   key[TSDB_TABLE_NAME_LEN * 2 + 1] = {0};
   size_t nLen = strlen(tinfo->childTableName);
   memcpy(key, currElement->measure, currElement->measureLen);
+  if(tsSmlDot2Underline){
+    smlStrReplace(key, currElement->measureLen);
+  }
   memcpy(key + currElement->measureLen + 1, tinfo->childTableName, nLen);
   void *uid =
       taosHashGet(info->tableUids, key,
diff --git a/utils/test/c/sml_test.c b/utils/test/c/sml_test.c
index e4ed6037a3..5be9d98a7f 100644
--- a/utils/test/c/sml_test.c
+++ b/utils/test/c/sml_test.c
@@ -1533,6 +1533,7 @@ int sml_ts3724_Test() {
 
   const char *sql[] = {
       "stb.2,t1=1 f1=283i32 1632299372000",
+      "stb_2,t1=1 f1=283i32 1632299372000",
       ".stb2,t1=1 f1=106i32 1632299378000",
       "stb2.,t1=1 f1=106i32 1632299378000",
   };
@@ -1547,6 +1548,18 @@ int sml_ts3724_Test() {
   printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
   taos_free_result(pRes);
 
+  pRes = taos_query(taos, "select * from stb_2");
+  TAOS_ROW row = taos_fetch_row(pRes);
+  int numRows = taos_affected_rows(pRes);
+  ASSERT(numRows == 1);
+  taos_free_result(pRes);
+
+  pRes = taos_query(taos, "show stables");
+  row = taos_fetch_row(pRes);
+  numRows = taos_affected_rows(pRes);
+  ASSERT(numRows == 3);
+  taos_free_result(pRes);
+
   taos_close(taos);
 
   return code;

From d5cc4155420a2e93b012c56827791ea2cf7810dd Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 24 Aug 2023 18:35:53 +0800
Subject: [PATCH 41/48] fix:test case error

---
 tests/system-test/7-tmq/subscribeDb0.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system-test/7-tmq/subscribeDb0.py b/tests/system-test/7-tmq/subscribeDb0.py
index ed13fcbe06..d4dfe425dc 100644
--- a/tests/system-test/7-tmq/subscribeDb0.py
+++ b/tests/system-test/7-tmq/subscribeDb0.py
@@ -237,7 +237,7 @@ class TDTestCase:
         for i in range(expectRows):
             totalConsumeRows += resultList[i]
 
-        if totalConsumeRows != expectrowcnt:
+        if totalConsumeRows < expectrowcnt:
             tdLog.info("act consume rows: %d, expect consume rows: %d"%(totalConsumeRows, expectrowcnt))
             tdLog.exit("tmq consume rows error!")
 

From 8045f30be8b8d27f82a854f503314cb2431c48fb Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Thu, 24 Aug 2023 23:15:35 +0800
Subject: [PATCH 42/48] fix:sml test case error for tbname

---
 tests/system-test/2-query/sml_TS-3724.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system-test/2-query/sml_TS-3724.py b/tests/system-test/2-query/sml_TS-3724.py
index a8b16c4662..410e266f10 100644
--- a/tests/system-test/2-query/sml_TS-3724.py
+++ b/tests/system-test/2-query/sml_TS-3724.py
@@ -67,7 +67,7 @@ class TDTestCase:
         tdSql.query(f"select distinct tbname from {dbname}.`sys_if_bytes_out`")
         tdSql.checkRows(2)
 
-        tdSql.query(f"select * from {dbname}.t_fc70dec6677d4277c5d9799c4da806da order by times")
+        tdSql.query(f"select * from {dbname}.t_f67972b49aa8adf8bca5d0d54f0d850d order by times")
         tdSql.checkRows(2)
         tdSql.checkData(0, 1, 1.300000000)
         tdSql.checkData(1, 1, 13.000000000)

From f7b42ad41b9a301009749a67c95a20e26a47bce6 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Fri, 25 Aug 2023 09:22:29 +0800
Subject: [PATCH 43/48] fix: specify utf-8 in jdbc example pom.xml (#22565)

* fix: use latest version of jdbc connector

* fix: remove locale and timezone to avoid confusing user

* fix: update readme.md

* fix: refine demo.c

* fix: specify utf-8 in jdbc example pom.xml
---
 examples/JDBC/taosdemo/pom.xml   | 1 +
 examples/JDBC/taosdemo/readme.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/JDBC/taosdemo/pom.xml b/examples/JDBC/taosdemo/pom.xml
index 0d47663bba..ff64d3e1df 100644
--- a/examples/JDBC/taosdemo/pom.xml
+++ b/examples/JDBC/taosdemo/pom.xml
@@ -133,6 +133,7 @@
                 <configuration>
                     <source>8</source>
                     <target>8</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
 
diff --git a/examples/JDBC/taosdemo/readme.md b/examples/JDBC/taosdemo/readme.md
index edac970399..986eef8a05 100644
--- a/examples/JDBC/taosdemo/readme.md
+++ b/examples/JDBC/taosdemo/readme.md
@@ -8,4 +8,4 @@ java -jar target/taosdemo-2.0.1-jar-with-dependencies.jar -host <hostname> -data
 ```
 
 如果发生错误 Exception in thread "main" java.lang.UnsatisfiedLinkError: no taos in java.library.path
-请检查是否安装 TDengine 客户端安装包或编译 TDengine 安装。如果确定已经安装过还出现这个错误，可以在命令行 java 后加 -Djava.library.path=/usr/local/lib 来指定寻找共享库的路径。
+请检查是否安装 TDengine 客户端安装包或编译 TDengine 安装。如果确定已经安装过还出现这个错误，可以在命令行 java 后加 -Djava.library.path=/usr/lib 来指定寻找共享库的路径。

From 250a8a7c39f664678a88973906eab40be33d3076 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Fri, 25 Aug 2023 10:06:59 +0800
Subject: [PATCH 44/48] fix: taosCompressFile mem leak

---
 source/os/src/osFile.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c
index dd670595f0..ede1f1fb0e 100644
--- a/source/os/src/osFile.c
+++ b/source/os/src/osFile.c
@@ -885,13 +885,16 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
   char   *data = taosMemoryMalloc(compressSize);
   gzFile  dstFp = NULL;
 
-  TdFilePtr pSrcFile = taosOpenFile(srcFileName, TD_FILE_READ | TD_FILE_STREAM);
+  TdFilePtr pFile = NULL;
+  TdFilePtr pSrcFile = NULL;
+
+  pSrcFile = taosOpenFile(srcFileName, TD_FILE_READ | TD_FILE_STREAM);
   if (pSrcFile == NULL) {
     ret = -1;
     goto cmp_end;
   }
 
-  TdFilePtr pFile = taosOpenFile(destFileName, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
+  pFile = taosOpenFile(destFileName, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_TRUNC);
   if (pFile == NULL) {
     ret = -2;
     goto cmp_end;
@@ -910,6 +913,9 @@ int32_t taosCompressFile(char *srcFileName, char *destFileName) {
    }
 
 cmp_end:
+  if (pFile) {
+     taosCloseFile(&pFile);
+  }
   if (pSrcFile) {
     taosCloseFile(&pSrcFile);
   }

From 29aaf1c86857fb11ef21423da0dc2d81040c4389 Mon Sep 17 00:00:00 2001
From: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com>
Date: Fri, 25 Aug 2023 10:51:17 +0800
Subject: [PATCH 45/48] Update 06-taosdump.md dot replace with '-Q'

---
 docs/zh/14-reference/06-taosdump.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zh/14-reference/06-taosdump.md b/docs/zh/14-reference/06-taosdump.md
index 12122edd32..9fe3c5af7a 100644
--- a/docs/zh/14-reference/06-taosdump.md
+++ b/docs/zh/14-reference/06-taosdump.md
@@ -105,6 +105,8 @@ Usage: taosdump [OPTION...] dbname [tbname ...]
   -L, --loose-mode           Using loose mode if the table name and column name
                              use letter and number only. Default is NOT.
   -n, --no-escape            No escape char '`'. Default is using it.
+  -Q, --dot-replace          Repalce dot character with underline character in
+                             the table name.
   -T, --thread-num=THREAD_NUM   Number of thread for dump in file. Default is
                              8.
   -C, --cloud=CLOUD_DSN      specify a DSN to access TDengine cloud service

From acc12036a561aafebae5f02bde87b9629ac2bfca Mon Sep 17 00:00:00 2001
From: Alex Duan <51781608+DuanKuanJun@users.noreply.github.com>
Date: Fri, 25 Aug 2023 10:53:14 +0800
Subject: [PATCH 46/48] Update 06-taosdump.md dot replace with '-Q' (English)

---
 docs/en/14-reference/06-taosdump.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/en/14-reference/06-taosdump.md b/docs/en/14-reference/06-taosdump.md
index 6d5547e7a9..baf07d6b9e 100644
--- a/docs/en/14-reference/06-taosdump.md
+++ b/docs/en/14-reference/06-taosdump.md
@@ -102,6 +102,8 @@ Usage: taosdump [OPTION...] dbname [tbname ...]
   -L, --loose-mode           Use loose mode if the table name and column name
                              use letter and number only. Default is NOT.
   -n, --no-escape            No escape char '`'. Default is using it.
+  -Q, --dot-replace          Repalce dot character with underline character in
+                             the table name.
   -T, --thread-num=THREAD_NUM   Number of thread for dump in file. Default is
                              8.
   -C, --cloud=CLOUD_DSN      specify a DSN to access TDengine cloud service

From e1095e7d02fc2f419293f58ffdf082d21d97f117 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 25 Aug 2023 14:40:29 +0800
Subject: [PATCH 47/48] fix: improve upgrade speed

---
 source/dnode/vnode/src/tsdb/tsdbUpgrade.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbUpgrade.c b/source/dnode/vnode/src/tsdb/tsdbUpgrade.c
index 59ba51c371..3f1fcb7248 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUpgrade.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUpgrade.c
@@ -120,7 +120,15 @@ static int32_t tsdbUpgradeHead(STsdb *tsdb, SDFileSet *pDFileSet, SDataFReader *
         };
 
         if (dataBlk->hasDup) {
-          code = tsdbReadDataBlockEx(reader, dataBlk, ctx->blockData);
+          tBlockDataReset(ctx->blockData);
+
+          int16_t  aCid = 0;
+          STSchema tSchema = {0};
+          TABLEID  tbid = {.suid = pBlockIdx->suid, .uid = pBlockIdx->uid};
+          code = tBlockDataInit(ctx->blockData, &tbid, &tSchema, &aCid, 0);
+          TSDB_CHECK_CODE(code, lino, _exit);
+
+          code = tsdbReadDataBlock(reader, dataBlk, ctx->blockData);
           TSDB_CHECK_CODE(code, lino, _exit);
 
           record.count = 1;
@@ -334,6 +342,8 @@ static int32_t tsdbUpgradeFileSet(STsdb *tsdb, SDFileSet *pDFileSet, TFileSetArr
   int32_t code = 0;
   int32_t lino = 0;
 
+  tsdbInfo("vgId:%d upgrade file set start, fid:%d", TD_VID(tsdb->pVnode), pDFileSet->fid);
+
   SDataFReader *reader;
   STFileSet    *fset;
 
@@ -366,6 +376,8 @@ static int32_t tsdbUpgradeFileSet(STsdb *tsdb, SDFileSet *pDFileSet, TFileSetArr
   code = TARRAY2_APPEND(fileSetArray, fset);
   TSDB_CHECK_CODE(code, lino, _exit);
 
+  tsdbInfo("vgId:%d upgrade file set end, fid:%d", TD_VID(tsdb->pVnode), pDFileSet->fid);
+
 _exit:
   if (code) {
     TSDB_ERROR_LOG(TD_VID(tsdb->pVnode), lino, code);

From 1bf2c3421dc5901f8883874355313a60bce6964d Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sun, 27 Aug 2023 00:05:44 +0800
Subject: [PATCH 48/48] docs: kill query command need quote around id (#22588)

* docs: add current_user() in function

* docs: kill query command need quote around id
---
 docs/en/12-taos-sql/28-recovery.md | 2 +-
 docs/zh/12-taos-sql/28-recovery.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/12-taos-sql/28-recovery.md b/docs/en/12-taos-sql/28-recovery.md
index b4da25ea0c..1c1838f616 100644
--- a/docs/en/12-taos-sql/28-recovery.md
+++ b/docs/en/12-taos-sql/28-recovery.md
@@ -17,7 +17,7 @@ You can use the SHOW CONNECTIONS statement to find the conn_id.
 ## Terminate a Query
 
 ```sql
-KILL QUERY kill_id;
+KILL QUERY 'kill_id';
 ```
 
 You can use the SHOW QUERIES statement to find the kill_id.
diff --git a/docs/zh/12-taos-sql/28-recovery.md b/docs/zh/12-taos-sql/28-recovery.md
index b5088e7982..8e327afe0b 100644
--- a/docs/zh/12-taos-sql/28-recovery.md
+++ b/docs/zh/12-taos-sql/28-recovery.md
@@ -17,7 +17,7 @@ conn_id 可以通过 `SHOW CONNECTIONS` 获取。
 ## 终止查询
 
 ```sql
-KILL QUERY kill_id;
+KILL QUERY 'kill_id';
 ```
 
 kill_id 可以通过 `SHOW QUERIES` 获取。