From 92eb1e96717292b08cae53094a265645ba6c0c91 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Fri, 22 Sep 2023 16:08:37 +0800
Subject: [PATCH 01/22] test: check error info of failed sql

---
 tests/pytest/util/sql.py                     | 18 +++++++++++-------
 tests/system-test/0-others/show_tag_index.py |  7 +++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index eb64f7f316..7dcf6bc3f2 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -78,7 +78,7 @@ class TDSql:
         self.cursor.execute(s)
         time.sleep(2)
 
-    def error(self, sql, expectedErrno = None):
+    def error(self, sql, expectedErrno = None, expectErrInfo = None):
         caller = inspect.getframeinfo(inspect.stack()[1][0])
         expectErrNotOccured = True
 
@@ -87,12 +87,9 @@ class TDSql:
         except BaseException as e:
             expectErrNotOccured = False
             self.errno = e.errno
-            self.error_info = repr(e)
-            # print(error_info)
-            # self.error_info = error_info[error_info.index('(')+1:-1].split(",")[0].replace("'","")
+            error_info = repr(e)
+            self.error_info = error_info[error_info.index('(')+1:-1].split(",")[0].replace("'","")
             # self.error_info = (','.join(error_info.split(",")[:-1]).split("(",1)[1:][0]).replace("'","")
-            # print("!!!!!!!!!!!!!!",self.error_info)
-
         if expectErrNotOccured:
             tdLog.exit("%s(%d) failed: sql:%s, expect error not occured" % (caller.filename, caller.lineno, sql))
         else:
@@ -108,8 +105,15 @@ class TDSql:
             else:
               tdLog.info("sql:%s, expect error occured" % (sql))
 
-            return self.error_info
+            if expectErrInfo != None:
+                if  expectErrInfo == self.error_info:
+                    tdLog.info("sql:%s, expected expectErrInfo %s occured" % (sql, expectErrInfo))
+                else:
+                  tdLog.exit("%s(%d) failed: sql:%s, expectErrInfo %s occured, but not expected errno %s" % (caller.filename, caller.lineno, sql, self.error_info, expectErrInfo))
+            else:
+              tdLog.info("sql:%s, expect error occured" % (sql))
 
+            return self.error_info
 
     def query(self, sql, row_tag=None, queryTimes=10, count_expected_res=None):
         self.sql = sql
diff --git a/tests/system-test/0-others/show_tag_index.py b/tests/system-test/0-others/show_tag_index.py
index d39f9eaab9..c79880ba35 100644
--- a/tests/system-test/0-others/show_tag_index.py
+++ b/tests/system-test/0-others/show_tag_index.py
@@ -180,6 +180,13 @@ class TDTestCase:
         tdSql.error(f'show indexes from db.ctb1 from db')
         tdSql.error(f'show indexes from `db`.`ctb1` from db')
 
+        # check error information
+        tdSql.error(f'create index idx1 on db2.stb (t1);', expectErrInfo='Database not exist')
+        tdSql.error(f'use db2;', expectErrInfo='Database not exist')
+        tdSql.error(f' alter stable db2.stb add column c2 int;', expectErrInfo='Database not exist')
+
+        
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

From 09f74cc9ad4ed91b140eb4715ce51cc9ce7d871f Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Fri, 22 Sep 2023 18:47:16 +0800
Subject: [PATCH 02/22] fix/TD-26434

---
 include/libs/audit/audit.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/libs/audit/audit.h b/include/libs/audit/audit.h
index 11b1eacd91..2ce329ec70 100644
--- a/include/libs/audit/audit.h
+++ b/include/libs/audit/audit.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#define AUDIT_DETAIL_MAX 64000
+#define AUDIT_DETAIL_MAX 65536
 
 typedef struct {
   const char *server;

From ab19aadea5a190963be7b533b594d7290098ba42 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Mon, 25 Sep 2023 15:02:46 +0800
Subject: [PATCH 03/22] update packaging script

---
 packaging/tools/install.sh | 35 +++++++++++++++++++++++++---
 packaging/tools/remove.sh  | 47 ++++++++++++++++++++------------------
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 19efa7b169..0a11ef3a53 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -33,14 +33,17 @@ adapterName="taosadapter"
 benchmarkName="taosBenchmark"
 dumpName="taosdump"
 demoName="taosdemo"
+xname="taosx"
 
 clientName2="taos"
 serverName2="${clientName2}d"
 configFile2="${clientName2}.cfg"
 productName2="TDengine"
 emailName2="taosdata.com"
+xname2="${clientName2}x"
 adapterName2="${clientName2}adapter"
 
+explorerName="${clientName2}-explorer"
 benchmarkName2="${clientName2}Benchmark"
 demoName2="${clientName2}demo"
 dumpName2="${clientName2}dump"
@@ -235,6 +238,12 @@ function install_bin() {
   [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 
   if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
+    ${csudo}rm -f ${bin_link_dir}/${xname2} || :
+    ${csudo}rm -f ${bin_link_dir}/${explorerName} || :
+
+    #Make link
+    [ -x ${install_main_dir}/bin/${xname2} ] && ${csudo}ln -sf ${install_main_dir}/bin/${xname2} ${bin_link_dir}/${xname2} || :
+    [ -x ${install_main_dir}/bin/${explorerName} ] && ${csudo}ln -sf ${install_main_dir}/bin/${explorerName} ${bin_link_dir}/${explorerName} || :
     [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript2} || :
   fi
 }
@@ -693,9 +702,29 @@ function clean_service_on_systemd() {
   fi
   ${csudo}systemctl disable tarbitratord &>/dev/null || echo &>/dev/null
   ${csudo}rm -f ${tarbitratord_service_config}
-  # if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
-  #     ${csudo}rm -f ${service_config_dir}/${serverName2}.service
-  # fi
+  
+  if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
+    x_service_config="${service_config_dir}/${xName2}.service"
+    if [ -e "$x_service_config" ]; then
+      if systemctl is-active --quiet ${xName2}; then
+        echo "${productName2} ${xName2} is running, stopping it..."
+        ${csudo}systemctl stop ${xName2} &>/dev/null || echo &>/dev/null
+      fi
+      ${csudo}systemctl disable ${xName2} &>/dev/null || echo &>/dev/null
+      ${csudo}rm -f ${x_service_config}
+    fi
+
+    explorer_service_config="${service_config_dir}/${explorerName2}.service"
+    if [ -e "$explorer_service_config" ]; then
+      if systemctl is-active --quiet ${explorerName2}; then
+        echo "${productName2} ${explorerName2} is running, stopping it..."
+        ${csudo}systemctl stop ${explorerName2} &>/dev/null || echo &>/dev/null
+      fi
+      ${csudo}systemctl disable ${explorerName2} &>/dev/null || echo &>/dev/null
+      ${csudo}rm -f ${explorer_service_config}
+      ${csudo}rm -f /etc/${clientName2}/explorer.toml
+    fi
+  fi
 }
 
 function install_service_on_systemd() {
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index 0e8b036f28..97bffb0535 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -123,10 +123,11 @@ function clean_bin() {
   ${csudo}rm -f ${bin_link_dir}/set_core || :
   ${csudo}rm -f ${bin_link_dir}/TDinsight.sh || :
   ${csudo}rm -f ${bin_link_dir}/${keeperName2}      || :
-  # ${csudo}rm -f ${bin_link_dir}/${xName2}           || :
-  # ${csudo}rm -f ${bin_link_dir}/${explorerName2}    || :
+  
 
   if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
+    ${csudo}rm -f ${bin_link_dir}/${xName2}           || :
+    ${csudo}rm -f ${bin_link_dir}/${explorerName2}    || :
     ${csudo}rm -f ${bin_link_dir}/${clientName2} || :
     ${csudo}rm -f ${bin_link_dir}/${benchmarkName2} || :
     ${csudo}rm -f ${bin_link_dir}/${dumpName2} || :
@@ -194,27 +195,29 @@ function clean_service_on_systemd() {
     ${csudo}systemctl stop ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
   fi
   ${csudo}systemctl disable ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
+  
+  if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then
+    x_service_config="${service_config_dir}/${xName2}.service"
+    if [ -e "$x_service_config" ]; then
+      if systemctl is-active --quiet ${xName2}; then
+        echo "${productName2} ${xName2} is running, stopping it..."
+        ${csudo}systemctl stop ${xName2} &>/dev/null || echo &>/dev/null
+      fi
+      ${csudo}systemctl disable ${xName2} &>/dev/null || echo &>/dev/null
+      ${csudo}rm -f ${x_service_config}
+    fi
 
-  # x_service_config="${service_config_dir}/${xName2}.service"
-  # if [ -e "$x_service_config" ]; then
-  #   if systemctl is-active --quiet ${xName2}; then
-  #     echo "${productName2} ${xName2} is running, stopping it..."
-  #     ${csudo}systemctl stop ${xName2} &>/dev/null || echo &>/dev/null
-  #   fi
-  #   ${csudo}systemctl disable ${xName2} &>/dev/null || echo &>/dev/null
-  #   ${csudo}rm -f ${x_service_config}
-  # fi
-
-  # explorer_service_config="${service_config_dir}/${explorerName2}.service"
-  # if [ -e "$explorer_service_config" ]; then
-  #   if systemctl is-active --quiet ${explorerName2}; then
-  #     echo "${productName2} ${explorerName2} is running, stopping it..."
-  #     ${csudo}systemctl stop ${explorerName2} &>/dev/null || echo &>/dev/null
-  #   fi
-  #   ${csudo}systemctl disable ${explorerName2} &>/dev/null || echo &>/dev/null
-  #   ${csudo}rm -f ${explorer_service_config}
-  #   ${csudo}rm -f /etc/${clientName2}/explorer.toml
-  # fi
+    explorer_service_config="${service_config_dir}/${explorerName2}.service"
+    if [ -e "$explorer_service_config" ]; then
+      if systemctl is-active --quiet ${explorerName2}; then
+        echo "${productName2} ${explorerName2} is running, stopping it..."
+        ${csudo}systemctl stop ${explorerName2} &>/dev/null || echo &>/dev/null
+      fi
+      ${csudo}systemctl disable ${explorerName2} &>/dev/null || echo &>/dev/null
+      ${csudo}rm -f ${explorer_service_config}
+      ${csudo}rm -f /etc/${clientName2}/explorer.toml
+    fi
+  fi
 }
 
 function clean_service_on_sysvinit() {

From 83c58a25cb4702796a17a5ab2d981e564a539464 Mon Sep 17 00:00:00 2001
From: liuyao <54liuyao@163.com>
Date: Mon, 25 Sep 2023 16:58:23 +0800
Subject: [PATCH 04/22] ignore udpate check

---
 source/libs/executor/src/scanoperator.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 474128007a..805635f603 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2217,7 +2217,9 @@ FETCH_NEXT_BLOCK:
         if (pSDB) {
           STableScanInfo* pTableScanInfo = pInfo->pTableScanOp->info;
           pSDB->info.type = pInfo->scanMode == STREAM_SCAN_FROM_DATAREADER_RANGE ? STREAM_NORMAL : STREAM_PULL_DATA;
-          checkUpdateData(pInfo, true, pSDB, false);
+          if (!pInfo->igCheckUpdate && pInfo->pUpdateInfo) {
+            checkUpdateData(pInfo, true, pSDB, false);
+          }
           printSpecDataBlock(pSDB, getStreamOpName(pOperator->operatorType), "update", GET_TASKID(pTaskInfo));
           calBlockTbName(pInfo, pSDB);
           return pSDB;

From 5d588cb7d2eab2f23e6fada7d41e7b19a6abf2f1 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Mon, 25 Sep 2023 17:14:22 +0800
Subject: [PATCH 05/22] enh: trigger failover if tsdbMerge failure

---
 source/dnode/vnode/src/tsdb/tsdbMerge.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/dnode/vnode/src/tsdb/tsdbMerge.c b/source/dnode/vnode/src/tsdb/tsdbMerge.c
index ec0ea3c60f..98bfd6fb45 100644
--- a/source/dnode/vnode/src/tsdb/tsdbMerge.c
+++ b/source/dnode/vnode/src/tsdb/tsdbMerge.c
@@ -447,6 +447,9 @@ int32_t tsdbMerge(void *arg) {
 _exit:
   if (code) {
     TSDB_ERROR_LOG(TD_VID(tsdb->pVnode), lino, code);
+    tsdbFatal("vgId:%d, failed to merge stt files since %s. code:%d", TD_VID(tsdb->pVnode), terrstr(), code);
+    taosMsleep(100);
+    exit(EXIT_FAILURE);
   } else if (merger->ctx->opened) {
     tsdbDebug("vgId:%d %s done", TD_VID(tsdb->pVnode), __func__);
   }

From 6f5689b0d6a5748a46e1f297c82d1517f6ff1d54 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Mon, 25 Sep 2023 18:53:22 +0800
Subject: [PATCH 06/22] fix: net_in/net_out

---
 source/os/src/osSysinfo.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 5f73251e3b..eab93dcc35 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -798,13 +798,12 @@ void taosGetProcIODelta(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, i
 }
 
 int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
-#ifdef WINDOWS
   *receive_bytes = 0;
   *transmit_bytes = 0;
+
+#ifdef WINDOWS
   return 0;
 #elif defined(_TD_DARWIN_64)
-  *receive_bytes = 0;
-  *transmit_bytes = 0;
   return 0;
 #else
   TdFilePtr pFile = taosOpenFile(tsSysNetFile, TD_FILE_READ | TD_FILE_STREAM);
@@ -841,8 +840,8 @@ int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
            "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64
            " %" PRId64,
            nouse0, &o_rbytes, &rpackts, &nouse1, &nouse2, &nouse3, &nouse4, &nouse5, &nouse6, &o_tbytes, &tpackets);
-    *receive_bytes = o_rbytes;
-    *transmit_bytes = o_tbytes;
+    *receive_bytes += o_rbytes;
+    *transmit_bytes += o_tbytes;
   }
 
   taosCloseFile(&pFile);
@@ -854,8 +853,8 @@ int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
 void taosGetCardInfoDelta(int64_t *receive_bytes, int64_t *transmit_bytes) {
   static int64_t last_receive_bytes = 0;
   static int64_t last_transmit_bytes = 0;
-  static int64_t cur_receive_bytes = 0;
-  static int64_t cur_transmit_bytes = 0;
+  int64_t cur_receive_bytes = 0;
+  int64_t cur_transmit_bytes = 0;
   if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) == 0) {
     *receive_bytes = cur_receive_bytes - last_receive_bytes;
     *transmit_bytes = cur_transmit_bytes - last_transmit_bytes;

From ffa07cbdb0a5b6d19dc69ec421bf2f3509c31608 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Mon, 25 Sep 2023 19:21:34 +0800
Subject: [PATCH 07/22] detail length

---
 include/libs/audit/audit.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/libs/audit/audit.h b/include/libs/audit/audit.h
index 2ce329ec70..85d462b96b 100644
--- a/include/libs/audit/audit.h
+++ b/include/libs/audit/audit.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#define AUDIT_DETAIL_MAX 65536
+#define AUDIT_DETAIL_MAX 65472
 
 typedef struct {
   const char *server;

From 03456ce443a15c2cee3c3279666b92b62c97f3cf Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 26 Sep 2023 09:23:22 +0800
Subject: [PATCH 08/22] fix: upgrade error when has tomb data

---
 include/util/tarray2.h                  | 2 ++
 source/dnode/vnode/src/tsdb/tsdbFS2.c   | 1 +
 source/dnode/vnode/src/tsdb/tsdbFSet2.c | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/include/util/tarray2.h b/include/util/tarray2.h
index cd49e64789..a8d460785f 100644
--- a/include/util/tarray2.h
+++ b/include/util/tarray2.h
@@ -165,6 +165,8 @@ static FORCE_INLINE int32_t tarray2SortInsert(void *arr, const void *elePtr, int
 #define TARRAY2_FOREACH_PTR_REVERSE(a, ep) \
   for (int32_t __i = (a)->size - 1; __i >= 0 && ((ep) = &(a)->data[__i], 1); __i--)
 
+#define TARRAY2_SORT(a, cmp) taosSort((a)->data, (a)->size, sizeof((a)->data[0]), (__compar_fn_t)cmp)
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS2.c b/source/dnode/vnode/src/tsdb/tsdbFS2.c
index f43bb52d05..5e5348e9b5 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS2.c
@@ -236,6 +236,7 @@ static int32_t load_fs(STsdb *pTsdb, const char *fname, TFileSetArray *arr) {
       code = TARRAY2_APPEND(arr, fset);
       TSDB_CHECK_CODE(code, lino, _exit);
     }
+    TARRAY2_SORT(arr, tsdbTFileSetCmprFn);
   } else {
     code = TSDB_CODE_FILE_CORRUPTED;
     TSDB_CHECK_CODE(code, lino, _exit);
diff --git a/source/dnode/vnode/src/tsdb/tsdbFSet2.c b/source/dnode/vnode/src/tsdb/tsdbFSet2.c
index 37c7e2ffc1..cd47a54973 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFSet2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFSet2.c
@@ -189,6 +189,7 @@ static int32_t tsdbJsonToSttLvl(STsdb *pTsdb, const cJSON *json, SSttLvl **lvl)
     code = TARRAY2_APPEND(lvl[0]->fobjArr, fobj);
     if (code) return code;
   }
+  TARRAY2_SORT(lvl[0]->fobjArr, tsdbTFileObjCmpr);
   return 0;
 }
 
@@ -268,6 +269,7 @@ int32_t tsdbJsonToTFileSet(STsdb *pTsdb, const cJSON *json, STFileSet **fset) {
       code = TARRAY2_APPEND((*fset)->lvlArr, lvl);
       if (code) return code;
     }
+    TARRAY2_SORT((*fset)->lvlArr, tsdbSttLvlCmprFn);
   } else {
     return TSDB_CODE_FILE_CORRUPTED;
   }

From 9e8d761813e21406665c8d923c93512b74c9a8f3 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 26 Sep 2023 11:08:20 +0800
Subject: [PATCH 09/22] more fix

---
 include/util/tarray2.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/util/tarray2.h b/include/util/tarray2.h
index a8d460785f..2e9b0c7cb5 100644
--- a/include/util/tarray2.h
+++ b/include/util/tarray2.h
@@ -165,7 +165,12 @@ static FORCE_INLINE int32_t tarray2SortInsert(void *arr, const void *elePtr, int
 #define TARRAY2_FOREACH_PTR_REVERSE(a, ep) \
   for (int32_t __i = (a)->size - 1; __i >= 0 && ((ep) = &(a)->data[__i], 1); __i--)
 
-#define TARRAY2_SORT(a, cmp) taosSort((a)->data, (a)->size, sizeof((a)->data[0]), (__compar_fn_t)cmp)
+#define TARRAY2_SORT(a, cmp)                                                    \
+  do {                                                                          \
+    if ((a)->size > 1) {                                                        \
+      taosSort((a)->data, (a)->size, sizeof((a)->data[0]), (__compar_fn_t)cmp); \
+    }                                                                           \
+  } while (0)
 
 #ifdef __cplusplus
 }

From e1cd54a1b33aab2273458bca3ba6bcb0995aba50 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 26 Sep 2023 15:44:35 +0800
Subject: [PATCH 10/22] fix: rwlock reentrant problem on windows

---
 source/dnode/vnode/src/tsdb/tsdbRead2.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index e2123df3a8..f581623e86 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -4899,6 +4899,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
   // alloc
   STsdbReadSnap* pSnap = (STsdbReadSnap*)taosMemoryCalloc(1, sizeof(STsdbReadSnap));
   if (pSnap == NULL) {
+    taosThreadRwlockUnlock(&pTsdb->rwLock);
     code = TSDB_CODE_OUT_OF_MEMORY;
     goto _exit;
   }
@@ -4908,6 +4909,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
     pSnap->pMem = pTsdb->mem;
     pSnap->pNode = taosMemoryMalloc(sizeof(*pSnap->pNode));
     if (pSnap->pNode == NULL) {
+      taosThreadRwlockUnlock(&pTsdb->rwLock);
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _exit;
     }
@@ -4922,6 +4924,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
     pSnap->pIMem = pTsdb->imem;
     pSnap->pINode = taosMemoryMalloc(sizeof(*pSnap->pINode));
     if (pSnap->pINode == NULL) {
+      taosThreadRwlockUnlock(&pTsdb->rwLock);
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _exit;
     }
@@ -4932,6 +4935,9 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
     tsdbRefMemTable(pTsdb->imem, pSnap->pINode);
   }
 
+  // unlock
+  taosThreadRwlockUnlock(&pTsdb->rwLock);
+
   // fs
   code = tsdbFSCreateRefSnapshot(pTsdb->pFS, &pSnap->pfSetArray);
   if (code == TSDB_CODE_SUCCESS) {
@@ -4939,8 +4945,6 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
   }
 
 _exit:
-  taosThreadRwlockUnlock(&pTsdb->rwLock);
-
   if (code != TSDB_CODE_SUCCESS) {
     tsdbError("vgId:%d take read snapshot failed, code:%s", TD_VID(pTsdb->pVnode), tstrerror(code));
 

From 5a28981d500687c09b490a898318b9e6e1120286 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Tue, 26 Sep 2023 16:00:56 +0800
Subject: [PATCH 11/22] fix: set null when creating empty input for count

---
 source/libs/executor/src/aggregateoperator.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/libs/executor/src/aggregateoperator.c b/source/libs/executor/src/aggregateoperator.c
index f6a8c6689f..19ec092acc 100644
--- a/source/libs/executor/src/aggregateoperator.c
+++ b/source/libs/executor/src/aggregateoperator.c
@@ -334,6 +334,7 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc
     colInfo.info.type = TSDB_DATA_TYPE_NULL;
     colInfo.info.bytes = 1;
 
+
     SExprInfo* pOneExpr = &pOperator->exprSupp.pExprInfo[i];
     for (int32_t j = 0; j < pOneExpr->base.numOfParams; ++j) {
       SFunctParam* pFuncParam = &pOneExpr->base.pParam[j];
@@ -353,6 +354,10 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc
   }
 
   blockDataEnsureCapacity(pBlock, pBlock->info.rows);
+  for (int32_t i = 0; i < blockDataGetNumOfCols(pBlock); ++i) {
+    SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+    colDataSetNULL(pColInfoData, 0);
+  }
   *ppBlock = pBlock;
 
   return TSDB_CODE_SUCCESS;

From 17e1da0be727870a0a921788ac96ff41d2874651 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 26 Sep 2023 16:53:29 +0800
Subject: [PATCH 12/22] fix: log typo

---
 source/libs/catalog/src/catalog.c  | 2 +-
 source/libs/catalog/src/ctgAsync.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index f975517669..44854d334b 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -165,7 +165,7 @@ int32_t ctgRefreshTbMeta(SCatalog* pCtg, SRequestConnInfo* pConn, SCtgTbMetaCtx*
   }
 
   if (CTG_IS_META_NULL(output->metaType)) {
-    ctgError("no tbmeta got, tbNmae:%s", tNameGetTableName(ctx->pName));
+    ctgError("no tbmeta got, tbName:%s", tNameGetTableName(ctx->pName));
     ctgRemoveTbMetaFromCache(pCtg, ctx->pName, false);
     CTG_ERR_JRET(CTG_ERR_CODE_TABLE_NOT_EXIST);
   }
diff --git a/source/libs/catalog/src/ctgAsync.c b/source/libs/catalog/src/ctgAsync.c
index fb5ecf7ad2..ba7106ea51 100644
--- a/source/libs/catalog/src/ctgAsync.c
+++ b/source/libs/catalog/src/ctgAsync.c
@@ -1171,7 +1171,7 @@ int32_t ctgHandleGetTbMetaRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBuf
       STableMetaOutput* pOut = (STableMetaOutput*)pMsgCtx->out;
 
       if (CTG_IS_META_NULL(pOut->metaType)) {
-        ctgError("no tbmeta got, tbNmae:%s", tNameGetTableName(pName));
+        ctgError("no tbmeta got, tbName:%s", tNameGetTableName(pName));
         ctgRemoveTbMetaFromCache(pCtg, pName, false);
         CTG_ERR_JRET(CTG_ERR_CODE_TABLE_NOT_EXIST);
       }
@@ -1341,7 +1341,7 @@ int32_t ctgHandleGetTbMetasRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBu
       STableMetaOutput* pOut = (STableMetaOutput*)pMsgCtx->out;
 
       if (CTG_IS_META_NULL(pOut->metaType)) {
-        ctgTaskError("no tbmeta got, tbNmae:%s", tNameGetTableName(pName));
+        ctgTaskError("no tbmeta got, tbName:%s", tNameGetTableName(pName));
         ctgRemoveTbMetaFromCache(pCtg, pName, false);
         CTG_ERR_JRET(CTG_ERR_CODE_TABLE_NOT_EXIST);
       }

From a4c161175521c0e05eeb65925a69d9219f00f271 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Tue, 26 Sep 2023 11:06:44 +0000
Subject: [PATCH 13/22] TD-26432

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

diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index 76e11cad8a..ee3dd5a06d 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -2265,7 +2265,7 @@ static int32_t mndProcessAlterStbReq(SRpcMsg *pReq) {
   SName name = {0};
   tNameFromString(&name, alterReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
 
-  auditRecord(pReq, pMnode->clusterId, "alterStb", name.dbname, alterReq.name, alterReq.sql, alterReq.sqlLen);
+  auditRecord(pReq, pMnode->clusterId, "alterStb", name.dbname, name.tname, alterReq.sql, alterReq.sqlLen);
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {

From 7045509061646ad76b59d4fd4675586886f25148 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 27 Sep 2023 09:44:54 +0800
Subject: [PATCH 14/22] fix: add test case

---
 tests/parallel_test/cases.task           |  1 +
 tests/script/tsim/query/count_spread.sim | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 tests/script/tsim/query/count_spread.sim

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index c3ad3130fd..bb5a8f0b30 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -993,6 +993,7 @@
 ,,y,script,./test.sh -f tsim/query/udf_with_const.sim
 ,,y,script,./test.sh -f tsim/query/join_interval.sim
 ,,y,script,./test.sh -f tsim/query/join_pk.sim
+,,y,script,./test.sh -f tsim/query/count_spread.sim
 ,,y,script,./test.sh -f tsim/query/unionall_as_table.sim
 ,,y,script,./test.sh -f tsim/query/multi_order_by.sim
 ,,y,script,./test.sh -f tsim/query/sys_tbname.sim
diff --git a/tests/script/tsim/query/count_spread.sim b/tests/script/tsim/query/count_spread.sim
new file mode 100644
index 0000000000..c03783b7fe
--- /dev/null
+++ b/tests/script/tsim/query/count_spread.sim
@@ -0,0 +1,24 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create database test;
+sql use test;
+sql create table st(ts timestamp, f int) tags(t int);
+sql insert into ct1 using st tags(1) values(now, 0)(now+1s, 1)(now+2s, 10)(now+3s, 11)
+sql insert into ct2 using st tags(2) values(now+2s, 2)(now+3s, 3)
+sql insert into ct3 using st tags(3) values(now+4s, 4)(now+5s, 5)
+sql insert into ct4 using st tags(4) values(now+6s, 6)(now+7s, 7)
+
+sql select count(*), spread(ts) from st where tbname='ct1' 
+print $data00, $data01
+if $data00 != @4@ then
+  return -1
+endi
+if $data01 != @3000.000000000@ then
+  return -1
+endi
+
+sql drop database test;
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

From 9ab89ef961924ffa015e02f8ae0d9d58f4153e13 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 27 Sep 2023 15:26:46 +0800
Subject: [PATCH 15/22] fix(stream): fix dead lock.

---
 source/libs/stream/src/streamBackendRocksdb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index 85494693c1..892930c32b 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -794,7 +794,10 @@ int32_t chkpGetAllDbCfHandle(SStreamMeta* pMeta, rocksdb_column_family_handle_t*
     int64_t id = *(int64_t*)pIter;
 
     SBackendCfWrapper* wrapper = taosAcquireRef(streamBackendCfWrapperId, id);
-    if (wrapper == NULL) continue;
+    if (wrapper == NULL) {
+      pIter = taosHashIterate(pMeta->pTaskBackendUnique, pIter);
+      continue;
+    }
 
     taosThreadRwlockRdlock(&wrapper->rwLock);
     for (int i = 0; i < sizeof(ginitDict) / sizeof(ginitDict[0]); i++) {

From d5df76fc8c61ba02f938a1bbffa42c82a87043ea Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Wed, 27 Sep 2023 15:39:43 +0800
Subject: [PATCH 16/22] fix: timestamp add return float when get time range

---
 source/libs/scalar/src/filter.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 12729c3262..588fe24c2c 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -3983,18 +3983,14 @@ _return:
   return code;
 }
 
-static int32_t fltSclGetDatumValueFromPoint(SFltSclPoint *point, SFltSclDatum *d) {
+static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) {
   *d = point->val;
-  if (point->val.kind == FLT_SCL_DATUM_KIND_NULL) {
-    return TSDB_CODE_SUCCESS;
-  }
-  if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
-    getDataMax(d->type.type, &(d->i));
-  } else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) {
-    getDataMin(d->type.type, &(d->i));
-  }
 
-  if (IS_INTEGER_TYPE(d->type.type) || IS_TIMESTAMP_TYPE(d->type.type)) {
+  if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
+    getDataMax(point->val.type.type, &(d->i));
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) {
+    getDataMin(point->val.type.type, &(d->i));
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_INT64) {
     if (point->excl) {
       if (point->start) {
         ++d->i;
@@ -4002,6 +3998,16 @@ static int32_t fltSclGetDatumValueFromPoint(SFltSclPoint *point, SFltSclDatum *d
         --d->i;
       }
     }
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_FLOAT64) {
+    d->kind = FLT_SCL_DATUM_KIND_INT64;
+    double v = d->d;
+    if (point->excl) {
+      if (point->start) {
+        d->i = v + 1;
+      }  else {
+        d->i = v - 1;
+      }
+    }
   } else {
     qError("not supported type %d when get datum from point", d->type.type);
   }
@@ -4022,12 +4028,13 @@ int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict) {
       SFltSclColumnRange *colRange = taosArrayGet(colRanges, 0);
       SArray             *points = colRange->points;
       if (taosArrayGetSize(points) == 2) {
+        *win = TSWINDOW_DESC_INITIALIZER;
         SFltSclPoint *startPt = taosArrayGet(points, 0);
         SFltSclPoint *endPt = taosArrayGet(points, 1);
         SFltSclDatum  start;
         SFltSclDatum  end;
-        fltSclGetDatumValueFromPoint(startPt, &start);
-        fltSclGetDatumValueFromPoint(endPt, &end);
+        fltSclGetTimeStampDatum(startPt, &start);
+        fltSclGetTimeStampDatum(endPt, &end);
         win->skey = start.i;
         win->ekey = end.i;
         *isStrict = true;

From c8aee79e3fa85db9ec57dbc1f2d751b47e556d76 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Wed, 27 Sep 2023 16:08:06 +0800
Subject: [PATCH 17/22] fix: apercentile parameter validation and result error

---
 source/libs/function/src/builtins.c     | 21 +++++++++++++--
 source/libs/function/src/builtinsimpl.c | 17 +++++++++---
 tests/parallel_test/cases.task          |  1 +
 tests/script/tsim/query/apercentile.sim | 36 +++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 tests/script/tsim/query/apercentile.sim

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index aad08fc337..00a4507492 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -651,7 +651,7 @@ static int32_t translateApercentileImpl(SFunctionNode* pFunc, char* pErrBuf, int
         (SDataType){.bytes = getApercentileMaxSize() + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_BINARY};
   } else {
     // original percent param is reserved
-    if (2 != numOfParams) {
+    if (3 != numOfParams && 2 != numOfParams) {
       return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
     }
     uint8_t para1Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 0))->resType.type;
@@ -660,6 +660,19 @@ static int32_t translateApercentileImpl(SFunctionNode* pFunc, char* pErrBuf, int
       return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
     }
 
+    if (3 == numOfParams) {
+      uint8_t para3Type = ((SExprNode*)nodesListGetNode(pFunc->pParameterList, 2))->resType.type;
+      if (!IS_STR_DATA_TYPE(para3Type)) {
+        return invaildFuncParaTypeErrMsg(pErrBuf, len, pFunc->functionName);
+      }
+      
+      SNode* pParamNode2 = nodesListGetNode(pFunc->pParameterList, 2);
+      if (QUERY_NODE_VALUE != nodeType(pParamNode2) || !validateApercentileAlgo((SValueNode*)pParamNode2)) {
+        return buildFuncErrMsg(pErrBuf, len, TSDB_CODE_FUNC_FUNTION_ERROR,
+                               "Third parameter algorithm of apercentile must be 'default' or 't-digest'");
+      }
+      }
+
     pFunc->node.resType = (SDataType){.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes, .type = TSDB_DATA_TYPE_DOUBLE};
   }
 
@@ -744,7 +757,11 @@ int32_t topBotCreateMergeParam(SNodeList* pRawParameters, SNode* pPartialRes, SN
 }
 
 int32_t apercentileCreateMergeParam(SNodeList* pRawParameters, SNode* pPartialRes, SNodeList** pParameters) {
-  return reserveFirstMergeParam(pRawParameters, pPartialRes, pParameters);
+  int32_t code = reserveFirstMergeParam(pRawParameters, pPartialRes, pParameters);
+  if (TSDB_CODE_SUCCESS == code && pRawParameters->length >= 3) {
+    code = nodesListStrictAppend(*pParameters, nodesCloneNode(nodesListGetNode(pRawParameters, 2)));
+  }
+  return code;
 }
 
 static int32_t translateSpread(SFunctionNode* pFunc, char* pErrBuf, int32_t len) {
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 108a641c08..071afe0159 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -1904,7 +1904,7 @@ int32_t apercentileFunction(SqlFunctionCtx* pCtx) {
   return TSDB_CODE_SUCCESS;
 }
 
-static void apercentileTransferInfo(SAPercentileInfo* pInput, SAPercentileInfo* pOutput) {
+static void apercentileTransferInfo(SAPercentileInfo* pInput, SAPercentileInfo* pOutput, bool* hasRes) {
   pOutput->percent = pInput->percent;
   pOutput->algo = pInput->algo;
   if (pOutput->algo == APERCT_ALGO_TDIGEST) {
@@ -1915,6 +1915,10 @@ static void apercentileTransferInfo(SAPercentileInfo* pInput, SAPercentileInfo*
       return;
     }
 
+    if (hasRes) {
+      *hasRes = true;
+    }
+
     buildTDigestInfo(pOutput);
     TDigest* pTDigest = pOutput->pTDigest;
     tdigestAutoFill(pTDigest, COMPRESSION);
@@ -1931,6 +1935,10 @@ static void apercentileTransferInfo(SAPercentileInfo* pInput, SAPercentileInfo*
       return;
     }
 
+    if (hasRes) {
+      *hasRes = true;
+    }
+
     buildHistogramInfo(pOutput);
     SHistogramInfo* pHisto = pOutput->pHisto;
 
@@ -1970,12 +1978,13 @@ int32_t apercentileFunctionMerge(SqlFunctionCtx* pCtx) {
 
   qDebug("%s total %" PRId64 " rows will merge, %p", __FUNCTION__, pInput->numOfRows, pInfo->pHisto);
 
+  bool hasRes = false;
   int32_t start = pInput->startRowIndex;
   for (int32_t i = start; i < start + pInput->numOfRows; ++i) {
     char* data = colDataGetData(pCol, i);
 
     SAPercentileInfo* pInputInfo = (SAPercentileInfo*)varDataVal(data);
-    apercentileTransferInfo(pInputInfo, pInfo);
+    apercentileTransferInfo(pInputInfo, pInfo, &hasRes);
   }
 
   if (pInfo->algo != APERCT_ALGO_TDIGEST) {
@@ -1984,7 +1993,7 @@ int32_t apercentileFunctionMerge(SqlFunctionCtx* pCtx) {
            pInfo->pHisto->numOfEntries, pInfo->pHisto);
   }
 
-  SET_VAL(pResInfo, 1, 1);
+  SET_VAL(pResInfo, hasRes ? 1 : 0, 1);
   return TSDB_CODE_SUCCESS;
 }
 
@@ -2056,7 +2065,7 @@ int32_t apercentileCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx)
 
   qDebug("%s start to combine apercentile, %p", __FUNCTION__, pDBuf->pHisto);
 
-  apercentileTransferInfo(pSBuf, pDBuf);
+  apercentileTransferInfo(pSBuf, pDBuf, NULL);
   pDResInfo->numOfRes = TMAX(pDResInfo->numOfRes, pSResInfo->numOfRes);
   pDResInfo->isNullRes &= pSResInfo->isNullRes;
   return TSDB_CODE_SUCCESS;
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index bb5a8f0b30..dbc10999f0 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1009,6 +1009,7 @@
 ,,y,script,./test.sh -f tsim/query/nullColSma.sim
 ,,y,script,./test.sh -f tsim/query/bug3398.sim
 ,,y,script,./test.sh -f tsim/query/explain_tsorder.sim
+,,y,script,./test.sh -f tsim/query/apercentile.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
 ,,y,script,./test.sh -f tsim/snode/basic1.sim
 ,,y,script,./test.sh -f tsim/mnode/basic1.sim
diff --git a/tests/script/tsim/query/apercentile.sim b/tests/script/tsim/query/apercentile.sim
new file mode 100644
index 0000000000..71d075b0ef
--- /dev/null
+++ b/tests/script/tsim/query/apercentile.sim
@@ -0,0 +1,36 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql drop database if exists test2;
+sql create database test2;
+sql use test2;
+sql create table s(ts timestamp,v double) tags(id nchar(16));
+sql create table t using s tags('11') ;
+sql insert into t values(now,null);
+sql select APERCENTILE(v,50,'t-digest') as k from s where ts > now-1d and ts < now interval(1h);
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+
+sql select APERCENTILE(v,50) as k from s where ts > now-1d and ts < now interval(1h);
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+
+sql select APERCENTILE(v,50) as k from s where ts > now-1d and ts < now interval(1h);
+if $rows != 1 then
+  return -1
+endi
+if $data00 != NULL then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

From 79d4793c1d43a0eb068d7e4ca5edc51479ab942a Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 27 Sep 2023 16:38:00 +0800
Subject: [PATCH 18/22] fix: add test case

---
 source/libs/scalar/src/filter.c        | 15 ++++-
 tests/develop-test/2-query/ts-range.py | 86 ++++++++++++++++++++++++++
 tests/parallel_test/cases.task         |  1 +
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 tests/develop-test/2-query/ts-range.py

diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 588fe24c2c..adc3e9fd27 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -3985,6 +3985,7 @@ _return:
 
 static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) {
   *d = point->val;
+  d->kind = FLT_SCL_DATUM_KIND_INT64;
 
   if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
     getDataMax(point->val.type.type, &(d->i));
@@ -3999,7 +4000,6 @@ static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) {
       }
     }
   } else if (point->val.kind == FLT_SCL_DATUM_KIND_FLOAT64) {
-    d->kind = FLT_SCL_DATUM_KIND_INT64;
     double v = d->d;
     if (point->excl) {
       if (point->start) {
@@ -4007,6 +4007,19 @@ static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) {
       }  else {
         d->i = v - 1;
       }
+    } else {
+      d->i = v;
+    }
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_UINT64) {
+    uint64_t v = d->u;
+    if (point->excl) {
+      if (point->start) {
+        d->i = v + 1;
+      }  else {
+        d->i = v - 1;
+      }
+    } else {
+      d->i = v;
     }
   } else {
     qError("not supported type %d when get datum from point", d->type.type);
diff --git a/tests/develop-test/2-query/ts-range.py b/tests/develop-test/2-query/ts-range.py
new file mode 100644
index 0000000000..6ad88281ef
--- /dev/null
+++ b/tests/develop-test/2-query/ts-range.py
@@ -0,0 +1,86 @@
+import sys 
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+from math import inf
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<shenglian zhou>: [TS-4088] timestamp range support operator
+        ''' 
+        return
+    
+    def init(self, conn, logSql, replicaVer=1):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), True)
+        self._conn = conn
+        
+    def restartTaosd(self, index=1, dbname="db"):
+        tdDnodes.stop(index)
+        tdDnodes.startWithoutSleep(index)
+        tdSql.execute(f"use ts_range")
+
+    def run(self):
+        print("running {}".format(__file__))
+        tdSql.execute("drop database if exists ts_range")
+        tdSql.execute("create database if not exists ts_range")
+        tdSql.execute('use ts_range')
+        tdSql.execute('create table stb1 (ts timestamp, c1 bool, c2 tinyint, c3 smallint, c4 int, c5 bigint, c6 float, c7 double, c8 binary(10), c9 nchar(10), c10 tinyint unsigned, c11 smallint unsigned, c12 int unsigned, c13 bigint unsigned) TAGS(t1 int, t2 binary(10), t3 double);')
+
+        tdSql.execute("create table tb1 using stb1 tags(1,'1',1.0);")
+
+        tdSql.execute("create table tb2 using stb1 tags(2,'2',2.0);")
+
+        tdSql.execute("create table tb3 using stb1 tags(3,'3',3.0);")
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:00\',true,1,1,1,1,1,1,"123","1234",1,1,1,1);')
+
+        tdSql.execute("insert into tb1 values ('2021-11-11 09:00:01',true,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);")
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:02\',true,2,NULL,2,NULL,2,NULL,"234",NULL,2,NULL,2,NULL);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:03\',false,NULL,3,NULL,3,NULL,3,NULL,"3456",NULL,3,NULL,3);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:04\',true,4,4,4,4,4,4,"456","4567",4,4,4,4);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:05\',true,127,32767,2147483647,9223372036854775807,3.402823466e+38,1.79769e+308,"567","5678",254,65534,4294967294,9223372036854775807);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:06\',true,-127,-32767,-2147483647,-9223372036854775807,-3.402823466e+38,-1.79769e+308,"678","6789",0,0,0,0);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:00\',true,1,1,1,1,1,1,"111","1111",1,1,1,1);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:01\',true,2,2,2,2,2,2,"222","2222",2,2,2,2);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:02\',true,3,3,2,3,3,3,"333","3333",3,3,3,3);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:03\',false,4,4,4,4,4,4,"444","4444",4,4,4,4);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:04\',true,5,5,5,5,5,5,"555","5555",5,5,5,5);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:05\',true,6,6,6,6,6,6,"666","6666",6,6,6,6);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:06\',true,7,7,7,7,7,7,"777","7777",7,7,7,7);')
+        
+        	
+        tdSql.query('select count(*) from stb1 where ts < 1000000000000 + 10s')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)        	
+        tdSql.query('select count(*) from stb1 where ts >= 1000000000000 + 10s')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 14)  
+        	
+        tdSql.query('select count(*) from stb1 where ts > 1000000000000 - 10s and ts <= 1000000000000 + 10s')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)   
+	 
+        tdSql.query('select count(*) from stb1 where ts > 1636592400000 + 3s');
+        tdSql.checkData(0, 0, 6)
+        #tdSql.execute('drop database ts_range')
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index c3ad3130fd..cbcd3b64ab 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1243,6 +1243,7 @@
 
 #develop test
 ,,n,develop-test,python3 ./test.py -f 2-query/table_count_scan.py
+,,n,develop-test,python3 ./test.py -f 2-query/ts_range.py
 ,,n,develop-test,python3 ./test.py -f 2-query/show_create_db.py
 ,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/auto_create_table_json.py
 ,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/custom_col_tag.py

From fc824a3bb90fc4e86fc354af0a1a7d29446aae77 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Wed, 27 Sep 2023 15:39:43 +0800
Subject: [PATCH 19/22] fix: timestamp add return float when get time range

---
 source/libs/scalar/src/filter.c        | 44 +++++++++----
 tests/develop-test/2-query/ts-range.py | 86 ++++++++++++++++++++++++++
 tests/parallel_test/cases.task         |  1 +
 3 files changed, 119 insertions(+), 12 deletions(-)
 create mode 100644 tests/develop-test/2-query/ts-range.py

diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 12729c3262..adc3e9fd27 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -3983,18 +3983,15 @@ _return:
   return code;
 }
 
-static int32_t fltSclGetDatumValueFromPoint(SFltSclPoint *point, SFltSclDatum *d) {
+static int32_t fltSclGetTimeStampDatum(SFltSclPoint *point, SFltSclDatum *d) {
   *d = point->val;
-  if (point->val.kind == FLT_SCL_DATUM_KIND_NULL) {
-    return TSDB_CODE_SUCCESS;
-  }
-  if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
-    getDataMax(d->type.type, &(d->i));
-  } else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) {
-    getDataMin(d->type.type, &(d->i));
-  }
+  d->kind = FLT_SCL_DATUM_KIND_INT64;
 
-  if (IS_INTEGER_TYPE(d->type.type) || IS_TIMESTAMP_TYPE(d->type.type)) {
+  if (point->val.kind == FLT_SCL_DATUM_KIND_MAX) {
+    getDataMax(point->val.type.type, &(d->i));
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_MIN) {
+    getDataMin(point->val.type.type, &(d->i));
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_INT64) {
     if (point->excl) {
       if (point->start) {
         ++d->i;
@@ -4002,6 +3999,28 @@ static int32_t fltSclGetDatumValueFromPoint(SFltSclPoint *point, SFltSclDatum *d
         --d->i;
       }
     }
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_FLOAT64) {
+    double v = d->d;
+    if (point->excl) {
+      if (point->start) {
+        d->i = v + 1;
+      }  else {
+        d->i = v - 1;
+      }
+    } else {
+      d->i = v;
+    }
+  } else if (point->val.kind == FLT_SCL_DATUM_KIND_UINT64) {
+    uint64_t v = d->u;
+    if (point->excl) {
+      if (point->start) {
+        d->i = v + 1;
+      }  else {
+        d->i = v - 1;
+      }
+    } else {
+      d->i = v;
+    }
   } else {
     qError("not supported type %d when get datum from point", d->type.type);
   }
@@ -4022,12 +4041,13 @@ int32_t filterGetTimeRange(SNode *pNode, STimeWindow *win, bool *isStrict) {
       SFltSclColumnRange *colRange = taosArrayGet(colRanges, 0);
       SArray             *points = colRange->points;
       if (taosArrayGetSize(points) == 2) {
+        *win = TSWINDOW_DESC_INITIALIZER;
         SFltSclPoint *startPt = taosArrayGet(points, 0);
         SFltSclPoint *endPt = taosArrayGet(points, 1);
         SFltSclDatum  start;
         SFltSclDatum  end;
-        fltSclGetDatumValueFromPoint(startPt, &start);
-        fltSclGetDatumValueFromPoint(endPt, &end);
+        fltSclGetTimeStampDatum(startPt, &start);
+        fltSclGetTimeStampDatum(endPt, &end);
         win->skey = start.i;
         win->ekey = end.i;
         *isStrict = true;
diff --git a/tests/develop-test/2-query/ts-range.py b/tests/develop-test/2-query/ts-range.py
new file mode 100644
index 0000000000..6ad88281ef
--- /dev/null
+++ b/tests/develop-test/2-query/ts-range.py
@@ -0,0 +1,86 @@
+import sys 
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+from math import inf
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        case1<shenglian zhou>: [TS-4088] timestamp range support operator
+        ''' 
+        return
+    
+    def init(self, conn, logSql, replicaVer=1):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), True)
+        self._conn = conn
+        
+    def restartTaosd(self, index=1, dbname="db"):
+        tdDnodes.stop(index)
+        tdDnodes.startWithoutSleep(index)
+        tdSql.execute(f"use ts_range")
+
+    def run(self):
+        print("running {}".format(__file__))
+        tdSql.execute("drop database if exists ts_range")
+        tdSql.execute("create database if not exists ts_range")
+        tdSql.execute('use ts_range')
+        tdSql.execute('create table stb1 (ts timestamp, c1 bool, c2 tinyint, c3 smallint, c4 int, c5 bigint, c6 float, c7 double, c8 binary(10), c9 nchar(10), c10 tinyint unsigned, c11 smallint unsigned, c12 int unsigned, c13 bigint unsigned) TAGS(t1 int, t2 binary(10), t3 double);')
+
+        tdSql.execute("create table tb1 using stb1 tags(1,'1',1.0);")
+
+        tdSql.execute("create table tb2 using stb1 tags(2,'2',2.0);")
+
+        tdSql.execute("create table tb3 using stb1 tags(3,'3',3.0);")
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:00\',true,1,1,1,1,1,1,"123","1234",1,1,1,1);')
+
+        tdSql.execute("insert into tb1 values ('2021-11-11 09:00:01',true,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);")
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:02\',true,2,NULL,2,NULL,2,NULL,"234",NULL,2,NULL,2,NULL);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:03\',false,NULL,3,NULL,3,NULL,3,NULL,"3456",NULL,3,NULL,3);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:04\',true,4,4,4,4,4,4,"456","4567",4,4,4,4);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:05\',true,127,32767,2147483647,9223372036854775807,3.402823466e+38,1.79769e+308,"567","5678",254,65534,4294967294,9223372036854775807);')
+
+        tdSql.execute('insert into tb1 values (\'2021-11-11 09:00:06\',true,-127,-32767,-2147483647,-9223372036854775807,-3.402823466e+38,-1.79769e+308,"678","6789",0,0,0,0);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:00\',true,1,1,1,1,1,1,"111","1111",1,1,1,1);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:01\',true,2,2,2,2,2,2,"222","2222",2,2,2,2);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:02\',true,3,3,2,3,3,3,"333","3333",3,3,3,3);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:03\',false,4,4,4,4,4,4,"444","4444",4,4,4,4);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:04\',true,5,5,5,5,5,5,"555","5555",5,5,5,5);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:05\',true,6,6,6,6,6,6,"666","6666",6,6,6,6);')
+
+        tdSql.execute('insert into tb2 values (\'2021-11-11 09:00:06\',true,7,7,7,7,7,7,"777","7777",7,7,7,7);')
+        
+        	
+        tdSql.query('select count(*) from stb1 where ts < 1000000000000 + 10s')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)        	
+        tdSql.query('select count(*) from stb1 where ts >= 1000000000000 + 10s')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 14)  
+        	
+        tdSql.query('select count(*) from stb1 where ts > 1000000000000 - 10s and ts <= 1000000000000 + 10s')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 0)   
+	 
+        tdSql.query('select count(*) from stb1 where ts > 1636592400000 + 3s');
+        tdSql.checkData(0, 0, 6)
+        #tdSql.execute('drop database ts_range')
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index c3ad3130fd..cbcd3b64ab 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1243,6 +1243,7 @@
 
 #develop test
 ,,n,develop-test,python3 ./test.py -f 2-query/table_count_scan.py
+,,n,develop-test,python3 ./test.py -f 2-query/ts_range.py
 ,,n,develop-test,python3 ./test.py -f 2-query/show_create_db.py
 ,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/auto_create_table_json.py
 ,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/custom_col_tag.py

From 4581c296d0cb9af10d39198e624c4c0dac129c7d Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Wed, 27 Sep 2023 19:54:09 +0800
Subject: [PATCH 20/22] fix trans invalid read

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

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 3dbb224e79..c978111f39 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -576,6 +576,7 @@ void* destroyConnPool(SCliThrd* pThrd) {
     connList = taosHashIterate((SHashObj*)pool, connList);
   }
   taosHashCleanup(pool);
+  pThrd->pool = NULL;
   return NULL;
 }
 
@@ -870,8 +871,10 @@ static void cliDestroyConn(SCliConn* conn, bool clear) {
     connList->list->numOfConn--;
     connList->size--;
   } else {
-    SConnList* connList = taosHashGet((SHashObj*)pThrd->pool, conn->dstAddr, strlen(conn->dstAddr) + 1);
-    if (connList != NULL) connList->list->numOfConn--;
+    if (pThrd->pool) {
+      SConnList* connList = taosHashGet((SHashObj*)pThrd->pool, conn->dstAddr, strlen(conn->dstAddr) + 1);
+      if (connList != NULL) connList->list->numOfConn--;
+    }
   }
   conn->list = NULL;
   pThrd->newConnCount--;

From 39cae2b8791aa09d34382c63a16bd76117813b2e Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 27 Sep 2023 21:32:54 +0800
Subject: [PATCH 21/22] fix: typo error

---
 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 cbcd3b64ab..bb2fa07da1 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1243,7 +1243,7 @@
 
 #develop test
 ,,n,develop-test,python3 ./test.py -f 2-query/table_count_scan.py
-,,n,develop-test,python3 ./test.py -f 2-query/ts_range.py
+,,n,develop-test,python3 ./test.py -f 2-query/ts-range.py
 ,,n,develop-test,python3 ./test.py -f 2-query/show_create_db.py
 ,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/auto_create_table_json.py
 ,,n,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/custom_col_tag.py

From 2340a952aa7a8ce0a8d03ecd74b005dd6b75aa35 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Wed, 27 Sep 2023 16:48:22 +0800
Subject: [PATCH 22/22] fix: group by operator may cause client assert fail

---
 source/libs/planner/src/planLogicCreater.c        | 2 ++
 tests/system-test/2-query/interval_limit_opt_2.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 96d253494d..546b30a7c3 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -88,6 +88,7 @@ static EDealRes doRewriteExpr(SNode** pNode, void* pContext) {
             pCxt->pOutputs[index] = true;
             break;
           }
+          index++;
         }
       }
       break;
@@ -174,6 +175,7 @@ static int32_t cloneRewriteExprs(SNodeList* pExprs, bool* pOutputs, SNodeList**
         break;
       }
     }
+    index++;
   }
   return code;
 }
diff --git a/tests/system-test/2-query/interval_limit_opt_2.py b/tests/system-test/2-query/interval_limit_opt_2.py
index fb15a25f63..cadb32b388 100644
--- a/tests/system-test/2-query/interval_limit_opt_2.py
+++ b/tests/system-test/2-query/interval_limit_opt_2.py
@@ -204,8 +204,12 @@ class TDTestCase:
         for sql in sqls:
             self.query_and_check_with_slimit(sql, 10, 2, offset)
 
+    def test_group_by_operator(self):
+        tdSql.query('select count(*), c1+1 from meters group by tbname, c1+1', 1)
+
     def run(self):
         self.prepareTestEnv()
+        self.test_group_by_operator()
         self.test_interval_limit_offset()
 
     def stop(self):