diff --git a/cmake/taosadapter_CMakeLists.txt.in b/cmake/taosadapter_CMakeLists.txt.in
index 13826a1a74..ef6ed4af1d 100644
--- a/cmake/taosadapter_CMakeLists.txt.in
+++ b/cmake/taosadapter_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
         GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG main
+        GIT_TAG 3.0
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in
index 9bbda8309f..9a6a5329ae 100644
--- a/cmake/taostools_CMakeLists.txt.in
+++ b/cmake/taostools_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG main
+        GIT_TAG 3.0
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/cmake/taosws_CMakeLists.txt.in b/cmake/taosws_CMakeLists.txt.in
index b013d45911..17446d184d 100644
--- a/cmake/taosws_CMakeLists.txt.in
+++ b/cmake/taosws_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosws-rs
 ExternalProject_Add(taosws-rs
         GIT_REPOSITORY https://github.com/taosdata/taos-connector-rust.git
-        GIT_TAG main
+        GIT_TAG 3.0
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosws-rs"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/docs/zh/06-advanced/05-data-in/07-mqtt.md b/docs/zh/06-advanced/05-data-in/07-mqtt.mdx
similarity index 98%
rename from docs/zh/06-advanced/05-data-in/07-mqtt.md
rename to docs/zh/06-advanced/05-data-in/07-mqtt.mdx
index a0e121f632..3ffab4dfbf 100644
--- a/docs/zh/06-advanced/05-data-in/07-mqtt.md
+++ b/docs/zh/06-advanced/05-data-in/07-mqtt.mdx
@@ -166,6 +166,12 @@ json 数据支持 JSONObject 或者 JSONArray，使用 json 解析器可以解
 
 ![mqtt-14](./mqtt-14.png)
 
-### 8. 创建完成
+### 8. 异常处理策略
+
+import Contributing from './_03-exception-handling-strategy.mdx'
+
+<Contributing />
+
+### 9. 创建完成
 
 点击 **提交** 按钮，完成创建 MQTT 到 TDengine 的数据同步任务，回到**数据源列表**页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/08-kafka.md b/docs/zh/06-advanced/05-data-in/08-kafka.mdx
similarity index 97%
rename from docs/zh/06-advanced/05-data-in/08-kafka.md
rename to docs/zh/06-advanced/05-data-in/08-kafka.mdx
index b605f84c7a..71070b271c 100644
--- a/docs/zh/06-advanced/05-data-in/08-kafka.md
+++ b/docs/zh/06-advanced/05-data-in/08-kafka.mdx
@@ -196,12 +196,16 @@ json 数据支持 JSONObject 或者 JSONArray，使用 json 解析器可以解
 
 ### 8. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+import AdvancedOptions from './_02-advanced_options.mdx'
 
-![kafka-15.png](./kafka-15.png)
+<AdvancedOptions/>
 
-![kafka-16.png](./kafka-16.png)
+### 9. 异常处理策略
 
-### 9. 创建完成
+import Contributing from './_03-exception-handling-strategy.mdx'
+
+<Contributing />
+
+### 10. 创建完成
 
 点击 **提交** 按钮，完成创建 Kafka 到 TDengine 的数据同步任务，回到**数据源列表**页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/09-influxdb.md b/docs/zh/06-advanced/05-data-in/09-influxdb.mdx
similarity index 94%
rename from docs/zh/06-advanced/05-data-in/09-influxdb.md
rename to docs/zh/06-advanced/05-data-in/09-influxdb.mdx
index d0b781667d..b88bcdf3c6 100644
--- a/docs/zh/06-advanced/05-data-in/09-influxdb.md
+++ b/docs/zh/06-advanced/05-data-in/09-influxdb.mdx
@@ -75,9 +75,9 @@ InfluxDB 是一种流行的开源时间序列数据库，它针对处理大量
 
 ### 6. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
-![InfluxDB-09zh-AdvancedOptionsExpandButton.png](./pic/InfluxDB-09zh-AdvancedOptionsExpandButton.png "高级选项展开按钮")
-![InfluxDB-10zh-AdvancedOptionsExpand.png](./pic/InfluxDB-10zh-AdvancedOptionsExpand.png "高级选项展开按钮")
+import AdvancedOptions from './_02-advanced_options.mdx'
+
+<AdvancedOptions/>
 
 ### 7. 创建完成
 
diff --git a/docs/zh/06-advanced/05-data-in/10-opentsdb.md b/docs/zh/06-advanced/05-data-in/10-opentsdb.mdx
similarity index 92%
rename from docs/zh/06-advanced/05-data-in/10-opentsdb.md
rename to docs/zh/06-advanced/05-data-in/10-opentsdb.mdx
index 3737f2a415..eeb4e37988 100644
--- a/docs/zh/06-advanced/05-data-in/10-opentsdb.md
+++ b/docs/zh/06-advanced/05-data-in/10-opentsdb.mdx
@@ -58,9 +58,9 @@ OpenTSDB 是一个架构在 HBase 系统之上的实时监控信息收集和展
 
 ### 5. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
-![OpenTSDB-07zh-AdvancedOptionsExpandButton.png](./pic/OpenTSDB-07zh-AdvancedOptionsExpandButton.png "高级选项展开按钮")
-![OpenTSDB-08zh-AdvancedOptionsExpand.png](./pic/OpenTSDB-08zh-AdvancedOptionsExpand.png "高级选项展开按钮")
+import AdvancedOptions from './_02-advanced_options.mdx'
+
+<AdvancedOptions/>
 
 ### 6. 创建完成
 
diff --git a/docs/zh/06-advanced/05-data-in/11-csv.md b/docs/zh/06-advanced/05-data-in/11-csv.mdx
similarity index 95%
rename from docs/zh/06-advanced/05-data-in/11-csv.md
rename to docs/zh/06-advanced/05-data-in/11-csv.mdx
index 4924ed2fbd..5737fc8b79 100644
--- a/docs/zh/06-advanced/05-data-in/11-csv.md
+++ b/docs/zh/06-advanced/05-data-in/11-csv.mdx
@@ -107,13 +107,25 @@ sidebar_label: "CSV"
 
 ![csv-09.png](./csv-09.png)
 
-### 5. 创建完成
+### 5. 配置高级选项
+
+import AdvancedOptions from './_02-advanced_options.mdx'
+
+<AdvancedOptions/>
+
+### 6. 异常处理策略
+
+import Contributing from './_03-exception-handling-strategy.mdx'
+
+<Contributing />
+
+### 7. 创建完成
 
 点击 **提交** 按钮，完成创建 CSV 到 TDengine 的数据同步任务，回到数据写入任务列表页面，可查看任务执行情况，也可以进行任务的“启动/停止”操作与“查看/编辑/删除/复制”操作。
 
 ![csv-10.png](./csv-10.png)
 
-### 6. 查看运行指标
+### 8. 查看运行指标
 
 点击 **查看** 按钮，查看任务的运行指标，同时也可以查看任务中所有文件的处理情况。
 
diff --git a/docs/zh/06-advanced/05-data-in/12-aveva-historian.md b/docs/zh/06-advanced/05-data-in/12-aveva-historian.mdx
similarity index 97%
rename from docs/zh/06-advanced/05-data-in/12-aveva-historian.md
rename to docs/zh/06-advanced/05-data-in/12-aveva-historian.mdx
index ee04194dea..e8ab4c839e 100644
--- a/docs/zh/06-advanced/05-data-in/12-aveva-historian.md
+++ b/docs/zh/06-advanced/05-data-in/12-aveva-historian.mdx
@@ -134,6 +134,12 @@ split 提取器，seperator 填写分割符 `,`, number 填写 2。
 
 ![aveva-historian-08.png](pic/aveva-historian-08.png)
 
-### 7. 创建完成
+### 7. 异常处理策略
+
+import Contributing from './_03-exception-handling-strategy.mdx'
+
+<Contributing />
+
+### 8. 创建完成
 
 点击 **提交** 按钮，完成创建任务。提交任务后，回到**数据写入**页面可以查看任务状态。
diff --git a/docs/zh/06-advanced/05-data-in/13-mysql.md b/docs/zh/06-advanced/05-data-in/13-mysql.mdx
similarity index 93%
rename from docs/zh/06-advanced/05-data-in/13-mysql.md
rename to docs/zh/06-advanced/05-data-in/13-mysql.mdx
index 4cc84fbfa2..f1894190cb 100644
--- a/docs/zh/06-advanced/05-data-in/13-mysql.md
+++ b/docs/zh/06-advanced/05-data-in/13-mysql.mdx
@@ -98,14 +98,16 @@ MySQL 是最流行的关系型数据库之一。很多系统都曾经或正在
 
 ### 8. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+import AdvancedOptions from './_02-advanced_options.mdx'
 
-**最大读取并发数** 数据源连接数或读取线程数限制，当默认参数不满足需要或需要调整资源使用量时修改此参数。
+<AdvancedOptions/>
 
-**批次大小** 单次发送的最大消息数或行数。默认是 10000。
+### 9. 异常处理策略
 
-![mysql-07.png](pic/mysql-07.png)
+import Contributing from './_03-exception-handling-strategy.mdx'
 
-### 9. 创建完成
+<Contributing />
+
+### 10. 创建完成
 
 点击 **提交** 按钮，完成创建  MySQL 到 TDengine 的数据同步任务，回到**数据源列表**页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/14-postgres.md b/docs/zh/06-advanced/05-data-in/14-postgres.mdx
similarity index 93%
rename from docs/zh/06-advanced/05-data-in/14-postgres.md
rename to docs/zh/06-advanced/05-data-in/14-postgres.mdx
index af8297bfff..7651db68f2 100644
--- a/docs/zh/06-advanced/05-data-in/14-postgres.md
+++ b/docs/zh/06-advanced/05-data-in/14-postgres.mdx
@@ -99,14 +99,16 @@ TDengine 可以高效地从 PostgreSQL 读取数据并将其写入 TDengine，
 
 ### 8. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+import AdvancedOptions from './_02-advanced_options.mdx'
 
-**最大读取并发数** 数据源连接数或读取线程数限制，当默认参数不满足需要或需要调整资源使用量时修改此参数。
+<AdvancedOptions/>
 
-**批次大小** 单次发送的最大消息数或行数。默认是 10000。
+### 9. 异常处理策略
 
-![postgres-07.png](pic/postgres-07.png)
+import Contributing from './_03-exception-handling-strategy.mdx'
 
-### 9. 创建完成
+<Contributing />
+
+### 10. 创建完成
 
 点击 **提交** 按钮，完成创建 PostgreSQL 到 TDengine 的数据同步任务，回到**数据源列表**页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/15-oracle.md b/docs/zh/06-advanced/05-data-in/15-oracle.mdx
similarity index 93%
rename from docs/zh/06-advanced/05-data-in/15-oracle.md
rename to docs/zh/06-advanced/05-data-in/15-oracle.mdx
index 39bbab32d3..484365415e 100644
--- a/docs/zh/06-advanced/05-data-in/15-oracle.md
+++ b/docs/zh/06-advanced/05-data-in/15-oracle.mdx
@@ -91,14 +91,16 @@ TDengine 可以高效地从 Oracle 读取数据并将其写入 TDengine，以实
 
 ### 7. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+import AdvancedOptions from './_02-advanced_options.mdx'
 
-**最大读取并发数** 数据源连接数或读取线程数限制，当默认参数不满足需要或需要调整资源使用量时修改此参数。
+<AdvancedOptions/>
 
-**批次大小** 单次发送的最大消息数或行数。默认是 10000。
+### 8. 异常处理策略
 
-![oracle-06.png](pic/oracle-06.png)
+import Contributing from './_03-exception-handling-strategy.mdx'
 
-### 8. 创建完成
+<Contributing />
+
+### 9. 创建完成
 
 点击 **提交** 按钮，完成创建 Oracle 到 TDengine 的数据同步任务，回到**数据源列表****页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/16-mssql.md b/docs/zh/06-advanced/05-data-in/16-mssql.mdx
similarity index 94%
rename from docs/zh/06-advanced/05-data-in/16-mssql.md
rename to docs/zh/06-advanced/05-data-in/16-mssql.mdx
index 81e9e98013..1e6b9928be 100644
--- a/docs/zh/06-advanced/05-data-in/16-mssql.md
+++ b/docs/zh/06-advanced/05-data-in/16-mssql.mdx
@@ -105,14 +105,16 @@ Microsoft SQL Server 是最流行的关系型数据库之一。很多系统都
 
 ### 8. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+import AdvancedOptions from './_02-advanced_options.mdx'
 
-**最大读取并发数** 数据源连接数或读取线程数限制，当默认参数不满足需要或需要调整资源使用量时修改此参数。
+<AdvancedOptions/>
 
-**批次大小** 单次发送的最大消息数或行数。默认是 10000。
+### 9. 异常处理策略
 
-![mssql-07.png](pic/mssql-07.png)
+import Contributing from './_03-exception-handling-strategy.mdx'
 
-### 9. 创建完成
+<Contributing />
+
+### 10. 创建完成
 
 点击 **提交** 按钮，完成创建  Microsoft SQL Server 到 TDengine 的数据同步任务，回到**数据源列表**页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/17-mongodb.md b/docs/zh/06-advanced/05-data-in/17-mongodb.mdx
similarity index 94%
rename from docs/zh/06-advanced/05-data-in/17-mongodb.md
rename to docs/zh/06-advanced/05-data-in/17-mongodb.mdx
index 5311bc43c6..e92f37a6f0 100644
--- a/docs/zh/06-advanced/05-data-in/17-mongodb.md
+++ b/docs/zh/06-advanced/05-data-in/17-mongodb.mdx
@@ -122,14 +122,16 @@ MongoDB 是一个介于关系型数据库与非关系型数据库之间的产品
 
 ### 8. 配置高级选项
 
-**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+import AdvancedOptions from './_02-advanced_options.mdx'
 
-**最大读取并发数** 数据源连接数或读取线程数限制，当默认参数不满足需要或需要调整资源使用量时修改此参数。
+<AdvancedOptions/>
 
-**批次大小** 单次发送的最大消息数或行数。默认是 10000。
+### 9. 异常处理策略
 
-![mongodb-07.png](pic/mongodb-07.png)
+import Contributing from './_03-exception-handling-strategy.mdx'
 
-### 9. 创建完成
+<Contributing />
+
+### 10. 创建完成
 
 点击 **提交** 按钮，完成创建 MongoDB 到 TDengine 的数据同步任务，回到**数据源列表**页面可查看任务执行情况。
diff --git a/docs/zh/06-advanced/05-data-in/_02-advanced_options.mdx b/docs/zh/06-advanced/05-data-in/_02-advanced_options.mdx
new file mode 100644
index 0000000000..f37de063c0
--- /dev/null
+++ b/docs/zh/06-advanced/05-data-in/_02-advanced_options.mdx
@@ -0,0 +1,7 @@
+**高级选项** 区域是默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+
+**最大读取并发数** 数据源连接数或读取线程数限制，当默认参数不满足需要或需要调整资源使用量时修改此参数。
+
+**批次大小** 单次发送的最大消息数或行数。默认是 10000。
+
+![advanced_options.png](pic/advanced_options.png)
\ No newline at end of file
diff --git a/docs/zh/06-advanced/05-data-in/_03-exception-handling-strategy.mdx b/docs/zh/06-advanced/05-data-in/_03-exception-handling-strategy.mdx
new file mode 100644
index 0000000000..470c304ff3
--- /dev/null
+++ b/docs/zh/06-advanced/05-data-in/_03-exception-handling-strategy.mdx
@@ -0,0 +1,23 @@
+异常处理策略区域是对数据异常时的处理策略进行配置，默认折叠的，点击右侧 `>` 可以展开，如下图所示：
+
+![exception-handling-strategy.png](pic/exception-handling-strategy.png)
+
+各异常项说明及相应可选处理策略如下：
+
+> 通用处理策略说明：  
+> 归档：将异常数据写入归档文件（默认路径为 `${data_dir}/tasks/_id/.datetime`），不写入目标库  
+> 丢弃：将异常数据忽略，不写入目标库  
+> 报错：任务报错
+
+- **主键时间戳溢出** 检查数据中第一列时间戳是否在正确的时间范围内（now - keep1, now + 100y），可选处理策略：归档、丢弃、报错
+- **主键时间戳空** 检查数据中第一列时间戳是否为空，可选处理策略：归档、丢弃、报错、使用当前时间
+  > 使用当前时间：使用当前时间填充到空的时间戳字段中
+- **表名长度溢出** 检查子表表名的长度是否超出限制（最大 192 字符），可选处理策略：归档、丢弃、报错、截断、截断且归档
+  > 截断：截取原始表名的前 192 个字符作为新的表名  
+  > 截断且归档：截取原始表名的前 192 个字符作为新的表名，并且将此行记录写入归档文件
+- **表名非法字符** 检查子表表名中是否包含特殊字符（符号 `.` 等），可选处理策略：归档、丢弃、报错、非法字符替换为指定字符串
+  > 非法字符替换为指定字符串：将原始表名中的特殊字符替换为后方输入框中的指定字符串，例如 `a.b` 替换为 `a_b`
+- **表名模板变量空值** 检查子表表名模板中的变量是否为空，可选处理策略：丢弃、留空、变量替换为指定字符串
+  > 留空：变量位置不做任何特殊处理，例如 `a_{x}` 转换为 `a_`
+  > 变量替换为指定字符串：变量位置使用后方输入框中的指定字符串，例如 `a_{x}` 转换为 `a_b`
+- **列名长度溢出** 检查列名的长度是否超出限制（最大 64 字符），可选处理策略：归档、丢弃、报错
\ No newline at end of file
diff --git a/docs/zh/06-advanced/05-data-in/kafka-15.png b/docs/zh/06-advanced/05-data-in/kafka-15.png
deleted file mode 100644
index 96d593dad9..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/kafka-15.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/kafka-16.png b/docs/zh/06-advanced/05-data-in/kafka-16.png
deleted file mode 100644
index 395453c410..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/kafka-16.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/InfluxDB-09zh-AdvancedOptionsExpandButton.png b/docs/zh/06-advanced/05-data-in/pic/InfluxDB-09zh-AdvancedOptionsExpandButton.png
deleted file mode 100644
index f12692c506..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/InfluxDB-09zh-AdvancedOptionsExpandButton.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/InfluxDB-10zh-AdvancedOptionsExpand.png b/docs/zh/06-advanced/05-data-in/pic/InfluxDB-10zh-AdvancedOptionsExpand.png
deleted file mode 100644
index dbb188852c..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/InfluxDB-10zh-AdvancedOptionsExpand.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/OpenTSDB-07zh-AdvancedOptionsExpandButton.png b/docs/zh/06-advanced/05-data-in/pic/OpenTSDB-07zh-AdvancedOptionsExpandButton.png
deleted file mode 100644
index 65d6344e56..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/OpenTSDB-07zh-AdvancedOptionsExpandButton.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/OpenTSDB-08zh-AdvancedOptionsExpand.png b/docs/zh/06-advanced/05-data-in/pic/OpenTSDB-08zh-AdvancedOptionsExpand.png
deleted file mode 100644
index ea5dc538e5..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/OpenTSDB-08zh-AdvancedOptionsExpand.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/advanced_options.png b/docs/zh/06-advanced/05-data-in/pic/advanced_options.png
new file mode 100644
index 0000000000..8ef9b8d35a
Binary files /dev/null and b/docs/zh/06-advanced/05-data-in/pic/advanced_options.png differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/exception-handling-strategy.png b/docs/zh/06-advanced/05-data-in/pic/exception-handling-strategy.png
new file mode 100644
index 0000000000..1e1d55d85c
Binary files /dev/null and b/docs/zh/06-advanced/05-data-in/pic/exception-handling-strategy.png differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/mongodb-07.png b/docs/zh/06-advanced/05-data-in/pic/mongodb-07.png
deleted file mode 100644
index 2305ec3d2e..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/mongodb-07.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/mssql-07.png b/docs/zh/06-advanced/05-data-in/pic/mssql-07.png
deleted file mode 100644
index 6c1668481c..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/mssql-07.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/mysql-07.png b/docs/zh/06-advanced/05-data-in/pic/mysql-07.png
deleted file mode 100644
index 6c1668481c..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/mysql-07.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/oracle-06.png b/docs/zh/06-advanced/05-data-in/pic/oracle-06.png
deleted file mode 100644
index 0de5443f08..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/oracle-06.png and /dev/null differ
diff --git a/docs/zh/06-advanced/05-data-in/pic/postgres-07.png b/docs/zh/06-advanced/05-data-in/pic/postgres-07.png
deleted file mode 100644
index 6c1668481c..0000000000
Binary files a/docs/zh/06-advanced/05-data-in/pic/postgres-07.png and /dev/null differ
diff --git a/docs/zh/08-operation/05-monitor.md b/docs/zh/08-operation/05-monitor.md
index abbd54736b..897f813872 100644
--- a/docs/zh/08-operation/05-monitor.md
+++ b/docs/zh/08-operation/05-monitor.md
@@ -145,3 +145,47 @@ toasX 的配置文件(默认 /etc/taos/taosx.toml) 中与 monitor 相关的配
 #### 限制
 
 只有在以 server 模式运行 taosX 时，与监控相关的配置才生效。
+
+## explorer 集成监控面板
+
+explorer 支持集成已有的 grafana dashboard。
+
+### 配置 grafana
+
+编辑 grafana.ini, 修改以下配置项。配置 root_url, 可能对现有的 grafana 使用习惯有所影响，为了集成到 explorer 是需要如此配置的, 方便通过 explorer 做服务代理。
+
+``` toml
+[server]
+# If you use reverse proxy and sub path specify full url (with sub path)
+root_url = http://ip:3000/grafana
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+serve_from_sub_path = true
+
+[security]
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+allow_embedding = true
+```
+
+### 配置 Explorer
+
+修改 explorer.toml, 其中 dashboard 配置的 url 中的 ip, 应该配置为可以通过 explorer 服务器能够访问到的 grafana 服务的内网地址。
+
+``` toml
+[grafana]
+# The token of the Grafana server, which is used to access the Grafana server.
+token = ""
+
+# The URL of the Grafana dashboard, which is used to display the monitoring data of the TDengine cluster.
+# You can configure multiple Grafana dashboards.
+[grafana.dashboards]
+TDengine3 = "http://ip:3000/d/000000001/tdengine3?theme=light&kiosk=tv"
+taosX = "http://ip:3000/d/000000002/taosx?theme=light&kiosk=tv"
+```
+
+如下图(grafana V-8.5.27)，获取 api key, 请注意添加只读权限的 apikey, 否则有安全风险。
+
+![获取 grafana apikey](./pic/grafana-apikey.png)
+
+如下图(grafana V-8.5.27)，获取 dashboard url, 获取的 url 请额外加上参数：theme=light&kiosk=tv.
+
+![获取 grafana dashboard](./pic/grafana-dashboard.png)
diff --git a/docs/zh/08-operation/pic/grafana-apikey.png b/docs/zh/08-operation/pic/grafana-apikey.png
new file mode 100644
index 0000000000..ed7fb40410
Binary files /dev/null and b/docs/zh/08-operation/pic/grafana-apikey.png differ
diff --git a/docs/zh/08-operation/pic/grafana-dashboard.png b/docs/zh/08-operation/pic/grafana-dashboard.png
new file mode 100644
index 0000000000..77d190df5f
Binary files /dev/null and b/docs/zh/08-operation/pic/grafana-dashboard.png differ
diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 584c4b5775..501f1cabc1 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -293,6 +293,7 @@ extern int32_t tsMaxStreamBackendCache;
 extern int32_t tsPQSortMemThreshold;
 extern int32_t tsResolveFQDNRetryTime;
 extern bool    tsStreamCoverage;
+extern int8_t  tsS3EpNum;
 
 extern bool tsExperimental;
 // #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
diff --git a/include/libs/function/taosudf.h b/include/libs/function/taosudf.h
index 91487e5d1d..fd6b42f61e 100644
--- a/include/libs/function/taosudf.h
+++ b/include/libs/function/taosudf.h
@@ -237,18 +237,20 @@ static FORCE_INLINE int32_t udfColDataSet(SUdfColumn *pColumn, uint32_t currentR
       (void)memcpy(data->fixLenCol.data + meta->bytes * currentRow, pData, meta->bytes);
     } else {
       int32_t dataLen = varDataTLen(pData);
-      if (meta->type == TSDB_DATA_TYPE_JSON) {
-        if (*pData == TSDB_DATA_TYPE_NULL) {
-          dataLen = 0;
-        } else if (*pData == TSDB_DATA_TYPE_NCHAR) {
-          dataLen = varDataTLen(pData + sizeof(char));
-        } else if (*pData == TSDB_DATA_TYPE_BIGINT || *pData == TSDB_DATA_TYPE_DOUBLE) {
-          dataLen = sizeof(int64_t);
-        } else if (*pData == TSDB_DATA_TYPE_BOOL) {
-          dataLen = sizeof(char);
-        }
-        dataLen += sizeof(char);
-      }
+      // This is a piece of code to help users implement udf. It is only called during testing. 
+      // Currently, the json type is not supported and will not be called.
+      // if (meta->type == TSDB_DATA_TYPE_JSON) {
+      //   if (*pData == TSDB_DATA_TYPE_NULL) {
+      //     dataLen = 0;
+      //   } else if (*pData == TSDB_DATA_TYPE_NCHAR) {
+      //     dataLen = varDataTLen(pData + sizeof(char));
+      //   } else if (*pData == TSDB_DATA_TYPE_BIGINT || *pData == TSDB_DATA_TYPE_DOUBLE) {
+      //     dataLen = sizeof(int64_t);
+      //   } else if (*pData == TSDB_DATA_TYPE_BOOL) {
+      //     dataLen = sizeof(char);
+      //   }
+      //   dataLen += sizeof(char);
+      // }
 
       if (data->varLenCol.payloadAllocLen < data->varLenCol.payloadLen + dataLen) {
         uint32_t newSize = data->varLenCol.payloadAllocLen;
diff --git a/source/client/test/smlTest.cpp b/source/client/test/smlTest.cpp
index 338457bec4..d64cd9c971 100644
--- a/source/client/test/smlTest.cpp
+++ b/source/client/test/smlTest.cpp
@@ -276,6 +276,7 @@ TEST(testCase, smlParseCols_Test) {
   info->dataFormat = false;
   SSmlLineInfo elements = {0};
   info->msgBuf = msgBuf;
+  ASSERT_EQ(smlInitHandle(NULL), TSDB_CODE_INVALID_PARA);
 
   const char *data =
       "st,t=1 cb\\=in=\"pass\\,it "
diff --git a/source/common/src/msg/tmsg.c b/source/common/src/msg/tmsg.c
index 2193c7983f..166c889947 100644
--- a/source/common/src/msg/tmsg.c
+++ b/source/common/src/msg/tmsg.c
@@ -11141,6 +11141,7 @@ void tOffsetCopy(STqOffsetVal *pLeft, const STqOffsetVal *pRight) {
 }
 
 void tOffsetDestroy(void *param) {
+  if (param == NULL) return;
   STqOffsetVal *pVal = (STqOffsetVal *)param;
   if (IS_VAR_DATA_TYPE(pVal->primaryKey.type)) {
     taosMemoryFreeClear(pVal->primaryKey.pData);
@@ -11148,6 +11149,7 @@ void tOffsetDestroy(void *param) {
 }
 
 void tDeleteSTqOffset(void *param) {
+  if (param == NULL) return;
   STqOffset *pVal = (STqOffset *)param;
   tOffsetDestroy(&pVal->val);
 }
diff --git a/source/dnode/mnode/impl/src/mndCompact.c b/source/dnode/mnode/impl/src/mndCompact.c
index e8f7202986..33a6ddcc5d 100644
--- a/source/dnode/mnode/impl/src/mndCompact.c
+++ b/source/dnode/mnode/impl/src/mndCompact.c
@@ -348,6 +348,7 @@ static void *mndBuildKillCompactReq(SMnode *pMnode, SVgObj *pVgroup, int32_t *pC
   req.compactId = compactId;
   req.vgId = pVgroup->vgId;
   req.dnodeId = dnodeid;
+  terrno = 0;
 
   mInfo("vgId:%d, build compact vnode config req", pVgroup->vgId);
   int32_t contLen = tSerializeSVKillCompactReq(NULL, 0, &req);
@@ -367,8 +368,10 @@ static void *mndBuildKillCompactReq(SMnode *pMnode, SVgObj *pVgroup, int32_t *pC
   pHead->contLen = htonl(contLen);
   pHead->vgId = htonl(pVgroup->vgId);
 
-  if ((contLen = tSerializeSVKillCompactReq((char *)pReq + sizeof(SMsgHead), contLen, &req)) < 0) {
-    terrno = contLen;
+  mTrace("vgId:%d, build compact vnode config req, contLen:%d", pVgroup->vgId, contLen);
+  int32_t ret = 0;
+  if ((ret = tSerializeSVKillCompactReq((char *)pReq + sizeof(SMsgHead), contLen, &req)) < 0) {
+    terrno = ret;
     return NULL;
   }
   *pContLen = contLen;
@@ -401,6 +404,8 @@ static int32_t mndAddKillCompactAction(SMnode *pMnode, STrans *pTrans, SVgObj *p
   action.contLen = contLen;
   action.msgType = TDMT_VND_KILL_COMPACT;
 
+  mTrace("trans:%d, kill compact msg len:%d", pTrans->id, contLen);
+
   if ((code = mndTransAppendRedoAction(pTrans, &action)) != 0) {
     taosMemoryFree(pReq);
     TAOS_RETURN(code);
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 4f1ecf81dd..940116317c 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -160,7 +160,7 @@ int32_t         metaAlterSuperTable(SMeta* pMeta, int64_t version, SVCreateStbRe
 int32_t         metaDropSuperTable(SMeta* pMeta, int64_t verison, SVDropStbReq* pReq);
 int32_t         metaCreateTable2(SMeta* pMeta, int64_t version, SVCreateTbReq* pReq, STableMetaRsp** ppRsp);
 int32_t         metaDropTable2(SMeta* pMeta, int64_t version, SVDropTbReq* pReq);
-int32_t         metaTrimTables(SMeta* pMeta);
+int32_t         metaTrimTables(SMeta* pMeta, int64_t version);
 int32_t         metaDropMultipleTables(SMeta* pMeta, int64_t version, SArray* tbUids);
 int             metaTtlFindExpired(SMeta* pMeta, int64_t timePointMs, SArray* tbUids, int32_t ttlDropMaxCount);
 int             metaAlterTable(SMeta* pMeta, int64_t version, SVAlterTbReq* pReq, STableMetaRsp* pMetaRsp);
diff --git a/source/dnode/vnode/src/meta/metaEntry2.c b/source/dnode/vnode/src/meta/metaEntry2.c
index 7aa57edf73..20744577a7 100644
--- a/source/dnode/vnode/src/meta/metaEntry2.c
+++ b/source/dnode/vnode/src/meta/metaEntry2.c
@@ -1645,7 +1645,6 @@ static int32_t metaHandleSuperTableUpdate(SMeta *pMeta, const SMetaEntry *pEntry
         metaFetchEntryFree(&pOldEntry);
         return code;
       }
-      // TAOS_CHECK_RETURN(metaGetSubtables(pMeta, pEntry->uid, uids));
       TAOS_CHECK_RETURN(tsdbCacheNewSTableColumn(pTsdb, uids, cid, col_type));
     } else if (deltaCol == -1) {
       int16_t cid = -1;
@@ -1667,7 +1666,6 @@ static int32_t metaHandleSuperTableUpdate(SMeta *pMeta, const SMetaEntry *pEntry
           metaFetchEntryFree(&pOldEntry);
           return code;
         }
-        // TAOS_CHECK_RETURN(metaGetSubtables(pMeta, pEntry->uid, uids));
         TAOS_CHECK_RETURN(tsdbCacheDropSTableColumn(pTsdb, uids, cid, hasPrimaryKey));
       }
     }
diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index ee37dd1f90..2dbc89f58f 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -28,26 +28,14 @@ int32_t metaUpdateTableColCompress2(SMeta *pMeta, int64_t version, SVAlterTbReq
 
 int32_t metaSaveJsonVarToIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry, const SSchema *pSchema);
 
-int32_t     metaDelJsonVarFromIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry, const SSchema *pSchema);
-static int  metaSaveToTbDb(SMeta *pMeta, const SMetaEntry *pME);
-static int  metaUpdateUidIdx(SMeta *pMeta, const SMetaEntry *pME);
-static int  metaUpdateNameIdx(SMeta *pMeta, const SMetaEntry *pME);
-static void metaUpdateTtl(SMeta *pMeta, const SMetaEntry *pME);
-static int  metaUpdateChangeTime(SMeta *pMeta, tb_uid_t uid, int64_t changeTimeMs);
-static int  metaSaveToSkmDb(SMeta *pMeta, const SMetaEntry *pME);
-static int  metaUpdateCtbIdx(SMeta *pMeta, const SMetaEntry *pME);
-static int  metaUpdateSuidIdx(SMeta *pMeta, const SMetaEntry *pME);
-static int  metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry);
-static int  metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type, tb_uid_t *pSuid, int8_t *pSysTbl);
-void        metaDestroyTagIdxKey(STagIdxKey *pTagIdxKey);
+int32_t    metaDelJsonVarFromIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry, const SSchema *pSchema);
+static int metaUpdateChangeTime(SMeta *pMeta, tb_uid_t uid, int64_t changeTimeMs);
+static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type, tb_uid_t *pSuid, int8_t *pSysTbl);
+void       metaDestroyTagIdxKey(STagIdxKey *pTagIdxKey);
 // opt ins_tables query
-static int metaUpdateBtimeIdx(SMeta *pMeta, const SMetaEntry *pME);
 static int metaDeleteBtimeIdx(SMeta *pMeta, const SMetaEntry *pME);
-static int metaUpdateNcolIdx(SMeta *pMeta, const SMetaEntry *pME);
 static int metaDeleteNcolIdx(SMeta *pMeta, const SMetaEntry *pME);
 
-int metaHandleEntry(SMeta *pMeta, const SMetaEntry *pME);
-
 int32_t updataTableColCmpr(SColCmprWrapper *pWp, SSchema *pSchema, int8_t add, uint32_t compress) {
   int32_t nCols = pWp->nCols;
   int32_t ver = pWp->version;
@@ -80,22 +68,6 @@ int32_t updataTableColCmpr(SColCmprWrapper *pWp, SSchema *pSchema, int8_t add, u
   }
   return 0;
 }
-static void metaGetEntryInfo(const SMetaEntry *pEntry, SMetaInfo *pInfo) {
-  pInfo->uid = pEntry->uid;
-  pInfo->version = pEntry->version;
-  if (pEntry->type == TSDB_SUPER_TABLE) {
-    pInfo->suid = pEntry->uid;
-    pInfo->skmVer = pEntry->stbEntry.schemaRow.version;
-  } else if (pEntry->type == TSDB_CHILD_TABLE) {
-    pInfo->suid = pEntry->ctbEntry.suid;
-    pInfo->skmVer = 0;
-  } else if (pEntry->type == TSDB_NORMAL_TABLE) {
-    pInfo->suid = 0;
-    pInfo->skmVer = pEntry->ntbEntry.schemaRow.version;
-  } else {
-    metaError("meta/table: invalide table type: %" PRId8 " get entry info failed.", pEntry->type);
-  }
-}
 
 int metaUpdateMetaRsp(tb_uid_t uid, char *tbName, SSchemaWrapper *pSchema, STableMetaRsp *pMetaRsp) {
   pMetaRsp->pSchemas = taosMemoryMalloc(pSchema->nCols * sizeof(SSchema));
@@ -303,991 +275,6 @@ void metaTimeSeriesNotifyCheck(SMeta *pMeta) {
 #endif
 }
 
-static int metaCreateSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
-  SMetaEntry  me = {0};
-  int         kLen = 0;
-  int         vLen = 0;
-  const void *pKey = NULL;
-  const void *pVal = NULL;
-  void       *pBuf = NULL;
-  int32_t     szBuf = 0;
-  void       *p = NULL;
-  int32_t     code = 0;
-
-  // validate req
-  void *pData = NULL;
-  int   nData = 0;
-  if (tdbTbGet(pMeta->pNameIdx, pReq->name, strlen(pReq->name) + 1, &pData, &nData) == 0) {
-    tb_uid_t uid = *(tb_uid_t *)pData;
-    tdbFree(pData);
-    SMetaInfo info;
-    if (metaGetInfo(pMeta, uid, &info, NULL) == TSDB_CODE_NOT_FOUND) {
-      return terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
-    }
-    if (info.uid == info.suid) {
-      return 0;
-    } else {
-      return terrno = TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
-    }
-  }
-
-  // set structs
-  me.version = version;
-  me.type = TSDB_SUPER_TABLE;
-  me.uid = pReq->suid;
-  me.name = pReq->name;
-  me.stbEntry.schemaRow = pReq->schemaRow;
-  me.stbEntry.schemaTag = pReq->schemaTag;
-  if (pReq->rollup) {
-    TABLE_SET_ROLLUP(me.flags);
-    me.stbEntry.rsmaParam = pReq->rsmaParam;
-  }
-  if (pReq->colCmpred) {
-    TABLE_SET_COL_COMPRESSED(me.flags);
-    me.colCmpr = pReq->colCmpr;
-  }
-
-  code = metaHandleEntry(pMeta, &me);
-  if (code) goto _err;
-
-  ++pMeta->pVnode->config.vndStats.numOfSTables;
-
-  pMeta->changed = true;
-  metaDebug("vgId:%d, stb:%s is created, suid:%" PRId64, TD_VID(pMeta->pVnode), pReq->name, pReq->suid);
-
-  return 0;
-
-_err:
-  metaError("vgId:%d, failed to create stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-            tstrerror(terrno));
-  return code;
-}
-
-static int metaDropSTable(SMeta *pMeta, int64_t verison, SVDropStbReq *pReq, SArray *tbUidList) {
-  void   *pKey = NULL;
-  int     nKey = 0;
-  void   *pData = NULL;
-  int     nData = 0;
-  int     c = 0;
-  int     rc = 0;
-  int32_t lino;
-  int32_t ret;
-
-  // check if super table exists
-  rc = tdbTbGet(pMeta->pNameIdx, pReq->name, strlen(pReq->name) + 1, &pData, &nData);
-  if (rc < 0 || *(tb_uid_t *)pData != pReq->suid) {
-    tdbFree(pData);
-    return terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-  }
-
-  // drop all child tables
-  TBC *pCtbIdxc = NULL;
-
-  rc = tdbTbcOpen(pMeta->pCtbIdx, &pCtbIdxc, NULL);
-  if (rc) {
-    return (terrno = rc);
-  }
-
-  rc = tdbTbcMoveTo(pCtbIdxc, &(SCtbIdxKey){.suid = pReq->suid, .uid = INT64_MIN}, sizeof(SCtbIdxKey), &c);
-  if (rc < 0) {
-    tdbTbcClose(pCtbIdxc);
-    metaWLock(pMeta);
-    goto _drop_super_table;
-  }
-
-  for (;;) {
-    rc = tdbTbcNext(pCtbIdxc, &pKey, &nKey, NULL, NULL);
-    if (rc < 0) break;
-
-    if (((SCtbIdxKey *)pKey)->suid < pReq->suid) {
-      continue;
-    } else if (((SCtbIdxKey *)pKey)->suid > pReq->suid) {
-      break;
-    }
-
-    if (taosArrayPush(tbUidList, &(((SCtbIdxKey *)pKey)->uid)) == NULL) {
-      tdbFree(pKey);
-      tdbTbcClose(pCtbIdxc);
-      return terrno;
-    }
-  }
-
-  tdbTbcClose(pCtbIdxc);
-
-  ret = tsdbCacheDropSubTables(pMeta->pVnode->pTsdb, tbUidList, pReq->suid);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  metaWLock(pMeta);
-
-  for (int32_t iChild = 0; iChild < taosArrayGetSize(tbUidList); iChild++) {
-    tb_uid_t uid = *(tb_uid_t *)taosArrayGet(tbUidList, iChild);
-    ret = metaDropTableByUid(pMeta, uid, NULL, NULL, NULL);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                pReq->suid, tstrerror(terrno));
-    }
-  }
-
-  // drop super table
-_drop_super_table:
-  tdbTbGet(pMeta->pUidIdx, &pReq->suid, sizeof(tb_uid_t), &pData, &nData);
-  ret = tdbTbDelete(pMeta->pTbDb, &(STbDbKey){.version = ((SUidIdxVal *)pData)[0].version, .uid = pReq->suid},
-                    sizeof(STbDbKey), pMeta->txn);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  ret = tdbTbDelete(pMeta->pNameIdx, pReq->name, strlen(pReq->name) + 1, pMeta->txn);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  ret = metaCacheDrop(pMeta, pReq->suid);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  ret = tdbTbDelete(pMeta->pUidIdx, &pReq->suid, sizeof(tb_uid_t), pMeta->txn);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  ret = tdbTbDelete(pMeta->pSuidIdx, &pReq->suid, sizeof(tb_uid_t), pMeta->txn);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  ret = metaStatsCacheDrop(pMeta, pReq->suid);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to drop stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, pReq->suid,
-              tstrerror(terrno));
-  }
-
-  metaULock(pMeta);
-
-  metaUpdTimeSeriesNum(pMeta);
-
-  pMeta->changed = true;
-
-_exit:
-  tdbFree(pKey);
-  tdbFree(pData);
-  metaDebug("vgId:%d, super table %s uid:%" PRId64 " is dropped", TD_VID(pMeta->pVnode), pReq->name, pReq->suid);
-  return 0;
-}
-
-static int32_t metaGetSubtables(SMeta *pMeta, int64_t suid, SArray *uids) {
-  if (!uids) return TSDB_CODE_INVALID_PARA;
-
-  int   c = 0;
-  void *pKey = NULL;
-  int   nKey = 0;
-  TBC  *pCtbIdxc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pCtbIdx, &pCtbIdxc, NULL));
-  int rc = tdbTbcMoveTo(pCtbIdxc, &(SCtbIdxKey){.suid = suid, .uid = INT64_MIN}, sizeof(SCtbIdxKey), &c);
-  if (rc < 0) {
-    tdbTbcClose(pCtbIdxc);
-    metaWLock(pMeta);
-    return 0;
-  }
-
-  for (;;) {
-    rc = tdbTbcNext(pCtbIdxc, &pKey, &nKey, NULL, NULL);
-    if (rc < 0) break;
-
-    if (((SCtbIdxKey *)pKey)->suid < suid) {
-      continue;
-    } else if (((SCtbIdxKey *)pKey)->suid > suid) {
-      break;
-    }
-
-    if (taosArrayPush(uids, &(((SCtbIdxKey *)pKey)->uid)) == NULL) {
-      tdbFree(pKey);
-      tdbTbcClose(pCtbIdxc);
-      return terrno;
-    }
-  }
-
-  tdbFree(pKey);
-
-  tdbTbcClose(pCtbIdxc);
-  return 0;
-}
-
-static int metaAlterSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
-  SMetaEntry  oStbEntry = {0};
-  SMetaEntry  nStbEntry = {0};
-  TBC        *pUidIdxc = NULL;
-  TBC        *pTbDbc = NULL;
-  const void *pData;
-  int         nData;
-  int64_t     oversion;
-  SDecoder    dc = {0};
-  int32_t     ret;
-  int32_t     c = -2;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL));
-  ret = tdbTbcMoveTo(pUidIdxc, &pReq->suid, sizeof(tb_uid_t), &c);
-  if (ret < 0 || c) {
-    tdbTbcClose(pUidIdxc);
-
-    return terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-  }
-
-  ret = tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData);
-  if (ret < 0) {
-    tdbTbcClose(pUidIdxc);
-
-    return terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-  }
-
-  oversion = ((SUidIdxVal *)pData)[0].version;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL));
-  ret = tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = pReq->suid, .version = oversion}), sizeof(STbDbKey), &c);
-  if (!(ret == 0 && c == 0)) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-
-    metaError("meta/table: invalide ret: %" PRId32 " or c: %" PRId32 "alter stb failed.", ret, c);
-    return terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-  }
-
-  ret = tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData);
-  if (ret < 0) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-
-    return terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-  }
-
-  if ((oStbEntry.pBuf = taosMemoryMalloc(nData)) == NULL) {
-    tdbTbcClose(pTbDbc);
-    tdbTbcClose(pUidIdxc);
-    return terrno;
-  }
-  memcpy(oStbEntry.pBuf, pData, nData);
-  tDecoderInit(&dc, oStbEntry.pBuf, nData);
-  ret = metaDecodeEntry(&dc, &oStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to decode stb:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-              pReq->suid, tstrerror(ret));
-    tDecoderClear(&dc);
-    tdbTbcClose(pTbDbc);
-    tdbTbcClose(pUidIdxc);
-    return terrno;
-  }
-
-  nStbEntry.version = version;
-  nStbEntry.type = TSDB_SUPER_TABLE;
-  nStbEntry.uid = pReq->suid;
-  nStbEntry.name = pReq->name;
-  nStbEntry.stbEntry.schemaRow = pReq->schemaRow;
-  nStbEntry.stbEntry.schemaTag = pReq->schemaTag;
-  nStbEntry.colCmpr = pReq->colCmpr;
-  TABLE_SET_COL_COMPRESSED(nStbEntry.flags);
-
-  int     nCols = pReq->schemaRow.nCols;
-  int     onCols = oStbEntry.stbEntry.schemaRow.nCols;
-  int32_t deltaCol = nCols - onCols;
-  bool    updStat = deltaCol != 0 && !metaTbInFilterCache(pMeta, pReq->name, 1);
-
-  if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-    STsdb  *pTsdb = pMeta->pVnode->pTsdb;
-    SArray *uids = taosArrayInit(8, sizeof(int64_t));
-    if (uids == NULL) {
-      if (oStbEntry.pBuf) taosMemoryFree(oStbEntry.pBuf);
-      tDecoderClear(&dc);
-      tdbTbcClose(pTbDbc);
-      tdbTbcClose(pUidIdxc);
-      return terrno;
-    }
-    if (deltaCol == 1) {
-      int16_t cid = pReq->schemaRow.pSchema[nCols - 1].colId;
-      int8_t  col_type = pReq->schemaRow.pSchema[nCols - 1].type;
-
-      TAOS_CHECK_RETURN(metaGetSubtables(pMeta, pReq->suid, uids));
-      TAOS_CHECK_RETURN(tsdbCacheNewSTableColumn(pTsdb, uids, cid, col_type));
-    } else if (deltaCol == -1) {
-      int16_t cid = -1;
-      bool    hasPrimaryKey = false;
-      if (onCols >= 2) {
-        hasPrimaryKey = (oStbEntry.stbEntry.schemaRow.pSchema[1].flags & COL_IS_KEY) ? true : false;
-      }
-      for (int i = 0, j = 0; i < nCols && j < onCols; ++i, ++j) {
-        if (pReq->schemaRow.pSchema[i].colId != oStbEntry.stbEntry.schemaRow.pSchema[j].colId) {
-          cid = oStbEntry.stbEntry.schemaRow.pSchema[j].colId;
-          break;
-        }
-      }
-
-      if (cid != -1) {
-        TAOS_CHECK_RETURN(metaGetSubtables(pMeta, pReq->suid, uids));
-        TAOS_CHECK_RETURN(tsdbCacheDropSTableColumn(pTsdb, uids, cid, hasPrimaryKey));
-      }
-    }
-    if (uids) taosArrayDestroy(uids);
-
-    tsdbCacheInvalidateSchema(pTsdb, pReq->suid, -1, pReq->schemaRow.version);
-  }
-
-  metaWLock(pMeta);
-  // compare two entry
-  if (oStbEntry.stbEntry.schemaRow.version != pReq->schemaRow.version) {
-    ret = metaSaveToSkmDb(pMeta, &nStbEntry);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to save skm db:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                pReq->suid, tstrerror(ret));
-    }
-  }
-
-  // update table.db
-  ret = metaSaveToTbDb(pMeta, &nStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to save tb db:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-              pReq->suid, tstrerror(ret));
-  }
-
-  // update uid index
-  ret = metaUpdateUidIdx(pMeta, &nStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to update uid idx:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-              pReq->suid, tstrerror(ret));
-  }
-
-  // metaStatsCacheDrop(pMeta, nStbEntry.uid);
-
-  if (updStat) {
-    metaUpdateStbStats(pMeta, pReq->suid, 0, deltaCol);
-  }
-  metaULock(pMeta);
-
-  if (updStat) {
-    int64_t ctbNum;
-    ret = metaGetStbStats(pMeta->pVnode, pReq->suid, &ctbNum, NULL);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to get stb stats:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                pReq->suid, tstrerror(ret));
-    }
-    pMeta->pVnode->config.vndStats.numOfTimeSeries += (ctbNum * deltaCol);
-    metaTimeSeriesNotifyCheck(pMeta);
-  }
-
-  pMeta->changed = true;
-
-_exit:
-  if (oStbEntry.pBuf) taosMemoryFree(oStbEntry.pBuf);
-  tDecoderClear(&dc);
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  return 0;
-}
-
-static int metaAddIndexToSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
-  SMetaEntry oStbEntry = {0};
-  SMetaEntry nStbEntry = {0};
-  STbDbKey   tbDbKey = {0};
-
-  TBC     *pUidIdxc = NULL;
-  TBC     *pTbDbc = NULL;
-  void    *pData = NULL;
-  int      nData = 0;
-  int64_t  oversion;
-  SDecoder dc = {0};
-  int32_t  ret;
-  int32_t  c = -2;
-  tb_uid_t suid = pReq->suid;
-  int32_t  code = 0;
-
-  // get super table
-  if ((code = tdbTbGet(pMeta->pUidIdx, &suid, sizeof(tb_uid_t), &pData, &nData)) != 0) {
-    goto _err;
-  }
-
-  tbDbKey.uid = suid;
-  tbDbKey.version = ((SUidIdxVal *)pData)[0].version;
-  if ((code = tdbTbGet(pMeta->pTbDb, &tbDbKey, sizeof(tbDbKey), &pData, &nData)) != 0) {
-    goto _err;
-  }
-
-  tDecoderInit(&dc, pData, nData);
-  code = metaDecodeEntry(&dc, &oStbEntry);
-  if (code < 0) {
-    goto _err;
-  }
-
-  if (oStbEntry.stbEntry.schemaTag.pSchema == NULL || oStbEntry.stbEntry.schemaTag.pSchema == NULL) {
-    code = TSDB_CODE_INVALID_PARA;
-    goto _err;
-  }
-
-  if (oStbEntry.stbEntry.schemaTag.version == pReq->schemaTag.version) {
-    code = TSDB_CODE_INVALID_PARA;
-    goto _err;
-  }
-
-  if (oStbEntry.stbEntry.schemaTag.nCols != pReq->schemaTag.nCols) {
-    code = TSDB_CODE_INVALID_PARA;
-    goto _err;
-  }
-
-  int diffIdx = -1;
-  for (int i = 0; i < pReq->schemaTag.nCols; i++) {
-    SSchema *pNew = pReq->schemaTag.pSchema + i;
-    SSchema *pOld = oStbEntry.stbEntry.schemaTag.pSchema + i;
-    if (pNew->type != pOld->type || pNew->colId != pOld->colId || pNew->bytes != pOld->bytes ||
-        strncmp(pOld->name, pNew->name, sizeof(pNew->name))) {
-      code = TSDB_CODE_INVALID_PARA;
-      goto _err;
-    }
-    if (IS_IDX_ON(pNew) && !IS_IDX_ON(pOld)) {
-      // if (diffIdx != -1) goto _err;
-      diffIdx = i;
-      break;
-    }
-  }
-
-  if (diffIdx == -1) {
-    code = TSDB_CODE_INVALID_PARA;
-    goto _err;
-  }
-
-  // Get target schema info
-  SSchemaWrapper *pTagSchema = &pReq->schemaTag;
-  if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
-    code = TSDB_CODE_INVALID_PARA;
-    goto _err;
-  }
-  SSchema *pCol = pTagSchema->pSchema + diffIdx;
-
-  /*
-   * iterator all pTdDbc by uid and version
-   */
-  TBC *pCtbIdxc = NULL;
-  code = tdbTbcOpen(pMeta->pCtbIdx, &pCtbIdxc, NULL);
-  if (code != 0) {
-    goto _err;
-  }
-
-  code = tdbTbcMoveTo(pCtbIdxc, &(SCtbIdxKey){.suid = suid, .uid = INT64_MIN}, sizeof(SCtbIdxKey), &c);
-  if (code < 0) {
-    tdbTbcClose(pCtbIdxc);
-    goto _err;
-  }
-  for (;;) {
-    void *pKey = NULL, *pVal = NULL;
-    int   nKey = 0, nVal = 0;
-    code = tdbTbcNext(pCtbIdxc, &pKey, &nKey, &pVal, &nVal);
-    if (code < 0) {
-      tdbFree(pKey);
-      tdbFree(pVal);
-      tdbTbcClose(pCtbIdxc);
-      pCtbIdxc = NULL;
-      break;
-    }
-    if (((SCtbIdxKey *)pKey)->suid != suid) {
-      tdbFree(pKey);
-      tdbFree(pVal);
-      continue;
-    }
-    STagIdxKey *pTagIdxKey = NULL;
-    int32_t     nTagIdxKey;
-
-    const void *pTagData = NULL;
-    int32_t     nTagData = 0;
-
-    SCtbIdxKey *table = (SCtbIdxKey *)pKey;
-    STagVal     tagVal = {.cid = pCol->colId};
-    if (tTagGet((const STag *)pVal, &tagVal)) {
-      if (IS_VAR_DATA_TYPE(pCol->type)) {
-        pTagData = tagVal.pData;
-        nTagData = (int32_t)tagVal.nData;
-      } else {
-        pTagData = &(tagVal.i64);
-        nTagData = tDataTypes[pCol->type].bytes;
-      }
-    } else {
-      if (!IS_VAR_DATA_TYPE(pCol->type)) {
-        nTagData = tDataTypes[pCol->type].bytes;
-      }
-    }
-    code = metaCreateTagIdxKey(suid, pCol->colId, pTagData, nTagData, pCol->type, table->uid, &pTagIdxKey, &nTagIdxKey);
-    tdbFree(pKey);
-    tdbFree(pVal);
-    if (code < 0) {
-      metaDestroyTagIdxKey(pTagIdxKey);
-      tdbTbcClose(pCtbIdxc);
-      goto _err;
-    }
-
-    metaWLock(pMeta);
-    ret = tdbTbUpsert(pMeta->pTagIdx, pTagIdxKey, nTagIdxKey, NULL, 0, pMeta->txn);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to upsert tag idx key:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                pReq->suid, tstrerror(ret));
-    }
-    metaULock(pMeta);
-
-    metaDestroyTagIdxKey(pTagIdxKey);
-    pTagIdxKey = NULL;
-  }
-
-  nStbEntry.version = version;
-  nStbEntry.type = TSDB_SUPER_TABLE;
-  nStbEntry.uid = pReq->suid;
-  nStbEntry.name = pReq->name;
-  nStbEntry.stbEntry.schemaRow = pReq->schemaRow;
-  nStbEntry.stbEntry.schemaTag = pReq->schemaTag;
-  nStbEntry.colCmpr = pReq->colCmpr;
-
-  metaWLock(pMeta);
-  // update table.db
-  ret = metaSaveToTbDb(pMeta, &nStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to save tb db:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-              pReq->suid, tstrerror(ret));
-  }
-  // update uid index
-  ret = metaUpdateUidIdx(pMeta, &nStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to update uid idx:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-              pReq->suid, tstrerror(ret));
-  }
-  metaULock(pMeta);
-
-  if (oStbEntry.pBuf) taosMemoryFree(oStbEntry.pBuf);
-  tDecoderClear(&dc);
-  tdbFree(pData);
-
-  tdbTbcClose(pCtbIdxc);
-  return TSDB_CODE_SUCCESS;
-_err:
-  if (oStbEntry.pBuf) taosMemoryFree(oStbEntry.pBuf);
-  tDecoderClear(&dc);
-  tdbFree(pData);
-
-  return code;
-}
-
-static int metaDropIndexFromSTable(SMeta *pMeta, int64_t version, SDropIndexReq *pReq) {
-  int32_t    code = 0;
-  SMetaEntry oStbEntry = {0};
-  SMetaEntry nStbEntry = {0};
-
-  STbDbKey tbDbKey = {0};
-  TBC     *pUidIdxc = NULL;
-  TBC     *pTbDbc = NULL;
-  int      ret = 0;
-  int      c = -2;
-  void    *pData = NULL;
-  int      nData = 0;
-  int64_t  oversion;
-  SDecoder dc = {0};
-
-  tb_uid_t suid = pReq->stbUid;
-
-  if ((code = tdbTbGet(pMeta->pUidIdx, &suid, sizeof(tb_uid_t), &pData, &nData)) != 0) {
-    goto _err;
-  }
-
-  tbDbKey.uid = suid;
-  tbDbKey.version = ((SUidIdxVal *)pData)[0].version;
-  if ((code = tdbTbGet(pMeta->pTbDb, &tbDbKey, sizeof(tbDbKey), &pData, &nData)) != 0) {
-    goto _err;
-  }
-
-  tDecoderInit(&dc, pData, nData);
-  code = metaDecodeEntry(&dc, &oStbEntry);
-  if (code != 0) {
-    goto _err;
-  }
-
-  SSchema *pCol = NULL;
-  int32_t  colId = -1;
-  for (int i = 0; i < oStbEntry.stbEntry.schemaTag.nCols; i++) {
-    SSchema *schema = oStbEntry.stbEntry.schemaTag.pSchema + i;
-    if (0 == strncmp(schema->name, pReq->colName, sizeof(pReq->colName))) {
-      if (IS_IDX_ON(schema)) {
-        pCol = schema;
-      }
-      break;
-    }
-  }
-
-  if (pCol == NULL) {
-    metaError("vgId:%d, failed to drop index on %s.%s,since %s", TD_VID(pMeta->pVnode), pReq->stb, pReq->colName,
-              tstrerror(TSDB_CODE_VND_COL_NOT_EXISTS));
-    code = 0;
-
-    goto _err;
-  }
-
-  /*
-   * iterator all pTdDbc by uid and version
-   */
-  TBC *pCtbIdxc = NULL;
-  code = tdbTbcOpen(pMeta->pCtbIdx, &pCtbIdxc, NULL);
-  if (code != 0) {
-    goto _err;
-  }
-
-  code = tdbTbcMoveTo(pCtbIdxc, &(SCtbIdxKey){.suid = suid, .uid = INT64_MIN}, sizeof(SCtbIdxKey), &c);
-  if (code < 0) {
-    tdbTbcClose(pCtbIdxc);
-    goto _err;
-  }
-  for (;;) {
-    void *pKey = NULL, *pVal = NULL;
-    int   nKey = 0, nVal = 0;
-
-    code = tdbTbcNext(pCtbIdxc, &pKey, &nKey, &pVal, &nVal);
-    if (code < 0) {
-      tdbFree(pKey);
-      tdbFree(pVal);
-      tdbTbcClose(pCtbIdxc);
-      pCtbIdxc = NULL;
-      break;
-    }
-    if (((SCtbIdxKey *)pKey)->suid != suid) {
-      tdbFree(pKey);
-      tdbFree(pVal);
-      continue;
-    }
-    STagIdxKey *pTagIdxKey = NULL;
-    int32_t     nTagIdxKey;
-
-    const void *pTagData = NULL;
-    int32_t     nTagData = 0;
-
-    SCtbIdxKey *table = (SCtbIdxKey *)pKey;
-    STagVal     tagVal = {.cid = pCol->colId};
-    if (tTagGet((const STag *)pVal, &tagVal)) {
-      if (IS_VAR_DATA_TYPE(pCol->type)) {
-        pTagData = tagVal.pData;
-        nTagData = (int32_t)tagVal.nData;
-      } else {
-        pTagData = &(tagVal.i64);
-        nTagData = tDataTypes[pCol->type].bytes;
-      }
-    } else {
-      if (!IS_VAR_DATA_TYPE(pCol->type)) {
-        nTagData = tDataTypes[pCol->type].bytes;
-      }
-    }
-
-    code = metaCreateTagIdxKey(suid, pCol->colId, pTagData, nTagData, pCol->type, table->uid, &pTagIdxKey, &nTagIdxKey);
-    tdbFree(pKey);
-    tdbFree(pVal);
-    if (code < 0) {
-      metaDestroyTagIdxKey(pTagIdxKey);
-      tdbTbcClose(pCtbIdxc);
-      goto _err;
-    }
-
-    metaWLock(pMeta);
-    ret = tdbTbDelete(pMeta->pTagIdx, pTagIdxKey, nTagIdxKey, pMeta->txn);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to delete tag idx key:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->stb,
-                pReq->stbUid, tstrerror(ret));
-    }
-    metaULock(pMeta);
-    metaDestroyTagIdxKey(pTagIdxKey);
-    pTagIdxKey = NULL;
-  }
-
-  // clear idx flag
-  SSCHMEA_SET_IDX_OFF(pCol);
-
-  nStbEntry.version = version;
-  nStbEntry.type = TSDB_SUPER_TABLE;
-  nStbEntry.uid = oStbEntry.uid;
-  nStbEntry.name = oStbEntry.name;
-
-  SSchemaWrapper  *row = tCloneSSchemaWrapper(&oStbEntry.stbEntry.schemaRow);
-  SSchemaWrapper  *tag = tCloneSSchemaWrapper(&oStbEntry.stbEntry.schemaTag);
-  SColCmprWrapper *cmpr = tCloneSColCmprWrapper(&oStbEntry.colCmpr);
-  if (row == NULL || tag == NULL || cmpr == NULL) {
-    tDeleteSchemaWrapper(row);
-    tDeleteSchemaWrapper(tag);
-    tDeleteSColCmprWrapper(cmpr);
-    code = TSDB_CODE_OUT_OF_MEMORY;
-
-    tdbTbcClose(pCtbIdxc);
-    goto _err;
-  }
-
-  nStbEntry.stbEntry.schemaRow = *row;
-  nStbEntry.stbEntry.schemaTag = *tag;
-  nStbEntry.stbEntry.rsmaParam = oStbEntry.stbEntry.rsmaParam;
-  nStbEntry.colCmpr = *cmpr;
-
-  nStbEntry.colCmpr = oStbEntry.colCmpr;
-
-  metaWLock(pMeta);
-  // update table.db
-  ret = metaSaveToTbDb(pMeta, &nStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to save tb db:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->stb,
-              pReq->stbUid, tstrerror(ret));
-  }
-  // update uid index
-  ret = metaUpdateUidIdx(pMeta, &nStbEntry);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to update uid idx:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->stb,
-              pReq->stbUid, tstrerror(ret));
-  }
-  metaULock(pMeta);
-
-  tDeleteSchemaWrapper(tag);
-  tDeleteSchemaWrapper(row);
-  tDeleteSColCmprWrapper(cmpr);
-
-  if (oStbEntry.pBuf) taosMemoryFree(oStbEntry.pBuf);
-  tDecoderClear(&dc);
-  tdbFree(pData);
-
-  tdbTbcClose(pCtbIdxc);
-  return TSDB_CODE_SUCCESS;
-_err:
-  if (oStbEntry.pBuf) taosMemoryFree(oStbEntry.pBuf);
-  tDecoderClear(&dc);
-  tdbFree(pData);
-
-  return code;
-}
-
-static int metaCreateTable(SMeta *pMeta, int64_t ver, SVCreateTbReq *pReq, STableMetaRsp **pMetaRsp) {
-  SMetaEntry  me = {0};
-  SMetaReader mr = {0};
-  int32_t     ret;
-
-  // validate message
-  if (pReq->type != TSDB_CHILD_TABLE && pReq->type != TSDB_NORMAL_TABLE) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _err;
-  }
-
-  if (pReq->type == TSDB_CHILD_TABLE) {
-    tb_uid_t suid = metaGetTableEntryUidByName(pMeta, pReq->ctb.stbName);
-    if (suid != pReq->ctb.suid) {
-      return terrno = TSDB_CODE_PAR_TABLE_NOT_EXIST;
-    }
-  }
-
-  // validate req
-  metaReaderDoInit(&mr, pMeta, META_READER_LOCK);
-  if (metaGetTableEntryByName(&mr, pReq->name) == 0) {
-    if (pReq->type == TSDB_CHILD_TABLE && pReq->ctb.suid != mr.me.ctbEntry.suid) {
-      metaReaderClear(&mr);
-      return terrno = TSDB_CODE_TDB_TABLE_IN_OTHER_STABLE;
-    }
-    pReq->uid = mr.me.uid;
-    if (pReq->type == TSDB_CHILD_TABLE) {
-      pReq->ctb.suid = mr.me.ctbEntry.suid;
-    }
-    metaReaderClear(&mr);
-    return terrno = TSDB_CODE_TDB_TABLE_ALREADY_EXIST;
-  } else if (terrno == TSDB_CODE_PAR_TABLE_NOT_EXIST) {
-    terrno = TSDB_CODE_SUCCESS;
-  }
-  metaReaderClear(&mr);
-
-  bool sysTbl = (pReq->type == TSDB_CHILD_TABLE) && metaTbInFilterCache(pMeta, pReq->ctb.stbName, 1);
-
-  if (!sysTbl && ((terrno = grantCheck(TSDB_GRANT_TIMESERIES)) < 0)) goto _err;
-
-  // build SMetaEntry
-  SVnodeStats *pStats = &pMeta->pVnode->config.vndStats;
-  me.version = ver;
-  me.type = pReq->type;
-  me.uid = pReq->uid;
-  me.name = pReq->name;
-  if (me.type == TSDB_CHILD_TABLE) {
-    me.ctbEntry.btime = pReq->btime;
-    me.ctbEntry.ttlDays = pReq->ttl;
-    me.ctbEntry.commentLen = pReq->commentLen;
-    me.ctbEntry.comment = pReq->comment;
-    me.ctbEntry.suid = pReq->ctb.suid;
-    me.ctbEntry.pTags = pReq->ctb.pTag;
-
-#ifdef TAG_FILTER_DEBUG
-    SArray *pTagVals = NULL;
-    int32_t code = tTagToValArray((STag *)pReq->ctb.pTag, &pTagVals);
-    for (int i = 0; i < taosArrayGetSize(pTagVals); i++) {
-      STagVal *pTagVal = (STagVal *)taosArrayGet(pTagVals, i);
-
-      if (IS_VAR_DATA_TYPE(pTagVal->type)) {
-        char *buf = taosMemoryCalloc(pTagVal->nData + 1, 1);
-        memcpy(buf, pTagVal->pData, pTagVal->nData);
-        metaDebug("metaTag table:%s varchar index:%d cid:%d type:%d value:%s", pReq->name, i, pTagVal->cid,
-                  pTagVal->type, buf);
-        taosMemoryFree(buf);
-      } else {
-        double val = 0;
-        GET_TYPED_DATA(val, double, pTagVal->type, &pTagVal->i64);
-        metaDebug("metaTag table:%s number index:%d cid:%d type:%d value:%f", pReq->name, i, pTagVal->cid,
-                  pTagVal->type, val);
-      }
-    }
-#endif
-
-    ++pStats->numOfCTables;
-
-    if (!sysTbl) {
-      int32_t nCols = 0;
-      ret = metaGetStbStats(pMeta->pVnode, me.ctbEntry.suid, 0, &nCols);
-      if (ret < 0) {
-        metaError("vgId:%d, failed to get stb stats:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                  pReq->ctb.suid, tstrerror(ret));
-      }
-      pStats->numOfTimeSeries += nCols - 1;
-    }
-
-    metaWLock(pMeta);
-    metaUpdateStbStats(pMeta, me.ctbEntry.suid, 1, 0);
-    ret = metaUidCacheClear(pMeta, me.ctbEntry.suid);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to clear uid cache:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                pReq->ctb.suid, tstrerror(ret));
-    }
-    ret = metaTbGroupCacheClear(pMeta, me.ctbEntry.suid);
-    if (ret < 0) {
-      metaError("vgId:%d, failed to clear group cache:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name,
-                pReq->ctb.suid, tstrerror(ret));
-    }
-    metaULock(pMeta);
-
-    if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-      ret = tsdbCacheNewTable(pMeta->pVnode->pTsdb, me.uid, me.ctbEntry.suid, NULL);
-      if (ret < 0) {
-        metaError("vgId:%d, failed to create table:%s since %s", TD_VID(pMeta->pVnode), pReq->name, tstrerror(ret));
-        goto _err;
-      }
-    }
-  } else {
-    me.ntbEntry.btime = pReq->btime;
-    me.ntbEntry.ttlDays = pReq->ttl;
-    me.ntbEntry.commentLen = pReq->commentLen;
-    me.ntbEntry.comment = pReq->comment;
-    me.ntbEntry.schemaRow = pReq->ntb.schemaRow;
-    me.ntbEntry.ncid = me.ntbEntry.schemaRow.pSchema[me.ntbEntry.schemaRow.nCols - 1].colId + 1;
-    me.colCmpr = pReq->colCmpr;
-    TABLE_SET_COL_COMPRESSED(me.flags);
-
-    ++pStats->numOfNTables;
-    pStats->numOfNTimeSeries += me.ntbEntry.schemaRow.nCols - 1;
-
-    if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-      ret = tsdbCacheNewTable(pMeta->pVnode->pTsdb, me.uid, -1, &me.ntbEntry.schemaRow);
-      if (ret < 0) {
-        metaError("vgId:%d, failed to create table:%s since %s", TD_VID(pMeta->pVnode), pReq->name, tstrerror(ret));
-        goto _err;
-      }
-    }
-  }
-
-  if (metaHandleEntry(pMeta, &me) < 0) goto _err;
-
-  metaTimeSeriesNotifyCheck(pMeta);
-
-  if (pMetaRsp) {
-    *pMetaRsp = taosMemoryCalloc(1, sizeof(STableMetaRsp));
-
-    if (*pMetaRsp) {
-      if (me.type == TSDB_CHILD_TABLE) {
-        (*pMetaRsp)->tableType = TSDB_CHILD_TABLE;
-        (*pMetaRsp)->tuid = pReq->uid;
-        (*pMetaRsp)->suid = pReq->ctb.suid;
-        tstrncpy((*pMetaRsp)->tbName, pReq->name, strlen(pReq->name) + 1);
-      } else {
-        ret = metaUpdateMetaRsp(pReq->uid, pReq->name, &pReq->ntb.schemaRow, *pMetaRsp);
-        if (ret < 0) {
-          metaError("vgId:%d, failed to update meta rsp:%s since %s", TD_VID(pMeta->pVnode), pReq->name,
-                    tstrerror(ret));
-        }
-        for (int32_t i = 0; i < pReq->colCmpr.nCols; i++) {
-          SColCmpr *p = &pReq->colCmpr.pColCmpr[i];
-          (*pMetaRsp)->pSchemaExt[i].colId = p->id;
-          (*pMetaRsp)->pSchemaExt[i].compress = p->alg;
-        }
-      }
-    }
-  }
-
-  pMeta->changed = true;
-  metaDebug("vgId:%d, table:%s uid %" PRId64 " is created, type:%" PRId8, TD_VID(pMeta->pVnode), pReq->name, pReq->uid,
-            pReq->type);
-  return 0;
-
-_err:
-  metaError("vgId:%d, failed to create table:%s type:%s since %s", TD_VID(pMeta->pVnode), pReq->name,
-            pReq->type == TSDB_CHILD_TABLE ? "child table" : "normal table", tstrerror(terrno));
-  return TSDB_CODE_FAILED;
-}
-
-static int metaDropTable(SMeta *pMeta, int64_t version, SVDropTbReq *pReq, SArray *tbUids, tb_uid_t *tbUid) {
-  void    *pData = NULL;
-  int      nData = 0;
-  int      rc = 0;
-  tb_uid_t uid = 0;
-  tb_uid_t suid = 0;
-  int8_t   sysTbl = 0;
-  int      type;
-
-  rc = tdbTbGet(pMeta->pNameIdx, pReq->name, strlen(pReq->name) + 1, &pData, &nData);
-  if (rc < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-  uid = *(tb_uid_t *)pData;
-
-  metaWLock(pMeta);
-  rc = metaDropTableByUid(pMeta, uid, &type, &suid, &sysTbl);
-  metaULock(pMeta);
-
-  if (rc < 0) goto _exit;
-
-  if (!sysTbl && type == TSDB_CHILD_TABLE) {
-    int32_t      nCols = 0;
-    SVnodeStats *pStats = &pMeta->pVnode->config.vndStats;
-    if (metaGetStbStats(pMeta->pVnode, suid, NULL, &nCols) == 0) {
-      pStats->numOfTimeSeries -= nCols - 1;
-    }
-  }
-
-  if ((type == TSDB_CHILD_TABLE || type == TSDB_NORMAL_TABLE) && tbUids) {
-    if (taosArrayPush(tbUids, &uid) == NULL) {
-      rc = terrno;
-      goto _exit;
-    }
-
-    if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-      int32_t ret = tsdbCacheDropTable(pMeta->pVnode->pTsdb, uid, suid, NULL);
-      if (ret < 0) {
-        metaError("vgId:%d, failed to drop table:%s uid:%" PRId64 " since %s", TD_VID(pMeta->pVnode), pReq->name, uid,
-                  tstrerror(ret));
-      }
-    }
-  }
-
-  if ((type == TSDB_CHILD_TABLE) && tbUid) {
-    *tbUid = uid;
-  }
-
-  pMeta->changed = true;
-_exit:
-  tdbFree(pData);
-  return rc;
-}
-
 static int32_t metaDropTables(SMeta *pMeta, SArray *tbUids) {
   int32_t code = 0;
   if (taosArrayGetSize(tbUids) == 0) return TSDB_CODE_SUCCESS;
@@ -1399,7 +386,7 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
   return 0;
 }
 
-int32_t metaTrimTables(SMeta *pMeta) {
+int32_t metaTrimTables(SMeta *pMeta, int64_t version) {
   int32_t code = 0;
 
   SArray *tbUids = taosArrayInit(8, sizeof(int64_t));
@@ -1679,17 +666,6 @@ static int metaDropTableByUid(SMeta *pMeta, tb_uid_t uid, int *type, tb_uid_t *p
 
   return 0;
 }
-// opt ins_tables
-static int metaUpdateBtimeIdx(SMeta *pMeta, const SMetaEntry *pME) {
-  SBtimeIdxKey btimeKey = {0};
-  if (metaBuildBtimeIdxKey(&btimeKey, pME) < 0) {
-    return 0;
-  }
-  metaTrace("vgId:%d, start to save version:%" PRId64 " uid:%" PRId64 " btime:%" PRId64, TD_VID(pMeta->pVnode),
-            pME->version, pME->uid, btimeKey.btime);
-
-  return tdbTbUpsert(pMeta->pBtimeIdx, &btimeKey, sizeof(btimeKey), NULL, 0, pMeta->txn);
-}
 
 static int metaDeleteBtimeIdx(SMeta *pMeta, const SMetaEntry *pME) {
   SBtimeIdxKey btimeKey = {0};
@@ -1699,14 +675,6 @@ static int metaDeleteBtimeIdx(SMeta *pMeta, const SMetaEntry *pME) {
   return tdbTbDelete(pMeta->pBtimeIdx, &btimeKey, sizeof(btimeKey), pMeta->txn);
 }
 
-int metaUpdateNcolIdx(SMeta *pMeta, const SMetaEntry *pME) {
-  SNcolIdxKey ncolKey = {0};
-  if (metaBuildNColIdxKey(&ncolKey, pME) < 0) {
-    return 0;
-  }
-  return tdbTbUpsert(pMeta->pNcolIdx, &ncolKey, sizeof(ncolKey), NULL, 0, pMeta->txn);
-}
-
 int metaDeleteNcolIdx(SMeta *pMeta, const SMetaEntry *pME) {
   SNcolIdxKey ncolKey = {0};
   if (metaBuildNColIdxKey(&ncolKey, pME) < 0) {
@@ -1715,1143 +683,6 @@ int metaDeleteNcolIdx(SMeta *pMeta, const SMetaEntry *pME) {
   return tdbTbDelete(pMeta->pNcolIdx, &ncolKey, sizeof(ncolKey), pMeta->txn);
 }
 
-static int metaAlterTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq, STableMetaRsp *pMetaRsp) {
-  void           *pVal = NULL;
-  int             nVal = 0;
-  const void     *pData = NULL;
-  int             nData = 0;
-  int             ret = 0;
-  tb_uid_t        uid;
-  int64_t         oversion;
-  SSchema        *pColumn = NULL;
-  SMetaEntry      entry = {0};
-  SSchemaWrapper *pSchema;
-  int             c;
-  bool            freeColCmpr = false;
-  if (pAlterTbReq->colName == NULL) {
-    metaError("meta/table: null pAlterTbReq->colName");
-    return terrno = TSDB_CODE_INVALID_MSG;
-  }
-
-  // search name index
-  ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
-  if (ret < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  uid = *(tb_uid_t *)pVal;
-  tdbFree(pVal);
-  pVal = NULL;
-
-  // search uid index
-  TBC *pUidIdxc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL));
-  ret = tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c);
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    metaError("meta/table: invalide c: %" PRId32 " alt tb column failed.", c);
-    return TSDB_CODE_FAILED;
-  }
-
-  ret = tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData);
-  oversion = ((SUidIdxVal *)pData)[0].version;
-
-  // search table.db
-  TBC *pTbDbc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL));
-  ret = tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c);
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    metaError("meta/table: invalide c: %" PRId32 " alt tb column failed.", c);
-    return TSDB_CODE_FAILED;
-  }
-
-  ret = tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData);
-
-  // get table entry
-  SDecoder dc = {0};
-  if ((entry.pBuf = taosMemoryMalloc(nData)) == NULL) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    return terrno;
-  }
-  memcpy(entry.pBuf, pData, nData);
-  tDecoderInit(&dc, entry.pBuf, nData);
-  ret = metaDecodeEntry(&dc, &entry);
-  if (ret != 0) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    tDecoderClear(&dc);
-    metaError("meta/table: invalide ret: %" PRId32 " alt tb column failed.", ret);
-    return ret;
-  }
-
-  if (entry.type != TSDB_NORMAL_TABLE) {
-    terrno = TSDB_CODE_VND_INVALID_TABLE_ACTION;
-    goto _err;
-  }
-  // search the column to add/drop/update
-  pSchema = &entry.ntbEntry.schemaRow;
-
-  // save old entry
-  SMetaEntry oldEntry = {.type = TSDB_NORMAL_TABLE, .uid = entry.uid};
-  oldEntry.ntbEntry.schemaRow.nCols = pSchema->nCols;
-
-  int32_t rowLen = -1;
-  if (pAlterTbReq->action == TSDB_ALTER_TABLE_ADD_COLUMN ||
-      pAlterTbReq->action == TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES) {
-    rowLen = 0;
-  }
-
-  int32_t  iCol = 0, jCol = 0;
-  SSchema *qColumn = NULL;
-  for (;;) {
-    qColumn = NULL;
-
-    if (jCol >= pSchema->nCols) break;
-    qColumn = &pSchema->pSchema[jCol];
-
-    if (!pColumn && (strcmp(qColumn->name, pAlterTbReq->colName) == 0)) {
-      pColumn = qColumn;
-      iCol = jCol;
-      if (rowLen < 0) break;
-    }
-    rowLen += qColumn->bytes;
-    ++jCol;
-  }
-
-  entry.version = version;
-  int      tlen;
-  SSchema *pNewSchema = NULL;
-  SSchema  tScheam;
-  switch (pAlterTbReq->action) {
-    case TSDB_ALTER_TABLE_ADD_COLUMN:
-    case TSDB_ALTER_TABLE_ADD_COLUMN_WITH_COMPRESS_OPTION:
-      if (pColumn) {
-        terrno = TSDB_CODE_VND_COL_ALREADY_EXISTS;
-        goto _err;
-      }
-      if ((terrno = grantCheck(TSDB_GRANT_TIMESERIES)) < 0) {
-        goto _err;
-      }
-      if (rowLen + pAlterTbReq->bytes > TSDB_MAX_BYTES_PER_ROW) {
-        terrno = TSDB_CODE_PAR_INVALID_ROW_LENGTH;
-        goto _err;
-      }
-      pSchema->version++;
-      pSchema->nCols++;
-      pNewSchema = taosMemoryMalloc(sizeof(SSchema) * pSchema->nCols);
-      if (pNewSchema == NULL) {
-        goto _err;
-      }
-      memcpy(pNewSchema, pSchema->pSchema, sizeof(SSchema) * (pSchema->nCols - 1));
-      pSchema->pSchema = pNewSchema;
-      pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].bytes = pAlterTbReq->bytes;
-      pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].type = pAlterTbReq->type;
-      pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].flags = pAlterTbReq->flags;
-      pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].colId = entry.ntbEntry.ncid++;
-      tstrncpy(pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].name, pAlterTbReq->colName,
-               strlen(pAlterTbReq->colName) + 1);
-
-      ++pMeta->pVnode->config.vndStats.numOfNTimeSeries;
-      metaTimeSeriesNotifyCheck(pMeta);
-
-      if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-        int16_t cid = pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].colId;
-        int8_t  col_type = pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1].type;
-        int32_t ret = tsdbCacheNewNTableColumn(pMeta->pVnode->pTsdb, entry.uid, cid, col_type);
-        if (ret < 0) {
-          terrno = ret;
-          goto _err;
-        }
-      }
-      SSchema *pCol = &pSchema->pSchema[entry.ntbEntry.schemaRow.nCols - 1];
-      uint32_t compress = pAlterTbReq->action == TSDB_ALTER_TABLE_ADD_COLUMN ? createDefaultColCmprByType(pCol->type)
-                                                                             : pAlterTbReq->compress;
-      if (updataTableColCmpr(&entry.colCmpr, pCol, 1, compress) != 0) {
-        metaError("vgId:%d, failed to update table col cmpr:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name,
-                  entry.uid);
-      }
-      freeColCmpr = true;
-      if (entry.colCmpr.nCols != pSchema->nCols) {
-        if (pNewSchema) taosMemoryFree(pNewSchema);
-        if (freeColCmpr) taosMemoryFree(entry.colCmpr.pColCmpr);
-        terrno = TSDB_CODE_VND_INVALID_TABLE_ACTION;
-        goto _err;
-      }
-      break;
-    case TSDB_ALTER_TABLE_DROP_COLUMN:
-      if (pColumn == NULL) {
-        terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-        goto _err;
-      }
-      if (pColumn->colId == 0) {
-        terrno = TSDB_CODE_VND_INVALID_TABLE_ACTION;
-        goto _err;
-      }
-      if (tqCheckColModifiable(pMeta->pVnode->pTq, uid, pColumn->colId) != 0) {
-        terrno = TSDB_CODE_VND_COL_SUBSCRIBED;
-        goto _err;
-      }
-      bool hasPrimayKey = false;
-      if (pSchema->nCols >= 2) {
-        hasPrimayKey = pSchema->pSchema[1].flags & COL_IS_KEY ? true : false;
-      }
-
-      memcpy(&tScheam, pColumn, sizeof(SSchema));
-      pSchema->version++;
-      tlen = (pSchema->nCols - iCol - 1) * sizeof(SSchema);
-      if (tlen) {
-        memmove(pColumn, pColumn + 1, tlen);
-      }
-      pSchema->nCols--;
-
-      --pMeta->pVnode->config.vndStats.numOfNTimeSeries;
-
-      if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-        int16_t cid = pColumn->colId;
-
-        if (tsdbCacheDropNTableColumn(pMeta->pVnode->pTsdb, entry.uid, cid, hasPrimayKey) != 0) {
-          metaError("vgId:%d, failed to drop ntable column:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name,
-                    entry.uid);
-        }
-      }
-
-      if (updataTableColCmpr(&entry.colCmpr, &tScheam, 0, 0) != 0) {
-        metaError("vgId:%d, failed to update table col cmpr:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name,
-                  entry.uid);
-      }
-      if (entry.colCmpr.nCols != pSchema->nCols) {
-        terrno = TSDB_CODE_VND_INVALID_TABLE_ACTION;
-        goto _err;
-      }
-      break;
-    case TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES:
-      if (pColumn == NULL) {
-        terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-        goto _err;
-      }
-      if (!IS_VAR_DATA_TYPE(pColumn->type) || pColumn->bytes >= pAlterTbReq->colModBytes) {
-        terrno = TSDB_CODE_VND_INVALID_TABLE_ACTION;
-        goto _err;
-      }
-      if (rowLen + pAlterTbReq->colModBytes - pColumn->bytes > TSDB_MAX_BYTES_PER_ROW) {
-        terrno = TSDB_CODE_PAR_INVALID_ROW_LENGTH;
-        goto _err;
-      }
-      if (tqCheckColModifiable(pMeta->pVnode->pTq, uid, pColumn->colId) != 0) {
-        terrno = TSDB_CODE_VND_COL_SUBSCRIBED;
-        goto _err;
-      }
-      pSchema->version++;
-      pColumn->bytes = pAlterTbReq->colModBytes;
-      break;
-    case TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME:
-      if (pAlterTbReq->colNewName == NULL) {
-        terrno = TSDB_CODE_INVALID_MSG;
-        goto _err;
-      }
-      if (pColumn == NULL) {
-        terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-        goto _err;
-      }
-      if (tqCheckColModifiable(pMeta->pVnode->pTq, uid, pColumn->colId) != 0) {
-        terrno = TSDB_CODE_VND_COL_SUBSCRIBED;
-        goto _err;
-      }
-      pSchema->version++;
-      tstrncpy(pColumn->name, pAlterTbReq->colNewName, strlen(pAlterTbReq->colNewName) + 1);
-      break;
-  }
-
-  if (!TSDB_CACHE_NO(pMeta->pVnode->config)) {
-    tsdbCacheInvalidateSchema(pMeta->pVnode->pTsdb, 0, entry.uid, pSchema->version);
-  }
-
-  entry.version = version;
-
-  // do actual write
-  metaWLock(pMeta);
-
-  if (metaDeleteNcolIdx(pMeta, &oldEntry) < 0) {
-    metaError("vgId:%d, failed to delete ncol idx:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-
-  if (metaUpdateNcolIdx(pMeta, &entry) < 0) {
-    metaError("vgId:%d, failed to update ncol idx:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-
-  // save to table db
-  if (metaSaveToTbDb(pMeta, &entry) < 0) {
-    metaError("vgId:%d, failed to save to tb db:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-
-  if (metaUpdateUidIdx(pMeta, &entry) < 0) {
-    metaError("vgId:%d, failed to update uid idx:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-
-  if (metaSaveToSkmDb(pMeta, &entry) < 0) {
-    metaError("vgId:%d, failed to save to skm db:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-
-  if (metaUpdateChangeTime(pMeta, entry.uid, pAlterTbReq->ctimeMs) < 0) {
-    metaError("vgId:%d, failed to update change time:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-
-  metaULock(pMeta);
-
-  if (metaUpdateMetaRsp(uid, pAlterTbReq->tbName, pSchema, pMetaRsp) < 0) {
-    metaError("vgId:%d, failed to update meta rsp:%s uid:%" PRId64, TD_VID(pMeta->pVnode), entry.name, entry.uid);
-  }
-  for (int32_t i = 0; i < entry.colCmpr.nCols; i++) {
-    SColCmpr *p = &entry.colCmpr.pColCmpr[i];
-    pMetaRsp->pSchemaExt[i].colId = p->id;
-    pMetaRsp->pSchemaExt[i].compress = p->alg;
-  }
-
-  if (entry.pBuf) taosMemoryFree(entry.pBuf);
-  if (pNewSchema) taosMemoryFree(pNewSchema);
-  if (freeColCmpr) taosMemoryFree(entry.colCmpr.pColCmpr);
-
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  tDecoderClear(&dc);
-
-  return 0;
-
-_err:
-  if (entry.pBuf) taosMemoryFree(entry.pBuf);
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  tDecoderClear(&dc);
-
-  return terrno != 0 ? terrno : TSDB_CODE_FAILED;
-}
-
-static int metaUpdateTableMultiTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {
-  SMetaEntry  ctbEntry = {0};
-  SMetaEntry  stbEntry = {0};
-  void       *pVal = NULL;
-  int         nVal = 0;
-  int         ret;
-  int         c;
-  tb_uid_t    uid;
-  int64_t     oversion;
-  const void *pData = NULL;
-  int         nData = 0;
-  SHashObj   *pTagTable = NULL;
-
-  // search name index
-  ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
-  if (ret < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  uid = *(tb_uid_t *)pVal;
-  tdbFree(pVal);
-  pVal = NULL;
-
-  // search uid index
-  TBC *pUidIdxc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL));
-  if (tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c) < 0) {
-    metaTrace("meta/table: failed to move to uid index, uid:%" PRId64, uid);
-  }
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  if (tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData) != 0) {
-    tdbTbcClose(pUidIdxc);
-    metaError("meta/table: failed to get uid index, uid:%" PRId64, uid);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-  oversion = ((SUidIdxVal *)pData)[0].version;
-
-  // search table.db
-  TBC     *pTbDbc = NULL;
-  SDecoder dc1 = {0};
-  SDecoder dc2 = {0};
-
-  /* get ctbEntry */
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL));
-  if (tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c) != 0) {
-    metaError("meta/table: failed to move to tb db, uid:%" PRId64, uid);
-  }
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  if (tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData) != 0) {
-    metaError("meta/table: failed to get tb db, uid:%" PRId64, uid);
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  if ((ctbEntry.pBuf = taosMemoryMalloc(nData)) == NULL) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    return terrno;
-  }
-  memcpy(ctbEntry.pBuf, pData, nData);
-  tDecoderInit(&dc1, ctbEntry.pBuf, nData);
-  ret = metaDecodeEntry(&dc1, &ctbEntry);
-  if (ret < 0) {
-    terrno = ret;
-    goto _err;
-  }
-
-  /* get stbEntry*/
-  if (tdbTbGet(pMeta->pUidIdx, &ctbEntry.ctbEntry.suid, sizeof(tb_uid_t), &pVal, &nVal) != 0) {
-    metaError("meta/table: failed to get uid index, uid:%" PRId64, ctbEntry.ctbEntry.suid);
-  }
-  if (!pVal) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _err;
-  }
-
-  if (tdbTbGet(pMeta->pTbDb, &((STbDbKey){.uid = ctbEntry.ctbEntry.suid, .version = ((SUidIdxVal *)pVal)[0].version}),
-               sizeof(STbDbKey), (void **)&stbEntry.pBuf, &nVal) != 0) {
-    metaError("meta/table: failed to get tb db, uid:%" PRId64, ctbEntry.ctbEntry.suid);
-  }
-  tdbFree(pVal);
-  tDecoderInit(&dc2, stbEntry.pBuf, nVal);
-  ret = metaDecodeEntry(&dc2, &stbEntry);
-  if (ret < 0) {
-    terrno = ret;
-    goto _err;
-  }
-
-  int32_t nTagVals = taosArrayGetSize(pAlterTbReq->pMultiTag);
-  pTagTable = taosHashInit(nTagVals, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
-  if (pTagTable == NULL) {
-    ret = terrno;
-    goto _err;
-  }
-
-  // remove duplicate tag name
-  for (int i = 0; i < nTagVals; i++) {
-    SMultiTagUpateVal *pTagVal = taosArrayGet(pAlterTbReq->pMultiTag, i);
-    ret = taosHashPut(pTagTable, pTagVal->tagName, strlen(pTagVal->tagName), pTagVal, sizeof(*pTagVal));
-    if (ret != 0) {
-      goto _err;
-    }
-  }
-
-  SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
-  SSchema        *pColumn = NULL;
-  int32_t         iCol = 0;
-  int32_t         count = 0;
-
-  for (;;) {
-    pColumn = NULL;
-
-    if (iCol >= pTagSchema->nCols) break;
-    pColumn = &pTagSchema->pSchema[iCol];
-    if (taosHashGet(pTagTable, pColumn->name, strlen(pColumn->name)) != NULL) {
-      count++;
-    }
-    iCol++;
-  }
-  if (count != taosHashGetSize(pTagTable)) {
-    terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-    goto _err;
-  }
-
-  ctbEntry.version = version;
-  if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
-    terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-    goto _err;
-  } else {
-    const STag *pOldTag = (const STag *)ctbEntry.ctbEntry.pTags;
-    STag       *pNewTag = NULL;
-    SArray     *pTagArray = taosArrayInit(pTagSchema->nCols, sizeof(STagVal));
-    if (!pTagArray) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      goto _err;
-    }
-    for (int32_t i = 0; i < pTagSchema->nCols; i++) {
-      SSchema           *pCol = &pTagSchema->pSchema[i];
-      SMultiTagUpateVal *pTagVal = taosHashGet(pTagTable, pCol->name, strlen(pCol->name));
-      if (pTagVal == NULL) {
-        STagVal val = {.cid = pCol->colId};
-        if (tTagGet(pOldTag, &val)) {
-          if (taosArrayPush(pTagArray, &val) == NULL) {
-            terrno = TSDB_CODE_OUT_OF_MEMORY;
-            taosArrayDestroy(pTagArray);
-            goto _err;
-          }
-        }
-      } else {
-        STagVal val = {0};
-        val.type = pCol->type;
-        val.cid = pCol->colId;
-        if (pTagVal->isNull) continue;
-
-        if (IS_VAR_DATA_TYPE(pCol->type)) {
-          val.pData = pTagVal->pTagVal;
-          val.nData = pTagVal->nTagVal;
-        } else {
-          memcpy(&val.i64, pTagVal->pTagVal, pTagVal->nTagVal);
-        }
-        if (taosArrayPush(pTagArray, &val) == NULL) {
-          terrno = TSDB_CODE_OUT_OF_MEMORY;
-          taosArrayDestroy(pTagArray);
-          goto _err;
-        }
-      }
-    }
-    if ((terrno = tTagNew(pTagArray, pTagSchema->version, false, &pNewTag)) < 0) {
-      taosArrayDestroy(pTagArray);
-      goto _err;
-    }
-    ctbEntry.ctbEntry.pTags = (uint8_t *)pNewTag;
-    taosArrayDestroy(pTagArray);
-  }
-
-  metaWLock(pMeta);
-
-  // save to table.db
-  if (metaSaveToTbDb(pMeta, &ctbEntry) < 0) {
-    metaError("meta/table: failed to save to tb db:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  // save to uid.idx
-  if (metaUpdateUidIdx(pMeta, &ctbEntry) < 0) {
-    metaError("meta/table: failed to update uid idx:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaUpdateTagIdx(pMeta, &ctbEntry) < 0) {
-    metaError("meta/table: failed to update tag idx:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  SCtbIdxKey ctbIdxKey = {.suid = ctbEntry.ctbEntry.suid, .uid = uid};
-  if (tdbTbUpsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), ctbEntry.ctbEntry.pTags,
-                  ((STag *)(ctbEntry.ctbEntry.pTags))->len, pMeta->txn) < 0) {
-    metaError("meta/table: failed to upsert ctb idx:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaUidCacheClear(pMeta, ctbEntry.ctbEntry.suid) < 0) {
-    metaError("meta/table: failed to clear uid cache:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaTbGroupCacheClear(pMeta, ctbEntry.ctbEntry.suid) < 0) {
-    metaError("meta/table: failed to clear group cache:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaUpdateChangeTime(pMeta, ctbEntry.uid, pAlterTbReq->ctimeMs) < 0) {
-    metaError("meta/table: failed to update change time:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  metaULock(pMeta);
-
-  tDecoderClear(&dc1);
-  tDecoderClear(&dc2);
-  taosMemoryFree((void *)ctbEntry.ctbEntry.pTags);
-  if (ctbEntry.pBuf) taosMemoryFree(ctbEntry.pBuf);
-  if (stbEntry.pBuf) tdbFree(stbEntry.pBuf);
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  taosHashCleanup(pTagTable);
-  return 0;
-
-_err:
-  tDecoderClear(&dc1);
-  tDecoderClear(&dc2);
-  if (ctbEntry.pBuf) taosMemoryFree(ctbEntry.pBuf);
-  if (stbEntry.pBuf) tdbFree(stbEntry.pBuf);
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  taosHashCleanup(pTagTable);
-  return -1;
-}
-static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {
-  SMetaEntry  ctbEntry = {0};
-  SMetaEntry  stbEntry = {0};
-  void       *pVal = NULL;
-  int         nVal = 0;
-  int         ret;
-  int         c;
-  tb_uid_t    uid;
-  int64_t     oversion;
-  const void *pData = NULL;
-  int         nData = 0;
-
-  if (pAlterTbReq->tagName == NULL) {
-    return terrno = TSDB_CODE_INVALID_MSG;
-  }
-
-  // search name index
-  ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
-  if (ret < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  uid = *(tb_uid_t *)pVal;
-  tdbFree(pVal);
-  pVal = NULL;
-
-  // search uid index
-  TBC *pUidIdxc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL));
-  if (tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c) < 0) {
-    metaTrace("meta/table: failed to move to uid index, uid:%" PRId64, uid);
-  }
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  if (tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData) != 0) {
-    tdbTbcClose(pUidIdxc);
-    metaError("meta/table: failed to get uid index, uid:%" PRId64, uid);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-  oversion = ((SUidIdxVal *)pData)[0].version;
-
-  // search table.db
-  TBC     *pTbDbc = NULL;
-  SDecoder dc1 = {0};
-  SDecoder dc2 = {0};
-
-  /* get ctbEntry */
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL));
-  if (tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c) != 0) {
-    metaError("meta/table: failed to move to tb db, uid:%" PRId64, uid);
-  }
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    metaError("meta/table: invalide c: %" PRId32 " update tb tag val failed.", c);
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  if (tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData) != 0) {
-    metaError("meta/table: failed to get tb db, uid:%" PRId64, uid);
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    return terrno = TSDB_CODE_INVALID_MSG;
-  }
-
-  if ((ctbEntry.pBuf = taosMemoryMalloc(nData)) == NULL) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    return terrno;
-  }
-  memcpy(ctbEntry.pBuf, pData, nData);
-  tDecoderInit(&dc1, ctbEntry.pBuf, nData);
-  ret = metaDecodeEntry(&dc1, &ctbEntry);
-  if (ret < 0) {
-    terrno = ret;
-    goto _err;
-  }
-
-  /* get stbEntry*/
-  if (tdbTbGet(pMeta->pUidIdx, &ctbEntry.ctbEntry.suid, sizeof(tb_uid_t), &pVal, &nVal) != 0) {
-    metaError("meta/table: failed to get uid index, uid:%" PRId64, ctbEntry.ctbEntry.suid);
-  }
-  if (!pVal) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    goto _err;
-  }
-
-  if (tdbTbGet(pMeta->pTbDb, &((STbDbKey){.uid = ctbEntry.ctbEntry.suid, .version = ((SUidIdxVal *)pVal)[0].version}),
-               sizeof(STbDbKey), (void **)&stbEntry.pBuf, &nVal) != 0) {
-    metaError("meta/table: failed to get tb db, uid:%" PRId64, ctbEntry.ctbEntry.suid);
-  }
-  tdbFree(pVal);
-  tDecoderInit(&dc2, stbEntry.pBuf, nVal);
-  ret = metaDecodeEntry(&dc2, &stbEntry);
-  if (ret < 0) {
-    terrno = ret;
-    goto _err;
-  }
-
-  SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
-  SSchema        *pColumn = NULL;
-  int32_t         iCol = 0;
-
-  for (;;) {
-    pColumn = NULL;
-
-    if (iCol >= pTagSchema->nCols) break;
-    pColumn = &pTagSchema->pSchema[iCol];
-
-    if (strcmp(pColumn->name, pAlterTbReq->tagName) == 0) break;
-    iCol++;
-  }
-
-  if (pColumn == NULL) {
-    terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-    goto _err;
-  }
-
-  ctbEntry.version = version;
-  if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
-    ctbEntry.ctbEntry.pTags = taosMemoryMalloc(pAlterTbReq->nTagVal);
-    if (ctbEntry.ctbEntry.pTags == NULL) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      goto _err;
-    }
-    memcpy((void *)ctbEntry.ctbEntry.pTags, pAlterTbReq->pTagVal, pAlterTbReq->nTagVal);
-  } else {
-    const STag *pOldTag = (const STag *)ctbEntry.ctbEntry.pTags;
-    STag       *pNewTag = NULL;
-    SArray     *pTagArray = taosArrayInit(pTagSchema->nCols, sizeof(STagVal));
-    if (!pTagArray) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      goto _err;
-    }
-    for (int32_t i = 0; i < pTagSchema->nCols; i++) {
-      SSchema *pCol = &pTagSchema->pSchema[i];
-      if (iCol == i) {
-        if (pAlterTbReq->isNull) {
-          continue;
-        }
-        STagVal val = {0};
-        val.type = pCol->type;
-        val.cid = pCol->colId;
-        if (IS_VAR_DATA_TYPE(pCol->type)) {
-          val.pData = pAlterTbReq->pTagVal;
-          val.nData = pAlterTbReq->nTagVal;
-        } else {
-          memcpy(&val.i64, pAlterTbReq->pTagVal, pAlterTbReq->nTagVal);
-        }
-        if (taosArrayPush(pTagArray, &val) == NULL) {
-          terrno = TSDB_CODE_OUT_OF_MEMORY;
-          taosArrayDestroy(pTagArray);
-          goto _err;
-        }
-      } else {
-        STagVal val = {.cid = pCol->colId};
-        if (tTagGet(pOldTag, &val)) {
-          if (taosArrayPush(pTagArray, &val) == NULL) {
-            terrno = TSDB_CODE_OUT_OF_MEMORY;
-            taosArrayDestroy(pTagArray);
-            goto _err;
-          }
-        }
-      }
-    }
-    if ((terrno = tTagNew(pTagArray, pTagSchema->version, false, &pNewTag)) < 0) {
-      taosArrayDestroy(pTagArray);
-      goto _err;
-    }
-    ctbEntry.ctbEntry.pTags = (uint8_t *)pNewTag;
-    taosArrayDestroy(pTagArray);
-  }
-
-  metaWLock(pMeta);
-
-  // save to table.db
-  if (metaSaveToTbDb(pMeta, &ctbEntry) < 0) {
-    metaError("meta/table: failed to save to tb db:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  // save to uid.idx
-  if (metaUpdateUidIdx(pMeta, &ctbEntry) < 0) {
-    metaError("meta/table: failed to update uid idx:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaUpdateTagIdx(pMeta, &ctbEntry) < 0) {
-    metaError("meta/table: failed to update tag idx:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  SCtbIdxKey ctbIdxKey = {.suid = ctbEntry.ctbEntry.suid, .uid = uid};
-  if (tdbTbUpsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), ctbEntry.ctbEntry.pTags,
-                  ((STag *)(ctbEntry.ctbEntry.pTags))->len, pMeta->txn) < 0) {
-    metaError("meta/table: failed to upsert ctb idx:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaUidCacheClear(pMeta, ctbEntry.ctbEntry.suid) < 0) {
-    metaError("meta/table: failed to clear uid cache:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaTbGroupCacheClear(pMeta, ctbEntry.ctbEntry.suid) < 0) {
-    metaError("meta/table: failed to clear group cache:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  if (metaUpdateChangeTime(pMeta, ctbEntry.uid, pAlterTbReq->ctimeMs) < 0) {
-    metaError("meta/table: failed to update change time:%s uid:%" PRId64, ctbEntry.name, ctbEntry.uid);
-  }
-
-  metaULock(pMeta);
-
-  tDecoderClear(&dc1);
-  tDecoderClear(&dc2);
-  taosMemoryFree((void *)ctbEntry.ctbEntry.pTags);
-  if (ctbEntry.pBuf) taosMemoryFree(ctbEntry.pBuf);
-  if (stbEntry.pBuf) tdbFree(stbEntry.pBuf);
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  return 0;
-
-_err:
-  tDecoderClear(&dc1);
-  tDecoderClear(&dc2);
-  if (ctbEntry.pBuf) taosMemoryFree(ctbEntry.pBuf);
-  if (stbEntry.pBuf) tdbFree(stbEntry.pBuf);
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  return -1;
-}
-
-static int metaUpdateTableOptions(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {
-  void       *pVal = NULL;
-  int         nVal = 0;
-  const void *pData = NULL;
-  int         nData = 0;
-  int         ret = 0;
-  tb_uid_t    uid;
-  int64_t     oversion;
-  SMetaEntry  entry = {0};
-  int         c = 0;
-
-  // search name index
-  ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
-  if (ret < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-
-  uid = *(tb_uid_t *)pVal;
-  tdbFree(pVal);
-  pVal = NULL;
-
-  // search uid index
-  TBC *pUidIdxc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, NULL));
-  if (tdbTbcMoveTo(pUidIdxc, &uid, sizeof(uid), &c) < 0) {
-    metaError("meta/table: failed to move to uid index, uid:%" PRId64, uid);
-  }
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    metaError("meta/table: invalide c: %" PRId32 " update tb options failed.", c);
-    return TSDB_CODE_FAILED;
-  }
-
-  if (tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData) < 0) {
-    metaError("meta/table: failed to get uid index, uid:%" PRId64, uid);
-  }
-  oversion = ((SUidIdxVal *)pData)[0].version;
-
-  // search table.db
-  TBC *pTbDbc = NULL;
-
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pTbDb, &pTbDbc, NULL));
-  if (tdbTbcMoveTo(pTbDbc, &((STbDbKey){.uid = uid, .version = oversion}), sizeof(STbDbKey), &c) < 0) {
-    metaError("meta/table: failed to move to tb db, uid:%" PRId64, uid);
-  }
-  if (c != 0) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    metaError("meta/table: invalide c: %" PRId32 " update tb options failed.", c);
-    return TSDB_CODE_FAILED;
-  }
-
-  if (tdbTbcGet(pTbDbc, NULL, NULL, &pData, &nData) < 0) {
-    metaError("meta/table: failed to get tb db, uid:%" PRId64, uid);
-  }
-
-  // get table entry
-  SDecoder dc = {0};
-  if ((entry.pBuf = taosMemoryMalloc(nData)) == NULL) {
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    return terrno;
-  }
-  memcpy(entry.pBuf, pData, nData);
-  tDecoderInit(&dc, entry.pBuf, nData);
-  ret = metaDecodeEntry(&dc, &entry);
-  if (ret != 0) {
-    tDecoderClear(&dc);
-    tdbTbcClose(pUidIdxc);
-    tdbTbcClose(pTbDbc);
-    metaError("meta/table: invalide ret: %" PRId32 " alt tb options failed.", ret);
-    return TSDB_CODE_FAILED;
-  }
-
-  entry.version = version;
-  metaWLock(pMeta);
-  // build SMetaEntry
-  if (entry.type == TSDB_CHILD_TABLE) {
-    if (pAlterTbReq->updateTTL) {
-      metaDeleteTtl(pMeta, &entry);
-      entry.ctbEntry.ttlDays = pAlterTbReq->newTTL;
-      metaUpdateTtl(pMeta, &entry);
-    }
-    if (pAlterTbReq->newCommentLen >= 0) {
-      entry.ctbEntry.commentLen = pAlterTbReq->newCommentLen;
-      entry.ctbEntry.comment = pAlterTbReq->newComment;
-    }
-  } else {
-    if (pAlterTbReq->updateTTL) {
-      metaDeleteTtl(pMeta, &entry);
-      entry.ntbEntry.ttlDays = pAlterTbReq->newTTL;
-      metaUpdateTtl(pMeta, &entry);
-    }
-    if (pAlterTbReq->newCommentLen >= 0) {
-      entry.ntbEntry.commentLen = pAlterTbReq->newCommentLen;
-      entry.ntbEntry.comment = pAlterTbReq->newComment;
-    }
-  }
-
-  // save to table db
-  if (metaSaveToTbDb(pMeta, &entry) < 0) {
-    metaError("meta/table: failed to save to tb db:%s uid:%" PRId64, entry.name, entry.uid);
-  }
-
-  if (metaUpdateUidIdx(pMeta, &entry) < 0) {
-    metaError("meta/table: failed to update uid idx:%s uid:%" PRId64, entry.name, entry.uid);
-  }
-
-  if (metaUpdateChangeTime(pMeta, entry.uid, pAlterTbReq->ctimeMs) < 0) {
-    metaError("meta/table: failed to update change time:%s uid:%" PRId64, entry.name, entry.uid);
-  }
-
-  metaULock(pMeta);
-
-  tdbTbcClose(pTbDbc);
-  tdbTbcClose(pUidIdxc);
-  tDecoderClear(&dc);
-  if (entry.pBuf) taosMemoryFree(entry.pBuf);
-  return 0;
-}
-
-typedef struct SMetaPair {
-  void *key;
-  int   nkey;
-} SMetaPair;
-
-static int metaDropTagIndex(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {
-  SMetaEntry  stbEntry = {0};
-  void       *pVal = NULL;
-  int         nVal = 0;
-  int         ret;
-  int         c;
-  tb_uid_t    suid;
-  int64_t     oversion;
-  const void *pData = NULL;
-  int         nData = 0;
-  SDecoder    dc = {0};
-
-  if (pAlterTbReq->tagName == NULL) {
-    return terrno = TSDB_CODE_INVALID_MSG;
-  }
-
-  // search name index
-  ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
-  if (ret < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-  suid = *(tb_uid_t *)pVal;
-  tdbFree(pVal);
-  pVal = NULL;
-
-  if (tdbTbGet(pMeta->pUidIdx, &suid, sizeof(tb_uid_t), &pVal, &nVal) == -1) {
-    ret = -1;
-    goto _err;
-  }
-
-  STbDbKey tbDbKey = {0};
-  tbDbKey.uid = suid;
-  tbDbKey.version = ((SUidIdxVal *)pVal)[0].version;
-  ret = tdbTbGet(pMeta->pTbDb, &tbDbKey, sizeof(tbDbKey), &pVal, &nVal);
-  if (ret < 0) {
-    goto _err;
-  }
-
-  tDecoderInit(&dc, pVal, nVal);
-  ret = metaDecodeEntry(&dc, &stbEntry);
-  if (ret < 0) {
-    tDecoderClear(&dc);
-    goto _err;
-  }
-
-  // Get targe schema info
-  SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
-  if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
-    terrno = TSDB_CODE_VND_COL_ALREADY_EXISTS;
-    goto _err;
-  }
-  SSchema *pCol = NULL;
-  int32_t  iCol = 0;
-  for (;;) {
-    pCol = NULL;
-    if (iCol >= pTagSchema->nCols) break;
-    pCol = &pTagSchema->pSchema[iCol];
-    if (strcmp(pCol->name, pAlterTbReq->tagName) == 0) break;
-    iCol++;
-  }
-  if (iCol == 0) {
-    // cannot drop 1th tag index
-    terrno = -1;
-    goto _err;
-  }
-  if (pCol == NULL) {
-    terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
-    goto _err;
-  }
-
-  if (IS_IDX_ON(pCol)) {
-    terrno = TSDB_CODE_VND_COL_ALREADY_EXISTS;
-    goto _err;
-  }
-
-  SArray *tagIdxList = taosArrayInit(512, sizeof(SMetaPair));
-  if (tagIdxList == NULL) {
-    goto _err;
-  }
-
-  TBC *pTagIdxc = NULL;
-  TAOS_CHECK_RETURN(tdbTbcOpen(pMeta->pTagIdx, &pTagIdxc, NULL));
-  int rc =
-      tdbTbcMoveTo(pTagIdxc, &(STagIdxKey){.suid = suid, .cid = INT32_MIN, .type = pCol->type}, sizeof(STagIdxKey), &c);
-  for (;;) {
-    void *pKey, *pVal;
-    int   nKey, nVal;
-    rc = tdbTbcNext(pTagIdxc, &pKey, &nKey, &pVal, &nVal);
-    STagIdxKey *pIdxKey = (STagIdxKey *)pKey;
-    if (pIdxKey->suid != suid || pIdxKey->cid != pCol->colId) {
-      tdbFree(pKey);
-      tdbFree(pVal);
-      continue;
-    }
-
-    SMetaPair pair = {.key = pKey, nKey = nKey};
-    if (taosArrayPush(tagIdxList, &pair) == NULL) {
-      goto _err;
-    }
-  }
-  tdbTbcClose(pTagIdxc);
-
-  metaWLock(pMeta);
-  for (int i = 0; i < taosArrayGetSize(tagIdxList); i++) {
-    SMetaPair *pair = taosArrayGet(tagIdxList, i);
-    ret = tdbTbDelete(pMeta->pTagIdx, pair->key, pair->nkey, pMeta->txn);
-    if (ret < 0) {
-      metaError("meta/table: failed to delete tag idx:%s uid:%" PRId64, stbEntry.name, stbEntry.uid);
-    }
-  }
-  metaULock(pMeta);
-
-  taosArrayDestroy(tagIdxList);
-
-  // set pCol->flags; INDEX_ON
-  return 0;
-_err:
-  return TSDB_CODE_FAILED;
-}
-static int32_t metaUpdateTableColCompress(SMeta *pMeta, int64_t version, SVAlterTbReq *pReq) {
-  // impl later
-  SMetaEntry  tbEntry = {0};
-  void       *pVal = NULL;
-  int         nVal = 0;
-  int         ret;
-  int         c;
-  tb_uid_t    suid;
-  int64_t     oversion;
-  const void *pData = NULL;
-  int         nData = 0;
-  SDecoder    dc = {0};
-  ret = tdbTbGet(pMeta->pNameIdx, pReq->tbName, strlen(pReq->tbName) + 1, &pVal, &nVal);
-  if (ret < 0) {
-    return terrno = TSDB_CODE_TDB_TABLE_NOT_EXIST;
-  }
-  suid = *(tb_uid_t *)pVal;
-  tdbFree(pVal);
-  pVal = NULL;
-
-  if (tdbTbGet(pMeta->pUidIdx, &suid, sizeof(tb_uid_t), &pVal, &nVal) == -1) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    ret = -1;
-    goto _err;
-  }
-
-  STbDbKey tbDbKey = {0};
-  tbDbKey.uid = suid;
-  tbDbKey.version = ((SUidIdxVal *)pVal)[0].version;
-  if (tdbTbGet(pMeta->pTbDb, &tbDbKey, sizeof(tbDbKey), &pVal, &nVal) < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    tdbFree(pVal);
-    goto _err;
-  }
-
-  tDecoderInit(&dc, pVal, nVal);
-  ret = metaDecodeEntry(&dc, &tbEntry);
-  if (ret < 0) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    tdbFree(pVal);
-    tDecoderClear(&dc);
-    goto _err;
-  }
-  if (tbEntry.type != TSDB_NORMAL_TABLE && tbEntry.type != TSDB_SUPER_TABLE) {
-    terrno = TSDB_CODE_INVALID_MSG;
-    tdbFree(pVal);
-    tDecoderClear(&dc);
-    goto _err;
-  }
-  int8_t           updated = 0;
-  SColCmprWrapper *wp = &tbEntry.colCmpr;
-  for (int32_t i = 0; i < wp->nCols; i++) {
-    SColCmpr *p = &wp->pColCmpr[i];
-    if (p->id == pReq->colId) {
-      uint32_t dst = 0;
-      updated = tUpdateCompress(p->alg, pReq->compress, TSDB_COLVAL_COMPRESS_DISABLED, TSDB_COLVAL_LEVEL_DISABLED,
-                                TSDB_COLVAL_LEVEL_MEDIUM, &dst);
-      if (updated > 0) {
-        p->alg = dst;
-      }
-    }
-  }
-  if (updated == 0) {
-    tdbFree(pVal);
-    tDecoderClear(&dc);
-    terrno = TSDB_CODE_VND_COLUMN_COMPRESS_ALREADY_EXIST;
-    goto _err;
-  } else if (updated < 0) {
-    tdbFree(pVal);
-    tDecoderClear(&dc);
-    terrno = TSDB_CODE_TSC_COMPRESS_LEVEL_ERROR;
-    goto _err;
-  }
-  tbEntry.version = version;
-
-  metaWLock(pMeta);
-  if (metaSaveToTbDb(pMeta, &tbEntry) < 0) {
-    metaError("meta/table: failed to save to tb db:%s uid:%" PRId64, tbEntry.name, tbEntry.uid);
-  }
-
-  if (metaUpdateUidIdx(pMeta, &tbEntry) < 0) {
-    metaError("meta/table: failed to update uid idx:%s uid:%" PRId64, tbEntry.name, tbEntry.uid);
-  }
-
-  if (metaUpdateChangeTime(pMeta, suid, pReq->ctimeMs) < 0) {
-    metaError("meta/table: failed to update change time:%s uid:%" PRId64, tbEntry.name, tbEntry.uid);
-  }
-
-  metaULock(pMeta);
-
-  tdbFree(pVal);
-  tDecoderClear(&dc);
-
-  return 0;
-_err:
-  return TSDB_CODE_FAILED;
-}
-
 int metaAlterTable(SMeta *pMeta, int64_t version, SVAlterTbReq *pReq, STableMetaRsp *pMetaRsp) {
   pMeta->changed = true;
   switch (pReq->action) {
@@ -2878,102 +709,6 @@ int metaAlterTable(SMeta *pMeta, int64_t version, SVAlterTbReq *pReq, STableMeta
   }
 }
 
-static int metaSaveToTbDb(SMeta *pMeta, const SMetaEntry *pME) {
-  STbDbKey tbDbKey;
-  void    *pKey = NULL;
-  void    *pVal = NULL;
-  int      kLen = 0;
-  int      vLen = 0;
-  SEncoder coder = {0};
-
-  // set key and value
-  tbDbKey.version = pME->version;
-  tbDbKey.uid = pME->uid;
-
-  metaDebug("vgId:%d, start to save table version:%" PRId64 " uid:%" PRId64, TD_VID(pMeta->pVnode), pME->version,
-            pME->uid);
-
-  pKey = &tbDbKey;
-  kLen = sizeof(tbDbKey);
-
-  int32_t ret = 0;
-  tEncodeSize(metaEncodeEntry, pME, vLen, ret);
-  if (ret < 0) {
-    goto _err;
-  }
-
-  pVal = taosMemoryMalloc(vLen);
-  if (pVal == NULL) {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto _err;
-  }
-
-  tEncoderInit(&coder, pVal, vLen);
-
-  if (metaEncodeEntry(&coder, pME) < 0) {
-    goto _err;
-  }
-
-  tEncoderClear(&coder);
-
-  // write to table.db
-  if (tdbTbInsert(pMeta->pTbDb, pKey, kLen, pVal, vLen, pMeta->txn) < 0) {
-    goto _err;
-  }
-
-  taosMemoryFree(pVal);
-  return 0;
-
-_err:
-  metaError("vgId:%d, failed to save table version:%" PRId64 "uid:%" PRId64 " %s", TD_VID(pMeta->pVnode), pME->version,
-            pME->uid, tstrerror(terrno));
-
-  taosMemoryFree(pVal);
-  return TSDB_CODE_FAILED;
-}
-
-static int metaUpdateUidIdx(SMeta *pMeta, const SMetaEntry *pME) {
-  // upsert cache
-  SMetaInfo info;
-  metaGetEntryInfo(pME, &info);
-  int32_t ret = metaCacheUpsert(pMeta, &info);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to upsert cache, uid: %" PRId64 " %s", TD_VID(pMeta->pVnode), pME->uid, tstrerror(ret));
-  }
-
-  SUidIdxVal uidIdxVal = {.suid = info.suid, .version = info.version, .skmVer = info.skmVer};
-
-  return tdbTbUpsert(pMeta->pUidIdx, &pME->uid, sizeof(tb_uid_t), &uidIdxVal, sizeof(uidIdxVal), pMeta->txn);
-}
-
-static int metaUpdateSuidIdx(SMeta *pMeta, const SMetaEntry *pME) {
-  return tdbTbUpsert(pMeta->pSuidIdx, &pME->uid, sizeof(tb_uid_t), NULL, 0, pMeta->txn);
-}
-
-static int metaUpdateNameIdx(SMeta *pMeta, const SMetaEntry *pME) {
-  return tdbTbUpsert(pMeta->pNameIdx, pME->name, strlen(pME->name) + 1, &pME->uid, sizeof(tb_uid_t), pMeta->txn);
-}
-
-static void metaUpdateTtl(SMeta *pMeta, const SMetaEntry *pME) {
-  if (pME->type != TSDB_CHILD_TABLE && pME->type != TSDB_NORMAL_TABLE) return;
-
-  STtlUpdTtlCtx ctx = {.uid = pME->uid, .pTxn = pMeta->txn};
-  if (pME->type == TSDB_CHILD_TABLE) {
-    ctx.ttlDays = pME->ctbEntry.ttlDays;
-    ctx.changeTimeMs = pME->ctbEntry.btime;
-  } else {
-    ctx.ttlDays = pME->ntbEntry.ttlDays;
-    ctx.changeTimeMs = pME->ntbEntry.btime;
-  }
-
-  int32_t ret = ttlMgrInsertTtl(pMeta->pTtlMgr, &ctx);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to insert ttl, uid: %" PRId64 " %s", TD_VID(pMeta->pVnode), pME->uid, tstrerror(ret));
-  }
-
-  return;
-}
-
 static int metaUpdateChangeTime(SMeta *pMeta, tb_uid_t uid, int64_t changeTimeMs) {
   if (!tsTtlChangeOnWrite) return 0;
 
@@ -2996,13 +731,6 @@ int metaUpdateChangeTimeWithLock(SMeta *pMeta, tb_uid_t uid, int64_t changeTimeM
   return ret;
 }
 
-static int metaUpdateCtbIdx(SMeta *pMeta, const SMetaEntry *pME) {
-  SCtbIdxKey ctbIdxKey = {.suid = pME->ctbEntry.suid, .uid = pME->uid};
-
-  return tdbTbUpsert(pMeta->pCtbIdx, &ctbIdxKey, sizeof(ctbIdxKey), pME->ctbEntry.pTags,
-                     ((STag *)(pME->ctbEntry.pTags))->len, pMeta->txn);
-}
-
 int metaCreateTagIdxKey(tb_uid_t suid, int32_t cid, const void *pTagData, int32_t nTagData, int8_t type, tb_uid_t uid,
                         STagIdxKey **ppTagIdxKey, int32_t *nTagIdxKey) {
   if (IS_VAR_DATA_TYPE(type)) {
@@ -3038,212 +766,6 @@ void metaDestroyTagIdxKey(STagIdxKey *pTagIdxKey) {
   if (pTagIdxKey) taosMemoryFree(pTagIdxKey);
 }
 
-static int metaUpdateTagIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry) {
-  void          *pData = NULL;
-  int            nData = 0;
-  STbDbKey       tbDbKey = {0};
-  SMetaEntry     stbEntry = {0};
-  STagIdxKey    *pTagIdxKey = NULL;
-  int32_t        nTagIdxKey;
-  const SSchema *pTagColumn;
-  const void    *pTagData = NULL;
-  int32_t        nTagData = 0;
-  SDecoder       dc = {0};
-  int32_t        ret = 0;
-  // get super table
-  if (tdbTbGet(pMeta->pUidIdx, &pCtbEntry->ctbEntry.suid, sizeof(tb_uid_t), &pData, &nData) != 0) {
-    metaError("vgId:%d, failed to get stable suid for update. version:%" PRId64, TD_VID(pMeta->pVnode),
-              pCtbEntry->version);
-    ret = TSDB_CODE_TDB_INVALID_TABLE_ID;
-    goto end;
-  }
-  tbDbKey.uid = pCtbEntry->ctbEntry.suid;
-  tbDbKey.version = ((SUidIdxVal *)pData)[0].version;
-  ret = tdbTbGet(pMeta->pTbDb, &tbDbKey, sizeof(tbDbKey), &pData, &nData);
-  if (ret < 0) {
-    metaError("vgId:%d, failed to get stable for update. version:%" PRId64, TD_VID(pMeta->pVnode), pCtbEntry->version);
-    goto end;
-  }
-
-  tDecoderInit(&dc, pData, nData);
-  ret = metaDecodeEntry(&dc, &stbEntry);
-  if (ret < 0) {
-    goto end;
-  }
-
-  if (stbEntry.stbEntry.schemaTag.pSchema == NULL) {
-    ret = TSDB_CODE_INVALID_PARA;
-    goto end;
-  }
-
-  SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
-  if (pTagSchema->nCols == 1 && pTagSchema->pSchema[0].type == TSDB_DATA_TYPE_JSON) {
-    pTagColumn = &stbEntry.stbEntry.schemaTag.pSchema[0];
-    STagVal tagVal = {.cid = pTagColumn->colId};
-
-    pTagData = pCtbEntry->ctbEntry.pTags;
-    nTagData = ((const STag *)pCtbEntry->ctbEntry.pTags)->len;
-    ret = metaSaveJsonVarToIdx(pMeta, pCtbEntry, pTagColumn);
-    goto end;
-  } else {
-    for (int i = 0; i < pTagSchema->nCols; i++) {
-      pTagData = NULL;
-      nTagData = 0;
-      pTagColumn = &pTagSchema->pSchema[i];
-      if (!IS_IDX_ON(pTagColumn)) continue;
-
-      STagVal tagVal = {.cid = pTagColumn->colId};
-      if (tTagGet((const STag *)pCtbEntry->ctbEntry.pTags, &tagVal)) {
-        if (IS_VAR_DATA_TYPE(pTagColumn->type)) {
-          pTagData = tagVal.pData;
-          nTagData = (int32_t)tagVal.nData;
-        } else {
-          pTagData = &(tagVal.i64);
-          nTagData = tDataTypes[pTagColumn->type].bytes;
-        }
-      } else {
-        if (!IS_VAR_DATA_TYPE(pTagColumn->type)) {
-          nTagData = tDataTypes[pTagColumn->type].bytes;
-        }
-      }
-      if (metaCreateTagIdxKey(pCtbEntry->ctbEntry.suid, pTagColumn->colId, pTagData, nTagData, pTagColumn->type,
-                              pCtbEntry->uid, &pTagIdxKey, &nTagIdxKey) < 0) {
-        ret = -1;
-        goto end;
-      }
-      if (tdbTbUpsert(pMeta->pTagIdx, pTagIdxKey, nTagIdxKey, NULL, 0, pMeta->txn) < 0) {
-        metaError("vgId:%d, failed to update tag index. version:%" PRId64, TD_VID(pMeta->pVnode), pCtbEntry->version);
-      }
-      metaDestroyTagIdxKey(pTagIdxKey);
-      pTagIdxKey = NULL;
-    }
-  }
-end:
-  tDecoderClear(&dc);
-  tdbFree(pData);
-  return ret;
-}
-
-static int metaSaveToSkmDb(SMeta *pMeta, const SMetaEntry *pME) {
-  SEncoder              coder = {0};
-  void                 *pVal = NULL;
-  int                   vLen = 0;
-  int                   rcode = 0;
-  SSkmDbKey             skmDbKey = {0};
-  const SSchemaWrapper *pSW;
-
-  if (pME->type == TSDB_SUPER_TABLE) {
-    pSW = &pME->stbEntry.schemaRow;
-  } else if (pME->type == TSDB_NORMAL_TABLE) {
-    pSW = &pME->ntbEntry.schemaRow;
-  } else {
-    metaError("meta/table: invalide table type: %" PRId8 " save skm db failed.", pME->type);
-    return TSDB_CODE_FAILED;
-  }
-
-  skmDbKey.uid = pME->uid;
-  skmDbKey.sver = pSW->version;
-
-  // if receive tmq meta message is: create stable1 then delete stable1 then create stable1 with multi vgroups
-  if (tdbTbGet(pMeta->pSkmDb, &skmDbKey, sizeof(skmDbKey), NULL, NULL) == 0) {
-    return rcode;
-  }
-
-  // encode schema
-  int32_t ret = 0;
-  tEncodeSize(tEncodeSSchemaWrapper, pSW, vLen, ret);
-  if (ret < 0) return -1;
-  pVal = taosMemoryMalloc(vLen);
-  if (pVal == NULL) {
-    rcode = -1;
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
-    goto _exit;
-  }
-
-  tEncoderInit(&coder, pVal, vLen);
-  ret = tEncodeSSchemaWrapper(&coder, pSW);
-  if (ret < 0) {
-    rcode = -1;
-    goto _exit;
-  }
-
-  if (tdbTbInsert(pMeta->pSkmDb, &skmDbKey, sizeof(skmDbKey), pVal, vLen, pMeta->txn) < 0) {
-    rcode = -1;
-    goto _exit;
-  }
-
-  metaDebug("vgId:%d, set schema:(%" PRId64 ") sver:%d since %s", TD_VID(pMeta->pVnode), pME->uid, pSW->version,
-            tstrerror(terrno));
-
-_exit:
-  taosMemoryFree(pVal);
-  tEncoderClear(&coder);
-  return rcode;
-}
-
-int metaHandleEntry(SMeta *pMeta, const SMetaEntry *pME) {
-  int32_t code = 0;
-  int32_t line = 0;
-  metaWLock(pMeta);
-
-  // save to table.db
-  code = metaSaveToTbDb(pMeta, pME);
-  VND_CHECK_CODE(code, line, _err);
-
-  // update uid.idx
-  code = metaUpdateUidIdx(pMeta, pME);
-  VND_CHECK_CODE(code, line, _err);
-
-  // update name.idx
-  code = metaUpdateNameIdx(pMeta, pME);
-  VND_CHECK_CODE(code, line, _err);
-
-  if (pME->type == TSDB_CHILD_TABLE) {
-    // update ctb.idx
-    code = metaUpdateCtbIdx(pMeta, pME);
-    VND_CHECK_CODE(code, line, _err);
-
-    // update tag.idx
-    code = metaUpdateTagIdx(pMeta, pME);
-    VND_CHECK_CODE(code, line, _err);
-  } else {
-    // update schema.db
-    code = metaSaveToSkmDb(pMeta, pME);
-    VND_CHECK_CODE(code, line, _err);
-
-    if (pME->type == TSDB_SUPER_TABLE) {
-      code = metaUpdateSuidIdx(pMeta, pME);
-      VND_CHECK_CODE(code, line, _err);
-    }
-  }
-
-  code = metaUpdateBtimeIdx(pMeta, pME);
-  VND_CHECK_CODE(code, line, _err);
-
-  if (pME->type == TSDB_NORMAL_TABLE) {
-    code = metaUpdateNcolIdx(pMeta, pME);
-    VND_CHECK_CODE(code, line, _err);
-  }
-
-  if (pME->type != TSDB_SUPER_TABLE) {
-    metaUpdateTtl(pMeta, pME);
-  }
-
-  if (pME->type == TSDB_SUPER_TABLE || pME->type == TSDB_NORMAL_TABLE) {
-  }
-
-  metaULock(pMeta);
-  metaDebug("vgId:%d, handle meta entry, ver:%" PRId64 ", uid:%" PRId64 ", name:%s", TD_VID(pMeta->pVnode),
-            pME->version, pME->uid, pME->name);
-  return 0;
-
-_err:
-  metaULock(pMeta);
-  metaError("vgId:%d, failed to handle meta entry since %s at line:%d, ver:%" PRId64 ", uid:%" PRId64 ", name:%s",
-            TD_VID(pMeta->pVnode), terrstr(), line, pME->version, pME->uid, pME->name);
-  return TSDB_CODE_FAILED;
-}
-
 static void colCompressDebug(SHashObj *pColCmprObj) {
   void *p = taosHashIterate(pColCmprObj, NULL);
   while (p) {
@@ -3261,6 +783,7 @@ static void colCompressDebug(SHashObj *pColCmprObj) {
   }
   return;
 }
+
 int32_t metaGetColCmpr(SMeta *pMeta, tb_uid_t uid, SHashObj **ppColCmprObj) {
   int rc = 0;
 
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 03037e529b..73052c1e5e 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -151,11 +151,8 @@ void tqClose(STQ* pTq) {
   taosHashCleanup(pTq->pOffset);
   taosMemoryFree(pTq->path);
   tqMetaClose(pTq);
-
-  int32_t vgId = pTq->pStreamMeta->vgId;
+  qDebug("vgId:%d end to close tq", pTq->pStreamMeta != NULL ? pTq->pStreamMeta->vgId : -1);
   streamMetaClose(pTq->pStreamMeta);
-
-  qDebug("vgId:%d end to close tq", vgId);
   taosMemoryFree(pTq);
 }
 
diff --git a/source/dnode/vnode/src/tq/tqOffset.c b/source/dnode/vnode/src/tq/tqOffset.c
index c42959971b..6996f3578c 100644
--- a/source/dnode/vnode/src/tq/tqOffset.c
+++ b/source/dnode/vnode/src/tq/tqOffset.c
@@ -17,36 +17,41 @@
 #include "tq.h"
 
 int32_t tqBuildFName(char** data, const char* path, char* name) {
-  if (data == NULL || path == NULL || name == NULL) {
-    return TSDB_CODE_INVALID_MSG;
-  }
+  int32_t   code = 0;
+  int32_t   lino = 0;
+  char*     fname = NULL;
+  TSDB_CHECK_NULL(data, code, lino, END, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(path, code, lino, END, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(name, code, lino, END, TSDB_CODE_INVALID_MSG);
   int32_t len = strlen(path) + strlen(name) + 2;
-  char*   fname = taosMemoryCalloc(1, len);
-  if(fname == NULL) {
-    return terrno;
-  }
-  int32_t code = tsnprintf(fname, len, "%s%s%s", path, TD_DIRSEP, name);
-  if (code < 0){
-    code = TAOS_SYSTEM_ERROR(errno);
-    taosMemoryFree(fname);
-    return code;
-  }
+  fname = taosMemoryCalloc(1, len);
+  TSDB_CHECK_NULL(fname, code, lino, END, terrno);
+  (void)tsnprintf(fname, len, "%s%s%s", path, TD_DIRSEP, name);
+
   *data = fname;
-  return TDB_CODE_SUCCESS;
+  fname = NULL;
+
+END:
+  if (code != 0){
+    tqError("%s failed at %d since %s", __func__, lino, tstrerror(code));
+  }
+  taosMemoryFree(fname);
+  return code;
 }
 
 int32_t tqOffsetRestoreFromFile(STQ* pTq, char* name) {
-  if (pTq == NULL || name == NULL) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t   code = TDB_CODE_SUCCESS;
-  void*     pMemBuf = NULL;
+  int32_t    code = TDB_CODE_SUCCESS;
+  int32_t    lino = 0;
+  void*      pMemBuf = NULL;
+  TdFilePtr  pFile = NULL;
+  STqOffset *pOffset = NULL;
+  void      *pIter = NULL;
 
-  TdFilePtr pFile = taosOpenFile(name, TD_FILE_READ);
-  if (pFile == NULL) {
-    code = TDB_CODE_SUCCESS;
-    goto END;
-  }
+  TSDB_CHECK_NULL(pTq, code, lino, END, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(name, code, lino, END, TSDB_CODE_INVALID_MSG);
+
+  pFile = taosOpenFile(name, TD_FILE_READ);
+  TSDB_CHECK_NULL(pFile, code, lino, END, TDB_CODE_SUCCESS);
 
   int64_t ret = 0;
   int32_t size = 0;
@@ -60,48 +65,41 @@ int32_t tqOffsetRestoreFromFile(STQ* pTq, char* name) {
     }
     total += INT_BYTES;
     size = htonl(size);
-    if (size <= 0) {
-      code = TSDB_CODE_INVALID_MSG;
-      goto END;
-    }
-    pMemBuf = taosMemoryCalloc(1, size);
-    if (pMemBuf == NULL) {
-      code = terrno;
-      goto END;
-    }
+    TSDB_CHECK_CONDITION(size > 0, code, lino, END, TSDB_CODE_INVALID_MSG);
 
-    if (taosReadFile(pFile, pMemBuf, size) != size) {
-      terrno = TSDB_CODE_INVALID_MSG;
-      goto END;
-    }
+    pMemBuf = taosMemoryCalloc(1, size);
+    TSDB_CHECK_NULL(pMemBuf, code, lino, END, terrno);
+    TSDB_CHECK_CONDITION(taosReadFile(pFile, pMemBuf, size) == size, code, lino, END, TSDB_CODE_INVALID_MSG);
 
     total += size;
     STqOffset offset = {0};
-    TQ_ERR_GO_TO_END(tqMetaDecodeOffsetInfo(&offset, pMemBuf, size));
-    code = taosHashPut(pTq->pOffset, offset.subKey, strlen(offset.subKey), &offset, sizeof(STqOffset));
-    if (code != TDB_CODE_SUCCESS) {
-      tDeleteSTqOffset(&offset);
-      goto END;
-    }
+    code = tqMetaDecodeOffsetInfo(&offset, pMemBuf, size);
+    TSDB_CHECK_CODE(code, lino, END);
+    pOffset = &offset;
+    code = taosHashPut(pTq->pOffset, pOffset->subKey, strlen(pOffset->subKey), pOffset, sizeof(STqOffset));
+    TSDB_CHECK_CODE(code, lino, END);
+    pOffset = NULL;
 
     tqInfo("tq: offset restore from file to tdb, size:%d, hash size:%d subkey:%s", total, taosHashGetSize(pTq->pOffset), offset.subKey);
     taosMemoryFree(pMemBuf);
     pMemBuf = NULL;
   }
 
-  void *pIter = NULL;
   while ((pIter = taosHashIterate(pTq->pOffset, pIter))) {
-    STqOffset* pOffset = (STqOffset*)pIter;
-    code = tqMetaSaveOffset(pTq, pOffset);
-    if(code != 0){
-      taosHashCancelIterate(pTq->pOffset, pIter);
-      goto END;
-    }
+    STqOffset* offset = (STqOffset*)pIter;
+    code = tqMetaSaveOffset(pTq, offset);
+    TSDB_CHECK_CODE(code, lino, END);
   }
 
 END:
-  taosCloseFile(&pFile);
+  if (code != 0){
+    tqError("%s failed at %d since %s", __func__, lino, tstrerror(code));
+  }
+  (void)taosCloseFile(&pFile);
   taosMemoryFree(pMemBuf);
 
+  tDeleteSTqOffset(pOffset);
+  taosHashCancelIterate(pTq->pOffset, pIter);
+
   return code;
 }
diff --git a/source/dnode/vnode/src/tq/tqSnapshot.c b/source/dnode/vnode/src/tq/tqSnapshot.c
index 219ea4b6b4..ce5008e344 100644
--- a/source/dnode/vnode/src/tq/tqSnapshot.c
+++ b/source/dnode/vnode/src/tq/tqSnapshot.c
@@ -27,18 +27,16 @@ struct STqSnapReader {
 };
 
 int32_t tqSnapReaderOpen(STQ* pTq, int64_t sver, int64_t ever, int8_t type, STqSnapReader** ppReader) {
-  if (pTq == NULL || ppReader == NULL) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t        code = 0;
+  int      code  = TSDB_CODE_SUCCESS;
+  int32_t  lino  = 0;
   STqSnapReader* pReader = NULL;
+  TSDB_CHECK_NULL(pTq, code, lino, end, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(ppReader, code, lino, end, TSDB_CODE_INVALID_MSG);
 
   // alloc
   pReader = (STqSnapReader*)taosMemoryCalloc(1, sizeof(STqSnapReader));
-  if (pReader == NULL) {
-    code = terrno;
-    goto _err;
-  }
+  TSDB_CHECK_NULL(pReader, code, lino, end, terrno);
+
   pReader->pTq = pTq;
   pReader->sver = sver;
   pReader->ever = ever;
@@ -54,28 +52,21 @@ int32_t tqSnapReaderOpen(STQ* pTq, int64_t sver, int64_t ever, int8_t type, STqS
     pTb = pTq->pOffsetStore;
   } else {
     code = TSDB_CODE_INVALID_MSG;
-    goto _err;
+    goto end;
   }
   code = tdbTbcOpen(pTb, &pReader->pCur, NULL);
-  if (code) {
-    taosMemoryFree(pReader);
-    goto _err;
-  }
-
+  TSDB_CHECK_CODE(code, lino, end);
   code = tdbTbcMoveToFirst(pReader->pCur);
-  if (code) {
-    taosMemoryFree(pReader);
-    goto _err;
+  TSDB_CHECK_CODE(code, lino, end);
+  tqInfo("vgId:%d, vnode tq snapshot reader opene success", TD_VID(pTq->pVnode));
+  *ppReader = pReader;
+
+end:
+  if (code != 0){
+    tqError("%s failed at %d, vnode tq snapshot reader open failed since %s", __func__, lino, tstrerror(code));
+    taosMemoryFreeClear(pReader);
   }
 
-  tqInfo("vgId:%d, vnode snapshot tq reader opened", TD_VID(pTq->pVnode));
-
-  *ppReader = pReader;
-  return code;
-
-_err:
-  tqError("vgId:%d, vnode snapshot tq reader open failed since %s", TD_VID(pTq->pVnode), tstrerror(code));
-  *ppReader = NULL;
   return code;
 }
 
@@ -84,45 +75,37 @@ void tqSnapReaderClose(STqSnapReader** ppReader) {
     return;
   }
   tdbTbcClose((*ppReader)->pCur);
-  taosMemoryFree(*ppReader);
-  *ppReader = NULL;
+  taosMemoryFreeClear(*ppReader);
 }
 
 int32_t tqSnapRead(STqSnapReader* pReader, uint8_t** ppData) {
-  if (pReader == NULL || ppData == NULL) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t code = 0;
-  void*   pKey = NULL;
-  void*   pVal = NULL;
-  int32_t kLen = 0;
-  int32_t vLen = 0;
+  int     code  = TSDB_CODE_SUCCESS;
+  int32_t lino  = 0;
+  void*   pKey  = NULL;
+  void*   pVal  = NULL;
+  int32_t kLen  = 0;
+  int32_t vLen  = 0;
+  TSDB_CHECK_NULL(pReader, code, lino, end, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(ppData, code, lino, end, TSDB_CODE_INVALID_MSG);
 
-  if (tdbTbcNext(pReader->pCur, &pKey, &kLen, &pVal, &vLen)) {
-    goto _exit;
-  }
+  code = tdbTbcNext(pReader->pCur, &pKey, &kLen, &pVal, &vLen);
+  TSDB_CHECK_CONDITION(code == 0, code, lino, end, TDB_CODE_SUCCESS);
 
   *ppData = taosMemoryMalloc(sizeof(SSnapDataHdr) + vLen);
-  if (*ppData == NULL) {
-    code = TAOS_GET_TERRNO(TSDB_CODE_OUT_OF_MEMORY);
-    goto _err;
-  }
+  TSDB_CHECK_NULL(*ppData, code, lino, end, terrno);
 
   SSnapDataHdr* pHdr = (SSnapDataHdr*)(*ppData);
   pHdr->type = pReader->type;
   pHdr->size = vLen;
   (void)memcpy(pHdr->data, pVal, vLen);
+  tqInfo("vgId:%d, vnode tq snapshot read data, vLen:%d", TD_VID(pReader->pTq->pVnode), vLen);
 
-_exit:
+end:
+  if (code != 0) {
+    tqError("%s failed at %d, vnode tq snapshot read data failed since %s", __func__, lino, tstrerror(code));
+  }
   tdbFree(pKey);
   tdbFree(pVal);
-  tqInfo("vgId:%d, vnode snapshot tq read data, vLen:%d", TD_VID(pReader->pTq->pVnode), vLen);
-  return code;
-
-_err:
-  tdbFree(pKey);
-  tdbFree(pVal);
-  tqError("vgId:%d, vnode snapshot tq read data failed since %s", TD_VID(pReader->pTq->pVnode), tstrerror(code));
   return code;
 }
 
@@ -135,135 +118,148 @@ struct STqSnapWriter {
 };
 
 int32_t tqSnapWriterOpen(STQ* pTq, int64_t sver, int64_t ever, STqSnapWriter** ppWriter) {
-  if (pTq == NULL || ppWriter == NULL) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t        code = 0;
+  int     code  = TSDB_CODE_SUCCESS;
+  int32_t lino  = 0;
   STqSnapWriter* pWriter = NULL;
 
+  TSDB_CHECK_NULL(pTq, code, lino, end, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(ppWriter, code, lino, end, TSDB_CODE_INVALID_MSG);
+
   // alloc
   pWriter = (STqSnapWriter*)taosMemoryCalloc(1, sizeof(*pWriter));
-  if (pWriter == NULL) {
-    code = TAOS_GET_TERRNO(TSDB_CODE_OUT_OF_MEMORY);
-    ;
-    goto _err;
-  }
+  TSDB_CHECK_NULL(pWriter, code, lino, end, terrno);
   pWriter->pTq = pTq;
   pWriter->sver = sver;
   pWriter->ever = ever;
 
   code = tdbBegin(pTq->pMetaDB, &pWriter->txn, tdbDefaultMalloc, tdbDefaultFree, NULL, 0);
-  if (code < 0) {
-    taosMemoryFree(pWriter);
-    goto _err;
-  }
-
+  TSDB_CHECK_CODE(code, lino, end);
+  tqInfo("vgId:%d, tq snapshot writer opene success", TD_VID(pTq->pVnode));
   *ppWriter = pWriter;
-  return code;
 
-_err:
-  tqError("vgId:%d, tq snapshot writer open failed since %s", TD_VID(pTq->pVnode), tstrerror(code));
-  *ppWriter = NULL;
+end:
+  if (code != 0){
+    tqError("%s failed at %d tq snapshot writer open failed since %s", __func__, lino, tstrerror(code));
+    taosMemoryFreeClear(pWriter);
+  }
   return code;
 }
 
 int32_t tqSnapWriterClose(STqSnapWriter** ppWriter, int8_t rollback) {
-  if (ppWriter == NULL || *ppWriter == NULL) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t        code = 0;
-  STqSnapWriter* pWriter = *ppWriter;
-  STQ*           pTq = pWriter->pTq;
+  int     code  = TSDB_CODE_SUCCESS;
+  int32_t lino  = 0;
+  STqSnapWriter* pWriter = NULL;
+
+  TSDB_CHECK_NULL(ppWriter, code, lino, end, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(*ppWriter, code, lino, end, TSDB_CODE_INVALID_MSG);
+  pWriter = *ppWriter;
 
   if (rollback) {
     tdbAbort(pWriter->pTq->pMetaDB, pWriter->txn);
   } else {
     code = tdbCommit(pWriter->pTq->pMetaDB, pWriter->txn);
-    if (code) goto _err;
+    TSDB_CHECK_CODE(code, lino, end);
+
     code = tdbPostCommit(pWriter->pTq->pMetaDB, pWriter->txn);
-    if (code) goto _err;
+    TSDB_CHECK_CODE(code, lino, end);
   }
+  tqInfo("vgId:%d, tq snapshot writer close success", TD_VID(pWriter->pTq->pVnode));
+  taosMemoryFreeClear(*ppWriter);
 
-  taosMemoryFree(pWriter);
-  *ppWriter = NULL;
-
-  return code;
-
-_err:
-  tqError("vgId:%d, tq snapshot writer close failed since %s", TD_VID(pTq->pVnode), tstrerror(code));
+end:
+  if (code != 0){
+    tqError("%s failed at %d, tq snapshot writer close failed since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
-int32_t tqSnapHandleWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nData) {
-  if (pWriter == NULL || pData == NULL || nData < sizeof(SSnapDataHdr)) {
-    return TSDB_CODE_INVALID_MSG;
+static int32_t tqWriteCheck(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nData){
+  int       code  = TSDB_CODE_SUCCESS;
+  int32_t   lino  = 0;
+  TSDB_CHECK_NULL(pWriter, code, lino, end, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_NULL(pData, code, lino, end, TSDB_CODE_INVALID_MSG);
+  TSDB_CHECK_CONDITION(nData >= sizeof(SSnapDataHdr), code, lino, end, TSDB_CODE_INVALID_MSG);
+end:
+  if (code != 0){
+    tqError("%s failed at %d failed since %s", __func__, lino, tstrerror(code));
   }
-  int32_t   code = 0;
-  STQ*      pTq = pWriter->pTq;
+  return code;
+}
+int32_t tqSnapHandleWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nData) {
+  int       code  = TSDB_CODE_SUCCESS;
+  int32_t   lino  = 0;
   SDecoder  decoder = {0};
   SDecoder* pDecoder = &decoder;
   STqHandle handle = {0};
+  code = tqWriteCheck(pWriter, pData, nData);
+  TSDB_CHECK_CODE(code, lino, end);
 
+  STQ*      pTq = pWriter->pTq;
   tDecoderInit(pDecoder, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr));
   code = tDecodeSTqHandle(pDecoder, &handle);
-  if (code) goto end;
+  TSDB_CHECK_CODE(code, lino, end);
+
   taosWLockLatch(&pTq->lock);
   code = tqMetaSaveInfo(pTq, pTq->pExecStore, handle.subKey, strlen(handle.subKey), pData + sizeof(SSnapDataHdr),
                         nData - sizeof(SSnapDataHdr));
   taosWUnLockLatch(&pTq->lock);
+  TSDB_CHECK_CODE(code, lino, end);
+  tqInfo("vgId:%d, vnode tq snapshot write success", TD_VID(pTq->pVnode));
 
 end:
   tDecoderClear(pDecoder);
   tqDestroyTqHandle(&handle);
-  tqInfo("vgId:%d, vnode snapshot tq write result:%d", TD_VID(pTq->pVnode), code);
+  if (code != 0){
+    tqError("%s failed at %d, vnode tq snapshot write failed since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
 int32_t tqSnapCheckInfoWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nData) {
-  if (pWriter == NULL || pData == NULL || nData < sizeof(SSnapDataHdr)) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t      code = 0;
+  int       code  = TSDB_CODE_SUCCESS;
+  int32_t   lino  = 0;
+
+  code = tqWriteCheck(pWriter, pData, nData);
+  TSDB_CHECK_CODE(code, lino, end);
+
   STQ*         pTq = pWriter->pTq;
   STqCheckInfo info = {0};
   code = tqMetaDecodeCheckInfo(&info, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr));
-  if (code != 0) {
-    goto _err;
-  }
+  TSDB_CHECK_CODE(code, lino, end);
 
   code = tqMetaSaveInfo(pTq, pTq->pCheckStore, &info.topic, strlen(info.topic), pData + sizeof(SSnapDataHdr),
                         nData - sizeof(SSnapDataHdr));
   tDeleteSTqCheckInfo(&info);
-  if (code) goto _err;
+  TSDB_CHECK_CODE(code, lino, end);
+  tqInfo("vgId:%d, vnode tq check info  write success", TD_VID(pTq->pVnode));
 
-  return code;
-
-_err:
-  tqError("vgId:%d, vnode check info tq write failed since %s", TD_VID(pTq->pVnode), tstrerror(code));
+end:
+  if (code != 0){
+    tqError("%s failed at %d, vnode tq check info write failed since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
 
 int32_t tqSnapOffsetWrite(STqSnapWriter* pWriter, uint8_t* pData, uint32_t nData) {
-  if (pWriter == NULL || pData == NULL || nData < sizeof(SSnapDataHdr)) {
-    return TSDB_CODE_INVALID_MSG;
-  }
-  int32_t code = 0;
-  STQ*    pTq = pWriter->pTq;
+  int       code  = TSDB_CODE_SUCCESS;
+  int32_t   lino  = 0;
+  code = tqWriteCheck(pWriter, pData, nData);
+  TSDB_CHECK_CODE(code, lino, end);
 
+  STQ*    pTq = pWriter->pTq;
   STqOffset info = {0};
   code = tqMetaDecodeOffsetInfo(&info, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr));
-  if (code != 0) {
-    goto _err;
-  }
+  TSDB_CHECK_CODE(code, lino, end);
 
   code = tqMetaSaveInfo(pTq, pTq->pOffsetStore, info.subKey, strlen(info.subKey), pData + sizeof(SSnapDataHdr),
                         nData - sizeof(SSnapDataHdr));
   tDeleteSTqOffset(&info);
-  if (code) goto _err;
+  TSDB_CHECK_CODE(code, lino, end);
+  tqInfo("vgId:%d, vnode tq offset write success", TD_VID(pTq->pVnode));
 
-  return code;
-
-_err:
-  tqError("vgId:%d, vnode check info tq write failed since %s", TD_VID(pTq->pVnode), tstrerror(code));
+end:
+  if (code != 0){
+    tqError("%s failed at %d, vnode tq offset write failed since %s", __func__, lino, tstrerror(code));
+  }
   return code;
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index 05ae4be74b..a9f3893b96 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -5791,7 +5791,6 @@ int32_t tsdbReaderSuspend2(STsdbReader* pReader) {
 
   // make sure only release once
   void* p = pReader->pReadSnap;
-  TSDB_CHECK_NULL(p, code, lino, _end, TSDB_CODE_INVALID_PARA);
   if ((p == atomic_val_compare_exchange_ptr((void**)&pReader->pReadSnap, p, NULL)) && (p != NULL)) {
     tsdbUntakeReadSnap2(pReader, p, false);
     pReader->pReadSnap = NULL;
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index e82209e03f..f8b75eb15c 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -607,9 +607,9 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t ver, SRpcMsg
   }
 
   vDebug("vgId:%d, start to process write request %s, index:%" PRId64 ", applied:%" PRId64 ", state.applyTerm:%" PRId64
-         ", conn.applyTerm:%" PRId64,
+         ", conn.applyTerm:%" PRId64 ", contLen:%d",
          TD_VID(pVnode), TMSG_INFO(pMsg->msgType), ver, pVnode->state.applied, pVnode->state.applyTerm,
-         pMsg->info.conn.applyTerm);
+         pMsg->info.conn.applyTerm, pMsg->contLen);
 
   if (!(pVnode->state.applyTerm <= pMsg->info.conn.applyTerm)) {
     return terrno = TSDB_CODE_INTERNAL_ERROR;
@@ -843,7 +843,7 @@ int32_t vnodeProcessQueryMsg(SVnode *pVnode, SRpcMsg *pMsg, SQueueInfo *pInfo) {
   SReadHandle handle = {.vnode = pVnode, .pMsgCb = &pVnode->msgCb, .pWorkerCb = pInfo->workerCb};
   initStorageAPI(&handle.api);
   int32_t code = TSDB_CODE_SUCCESS;
-  bool redirected = false;
+  bool    redirected = false;
 
   switch (pMsg->msgType) {
     case TDMT_SCH_QUERY:
@@ -2145,7 +2145,7 @@ static int32_t vnodeConsolidateAlterHashRange(SVnode *pVnode, int64_t ver) {
         pVnode->config.hashBegin, pVnode->config.hashEnd, ver);
 
   // TODO: trim meta of tables from TDB per hash range [pVnode->config.hashBegin, pVnode->config.hashEnd]
-  code = metaTrimTables(pVnode->pMeta);
+  code = metaTrimTables(pVnode->pMeta, ver);
 
   return code;
 }
diff --git a/source/dnode/vnode/test/CMakeLists.txt b/source/dnode/vnode/test/CMakeLists.txt
index 724eabc751..ff7e5a2196 100644
--- a/source/dnode/vnode/test/CMakeLists.txt
+++ b/source/dnode/vnode/test/CMakeLists.txt
@@ -1,29 +1,27 @@
-MESSAGE(STATUS "vnode unit test")
+MESSAGE(STATUS "tq unit test")
 
 # GoogleTest requires at least C++11
 SET(CMAKE_CXX_STANDARD 11)
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 
-# add_executable(tqTest "")
-# target_sources(tqTest
-#     PRIVATE
-#     "tqMetaTest.cpp"
-# )
-# target_include_directories(tqTest
-#     PUBLIC
-#     "${TD_SOURCE_DIR}/include/server/vnode/tq"
-#     "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
-# )
+IF(NOT TD_WINDOWS)
+    add_executable(tqTest tqTest.cpp)
+    target_include_directories(tqTest
+            PUBLIC
+            "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+    )
 
-# target_link_libraries(tqTest
-#     tq
-#     gtest_main
-# )
-# enable_testing()
-# add_test(
-#     NAME tq_test
-#     COMMAND tqTest
-# )
+    TARGET_LINK_LIBRARIES(
+            tqTest
+            PUBLIC os util common vnode gtest_main
+    )
+
+    enable_testing()
+
+    add_test(
+            NAME tq_test
+            COMMAND tqTest
+    )
+ENDIF()
 
 # ADD_EXECUTABLE(tsdbSmaTest tsdbSmaTest.cpp)
 # TARGET_LINK_LIBRARIES(
diff --git a/source/dnode/vnode/test/tqTest.cpp b/source/dnode/vnode/test/tqTest.cpp
new file mode 100644
index 0000000000..d757aa6d43
--- /dev/null
+++ b/source/dnode/vnode/test/tqTest.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtest/gtest.h>
+#include <vnodeInt.h>
+
+#include <taoserror.h>
+#include <tglobal.h>
+#include <iostream>
+
+#include <tmsg.h>
+#include <vnodeInt.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+
+SDmNotifyHandle dmNotifyHdl = {.state = 0};
+
+#include "tq.h"
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+
+void tqWriteOffset() {
+  TdFilePtr pFile = taosOpenFile(TQ_OFFSET_NAME, TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND);
+
+  STqOffset offset = {.val = {.type = TMQ_OFFSET__LOG, .version = 8923}};
+  strcpy(offset.subKey, "testtest");
+  int32_t    bodyLen;
+  int32_t    code;
+  tEncodeSize(tEncodeSTqOffset, &offset, bodyLen, code);
+  int32_t totLen = INT_BYTES + bodyLen;
+  void*   buf = taosMemoryCalloc(1, totLen);
+  void*   abuf = POINTER_SHIFT(buf, INT_BYTES);
+
+  *(int32_t*)buf = htonl(bodyLen);
+  SEncoder encoder;
+  tEncoderInit(&encoder, (uint8_t*)abuf, bodyLen);
+  tEncodeSTqOffset(&encoder, &offset);
+  taosWriteFile(pFile, buf, totLen);
+
+  taosMemoryFree(buf);
+
+  taosCloseFile(&pFile);
+}
+
+TEST(testCase, tqOffsetTest) {
+  STQ* pTq = (STQ*)taosMemoryCalloc(1, sizeof(STQ));
+  pTq->path = taosStrdup("./");
+
+  pTq->pOffset = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_VARCHAR), true, HASH_ENTRY_LOCK);
+  taosHashSetFreeFp(pTq->pOffset, (FDelete)tDeleteSTqOffset);
+
+  tdbOpen(pTq->path, 16 * 1024, 1, &pTq->pMetaDB, 0, 0, NULL);
+  tdbTbOpen("tq.offset.db", -1, -1, NULL, pTq->pMetaDB, &pTq->pOffsetStore, 0);
+
+  tqWriteOffset();
+  tqOffsetRestoreFromFile(pTq, TQ_OFFSET_NAME);
+  taosRemoveFile(TQ_OFFSET_NAME);
+  tqClose(pTq);
+}
+
+#pragma GCC diagnostic pop
diff --git a/source/libs/catalog/CMakeLists.txt b/source/libs/catalog/CMakeLists.txt
index 3bdb0a9b1d..dd7220da15 100644
--- a/source/libs/catalog/CMakeLists.txt
+++ b/source/libs/catalog/CMakeLists.txt
@@ -11,6 +11,6 @@ target_link_libraries(
     PRIVATE os util transport qcom nodes
 )
 
-#if(${BUILD_TEST})
-# ADD_SUBDIRECTORY(test)
-#endif(${BUILD_TEST})
+if(${BUILD_TEST} AND NOT ${TD_WINDOWS})
+ ADD_SUBDIRECTORY(test)
+endif()
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 199bac5246..bc1462176a 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -424,6 +424,7 @@ int32_t ctgGetTbCfg(SCatalog* pCtg, SRequestConnInfo* pConn, SName* pTableName,
   CTG_RET(TSDB_CODE_SUCCESS);
 }
 
+#if 0
 int32_t ctgGetTbTag(SCatalog* pCtg, SRequestConnInfo* pConn, SName* pTableName, SArray** pRes) {
   SVgroupInfo vgroupInfo = {0};
   STableCfg* pCfg = NULL;
@@ -474,6 +475,7 @@ _return:
   
   CTG_RET(code);
 }
+#endif
 
 int32_t ctgGetTbDistVgInfo(SCatalog* pCtg, SRequestConnInfo* pConn, SName* pTableName, SArray** pVgList) {
   STableMeta*   tbMeta = NULL;
@@ -1695,6 +1697,7 @@ _return:
   CTG_API_LEAVE(code);
 }
 
+#if 0
 int32_t catalogGetTableTag(SCatalog* pCtg, SRequestConnInfo* pConn, const SName* pTableName, SArray** pRes) {
   CTG_API_ENTER();
 
@@ -1709,6 +1712,7 @@ _return:
 
   CTG_API_LEAVE(code);
 }
+#endif
 
 int32_t catalogRefreshGetTableCfg(SCatalog* pCtg, SRequestConnInfo* pConn, const SName* pTableName, STableCfg** pCfg) {
   CTG_API_ENTER();
@@ -1845,7 +1849,7 @@ _return:
   CTG_API_LEAVE(code);
 }
 
-
+#if 0
 int32_t catalogAsyncUpdateViewMeta(SCatalog* pCtg, SViewMetaRsp* pMsg) {
   CTG_API_ENTER();
 
@@ -1860,6 +1864,7 @@ _return:
 
   CTG_API_LEAVE(code);
 }
+#endif
 
 int32_t catalogGetViewMeta(SCatalog* pCtg, SRequestConnInfo* pConn, const SName* pViewName, STableMeta** pTableMeta) {
   CTG_API_ENTER();
diff --git a/source/libs/catalog/test/catalogTests.cpp b/source/libs/catalog/test/catalogTests.cpp
index 7b0504504d..c2889f096b 100644
--- a/source/libs/catalog/test/catalogTests.cpp
+++ b/source/libs/catalog/test/catalogTests.cpp
@@ -2992,6 +2992,7 @@ TEST(apiTest, catalogGetTableIndex_test) {
   catalogDestroy();
 }
 
+
 TEST(apiTest, catalogGetDBCfg_test) {
   struct SCatalog  *pCtg = NULL;
   SRequestConnInfo  connInfo = {0};
diff --git a/source/libs/executor/src/hashjoin.c b/source/libs/executor/src/hashjoin.c
index f63b4093db..da7686cce6 100755
--- a/source/libs/executor/src/hashjoin.c
+++ b/source/libs/executor/src/hashjoin.c
@@ -83,6 +83,8 @@ int32_t hInnerJoinDo(struct SOperatorInfo* pOperator) {
   return code;
 }
 
+#ifdef HASH_JOIN_FULL
+
 int32_t hLeftJoinHandleSeqRowRemains(struct SOperatorInfo* pOperator, SHJoinOperatorInfo* pJoin, bool* loopCont) {
   bool allFetched = false;
   SHJoinCtx* pCtx = &pJoin->ctx;
@@ -346,4 +348,5 @@ int32_t hLeftJoinDo(struct SOperatorInfo* pOperator) {
   return TSDB_CODE_SUCCESS;
 }
 
+#endif
 
diff --git a/source/libs/executor/src/hashjoinoperator.c b/source/libs/executor/src/hashjoinoperator.c
index 64ce62cb66..73a5139e43 100644
--- a/source/libs/executor/src/hashjoinoperator.c
+++ b/source/libs/executor/src/hashjoinoperator.c
@@ -89,7 +89,7 @@ int32_t hJoinSetImplFp(SHJoinOperatorInfo* pJoin) {
     case JOIN_TYPE_RIGHT: {
       switch (pJoin->subType) {
         case JOIN_STYPE_OUTER:          
-          pJoin->joinFp = hLeftJoinDo;
+          //pJoin->joinFp = hLeftJoinDo; TOOPEN
           break;
         default:
           break;
diff --git a/source/libs/executor/test/CMakeLists.txt b/source/libs/executor/test/CMakeLists.txt
index cb1f951c94..4136640847 100644
--- a/source/libs/executor/test/CMakeLists.txt
+++ b/source/libs/executor/test/CMakeLists.txt
@@ -44,3 +44,15 @@ TARGET_INCLUDE_DIRECTORIES(
         PUBLIC "${TD_SOURCE_DIR}/include/common"
         PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
+
+ADD_EXECUTABLE(execUtilTests execUtilTests.cpp)
+TARGET_LINK_LIBRARIES(
+        execUtilTests
+        PRIVATE os util common executor gtest_main qcom function planner scalar nodes vnode
+)
+
+TARGET_INCLUDE_DIRECTORIES(
+        execUtilTests
+        PUBLIC "${TD_SOURCE_DIR}/include/common"
+        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
diff --git a/source/libs/executor/test/execUtilTests.cpp b/source/libs/executor/test/execUtilTests.cpp
new file mode 100644
index 0000000000..61b69fb9cf
--- /dev/null
+++ b/source/libs/executor/test/execUtilTests.cpp
@@ -0,0 +1,35 @@
+#include "gtest/gtest.h"
+
+#include "executil.h"
+
+TEST(execUtilTest, resRowTest) {
+  SDiskbasedBuf *pBuf = nullptr;
+  int32_t        pageSize = 32;
+  int32_t        numPages = 3;
+  int32_t        code = createDiskbasedBuf(&pBuf, pageSize, pageSize * numPages, "test_buf", "/");
+  EXPECT_EQ(code, TSDB_CODE_SUCCESS);
+
+  std::vector<void *>  pages(numPages);
+  std::vector<int32_t> pageIds(numPages);
+  for (int32_t i = 0; i < numPages; ++i) {
+    pages[i] = getNewBufPage(pBuf, &pageIds[i]);
+    EXPECT_NE(pages[i], nullptr);
+    EXPECT_EQ(pageIds[i], i);
+  }
+
+  EXPECT_EQ(getNewBufPage(pBuf, nullptr), nullptr);
+
+  SResultRowPosition pos;
+  pos.offset = 0;
+  for (int32_t i = 0; i < numPages; ++i) {
+    pos.pageId = pageIds[i];
+    bool forUpdate = i & 0x1;
+    SResultRow *row =  getResultRowByPos(pBuf, &pos, forUpdate);
+    EXPECT_EQ((void *)row, pages[i]);
+  }
+
+  pos.pageId = numPages + 1;
+  EXPECT_EQ(getResultRowByPos(pBuf, &pos, true), nullptr);
+
+  destroyDiskbasedBuf(pBuf);
+}
diff --git a/source/libs/executor/test/joinTests.cpp b/source/libs/executor/test/joinTests.cpp
index 6dd42c3a93..efbe1fcc83 100755
--- a/source/libs/executor/test/joinTests.cpp
+++ b/source/libs/executor/test/joinTests.cpp
@@ -41,6 +41,7 @@
 #include "tvariant.h"
 #include "stub.h"
 #include "querytask.h"
+#include "hashjoin.h"
 
 
 namespace {
@@ -3766,6 +3767,21 @@ TEST(leftWinJoin, noCondProjectionTest) {
 
 #endif
 
+#if 1
+TEST(functionsTest, branch) {
+  struct SOperatorInfo op = {0};
+  SHJoinOperatorInfo join;
+  SBufRowInfo bufrow = {0};
+  SSDataBlock blk = {0};
+
+  op.info = &join;
+  memset(&join, 0, sizeof(join));
+  join.ctx.pBuildRow = &bufrow;
+  blk.info.rows = 1;
+  join.finBlk = &blk;
+  hInnerJoinDo(&op);
+}
+#endif
 
 
 int main(int argc, char** argv) {
diff --git a/source/libs/function/CMakeLists.txt b/source/libs/function/CMakeLists.txt
index 6891653981..fad0a749d5 100644
--- a/source/libs/function/CMakeLists.txt
+++ b/source/libs/function/CMakeLists.txt
@@ -142,6 +142,50 @@ target_link_libraries(
     udf2_dup PUBLIC os ${LINK_JEMALLOC}
 )
 
+set(TARGET_NAMES
+    change_udf_normal
+    change_udf_no_init
+    change_udf_no_process
+    change_udf_no_destroy
+    change_udf_init_failed
+    change_udf_process_failed
+    change_udf_destory_failed
+)
+
+set(COMPILE_DEFINITIONS
+    CHANGE_UDF_NORMAL
+    CHANGE_UDF_NO_INIT
+    CHANGE_UDF_NO_PROCESS
+    CHANGE_UDF_NO_DESTROY
+    CHANGE_UDF_INIT_FAILED
+    CHANGE_UDF_PROCESS_FAILED
+    CHANGE_UDF_DESTORY_FAILED
+)
+
+foreach(index RANGE 0 6)
+    list(GET TARGET_NAMES ${index} target_name)
+    list(GET COMPILE_DEFINITIONS ${index} compile_def)
+
+    add_library(${target_name} STATIC MODULE test/change_udf.c)
+    target_include_directories(
+        ${target_name}
+        PUBLIC
+        "${TD_SOURCE_DIR}/include/libs/function"
+        "${TD_SOURCE_DIR}/include/util"
+        "${TD_SOURCE_DIR}/include/common"
+        "${TD_SOURCE_DIR}/include/client"
+        "${TD_SOURCE_DIR}/include/os"
+        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+    )
+    target_compile_definitions(${target_name} PRIVATE ${compile_def})
+    IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
+        ADD_DEPENDENCIES(${target_name} jemalloc)
+    ENDIF()
+    target_link_libraries(
+        ${target_name} PUBLIC os ${LINK_JEMALLOC}
+    )
+endforeach()
+
 # SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
 add_executable(udfd src/udfd.c)
 
diff --git a/source/libs/function/test/change_udf.c b/source/libs/function/test/change_udf.c
new file mode 100644
index 0000000000..f623a3194d
--- /dev/null
+++ b/source/libs/function/test/change_udf.c
@@ -0,0 +1,172 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef LINUX
+#include <unistd.h>
+#endif
+#ifdef WINDOWS
+#include <windows.h>
+#endif
+#include "taosudf.h"
+
+// rename function name
+#ifdef CHANGE_UDF_NORMAL
+#define UDFNAME change_udf_normal
+#define UDFNAMEINIT change_udf_normal_init
+#define UDFNAMEDESTROY change_udf_normal_destroy
+#elif defined(CHANGE_UDF_NO_INIT)
+#define UDFNAME change_udf_no_init
+#define UDFNAMEINIT change_udf_no_init_init
+#define UDFNAMEDESTROY change_udf_no_init_destroy
+#elif defined(CHANGE_UDF_NO_PROCESS)
+#define UDFNAME change_udf_no_process
+#define UDFNAMEINIT change_udf_no_process_init
+#define UDFNAMEDESTROY change_udf_no_process_destroy
+#elif defined(CHANGE_UDF_NO_DESTROY)
+#define UDFNAME change_udf_no_destroy
+#define UDFNAMEINIT change_udf_no_destroy_init
+#define UDFNAMEDESTROY change_udf_no_destroy_destroy
+#elif defined(CHANGE_UDF_INIT_FAILED)
+#define UDFNAME change_udf_init_failed
+#define UDFNAMEINIT change_udf_init_failed_init
+#define UDFNAMEDESTROY change_udf_init_failed_destroy
+#elif defined(CHANGE_UDF_PROCESS_FAILED)
+#define UDFNAME change_udf_process_failed
+#define UDFNAMEINIT change_udf_process_failed_init
+#define UDFNAMEDESTROY change_udf_process_failed_destroy
+#elif defined(CHANGE_UDF_DESTORY_FAILED)
+#define UDFNAME change_udf_destory_failed
+#define UDFNAMEINIT change_udf_destory_failed_init
+#define UDFNAMEDESTROY change_udf_destory_failed_destroy
+#else
+#define UDFNAME change_udf_normal
+#define UDFNAMEINIT change_udf_normal_init
+#define UDFNAMEDESTROY change_udf_normal_destroy
+#endif
+
+
+#ifdef CHANGE_UDF_NO_INIT
+#else
+DLL_EXPORT int32_t UDFNAMEINIT() {
+  #ifdef CHANGE_UDF_INIT_FAILED
+  return -1;
+  #else
+  return 0;
+  #endif // ifdef CHANGE_UDF_INIT_FAILED
+}
+#endif // ifdef CHANGE_UDF_NO_INIT
+
+#ifdef CHANGE_UDF_NO_DESTROY
+#else
+DLL_EXPORT int32_t UDFNAMEDESTROY() { 
+  #ifdef CHANGE_UDF_DESTORY_FAILED
+  return -1;
+  #else
+  return 0; 
+  #endif // ifdef CHANGE_UDF_DESTORY_FAILED
+  }
+#endif  // ifdef CHANGE_UDF_NO_DESTROY
+
+#ifdef CHANGE_UDF_NO_PROCESS
+#else
+DLL_EXPORT int32_t UDFNAME(SUdfDataBlock *block, SUdfColumn *resultCol) {
+  #ifdef CHANGE_UDF_PROCESS_FAILED
+  return -1;
+  #else
+  int32_t code = 0;
+  SUdfColumnData *resultData = &resultCol->colData;
+  for (int32_t i = 0; i < block->numOfRows; ++i) {
+    int j = 0;
+    for (; j < block->numOfCols; ++j) {
+      if (udfColDataIsNull(block->udfCols[j], i)) {
+        code = udfColDataSetNull(resultCol, i);
+        if (code != 0) {
+          return code;
+        }
+        break;
+      }
+    }
+    if (j == block->numOfCols) {
+      int32_t luckyNum = 1;
+      code = udfColDataSet(resultCol, i, (char *)&luckyNum, false);
+      if (code != 0) {
+        return code;
+      }
+    }
+  }
+  // to simulate actual processing delay by udf
+#ifdef LINUX
+  usleep(1 * 1000);  // usleep takes sleep time in us (1 millionth of a second)
+#endif // ifdef LINUX
+#ifdef WINDOWS
+  Sleep(1);
+#endif // ifdef WINDOWS
+  resultData->numOfRows = block->numOfRows;
+  return 0;
+  #endif // ifdef CHANGE_UDF_PROCESS_FAILED
+}
+#endif // ifdef CHANGE_UDF_NO_PROCESS
+
+
+
+
+/********************************************************************************************************************/
+//                                             udf revert functions
+/********************************************************************************************************************/
+DLL_EXPORT int32_t udf_reverse_init() { return 0; }
+
+DLL_EXPORT int32_t udf_reverse_destroy() { return 0; }
+
+static void reverse_data(char* data, size_t len) {
+    size_t i, j;
+    char temp;
+    for (i = 0, j = len - 1; i < j; i++, j--) {
+        temp = data[i];
+        data[i] = data[j];
+        data[j] = temp;
+    }
+}
+
+DLL_EXPORT int32_t udf_reverse(SUdfDataBlock *block, SUdfColumn *resultCol) {
+  int32_t code = 0;
+  SUdfColumnData *resultData = &resultCol->colData;
+  for (int32_t i = 0; i < block->numOfRows; ++i) {
+    int j = 0;
+    for (; j < block->numOfCols; ++j) {
+      if (udfColDataIsNull(block->udfCols[j], i)) {
+        code = udfColDataSetNull(resultCol, i);
+        if (code != 0) {
+          return code;
+        }
+        break;
+      } else {
+        int32_t oldLen = udfColDataGetDataLen(block->udfCols[j], i);
+        char   *pOldData = udfColDataGetData(block->udfCols[j], i);
+
+
+        char *buff = malloc(sizeof(VarDataLenT) + oldLen);
+        if (buff == NULL) {
+          return -1;
+        }
+        ((VarDataLenT *)buff)[0] = (VarDataLenT)oldLen;
+        memcpy(buff, pOldData, oldLen + sizeof(VarDataLenT));
+        reverse_data(buff + sizeof(VarDataLenT), oldLen);
+        code = udfColDataSet(resultCol, i, buff, false);
+        if (code != 0) {
+          free(buff);
+          return code;
+        }
+      }
+    }
+  }
+  // to simulate actual processing delay by udf
+#ifdef LINUX
+  usleep(1 * 1000);  // usleep takes sleep time in us (1 millionth of a second)
+#endif
+#ifdef WINDOWS
+  Sleep(1);
+#endif
+  resultData->numOfRows = block->numOfRows;
+  return 0;
+}
+
diff --git a/source/libs/nodes/test/nodesTestMain.cpp b/source/libs/nodes/test/nodesTestMain.cpp
index eb69017b11..e24a979b1e 100644
--- a/source/libs/nodes/test/nodesTestMain.cpp
+++ b/source/libs/nodes/test/nodesTestMain.cpp
@@ -128,6 +128,86 @@ TEST(NodesTest, sort) {
   nodesDestroyList(l);
 }
 
+TEST(NodesTest, match) {
+  SNode* pOperator = NULL;
+  int32_t code = nodesMakeNode(QUERY_NODE_OPERATOR, (SNode**)&pOperator);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  SOperatorNode* pOp = (SOperatorNode*)pOperator;
+  SOperatorNode* pLeft = NULL;
+  ASSERT_EQ(TSDB_CODE_SUCCESS, nodesMakeNode(QUERY_NODE_OPERATOR, (SNode**)&pLeft));
+  ASSERT_EQ(TSDB_CODE_SUCCESS, nodesMakeNode(QUERY_NODE_VALUE, &pLeft->pLeft));
+  ((SValueNode*)(pLeft->pLeft))->literal = taosStrdup("10");
+  ASSERT_EQ(TSDB_CODE_SUCCESS, nodesMakeNode(QUERY_NODE_VALUE, &pLeft->pRight));
+  ((SValueNode*)(pLeft->pRight))->literal = taosStrdup("5");
+  pOp->pLeft = (SNode*)pLeft;
+  ASSERT_EQ(TSDB_CODE_SUCCESS, nodesMakeNode(QUERY_NODE_VALUE, &pOp->pRight));
+  ((SValueNode*)(pOp->pRight))->literal = taosStrdup("3");
+  pOp->opType = OP_TYPE_GREATER_THAN;
+
+  SNode* pOperatorClone = NULL;
+  code = nodesCloneNode(pOperator, &pOperatorClone);
+  ASSERT_TRUE(nodesMatchNode(pOperator, pOperatorClone));
+
+  SNode* pValue = NULL;
+  code = nodesMakeNode(QUERY_NODE_VALUE, (SNode**)&pValue);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ((SValueNode*)pValue)->literal = taosStrdup("10");
+  ASSERT_FALSE(nodesMatchNode(pOperator, pValue));
+
+  SNode* pValueClone = NULL;
+  code = nodesCloneNode(pValue, &pValueClone);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(nodesMatchNode(pValue, pValueClone));
+  nodesDestroyNode(pValue);
+  nodesDestroyNode(pValueClone);
+
+  SNode* pColumn = NULL, *pColumnClone = NULL;
+  code = nodesMakeNode(QUERY_NODE_COLUMN, &pColumn);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  strcpy(((SColumnNode*)pColumn)->colName, "column");
+  strcpy(((SColumnNode*)pColumn)->tableName, "table");
+  strcpy(((SColumnNode*)pColumn)->dbName, "db");
+  strcpy(((SColumnNode*)pColumn)->node.aliasName, "column");
+  ASSERT_FALSE(nodesMatchNode(pOperator, pColumn));
+  code = nodesCloneNode(pColumn, &pColumnClone);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(nodesMatchNode(pColumn, pColumnClone));
+  nodesDestroyNode(pColumn);
+  nodesDestroyNode(pColumnClone);
+
+  SNode* pFunction = NULL, *pFunctionClone = NULL;
+  code = nodesMakeNode(QUERY_NODE_FUNCTION, (SNode**)&pFunction);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ((SFunctionNode*)pFunction)->funcId = 1;
+  strcpy(((SFunctionNode*)pFunction)->functionName, "now");
+  ASSERT_FALSE(nodesMatchNode(pOperator, pFunction));
+  code = nodesCloneNode(pFunction, &pFunctionClone);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(nodesMatchNode(pFunction, pFunctionClone));
+  nodesDestroyNode(pFunctionClone);
+  nodesDestroyNode(pFunction);
+
+  SNode* pLogicCondition = NULL, *pLogicConditionClone = NULL;
+  code = nodesMakeNode(QUERY_NODE_LOGIC_CONDITION, (SNode**)&pLogicCondition);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ((SLogicConditionNode*)pLogicCondition)->condType = LOGIC_COND_TYPE_AND;
+  ((SLogicConditionNode*)pLogicCondition)->pParameterList = NULL;
+  code = nodesMakeList(&((SLogicConditionNode*)pLogicCondition)->pParameterList);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = nodesListAppend((SNodeList*)((SLogicConditionNode*)pLogicCondition)->pParameterList, pOperator);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = nodesListAppend(((SLogicConditionNode*)pLogicCondition)->pParameterList, pOperatorClone);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = nodesCloneNode(pLogicCondition, &pLogicConditionClone);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(nodesMatchNode(pLogicCondition, pLogicConditionClone));
+  ASSERT_FALSE(nodesMatchNode(pLogicCondition, pFunctionClone));
+  
+  nodesDestroyNode(pLogicCondition);
+  nodesDestroyNode(pLogicConditionClone);
+}
+
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
diff --git a/source/libs/parser/src/parInsertSml.c b/source/libs/parser/src/parInsertSml.c
index 22d1f7edda..676aed4464 100644
--- a/source/libs/parser/src/parInsertSml.c
+++ b/source/libs/parser/src/parInsertSml.c
@@ -20,40 +20,32 @@
 
 int32_t qCreateSName(SName* pName, const char* pTableName, int32_t acctId, char* dbName, char* msgBuf,
                      int32_t msgBufLen) {
-  SMsgBuf msg = {.buf = msgBuf, .len = msgBufLen};
-  SToken  sToken;
-  int32_t code = 0;
-  char*   tbName = NULL;
+  SMsgBuf    msg = {.buf = msgBuf, .len = msgBufLen};
+  SToken  sToken = {0};
+  int      code  = TSDB_CODE_SUCCESS;
+  int32_t  lino  = 0;
 
   NEXT_TOKEN(pTableName, sToken);
-
-  if (sToken.n == 0) {
-    return buildInvalidOperationMsg(&msg, "empty table name");
-  }
-
+  TSDB_CHECK_CONDITION(sToken.n != 0, code, lino, end, TSDB_CODE_TSC_INVALID_OPERATION);
   code = insCreateSName(pName, &sToken, acctId, dbName, &msg);
-  if (code) {
-    return code;
-  }
-
+  TSDB_CHECK_CODE(code, lino, end);
   NEXT_TOKEN(pTableName, sToken);
+  TSDB_CHECK_CONDITION(sToken.n <= 0, code, lino, end, TSDB_CODE_TSC_INVALID_OPERATION);
 
-  if (sToken.n > 0) {
-    return buildInvalidOperationMsg(&msg, "table name format is wrong");
+end:
+  if (code != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(code));
   }
-
   return TSDB_CODE_SUCCESS;
 }
 
 static int32_t smlBoundColumnData(SArray* cols, SBoundColInfo* pBoundInfo, SSchema* pSchema, bool isTag) {
+  int      code = TSDB_CODE_SUCCESS;
+  int32_t  lino = 0;
   bool* pUseCols = taosMemoryCalloc(pBoundInfo->numOfCols, sizeof(bool));
-  if (NULL == pUseCols) {
-    return terrno;
-  }
-
+  TSDB_CHECK_NULL(pUseCols, code, lino, end, terrno);
   pBoundInfo->numOfBound = 0;
   int16_t lastColIdx = -1;  // last column found
-  int32_t code = TSDB_CODE_SUCCESS;
 
   for (int i = 0; i < taosArrayGetSize(cols); ++i) {
     SSmlKv*  kv = taosArrayGet(cols, i);
@@ -65,16 +57,9 @@ static int32_t smlBoundColumnData(SArray* cols, SBoundColInfo* pBoundInfo, SSche
       index = insFindCol(&sToken, 0, t, pSchema);
     }
 
-    if (index < 0) {
-      uError("smlBoundColumnData. index:%d", index);
-      code = TSDB_CODE_SML_INVALID_DATA;
-      goto end;
-    }
-    if (pUseCols[index]) {
-      uError("smlBoundColumnData. already set. index:%d", index);
-      code = TSDB_CODE_SML_INVALID_DATA;
-      goto end;
-    }
+    TSDB_CHECK_CONDITION(index >= 0, code, lino, end, TSDB_CODE_SML_INVALID_DATA);
+    TSDB_CHECK_CONDITION(!pUseCols[index], code, lino, end, TSDB_CODE_SML_INVALID_DATA);
+
     lastColIdx = index;
     pUseCols[index] = true;
     pBoundInfo->pColIndex[pBoundInfo->numOfBound] = index;
@@ -82,11 +67,30 @@ static int32_t smlBoundColumnData(SArray* cols, SBoundColInfo* pBoundInfo, SSche
   }
 
 end:
+  if (code != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(code));
+  }
   taosMemoryFree(pUseCols);
-
   return code;
 }
 
+static int32_t smlMbsToUcs4(const char* mbs, size_t mbsLen, void** result, int32_t* resultLen, int32_t maxLen, void* charsetCxt){
+  int      code = TSDB_CODE_SUCCESS;
+  void*    pUcs4 = NULL;
+  int32_t  lino = 0;
+  pUcs4 = taosMemoryCalloc(1, maxLen);
+  TSDB_CHECK_NULL(pUcs4, code, lino, end, terrno);
+  TSDB_CHECK_CONDITION(taosMbsToUcs4(mbs, mbsLen, (TdUcs4*)pUcs4, maxLen, resultLen, charsetCxt), code, lino, end, terrno);
+  *result = pUcs4;
+  pUcs4 = NULL;
+
+end:
+  if (code != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(code));
+  }
+  taosMemoryFree(pUcs4);
+  return code;
+}
 /**
  * @brief No json tag for schemaless
  *
@@ -99,75 +103,39 @@ end:
  */
 static int32_t smlBuildTagRow(SArray* cols, SBoundColInfo* tags, SSchema* pSchema, STag** ppTag, SArray** tagName,
                               SMsgBuf* msg, void* charsetCxt) {
-  SArray* pTagArray = taosArrayInit(tags->numOfBound, sizeof(STagVal));
-  if (!pTagArray) {
-    return terrno;
-  }
+  int      code = TSDB_CODE_SUCCESS;
+  int32_t  lino = 0;
+  SArray*  pTagArray = taosArrayInit(tags->numOfBound, sizeof(STagVal));
+  TSDB_CHECK_NULL(pTagArray, code, lino, end, terrno);
   *tagName = taosArrayInit(8, TSDB_COL_NAME_LEN);
-  if (!*tagName) {
-    return terrno;
-  }
+  TSDB_CHECK_NULL(*tagName, code, lino, end, terrno);
 
-  int32_t code = TSDB_CODE_SUCCESS;
   for (int i = 0; i < tags->numOfBound; ++i) {
     SSchema* pTagSchema = &pSchema[tags->pColIndex[i]];
     SSmlKv*  kv = taosArrayGet(cols, i);
-    if (kv == NULL){
-      code = terrno;
-      uError("SML smlBuildTagRow error kv is null");
-      goto end;
-    }
-    if (kv->keyLen != strlen(pTagSchema->name) || memcmp(kv->key, pTagSchema->name, kv->keyLen) != 0 ||
-        kv->type != pTagSchema->type) {
-      code = TSDB_CODE_SML_INVALID_DATA;
-      uError("SML smlBuildTagRow error col not same %s", pTagSchema->name);
-      goto end;
-    }
-
-    if (taosArrayPush(*tagName, pTagSchema->name) == NULL){
-      code = terrno;
-      uError("SML smlBuildTagRow error push tag name");
-      goto end;
-    }
+    TSDB_CHECK_NULL(kv, code, lino, end, terrno);
+    bool cond = (kv->keyLen == strlen(pTagSchema->name) && memcmp(kv->key, pTagSchema->name, kv->keyLen) == 0 && kv->type == pTagSchema->type);
+    TSDB_CHECK_CONDITION(cond, code, lino, end, TSDB_CODE_SML_INVALID_DATA);
+    TSDB_CHECK_NULL(taosArrayPush(*tagName, pTagSchema->name), code, lino, end, terrno);
     STagVal val = {.cid = pTagSchema->colId, .type = pTagSchema->type};
-    //    strcpy(val.colName, pTagSchema->name);
     if (pTagSchema->type == TSDB_DATA_TYPE_BINARY || pTagSchema->type == TSDB_DATA_TYPE_VARBINARY ||
         pTagSchema->type == TSDB_DATA_TYPE_GEOMETRY) {
       val.pData = (uint8_t*)kv->value;
       val.nData = kv->length;
     } else if (pTagSchema->type == TSDB_DATA_TYPE_NCHAR) {
-      int32_t output = 0;
-      void*   p = taosMemoryCalloc(1, kv->length * TSDB_NCHAR_SIZE);
-      if (p == NULL) {
-        code = terrno;
-        goto end;
-      }
-      if (!taosMbsToUcs4(kv->value, kv->length, (TdUcs4*)(p), kv->length * TSDB_NCHAR_SIZE, &output, charsetCxt)) {
-        if (terrno == TAOS_SYSTEM_ERROR(E2BIG)) {
-          taosMemoryFree(p);
-          code = generateSyntaxErrMsg(msg, TSDB_CODE_PAR_VALUE_TOO_LONG, pTagSchema->name);
-          goto end;
-        }
-        char buf[512] = {0};
-        (void)snprintf(buf, tListLen(buf), " taosMbsToUcs4 error:%s", strerror(terrno));
-        taosMemoryFree(p);
-        code = buildSyntaxErrMsg(msg, buf, kv->value);
-        goto end;
-      }
-      val.pData = p;
-      val.nData = output;
+      code = smlMbsToUcs4(kv->value, kv->length, (void**)&val.pData, (int32_t*)&val.nData, kv->length * TSDB_NCHAR_SIZE, charsetCxt);
+      TSDB_CHECK_CODE(code, lino, end);
     } else {
       (void)memcpy(&val.i64, &(kv->value), kv->length);
     }
-    if (taosArrayPush(pTagArray, &val) == NULL){
-      code = terrno;
-      uError("SML smlBuildTagRow error push tag array");
-      goto end;
-    }
+    TSDB_CHECK_NULL(taosArrayPush(pTagArray, &val), code, lino, end, terrno);
   }
-
   code = tTagNew(pTagArray, 1, false, ppTag);
+
 end:
+  if (code != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(code));
+  }
   for (int i = 0; i < taosArrayGetSize(pTagArray); ++i) {
     STagVal* p = (STagVal*)taosArrayGet(pTagArray, i);
     if (p->type == TSDB_DATA_TYPE_NCHAR) {
@@ -179,18 +147,20 @@ end:
 }
 
 int32_t smlInitTableDataCtx(SQuery* query, STableMeta* pTableMeta, STableDataCxt** cxt) {
+  int      ret = TSDB_CODE_SUCCESS;
+  int32_t  lino = 0;
   SVCreateTbReq* pCreateTbReq = NULL;
-  int            ret = insGetTableDataCxt(((SVnodeModifyOpStmt*)(query->pRoot))->pTableBlockHashObj, &pTableMeta->uid,
+  ret = insGetTableDataCxt(((SVnodeModifyOpStmt*)(query->pRoot))->pTableBlockHashObj, &pTableMeta->uid,
                                           sizeof(pTableMeta->uid), pTableMeta, &pCreateTbReq, cxt, false, false);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return ret;
-  }
-
+  TSDB_CHECK_CODE(ret, lino, end);
   ret = initTableColSubmitData(*cxt);
-  if (ret != TSDB_CODE_SUCCESS) {
-    return ret;
+  TSDB_CHECK_CODE(ret, lino, end);
+
+end:
+  if (ret != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(ret));
   }
-  return TSDB_CODE_SUCCESS;
+  return ret;
 }
 
 void clearColValArraySml(SArray* pCols) {
@@ -207,78 +177,51 @@ void clearColValArraySml(SArray* pCols) {
 }
 
 int32_t smlBuildRow(STableDataCxt* pTableCxt) {
-  SRow** pRow = taosArrayReserve(pTableCxt->pData->aRowP, 1);
-  if (pRow == NULL){
-    return terrno;
-  }
-  int    ret = tRowBuild(pTableCxt->pValues, pTableCxt->pSchema, pRow);
-  if (TSDB_CODE_SUCCESS != ret) {
-    return ret;
-  }
+  int      ret = TSDB_CODE_SUCCESS;
+  int32_t  lino = 0;
+  SRow**   pRow = taosArrayReserve(pTableCxt->pData->aRowP, 1);
+  TSDB_CHECK_NULL(pRow, ret, lino, end, terrno);
+  ret = tRowBuild(pTableCxt->pValues, pTableCxt->pSchema, pRow);
+  TSDB_CHECK_CODE(ret, lino, end);
   SRowKey key;
   tRowGetKey(*pRow, &key);
   insCheckTableDataOrder(pTableCxt, &key);
-  return TSDB_CODE_SUCCESS;
+end:
+  if (ret != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(ret));
+  }
+  return ret;
 }
 
 int32_t smlBuildCol(STableDataCxt* pTableCxt, SSchema* schema, void* data, int32_t index, void* charsetCxt) {
   int      ret = TSDB_CODE_SUCCESS;
+  int32_t  lino = 0;
   SSchema* pColSchema = schema + index;
   SColVal* pVal = taosArrayGet(pTableCxt->pValues, index);
-  if (pVal == NULL) {
-    return TSDB_CODE_SUCCESS;
-  }
+  TSDB_CHECK_NULL(pVal, ret, lino, end, TSDB_CODE_SUCCESS);
   SSmlKv*  kv = (SSmlKv*)data;
   if (kv->keyLen != strlen(pColSchema->name) || memcmp(kv->key, pColSchema->name, kv->keyLen) != 0 ||
       kv->type != pColSchema->type) {
     ret = TSDB_CODE_SML_INVALID_DATA;
     char* tmp = taosMemoryCalloc(kv->keyLen + 1, 1);
-    if (tmp) {
-      (void)memcpy(tmp, kv->key, kv->keyLen);
-      uInfo("SML data(name:%s type:%s) is not same like the db data(name:%s type:%s)", tmp, tDataTypes[kv->type].name,
-            pColSchema->name, tDataTypes[pColSchema->type].name);
-      taosMemoryFree(tmp);
-    } else {
-      uError("SML smlBuildCol out of memory");
-      ret = terrno;
-    }
+    TSDB_CHECK_NULL(tmp, ret, lino, end, terrno);
+    (void)memcpy(tmp, kv->key, kv->keyLen);
+    uInfo("SML data(name:%s type:%s) is not same like the db data(name:%s type:%s)", tmp, tDataTypes[kv->type].name,
+          pColSchema->name, tDataTypes[pColSchema->type].name);
+    taosMemoryFree(tmp);
     goto end;
   }
   if (kv->type == TSDB_DATA_TYPE_NCHAR) {
-    int32_t len = 0;
-    int64_t size = pColSchema->bytes - VARSTR_HEADER_SIZE;
-    if (size <= 0) {
-      ret = TSDB_CODE_SML_INVALID_DATA;
-      goto end;
-    }
-    char* pUcs4 = taosMemoryCalloc(1, size);
-    if (NULL == pUcs4) {
-      ret = terrno;
-      goto end;
-    }
-    if (!taosMbsToUcs4(kv->value, kv->length, (TdUcs4*)pUcs4, size, &len, charsetCxt)) {
-      if (terrno == TAOS_SYSTEM_ERROR(E2BIG)) {
-        taosMemoryFree(pUcs4);
-        ret = TSDB_CODE_PAR_VALUE_TOO_LONG;
-        goto end;
-      }
-      taosMemoryFree(pUcs4);
-      ret = TSDB_CODE_TSC_INVALID_VALUE;
-      goto end;
-    }
-    pVal->value.pData = pUcs4;
-    pVal->value.nData = len;
+    ret = smlMbsToUcs4(kv->value, kv->length, (void**)&pVal->value.pData, &pVal->value.nData, pColSchema->bytes - VARSTR_HEADER_SIZE, charsetCxt);
+    TSDB_CHECK_CODE(ret, lino, end);
   } else if (kv->type == TSDB_DATA_TYPE_BINARY) {
     pVal->value.nData = kv->length;
     pVal->value.pData = (uint8_t*)kv->value;
   } else if (kv->type == TSDB_DATA_TYPE_GEOMETRY || kv->type == TSDB_DATA_TYPE_VARBINARY) {
     pVal->value.nData = kv->length;
     pVal->value.pData = taosMemoryMalloc(kv->length);
-    if (!pVal->value.pData) {
-      ret = terrno;
-      uError("SML smlBuildCol malloc failed %s:%d, err: %s", __func__, __LINE__, tstrerror(ret));
-      goto end;
-    }
+    TSDB_CHECK_NULL(pVal->value.pData, ret, lino, end, terrno);
+
     (void)memcpy(pVal->value.pData, (uint8_t*)kv->value, kv->length);
   } else {
     (void)memcpy(&pVal->value.val, &(kv->value), kv->length);
@@ -286,12 +229,17 @@ int32_t smlBuildCol(STableDataCxt* pTableCxt, SSchema* schema, void* data, int32
   pVal->flag = CV_FLAG_VALUE;
 
 end:
+  if (ret != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(ret));
+  }
   return ret;
 }
 
 int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSchema, SArray* cols,
                     STableMeta* pTableMeta, char* tableName, const char* sTableName, int32_t sTableNameLen, int32_t ttl,
                     char* msgBuf, int32_t msgBufLen, void* charsetCxt) {
+  int32_t lino = 0;
+  int32_t ret = 0;
   SMsgBuf pBuf = {.buf = msgBuf, .len = msgBufLen};
 
   SSchema*       pTagsSchema = getTableTagSchema(pTableMeta);
@@ -299,50 +247,32 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc
   SVCreateTbReq* pCreateTblReq = NULL;
   SArray*        tagName = NULL;
 
-  int ret = insInitBoundColsInfo(getNumOfTags(pTableMeta), &bindTags);
-  if (ret != TSDB_CODE_SUCCESS) {
-    ret = buildInvalidOperationMsg(&pBuf, "init bound cols error");
-    goto end;
-  }
+  ret = insInitBoundColsInfo(getNumOfTags(pTableMeta), &bindTags);
+  TSDB_CHECK_CODE(ret, lino, end);
 
   ret = smlBoundColumnData(tags, &bindTags, pTagsSchema, true);
-  if (ret != TSDB_CODE_SUCCESS) {
-    ret = buildInvalidOperationMsg(&pBuf, "bound tags error");
-    goto end;
-  }
+  TSDB_CHECK_CODE(ret, lino, end);
 
   STag* pTag = NULL;
-
   ret = smlBuildTagRow(tags, &bindTags, pTagsSchema, &pTag, &tagName, &pBuf, charsetCxt);
-  if (ret != TSDB_CODE_SUCCESS) {
-    goto end;
-  }
+  TSDB_CHECK_CODE(ret, lino, end);
 
   pCreateTblReq = taosMemoryCalloc(1, sizeof(SVCreateTbReq));
-  if (NULL == pCreateTblReq) {
-    ret = terrno;
-    goto end;
-  }
+  TSDB_CHECK_NULL(pCreateTblReq, ret, lino, end, terrno);
+
   ret = insBuildCreateTbReq(pCreateTblReq, tableName, pTag, pTableMeta->suid, NULL, tagName,
                             pTableMeta->tableInfo.numOfTags, ttl);
-  if (TSDB_CODE_SUCCESS != ret) {
-    goto end;
-  }
+  TSDB_CHECK_CODE(ret, lino, end);
 
   pCreateTblReq->ctb.stbName = taosMemoryCalloc(1, sTableNameLen + 1);
-  if (pCreateTblReq->ctb.stbName == NULL){
-    ret = terrno;
-    goto end;
-  }
+  TSDB_CHECK_NULL(pCreateTblReq->ctb.stbName, ret, lino, end, terrno);
+
   (void)memcpy(pCreateTblReq->ctb.stbName, sTableName, sTableNameLen);
 
   if (dataFormat) {
     STableDataCxt** pTableCxt = (STableDataCxt**)taosHashGet(((SVnodeModifyOpStmt*)(query->pRoot))->pTableBlockHashObj,
                                                              &pTableMeta->uid, sizeof(pTableMeta->uid));
-    if (NULL == pTableCxt) {
-      ret = buildInvalidOperationMsg(&pBuf, "dataformat true. get tableDataCtx error");
-      goto end;
-    }
+    TSDB_CHECK_NULL(pTableCxt, ret, lino, end, TSDB_CODE_TSC_INVALID_OPERATION);
     (*pTableCxt)->pData->flags |= SUBMIT_REQ_AUTO_CREATE_TABLE;
     (*pTableCxt)->pData->pCreateTbReq = pCreateTblReq;
     (*pTableCxt)->pMeta->uid = pTableMeta->uid;
@@ -354,86 +284,47 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc
   STableDataCxt* pTableCxt = NULL;
   ret = insGetTableDataCxt(((SVnodeModifyOpStmt*)(query->pRoot))->pTableBlockHashObj, &pTableMeta->uid,
                            sizeof(pTableMeta->uid), pTableMeta, &pCreateTblReq, &pTableCxt, false, false);
-  if (ret != TSDB_CODE_SUCCESS) {
-    ret = buildInvalidOperationMsg(&pBuf, "insGetTableDataCxt error");
-    goto end;
-  }
+  TSDB_CHECK_CODE(ret, lino, end);
 
   SSchema* pSchema = getTableColumnSchema(pTableMeta);
   ret = smlBoundColumnData(colsSchema, &pTableCxt->boundColsInfo, pSchema, false);
-  if (ret != TSDB_CODE_SUCCESS) {
-    ret = buildInvalidOperationMsg(&pBuf, "bound cols error");
-    goto end;
-  }
+  TSDB_CHECK_CODE(ret, lino, end);
 
   ret = initTableColSubmitData(pTableCxt);
-  if (ret != TSDB_CODE_SUCCESS) {
-    ret = buildInvalidOperationMsg(&pBuf, "initTableColSubmitData error");
-    goto end;
-  }
+  TSDB_CHECK_CODE(ret, lino, end);
 
   int32_t rowNum = taosArrayGetSize(cols);
-  if (rowNum <= 0) {
-    ret = buildInvalidOperationMsg(&pBuf, "cols size <= 0");
-    goto end;
-  }
+  TSDB_CHECK_CONDITION(rowNum > 0, ret, lino, end, TSDB_CODE_TSC_INVALID_OPERATION);
 
   for (int32_t r = 0; r < rowNum; ++r) {
     void* rowData = taosArrayGetP(cols, r);
-    if (rowData == NULL) {
-      ret = terrno;
-      goto end;
-    }
+    TSDB_CHECK_NULL(rowData, ret, lino, end, terrno);
+
     // 1. set the parsed value from sql string
     for (int c = 0; c < pTableCxt->boundColsInfo.numOfBound; ++c) {
       SSchema* pColSchema = &pSchema[pTableCxt->boundColsInfo.pColIndex[c]];
       SColVal* pVal = taosArrayGet(pTableCxt->pValues, pTableCxt->boundColsInfo.pColIndex[c]);
-      if (pVal == NULL) {
-        ret = terrno;
-        goto end;
-      }
+      TSDB_CHECK_NULL(pVal, ret, lino, end, terrno);
       void**   p = taosHashGet(rowData, pColSchema->name, strlen(pColSchema->name));
       if (p == NULL) {
         continue;
       }
       SSmlKv* kv = *(SSmlKv**)p;
-      if (kv->type != pColSchema->type) {
-        ret = buildInvalidOperationMsg(&pBuf, "kv type not equal to col type");
-        goto end;
-      }
+      TSDB_CHECK_CONDITION(kv->type == pColSchema->type, ret, lino, end, TSDB_CODE_TSC_INVALID_OPERATION);
+
       if (pColSchema->type == TSDB_DATA_TYPE_TIMESTAMP) {
         kv->i = convertTimePrecision(kv->i, TSDB_TIME_PRECISION_NANO, pTableMeta->tableInfo.precision);
       }
       if (kv->type == TSDB_DATA_TYPE_NCHAR) {
-        int32_t len = 0;
-        char*   pUcs4 = taosMemoryCalloc(1, pColSchema->bytes - VARSTR_HEADER_SIZE);
-        if (NULL == pUcs4) {
-          ret = terrno;
-          goto end;
-        }
-        if (!taosMbsToUcs4(kv->value, kv->length, (TdUcs4*)pUcs4, pColSchema->bytes - VARSTR_HEADER_SIZE, &len, charsetCxt)) {
-          if (terrno == TAOS_SYSTEM_ERROR(E2BIG)) {
-            uError("sml bind taosMbsToUcs4 error, kv length:%d, bytes:%d, kv->value:%s", (int)kv->length,
-                   pColSchema->bytes, kv->value);
-            (void)buildInvalidOperationMsg(&pBuf, "value too long");
-            ret = TSDB_CODE_PAR_VALUE_TOO_LONG;
-            goto end;
-          }
-          ret = buildInvalidOperationMsg(&pBuf, strerror(terrno));
-          goto end;
-        }
-        pVal->value.pData = pUcs4;
-        pVal->value.nData = len;
+        ret = smlMbsToUcs4(kv->value, kv->length, (void**)&pVal->value.pData, (int32_t*)&pVal->value.nData, pColSchema->bytes - VARSTR_HEADER_SIZE, charsetCxt);
+        TSDB_CHECK_CODE(ret, lino, end);
       } else if (kv->type == TSDB_DATA_TYPE_BINARY) {
         pVal->value.nData = kv->length;
         pVal->value.pData = (uint8_t*)kv->value;
       } else if (kv->type == TSDB_DATA_TYPE_GEOMETRY || kv->type == TSDB_DATA_TYPE_VARBINARY) {
         pVal->value.nData = kv->length;
         pVal->value.pData = taosMemoryMalloc(kv->length);
-        if (NULL == pVal->value.pData) {
-          ret = terrno;
-          goto end;
-        }
+        TSDB_CHECK_NULL(pVal->value.pData, ret, lino, end, terrno);
         (void)memcpy(pVal->value.pData, (uint8_t*)kv->value, kv->length);
       } else {
         (void)memcpy(&pVal->value.val, &(kv->value), kv->length);
@@ -442,22 +333,20 @@ int32_t smlBindData(SQuery* query, bool dataFormat, SArray* tags, SArray* colsSc
     }
 
     SRow** pRow = taosArrayReserve(pTableCxt->pData->aRowP, 1);
-    if (NULL == pRow) {
-      ret = terrno;
-      goto end;
-    }
+    TSDB_CHECK_NULL(pRow, ret, lino, end, terrno);
     ret = tRowBuild(pTableCxt->pValues, pTableCxt->pSchema, pRow);
-    if (TSDB_CODE_SUCCESS != ret) {
-      ret = buildInvalidOperationMsg(&pBuf, "tRowBuild error");
-      goto end;
-    }
-    SRowKey key;
+    TSDB_CHECK_CODE(ret, lino, end);
+    SRowKey key = {0};
     tRowGetKey(*pRow, &key);
     insCheckTableDataOrder(pTableCxt, &key);
     clearColValArraySml(pTableCxt->pValues);
   }
 
 end:
+  if (ret != 0){
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(ret));
+    ret = buildInvalidOperationMsg(&pBuf, tstrerror(ret));
+  }
   insDestroyBoundColInfo(&bindTags);
   tdDestroySVCreateTbReq(pCreateTblReq);
   taosMemoryFree(pCreateTblReq);
@@ -466,29 +355,22 @@ end:
 }
 
 int32_t smlInitHandle(SQuery** query) {
-  *query = NULL;
+  int32_t lino = 0;
+  int32_t code = 0;
   SQuery* pQuery = NULL;
   SVnodeModifyOpStmt* stmt = NULL;
+  TSDB_CHECK_NULL(query, code, lino, end, TSDB_CODE_INVALID_PARA);
 
-  int32_t code = nodesMakeNode(QUERY_NODE_QUERY, (SNode**)&pQuery);
-  if (code != 0) {
-    uError("SML create pQuery error");
-    goto END;
-  }
+  *query = NULL;
+  code = nodesMakeNode(QUERY_NODE_QUERY, (SNode**)&pQuery);
+  TSDB_CHECK_CODE(code, lino, end);
   pQuery->execMode = QUERY_EXEC_MODE_SCHEDULE;
   pQuery->haveResultSet = false;
   pQuery->msgType = TDMT_VND_SUBMIT;
   code = nodesMakeNode(QUERY_NODE_VNODE_MODIFY_STMT, (SNode**)&stmt);
-  if (code != 0) {
-    uError("SML create SVnodeModifyOpStmt error");
-    goto END;
-  }
+  TSDB_CHECK_CODE(code, lino, end);
   stmt->pTableBlockHashObj = taosHashInit(16, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK);
-  if (stmt->pTableBlockHashObj == NULL){
-    uError("SML create pTableBlockHashObj error");
-    code = terrno;
-    goto END;
-  }
+  TSDB_CHECK_NULL(stmt->pTableBlockHashObj, code, lino, end, terrno);
   stmt->freeHashFunc = insDestroyTableDataCxtHashMap;
   stmt->freeArrayFunc = insDestroyVgroupDataCxtList;
 
@@ -496,24 +378,28 @@ int32_t smlInitHandle(SQuery** query) {
   *query = pQuery;
   return code;
 
-END:
+end:
+  if (code != 0) {
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(code));
+  }
   nodesDestroyNode((SNode*)stmt);
   qDestroyQuery(pQuery);
   return code;
 }
 
 int32_t smlBuildOutput(SQuery* handle, SHashObj* pVgHash) {
+  int32_t lino = 0;
+  int32_t code = 0;
+
   SVnodeModifyOpStmt* pStmt = (SVnodeModifyOpStmt*)(handle)->pRoot;
-  // merge according to vgId
-  int32_t code = insMergeTableDataCxt(pStmt->pTableBlockHashObj, &pStmt->pVgDataBlocks, true);
-  if (code != TSDB_CODE_SUCCESS) {
-    uError("insMergeTableDataCxt failed");
-    return code;
-  }
+  code = insMergeTableDataCxt(pStmt->pTableBlockHashObj, &pStmt->pVgDataBlocks, true);
+  TSDB_CHECK_CODE(code, lino, end);
   code = insBuildVgDataBlocks(pVgHash, pStmt->pVgDataBlocks, &pStmt->pDataBlocks, false);
-  if (code != TSDB_CODE_SUCCESS) {
-    uError("insBuildVgDataBlocks failed");
-    return code;
+  TSDB_CHECK_CODE(code, lino, end);
+
+end:
+  if (code != 0) {
+    uError("%s failed at %d since %s", __func__, lino, tstrerror(code));
   }
   return code;
 }
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 11cf926081..7085c8dc7c 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -6060,11 +6060,22 @@ static int32_t stbJoinOptCreateTagScanNode(SLogicNode* pJoin, SNodeList** ppList
   }
 
   SNode* pNode = NULL;
+  SName* pPrev = NULL;
   FOREACH(pNode, pList) {
     code = stbJoinOptRewriteToTagScan(pJoin, pNode);
     if (code) {
       break;
     }
+
+    SScanLogicNode* pScan = (SScanLogicNode*)pNode;
+    if (pScan->pVgroupList && 1 == pScan->pVgroupList->numOfVgroups) {
+      if (NULL == pPrev || 0 == strcmp(pPrev->dbname, pScan->tableName.dbname)) {
+        pPrev = &pScan->tableName;
+        continue;
+      }
+
+      pScan->needSplit = true;
+    }
   }
 
   if (TSDB_CODE_SUCCESS == code) {
@@ -6156,6 +6167,7 @@ static int32_t stbJoinOptCreateTableScanNodes(SLogicNode* pJoin, SNodeList** ppL
   }
 
   int32_t i = 0;
+  SName* pPrev = NULL;
   SNode*  pNode = NULL;
   FOREACH(pNode, pList) {
     SScanLogicNode* pScan = (SScanLogicNode*)pNode;
@@ -6173,6 +6185,16 @@ static int32_t stbJoinOptCreateTableScanNodes(SLogicNode* pJoin, SNodeList** ppL
     *(srcScan + i++) = pScan->pVgroupList->numOfVgroups <= 1;
 
     pScan->scanType = SCAN_TYPE_TABLE;
+
+    if (pScan->pVgroupList && 1 == pScan->pVgroupList->numOfVgroups) {
+      if (NULL == pPrev || 0 == strcmp(pPrev->dbname, pScan->tableName.dbname)) {
+        pPrev = &pScan->tableName;
+        continue;
+      }
+
+      pScan->needSplit = true;
+      *(srcScan + i - 1) = false;
+    }
   }
 
   *ppList = pList;
diff --git a/source/libs/planner/src/planValidator.c b/source/libs/planner/src/planValidator.c
index 6b7b46cfa7..a3b09dff22 100755
--- a/source/libs/planner/src/planValidator.c
+++ b/source/libs/planner/src/planValidator.c
@@ -55,16 +55,10 @@ int32_t validateQueryPlanNode(SValidatePlanContext* pCxt, SQueryPlan* pPlan) {
     SNode* pSubNode = NULL;
     SNodeListNode* pSubplans = (SNodeListNode*)pNode;
     FOREACH(pSubNode, pSubplans->pNodeList) {
-      if (QUERY_NODE_PHYSICAL_SUBPLAN != nodeType(pNode)) {
-        code = TSDB_CODE_PLAN_INTERNAL_ERROR;
-        break;
-      }
-      
       code = doValidatePhysiNode(pCxt, pSubNode);
-      if (code) {
-        break;
-      }
+      if (code) break;
     }
+    if (code) break;
   }
 
   return code;
@@ -142,24 +136,7 @@ int32_t validateQueryPlan(SPlanContext* pCxt, SQueryPlan* pPlan) {
 
   int32_t code = TSDB_CODE_SUCCESS;
   SNode* pNode = NULL;
-  FOREACH(pNode, pPlan->pSubplans) {
-    if (QUERY_NODE_NODE_LIST != nodeType(pNode)) {
-      code = TSDB_CODE_PLAN_INTERNAL_ERROR;
-      break;
-    }
-
-    SNode* pSubNode = NULL;
-    SNodeListNode* pSubplans = (SNodeListNode*)pNode;
-    FOREACH(pSubNode, pSubplans->pNodeList) {
-      code = doValidatePhysiNode(&cxt, pSubNode);
-      if (code) {
-        break;
-      }
-    }
-    if (code) {
-      break;
-    }
-  }
+  code = validateQueryPlanNode(&cxt, pPlan);
 
   destoryValidatePlanContext(&cxt);
   return code;
diff --git a/source/libs/planner/src/planner.c b/source/libs/planner/src/planner.c
index c3aa95f5b7..ee460e2610 100644
--- a/source/libs/planner/src/planner.c
+++ b/source/libs/planner/src/planner.c
@@ -161,6 +161,10 @@ int32_t qSubPlanToString(const SSubplan* pSubplan, char** pStr, int32_t* pLen) {
 int32_t qStringToSubplan(const char* pStr, SSubplan** pSubplan) { return nodesStringToNode(pStr, (SNode**)pSubplan); }
 
 int32_t qSubPlanToMsg(const SSubplan* pSubplan, char** pStr, int32_t* pLen) {
+  if (NULL == pSubplan) {
+    return terrno = TSDB_CODE_INVALID_PARA;
+  }
+  
   if (SUBPLAN_TYPE_MODIFY == pSubplan->subplanType && NULL == pSubplan->pNode) {
     SDataInserterNode* insert = (SDataInserterNode*)pSubplan->pDataSink;
     *pLen = insert->size;
diff --git a/source/libs/qcom/src/queryUtil.c b/source/libs/qcom/src/queryUtil.c
index 690d38aac0..6d637bee98 100644
--- a/source/libs/qcom/src/queryUtil.c
+++ b/source/libs/qcom/src/queryUtil.c
@@ -137,6 +137,8 @@ static void processTaskQueue(SQueueInfo *pInfo, SSchedMsg *pSchedMsg) {
 }
 
 int32_t initTaskQueue() {
+  memset(&taskQueue, 0, sizeof(taskQueue));
+  
   taskQueue.wrokrerPool.name = "taskWorkPool";
   taskQueue.wrokrerPool.min = tsNumOfTaskQueueThreads;
   taskQueue.wrokrerPool.max = tsNumOfTaskQueueThreads;
diff --git a/source/libs/qworker/inc/qwInt.h b/source/libs/qworker/inc/qwInt.h
index 65f7cd772f..6474a1ab30 100644
--- a/source/libs/qworker/inc/qwInt.h
+++ b/source/libs/qworker/inc/qwInt.h
@@ -477,6 +477,8 @@ extern SQueryMgmt gQueryMgmt;
     }                                                                                              \
   } while (0)
 
+
+#if 0
 #define QW_UNLOCK(type, _lock)                                                                      \
   do {                                                                                              \
     if (QW_READ == (type)) {                                                                        \
@@ -505,6 +507,16 @@ extern SQueryMgmt gQueryMgmt;
       }                                                                                             \
     }                                                                                               \
   } while (0)
+#else 
+#define QW_UNLOCK(type, _lock)                                                                      \
+  do {                                                                                              \
+    if (QW_READ == (type)) {                                                                        \
+      taosRUnLockLatch(_lock);                                                                      \
+    } else {                                                                                        \
+      taosWUnLockLatch(_lock);                                                                      \
+    }                                                                                               \
+  } while (0)
+#endif
 
 extern SQWorkerMgmt gQwMgmt;
 
diff --git a/source/libs/qworker/src/qwMem.c b/source/libs/qworker/src/qwMem.c
index 69d4093221..6451e073c8 100644
--- a/source/libs/qworker/src/qwMem.c
+++ b/source/libs/qworker/src/qwMem.c
@@ -1,6 +1,7 @@
 #include "qwInt.h"
 #include "qworker.h"
 
+#if 0
 void qwSetConcurrentTaskNumCb(int32_t taskNum) {
   int32_t finTaskNum = TMIN(taskNum, tsNumOfQueryThreads * QW_DEFAULT_THREAD_TASK_NUM);
   
@@ -33,6 +34,7 @@ void qwIncConcurrentTaskNumCb(void) {
 
   //TODO
 }
+#endif
 
 int32_t qwInitJobInfo(QW_FPARAMS_DEF, SQWJobInfo* pJob) {
   pJob->pSessions= taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 1da9a8f123..ce431c0b18 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -2985,279 +2985,93 @@ static int32_t doScalarFunction2(SScalarParam *pInput, int32_t inputNum, SScalar
   bool hasNullType = (IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[0])) || IS_NULL_TYPE(GET_PARAM_TYPE(&pInput[1])));
 
   int32_t numOfRows = TMAX(pInput[0].numOfRows, pInput[1].numOfRows);
-  if (pInput[0].numOfRows == pInput[1].numOfRows) {
-    for (int32_t i = 0; i < numOfRows; ++i) {
-      if (colDataIsNull_s(pInputData[0], i) || colDataIsNull_s(pInputData[1], i) || hasNullType) {
-        colDataSetNULL(pOutputData, i);
-        continue;
-      }
-      double in2;
-      GET_TYPED_DATA(in2, double, GET_PARAM_TYPE(&pInput[1]), colDataGetData(pInputData[1], i));
-      switch (GET_PARAM_TYPE(&pInput[0])) {
-        case TSDB_DATA_TYPE_DOUBLE: {
-          double  *in = (double *)pInputData[0]->pData;
-          double  *out = (double *)pOutputData->pData;
-          double  result = d1(in[i], in2);
-          if (isinf(result) || isnan(result)) {
-            colDataSetNULL(pOutputData, i);
-          } else {
-            out[i] = result;
-          }
-          break;
-        }
-        case TSDB_DATA_TYPE_FLOAT: {
-          float   *in = (float *)pInputData[0]->pData;
-          float   *out = (float *)pOutputData->pData;
-          float   result = f1(in[i], (float)in2);
-          if (isinf(result) || isnan(result)) {
-            colDataSetNULL(pOutputData, i);
-          } else {
-            out[i] = result;
-          }
-          break;
-        }
-        case TSDB_DATA_TYPE_TINYINT: {
-          int8_t *in = (int8_t *)pInputData[0]->pData;
-          int8_t *out = (int8_t *)pOutputData->pData;
-          int8_t result = (int8_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_SMALLINT: {
-          int16_t *in = (int16_t *)pInputData[0]->pData;
-          int16_t *out = (int16_t *)pOutputData->pData;
-          int16_t result = (int16_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_INT: {
-          int32_t *in = (int32_t *)pInputData[0]->pData;
-          int32_t *out = (int32_t *)pOutputData->pData;
-          int32_t result = (int32_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_BIGINT: {
-          int64_t *in = (int64_t *)pInputData[0]->pData;
-          int64_t *out = (int64_t *)pOutputData->pData;
-          int64_t result = (int64_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_UTINYINT: {
-          uint8_t *in = (uint8_t *)pInputData[0]->pData;
-          uint8_t *out = (uint8_t *)pOutputData->pData;
-          uint8_t result = (uint8_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_USMALLINT: {
-          uint16_t *in = (uint16_t *)pInputData[0]->pData;
-          uint16_t *out = (uint16_t *)pOutputData->pData;
-          uint16_t result = (uint16_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_UINT: {
-          uint32_t *in = (uint32_t *)pInputData[0]->pData;
-          uint32_t *out = (uint32_t *)pOutputData->pData;
-          uint32_t result = (uint32_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-        case TSDB_DATA_TYPE_UBIGINT: {
-          uint64_t *in = (uint64_t *)pInputData[0]->pData;
-          uint64_t *out = (uint64_t *)pOutputData->pData;
-          uint64_t result = (uint64_t)d1((double)in[i], in2);
-          out[i] = result;
-          break;
-        }
-      }
+  for (int32_t i = 0; i < numOfRows; ++i) {
+    int32_t colIdx1 = (pInput[0].numOfRows == 1) ? 0 : i;
+    int32_t colIdx2 = (pInput[1].numOfRows == 1) ? 0 : i;
+    if (colDataIsNull_s(pInputData[0], colIdx1) || colDataIsNull_s(pInputData[1], colIdx2) || hasNullType) {
+      colDataSetNULL(pOutputData, i);
+      continue;
     }
-  } else if (pInput[0].numOfRows == 1) {  // left operand is constant
-    if (colDataIsNull_s(pInputData[0], 0) || hasNullType) {
-      colDataSetNNULL(pOutputData, 0, pInput[1].numOfRows);
-    } else {
-      for (int32_t i = 0; i < numOfRows; ++i) {
-        if (colDataIsNull_s(pInputData[1], i)) {
+    double in2;
+    GET_TYPED_DATA(in2, double, GET_PARAM_TYPE(&pInput[1]), colDataGetData(pInputData[1], colIdx2));
+    switch (GET_PARAM_TYPE(&pInput[0])) {
+      case TSDB_DATA_TYPE_DOUBLE: {
+        double  *in = (double *)pInputData[0]->pData;
+        double  *out = (double *)pOutputData->pData;
+        double  result = d1(in[colIdx1], in2);
+        if (isinf(result) || isnan(result)) {
           colDataSetNULL(pOutputData, i);
-          continue;
-        }
-        double in2;
-        GET_TYPED_DATA(in2, double, GET_PARAM_TYPE(&pInput[1]), colDataGetData(pInputData[1], i));
-        switch (GET_PARAM_TYPE(&pInput[0])) {
-          case TSDB_DATA_TYPE_DOUBLE: {
-            double   *in = (double *)pInputData[0]->pData;
-            double   *out = (double *)pOutputData->pData;
-            double   result = d1(in[0], in2);
-            if (isinf(result) || isnan(result)) {
-              colDataSetNULL(pOutputData, i);
-            } else {
-              out[i] = result;
-            }
-            break;
-          }
-          case TSDB_DATA_TYPE_FLOAT: {
-            float   *in = (float *)pInputData[0]->pData;
-            float   *out = (float *)pOutputData->pData;
-            float   result = f1(in[0], (float)in2);
-            if (isinf(result) || isnan(result)) {
-              colDataSetNULL(pOutputData, i);
-            } else {
-              out[i] = result;
-            }
-            break;
-          }
-          case TSDB_DATA_TYPE_TINYINT: {
-            int8_t *in = (int8_t *)pInputData[0]->pData;
-            int8_t *out = (int8_t *)pOutputData->pData;
-            int8_t result = (int8_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_SMALLINT: {
-            int16_t *in = (int16_t *)pInputData[0]->pData;
-            int16_t *out = (int16_t *)pOutputData->pData;
-            int16_t result = (int16_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_INT: {
-            int32_t *in = (int32_t *)pInputData[0]->pData;
-            int32_t *out = (int32_t *)pOutputData->pData;
-            int32_t result = (int32_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_BIGINT: {
-            int64_t *in = (int64_t *)pInputData[0]->pData;
-            int64_t *out = (int64_t *)pOutputData->pData;
-            int64_t result = (int64_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_UTINYINT: {
-            uint8_t *in = (uint8_t *)pInputData[0]->pData;
-            uint8_t *out = (uint8_t *)pOutputData->pData;
-            uint8_t result = (uint8_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_USMALLINT: {
-            uint16_t *in = (uint16_t *)pInputData[0]->pData;
-            uint16_t *out = (uint16_t *)pOutputData->pData;
-            uint16_t result = (uint16_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_UINT: {
-            uint32_t *in = (uint32_t *)pInputData[0]->pData;
-            uint32_t *out = (uint32_t *)pOutputData->pData;
-            uint32_t result = (uint32_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_UBIGINT: {
-            uint64_t *in = (uint64_t *)pInputData[0]->pData;
-            uint64_t *out = (uint64_t *)pOutputData->pData;
-            uint64_t result = (uint64_t)d1((double)in[0], in2);
-            out[i] = result;
-            break;
-          }
+        } else {
+          out[i] = result;
         }
+        break;
       }
-    }
-  } else if (pInput[1].numOfRows == 1) {
-    if (colDataIsNull_s(pInputData[1], 0) || hasNullType) {
-      colDataSetNNULL(pOutputData, 0, pInput[0].numOfRows);
-    } else {
-      for (int32_t i = 0; i < numOfRows; ++i) {
-        if (colDataIsNull_s(pInputData[0], i)) {
+      case TSDB_DATA_TYPE_FLOAT: {
+        float   *in = (float *)pInputData[0]->pData;
+        float   *out = (float *)pOutputData->pData;
+        float   result = f1(in[colIdx1], (float)in2);
+        if (isinf(result) || isnan(result)) {
           colDataSetNULL(pOutputData, i);
-          continue;
-        }
-        double in2;
-        GET_TYPED_DATA(in2, double, GET_PARAM_TYPE(&pInput[1]), colDataGetData(pInputData[1], 0));
-        switch (GET_PARAM_TYPE(&pInput[0])) {
-          case TSDB_DATA_TYPE_DOUBLE: {
-            double   *in = (double *)pInputData[0]->pData;
-            double   *out = (double *)pOutputData->pData;
-            double   result = d1(in[i], in2);
-            if (isinf(result) || isnan(result)) {
-              colDataSetNULL(pOutputData, i);
-            } else {
-              out[i] = result;
-            }
-            break;
-          }
-          case TSDB_DATA_TYPE_FLOAT: {
-            float   *in = (float *)pInputData[0]->pData;
-            float   *out = (float *)pOutputData->pData;
-            float   result = f1(in[i], in2);
-            if (isinf(result) || isnan(result)) {
-              colDataSetNULL(pOutputData, i);
-            } else {
-              out[i] = result;
-            }
-            break;
-          }
-          case TSDB_DATA_TYPE_TINYINT: {
-            int8_t *in = (int8_t *)pInputData[0]->pData;
-            int8_t *out = (int8_t *)pOutputData->pData;
-            int8_t result = (int8_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_SMALLINT: {
-            int16_t *in = (int16_t *)pInputData[0]->pData;
-            int16_t *out = (int16_t *)pOutputData->pData;
-            int16_t result = (int16_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_INT: {
-            int32_t *in = (int32_t *)pInputData[0]->pData;
-            int32_t *out = (int32_t *)pOutputData->pData;
-            int32_t result = (int32_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_BIGINT: {
-            int64_t *in = (int64_t *)pInputData[0]->pData;
-            int64_t *out = (int64_t *)pOutputData->pData;
-            int64_t result = (int64_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_UTINYINT: {
-            uint8_t *in = (uint8_t *)pInputData[0]->pData;
-            uint8_t *out = (uint8_t *)pOutputData->pData;
-            uint8_t result = (uint8_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_USMALLINT: {
-            uint16_t *in = (uint16_t *)pInputData[0]->pData;
-            uint16_t *out = (uint16_t *)pOutputData->pData;
-            uint16_t result = (uint16_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_UINT: {
-            uint32_t *in = (uint32_t *)pInputData[0]->pData;
-            uint32_t *out = (uint32_t *)pOutputData->pData;
-            uint32_t result = (uint32_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
-          case TSDB_DATA_TYPE_UBIGINT: {
-            uint64_t *in = (uint64_t *)pInputData[0]->pData;
-            uint64_t *out = (uint64_t *)pOutputData->pData;
-            uint64_t result = (uint64_t)d1((double)in[i], in2);
-            out[i] = result;
-            break;
-          }
+        } else {
+          out[i] = result;
         }
+        break;
+      }
+      case TSDB_DATA_TYPE_TINYINT: {
+        int8_t *in = (int8_t *)pInputData[0]->pData;
+        int8_t *out = (int8_t *)pOutputData->pData;
+        int8_t result = (int8_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_SMALLINT: {
+        int16_t *in = (int16_t *)pInputData[0]->pData;
+        int16_t *out = (int16_t *)pOutputData->pData;
+        int16_t result = (int16_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_INT: {
+        int32_t *in = (int32_t *)pInputData[0]->pData;
+        int32_t *out = (int32_t *)pOutputData->pData;
+        int32_t result = (int32_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_BIGINT: {
+        int64_t *in = (int64_t *)pInputData[0]->pData;
+        int64_t *out = (int64_t *)pOutputData->pData;
+        int64_t result = (int64_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_UTINYINT: {
+        uint8_t *in = (uint8_t *)pInputData[0]->pData;
+        uint8_t *out = (uint8_t *)pOutputData->pData;
+        uint8_t result = (uint8_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_USMALLINT: {
+        uint16_t *in = (uint16_t *)pInputData[0]->pData;
+        uint16_t *out = (uint16_t *)pOutputData->pData;
+        uint16_t result = (uint16_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_UINT: {
+        uint32_t *in = (uint32_t *)pInputData[0]->pData;
+        uint32_t *out = (uint32_t *)pOutputData->pData;
+        uint32_t result = (uint32_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
+      }
+      case TSDB_DATA_TYPE_UBIGINT: {
+        uint64_t *in = (uint64_t *)pInputData[0]->pData;
+        uint64_t *out = (uint64_t *)pOutputData->pData;
+        uint64_t result = (uint64_t)d1((double)in[colIdx1], in2);
+        out[i] = result;
+        break;
       }
     }
   }
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index 5b432535fd..14dae1226d 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -121,19 +121,6 @@ _return:
   SCL_RET(code);
 }
 
-int32_t convertBinaryToDouble(const void *inData, void *outData) {
-  char *tmp = taosMemoryCalloc(1, varDataTLen(inData));
-  if (tmp == NULL) {
-    *((double *)outData) = 0.;
-    SCL_ERR_RET(terrno);
-  }
-  (void)memcpy(tmp, varDataVal(inData), varDataLen(inData));
-  double ret = taosStr2Double(tmp, NULL);
-  taosMemoryFree(tmp);
-  *((double *)outData) = ret;
-  SCL_RET(TSDB_CODE_SUCCESS);
-}
-
 typedef int32_t (*_getBigintValue_fn_t)(void *src, int32_t index, int64_t *res);
 
 int32_t getVectorBigintValue_TINYINT(void *src, int32_t index, int64_t *res) {
@@ -1129,17 +1116,11 @@ int32_t vectorConvertCols(SScalarParam *pLeft, SScalarParam *pRight, SScalarPara
   }
 
   if (type != GET_PARAM_TYPE(param1)) {
-    code = vectorConvertSingleCol(param1, paramOut1, type, startIndex, numOfRows);
-    if (code) {
-      return code;
-    }
+    SCL_ERR_RET(vectorConvertSingleCol(param1, paramOut1, type, startIndex, numOfRows));
   }
 
   if (type != GET_PARAM_TYPE(param2)) {
-    code = vectorConvertSingleCol(param2, paramOut2, type, startIndex, numOfRows);
-    if (code) {
-      return code;
-    }
+    SCL_ERR_RET(vectorConvertSingleCol(param2, paramOut2, type, startIndex, numOfRows));
   }
 
   return TSDB_CODE_SUCCESS;
@@ -1208,22 +1189,16 @@ static int32_t vectorMathTsAddHelper(SColumnInfoData *pLeftCol, SColumnInfoData
 static int32_t vectorConvertVarToDouble(SScalarParam *pInput, int32_t *converted, SColumnInfoData **pOutputCol) {
   SScalarParam     output = {0};
   SColumnInfoData *pCol = pInput->columnData;
-
+  int32_t          code = TSDB_CODE_SUCCESS;
+  *pOutputCol = NULL;
   if (IS_VAR_DATA_TYPE(pCol->info.type) && pCol->info.type != TSDB_DATA_TYPE_JSON && pCol->info.type != TSDB_DATA_TYPE_VARBINARY) {
-    int32_t code = vectorConvertSingleCol(pInput, &output, TSDB_DATA_TYPE_DOUBLE, -1, -1);
-    if (code != TSDB_CODE_SUCCESS) {
-      *pOutputCol = NULL;
-      SCL_ERR_RET(code);
-    }
-
+    SCL_ERR_RET(vectorConvertSingleCol(pInput, &output, TSDB_DATA_TYPE_DOUBLE, -1, -1));
     *converted = VECTOR_DO_CONVERT;
-
     *pOutputCol = output.columnData;
     SCL_RET(code);
   }
 
   *converted = VECTOR_UN_CONVERT;
-
   *pOutputCol = pInput->columnData;
   SCL_RET(TSDB_CODE_SUCCESS);
 }
@@ -1616,68 +1591,25 @@ int32_t vectorMathRemainder(SScalarParam *pLeft, SScalarParam *pRight, SScalarPa
 
   double *output = (double *)pOutputCol->pData;
 
-  if (pLeft->numOfRows == pRight->numOfRows) {
-    for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) {
-      if (IS_NULL) {
-        colDataSetNULL(pOutputCol, i);
-        continue;
-      }
-
-      double lx = 0;
-      double rx = 0;
-      SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &lx));
-      SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rx));
-      if (isnan(lx) || isinf(lx) || isnan(rx) || isinf(rx) || FLT_EQUAL(rx, 0)) {
-        colDataSetNULL(pOutputCol, i);
-        continue;
-      }
-
-      *output = lx - ((int64_t)(lx / rx)) * rx;
+  int32_t numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows);
+  for (; i < numOfRows && i >= 0; i += step, output += 1) {
+    int32_t leftidx = pLeft->numOfRows == 1 ? 0 : i;
+    int32_t rightidx = pRight->numOfRows == 1 ? 0 : i;
+    if (IS_HELPER_NULL(pLeftCol, leftidx) || IS_HELPER_NULL(pRightCol, rightidx)) {
+      colDataSetNULL(pOutputCol, i);
+      continue;
     }
-  } else if (pLeft->numOfRows == 1) {
+
     double lx = 0;
-    SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, 0, &lx));
-    if (IS_HELPER_NULL(pLeftCol, 0)) {  // Set pLeft->numOfRows NULL value
-      colDataSetNNULL(pOutputCol, 0, pRight->numOfRows);
-    } else {
-      for (; i >= 0 && i < pRight->numOfRows; i += step, output += 1) {
-        if (IS_HELPER_NULL(pRightCol, i)) {
-          colDataSetNULL(pOutputCol, i);
-          continue;
-        }
-
-        double rx = 0;
-        SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, i, &rx));
-        if (isnan(rx) || isinf(rx) || FLT_EQUAL(rx, 0)) {
-          colDataSetNULL(pOutputCol, i);
-          continue;
-        }
-
-        *output = lx - ((int64_t)(lx / rx)) * rx;
-      }
-    }
-  } else if (pRight->numOfRows == 1) {
     double rx = 0;
-    SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, 0, &rx));
-    if (IS_HELPER_NULL(pRightCol, 0) || FLT_EQUAL(rx, 0)) {  // Set pLeft->numOfRows NULL value
-      colDataSetNNULL(pOutputCol, 0, pLeft->numOfRows);
-    } else {
-      for (; i >= 0 && i < pLeft->numOfRows; i += step, output += 1) {
-        if (IS_HELPER_NULL(pLeftCol, i)) {
-          colDataSetNULL(pOutputCol, i);
-          continue;
-        }
-
-        double lx = 0;
-        SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, i, &lx));
-        if (isnan(lx) || isinf(lx)) {
-          colDataSetNULL(pOutputCol, i);
-          continue;
-        }
-
-        *output = lx - ((int64_t)(lx / rx)) * rx;
-      }
+    SCL_ERR_JRET(getVectorDoubleValueFnLeft(LEFT_COL, leftidx, &lx));
+    SCL_ERR_JRET(getVectorDoubleValueFnRight(RIGHT_COL, rightidx, &rx));
+    if (isnan(lx) || isinf(lx) || isnan(rx) || isinf(rx) || FLT_EQUAL(rx, 0)) {
+      colDataSetNULL(pOutputCol, i);
+      continue;
     }
+
+    *output = lx - ((int64_t)(lx / rx)) * rx;
   }
 
 _return:
@@ -1739,33 +1671,6 @@ int32_t vectorAssign(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t vectorBitAndHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol,
-                                  int32_t numOfRows, int32_t step, int32_t i) {
-  _getBigintValue_fn_t getVectorBigintValueFnLeft;
-  _getBigintValue_fn_t getVectorBigintValueFnRight;
-  SCL_ERR_RET(getVectorBigintValueFn(pLeftCol->info.type, &getVectorBigintValueFnLeft));
-  SCL_ERR_RET(getVectorBigintValueFn(pRightCol->info.type, &getVectorBigintValueFnRight));
-
-  int64_t *output = (int64_t *)pOutputCol->pData;
-
-  if (IS_HELPER_NULL(pRightCol, 0)) {  // Set pLeft->numOfRows NULL value
-    colDataSetNNULL(pOutputCol, 0, numOfRows);
-  } else {
-    for (; i >= 0 && i < numOfRows; i += step, output += 1) {
-      if (IS_HELPER_NULL(pLeftCol, i)) {
-        colDataSetNULL(pOutputCol, i);
-        continue;  // TODO set null or ignore
-      }
-      int64_t leftRes = 0;
-      int64_t rightRes = 0;
-      SCL_ERR_RET(getVectorBigintValueFnLeft(LEFT_COL, i, &leftRes));
-      SCL_ERR_RET(getVectorBigintValueFnRight(RIGHT_COL, 0, &rightRes));
-      *output =  leftRes & rightRes;
-    }
-  }
-  SCL_RET(TSDB_CODE_SUCCESS);
-}
-
 int32_t vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) {
   SColumnInfoData *pOutputCol = pOut->columnData;
   pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows);
@@ -1786,22 +1691,19 @@ int32_t vectorBitAnd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pO
   SCL_ERR_JRET(getVectorBigintValueFn(pRightCol->info.type, &getVectorBigintValueFnRight));
 
   int64_t *output = (int64_t *)pOutputCol->pData;
-  if (pLeft->numOfRows == pRight->numOfRows) {
-    for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) {
-      if (IS_NULL) {
-        colDataSetNULL(pOutputCol, i);
-        continue;  // TODO set null or ignore
-      }
-      int64_t leftRes = 0;
-      int64_t rightRes = 0;
-      SCL_ERR_JRET(getVectorBigintValueFnLeft(LEFT_COL, i, &leftRes));
-      SCL_ERR_JRET(getVectorBigintValueFnRight(RIGHT_COL, i, &rightRes));
-      *output = leftRes & rightRes;
+  int32_t numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows);
+  for (; i < numOfRows && i >= 0; i += step, output += 1) {
+    int32_t leftidx = pLeft->numOfRows == 1 ? 0 : i;
+    int32_t rightidx = pRight->numOfRows == 1 ? 0 : i;
+    if (IS_HELPER_NULL(pRightCol, rightidx) || IS_HELPER_NULL(pLeftCol, leftidx)) {
+      colDataSetNULL(pOutputCol, i);
+      continue;  // TODO set null or ignore
     }
-  } else if (pLeft->numOfRows == 1) {
-    SCL_ERR_JRET(vectorBitAndHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i));
-  } else if (pRight->numOfRows == 1) {
-    SCL_ERR_JRET(vectorBitAndHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i));
+    int64_t leftRes = 0;
+    int64_t rightRes = 0;
+    SCL_ERR_JRET(getVectorBigintValueFnLeft(LEFT_COL, leftidx, &leftRes));
+    SCL_ERR_JRET(getVectorBigintValueFnRight(RIGHT_COL, rightidx, &rightRes));
+    *output = leftRes & rightRes;
   }
 
 _return:
@@ -1810,33 +1712,6 @@ _return:
   SCL_RET(code);
 }
 
-static int32_t vectorBitOrHelper(SColumnInfoData *pLeftCol, SColumnInfoData *pRightCol, SColumnInfoData *pOutputCol,
-                                 int32_t numOfRows, int32_t step, int32_t i) {
-  _getBigintValue_fn_t getVectorBigintValueFnLeft;
-  _getBigintValue_fn_t getVectorBigintValueFnRight;
-  SCL_ERR_RET(getVectorBigintValueFn(pLeftCol->info.type, &getVectorBigintValueFnLeft));
-  SCL_ERR_RET(getVectorBigintValueFn(pRightCol->info.type, &getVectorBigintValueFnRight));
-
-  int64_t *output = (int64_t *)pOutputCol->pData;
-
-  if (IS_HELPER_NULL(pRightCol, 0)) {  // Set pLeft->numOfRows NULL value
-    colDataSetNNULL(pOutputCol, 0, numOfRows);
-  } else {
-    int64_t rx = 0;
-    SCL_ERR_RET(getVectorBigintValueFnRight(RIGHT_COL, 0, &rx));
-    for (; i >= 0 && i < numOfRows; i += step, output += 1) {
-      if (IS_HELPER_NULL(pLeftCol, i)) {
-        colDataSetNULL(pOutputCol, i);
-        continue;  // TODO set null or ignore
-      }
-      int64_t lx = 0;
-      SCL_ERR_RET(getVectorBigintValueFnLeft(LEFT_COL, i, &lx));
-      *output = lx | rx;
-    }
-  }
-  SCL_RET(TSDB_CODE_SUCCESS);
-}
-
 int32_t vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOut, int32_t _ord) {
   SColumnInfoData *pOutputCol = pOut->columnData;
   pOut->numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows);
@@ -1857,22 +1732,20 @@ int32_t vectorBitOr(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *pOu
   SCL_ERR_JRET(getVectorBigintValueFn(pRightCol->info.type, &getVectorBigintValueFnRight));
 
   int64_t *output = (int64_t *)pOutputCol->pData;
-  if (pLeft->numOfRows == pRight->numOfRows) {
-    for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) {
-      if (IS_NULL) {
-        colDataSetNULL(pOutputCol, i);
-        continue;  // TODO set null or ignore
-      }
-      int64_t leftRes = 0;
-      int64_t rightRes = 0;
-      SCL_ERR_JRET(getVectorBigintValueFnLeft(LEFT_COL, i, &leftRes));
-      SCL_ERR_JRET(getVectorBigintValueFnRight(RIGHT_COL, i, &rightRes));
-      *output = leftRes | rightRes;
+  int32_t numOfRows = TMAX(pLeft->numOfRows, pRight->numOfRows);
+  for (; i < numOfRows && i >= 0; i += step, output += 1) {
+    int32_t leftidx = pLeft->numOfRows == 1 ? 0 : i;
+    int32_t rightidx = pRight->numOfRows == 1 ? 0 : i;
+    if (IS_HELPER_NULL(pRightCol, leftidx) || IS_HELPER_NULL(pLeftCol, rightidx)) {
+      colDataSetNULL(pOutputCol, i);
+      continue;  // TODO set null or ignore
     }
-  } else if (pLeft->numOfRows == 1) {
-    SCL_ERR_JRET(vectorBitOrHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i));
-  } else if (pRight->numOfRows == 1) {
-    SCL_ERR_JRET(vectorBitOrHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i));
+
+    int64_t leftRes = 0;
+    int64_t rightRes = 0;
+    SCL_ERR_JRET(getVectorBigintValueFnLeft(LEFT_COL, leftidx, &leftRes));
+    SCL_ERR_JRET(getVectorBigintValueFnRight(RIGHT_COL, rightidx, &rightRes));
+    *output = leftRes | rightRes;
   }
 
 _return:
diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp
index 865fb30814..fec9d14ae0 100644
--- a/source/libs/scalar/test/scalar/scalarTests.cpp
+++ b/source/libs/scalar/test/scalar/scalarTests.cpp
@@ -391,6 +391,26 @@ TEST(constantTest, bigint_add_bigint) {
   nodesDestroyNode(res);
 }
 
+TEST(constantTest, ubigint_add_ubigint) {
+  SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
+  int32_t code = TSDB_CODE_SUCCESS;
+  code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_UBIGINT, &scltLeftV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_UBIGINT, &scltRightV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeOpNode(&opNode, OP_TYPE_ADD, TSDB_DATA_TYPE_UBIGINT, pLeft, pRight);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = scalarCalculateConstants(opNode, &res);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE);
+  SValueNode *v = (SValueNode *)res;
+  ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_UBIGINT);
+  ASSERT_FLOAT_EQ(v->datum.d, (scltLeftV + scltRightV));
+  nodesDestroyNode(res);
+}
+
 TEST(constantTest, double_sub_bigint) {
   SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
   int32_t code = TSDB_CODE_SUCCESS;
@@ -431,6 +451,66 @@ TEST(constantTest, tinyint_and_smallint) {
   nodesDestroyNode(res);
 }
 
+TEST(constantTest, utinyint_and_usmallint) {
+  SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
+  int32_t code = TSDB_CODE_SUCCESS;
+  code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_UTINYINT, &scltLeftV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_USMALLINT, &scltRightV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = scalarCalculateConstants(opNode, &res);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE);
+  SValueNode *v = (SValueNode *)res;
+  ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_BIGINT);
+  ASSERT_EQ(v->datum.i, (int64_t)scltLeftV & (int64_t)scltRightV);
+  nodesDestroyNode(res);
+}
+
+TEST(constantTest, uint_and_usmallint) {
+  SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
+  int32_t code = TSDB_CODE_SUCCESS;
+  code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_UINT, &scltLeftV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_USMALLINT, &scltRightV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = scalarCalculateConstants(opNode, &res);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE);
+  SValueNode *v = (SValueNode *)res;
+  ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_BIGINT);
+  ASSERT_EQ(v->datum.i, (int64_t)scltLeftV & (int64_t)scltRightV);
+  nodesDestroyNode(res);
+}
+
+TEST(constantTest, ubigint_and_uint) {
+  SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
+  int32_t code = TSDB_CODE_SUCCESS;
+  code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_UBIGINT, &scltLeftV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_UINT, &scltRightV);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeOpNode(&opNode, OP_TYPE_BIT_AND, TSDB_DATA_TYPE_BIGINT, pLeft, pRight);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = scalarCalculateConstants(opNode, &res);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE);
+  SValueNode *v = (SValueNode *)res;
+  ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_BIGINT);
+  ASSERT_EQ(v->datum.i, (int64_t)scltLeftV & (int64_t)scltRightV);
+  nodesDestroyNode(res);
+}
+
 TEST(constantTest, bigint_or_double) {
   SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
   int32_t code = TSDB_CODE_SUCCESS;
@@ -494,6 +574,53 @@ TEST(constantTest, int_greater_double) {
   nodesDestroyNode(res);
 }
 
+TEST(constantTest, binary_greater_equal_varbinary) {
+  SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
+  char   binaryStr[64] = {0};
+  int32_t code = TSDB_CODE_SUCCESS;
+  (void)sprintf(&binaryStr[2], "%d", scltRightV);
+  varDataSetLen(binaryStr, strlen(&binaryStr[2]));
+  code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_VARBINARY, binaryStr);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, binaryStr);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeOpNode(&opNode, OP_TYPE_GREATER_THAN, TSDB_DATA_TYPE_BOOL, pLeft, pRight);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = scalarCalculateConstants(opNode, &res);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE);
+  SValueNode *v = (SValueNode *)res;
+  ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_BOOL);
+  ASSERT_EQ(v->datum.b, scltLeftV < scltRightVd);
+  nodesDestroyNode(res);
+}
+
+TEST(constantTest, binary_equal_geo) {
+  SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
+  char   geoRawStr[64] = "POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))";
+  char   geoStr[64] = {0};
+  int32_t code = TSDB_CODE_SUCCESS;
+  (void)sprintf(&geoStr[2], "%s", geoRawStr);
+  varDataSetLen(geoStr, strlen(&geoStr[2]));
+  code = scltMakeValueNode(&pLeft, TSDB_DATA_TYPE_GEOMETRY, geoStr);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeValueNode(&pRight, TSDB_DATA_TYPE_BINARY, geoStr);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  code = scltMakeOpNode(&opNode, OP_TYPE_EQUAL, TSDB_DATA_TYPE_BOOL, pLeft, pRight);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  code = scalarCalculateConstants(opNode, &res);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+  ASSERT_TRUE(res);
+  ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE);
+  SValueNode *v = (SValueNode *)res;
+  ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_BOOL);
+  ASSERT_EQ(v->datum.b, scltLeftV < scltRightVd);
+  nodesDestroyNode(res);
+}
+
 TEST(constantTest, int_greater_equal_binary) {
   SNode *pLeft = NULL, *pRight = NULL, *opNode = NULL, *res = NULL;
   char   binaryStr[64] = {0};
diff --git a/source/libs/scheduler/inc/schInt.h b/source/libs/scheduler/inc/schInt.h
index 607f43a06f..cdbeb2a2e0 100644
--- a/source/libs/scheduler/inc/schInt.h
+++ b/source/libs/scheduler/inc/schInt.h
@@ -149,11 +149,11 @@ typedef struct SSchedulerMgmt {
   bool          exit;
   int32_t       jobRef;
   int32_t       jobNum;
-  SSchStat      stat;
   void         *timer;
   SRWLatch      hbLock;
   SHashObj     *hbConnections;
   void         *queryMgmt;
+  SSchStat      stat;
 } SSchedulerMgmt;
 
 typedef struct SSchCallbackParamHeader {
diff --git a/source/libs/scheduler/src/schFlowCtrl.c b/source/libs/scheduler/src/schFlowCtrl.c
index d9a0b88e40..c66f1dafe6 100644
--- a/source/libs/scheduler/src/schFlowCtrl.c
+++ b/source/libs/scheduler/src/schFlowCtrl.c
@@ -50,11 +50,6 @@ int32_t schChkJobNeedFlowCtrl(SSchJob *pJob, SSchLevel *pLevel) {
   int32_t taskNum = taosArrayGetSize(pJob->dataSrcTasks);
   for (int32_t i = 0; i < taskNum; ++i) {
     SSchTask *pTask = *(SSchTask **)taosArrayGet(pJob->dataSrcTasks, i);
-    if (NULL == pTask) {
-      SCH_JOB_DLOG("fail to get the %dth task", i);
-      SCH_ERR_RET(TSDB_CODE_SCH_INTERNAL_ERROR);
-    }
-
     sum += pTask->plan->execNodeStat.tableNum;
   }
 
diff --git a/source/libs/scheduler/src/schRemote.c b/source/libs/scheduler/src/schRemote.c
index d15ac7a791..a031bc08de 100644
--- a/source/libs/scheduler/src/schRemote.c
+++ b/source/libs/scheduler/src/schRemote.c
@@ -531,8 +531,8 @@ int32_t schHandleNotifyCallback(void *param, SDataBuf *pMsg, int32_t code) {
   qDebug("QID:0x%" PRIx64 ",SID:0x%" PRIx64 ",CID:0x%" PRIx64 ",TID:0x%" PRIx64 " task notify rsp received, code:0x%x", 
          pParam->queryId, pParam->seriousId, pParam->clientId, pParam->taskId, code);
   if (pMsg) {
-    taosMemoryFree(pMsg->pData);
-    taosMemoryFree(pMsg->pEpSet);
+    taosMemoryFreeClear(pMsg->pData);
+    taosMemoryFreeClear(pMsg->pEpSet);
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -545,8 +545,8 @@ int32_t schHandleLinkBrokenCallback(void *param, SDataBuf *pMsg, int32_t code) {
   qDebug("handle %p is broken", pMsg->handle);
 
   if (head->isHbParam) {
-    taosMemoryFree(pMsg->pData);
-    taosMemoryFree(pMsg->pEpSet);
+    taosMemoryFreeClear(pMsg->pData);
+    taosMemoryFreeClear(pMsg->pEpSet);
 
     SSchHbCallbackParam *hbParam = (SSchHbCallbackParam *)param;
     SSchTrans            trans = {.pTrans = hbParam->pTrans, .pHandle = NULL, .pHandleId = 0};
@@ -1293,6 +1293,7 @@ int32_t schBuildAndSendMsg(SSchJob *pJob, SSchTask *pTask, SQueryNodeAddr *addr,
       }
       break;
     }
+/*
     case TDMT_SCH_QUERY_HEARTBEAT: {
       SCH_ERR_RET(schMakeHbRpcCtx(pJob, pTask, &rpcCtx));
 
@@ -1320,6 +1321,7 @@ int32_t schBuildAndSendMsg(SSchJob *pJob, SSchTask *pTask, SQueryNodeAddr *addr,
       persistHandle = true;
       break;
     }
+*/    
     case TDMT_SCH_TASK_NOTIFY: {
       ETaskNotifyType* pType = param;
       STaskNotifyReq qMsg;
diff --git a/source/libs/scheduler/src/schTask.c b/source/libs/scheduler/src/schTask.c
index cb8a68fe4f..0e76e21aff 100644
--- a/source/libs/scheduler/src/schTask.c
+++ b/source/libs/scheduler/src/schTask.c
@@ -189,7 +189,6 @@ int32_t schProcessOnTaskFailure(SSchJob *pJob, SSchTask *pTask, int32_t errCode)
   }
 
   pTask->failedExecId = pTask->execId;
-  pTask->failedSeriousId = pTask->seriousId;
 
   int8_t jobStatus = 0;
   if (schJobNeedToStop(pJob, &jobStatus)) {
@@ -274,18 +273,18 @@ int32_t schProcessOnTaskSuccess(SSchJob *pJob, SSchTask *pTask) {
       if (taskDone < pTask->level->taskNum) {
         SCH_TASK_DLOG("wait all tasks, done:%d, all:%d", taskDone, pTask->level->taskNum);
         return TSDB_CODE_SUCCESS;
-      } else if (taskDone > pTask->level->taskNum) {
-        SCH_TASK_ELOG("taskDone number invalid, done:%d, total:%d", taskDone, pTask->level->taskNum);
       }
+      
+      SCH_TASK_DLOG("taskDone number reach level task number, done:%d, total:%d", taskDone, pTask->level->taskNum);
 
       if (pTask->level->taskFailed > 0) {
         SCH_RET(schHandleJobFailure(pJob, pJob->errCode));
-      } else {
-        SCH_RET(schSwitchJobStatus(pJob, JOB_TASK_STATUS_PART_SUCC, NULL));
       }
-    } else {
-      pJob->resNode = pTask->succeedAddr;
+
+      SCH_RET(schSwitchJobStatus(pJob, JOB_TASK_STATUS_PART_SUCC, NULL));
     }
+    
+    pJob->resNode = pTask->succeedAddr;
 
     pJob->fetchTask = pTask;
 
@@ -438,7 +437,7 @@ void schResetTaskForRetry(SSchJob *pJob, SSchTask *pTask) {
   pTask->waitRetry = true;
 
   if (pTask->delayTimer) {
-    taosTmrStop(pTask->delayTimer);
+    UNUSED(taosTmrStop(pTask->delayTimer));
   }
 
   schDropTaskOnExecNode(pJob, pTask);
@@ -452,6 +451,8 @@ void schResetTaskForRetry(SSchJob *pJob, SSchTask *pTask) {
   TAOS_MEMSET(&pTask->succeedAddr, 0, sizeof(pTask->succeedAddr));
 }
 
+#if 0
+
 int32_t schDoTaskRedirect(SSchJob *pJob, SSchTask *pTask, SDataBuf *pData, int32_t rspCode) {
   int32_t code = 0;
 
@@ -593,17 +594,18 @@ _return:
 
   SCH_RET(schProcessOnTaskFailure(pJob, pTask, code));
 }
+#endif
 
 int32_t schPushTaskToExecList(SSchJob *pJob, SSchTask *pTask) {
   int32_t code = taosHashPut(pJob->execTasks, &pTask->taskId, sizeof(pTask->taskId), &pTask, POINTER_BYTES);
   if (0 != code) {
     if (HASH_NODE_EXIST(code)) {
-      SCH_TASK_DLOG("task already in execTask list, code:%x", code);
+      SCH_TASK_DLOG("task already in execTask list, code:0x%x", code);
       return TSDB_CODE_SUCCESS;
     }
 
-    SCH_TASK_ELOG("taosHashPut task to execTask list failed, errno:0x%x", errno);
-    SCH_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
+    SCH_TASK_ELOG("taosHashPut task to execTask list failed, code:0x%x", code);
+    SCH_ERR_RET(code);
   }
 
   SCH_TASK_DLOG("task added to execTask list, numOfTasks:%d", taosHashGetSize(pJob->execTasks));
@@ -759,7 +761,7 @@ int32_t schHandleTaskRetry(SSchJob *pJob, SSchTask *pTask) {
   (void)atomic_sub_fetch_32(&pTask->level->taskLaunchedNum, 1);
 
   if (pTask->delayTimer) {
-    taosTmrStop(pTask->delayTimer);
+    UNUSED(taosTmrStop(pTask->delayTimer));
   }
 
   (void)schRemoveTaskFromExecList(pJob, pTask);  // ignore error
@@ -798,11 +800,6 @@ int32_t schSetAddrsFromNodeList(SSchJob *pJob, SSchTask *pTask) {
 
     for (int32_t i = 0; i < nodeNum; ++i) {
       SQueryNodeLoad *nload = taosArrayGet(pJob->nodeList, i);
-      if (NULL == nload) {
-        SCH_TASK_ELOG("fail to get the %dth node in nodeList, nodeNum:%d", i, nodeNum);
-        SCH_ERR_RET(TSDB_CODE_SCH_INTERNAL_ERROR);
-      }
-
       SQueryNodeAddr *naddr = &nload->addr;
 
       if (NULL == taosArrayPush(pTask->candidateAddrs, naddr)) {
@@ -869,6 +866,7 @@ int32_t schSetTaskCandidateAddrs(SSchJob *pJob, SSchTask *pTask) {
   return TSDB_CODE_SUCCESS;
 }
 
+#if 0
 int32_t schUpdateTaskCandidateAddr(SSchJob *pJob, SSchTask *pTask, SEpSet *pEpSet) {
   int32_t code = TSDB_CODE_SUCCESS;
   if (NULL == pTask->candidateAddrs || 1 != taosArrayGetSize(pTask->candidateAddrs)) {
@@ -900,6 +898,7 @@ _return:
 
   return code;
 }
+#endif
 
 int32_t schSwitchTaskCandidateAddr(SSchJob *pJob, SSchTask *pTask) {
   int32_t candidateNum = taosArrayGetSize(pTask->candidateAddrs);
@@ -1376,6 +1375,7 @@ int32_t schLaunchLevelTasks(SSchJob *pJob, SSchLevel *level) {
 
   for (int32_t i = 0; i < level->taskNum; ++i) {
     SSchTask *pTask = taosArrayGet(level->subTasks, i);
+    pTask->failedSeriousId = pJob->seriousId - 1;
     pTask->seriousId = pJob->seriousId;
     
     SCH_TASK_DLOG("task seriousId set to 0x%" PRIx64, pTask->seriousId);
diff --git a/source/libs/scheduler/test/schedulerTests.cpp b/source/libs/scheduler/test/schedulerTests.cpp
index a9878ec9a9..9d70227c48 100644
--- a/source/libs/scheduler/test/schedulerTests.cpp
+++ b/source/libs/scheduler/test/schedulerTests.cpp
@@ -57,6 +57,22 @@ namespace {
 extern "C" int32_t schHandleResponseMsg(SSchJob *pJob, SSchTask *pTask, uint64_t sId, int32_t execId, SDataBuf *pMsg,
                                         int32_t rspCode);
 extern "C" int32_t schHandleCallback(void *param, const SDataBuf *pMsg, int32_t rspCode);
+extern "C" int32_t schHandleNotifyCallback(void *param, SDataBuf *pMsg, int32_t code);
+extern "C" int32_t schHandleLinkBrokenCallback(void *param, SDataBuf *pMsg, int32_t code);
+extern "C" int32_t schRescheduleTask(SSchJob *pJob, SSchTask *pTask);
+extern "C" int32_t schValidateRspMsgType(SSchJob *pJob, SSchTask *pTask, int32_t msgType);
+//extern "C" int32_t schProcessFetchRsp(SSchJob *pJob, SSchTask *pTask, char *msg, int32_t rspCode);
+extern "C" int32_t schProcessResponseMsg(SSchJob *pJob, SSchTask *pTask, SDataBuf *pMsg, int32_t rspCode);
+extern "C" void schInitTaskRetryTimes(SSchJob *pJob, SSchTask *pTask, SSchLevel *pLevel);
+extern "C" int32_t schRecordTaskSucceedNode(SSchJob *pJob, SSchTask *pTask);
+extern "C" int32_t schDropTaskExecNode(SSchJob *pJob, SSchTask *pTask, void *handle, int32_t execId);
+extern "C" int32_t schPushTaskToExecList(SSchJob *pJob, SSchTask *pTask);
+extern "C" int32_t schSetAddrsFromNodeList(SSchJob *pJob, SSchTask *pTask);
+extern "C" int32_t schNotifyTaskOnExecNode(SSchJob *pJob, SSchTask *pTask, ETaskNotifyType type);
+extern "C" int32_t schLaunchRemoteTask(SSchJob *pJob, SSchTask *pTask);
+extern "C" int32_t schLaunchTaskImpl(void *param);
+extern "C" void schHandleTimerEvent(void *param, void *tmrId);
+
 
 int64_t insertJobRefId = 0;
 int64_t queryJobRefId = 0;
@@ -316,7 +332,7 @@ void schtBuildQueryFlowCtrlDag(SQueryPlan *dag) {
 
     scanPlan->execNode.nodeId = 1 + i;
     scanPlan->execNode.epSet.inUse = 0;
-    scanPlan->execNodeStat.tableNum = taosRand() % 30;
+    scanPlan->execNodeStat.tableNum = taosRand() % 100;
     addEpIntoEpSet(&scanPlan->execNode.epSet, "ep0", 6030);
     addEpIntoEpSet(&scanPlan->execNode.epSet, "ep1", 6030);
     addEpIntoEpSet(&scanPlan->execNode.epSet, "ep2", 6030);
@@ -982,8 +998,159 @@ TEST(queryTest, normalCase) {
   schedulerFreeJob(&job, 0);
 
   (void)taosThreadJoin(thread1, NULL);
+
+  schMgmt.jobRef = -1;
 }
 
+TEST(queryTest, rescheduleCase) {
+  void       *mockPointer = (void *)0x1;
+  char       *clusterId = "cluster1";
+  char       *dbname = "1.db1";
+  char       *tablename = "table1";
+  SVgroupInfo vgInfo = {0};
+  int64_t     job = 0;
+  SQueryPlan *dag = NULL;
+  int32_t code = nodesMakeNode(QUERY_NODE_PHYSICAL_PLAN, (SNode**)&dag);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  SArray *qnodeList = taosArrayInit(1, sizeof(SQueryNodeLoad));
+
+  SQueryNodeLoad load = {0};
+  load.addr.epSet.numOfEps = 1;
+  TAOS_STRCPY(load.addr.epSet.eps[0].fqdn, "qnode0.ep");
+  load.addr.epSet.eps[0].port = 6031;
+  assert(taosArrayPush(qnodeList, &load) != NULL);
+
+  TAOS_STRCPY(load.addr.epSet.eps[0].fqdn, "qnode1.ep");
+  assert(taosArrayPush(qnodeList, &load) != NULL);
+
+  code = schedulerInit();
+  ASSERT_EQ(code, 0);
+
+  schtBuildQueryDag(dag);
+
+  schtSetPlanToString();
+  schtSetExecNode();
+  schtSetAsyncSendMsgToServer();
+
+  int32_t queryDone = 0;
+
+  SRequestConnInfo conn = {0};
+  conn.pTrans = mockPointer;
+  SSchedulerReq req = {0};
+  req.pConn = &conn;
+  req.pNodeList = qnodeList;
+  req.pDag = dag;
+  req.sql = "select * from tb";
+  req.execFp = schtQueryCb;
+  req.cbParam = &queryDone;
+
+  code = schedulerExecJob(&req, &job);
+  ASSERT_EQ(code, 0);
+
+  SSchJob *pJob = NULL;
+  code = schAcquireJob(job, &pJob);
+  ASSERT_EQ(code, 0);
+
+  schedulerEnableReSchedule(true);
+
+  void *pIter = taosHashIterate(pJob->execTasks, NULL);
+  while (pIter) {
+    SSchTask *task = *(SSchTask **)pIter;
+    task->timeoutUsec = -1;
+
+    code = schRescheduleTask(pJob, task);
+    ASSERT_EQ(code, 0);
+
+    task->timeoutUsec = SCH_DEFAULT_TASK_TIMEOUT_USEC;
+    pIter = taosHashIterate(pJob->execTasks, pIter);
+  }
+
+  pIter = taosHashIterate(pJob->execTasks, NULL);
+  while (pIter) {
+    SSchTask *task = *(SSchTask **)pIter;
+
+    SDataBuf msg = {0};
+    void    *rmsg = NULL;
+    assert(0 == schtBuildQueryRspMsg(&msg.len, &rmsg));
+    msg.msgType = TDMT_SCH_QUERY_RSP;
+    msg.pData = rmsg;
+
+    code = schHandleResponseMsg(pJob, task, task->seriousId, task->execId, &msg, 0);
+
+    ASSERT_EQ(code, 0);
+    pIter = taosHashIterate(pJob->execTasks, pIter);
+  }
+
+
+  pIter = taosHashIterate(pJob->execTasks, NULL);
+  while (pIter) {
+    SSchTask *task = *(SSchTask **)pIter;
+    task->timeoutUsec = -1;
+
+    code = schRescheduleTask(pJob, task);
+    ASSERT_EQ(code, 0);
+
+    task->timeoutUsec = SCH_DEFAULT_TASK_TIMEOUT_USEC;
+    pIter = taosHashIterate(pJob->execTasks, pIter);
+  }
+
+  pIter = taosHashIterate(pJob->execTasks, NULL);
+  while (pIter) {
+    SSchTask *task = *(SSchTask **)pIter;
+    if (JOB_TASK_STATUS_EXEC == task->status) {
+      SDataBuf msg = {0};
+      void    *rmsg = NULL;
+      assert(0 == schtBuildQueryRspMsg(&msg.len, &rmsg));
+      msg.msgType = TDMT_SCH_QUERY_RSP;
+      msg.pData = rmsg;
+
+      code = schHandleResponseMsg(pJob, task, task->seriousId, task->execId, &msg, 0);
+
+      ASSERT_EQ(code, 0);
+    }
+
+    pIter = taosHashIterate(pJob->execTasks, pIter);
+  }
+
+  while (true) {
+    if (queryDone) {
+      break;
+    }
+
+    taosUsleep(10000);
+  }
+
+  TdThreadAttr thattr;
+  assert(0 == taosThreadAttrInit(&thattr));
+
+  TdThread thread1;
+  assert(0 == taosThreadCreate(&(thread1), &thattr, schtCreateFetchRspThread, &job));
+
+  void *data = NULL;
+  req.syncReq = true;
+  req.pFetchRes = &data;
+
+  code = schedulerFetchRows(job, &req);
+  ASSERT_EQ(code, 0);
+
+  SRetrieveTableRsp *pRsp = (SRetrieveTableRsp *)data;
+  ASSERT_EQ(pRsp->completed, 1);
+  ASSERT_EQ(pRsp->numOfRows, 10);
+  taosMemoryFreeClear(data);
+
+  (void)schReleaseJob(job);
+
+  schedulerDestroy();
+
+  schedulerFreeJob(&job, 0);
+
+  (void)taosThreadJoin(thread1, NULL);
+
+  schMgmt.jobRef = -1;
+}
+
+
 TEST(queryTest, readyFirstCase) {
   void       *mockPointer = (void *)0x1;
   char       *clusterId = "cluster1";
@@ -1097,6 +1264,7 @@ TEST(queryTest, readyFirstCase) {
   schedulerFreeJob(&job, 0);
 
   (void)taosThreadJoin(thread1, NULL);
+  schMgmt.jobRef = -1;
 }
 
 TEST(queryTest, flowCtrlCase) {
@@ -1196,6 +1364,9 @@ TEST(queryTest, flowCtrlCase) {
   schedulerFreeJob(&job, 0);
 
   (void)taosThreadJoin(thread1, NULL);
+  schMgmt.jobRef = -1;
+
+  cleanupTaskQueue();
 }
 
 TEST(insertTest, normalCase) {
@@ -1260,6 +1431,7 @@ TEST(insertTest, normalCase) {
   schedulerDestroy();
 
   (void)taosThreadJoin(thread1, NULL);
+  schMgmt.jobRef = -1;
 }
 
 TEST(multiThread, forceFree) {
@@ -1282,9 +1454,11 @@ TEST(multiThread, forceFree) {
 
   schtTestStop = true;
   // taosSsleep(3);
+  
+  schMgmt.jobRef = -1;
 }
 
-TEST(otherTest, otherCase) {
+TEST(otherTest, function) {
   // excpet test
   (void)schReleaseJob(0);
   schFreeRpcCtx(NULL);
@@ -1293,6 +1467,296 @@ TEST(otherTest, otherCase) {
   ASSERT_EQ(schDumpEpSet(NULL, &ep), TSDB_CODE_SUCCESS);
   ASSERT_EQ(strcmp(schGetOpStr(SCH_OP_NULL), "NULL"), 0);
   ASSERT_EQ(strcmp(schGetOpStr((SCH_OP_TYPE)100), "UNKNOWN"), 0);
+
+  SSchTaskCallbackParam param = {0};
+  SDataBuf dataBuf = {0};
+  dataBuf.pData = taosMemoryMalloc(1);
+  dataBuf.pEpSet = (SEpSet*)taosMemoryMalloc(sizeof(*dataBuf.pEpSet));
+  ASSERT_EQ(schHandleNotifyCallback(&param, &dataBuf, TSDB_CODE_SUCCESS), TSDB_CODE_SUCCESS);
+
+  SSchCallbackParamHeader param2 = {0};
+  dataBuf.pData = taosMemoryMalloc(1);
+  dataBuf.pEpSet = (SEpSet*)taosMemoryMalloc(sizeof(*dataBuf.pEpSet));
+  schHandleLinkBrokenCallback(&param2, &dataBuf, TSDB_CODE_SUCCESS);
+  param2.isHbParam = true;
+  dataBuf.pData = taosMemoryMalloc(1);
+  dataBuf.pEpSet = (SEpSet*)taosMemoryMalloc(sizeof(*dataBuf.pEpSet));
+  schHandleLinkBrokenCallback(&param2, &dataBuf, TSDB_CODE_SUCCESS);
+  
+  schMgmt.jobRef = -1;
+}
+
+TEST(otherTest, branch) {
+  SSchJob job = {0};
+  SSchTask task = {0};
+  memset(&schMgmt, 0, sizeof(schMgmt));
+  
+  schValidateRspMsgType(&job, &task, TDMT_SCH_MERGE_FETCH_RSP);
+
+  task.lastMsgType = TDMT_SCH_MERGE_FETCH_RSP - 1;
+  schValidateRspMsgType(&job, &task, TDMT_SCH_MERGE_FETCH_RSP);
+
+  schValidateRspMsgType(&job, &task, 0);
+
+  schValidateRspMsgType(&job, &task, TDMT_SCH_QUERY_RSP);
+
+  task.lastMsgType = TDMT_SCH_QUERY_RSP - 1;
+  schValidateRspMsgType(&job, &task, TDMT_SCH_QUERY_RSP);
+
+  schProcessFetchRsp(&job, &task, NULL, -1);
+  schProcessFetchRsp(&job, &task, NULL, 0);
+
+  job.fetchRes = (void*)0x1;
+  schProcessFetchRsp(&job, &task, (char*)taosMemoryMalloc(0), 0);
+  job.fetchRes = NULL;
+
+  SDataBuf databuf = {0};
+  databuf.msgType = TDMT_VND_ALTER_TABLE_RSP;
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_VND_SUBMIT_RSP;
+  databuf.pData = taosMemoryMalloc(0);
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_VND_DELETE_RSP;
+  databuf.pData = taosMemoryMalloc(0);
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_SCH_QUERY_RSP;
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_SCH_QUERY_RSP;
+  databuf.pData = taosMemoryMalloc(0);
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+  
+
+  databuf.msgType = TDMT_SCH_EXPLAIN_RSP;
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_SCH_EXPLAIN_RSP;
+  databuf.pData = taosMemoryMalloc(0);
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+  job.status = 0;
+
+  job.attr.explainMode = EXPLAIN_MODE_ANALYZE;
+  databuf.msgType = TDMT_SCH_EXPLAIN_RSP;
+  databuf.pData = taosMemoryMalloc(0);
+  job.status = JOB_TASK_STATUS_FAIL;
+  job.fetchRes = (void*)0x1;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+  job.fetchRes = NULL;
+
+  job.attr.explainMode = EXPLAIN_MODE_ANALYZE;
+  databuf.msgType = TDMT_SCH_EXPLAIN_RSP;
+  databuf.pData = taosMemoryMalloc(0);
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_SCH_DROP_TASK_RSP;
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = TDMT_SCH_LINK_BROKEN;
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.msgType = 0;
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessResponseMsg(&job, &task, &databuf, 0);
+
+  databuf.pData = taosMemoryMalloc(0);
+  schHandleHbCallback(NULL, &databuf, 0);
+
+  __async_send_cb_fn_t fp = NULL;
+  schGetCallbackFp(TDMT_SCH_TASK_NOTIFY, &fp);
+  schGetCallbackFp(0, &fp);
+
+  SQueryNodeEpId ep = {0};
+  schBuildAndSendHbMsg(&ep, NULL);
+
+  schBuildAndSendMsg(&job, &task, NULL, 0, NULL);
+
+  SSchLevel level = {0};
+  SSubplan subplan;
+  memset(&subplan, 0, sizeof(subplan));
+  job.attr.queryJob = true;
+  schMgmt.cfg.schPolicy = SCH_ALL;
+  task.plan = &subplan;
+  schInitTaskRetryTimes(&job, &task, &level);
+  job.attr.queryJob = false;
+  memset(&schMgmt.cfg, 0, sizeof(schMgmt.cfg));
+  memset(&level, 0, sizeof(level));
+
+  schRecordTaskSucceedNode(&job, &task);
+
+  schDropTaskExecNode(&job, &task, NULL, 0);
+
+  task.execNodes = taosHashInit(1, taosGetDefaultHashFunction(TSDB_DATA_TYPE_INT), true, HASH_NO_LOCK);
+  schDropTaskExecNode(&job, &task, NULL, 0);
+
+  int32_t execId = 0;
+  task.execId = 1;
+  (void)taosHashPut(task.execNodes, &execId, sizeof(execId), &execId, sizeof(execId));
+  schDropTaskExecNode(&job, &task, NULL, execId);
+  task.execId = 0;
+  taosHashCleanup(task.execNodes);
+  task.execNodes = NULL;
+
+  job.status = JOB_TASK_STATUS_FAIL;
+  schProcessOnTaskFailure(&job, &task, 0);
+  job.status = 0;
+
+  task.status = JOB_TASK_STATUS_FAIL;
+  schProcessOnTaskFailure(&job, &task, 0);
+  task.status = 0;
+
+  task.level = &level;
+  schProcessOnTaskFailure(&job, &task, TSDB_CODE_SCH_TIMEOUT_ERROR);
+  memset(&level, 0, sizeof(level));
+  task.level = NULL;
+
+  subplan.subplanType = SUBPLAN_TYPE_SCAN;
+  task.plan = &subplan;
+  SEpSet epset = {0};
+  epset.numOfEps = 127;
+  schChkUpdateRedirectCtx(&job, &task, &epset, 0);
+
+  schChkUpdateRedirectCtx(&job, &task, NULL, 0);
+  task.plan = NULL;
+
+  schPushTaskToExecList(&job, &task);
+
+  job.execTasks = taosHashInit(1, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_ENTRY_LOCK);
+  taosHashPut(job.execTasks, &task.taskId, sizeof(task.taskId), &task, POINTER_BYTES);
+  schPushTaskToExecList(&job, &task);
+  taosHashCleanup(job.execTasks);
+  job.execTasks = NULL;
+
+  bool needRetry = false;
+  task.timeoutUsec = SCH_MAX_TASK_TIMEOUT_USEC / 2 + 1;
+  task.retryTimes = 0;
+  task.maxRetryTimes = 0;
+  schTaskCheckSetRetry(&job, &task, TSDB_CODE_SCH_TIMEOUT_ERROR, &needRetry);
+
+  task.execId = 0;
+  task.retryTimes = 0;
+  task.maxRetryTimes = 100;
+  task.maxExecTimes = 1;
+  schTaskCheckSetRetry(&job, &task, TSDB_CODE_SCH_TIMEOUT_ERROR, &needRetry);
+
+
+  task.execId = 0;
+  task.retryTimes = 0;
+  task.maxRetryTimes = 100;
+  task.maxExecTimes = 100;
+  task.lastMsgType = TDMT_SCH_LINK_BROKEN;
+  schTaskCheckSetRetry(&job, &task, TSDB_CODE_SCH_TIMEOUT_ERROR, &needRetry);
+
+  schSetAddrsFromNodeList(&job, &task);
+
+  schSwitchTaskCandidateAddr(&job, &task);
+
+
+  task.candidateAddrs = taosArrayInit(SCHEDULE_DEFAULT_MAX_NODE_NUM, sizeof(SQueryNodeAddr));
+  SQueryNodeAddr addr = {0};
+  taosArrayPush(task.candidateAddrs, &addr);
+  taosArrayPush(task.candidateAddrs, &addr);
+  schMgmt.cfg.schPolicy = SCH_LOAD_SEQ;
+  task.candidateIdx = 1;
+  schSwitchTaskCandidateAddr(&job, &task);
+
+  schMgmt.cfg.schPolicy = SCH_RANDOM;
+  schSwitchTaskCandidateAddr(&job, &task);
+  taosArrayDestroy(task.candidateAddrs);
+  task.candidateAddrs = NULL;
+  memset(&schMgmt.cfg, 0, sizeof(schMgmt.cfg));
+  task.candidateIdx = 0;
+
+  schDropTaskOnExecNode(&job, &task);
+
+  schNotifyTaskOnExecNode(&job, &task, TASK_NOTIFY_FINISHED);
+
+  schLaunchRemoteTask(&job, &task);
+
+  SSchTaskCtx* pCtx = (SSchTaskCtx*)taosMemoryCalloc(1, sizeof(SSchTaskCtx));
+  pCtx->jobRid = -1;
+  schLaunchTaskImpl((void*)pCtx);
+
+  task.plan = &subplan;
+  subplan.subplanType = SUBPLAN_TYPE_SCAN;
+  job.attr.needFlowCtrl = true;
+  level.taskNum = 1000;
+  task.level = &level;
+  schLaunchTask(&job, &task);
+  task.plan = NULL;
+  task.level = NULL;
+  job.attr.needFlowCtrl = false;
+
+  SSchTimerParam param = {0};
+  param.rId = -1;
+  schHandleTimerEvent(&param, NULL);
+
+  job.execTasks = taosHashInit(1, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_ENTRY_LOCK);
+  task.delayExecMs = 1;
+  schMgmt.timer = NULL;
+  schDelayLaunchTask(&job, &task);
+  task.delayExecMs = 0;
+  taosHashCleanup(job.execTasks);
+  job.execTasks = NULL;
+
+  job.fetchRes = (void*)0x1;
+  schLaunchFetchTask(&job);
+  job.fetchRes = NULL;
+
+  job.fetchTask = &task;
+  job.attr.localExec = true;
+  job.attr.queryJob = true;
+  subplan.subplanType = SUBPLAN_TYPE_MERGE;
+  task.plan = &subplan;
+  void* p = taosMemoryCalloc(1, 1024);
+  schMgmt.queryMgmt = p;
+  schLaunchFetchTask(&job);
+  memset(&job, 0, sizeof(job));
+  memset(&subplan, 0, sizeof(subplan));
+  task.plan = NULL;
+  taosMemoryFreeClear(schMgmt.queryMgmt);
+
+  // flow ctrl
+
+  job.flowCtrl = taosHashInit(1, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
+  SEp sep = {0};
+  SSchFlowControl nctrl = {0};
+  nctrl.taskList = taosArrayInit(1, POINTER_BYTES);
+  taosHashPut(job.flowCtrl, &sep, sizeof(SEp), &nctrl, sizeof(nctrl));
+  schFreeFlowCtrl(&job);
+
+
+
+  schMgmt.jobRef = -1;
+}
+
+
+void schtReset() {
+  insertJobRefId = 0;
+  queryJobRefId = 0;
+  
+  schtJobDone = false;
+  schtMergeTemplateId = 0x4;
+  schtFetchTaskId = 0;
+  schtQueryId = 1;
+  
+  schtTestStop = false;
+  schtTestDeadLoop = false;
+  schtTestMTRunSec = 1;
+  schtTestPrintNum = 1000;
+  schtStartFetch = 0;
 }
 
 int main(int argc, char **argv) {
@@ -1302,7 +1766,17 @@ int main(int argc, char **argv) {
   }
   taosSeedRand(taosGetTimestampSec());
   testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+
+  int code = 0;
+  for (int32_t i = 0; i < 10; ++i) {
+    schtReset();
+    code = RUN_ALL_TESTS();
+    if (code) {
+      break;
+    }
+  }
+  
+  return code;
 }
 
 #pragma GCC diagnostic pop
diff --git a/source/libs/stream/inc/streamInt.h b/source/libs/stream/inc/streamInt.h
index 41ac0117f3..7af64c041d 100644
--- a/source/libs/stream/inc/streamInt.h
+++ b/source/libs/stream/inc/streamInt.h
@@ -252,6 +252,8 @@ void chkptFailedByRetrieveReqToSource(SStreamTask* pTask, int64_t checkpointId);
 
 int32_t uploadCheckpointData(SStreamTask* pTask, int64_t checkpointId, int64_t dbRefId, ECHECKPOINT_BACKUP_TYPE type);
 int32_t chkptTriggerRecvMonitorHelper(SStreamTask* pTask, void* param, SArray** ppNotSendList);
+int32_t downloadCheckpointByNameS3(const char* id, const char* fname, const char* dstName);
+int32_t uploadCheckpointToS3(const char* id, const char* path);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/stream/src/streamCheckpoint.c b/source/libs/stream/src/streamCheckpoint.c
index 0ec66cd2ce..ebde9fe50e 100644
--- a/source/libs/stream/src/streamCheckpoint.c
+++ b/source/libs/stream/src/streamCheckpoint.c
@@ -24,7 +24,6 @@ static int32_t streamTaskUploadCheckpoint(const char* id, const char* path, int6
 #ifdef BUILD_NO_CALL
 static int32_t deleteCheckpoint(const char* id);
 #endif
-static int32_t downloadCheckpointByNameS3(const char* id, const char* fname, const char* dstName);
 static int32_t continueDispatchCheckpointTriggerBlock(SStreamDataBlock* pBlock, SStreamTask* pTask);
 static int32_t appendCheckpointIntoInputQ(SStreamTask* pTask, int32_t checkpointType, int64_t checkpointId,
                                           int32_t transId, int32_t srcTaskId);
@@ -1355,7 +1354,7 @@ void streamTaskSetTriggerDispatchConfirmed(SStreamTask* pTask, int32_t vgId) {
   }
 }
 
-static int32_t uploadCheckpointToS3(const char* id, const char* path) {
+int32_t uploadCheckpointToS3(const char* id, const char* path) {
   int32_t code = 0;
   int32_t nBytes = 0;
   /*
diff --git a/source/libs/stream/src/streamSliceState.c b/source/libs/stream/src/streamSliceState.c
index eefe046878..976f806032 100644
--- a/source/libs/stream/src/streamSliceState.c
+++ b/source/libs/stream/src/streamSliceState.c
@@ -112,6 +112,7 @@ void clearSearchBuff(SStreamFileState* pFileState) {
   }
 }
 
+#ifdef BUILD_NO_CALL
 int32_t getStateFromRocksdbByCur(SStreamFileState* pFileState, SStreamStateCur* pCur, SWinKey* pResKey, SRowBuffPos** ppPos, int32_t* pVLen, int32_t* pWinCode) {
   int32_t code = TSDB_CODE_SUCCESS;
   int32_t lino = 0;
@@ -135,6 +136,7 @@ _end:
   }
   return code;
 }
+#endif
 
 int32_t getHashSortNextRow(SStreamFileState* pFileState, const SWinKey* pKey, SWinKey* pResKey, void** ppVal,
                            int32_t* pVLen, int32_t* pWinCode) {
diff --git a/source/libs/stream/test/streamCheckPointTest.cpp b/source/libs/stream/test/streamCheckPointTest.cpp
index 80dd3ec142..c8297d56b7 100644
--- a/source/libs/stream/test/streamCheckPointTest.cpp
+++ b/source/libs/stream/test/streamCheckPointTest.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 #include "tstream.h"
 #include "streamInt.h"
+#include "tcs.h"
+#include "tglobal.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wwrite-strings"
@@ -217,6 +219,10 @@ TEST(StreamTaskAlreadySendTriggerTest, AlreadySendTrigger) {
     taosArrayDestroy(array);
 }
 
+int32_t sendReq1111(const SEpSet *pEpSet, SRpcMsg *pMsg) {
+  return TSDB_CODE_SUCCESS;
+}
+
 TEST(ChkptTriggerRecvMonitorHelperTest, chkptTriggerRecvMonitorHelper) {
     SStreamTask* pTask = NULL;
     int64_t uid = 2222222222222;
@@ -239,6 +245,11 @@ TEST(ChkptTriggerRecvMonitorHelperTest, chkptTriggerRecvMonitorHelper) {
     pTask->chkInfo.pActiveInfo->transId = 4561111;
     pTask->chkInfo.startTs = 11111;
 
+    SStreamTask upTask;
+    upTask = *pTask;
+    streamTaskSetUpstreamInfo(pTask, &upTask);
+    
+
     streamTaskSetStatusReady(pTask);
     code = streamTaskHandleEvent(pTask->status.pSM, TASK_EVENT_GEN_CHECKPOINT);
     ASSERT_EQ(code, TSDB_CODE_SUCCESS);
@@ -254,7 +265,21 @@ TEST(ChkptTriggerRecvMonitorHelperTest, chkptTriggerRecvMonitorHelper) {
 
     taosArrayPush(pTask->chkInfo.pActiveInfo->pDispatchTriggerList, &triggerInfo);
 
+    STaskCheckpointReadyInfo readyInfo;
+    readyInfo.upstreamNodeId = 789111;
+    void* pBuf = rpcMallocCont(sizeof(SMsgHead) + 1);
+
+    initRpcMsg(&readyInfo.msg, 0, pBuf, sizeof(SMsgHead) + 1);
+    taosArrayPush(pTask->chkInfo.pActiveInfo->pReadyMsgList, &readyInfo);
+
+
     pTask->chkInfo.pActiveInfo->dispatchTrigger = true;
+
+    SMsgCb msgCb = {0};
+    msgCb.sendReqFp = sendReq1111;
+    msgCb.mgmt = (SMgmtWrapper*)(&msgCb);  // hack
+    tmsgSetDefault(&msgCb);
+
     SArray* array1 = NULL;
     code = chkptTriggerRecvMonitorHelper(pTask, NULL, &array1);
     EXPECT_EQ(code, TSDB_CODE_SUCCESS);
@@ -268,3 +293,106 @@ TEST(ChkptTriggerRecvMonitorHelperTest, chkptTriggerRecvMonitorHelper) {
     taosArrayDestroy(array);
     taosArrayDestroy(array1);
 }
+
+TEST(StreamTaskSendCheckpointTriggerMsgTest, SendCheckpointTriggerMsgSuccessTest) {
+    SStreamTask* pTask = NULL;
+    int64_t uid = 2222222222222;
+    SArray* array = taosArrayInit(4, POINTER_BYTES);
+    int32_t code = tNewStreamTask(uid, TASK_LEVEL__SINK, NULL, false, 0, 0, array,
+                                       false, 1, &pTask);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    initTaskLock(pTask);
+
+    const char *path = "/tmp/SendCheckpointTriggerMsgSuccessTest/stream";
+    code = streamMetaOpen((path), NULL, NULL, NULL, 0, 0, NULL, &pTask->pMeta);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    code = streamTaskCreateActiveChkptInfo(&pTask->chkInfo.pActiveInfo);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    SRpcHandleInfo rpcInfo;
+
+    int32_t ret = streamTaskSendCheckpointTriggerMsg(pTask, 123, 456, &rpcInfo, code);
+
+    EXPECT_EQ(ret, TSDB_CODE_SUCCESS);
+}
+
+TEST(streamTaskBuildCheckpointTest, streamTaskBuildCheckpointFnTest) {
+    SStreamTask* pTask = NULL;
+    int64_t uid = 2222222222222;
+    SArray* array = taosArrayInit(4, POINTER_BYTES);
+    int32_t code = tNewStreamTask(uid, TASK_LEVEL__SINK, NULL, false, 0, 0, array,
+                                       false, 1, &pTask);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    initTaskLock(pTask);
+
+    const char *path = "/tmp/streamTaskBuildCheckpoinTest/stream";
+    code = streamMetaOpen((path), NULL, NULL, NULL, 0, 0, NULL, &pTask->pMeta);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    SStreamState *pState = streamStateOpen((char *)path, pTask, 0, 0);
+    ASSERT(pState != NULL);
+
+    pTask->pBackend = pState->pTdbState->pOwner->pBackend;
+
+    code = streamTaskCreateActiveChkptInfo(&pTask->chkInfo.pActiveInfo);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    char a[] = "localhost";
+    memcpy(tsSnodeAddress, a, sizeof(a));
+
+    int32_t ret = streamTaskBuildCheckpoint(pTask);
+
+    EXPECT_NE(ret, TSDB_CODE_SUCCESS);
+}
+
+int32_t s3GetObjectToFileTest(const char *object_name, const char *fileName) {
+  return TSDB_CODE_SUCCESS;
+}
+
+TEST(sstreamTaskGetTriggerRecvStatusTest, streamTaskGetTriggerRecvStatusFnTest) {
+    SStreamTask* pTask = NULL;
+    int64_t uid = 2222222222222;
+    SArray* array = taosArrayInit(4, POINTER_BYTES);
+    int32_t code = tNewStreamTask(uid, TASK_LEVEL__SINK, NULL, false, 0, 0, array,
+                                       false, 1, &pTask);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    initTaskLock(pTask);
+
+    SStreamTask upTask;
+    upTask = *pTask;
+    code = streamTaskSetUpstreamInfo(pTask, &upTask);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    code = streamTaskSetUpstreamInfo(pTask, &upTask);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    code = streamTaskCreateActiveChkptInfo(&pTask->chkInfo.pActiveInfo);
+    ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+    int32_t recv = 0;
+    int32_t total = 0;
+    pTask->info.taskLevel = TASK_LEVEL__SOURCE;
+    streamTaskGetTriggerRecvStatus(pTask, &recv, &total);
+    EXPECT_EQ(total, 1);
+
+    pTask->info.taskLevel = TASK_LEVEL__AGG;
+    streamTaskGetTriggerRecvStatus(pTask, &recv, &total);
+    EXPECT_EQ(total, 2);
+
+    code = streamTaskDownloadCheckpointData("123", "/root/download", 123);
+    EXPECT_NE(code, TSDB_CODE_SUCCESS);
+
+    tcsInit();
+    extern int8_t tsS3EpNum;
+    tsS3EpNum = 1;
+
+    code = uploadCheckpointToS3("123", "/tmp/backend5/stream");
+    EXPECT_EQ(code, TSDB_CODE_SUCCESS);
+
+    code = downloadCheckpointByNameS3("123", "/root/download", "");
+    EXPECT_NE(code, TSDB_CODE_OUT_OF_RANGE);
+}
diff --git a/source/libs/stream/test/streamSliceStateTest.cpp b/source/libs/stream/test/streamSliceStateTest.cpp
new file mode 100644
index 0000000000..1d62b8ca7b
--- /dev/null
+++ b/source/libs/stream/test/streamSliceStateTest.cpp
@@ -0,0 +1,75 @@
+#include <gtest/gtest.h>
+#include "tstream.h"
+#include "streamInt.h"
+#include "tcs.h"
+#include "tglobal.h"
+#include "streamState.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
+#pragma GCC diagnostic ignored "-Wpointer-arith"
+
+
+SStreamState *stateCreate2(const char *path) {
+  SStreamTask *pTask = (SStreamTask *)taosMemoryCalloc(1, sizeof(SStreamTask));
+  pTask->ver = 1024;
+  pTask->id.streamId = 1023;
+  pTask->id.taskId = 1111111;
+  SStreamMeta *pMeta = NULL;
+
+  int32_t code = streamMetaOpen((path), NULL, NULL, NULL, 0, 0, NULL, &pMeta);
+  pTask->pMeta = pMeta;
+
+  SStreamState *p = streamStateOpen((char *)path, pTask, 0, 0);
+  ASSERT(p != NULL);
+  return p;
+}
+void *backendOpen2() {
+  streamMetaInit();
+  const char   *path = "/tmp/streamslicestate/";
+  SStreamState *p = stateCreate2(path);
+  ASSERT(p != NULL);
+  return p;
+}
+
+TSKEY compareTs1(void* pKey) {
+  SWinKey* pWinKey = (SWinKey*)pKey;
+  return pWinKey->ts;
+}
+
+TEST(getHashSortNextRowFn, getHashSortNextRowTest) {
+  void   *pState = backendOpen2();
+  SStreamFileState *pFileState = NULL;
+  int32_t code = streamFileStateInit(1024, sizeof(SWinKey), 10, 0, compareTs1, pState, INT64_MAX, "aaa", 123,
+                                     STREAM_STATE_BUFF_HASH, &pFileState);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  SWinKey key1;
+  key1.groupId = 123;
+  key1.ts = 456;
+  char str[] = "abc";
+  code = streamStateFillPut_rocksdb((SStreamState*)pState, &key1, str, sizeof(str));
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  SWinKey key2;
+  key2.groupId = 123;
+  key2.ts = 460;
+  code = streamStateFillPut_rocksdb((SStreamState*)pState, &key2, str, sizeof(str));
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  SWinKey key3;
+  key3.groupId = 123;
+  void* pVal = NULL;
+  int32_t len = 0;
+  int32_t wincode = 0;
+  code = getHashSortNextRow(pFileState, &key1, &key3, &pVal, &len, &wincode);
+  ASSERT_EQ(code, TSDB_CODE_SUCCESS);
+
+  ASSERT_EQ(key3.ts, key2.ts);
+}
diff --git a/source/os/src/osString.c b/source/os/src/osString.c
index 380e9f84d3..1d07b64c70 100644
--- a/source/os/src/osString.c
+++ b/source/os/src/osString.c
@@ -405,8 +405,6 @@ bool taosMbsToUcs4(const char *mbs, size_t mbsLength, TdUcs4 *ucs4, int32_t ucs4
   size_t ucs4_input_len = mbsLength;
   size_t outLeft = ucs4_max_len;
   if (iconv(conv, (char **)&mbs, &ucs4_input_len, (char **)&ucs4, &outLeft) == -1) {
-    char buf[512] = {0};
-    snprintf(buf, tListLen(buf), " taosMbsToUcs4 error:%s %d %d", strerror(terrno), errno, EILSEQ);
     terrno = TAOS_SYSTEM_ERROR(errno);
     taosReleaseConv(idx, conv, M2C, charsetCxt);
     return false;
diff --git a/source/os/src/osTime.c b/source/os/src/osTime.c
index 75cb2b91a2..3bab3e7e25 100644
--- a/source/os/src/osTime.c
+++ b/source/os/src/osTime.c
@@ -454,7 +454,8 @@ struct tm *taosGmTimeR(const time_t *timep, struct tm *result) {
     return NULL;
   }
 #ifdef WINDOWS
-  return gmtime_s(result, timep);
+  errno_t code = gmtime_s(result, timep);
+  return (code == 0) ? result : NULL;
 #else
   return gmtime_r(timep, result);
 #endif
diff --git a/source/os/test/osTimeTests.cpp b/source/os/test/osTimeTests.cpp
index 1d34587ad8..d1ce654a76 100644
--- a/source/os/test/osTimeTests.cpp
+++ b/source/os/test/osTimeTests.cpp
@@ -94,6 +94,35 @@ TEST(osTimeTests, taosLocalTime) {
 #endif
 }
 
+TEST(osTimeTests, taosGmTimeR) {
+  // Test 1: Test when both timep and result are not NULL
+  time_t     timep = 1617531000;  // 2021-04-04 18:10:00
+  struct tm  tmInfo;
+  ASSERT_NE(taosGmTimeR(&timep, &tmInfo), nullptr);
+
+  char buf[128];
+  taosStrfTime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S", &tmInfo);
+  ASSERT_STREQ(buf, "2021-04-04T10:10:00");
+}
+
+TEST(osTimeTests, taosTimeGm) {
+  char *timestr= "2021-04-04T18:10:00";
+  struct tm tm = {0};
+
+  taosStrpTime(timestr, "%Y-%m-%dT%H:%M:%S", &tm);
+  int64_t seconds = taosTimeGm(&tm);
+  ASSERT_EQ(seconds, 1617559800);
+}
+
+TEST(osTimeTests, taosMktime) {
+  char *timestr= "2021-04-04T18:10:00";
+  struct tm tm = {0};
+
+  taosStrpTime(timestr, "%Y-%m-%dT%H:%M:%S", &tm);
+  time_t seconds = taosMktime(&tm, NULL);
+  ASSERT_EQ(seconds, 1617531000);
+}
+
 TEST(osTimeTests, invalidParameter) {
   void          *retp = NULL;
   int32_t        reti = 0;
diff --git a/source/util/src/tdecompressavx.c b/source/util/src/tdecompressavx.c
index 143867b783..5077950c5d 100644
--- a/source/util/src/tdecompressavx.c
+++ b/source/util/src/tdecompressavx.c
@@ -22,7 +22,7 @@ char tsSIMDEnable = 0;
 #endif
 
 int32_t tsDecompressIntImpl_Hw(const char *const input, const int32_t nelements, char *const output, const char type) {
-#ifdef __AVX2__
+#ifdef __AVX512F__
   int32_t word_length = getWordLength(type);
 
   // Selector value:           0  1   2   3   4   5   6   7   8  9  10  11 12  13  14  15
@@ -53,183 +53,79 @@ int32_t tsDecompressIntImpl_Hw(const char *const input, const int32_t nelements,
         int32_t gRemainder = (nelements - _pos);
         int32_t num = (gRemainder > elems) ? elems : gRemainder;
 
-        int32_t batch = 0;
-        int32_t remain = 0;
-        if (tsSIMDEnable && tsAVX512Supported && tsAVX512Enable) {
-#ifdef __AVX512F__
-          batch = num >> 3;
-          remain = num & 0x07;
-#endif
-        } else if (tsSIMDEnable && tsAVX2Supported) {
-#ifdef __AVX2__
-          batch = num >> 2;
-          remain = num & 0x03;
-#endif
-        }
+        int32_t batch = num >> 3;
+        int32_t remain = num & 0x07;
 
         if (selector == 0 || selector == 1) {
-          if (tsSIMDEnable && tsAVX512Supported && tsAVX512Enable) {
-#ifdef __AVX512F__
-            for (int32_t i = 0; i < batch; ++i) {
-              __m512i prev = _mm512_set1_epi64(prevValue);
-              _mm512_storeu_si512((__m512i *)&p[_pos], prev);
-              _pos += 8;  // handle 64bit x 8 = 512bit
-            }
-            for (int32_t i = 0; i < remain; ++i) {
-              p[_pos++] = prevValue;
-            }
-#endif
-          } else if (tsSIMDEnable && tsAVX2Supported) {
-            for (int32_t i = 0; i < batch; ++i) {
-              __m256i prev = _mm256_set1_epi64x(prevValue);
-              _mm256_storeu_si256((__m256i *)&p[_pos], prev);
-              _pos += 4;
-            }
-
-            for (int32_t i = 0; i < remain; ++i) {
-              p[_pos++] = prevValue;
-            }
-
-          } else {  // alternative implementation without SIMD instructions.
-            for (int32_t i = 0; i < elems && count < nelements; i++, count++) {
-              p[_pos++] = prevValue;
-              v += bit;
-            }
+          for (int32_t i = 0; i < batch; ++i) {
+            __m512i prev = _mm512_set1_epi64(prevValue);
+            _mm512_storeu_si512((__m512i *)&p[_pos], prev);
+            _pos += 8;  // handle 64bit x 8 = 512bit
+          }
+          for (int32_t i = 0; i < remain; ++i) {
+            p[_pos++] = prevValue;
           }
         } else {
-          if (tsSIMDEnable && tsAVX512Supported && tsAVX512Enable) {
-#ifdef __AVX512F__
-            __m512i sum_mask1 = _mm512_set_epi64(6, 6, 4, 4, 2, 2, 0, 0);
-            __m512i sum_mask2 = _mm512_set_epi64(5, 5, 5, 5, 1, 1, 1, 1);
-            __m512i sum_mask3 = _mm512_set_epi64(3, 3, 3, 3, 3, 3, 3, 3);
-            __m512i base = _mm512_set1_epi64(w);
-            __m512i maskVal = _mm512_set1_epi64(mask);
-            __m512i shiftBits = _mm512_set_epi64(bit * 7 + 4, bit * 6 + 4, bit * 5 + 4, bit * 4 + 4, bit * 3 + 4,
-                                                 bit * 2 + 4, bit + 4, 4);
-            __m512i inc = _mm512_set1_epi64(bit << 3);
+          __m512i sum_mask1 = _mm512_set_epi64(6, 6, 4, 4, 2, 2, 0, 0);
+          __m512i sum_mask2 = _mm512_set_epi64(5, 5, 5, 5, 1, 1, 1, 1);
+          __m512i sum_mask3 = _mm512_set_epi64(3, 3, 3, 3, 3, 3, 3, 3);
+          __m512i base = _mm512_set1_epi64(w);
+          __m512i maskVal = _mm512_set1_epi64(mask);
+          __m512i shiftBits = _mm512_set_epi64(bit * 7 + 4, bit * 6 + 4, bit * 5 + 4, bit * 4 + 4, bit * 3 + 4,
+                                               bit * 2 + 4, bit + 4, 4);
+          __m512i inc = _mm512_set1_epi64(bit << 3);
 
-            for (int32_t i = 0; i < batch; ++i) {
-              __m512i after = _mm512_srlv_epi64(base, shiftBits);
-              __m512i zigzagVal = _mm512_and_si512(after, maskVal);
+          for (int32_t i = 0; i < batch; ++i) {
+            __m512i after = _mm512_srlv_epi64(base, shiftBits);
+            __m512i zigzagVal = _mm512_and_si512(after, maskVal);
 
-              // ZIGZAG_DECODE(T, v) (((v) >> 1) ^ -((T)((v)&1)))
-              __m512i signmask = _mm512_and_si512(_mm512_set1_epi64(1), zigzagVal);
-              signmask = _mm512_sub_epi64(_mm512_setzero_si512(), signmask);
-              __m512i delta = _mm512_xor_si512(_mm512_srli_epi64(zigzagVal, 1), signmask);
+            // ZIGZAG_DECODE(T, v) (((v) >> 1) ^ -((T)((v)&1)))
+            __m512i signmask = _mm512_and_si512(_mm512_set1_epi64(1), zigzagVal);
+            signmask = _mm512_sub_epi64(_mm512_setzero_si512(), signmask);
+            __m512i delta = _mm512_xor_si512(_mm512_srli_epi64(zigzagVal, 1), signmask);
 
-              // calculate the cumulative sum (prefix sum) for each number
-              // decode[0] =  prevValue + final[0]
-              // decode[1] = decode[0] + final[1]   -----> prevValue + final[0] + final[1]
-              // decode[2] = decode[1] + final[2]   -----> prevValue + final[0] + final[1] + final[2]
-              // decode[3] = decode[2] + final[3]   -----> prevValue + final[0] + final[1] + final[2] + final[3]
+            // calculate the cumulative sum (prefix sum) for each number
+            // decode[0] =  prevValue + final[0]
+            // decode[1] = decode[0] + final[1]   -----> prevValue + final[0] + final[1]
+            // decode[2] = decode[1] + final[2]   -----> prevValue + final[0] + final[1] + final[2]
+            // decode[3] = decode[2] + final[3]   -----> prevValue + final[0] + final[1] + final[2] + final[3]
 
-              // 7		6		5		4		3		2		1
-              // 0 D7		D6		D5		D4		D3		D2		D1
-              // D0 D6		0		D4		0		D2		0		D0
-              // 0 D7+D6		D6		D5+D4		D4		D3+D2		D2
-              // D1+D0		D0 13		6		9		4		5		2
-              // 1		0
-              __m512i prev = _mm512_set1_epi64(prevValue);
-              __m512i cum_sum = _mm512_add_epi64(delta, _mm512_maskz_permutexvar_epi64(0xaa, sum_mask1, delta));
-              cum_sum = _mm512_add_epi64(cum_sum, _mm512_maskz_permutexvar_epi64(0xcc, sum_mask2, cum_sum));
-              cum_sum = _mm512_add_epi64(cum_sum, _mm512_maskz_permutexvar_epi64(0xf0, sum_mask3, cum_sum));
+            // 7		6		5		4		3		2		1
+            // 0 D7		D6		D5		D4		D3		D2		D1
+            // D0 D6		0		D4		0		D2		0		D0
+            // 0 D7+D6		D6		D5+D4		D4		D3+D2		D2
+            // D1+D0		D0 13		6		9		4		5		2
+            // 1		0
+            __m512i prev = _mm512_set1_epi64(prevValue);
+            __m512i cum_sum = _mm512_add_epi64(delta, _mm512_maskz_permutexvar_epi64(0xaa, sum_mask1, delta));
+            cum_sum = _mm512_add_epi64(cum_sum, _mm512_maskz_permutexvar_epi64(0xcc, sum_mask2, cum_sum));
+            cum_sum = _mm512_add_epi64(cum_sum, _mm512_maskz_permutexvar_epi64(0xf0, sum_mask3, cum_sum));
 
-              // 13		6		9		4		5		2		1
-              // 0 D7,D6		D6		D5,D4		D4		D3,D2		D2
-              // D1,D0		D0 +D5,D4	D5,D4,		0		0		D1,D0		D1,D0
-              // 0		0 D7~D4		D6~D4		D5~D4		D4		D3~D0		D2~D0
-              // D1~D0		D0 22		15		9		4		6		3
-              // 1		0
-              //
-              // D3~D0		D3~D0		D3~D0		D3~D0		0		0		0
-              // 0 28		21		15		10		6		3		1
-              // 0
+            // 13		6		9		4		5		2		1
+            // 0 D7,D6		D6		D5,D4		D4		D3,D2		D2
+            // D1,D0		D0 +D5,D4	D5,D4,		0		0		D1,D0		D1,D0
+            // 0		0 D7~D4		D6~D4		D5~D4		D4		D3~D0		D2~D0
+            // D1~D0		D0 22		15		9		4		6		3
+            // 1		0
+            //
+            // D3~D0		D3~D0		D3~D0		D3~D0		0		0		0
+            // 0 28		21		15		10		6		3		1
+            // 0
 
-              cum_sum = _mm512_add_epi64(cum_sum, prev);
-              _mm512_storeu_si512((__m512i *)&p[_pos], cum_sum);
+            cum_sum = _mm512_add_epi64(cum_sum, prev);
+            _mm512_storeu_si512((__m512i *)&p[_pos], cum_sum);
 
-              shiftBits = _mm512_add_epi64(shiftBits, inc);
-              prevValue = p[_pos + 7];
-              _pos += 8;
-            }
-            // handle the remain value
-            for (int32_t i = 0; i < remain; i++) {
-              zigzag_value = ((w >> (v + (batch * bit * 8))) & mask);
-              prevValue += ZIGZAG_DECODE(int64_t, zigzag_value);
+            shiftBits = _mm512_add_epi64(shiftBits, inc);
+            prevValue = p[_pos + 7];
+            _pos += 8;
+          }
+          // handle the remain value
+          for (int32_t i = 0; i < remain; i++) {
+            zigzag_value = ((w >> (v + (batch * bit * 8))) & mask);
+            prevValue += ZIGZAG_DECODE(int64_t, zigzag_value);
 
-              p[_pos++] = prevValue;
-              v += bit;
-            }
-#endif
-          } else if (tsSIMDEnable && tsAVX2Supported) {
-            __m256i base = _mm256_set1_epi64x(w);
-            __m256i maskVal = _mm256_set1_epi64x(mask);
-
-            __m256i shiftBits = _mm256_set_epi64x(bit * 3 + 4, bit * 2 + 4, bit + 4, 4);
-            __m256i inc = _mm256_set1_epi64x(bit << 2);
-
-            for (int32_t i = 0; i < batch; ++i) {
-              __m256i after = _mm256_srlv_epi64(base, shiftBits);
-              __m256i zigzagVal = _mm256_and_si256(after, maskVal);
-
-              // ZIGZAG_DECODE(T, v) (((v) >> 1) ^ -((T)((v)&1)))
-              __m256i signmask = _mm256_and_si256(_mm256_set1_epi64x(1), zigzagVal);
-              signmask = _mm256_sub_epi64(_mm256_setzero_si256(), signmask);
-
-              // get four zigzag values here
-              __m256i delta = _mm256_xor_si256(_mm256_srli_epi64(zigzagVal, 1), signmask);
-
-              // calculate the cumulative sum (prefix sum) for each number
-              // decode[0] = prevValue + final[0]
-              // decode[1] = decode[0] + final[1]   -----> prevValue + final[0] + final[1]
-              // decode[2] = decode[1] + final[2]   -----> prevValue + final[0] + final[1] + final[2]
-              // decode[3] = decode[2] + final[3]   -----> prevValue + final[0] + final[1] + final[2] + final[3]
-
-              //  1, 2, 3, 4
-              //+ 0, 1, 0, 3
-              //  1, 3, 3, 7
-              // shift and add for the first round
-              __m128i prev = _mm_set1_epi64x(prevValue);
-              __m256i x = _mm256_slli_si256(delta, 8);
-
-              delta = _mm256_add_epi64(delta, x);
-              _mm256_storeu_si256((__m256i *)&p[_pos], delta);
-
-              //  1, 3, 3, 7
-              //+ 0, 0, 3, 3
-              //  1, 3, 6, 10
-              // shift and add operation for the second round
-              __m128i firstPart = _mm_loadu_si128((__m128i *)&p[_pos]);
-              __m128i secondItem = _mm_set1_epi64x(p[_pos + 1]);
-              __m128i secPart = _mm_add_epi64(_mm_loadu_si128((__m128i *)&p[_pos + 2]), secondItem);
-              firstPart = _mm_add_epi64(firstPart, prev);
-              secPart = _mm_add_epi64(secPart, prev);
-
-              // save it in the memory
-              _mm_storeu_si128((__m128i *)&p[_pos], firstPart);
-              _mm_storeu_si128((__m128i *)&p[_pos + 2], secPart);
-
-              shiftBits = _mm256_add_epi64(shiftBits, inc);
-              prevValue = p[_pos + 3];
-              _pos += 4;
-            }
-
-            // handle the remain value
-            for (int32_t i = 0; i < remain; i++) {
-              zigzag_value = ((w >> (v + (batch * bit * 4))) & mask);
-              prevValue += ZIGZAG_DECODE(int64_t, zigzag_value);
-
-              p[_pos++] = prevValue;
-              v += bit;
-            }
-          } else {  // alternative implementation without SIMD instructions.
-            for (int32_t i = 0; i < elems && count < nelements; i++, count++) {
-              zigzag_value = ((w >> v) & mask);
-              prevValue += ZIGZAG_DECODE(int64_t, zigzag_value);
-
-              p[_pos++] = prevValue;
-              v += bit;
-            }
+            p[_pos++] = prevValue;
+            v += bit;
           }
         }
       } break;
@@ -292,7 +188,7 @@ int32_t tsDecompressIntImpl_Hw(const char *const input, const int32_t nelements,
 
   return nelements * word_length;
 #else
-  uError("unable run %s without avx2 instructions", __func__);
+  uError("unable run %s without avx512 instructions", __func__);
   return -1;
 #endif
 }
diff --git a/source/util/src/tworker.c b/source/util/src/tworker.c
index 6370e6ca50..dbd8cb159e 100644
--- a/source/util/src/tworker.c
+++ b/source/util/src/tworker.c
@@ -823,6 +823,8 @@ bool tQueryAutoQWorkerTryRecycleWorker(SQueryAutoQWorkerPool *pPool, SQueryAutoQ
 int32_t tQueryAutoQWorkerInit(SQueryAutoQWorkerPool *pool) {
   int32_t code;
 
+  pool->exit = false;
+
   (void)taosThreadMutexInit(&pool->poolLock, NULL);
   (void)taosThreadMutexInit(&pool->backupLock, NULL);
   (void)taosThreadMutexInit(&pool->waitingAfterBlockLock, NULL);
diff --git a/source/util/test/CMakeLists.txt b/source/util/test/CMakeLists.txt
index 655557b180..cde1392216 100644
--- a/source/util/test/CMakeLists.txt
+++ b/source/util/test/CMakeLists.txt
@@ -138,6 +138,10 @@ add_test(
     COMMAND logTest
 )
 
+IF(COMPILER_SUPPORT_AVX2)
+    MESSAGE(STATUS "AVX2 instructions is ACTIVATED")
+    set_source_files_properties(decompressTest.cpp PROPERTIES COMPILE_FLAGS -mavx2)
+ENDIF()
 add_executable(decompressTest "decompressTest.cpp")
 target_link_libraries(decompressTest os util common gtest_main)
 add_test(
@@ -145,6 +149,16 @@ add_test(
     COMMAND decompressTest
 )
 
+
+IF($TD_LINUX)
+    add_executable(utilTests "utilTests.cpp")
+    target_link_libraries(utilTests os util common gtest_main)
+    add_test(
+        NAME utilTests
+        COMMAND utilTests
+    )
+ENDIF()
+
 if(${TD_LINUX})
     # terrorTest
     add_executable(terrorTest "terrorTest.cpp")
diff --git a/source/util/test/memPoolTest.cpp b/source/util/test/memPoolTest.cpp
index d0c08b1318..a8da96711d 100644
--- a/source/util/test/memPoolTest.cpp
+++ b/source/util/test/memPoolTest.cpp
@@ -2048,7 +2048,252 @@ TEST(DisablePoolFuncTest, MultiThreadTest) {
 }
 #endif
 
+#if 1
+TEST(functionsTest, internalFunc) {
+  char* caseName = "functionsTest:internalFunc";
+  int32_t code = 0;
 
+  int64_t msize = 10;
+  void* pSession = NULL;
+  void* pJob = NULL;
+  
+  mptInitPool();
+
+  memset(mptCtx.jobCtxs, 0, sizeof(*mptCtx.jobCtxs));
+
+  assert(0 == taosMemPoolCallocJob(0, 0, (void**)&pJob));
+  assert(0 == taosMemPoolInitSession(gMemPoolHandle, &pSession, pJob, "id"));
+
+  int32_t loopTimes = 1;
+  int64_t st = 0;
+  void **addrList = (void**)taosMemCalloc(loopTimes, POINTER_BYTES);
+  
+
+  // MALLOC 
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMalloc(msize);
+  }
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMalloc(msize);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMalloc(msize);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  // CALLOC 
+
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryCalloc(1, msize);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryCalloc(1, msize);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryCalloc(1, msize);
+  }
+  //mptFreeAddrList(addrList, loopTimes);  NO FREE FOR REALLOC
+
+  // REALLOC 
+
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryRealloc(addrList[i], msize);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryRealloc(addrList[i], msize);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryRealloc(addrList[i], msize);
+  }
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  // STRDUP 
+  
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptStrdup("abc");
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptStrdup("abc");
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptStrdup("abc");
+  }
+  mptFreeAddrList(addrList, loopTimes);
+
+  // STRNDUP 
+  
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptStrndup("abc", 3);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptStrndup("abc", 3);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptStrndup("abc", 3);
+  }
+  mptFreeAddrList(addrList, loopTimes);
+
+  // ALIGNALLOC 
+  
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMallocAlign(8, msize);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMallocAlign(8, msize);
+  }
+  mptDisableMemoryPoolUsage();
+  mptFreeAddrList(addrList, loopTimes);
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMallocAlign(8, msize);
+  }
+  //mptFreeAddrList(addrList, loopTimes);  NO FREE FOR GETSIZE
+
+
+  // GETSIZE 
+  
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemorySize(addrList[i]);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemorySize(addrList[i]);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemorySize(addrList[i]);
+  }
+
+  // FREE 
+  
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemoryFree(addrList[i]);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMalloc(msize);
+  }
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemoryFree(addrList[i]);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    addrList[i] = (char*)mptMemoryMalloc(msize);
+  }
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemoryFree(addrList[i]);
+  }
+
+  // TRIM
+
+  bool trimed = false;
+  tsMemPoolFullFunc = 0;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemoryTrim(0, NULL);
+    mptMemoryTrim(0, &trimed);
+  }
+  mptDisableMemoryPoolUsage();
+
+
+  tsMemPoolFullFunc = 1;
+  mptEnableMemoryPoolUsage(gMemPoolHandle, pSession);
+  for (int32_t i = 0; i < loopTimes; ++i) {
+    mptMemoryTrim(0, NULL);
+    mptMemoryTrim(0, &trimed);
+  }
+  mptDisableMemoryPoolUsage();
+
+  
+}
+#endif
 
 
 #endif
diff --git a/source/util/test/utilTests.cpp b/source/util/test/utilTests.cpp
index cb78743018..9a42213929 100644
--- a/source/util/test/utilTests.cpp
+++ b/source/util/test/utilTests.cpp
@@ -6,6 +6,7 @@
 
 #include "tarray.h"
 #include "tcompare.h"
+#include "tdatablock.h"
 
 namespace {
 }  // namespace
@@ -474,3 +475,67 @@ TEST(tsma, reverse_unit) {
   ASSERT_FALSE(tsmaIntervalCheck(12, 'n', 1, 'y', TSDB_TIME_PRECISION_NANO));
   ASSERT_TRUE(tsmaIntervalCheck(3, 'n', 1, 'y', TSDB_TIME_PRECISION_NANO));
 }
+
+template <int16_t type, typename ValType, typename F>
+void dataBlockNullTest(const F& setValFunc) {
+  int32_t         totalRows = 16;
+  SColumnInfoData columnInfoData = createColumnInfoData(type, tDataTypes[type].bytes, 0);
+  SColumnDataAgg  columnDataAgg = {.numOfNull = 0};
+
+  auto checkNull = [totalRows, &columnInfoData, &columnDataAgg](uint32_t row, bool expected) {
+    EXPECT_EQ(colDataIsNull_s(&columnInfoData, row), expected);
+    EXPECT_EQ(colDataIsNull_t(&columnInfoData, row, IS_VAR_DATA_TYPE(columnInfoData.info.type)), expected);
+    EXPECT_EQ(colDataIsNull(&columnInfoData, totalRows, row, NULL), expected);
+    columnDataAgg.numOfNull = totalRows;
+    EXPECT_EQ(colDataIsNull(&columnInfoData, totalRows, row, &columnDataAgg), columnInfoData.hasNull);
+    columnDataAgg.numOfNull = 0;
+    EXPECT_EQ(colDataIsNull(&columnInfoData, totalRows, row, &columnDataAgg), false);
+  };
+
+  columnInfoData.hasNull = false;
+  checkNull(0, false);
+  checkNull(1, false);
+  checkNull(2, false);
+  checkNull(totalRows - 2, false);
+  checkNull(totalRows - 1, false);
+
+  if (IS_VAR_DATA_TYPE(type)) {
+    columnInfoData.varmeta.offset = (int32_t*)taosMemoryCalloc(totalRows, sizeof(int32_t));
+  } else {
+    columnInfoData.pData = (char*)taosMemoryCalloc(totalRows, tDataTypes[type].bytes);
+    columnInfoData.nullbitmap = (char*)taosMemoryCalloc(((totalRows - 1) >> NBIT) + 1, 1);
+    ValType val = 1;
+    setValFunc(&columnInfoData, 1, &val);
+    val = 2;
+    setValFunc(&columnInfoData, 2, &val);
+  }
+  colDataSetNULL(&columnInfoData, 0);
+  colDataSetNNULL(&columnInfoData, 3, totalRows - 3);
+  checkNull(0, true);
+  checkNull(1, false);
+  checkNull(2, false);
+  checkNull(totalRows - 2, true);
+  checkNull(totalRows - 1, true);
+
+  if (IS_VAR_DATA_TYPE(type)) {
+    taosMemoryFreeClear(columnInfoData.varmeta.offset);
+  } else {
+    taosMemoryFreeClear(columnInfoData.pData);
+    taosMemoryFreeClear(columnInfoData.nullbitmap);
+    checkNull(0, false);
+    checkNull(1, false);
+    checkNull(2, false);
+    checkNull(totalRows - 2, false);
+    checkNull(totalRows - 1, false);
+  }
+}
+
+TEST(utilTest, tdatablockTestNull) {
+  dataBlockNullTest<TSDB_DATA_TYPE_TINYINT, int8_t>(colDataSetInt8);
+  dataBlockNullTest<TSDB_DATA_TYPE_SMALLINT, int16_t>(colDataSetInt16);
+  dataBlockNullTest<TSDB_DATA_TYPE_INT, int32_t>(colDataSetInt32);
+  dataBlockNullTest<TSDB_DATA_TYPE_BIGINT, int64_t>(colDataSetInt64);
+  dataBlockNullTest<TSDB_DATA_TYPE_FLOAT, float>(colDataSetFloat);
+  dataBlockNullTest<TSDB_DATA_TYPE_DOUBLE, double>(colDataSetDouble);
+  dataBlockNullTest<TSDB_DATA_TYPE_VARCHAR, int64_t>(colDataSetInt64);
+}
diff --git a/tests/army/cluster/arbitrator.py b/tests/army/cluster/arbitrator.py
new file mode 100644
index 0000000000..9fd8e7b1f3
--- /dev/null
+++ b/tests/army/cluster/arbitrator.py
@@ -0,0 +1,81 @@
+import taos
+import sys
+import os
+import subprocess
+import glob
+import shutil
+import time
+
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.srvCtl import *
+from frame.caseBase import *
+from frame import *
+from frame.autogen import *
+from frame import epath
+# from frame.server.dnodes import *
+# from frame.server.cluster import *
+
+
+class TDTestCase(TBase):
+    
+    def init(self, conn, logSql, replicaVar=1):
+        updatecfgDict = {'dDebugFlag':131}
+        super(TDTestCase, self).init(conn, logSql, replicaVar=1, checkColName="c1")
+        
+        self.valgrind = 0
+        self.db = "test"
+        self.stb = "meters"
+        self.childtable_count = 10
+        tdSql.init(conn.cursor(), logSql)  
+
+    def run(self):
+        tdSql.execute('CREATE DATABASE db vgroups 1 replica 2;')
+
+        time.sleep(1)
+
+        count = 0
+
+        while count < 100:        
+            tdSql.query("show arbgroups;")
+
+            if tdSql.getData(0, 4) == 1:
+                break
+
+            tdLog.info("wait 1 seconds for is sync")
+            time.sleep(1)
+
+            count += 1
+            
+
+        tdSql.query("show db.vgroups;")
+
+        if(tdSql.getData(0, 4) == "follower") and (tdSql.getData(0, 6) == "leader"):
+            tdLog.info("stop dnode2")
+            sc.dnodeStop(2)
+
+        if(tdSql.getData(0, 6) == "follower") and (tdSql.getData(0, 4) == "leader"):
+            tdLog.info("stop dnode 3")
+            sc.dnodeStop(3)
+
+        
+        count = 0
+        while count < 100:
+            tdSql.query("show db.vgroups;")
+
+            if(tdSql.getData(0, 4) == "assigned ") or (tdSql.getData(0, 6) == "assigned "):
+                break
+            
+            tdLog.info("wait 1 seconds for set assigned")
+            time.sleep(1)
+
+            count += 1
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/army/query/function/ans/leastsquares.csv b/tests/army/query/function/ans/leastsquares.csv
new file mode 100644
index 0000000000..3d5cd33336
--- /dev/null
+++ b/tests/army/query/function/ans/leastsquares.csv
@@ -0,0 +1,56 @@
+
+taos> select leastsquares(1, 1, 1)
+     leastsquares(1, 1, 1)      |
+=================================
+ {slop:-nan, intercept:-nan}    |
+
+taos> select leastsquares(cast(1.1 as float), 1, 1)
+ leastsquares(cast(1.1 as float), 1, 1) |
+=========================================
+ {slop:-nan, intercept:-nan}            |
+
+taos> select leastsquares(cast(1.1 as double), 1, 1)
+ leastsquares(cast(1.1 as double), 1, 1) |
+==========================================
+ {slop:-nan, intercept:-nan}             |
+
+taos> select leastsquares(cast(1 as tinyint), 1, 1)
+ leastsquares(cast(1 as tinyint), 1, 1) |
+=========================================
+ {slop:-nan, intercept:-nan}            |
+
+taos> select leastsquares(cast(100 as smallint), 1, 1)
+ leastsquares(cast(100 as smallint), 1, 1) |
+============================================
+ {slop:-nan, intercept:-nan}               |
+
+taos> select leastsquares(cast(100000 as int), 1, 1)
+ leastsquares(cast(100000 as int), 1, 1) |
+==========================================
+ {slop:-nan, intercept:-nan}             |
+
+taos> select leastsquares(cast(10000000000 as bigint), 1, 1)
+ leastsquares(cast(10000000000 as bigint), 1, 1) |
+==================================================
+ {slop:-nan, intercept:-nan}                     |
+
+taos> select leastsquares(cast(1 as tinyint unsigned), 1, 1)
+ leastsquares(cast(1 as tinyint unsigned), 1, 1) |
+==================================================
+ {slop:-nan, intercept:-nan}                     |
+
+taos> select leastsquares(cast(100 as smallint unsigned), 1, 1)
+ leastsquares(cast(100 as smallint unsigned), 1, 1) |
+=====================================================
+ {slop:-nan, intercept:-nan}                        |
+
+taos> select leastsquares(cast(100000 as int unsigned), 1, 1)
+ leastsquares(cast(100000 as int unsigned), 1, 1) |
+===================================================
+ {slop:-nan, intercept:-nan}                      |
+
+taos> select leastsquares(cast(10000000000 as bigint unsigned), 1, 1)
+ leastsquares(cast(10000000000 as bigint unsigned), 1, 1) |
+===========================================================
+ {slop:-nan, intercept:-nan}                              |
+
diff --git a/tests/army/query/function/ans/max.csv b/tests/army/query/function/ans/max.csv
index f150ad1208..1570e1ebc9 100644
--- a/tests/army/query/function/ans/max.csv
+++ b/tests/army/query/function/ans/max.csv
@@ -603,3 +603,58 @@ taos> select location, max(current) from ts_4893.meters group by location order
 ============================================
  beijing            |           11.9989996 |
 
+taos> select max(1)
+        max(1)         |
+========================
+                     1 |
+
+taos> select max(cast(1 as tinyint))
+ max(cast(1 as tinyint)) |
+==========================
+                       1 |
+
+taos> select max(cast(100 as smallint))
+ max(cast(100 as smallint)) |
+=============================
+                        100 |
+
+taos> select max(cast(100000 as int))
+ max(cast(100000 as int)) |
+===========================
+                   100000 |
+
+taos> select max(cast(10000000000 as bigint))
+ max(cast(10000000000 as bigint)) |
+===================================
+                      10000000000 |
+
+taos> select max(cast(1 as tinyint unsigned))
+ max(cast(1 as tinyint unsigned)) |
+===================================
+                                1 |
+
+taos> select max(cast(100 as smallint unsigned))
+ max(cast(100 as smallint unsigned)) |
+======================================
+                                 100 |
+
+taos> select max(cast(100000 as int unsigned))
+ max(cast(100000 as int unsigned)) |
+====================================
+                            100000 |
+
+taos> select max(cast(10000000000 as bigint unsigned))
+ max(cast(10000000000 as bigint unsigned)) |
+============================================
+                               10000000000 |
+
+taos> select max(cast(1.1 as float))
+ max(cast(1.1 as float)) |
+==========================
+           1.1000000e+00 |
+
+taos> select max(cast(1.1 as double))
+ max(cast(1.1 as double))  |
+============================
+         1.100000000000000 |
+
diff --git a/tests/army/query/function/ans/min.csv b/tests/army/query/function/ans/min.csv
index 9a8ba15287..1ea0c47e81 100644
--- a/tests/army/query/function/ans/min.csv
+++ b/tests/army/query/function/ans/min.csv
@@ -603,3 +603,58 @@ taos> select location, min(id) from ts_4893.meters group by location order by lo
 ===================================
  beijing            |           0 |
 
+taos> select min(1)
+        min(1)         |
+========================
+                     1 |
+
+taos> select min(cast(1 as tinyint))
+ min(cast(1 as tinyint)) |
+==========================
+                       1 |
+
+taos> select min(cast(100 as smallint))
+ min(cast(100 as smallint)) |
+=============================
+                        100 |
+
+taos> select min(cast(100000 as int))
+ min(cast(100000 as int)) |
+===========================
+                   100000 |
+
+taos> select min(cast(10000000000 as bigint))
+ min(cast(10000000000 as bigint)) |
+===================================
+                      10000000000 |
+
+taos> select min(cast(1 as tinyint unsigned))
+ min(cast(1 as tinyint unsigned)) |
+===================================
+                                1 |
+
+taos> select min(cast(100 as smallint unsigned))
+ min(cast(100 as smallint unsigned)) |
+======================================
+                                 100 |
+
+taos> select min(cast(100000 as int unsigned))
+ min(cast(100000 as int unsigned)) |
+====================================
+                            100000 |
+
+taos> select min(cast(10000000000 as bigint unsigned))
+ min(cast(10000000000 as bigint unsigned)) |
+============================================
+                               10000000000 |
+
+taos> select min(cast(1.1 as float))
+ min(cast(1.1 as float)) |
+==========================
+           1.1000000e+00 |
+
+taos> select min(cast(1.1 as double))
+ min(cast(1.1 as double))  |
+============================
+         1.100000000000000 |
+
diff --git a/tests/army/query/function/ans/round.csv b/tests/army/query/function/ans/round.csv
index 1b6ed548e7..4f9151c1ad 100644
--- a/tests/army/query/function/ans/round.csv
+++ b/tests/army/query/function/ans/round.csv
@@ -308,3 +308,53 @@ taos> select round(log(current), 2) from ts_4893.meters limit 1
 ============================
          2.370000000000000 |
 
+taos> select round(cast(1.0e+400 as float), 0);
+ round(cast(1.0e+400 as float), 0) |
+====================================
+ NULL                              |
+
+taos> select round(cast(1.0e+400 as double), 0);
+ round(cast(1.0e+400 as double), 0) |
+=====================================
+ NULL                               |
+
+taos> select round(cast(5 as tinyint), 1);
+ round(cast(5 as tinyint), 1) |
+===============================
+                            5 |
+
+taos> select round(cast(50 as smallint), 1);
+ round(cast(50 as smallint), 1) |
+=================================
+                             50 |
+
+taos> select round(cast(500 as int), 1);
+ round(cast(500 as int), 1) |
+=============================
+                        500 |
+
+taos> select round(cast(50000 as bigint), 1);
+ round(cast(50000 as bigint), 1) |
+==================================
+                           50000 |
+
+taos> select round(cast(5 as TINYINT UNSIGNED), 1);
+ round(cast(5 as tinyint unsigned), 1) |
+========================================
+                                     5 |
+
+taos> select round(cast(50 as smallint unsigned), 1);
+ round(cast(50 as smallint unsigned), 1) |
+==========================================
+                                      50 |
+
+taos> select round(cast(500 as int unsigned), 1);
+ round(cast(500 as int unsigned), 1) |
+======================================
+                                 500 |
+
+taos> select round(cast(50000 as bigint unsigned), 1)
+ round(cast(50000 as bigint unsigned), 1) |
+===========================================
+                                    50000 |
+
diff --git a/tests/army/query/function/ans/sign.csv b/tests/army/query/function/ans/sign.csv
index e15b4a74c7..45679af07f 100644
--- a/tests/army/query/function/ans/sign.csv
+++ b/tests/army/query/function/ans/sign.csv
@@ -121,6 +121,106 @@ taos> select SIGN(id) + id from ts_4893.meters order by ts limit 5
          4.000000000000000 |
          5.000000000000000 |
 
+taos> select sign(cast(1 as tinyint))
+ sign(cast(1 as tinyint)) |
+===========================
+                        1 |
+
+taos> select sign(cast(1 as smallint))
+ sign(cast(1 as smallint)) |
+============================
+                         1 |
+
+taos> select sign(cast(1 as int))
+ sign(cast(1 as int)) |
+=======================
+                    1 |
+
+taos> select sign(cast(1 as bigint))
+ sign(cast(1 as bigint)) |
+==========================
+                       1 |
+
+taos> select sign(cast(1 as tinyint unsigned))
+ sign(cast(1 as tinyint unsigned)) |
+====================================
+                                 1 |
+
+taos> select sign(cast(1 as smallint unsigned))
+ sign(cast(1 as smallint unsigned)) |
+=====================================
+                                  1 |
+
+taos> select sign(cast(1 as int unsigned))
+ sign(cast(1 as int unsigned)) |
+================================
+                             1 |
+
+taos> select sign(cast(1 as bigint unsigned))
+ sign(cast(1 as bigint unsigned)) |
+===================================
+                                1 |
+
+taos> select sign(cast(1 as float))
+ sign(cast(1 as float)) |
+=========================
+          1.0000000e+00 |
+
+taos> select sign(cast(1 as double))
+  sign(cast(1 as double))  |
+============================
+         1.000000000000000 |
+
+taos> select sign(cast(NULL as tinyint))
+ sign(cast(null as tinyint)) |
+==============================
+ NULL                        |
+
+taos> select sign(cast(NULL as smallint))
+ sign(cast(null as smallint)) |
+===============================
+ NULL                         |
+
+taos> select sign(cast(NULL as int))
+ sign(cast(null as int)) |
+==========================
+ NULL                    |
+
+taos> select sign(cast(NULL as bigint))
+ sign(cast(null as bigint)) |
+=============================
+ NULL                       |
+
+taos> select sign(cast(NULL as tinyint unsigned))
+ sign(cast(null as tinyint unsigned)) |
+=======================================
+ NULL                                 |
+
+taos> select sign(cast(NULL as smallint unsigned))
+ sign(cast(null as smallint unsigned)) |
+========================================
+ NULL                                  |
+
+taos> select sign(cast(NULL as int unsigned))
+ sign(cast(null as int unsigned)) |
+===================================
+ NULL                             |
+
+taos> select sign(cast(NULL as bigint unsigned))
+ sign(cast(null as bigint unsigned)) |
+======================================
+ NULL                                |
+
+taos> select sign(cast(NULL as float))
+ sign(cast(null as float)) |
+============================
+ NULL                      |
+
+taos> select sign(cast(NULL as double))
+ sign(cast(null as double)) |
+=============================
+ NULL                       |
+
 taos> select SIGN(abs(10))
      sign(abs(10))     |
 ========================
@@ -213,6 +313,34 @@ taos> select sign(current) from ts_4893.meters order by ts limit 10
             1.0000000 |
             1.0000000 |
 
+taos> select sign(cast(current as float)) from ts_4893.d0 order by ts limit 10
+ sign(cast(current as float)) |
+===============================
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+
+taos> select sign(cast(current as float)) from ts_4893.meters order by ts limit 10
+ sign(cast(current as float)) |
+===============================
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+                1.0000000e+00 |
+
 taos> select sign(null)
       sign(null)       |
 ========================
diff --git a/tests/army/query/function/ans/statecount.csv b/tests/army/query/function/ans/statecount.csv
new file mode 100644
index 0000000000..d16b8443e2
--- /dev/null
+++ b/tests/army/query/function/ans/statecount.csv
@@ -0,0 +1,56 @@
+
+taos> select statecount(1, 'GT', 1)
+ statecount(1, 'GT', 1) |
+=========================
+                     -1 |
+
+taos> select statecount(cast(1 as tinyint), 'GT', 1)
+ statecount(cast(1 as tinyint), 'GT', 1) |
+==========================================
+                                      -1 |
+
+taos> select statecount(cast(100 as smallint), 'GT', 1)
+ statecount(cast(100 as smallint), 'GT', 1) |
+=============================================
+                                          1 |
+
+taos> select statecount(cast(100000 as int), 'GT', 1)
+ statecount(cast(100000 as int), 'GT', 1) |
+===========================================
+                                        1 |
+
+taos> select statecount(cast(10000000000 as bigint), 'GT', 1)
+ statecount(cast(10000000000 as bigint), 'GT', 1) |
+===================================================
+                                                1 |
+
+taos> select statecount(cast(1 as tinyint unsigned), 'GT', 1)
+ statecount(cast(1 as tinyint unsigned), 'GT', 1) |
+===================================================
+                                               -1 |
+
+taos> select statecount(cast(100 as smallint unsigned), 'GT', 1)
+ statecount(cast(100 as smallint unsigned), 'GT', 1) |
+======================================================
+                                                   1 |
+
+taos> select statecount(cast(100000 as int unsigned), 'GT', 1)
+ statecount(cast(100000 as int unsigned), 'GT', 1) |
+====================================================
+                                                 1 |
+
+taos> select statecount(cast(10000000000 as bigint unsigned), 'GT', 1)
+ statecount(cast(10000000000 as bigint unsigned), 'GT', 1) |
+============================================================
+                                                         1 |
+
+taos> select statecount(cast(1.1 as float), 'GT', 1)
+ statecount(cast(1.1 as float), 'GT', 1) |
+==========================================
+                                       1 |
+
+taos> select statecount(cast(1.1 as double), 'GT', 1)
+ statecount(cast(1.1 as double), 'GT', 1) |
+===========================================
+                                        1 |
+
diff --git a/tests/army/query/function/ans/sum.csv b/tests/army/query/function/ans/sum.csv
new file mode 100644
index 0000000000..3444b3f710
--- /dev/null
+++ b/tests/army/query/function/ans/sum.csv
@@ -0,0 +1,56 @@
+
+taos> select sum(1)
+        sum(1)         |
+========================
+                     1 |
+
+taos> select sum(cast(1 as tinyint))
+ sum(cast(1 as tinyint)) |
+==========================
+                       1 |
+
+taos> select sum(cast(100 as smallint))
+ sum(cast(100 as smallint)) |
+=============================
+                        100 |
+
+taos> select sum(cast(100000 as int))
+ sum(cast(100000 as int)) |
+===========================
+                   100000 |
+
+taos> select sum(cast(10000000000 as bigint))
+ sum(cast(10000000000 as bigint)) |
+===================================
+                      10000000000 |
+
+taos> select sum(cast(1 as tinyint unsigned))
+ sum(cast(1 as tinyint unsigned)) |
+===================================
+                                1 |
+
+taos> select sum(cast(100 as smallint unsigned))
+ sum(cast(100 as smallint unsigned)) |
+======================================
+                                 100 |
+
+taos> select sum(cast(100000 as int unsigned))
+ sum(cast(100000 as int unsigned)) |
+====================================
+                            100000 |
+
+taos> select sum(cast(10000000000 as bigint unsigned))
+ sum(cast(10000000000 as bigint unsigned)) |
+============================================
+                               10000000000 |
+
+taos> select sum(cast(1.1 as float))
+  sum(cast(1.1 as float))  |
+============================
+         1.100000023841858 |
+
+taos> select sum(cast(1.1 as double))
+ sum(cast(1.1 as double))  |
+============================
+         1.100000000000000 |
+
diff --git a/tests/army/query/function/ans/trim.csv b/tests/army/query/function/ans/trim.csv
index 6e2efbda51..eb821ffc91 100644
--- a/tests/army/query/function/ans/trim.csv
+++ b/tests/army/query/function/ans/trim.csv
@@ -179,6 +179,33 @@ taos> select trim(trailing '空格blank' from '空格blank空格中Tes空格blan
 ===================================================================
  空格blank空格中Tes空格blank空                                    |
 
+taos> select trim(both from nch1) from ts_4893.meters order by ts limit 5
+      trim(both from nch1)      |
+=================================
+ novel                          |
+ 一二三四五六七八九十           |
+ update                         |
+ prision                        |
+ novel                          |
+
+taos> select trim(leading from nch1) from ts_4893.meters order by ts limit 5
+    trim(leading from nch1)     |
+=================================
+ novel                          |
+ 一二三四五六七八九十           |
+ update                         |
+ prision                        |
+ novel                          |
+
+taos> select trim(trailing from nch1) from ts_4893.meters order by ts limit 5
+    trim(trailing from nch1)    |
+=================================
+ novel                          |
+ 一二三四五六七八九十           |
+ update                         |
+ prision                        |
+ novel                          |
+
 taos> select trim(nch2 from nch1) from ts_4893.meters where position(nch2 in nch1) != 0 order by ts limit 5
       trim(nch2 from nch1)      |
 =================================
diff --git a/tests/army/query/function/in/avg.in b/tests/army/query/function/in/avg.in
new file mode 100644
index 0000000000..9284e8b1b7
--- /dev/null
+++ b/tests/army/query/function/in/avg.in
@@ -0,0 +1,11 @@
+select avg(1)
+select avg(cast(1 as tinyint))
+select avg(cast(100 as smallint))
+select avg(cast(100000 as int))
+select avg(cast(10000000000 as bigint))
+select avg(cast(1 as tinyint unsigned))
+select avg(cast(100 as smallint unsigned))
+select avg(cast(100000 as int unsigned))
+select avg(cast(10000000000 as bigint unsigned))
+select avg(cast(1.1 as float))
+select avg(cast(1.1 as double))
\ No newline at end of file
diff --git a/tests/army/query/function/in/leastsquares.in b/tests/army/query/function/in/leastsquares.in
new file mode 100644
index 0000000000..2783a2a0c5
--- /dev/null
+++ b/tests/army/query/function/in/leastsquares.in
@@ -0,0 +1,11 @@
+select leastsquares(1, 1, 1)
+select leastsquares(cast(1.1 as float), 1, 1)
+select leastsquares(cast(1.1 as double), 1, 1)
+select leastsquares(cast(1 as tinyint), 1, 1)
+select leastsquares(cast(100 as smallint), 1, 1)
+select leastsquares(cast(100000 as int), 1, 1)
+select leastsquares(cast(10000000000 as bigint), 1, 1)
+select leastsquares(cast(1 as tinyint unsigned), 1, 1)
+select leastsquares(cast(100 as smallint unsigned), 1, 1)
+select leastsquares(cast(100000 as int unsigned), 1, 1)
+select leastsquares(cast(10000000000 as bigint unsigned), 1, 1)
diff --git a/tests/army/query/function/in/max.in b/tests/army/query/function/in/max.in
index efd4620f7b..336045afb5 100644
--- a/tests/army/query/function/in/max.in
+++ b/tests/army/query/function/in/max.in
@@ -26,3 +26,14 @@ select log(max(voltage) + 1) from ts_4893.meters
 select groupid, max(voltage) from ts_4893.meters group by groupid order by groupid
 select location, max(id) from ts_4893.meters group by location order by location
 select location, max(current) from ts_4893.meters group by location order by location
+select max(1)
+select max(cast(1 as tinyint))
+select max(cast(100 as smallint))
+select max(cast(100000 as int))
+select max(cast(10000000000 as bigint))
+select max(cast(1 as tinyint unsigned))
+select max(cast(100 as smallint unsigned))
+select max(cast(100000 as int unsigned))
+select max(cast(10000000000 as bigint unsigned))
+select max(cast(1.1 as float))
+select max(cast(1.1 as double))
diff --git a/tests/army/query/function/in/min.in b/tests/army/query/function/in/min.in
index 910b8cc7bd..55d6853446 100644
--- a/tests/army/query/function/in/min.in
+++ b/tests/army/query/function/in/min.in
@@ -26,3 +26,14 @@ select log(min(voltage) + 1) from ts_4893.meters
 select groupid, min(voltage) from ts_4893.meters group by groupid order by groupid
 select location, min(current) from ts_4893.meters group by location order by location
 select location, min(id) from ts_4893.meters group by location order by location
+select min(1)
+select min(cast(1 as tinyint))
+select min(cast(100 as smallint))
+select min(cast(100000 as int))
+select min(cast(10000000000 as bigint))
+select min(cast(1 as tinyint unsigned))
+select min(cast(100 as smallint unsigned))
+select min(cast(100000 as int unsigned))
+select min(cast(10000000000 as bigint unsigned))
+select min(cast(1.1 as float))
+select min(cast(1.1 as double))
diff --git a/tests/army/query/function/in/round.in b/tests/army/query/function/in/round.in
index bca293fc72..13dcb57117 100644
--- a/tests/army/query/function/in/round.in
+++ b/tests/army/query/function/in/round.in
@@ -47,3 +47,13 @@ select round(abs(voltage), 2) from ts_4893.meters limit 1
 select round(pi() * phase, 3) from ts_4893.meters limit 1
 select round(sqrt(voltage), 2) from ts_4893.meters limit 1
 select round(log(current), 2) from ts_4893.meters limit 1
+select round(cast(1.0e+400 as float), 0);
+select round(cast(1.0e+400 as double), 0);
+select round(cast(5 as tinyint), 1);
+select round(cast(50 as smallint), 1);
+select round(cast(500 as int), 1);
+select round(cast(50000 as bigint), 1);
+select round(cast(5 as TINYINT UNSIGNED), 1);
+select round(cast(50 as smallint unsigned), 1);
+select round(cast(500 as int unsigned), 1);
+select round(cast(50000 as bigint unsigned), 1);
\ No newline at end of file
diff --git a/tests/army/query/function/in/sign.in b/tests/army/query/function/in/sign.in
index 436c884d36..25780eb31c 100644
--- a/tests/army/query/function/in/sign.in
+++ b/tests/army/query/function/in/sign.in
@@ -20,6 +20,26 @@ select SIGN(2) * SIGN(1) from ts_4893.meters limit 1
 select SIGN(2) / SIGN(1) from ts_4893.meters limit 1
 select SIGN(1) + id from ts_4893.meters order by ts limit 5
 select SIGN(id) + id from ts_4893.meters order by ts limit 5
+select sign(cast(1 as tinyint))
+select sign(cast(1 as smallint))
+select sign(cast(1 as int))
+select sign(cast(1 as bigint))
+select sign(cast(1 as tinyint unsigned))
+select sign(cast(1 as smallint unsigned))
+select sign(cast(1 as int unsigned))
+select sign(cast(1 as bigint unsigned))
+select sign(cast(1 as float))
+select sign(cast(1 as double))
+select sign(cast(NULL as tinyint))
+select sign(cast(NULL as smallint))
+select sign(cast(NULL as int))
+select sign(cast(NULL as bigint))
+select sign(cast(NULL as tinyint unsigned))
+select sign(cast(NULL as smallint unsigned))
+select sign(cast(NULL as int unsigned))
+select sign(cast(NULL as bigint unsigned))
+select sign(cast(NULL as float))
+select sign(cast(NULL as double))
 select SIGN(abs(10))
 select SIGN(abs(-10))
 select abs(SIGN(10))
@@ -34,6 +54,8 @@ select sign(-1)
 select sign(-10)
 select sign(current) from ts_4893.d0 order by ts limit 10
 select sign(current) from ts_4893.meters order by ts limit 10
+select sign(cast(current as float)) from ts_4893.d0 order by ts limit 10
+select sign(cast(current as float)) from ts_4893.meters order by ts limit 10
 select sign(null)
 select sign(25)
 select sign(-10)
diff --git a/tests/army/query/function/in/statecount.in b/tests/army/query/function/in/statecount.in
new file mode 100644
index 0000000000..df64918d61
--- /dev/null
+++ b/tests/army/query/function/in/statecount.in
@@ -0,0 +1,11 @@
+select statecount(1, 'GT', 1)
+select statecount(cast(1 as tinyint), 'GT', 1)
+select statecount(cast(100 as smallint), 'GT', 1)
+select statecount(cast(100000 as int), 'GT', 1)
+select statecount(cast(10000000000 as bigint), 'GT', 1)
+select statecount(cast(1 as tinyint unsigned), 'GT', 1)
+select statecount(cast(100 as smallint unsigned), 'GT', 1)
+select statecount(cast(100000 as int unsigned), 'GT', 1)
+select statecount(cast(10000000000 as bigint unsigned), 'GT', 1)
+select statecount(cast(1.1 as float), 'GT', 1)
+select statecount(cast(1.1 as double), 'GT', 1)
diff --git a/tests/army/query/function/in/sum.in b/tests/army/query/function/in/sum.in
new file mode 100644
index 0000000000..4caf5ecdbf
--- /dev/null
+++ b/tests/army/query/function/in/sum.in
@@ -0,0 +1,11 @@
+select sum(1)
+select sum(cast(1 as tinyint))
+select sum(cast(100 as smallint))
+select sum(cast(100000 as int))
+select sum(cast(10000000000 as bigint))
+select sum(cast(1 as tinyint unsigned))
+select sum(cast(100 as smallint unsigned))
+select sum(cast(100000 as int unsigned))
+select sum(cast(10000000000 as bigint unsigned))
+select sum(cast(1.1 as float))
+select sum(cast(1.1 as double))
diff --git a/tests/army/query/function/in/trim.in b/tests/army/query/function/in/trim.in
index a0ad54dd7c..e96fb08675 100644
--- a/tests/army/query/function/in/trim.in
+++ b/tests/army/query/function/in/trim.in
@@ -34,6 +34,9 @@ select trim('空格blank' from '空格blank空格中Tes空格blank空')
 select trim(both '空格blank' from '空格blank空格中Tes空格blank空')
 select trim(leading '空格blank' from '空格blank空格中Tes空格blank空')
 select trim(trailing '空格blank' from '空格blank空格中Tes空格blank空')
+select trim(both from nch1) from ts_4893.meters order by ts limit 5
+select trim(leading from nch1) from ts_4893.meters order by ts limit 5
+select trim(trailing from nch1) from ts_4893.meters order by ts limit 5
 select trim(nch2 from nch1) from ts_4893.meters where position(nch2 in nch1) != 0 order by ts limit 5
 select trim(both nch2 from nch1) from ts_4893.meters where position(nch2 in nch1) != 0 order by ts limit 5
 select trim(leading nch2 from nch1) from ts_4893.meters where position(nch2 in nch1) != 0 order by ts limit 5
diff --git a/tests/army/query/function/test_function.py b/tests/army/query/function/test_function.py
index d54460804a..c583d08cec 100644
--- a/tests/army/query/function/test_function.py
+++ b/tests/army/query/function/test_function.py
@@ -294,6 +294,18 @@ class TDTestCase(TBase):
 
         tdSql.error("select min(nonexistent_column) from ts_4893.meters;")
 
+    def test_sum(self):
+        self.test_normal_query_new("sum")
+
+    def test_statecount(self):
+        self.test_normal_query_new("statecount")
+
+    def test_avg(self):
+        self.test_normal_query_new("avg")
+
+    def test_leastsquares(self):
+        self.test_normal_query_new("leastsquares")
+
     def test_error(self):
         tdSql.error("select * from (select to_iso8601(ts, timezone()), timezone() from ts_4893.meters \
             order by ts desc) limit 1000;", expectErrInfo="Invalid parameter data type : to_iso8601") # TS-5340
@@ -336,6 +348,10 @@ class TDTestCase(TBase):
         # agg function
         self.test_stddev_pop()
         self.test_varpop()
+        self.test_avg()
+        self.test_sum()
+        self.test_leastsquares()
+        self.test_statecount()
 
         # select function
         self.test_max()
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 88adacd775..53bdfadff0 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -11,6 +11,7 @@
 #
 ,,y,army,./pytest.sh python3 ./test.py -f multi-level/mlevel_basic.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f db-encrypt/basic.py -N 3 -M 3
+,,y,army,./pytest.sh python3 ./test.py -f cluster/arbitrator.py -N 3
 ,,n,army,python3 ./test.py -f storage/s3/s3Basic.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f cluster/snapshot.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f query/function/test_func_elapsed.py
@@ -340,6 +341,7 @@
 ,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-stb-select-duplicatedata.py -N 3 -n 3
 ,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-stb-select-duplicatedata-false.py -N 3 -n 3
 ,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-stb-select.py -N 3 -n 3
+,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-ntb-select.py -N 3 -n 3
 ,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-stb-select-false.py -N 3 -n 3
 ,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-stb.py -N 3 -n 3
 ,,y,system-test,./pytest.sh python3 test.py -f 7-tmq/tmqVnodeSplit-stb-false.py -N 3 -n 3
@@ -365,6 +367,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/telemetry.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/backquote_check.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosdMonitor.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosdNewMonitor.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosd_audit.py
 ,,n,system-test,python3 ./test.py -f 0-others/taosdlog.py
 ,,n,system-test,python3 ./test.py -f 0-others/taosdShell.py -N 5 -M 3 -Q 3
 ,,n,system-test,python3 ./test.py -f 0-others/udfTest.py
@@ -406,6 +410,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/persisit_config.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/qmemCtrl.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/compact_vgroups.py
+,,n,system-test,python3 ./test.py -f 0-others/dumpsdb.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/compact.py -N 3
 
 
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/composite_primary_key_create.py
diff --git a/tests/pytest/auto_crash_gen.py b/tests/pytest/auto_crash_gen.py
index f6b31b4691..316f2ead0f 100755
--- a/tests/pytest/auto_crash_gen.py
+++ b/tests/pytest/auto_crash_gen.py
@@ -384,7 +384,8 @@ Core dir: {core_dir}
         if text_result == "success":
             send_msg(notification_robot_url, get_msg(text))
         else:
-            send_msg(alert_robot_url, get_msg(text))    
+            send_msg(alert_robot_url, get_msg(text))   
+            send_msg(notification_robot_url, get_msg(text)) 
                 
         #send_msg(get_msg(text)) 
     except Exception as e:
diff --git a/tests/pytest/auto_crash_gen_valgrind.py b/tests/pytest/auto_crash_gen_valgrind.py
index b346aca308..b7af68cd2f 100755
--- a/tests/pytest/auto_crash_gen_valgrind.py
+++ b/tests/pytest/auto_crash_gen_valgrind.py
@@ -419,6 +419,7 @@ Core dir: {core_dir}
             send_msg(notification_robot_url, get_msg(text))
         else:
             send_msg(alert_robot_url, get_msg(text))    
+            send_msg(notification_robot_url, get_msg(text))
                 
         #send_msg(get_msg(text)) 
     except Exception as e:
diff --git a/tests/pytest/auto_crash_gen_valgrind_cluster.py b/tests/pytest/auto_crash_gen_valgrind_cluster.py
index 522ad48640..df40b60967 100755
--- a/tests/pytest/auto_crash_gen_valgrind_cluster.py
+++ b/tests/pytest/auto_crash_gen_valgrind_cluster.py
@@ -406,7 +406,8 @@ Core dir: {core_dir}
         if text_result == "success":
             send_msg(notification_robot_url, get_msg(text))
         else:
-            send_msg(alert_robot_url, get_msg(text))    
+            send_msg(alert_robot_url, get_msg(text))  
+            send_msg(notification_robot_url, get_msg(text))  
                 
         #send_msg(get_msg(text)) 
     except Exception as e:
diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index 46b7e1f795..bb7b8411f9 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -155,6 +155,9 @@ class TDSql:
 
         try:
             self.cursor.execute(sql)
+            self.queryResult = self.cursor.fetchall()
+            self.queryRows = len(self.queryResult)
+            self.queryCols = len(self.cursor.description)
         except BaseException as e:
             tdLog.info("err:%s" % (e))
             expectErrNotOccured = False
@@ -165,10 +168,6 @@ class TDSql:
         if expectErrNotOccured:
             tdLog.exit("%s(%d) failed: sql:%s, expect error not occured" % (caller.filename, caller.lineno, sql))
         else:
-            self.queryRows = 0
-            self.queryCols = 0
-            self.queryResult = None
-
             if fullMatched:
                 if expectedErrno != None:
                     expectedErrno_rest = expectedErrno & 0x0000ffff
diff --git a/tests/pytest/util/tserror.py b/tests/pytest/util/tserror.py
new file mode 100644
index 0000000000..35d74153c3
--- /dev/null
+++ b/tests/pytest/util/tserror.py
@@ -0,0 +1,13 @@
+import ctypes
+
+TAOS_SYSTEM_ERROR = ctypes.c_int32(0x80ff0000).value
+TAOS_DEF_ERROR_CODE = ctypes.c_int32(0x80000000).value
+
+
+TSDB_CODE_MND_FUNC_NOT_EXIST    = (TAOS_DEF_ERROR_CODE | 0x0374)
+
+
+TSDB_CODE_UDF_FUNC_EXEC_FAILURE = (TAOS_DEF_ERROR_CODE | 0x290A)
+
+
+TSDB_CODE_TSC_INTERNAL_ERROR = (TAOS_DEF_ERROR_CODE | 0x02FF)
diff --git a/tests/run_all_ci_cases.sh b/tests/run_all_ci_cases.sh
index 959af66d19..11670800b8 100644
--- a/tests/run_all_ci_cases.sh
+++ b/tests/run_all_ci_cases.sh
@@ -7,12 +7,120 @@ GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 
-TDENGINE_DIR=/root/TDinternal/community
+function print_color() {
+    local color="$1"
+    local message="$2"
+    echo -e "${color}${message}${NC}"
+}
+
+# 初始化参数
+TDENGINE_DIR="/root/TDinternal/community"
+BRANCH=""
+SAVE_LOG="notsave"
+
+# 解析命令行参数
+while getopts "hd:b:t:s:" arg; do
+  case $arg in
+    d)
+      TDENGINE_DIR=$OPTARG
+      ;;
+    b)
+      BRANCH=$OPTARG
+      ;;
+    s)
+      SAVE_LOG=$OPTARG
+      ;;
+    h)
+      echo "Usage: $(basename $0) -d [TDengine_dir] -b [branch] -s [save ci case log]"
+      echo "                  -d [TDengine_dir] [default /root/TDinternal/community] "
+      echo "                  -b [branch] [default local branch] "
+      echo "                  -s [save/notsave] [default save ci case log in TDengine_dir/tests/ci_bak] "
+      exit 0
+      ;;
+    ?)
+      echo "Usage: ./$(basename $0) -h"
+      exit 1
+      ;;
+  esac
+done
+
+# 检查是否提供了命令名称
+if [ -z "$TDENGINE_DIR" ]; then
+  echo "Error: TDengine dir is required."
+  echo "Usage: $(basename $0) -d [TDengine_dir] -b [branch] -s [save ci case log] "
+  echo "                        -d [TDengine_dir] [default /root/TDinternal/community] "
+  echo "                        -b [branch] [default local branch] "
+  echo "                        -s [save/notsave] [default save ci case log in TDengine_dir/tests/ci_bak] "    
+  exit 1
+fi
 
 
-#echo "TDENGINE_DIR = $TDENGINE_DIR"
+echo "TDENGINE_DIR = $TDENGINE_DIR"
 today=`date +"%Y%m%d"`
-TDENGINE_ALLCI_REPORT=$TDENGINE_DIR/tests/all-ci-report-$today.log
+TDENGINE_ALLCI_REPORT="$TDENGINE_DIR/tests/all-ci-report-$today.log"
+BACKUP_DIR="$TDENGINE_DIR/tests/ci_bak"
+mkdir -p "$BACKUP_DIR"
+#cd $BACKUP_DIR && rm -rf *
+
+
+function buildTDengine() {
+    print_color "$GREEN" "TDengine build start"
+    
+    # pull parent code
+    cd "$TDENGINE_DIR/../"
+    print_color "$GREEN" "git pull parent code..."
+    git remote prune origin > /dev/null
+    git remote update > /dev/null
+
+    # pull tdengine code
+    cd $TDENGINE_DIR
+    print_color "$GREEN" "git pull tdengine code..."
+    git remote prune origin > /dev/null
+    git remote update > /dev/null
+    REMOTE_COMMIT=`git rev-parse --short remotes/origin/$branch`
+    LOCAL_COMMIT=`git rev-parse --short @`
+    print_color "$GREEN" " LOCAL: $LOCAL_COMMIT"
+    print_color "$GREEN" "REMOTE: $REMOTE_COMMIT"
+
+    if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+        print_color "$GREEN" "repo up-to-date"
+    else
+        print_color "$GREEN" "repo need to pull"
+    fi
+
+    git reset --hard
+    git checkout -- .
+    git checkout $branch
+    git checkout -- .
+    git clean -f
+    git pull
+
+    [ -d $TDENGINE_DIR/debug ] || mkdir $TDENGINE_DIR/debug
+    cd $TDENGINE_DIR/debug
+
+    print_color "$GREEN" "rebuild.."
+    LOCAL_COMMIT=`git rev-parse --short @`
+
+    rm -rf *
+    makecmd="cmake -DBUILD_TEST=false -DBUILD_HTTP=false -DBUILD_DEPENDENCY_TESTS=0 -DBUILD_TOOLS=true -DBUILD_GEOS=true -DBUILD_TEST=true -DBUILD_CONTRIB=false ../../"
+    print_color "$GREEN" "$makecmd"
+    $makecmd
+
+    make -j 8 install
+
+    print_color "$GREEN" "TDengine build end"
+}
+
+
+# 检查并获取分支名称
+if [ -n "$BRANCH" ]; then
+    branch="$BRANCH"
+    print_color "$GREEN" "Testing branch: $branch "
+    print_color "$GREEN" "Build is required for this test！"
+    buildTDengine
+else
+    print_color "$GREEN" "Build is not required for this test！"
+fi
 
 
 function runCasesOneByOne () {
@@ -20,23 +128,50 @@ function runCasesOneByOne () {
         if [[ "$line" != "#"* ]]; then
             cmd=`echo $line | cut -d',' -f 5`
             if [[ "$2" == "sim" ]] && [[ $line == *"script"* ]]; then
+                echo $cmd
                 case=`echo $cmd | cut -d' ' -f 3`
+                case_file=`echo $case | tr -d ' /' `
                 start_time=`date +%s`
-                date +%F\ %T | tee -a  $TDENGINE_ALLCI_REPORT  && timeout 20m $cmd > /dev/null 2>&1 && \
-                echo -e "${GREEN}$case success${NC}" | tee -a  $TDENGINE_ALLCI_REPORT \
-                || echo -e "${RED}$case failed${NC}" | tee -a  $TDENGINE_ALLCI_REPORT
+                date +%F\ %T | tee -a  $TDENGINE_ALLCI_REPORT  && timeout 20m $cmd > $TDENGINE_DIR/tests/$case_file.log 2>&1 && \
+                echo -e "${GREEN}$case success${NC}" | tee -a  $TDENGINE_ALLCI_REPORT || \
+                echo -e "${RED}$case failed${NC}" | tee -a $TDENGINE_ALLCI_REPORT
+
+                # # 记录日志和备份
+                # mkdir -p "$BACKUP_DIR/$case_file"
+                # tar --exclude='*.sock*' -czf "$BACKUP_DIR/$case_file/sim.tar.gz" -C "$TDENGINE_DIR/.." sim
+                # mv "$TDENGINE_DIR/tests/$case_file.log" "$BACKUP_DIR/$case_file"
+                
+                if [ "$SAVE_LOG" == "save" ]; then
+                    mkdir -p "$BACKUP_DIR/$case_file"
+                    tar --exclude='*.sock*' -czf "$BACKUP_DIR/$case_file/sim.tar.gz" -C "$TDENGINE_DIR/.." sim
+                    mv "$TDENGINE_DIR/tests/$case_file.log" "$BACKUP_DIR/$case_file"
+                else
+                    echo "This case not save log!"
+                fi
+                
                 end_time=`date +%s`
                 echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDENGINE_ALLCI_REPORT
-                
+
             elif [[ "$line" == *"$2"* ]]; then
+                echo $cmd
                 if [[ "$cmd" == *"pytest.sh"* ]]; then
                     cmd=`echo $cmd | cut -d' ' -f 2-20`
                 fi
-                case=`echo $cmd | cut -d' ' -f 4-20`
+                case=`echo $cmd | cut -d' ' -f 4-20`           
+                case_file=`echo $case | tr -d ' /' `
                 start_time=`date +%s`
-                date +%F\ %T | tee -a $TDENGINE_ALLCI_REPORT && timeout 20m $cmd > /dev/null 2>&1 && \
+                date +%F\ %T | tee -a $TDENGINE_ALLCI_REPORT && timeout 20m $cmd > $TDENGINE_DIR/tests/$case_file.log 2>&1 && \
                 echo -e "${GREEN}$case success${NC}" | tee -a $TDENGINE_ALLCI_REPORT || \
                 echo -e "${RED}$case failed${NC}" | tee -a $TDENGINE_ALLCI_REPORT
+                
+                if [ "$SAVE_LOG" == "save" ]; then
+                    mkdir -p "$BACKUP_DIR/$case_file"
+                    tar --exclude='*.sock*' -czf "$BACKUP_DIR/$case_file/sim.tar.gz" -C "$TDENGINE_DIR/.." sim
+                    mv "$TDENGINE_DIR/tests/$case_file.log" "$BACKUP_DIR/$case_file"
+                else
+                    echo "This case not save log!"
+                fi
+                
                 end_time=`date +%s`
                 echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDENGINE_ALLCI_REPORT
             fi
@@ -45,62 +180,62 @@ function runCasesOneByOne () {
 }
 
 function runUnitTest() {
-    echo "=== Run unit test case ==="
-    echo " $TDENGINE_DIR/debug"
-    cd $TDENGINE_DIR/debug
+    print_color "$GREEN" "=== Run unit test case ==="
+    print_color "$GREEN" " $TDENGINE_DIR/../debug"
+    cd $TDENGINE_DIR/../debug
     ctest -j12
-    echo "3.0 unit test done"
+    print_color "$GREEN" "3.0 unit test done"
 }
 
 function runSimCases() {
-    echo "=== Run sim cases ==="
+    print_color "$GREEN" "=== Run sim cases ==="
 
     cd $TDENGINE_DIR/tests/script
-    runCasesOneByOne $TDENGINE_DIR/tests/parallel_test/cases-test.task sim
+    runCasesOneByOne $TDENGINE_DIR/tests/parallel_test/cases.task sim
 
     totalSuccess=`grep 'sim success' $TDENGINE_ALLCI_REPORT | wc -l`
     if [ "$totalSuccess" -gt "0" ]; then
-        echo "### Total $totalSuccess SIM test case(s) succeed! ###" | tee -a $TDENGINE_ALLCI_REPORT
+        print_color "$GREEN" "### Total $totalSuccess SIM test case(s) succeed! ###" | tee -a $TDENGINE_ALLCI_REPORT
     fi
 
     totalFailed=`grep 'sim failed\|fault' $TDENGINE_ALLCI_REPORT | wc -l`
     if [ "$totalFailed" -ne "0" ]; then
-        echo "### Total $totalFailed SIM test case(s) failed! ###" | tee -a $TDENGINE_ALLCI_REPORT
+        print_color "$RED" "### Total $totalFailed SIM test case(s) failed! ###" | tee -a $TDENGINE_ALLCI_REPORT
     fi
 }
 
 function runPythonCases() {
-    echo "=== Run python cases ==="
+    print_color "$GREEN" "=== Run python cases ==="
 
     cd $TDENGINE_DIR/tests/parallel_test
-    sed -i '/compatibility.py/d' cases-test.task
+    sed -i '/compatibility.py/d' cases.task
 
     # army
     cd $TDENGINE_DIR/tests/army
-    runCasesOneByOne ../parallel_test/cases-test.task army
+    runCasesOneByOne ../parallel_test/cases.task army
 
     # system-test
     cd $TDENGINE_DIR/tests/system-test
-    runCasesOneByOne ../parallel_test/cases-test.task system-test
+    runCasesOneByOne ../parallel_test/cases.task system-test
 
     # develop-test
     cd $TDENGINE_DIR/tests/develop-test
-    runCasesOneByOne ../parallel_test/cases-test.task develop-test
+    runCasesOneByOne ../parallel_test/cases.task develop-test
 
     totalSuccess=`grep 'py success' $TDENGINE_ALLCI_REPORT | wc -l`
     if [ "$totalSuccess" -gt "0" ]; then
-        echo "### Total $totalSuccess python test case(s) succeed! ###" | tee -a $TDENGINE_ALLCI_REPORT
+        print_color "$GREEN" "### Total $totalSuccess python test case(s) succeed! ###" | tee -a $TDENGINE_ALLCI_REPORT
     fi
 
     totalFailed=`grep 'py failed\|fault' $TDENGINE_ALLCI_REPORT | wc -l`
     if [ "$totalFailed" -ne "0" ]; then
-        echo "### Total $totalFailed python test case(s) failed! ###" | tee -a $TDENGINE_ALLCI_REPORT
+        print_color "$RED" "### Total $totalFailed python test case(s) failed! ###" | tee -a $TDENGINE_ALLCI_REPORT
     fi
 }
 
 
 function runTest() {
-    echo "run Test"
+    print_color "$GREEN" "run Test"
 
     cd $TDENGINE_DIR
     [ -d sim ] && rm -rf sim
@@ -119,20 +254,20 @@ function runTest() {
 }
 
 function stopTaosd {
-    echo "Stop taosd start"
-        systemctl stop taosd
-      PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+    print_color "$GREEN" "Stop taosd start"
+    systemctl stop taosd
+    PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
     while [ -n "$PID" ]
     do
-    pkill -TERM -x taosd
-    sleep 1
-      PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+        pkill -TERM -x taosd
+        sleep 1
+        PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
     done
-    echo "Stop tasod end"
+    print_color "$GREEN" "Stop tasod end"
 }
 
 function stopTaosadapter {
-    echo "Stop taosadapter"
+    print_color "$GREEN" "Stop taosadapter"
     systemctl stop taosadapter.service
     PID=`ps -ef|grep -w taosadapter | grep -v grep | awk '{print $2}'`
     while [ -n "$PID" ]
@@ -141,18 +276,18 @@ function stopTaosadapter {
         sleep 1
         PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
     done
-    echo "Stop tasoadapter end"
+    print_color "$GREEN" "Stop tasoadapter end"
 
 }
 
 WORK_DIR=/root/
 
 date >> $WORK_DIR/date.log
-echo "Run ALL CI Test Cases" | tee -a $WORK_DIR/date.log
+print_color "$GREEN" "Run all ci test cases" | tee -a $WORK_DIR/date.log
 
 stopTaosd
 
 runTest
 
 date >> $WORK_DIR/date.log
-echo "End of CI Test Cases" | tee -a $WORK_DIR/date.log
\ No newline at end of file
+print_color "$GREEN" "End of ci test cases" | tee -a $WORK_DIR/date.log
\ No newline at end of file
diff --git a/tests/run_local_coverage.sh b/tests/run_local_coverage.sh
index b2413c4065..dfb0e8f9b7 100755
--- a/tests/run_local_coverage.sh
+++ b/tests/run_local_coverage.sh
@@ -17,9 +17,10 @@ function print_color() {
 TDENGINE_DIR="/root/TDinternal/community"
 BRANCH=""
 TDENGINE_GCDA_DIR="/root/TDinternal/community/debug/"
+LCOV_DIR="/usr/local/bin"
 
 # Parse command line parameters
-while getopts "hd:b:f:c:u:i:" arg; do
+while getopts "hd:b:f:c:u:i:l:" arg; do
   case $arg in
     d)
       TDENGINE_DIR=$OPTARG
@@ -39,14 +40,18 @@ while getopts "hd:b:f:c:u:i:" arg; do
     i)
       BRANCH_BUILD=$OPTARG
       ;;
+    l)
+      LCOV_DIR=$OPTARG
+      ;;
     h)
-      echo "Usage: $(basename $0) -d [TDengine dir] -b [Test branch] -i [Build test branch] -f [TDengine gcda dir] -c [Test single case/all cases] -u [Unit test case]"
+      echo "Usage: $(basename $0) -d [TDengine dir] -b [Test branch] -i [Build test branch] -f [TDengine gcda dir] -c [Test single case/all cases] -u [Unit test case] -l [Lcov dir]"
       echo "                  -d [TDengine dir] [default /root/TDinternal/community; eg: /home/TDinternal/community] "
       echo "                  -b [Test branch] [default local branch; eg:cover/3.0] "
       echo "                  -i [Build test branch] [default no:not build, but still install ;yes:will build and install ] "
       echo "                  -f [TDengine gcda dir] [default /root/TDinternal/community/debug; eg:/root/TDinternal/community/debug/community/source/dnode/vnode/CMakeFiles/vnode.dir/src/tq/] "
       echo "                  -c [Test single case/all cases] [default null; -c all : include parallel_test/longtimeruning_cases.task and all unit cases; -c task : include parallel_test/longtimeruning_cases.task; single case: eg: -c './test.sh -f tsim/stream/streamFwcIntervalFill.sim' ] "
       echo "                  -u [Unit test case] [default null;  eg: './schedulerTest' ] "
+      echo "                  -l [Lcov bin dir] [default /usr/local/bin;  eg: '/root/TDinternal/community/tests/lcov-1.14/bin' ] "
       exit 0
       ;;
     ?)
@@ -59,13 +64,14 @@ done
 # Check if the command name is provided
 if [ -z "$TDENGINE_DIR" ]; then
   echo "Error: TDengine dir is required."
-  echo "Usage: $(basename $0) -d [TDengine dir] -b [Test branch] -i [Build test branch]  -f [TDengine gcda dir] -c [Test single case/all cases] -u [Unit test case]  "
+  echo "Usage: $(basename $0) -d [TDengine dir] -b [Test branch] -i [Build test branch]  -f [TDengine gcda dir] -c [Test single case/all cases] -u [Unit test case] -l [Lcov dir] "
   echo "                        -d [TDengine dir] [default /root/TDinternal/community; eg: /home/TDinternal/community] "
   echo "                        -b [Test branch] [default local branch; eg:cover/3.0] "   
   echo "                        -i [Build test branch] [default no:not build, but still install ;yes:will build and install ] "
   echo "                        -f [TDengine gcda dir] [default /root/TDinternal/community/debug; eg:/root/TDinternal/community/debug/community/source/dnode/vnode/CMakeFiles/vnode.dir/src/tq/]  " 
   echo "                        -c [Test casingle case/all casesse] [default null; -c all : include parallel_test/longtimeruning_cases.task and all unit cases; -c task : include parallel_test/longtimeruning_cases.task; single case: eg: -c './test.sh -f tsim/stream/streamFwcIntervalFill.sim' ]  " 
   echo "                        -u [Unit test case] [default null;  eg: './schedulerTest' ] "
+  echo "                        -l [Lcov bin dir] [default /usr/local/bin;  eg: '/root/TDinternal/community/tests/lcov-1.14/bin' ] "
   exit 1
 fi
 
@@ -299,11 +305,18 @@ function lcovFunc {
         print_color "$GREEN" "Test gcda file dir is default: /root/TDinternal/community/debug"
     fi
 
+    if [ -n "$LCOV_DIR" ]; then
+        LCOV_DIR="$LCOV_DIR"
+        print_color "$GREEN" "Lcov bin dir: $LCOV_DIR "
+    else
+        print_color "$GREEN" "Lcov bin dir is default"
+    fi
+
     # collect data
-    lcov -d "$TDENGINE_GCDA_DIR" -capture --rc lcov_branch_coverage=1 --rc genhtml_branch_coverage=1 --no-external -b $TDENGINE_DIR -o coverage.info
+    $LCOV_DIR/lcov -d "$TDENGINE_GCDA_DIR" -capture --rc lcov_branch_coverage=1 --rc genhtml_branch_coverage=1 --no-external -b $TDENGINE_DIR -o coverage.info
 
     # remove exclude paths
-    lcov --remove coverage.info \
+    $LCOV_DIR/lcov --remove coverage.info \
         '*/contrib/*' '*/test/*' '*/packaging/*' '*/taos-tools/*' '*/taosadapter/*' '*/TSZ/*' \
         '*/AccessBridgeCalls.c' '*/ttszip.c' '*/dataInserter.c' '*/tlinearhash.c' '*/tsimplehash.c' '*/tsdbDiskData.c' '/*/enterprise/*' '*/docs/*' '*/sim/*'\
         '*/texpr.c' '*/runUdf.c' '*/schDbg.c' '*/syncIO.c' '*/tdbOs.c' '*/pushServer.c' '*/osLz4.c'\
@@ -316,7 +329,7 @@ function lcovFunc {
 
     # generate result
     echo "generate result"
-    lcov -l --rc lcov_branch_coverage=1 coverage.info | tee -a $TDENGINE_COVERAGE_REPORT
+    $LCOV_DIR/lcov -l --rc lcov_branch_coverage=1 coverage.info | tee -a $TDENGINE_COVERAGE_REPORT
 
 }
 
@@ -373,8 +386,14 @@ if [ ! -f "$COVERAGE_INFO" ]; then
     exit 1
 fi
 
+if [ -n "$LCOV_DIR" ]; then
+    LCOV_DIR="$LCOV_DIR"
+    print_color "$GREEN" "Lcov bin dir: $LCOV_DIR "
+else
+    print_color "$GREEN" "Lcov bin dir is default"
+fi
 # Generate local HTML reports
-genhtml "$COVERAGE_INFO"  --branch-coverage --function-coverage --output-directory "$OUTPUT_DIR"
+$LCOV_DIR/genhtml "$COVERAGE_INFO"  --branch-coverage --function-coverage --output-directory "$OUTPUT_DIR"
 
 # Check whether the report was generated successfully
 if [ $? -eq 0 ]; then
diff --git a/tests/script/tsim/join/inner_join.sim b/tests/script/tsim/join/inner_join.sim
index 7b9209813d..3049865777 100644
--- a/tests/script/tsim/join/inner_join.sim
+++ b/tests/script/tsim/join/inner_join.sim
@@ -203,3 +203,41 @@ sql select a.ts, b.ts from sta a join sta b on a.ts = b.ts and a.t1 = b.t1;
 if $rows != 8 then
   return -1
 endi
+
+sql select * from testb.stb1 a join testb.st2 b where a.ts = b.ts and a.t = b.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 a join testb1.stb21 b where a.ts = b.ts and a.t = b.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 b join testb1.stb21 a where a.ts = b.ts and a.t = b.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 a join testb1.stb21 b where b.ts = a.ts and b.t = a.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 b join testb1.stb21 a where b.ts = a.ts and b.t = a.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 b join testb1.stb21 a where a.ts = b.ts and b.t = a.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 b join testb1.stb21 a where b.ts = a.ts and a.t = b.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 a, testb1.stb21 b where a.ts = b.ts and a.t = b.t;
+if $rows != 4 then
+  return -1
+endi
+sql select * from testb.stb1 a join testb1.stb21 b on a.ts = b.ts and a.t = b.t;
+if $rows != 4 then
+  return -1
+endi
+
diff --git a/tests/script/tsim/join/join.sim b/tests/script/tsim/join/join.sim
index e3a04fc9c1..43b5b421ab 100644
--- a/tests/script/tsim/join/join.sim
+++ b/tests/script/tsim/join/join.sim
@@ -57,6 +57,22 @@ sql insert into ctb22 using st2 tags(2) values('2023-10-16 09:10:12', 110222, 11
 sql insert into ctb23 using st2 tags(3) values('2023-10-16 09:10:13', 110223, 1102230);
 sql insert into ctb24 using st2 tags(4) values('2023-10-16 09:10:14', 110224, 1102240);
 
+sql drop database if exists testb1;
+sql create database testb1 vgroups 1 PRECISION 'us';
+sql use testb1;
+
+sql create table stb21(ts timestamp, f int,g int) tags (t int);
+sql insert into ctb11 using stb21 tags(1) values('2023-10-16 09:10:11', 110111, 1101110);
+sql insert into ctb12 using stb21 tags(2) values('2023-10-16 09:10:12', 110112, 1101120);
+sql insert into ctb13 using stb21 tags(3) values('2023-10-16 09:10:13', 110113, 1101130);
+sql insert into ctb14 using stb21 tags(4) values('2023-10-16 09:10:14', 110114, 1101140);
+
+sql create table st22(ts timestamp, f int, g int) tags (t int);
+sql insert into ctb21 using st22 tags(1) values('2023-10-16 09:10:11', 110221, 1102210);
+sql insert into ctb22 using st22 tags(2) values('2023-10-16 09:10:12', 110222, 1102220);
+sql insert into ctb23 using st22 tags(3) values('2023-10-16 09:10:13', 110223, 1102230);
+sql insert into ctb24 using st22 tags(4) values('2023-10-16 09:10:14', 110224, 1102240);
+
 sql drop database if exists testc;
 sql create database testc vgroups 3;
 sql use testc;
diff --git a/tests/script/tsim/join/join_explain.sim b/tests/script/tsim/join/join_explain.sim
index f9d2f3eac1..2858999de5 100644
--- a/tests/script/tsim/join/join_explain.sim
+++ b/tests/script/tsim/join/join_explain.sim
@@ -39,6 +39,7 @@ sql explain analyze verbose true select a.ts from sta a join sta b on a.col1 = b
 sql explain analyze verbose true select a.ts from sta a join sta b where a.ts=b.ts;
 sql_error explain analyze verbose true select a.ts from sta a ,sta b on a.ts=b.ts;
 sql explain analyze verbose true select a.ts from sta a ,sta b where a.ts=b.ts;
+sql explain analyze verbose true select a.ts from sta a ,sta b where a.t1 = b.t1 and a.ts=b.ts;
 sql explain analyze verbose true select a.ts from sta a ,sta b where a.ts=b.ts and a.col1 + 1 = b.col1;
 sql explain analyze verbose true select b.col1 from sta a ,sta b where a.ts=b.ts and a.col1 + 1 = b.col1 order by a.ts;
 sql explain analyze verbose true select b.col1 from sta a join sta b join sta c where a.ts=b.ts and b.ts = c.ts order by a.ts;
diff --git a/tests/setup-lcov.sh b/tests/setup-lcov.sh
new file mode 100644
index 0000000000..0d1861fc92
--- /dev/null
+++ b/tests/setup-lcov.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+function usage() {
+    echo "Usage: $0 -v <version>"
+    echo "Example: $0 -v 1.14"
+}
+
+function download_lcov() {
+    local version=$1
+    local url="https://github.com/linux-test-project/lcov/releases/download/v${version}/lcov-${version}.tar.gz"
+    echo "Downloading lcov version ${version} from ${url}..."
+    curl -LO ${url}
+    tar -xzf lcov-${version}.tar.gz
+    echo "lcov version ${version} downloaded and extracted."
+}
+
+function install_lcov() {
+    echo -e "\nInstalling..."
+    local version=$1
+    cd lcov-${version}
+    sudo make uninstall && sudo make install
+    cd ..
+    echo "lcov version ${version} installed."
+}
+
+function verify_lcov() {
+    echo -e "\nVerify installation..."
+    lcov --version
+}
+
+function main() {
+    if [[ "$#" -ne 2 ]]; then
+        usage
+        exit 1
+    fi
+
+    while getopts "v:h" opt; do
+        case ${opt} in
+            v)
+                version=${OPTARG}
+                download_lcov ${version}
+                install_lcov ${version}
+        		verify_lcov
+                ;;
+            h)
+                usage
+                exit 0
+                ;;
+            *)
+                usage
+                exit 1
+                ;;
+        esac
+    done
+}
+
+main "$@"
\ No newline at end of file
diff --git a/tests/system-test/0-others/compact.py b/tests/system-test/0-others/compact.py
new file mode 100644
index 0000000000..eb2938e399
--- /dev/null
+++ b/tests/system-test/0-others/compact.py
@@ -0,0 +1,85 @@
+from util.log import *
+from util.cases import *
+from util.dnodes import *
+from util.sql import *
+
+import socket
+import taos
+
+class TDTestCase:
+    def init(self, conn, logSql, replicaVar=1):
+        tdLog.debug(f"start to excute {__file__}")
+        self.replicaVar =  int(replicaVar)
+    
+    def run(self):
+
+        tdSql.query("CREATE DATABASE power KEEP 365 DURATION 10 BUFFER 16 WAL_LEVEL 1 vgroups 1 replica 1;")
+
+        tdSql.query("CREATE DATABASE power1 KEEP 365 DURATION 10 BUFFER 16 WAL_LEVEL 1 vgroups 1 replica 1;")
+
+        #first
+        tdSql.query("compact database power;")
+
+        tdLog.info("compact id:%d"%tdSql.queryResult[0][1])
+
+        tdSql.query("show compact %d;"%tdSql.queryResult[0][1])
+
+        tdLog.info("detail:%d"%tdSql.queryRows)
+
+        #second
+        tdSql.query("compact database power1;")
+
+        tdLog.info("compact id:%d"%tdSql.queryResult[0][1])
+
+        tdSql.query("show compact %d;"%tdSql.queryResult[0][1])
+
+        tdLog.info("detail:%d"%tdSql.queryRows)
+
+
+        #kill
+        tdSql.query("show compacts;")
+        number1 = tdSql.queryResult[0][0]
+        number2 = tdSql.queryResult[1][0]
+
+        #first 
+        tdLog.info("kill compact %d;"%number1)  
+        tdSql.query("kill compact %d;"%number1)
+
+        #second
+        tdLog.info("kill compact %d;"%number2) 
+        tdSql.query("kill compact %d;"%number2)
+
+
+        #show
+        count = 0
+        tdLog.info("query progress")
+        while count < 50:
+            tdSql.query("show compact %d;"%number1)
+
+            row1 = tdSql.queryRows
+
+            tdSql.query("show compact %d;"%number2)
+
+            row2 = tdSql.queryRows
+
+            tdLog.info("compact%d:detail count:%d"%(number1, row1))
+            tdLog.info("compact%d:detail count:%d"%(number2, row2))
+
+            if row1 == 0 and row2 == 0 :
+                break
+
+            time.sleep(1)
+
+            count +=1
+            #tdLog.info("loop%d"%count)
+
+        if row1 != 0 or row2 != 0:
+            tdLog.exit("compact failed")
+        
+    
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/system-test/0-others/dumpsdb.py b/tests/system-test/0-others/dumpsdb.py
new file mode 100644
index 0000000000..fd0fd2fcd9
--- /dev/null
+++ b/tests/system-test/0-others/dumpsdb.py
@@ -0,0 +1,98 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+
+class TDTestCase:
+    def caseDescription(self):
+        """
+        dump sdb taosd -s
+        """
+
+    def init(self, conn, logSql, replicaVar=1):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+        self.tmpdir = "tmp"
+
+    def getPath(self, tool="taosd"):
+        if (platform.system().lower() == 'windows'):
+            tool = tool + ".exe"
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        paths = []
+        for root, dirs, files in os.walk(projPath):
+            if ((tool) in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    paths.append(os.path.join(root, tool))
+                    break
+        if (len(paths) == 0):
+            tdLog.exit("%s not found!"%tool)
+            return
+        else:
+            tdLog.info("%s found in %s" % (tool, paths[0]))
+            return paths[0]
+
+    def run(self):
+        tdSql.execute("create database db  keep 3649 ")
+
+        tdSql.execute("use db")
+        tdSql.execute(
+            "create table st(ts timestamp, c1 INT, c2 BOOL, c3 TINYINT, c4 SMALLINT, c5 BIGINT, c6 FLOAT, c7 DOUBLE, c8 TIMESTAMP, c9 BINARY(10), c10 NCHAR(10), c11 TINYINT UNSIGNED, c12 SMALLINT UNSIGNED, c13 INT UNSIGNED, c14 BIGINT UNSIGNED) tags(n1 INT, w2 BOOL, t3 TINYINT, t4 SMALLINT, t5 BIGINT, t6 FLOAT, t7 DOUBLE, t8 TIMESTAMP, t9 BINARY(10), t10 NCHAR(10), t11 TINYINT UNSIGNED, t12 SMALLINT UNSIGNED, t13 INT UNSIGNED, t14 BIGINT UNSIGNED)"
+        )
+        tdSql.execute(
+            "create table t1 using st tags(1, true, 1, 1, 1, 1.0, 1.0, 1, '1', '一', 1, 1, 1, 1)"
+        )
+        tdSql.execute(
+            "insert into t1 values(1640000000000, 1, true, 1, 1, 1, 1.0, 1.0, 1, '1', '一', 1, 1, 1, 1)"
+        )
+        tdSql.execute(
+            "create table t2 using st tags(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)"
+        )
+        tdSql.execute(
+            "insert into t2 values(1640000000000, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)"
+        )
+
+        #        sys.exit(1)
+
+        binPath = self.getPath()
+        if binPath == "":
+            tdLog.exit("taosd not found!")
+        else:
+            tdLog.info("taosd found in %s" % binPath)
+
+        if os.path.exists("sdb.json"):
+            os.system("rm -f sdb.json")
+
+        os.system("%s -s" % binPath)
+
+        if not os.path.exists("sdb.json"):
+            tdLog.exit("taosd -s failed!")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/system-test/0-others/taosdNewMonitor.py b/tests/system-test/0-others/taosdNewMonitor.py
new file mode 100644
index 0000000000..a3ced155c5
--- /dev/null
+++ b/tests/system-test/0-others/taosdNewMonitor.py
@@ -0,0 +1,243 @@
+import taos
+import sys
+import time
+import socket
+# import pexpect
+import os
+import http.server
+import gzip
+import threading
+import json
+import pickle
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+
+telemetryPort = '6043'
+serverPort = '7080'
+hostname = socket.gethostname()
+
+class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
+    hostPort = hostname + ":" + serverPort
+
+    def telemetryInfoCheck(self, infoDict=''):
+        if len(infoDict) == 0:
+            return
+        
+        if  "ts" not in infoDict[0] or len(infoDict[0]["ts"]) == 0:
+            tdLog.exit("ts is null!")
+
+        if "protocol" not in infoDict[0] or infoDict[0]["protocol"] != 2:
+            tdLog.exit("protocol is null!")
+
+        if "tables" not in infoDict[0]:
+            tdLog.exit("tables is null!")
+
+        if infoDict[0]["tables"][0]["name"] != "taosd_dnodes_info":
+            tdLog.exit("taosd_dnodes_info is null!")
+        
+        # dnode_info  ====================================
+
+        dnode_infos =  ['disk_engine', 'system_net_in', 'vnodes_num', 'system_net_out', 'uptime', 'has_mnode', 'io_read_disk', 'error_log_count',
+        'io_read', 'cpu_cores', 'has_qnode', 'has_snode', 'disk_total', 'mem_engine', 'info_log_count', 'cpu_engine', 'io_write_disk',
+        'debug_log_count', 'disk_used', 'mem_total', 'io_write', 'masters', 'cpu_system',
+        'trace_log_count', 'mem_free']
+        index = 0
+        for elem in dnode_infos:
+            tdLog.debug(f"elem: {index},{elem}")
+            if infoDict[0]["tables"][0]["metric_groups"][0]["metrics"][index]["name"] != elem:
+                tdLog.exit(f"{elem} is null!")
+            index += 1
+
+        if infoDict[0]["tables"][1]["name"] != "taosd_dnodes_log_dirs":
+            tdLog.exit("taosd_dnodes_log_dirs is null!")
+
+        # logdir
+        if infoDict[0]["tables"][1]["metric_groups"][0]["tags"][3]["name"] != "data_dir_name":
+            tdLog.exit("data_dir_name is null!")
+
+        if infoDict[0]["tables"][1]["metric_groups"][0]["metrics"][0]["name"] != "total":
+            tdLog.exit("total is null!")
+
+        if infoDict[0]["tables"][1]["metric_groups"][0]["metrics"][1]["name"] != "used":
+            tdLog.exit("used is null!")
+        
+        if infoDict[0]["tables"][1]["metric_groups"][0]["metrics"][2]["name"] != "avail":
+            tdLog.exit("avail is null!")
+
+        if infoDict[0]["tables"][2]["name"] != "taosd_dnodes_data_dirs":
+            tdLog.exit("taosd_dnodes_data_dirs is null!")
+
+        # data_dir
+        if infoDict[0]["tables"][2]["metric_groups"][0]["tags"][3]["name"] != "data_dir_name":
+            tdLog.exit("data_dir_name is null!")
+
+        if infoDict[0]["tables"][2]["metric_groups"][0]["metrics"][0]["name"] != "avail":
+            tdLog.exit("total is null!")
+
+        if infoDict[0]["tables"][2]["metric_groups"][0]["metrics"][1]["name"] != "total":
+            tdLog.exit("used is null!")
+        
+        if infoDict[0]["tables"][2]["metric_groups"][0]["metrics"][2]["name"] != "used":
+            tdLog.exit("avail is null!")
+        
+        if infoDict[0]["tables"][3]["name"] != "taosd_cluster_info":
+            tdLog.exit("taosd_cluster_info is null!")
+
+        # cluster_info  ====================================
+
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][0]["name"] != "cluster_uptime":
+            tdLog.exit("cluster_uptime is null!")
+        
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][1]["name"] != "dbs_total":
+            tdLog.exit("dbs_total is null!")
+        
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][4]["name"] != "vgroups_total":
+            tdLog.exit("vgroups_total is null!")
+
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][5]["name"] != "vgroups_alive":
+            tdLog.exit("vgroups_alive is null!")
+
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][10]["name"] != "connections_total":
+            tdLog.exit("connections_total is null!")
+
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][13]["name"] != "dnodes_total":
+            tdLog.exit("dnodes_total is null!")
+
+        # grant_info  ====================================
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][15]["name"] != "grants_expire_time":
+            tdLog.exit("grants_expire_time is null!")
+
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][16]["name"] != "grants_timeseries_used":
+            tdLog.exit("grants_timeseries_used is null!")
+        
+        if infoDict[0]["tables"][3]["metric_groups"][0]["metrics"][17]["name"] != "grants_timeseries_total":
+            tdLog.exit("grants_timeseries_total is null!")
+
+        # vgroup_infos  ====================================
+
+        vgroup_infos_nums = len(infoDict[0]["tables"][4]["metric_groups"])   
+    
+        for  index in range(vgroup_infos_nums):
+            if infoDict[0]["tables"][4]["metric_groups"][index]["metrics"][0]["name"] != "tables_num":
+                tdLog.exit("tables_num is null!")
+
+            if infoDict[0]["tables"][4]["metric_groups"][index]["metrics"][1]["name"] != "status":
+                tdLog.exit("status is null!")
+        
+        if infoDict[0]["tables"][5]["name"] != "taosd_dnodes_status":
+            tdLog.exit("taosd_dnodes_status is null!")
+
+        if infoDict[0]["tables"][6]["name"] != "taosd_mnodes_info":
+            tdLog.exit("taosd_mnodes_info is null!")
+
+        if infoDict[0]["tables"][7]["name"] != "taosd_vnodes_info":
+            tdLog.exit("taosd_vnodes_info is null!")
+
+    def do_GET(self):
+        """
+        process GET request
+        """
+
+    def do_POST(self):
+        """
+        process POST request
+        """
+        contentEncoding = self.headers["Content-Encoding"]
+
+        if contentEncoding == 'gzip':
+            req_body = self.rfile.read(int(self.headers["Content-Length"]))
+            plainText = gzip.decompress(req_body).decode()
+        else:
+            plainText = self.rfile.read(int(self.headers["Content-Length"])).decode()
+
+        print(plainText)
+        # 1. send response code and header
+        self.send_response(200)
+        self.send_header("Content-Type", "text/html; charset=utf-8")
+        self.end_headers()
+
+        # 2. send response content
+        #self.wfile.write(("Hello World: " + req_body + "\n").encode("utf-8"))
+
+        # 3. check request body info
+        infoDict = json.loads(plainText)
+        #print("================")
+        # print(infoDict)
+        self.telemetryInfoCheck(infoDict)
+
+        # 4. shutdown the server and exit case
+        assassin = threading.Thread(target=self.server.shutdown)
+        assassin.daemon = True
+        assassin.start()
+        print ("==== shutdown http server ====")
+
+class TDTestCase:
+    global hostname
+    global serverPort
+    if (platform.system().lower() == 'windows' and not tdDnodes.dnodes[0].remoteIP == ""):
+        try:
+            config = eval(tdDnodes.dnodes[0].remoteIP )
+            hostname = config["host"]
+        except Exception:
+            hostname = tdDnodes.dnodes[0].remoteIP
+    rpcDebugFlagVal = '143'
+    clientCfgDict = {'serverPort': '', 'firstEp': '', 'secondEp':'', 'rpcDebugFlag':'135', 'fqdn':''}
+    clientCfgDict["serverPort"]    = serverPort
+    clientCfgDict["firstEp"]       = hostname + ':' + serverPort
+    clientCfgDict["secondEp"]      = hostname + ':' + serverPort
+    clientCfgDict["rpcDebugFlag"]  = rpcDebugFlagVal
+    clientCfgDict["fqdn"]          = hostname
+
+    updatecfgDict = {'clientCfg': {}, 'serverPort': '', 'firstEp': '', 'secondEp':'', 'rpcDebugFlag':'135', 'fqdn':''}
+    updatecfgDict["clientCfg"]  = clientCfgDict
+    updatecfgDict["serverPort"] = serverPort
+    updatecfgDict["firstEp"]    = hostname + ':' + serverPort
+    updatecfgDict["secondEp"]   = hostname + ':' + serverPort
+    updatecfgDict["fqdn"]       = hostname
+
+    updatecfgDict["monitorFqdn"]       = hostname
+    updatecfgDict["monitorPort"]          = '6043'
+    updatecfgDict["monitor"]            = '1'
+    updatecfgDict["monitorInterval"]        = "5"
+    updatecfgDict["monitorMaxLogs"]        = "10"
+    updatecfgDict["monitorComp"]        = "1"
+    updatecfgDict["monitorForceV2"]        = "1"
+
+    updatecfgDict["audit"]            = '0'
+
+    print ("===================: ", updatecfgDict)
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor())
+
+    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        tdSql.prepare()
+        # time.sleep(2)
+        vgroups = "4"
+        sql = "create database db3 vgroups " + vgroups
+        tdSql.query(sql)
+        sql = "create table db3.stb (ts timestamp, f int) tags (t int)"
+        tdSql.query(sql)
+        sql = "create table db3.tb using db3.stb tags (1)"
+        tdSql.query(sql)
+
+        # create http server: bing ip/port , and  request processor
+        if (platform.system().lower() == 'windows' and not tdDnodes.dnodes[0].remoteIP == ""):
+            RequestHandlerImplStr = base64.b64encode(pickle.dumps(RequestHandlerImpl)).decode()
+            cmdStr = "import pickle\nimport http\nRequestHandlerImpl=pickle.loads(base64.b64decode(\"%s\".encode()))\nclass NewRequestHandlerImpl(RequestHandlerImpl):\n    hostPort = \'%s\'\nhttp.server.HTTPServer((\"\", %s), NewRequestHandlerImpl).serve_forever()"%(RequestHandlerImplStr,hostname+":"+serverPort,telemetryPort)
+            tdDnodes.dnodes[0].remoteExec({}, cmdStr)
+        else:
+            serverAddress = ("", int(telemetryPort))
+            http.server.HTTPServer(serverAddress, RequestHandlerImpl).serve_forever()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/system-test/0-others/taosd_audit.py b/tests/system-test/0-others/taosd_audit.py
new file mode 100644
index 0000000000..65a25cbdec
--- /dev/null
+++ b/tests/system-test/0-others/taosd_audit.py
@@ -0,0 +1,144 @@
+import taos
+import sys
+import time
+import socket
+# import pexpect
+import os
+import http.server
+import gzip
+import threading
+import json
+import pickle
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+
+telemetryPort = '6043'
+serverPort = '7080'
+hostname = socket.gethostname()
+
+class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
+    hostPort = hostname + ":" + serverPort
+
+    def telemetryInfoCheck(self, infoDict=''):
+        if  "records" not in infoDict or len(infoDict["records"]) == 0:
+            tdLog.exit("records is null!")
+
+        if "operation" not in infoDict["records"][0] or infoDict["records"][0]["operation"] != "delete":
+            tdLog.exit("operation is null!")
+
+        if "details" not in infoDict["records"][0] or infoDict["records"][0]["details"] != "delete from db3.tb":
+            tdLog.exit("details is null!")
+
+    def do_GET(self):
+        """
+        process GET request
+        """
+
+    def do_POST(self):
+        """
+        process POST request
+        """
+        contentEncoding = self.headers["Content-Encoding"]
+
+        if contentEncoding == 'gzip':
+            req_body = self.rfile.read(int(self.headers["Content-Length"]))
+            plainText = gzip.decompress(req_body).decode()
+        else:
+            plainText = self.rfile.read(int(self.headers["Content-Length"])).decode()
+
+        print(plainText)
+        # 1. send response code and header
+        self.send_response(200)
+        self.send_header("Content-Type", "text/html; charset=utf-8")
+        self.end_headers()
+
+        # 2. send response content
+        #self.wfile.write(("Hello World: " + req_body + "\n").encode("utf-8"))
+
+        # 3. check request body info
+        infoDict = json.loads(plainText)
+        #print("================")
+        # print(infoDict)
+        
+        self.telemetryInfoCheck(infoDict)
+
+        # 4. shutdown the server and exit case
+        assassin = threading.Thread(target=self.server.shutdown)
+        assassin.daemon = True
+        assassin.start()
+        print ("==== shutdown http server ====")
+
+class TDTestCase:
+    global hostname
+    global serverPort
+    if (platform.system().lower() == 'windows' and not tdDnodes.dnodes[0].remoteIP == ""):
+        try:
+            config = eval(tdDnodes.dnodes[0].remoteIP )
+            hostname = config["host"]
+        except Exception:
+            hostname = tdDnodes.dnodes[0].remoteIP
+    rpcDebugFlagVal = '143'
+    clientCfgDict = {'serverPort': '', 'firstEp': '', 'secondEp':'', 'rpcDebugFlag':'135', 'fqdn':''}
+    clientCfgDict["serverPort"]    = serverPort
+    clientCfgDict["firstEp"]       = hostname + ':' + serverPort
+    clientCfgDict["secondEp"]      = hostname + ':' + serverPort
+    clientCfgDict["rpcDebugFlag"]  = rpcDebugFlagVal
+    clientCfgDict["fqdn"]          = hostname
+
+    updatecfgDict = {'clientCfg': {}, 'serverPort': '', 'firstEp': '', 'secondEp':'', 'rpcDebugFlag':'135', 'fqdn':''}
+    updatecfgDict["clientCfg"]  = clientCfgDict
+    updatecfgDict["serverPort"] = serverPort
+    updatecfgDict["firstEp"]    = hostname + ':' + serverPort
+    updatecfgDict["secondEp"]   = hostname + ':' + serverPort
+    updatecfgDict["fqdn"]       = hostname
+
+    updatecfgDict["monitorFqdn"]       = hostname
+    updatecfgDict["monitorPort"]          = '6043'
+    updatecfgDict["monitor"]            = '0'
+    updatecfgDict["monitorInterval"]        = "5"
+    updatecfgDict["monitorMaxLogs"]        = "10"
+    updatecfgDict["monitorComp"]        = "1"
+    updatecfgDict["monitorForceV2"]        = "0"
+
+    updatecfgDict["audit"]            = '1'
+
+    print ("===================: ", updatecfgDict)
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor())
+
+    def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
+        tdSql.prepare()
+        # time.sleep(2)
+        vgroups = "4"
+        sql = "create database db3 vgroups " + vgroups
+        tdSql.query(sql)
+        sql = "create table db3.stb (ts timestamp, f int) tags (t int)"
+        tdSql.query(sql)
+        sql = "create table db3.tb using db3.stb tags (1)"
+        tdSql.query(sql)
+
+        sql = "delete from db3.tb"
+        tdSql.query(sql)
+
+        # create http server: bing ip/port , and  request processor
+        if (platform.system().lower() == 'windows' and not tdDnodes.dnodes[0].remoteIP == ""):
+            RequestHandlerImplStr = base64.b64encode(pickle.dumps(RequestHandlerImpl)).decode()
+            cmdStr = "import pickle\nimport http\nRequestHandlerImpl=pickle.loads(base64.b64decode(\"%s\".encode()))\nclass NewRequestHandlerImpl(RequestHandlerImpl):\n    hostPort = \'%s\'\nhttp.server.HTTPServer((\"\", %s), NewRequestHandlerImpl).serve_forever()"%(RequestHandlerImplStr,hostname+":"+serverPort,telemetryPort)
+            tdDnodes.dnodes[0].remoteExec({}, cmdStr)
+        else:
+            serverAddress = ("", int(telemetryPort))
+            http.server.HTTPServer(serverAddress, RequestHandlerImpl).serve_forever()
+        
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/system-test/0-others/udfTest.py b/tests/system-test/0-others/udfTest.py
index d3efa61e04..8134327b41 100644
--- a/tests/system-test/0-others/udfTest.py
+++ b/tests/system-test/0-others/udfTest.py
@@ -11,6 +11,7 @@ from util.log import *
 from util.sql import *
 from util.cases import *
 from util.dnodes import *
+from util.tserror import *
 import subprocess
 
 class TDTestCase:
@@ -56,8 +57,32 @@ class TDTestCase:
         else:
             self.libudf1 = subprocess.Popen('find %s -name "libudf1.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
             self.libudf2 = subprocess.Popen('find %s -name "libudf2.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_no_init = subprocess.Popen('find %s -name "libchange_udf_no_init.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_no_process = subprocess.Popen('find %s -name "libchange_udf_no_process.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_no_destroy = subprocess.Popen('find %s -name "libchange_udf_no_destroy.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_init_failed = subprocess.Popen('find %s -name "libchange_udf_init_failed.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_process_failed = subprocess.Popen('find %s -name "libchange_udf_process_failed.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_destroy_failed = subprocess.Popen('find %s -name "libchange_udf_destory_failed.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            self.libchange_udf_normal = subprocess.Popen('find %s -name "libchange_udf_normal.so"|grep lib|head -n1'%projPath , shell=True, stdout=subprocess.PIPE,stderr=subprocess.STDOUT).stdout.read().decode("utf-8")
+            
         self.libudf1 = self.libudf1.replace('\r','').replace('\n','')
         self.libudf2 = self.libudf2.replace('\r','').replace('\n','')
+        self.libchange_udf_no_init = self.libchange_udf_no_init.replace('\r','').replace('\n','')
+        self.libchange_udf_no_process = self.libchange_udf_no_process.replace('\r','').replace('\n','')
+        self.libchange_udf_normal = self.libchange_udf_normal.replace('\r','').replace('\n','')
+        self.libchange_udf_no_destroy = self.libchange_udf_no_destroy.replace('\r','').replace('\n','')
+        self.libchange_udf_init_failed = self.libchange_udf_init_failed.replace('\r','').replace('\n','')
+        self.libchange_udf_process_failed = self.libchange_udf_process_failed.replace('\r','').replace('\n','')
+        self.libchange_udf_destroy_failed = self.libchange_udf_destroy_failed.replace('\r','').replace('\n','')
+        tdLog.info(f"udf1 so path is {self.libudf1}")
+        tdLog.info(f"udf2 so path is {self.libudf2}")
+        tdLog.info(f"change_udf_no_init so path is {self.libchange_udf_no_init}")
+        tdLog.info(f"change_udf_no_process so path is {self.libchange_udf_no_process}")
+        tdLog.info(f"change_udf_no_destroy so path is {self.libchange_udf_no_destroy}")
+        tdLog.info(f"change_udf_init_failed so path is {self.libchange_udf_init_failed}")
+        tdLog.info(f"change_udf_process_failed so path is {self.libchange_udf_process_failed}")
+        tdLog.info(f"change_udf_destroy_failed so path is {self.libchange_udf_destroy_failed}")
+        tdLog.info(f"change_udf_normal so path is {self.libchange_udf_normal}")
 
 
     def prepare_data(self):
@@ -664,13 +689,118 @@ class TDTestCase:
         path = ''.join(random.choice(letters) for i in range(5000))
 
         os.system(f"udfd -c {path}")
+   
+    def test_change_udf_normal(self, func_name):
+        # create function with normal file
+        tdSql.execute(f"create function {func_name} as '%s' outputtype int"%self.libchange_udf_normal)
+        functions = tdSql.getResult("show functions")
+        for function in functions:
+            if f"{func_name}" in function[0]:
+                tdLog.info(f"create {func_name} functions success, using {self.libchange_udf_normal}")
+                break
+        tdSql.query(f"select num1 , {func_name}(num1) ,num2 ,{func_name}(num2),num3 ,{func_name}(num3),num4 ,{func_name}(num4) from db.tb", TSDB_CODE_UDF_FUNC_EXEC_FAILURE)
+        tdSql.checkData(0,0,None)
+        tdSql.checkData(0,1,None)
+        tdSql.checkData(0,2,1)
+        tdSql.checkData(0,3,1)
+        tdSql.checkData(0,4,1.000000000)
+        tdSql.checkData(0,5,1)
+        tdSql.checkData(0,6,"binary1")
+        tdSql.checkData(0,7,1)
+        tdSql.query(f"select {func_name}(num1) from db.tb", TSDB_CODE_UDF_FUNC_EXEC_FAILURE)
+        tdSql.execute(f"drop function {func_name}")
+        tdSql.error(f"select {func_name}(num1) from db.tb", TSDB_CODE_MND_FUNC_NOT_EXIST)
+        tdLog.info(f"change udf test finished, using {self.libchange_udf_normal}")
+
+    def test_change_udf_failed(self, func_name, lib_name):
+        tdLog.info(f"test change udf start: using {lib_name}")
+        tdSql.error(f"select num1 , {func_name}(num1) ,num2 ,{func_name}(num2),num3 ,{func_name}(num3),num4 ,{func_name}(num4) from db.tb", TSDB_CODE_MND_FUNC_NOT_EXIST)
+        tdSql.execute(f"create function {func_name} as '{lib_name}' outputtype int")
+        functions = tdSql.getResult("show functions")
+        for function in functions:
+            if f"{func_name}" in function[0]:
+                tdLog.info(f"create {func_name} functions success, using {lib_name}")
+                break     
+
+        tdSql.error(f"select num1 , {func_name}(num1) ,num2 ,{func_name}(num2),num3 ,{func_name}(num3),num4 ,{func_name}(num4) from db.tb", TSDB_CODE_UDF_FUNC_EXEC_FAILURE)
+        tdSql.error(f"select {func_name}(num1) from db.tb", TSDB_CODE_UDF_FUNC_EXEC_FAILURE)
+        tdSql.execute(f"drop function {func_name}")
+        tdSql.error(f"select {func_name}(num1) from db.tb", TSDB_CODE_MND_FUNC_NOT_EXIST)
+        tdLog.info(f"change udf test finished, using {lib_name}")
+        
+    def test_change_udf_reverse(self):
+        tdSql.execute("create database if not exists db  duration 100")
+        tdSql.execute("use db")
+        
+        func_name = "udf_reverse"
+        tdSql.execute(f"create function {func_name} as '%s' outputtype nchar(256)"%self.libchange_udf_normal)
+        functions = tdSql.getResult("show functions")
+        for function in functions:
+            if f"{func_name}" in function[0]:
+                tdLog.info(f"create {func_name} functions success, using {self.libchange_udf_normal}")
+                break
+                
+        tdSql.error(f"select {func_name}(c8) from db.t1", TSDB_CODE_TSC_INTERNAL_ERROR)
+        tdSql.execute(f"drop function {func_name}")
+        tdSql.error(f"select {func_name}(num1) from db.tb", TSDB_CODE_MND_FUNC_NOT_EXIST)
+        
+        self.test_change_udf_normal("change_udf_normal")
+        tdSql.execute(f"create function {func_name} as '%s' outputtype varchar(256)"%self.libchange_udf_normal)
+        functions = tdSql.getResult("show functions")
+        for function in functions:
+            if f"{func_name}" in function[0]:
+                tdLog.info(f"create {func_name} functions success, using {self.libchange_udf_normal}")
+                break
+                
+        tdSql.query(f"select {func_name}(c8) from db.t1 order by ts")
+        tdSql.checkData(0,0, None)
+        tdSql.checkData(1,0, "1yranib")
+        tdSql.checkData(2,0, "2yranib")
+        tdSql.checkData(3,0, "3yranib")
+        
+        
+             
+    def unexpected_using_test(self):
+        tdSql.execute("use db ")
+        
+        # create function without wrong file path
+        tdSql.error("create function udf1 as '%s_wrongpath' outputtype int;"%self.libudf1, TAOS_SYSTEM_ERROR|2)
+        tdSql.error("create aggregate function udf2 as '%s_wrongpath' outputtype double;"%self.libudf2, TAOS_SYSTEM_ERROR|2)
+        
+        tdSql.execute("create function udf1 as '%s' outputtype int;"%self.libudf1)
+        tdSql.query("select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb")
+        
+        self.test_change_udf_normal("change_udf_normal")
+        self.test_change_udf_failed("change_udf_no_init", self.libchange_udf_no_init)
+        
+        self.test_change_udf_normal("change_udf_normal")
+        self.test_change_udf_failed("change_udf_no_process", self.libchange_udf_no_process)
+        
+        self.test_change_udf_normal("change_udf_normal")
+        self.test_change_udf_failed("change_udf_no_destroy", self.libchange_udf_no_destroy)
+        
+        self.test_change_udf_normal("change_udf_normal")
+        self.test_change_udf_failed("change_udf_init_failed", self.libchange_udf_init_failed)
+        
+        self.test_change_udf_normal("change_udf_normal")
+        self.test_change_udf_failed("change_udf_process_failed", self.libchange_udf_process_failed)
+        
+        self.test_change_udf_normal("change_udf_normal")
+        self.test_change_udf_failed("libchange_udf_destroy_failed", self.libchange_udf_destroy_failed)
+        
+        tdSql.query("select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb")
+        tdSql.execute(f"drop function udf1")
+        tdSql.error("select num1 , udf1(num1) ,num2 ,udf1(num2),num3 ,udf1(num3),num4 ,udf1(num4) from tb", TSDB_CODE_MND_FUNC_NOT_EXIST)
 
     def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring     
         print(" env is ok for all ")
         self.test_udfd_cmd()
         self.prepare_udf_so()
         self.prepare_data()
+        
+        self.unexpected_using_test()
         self.create_udf_function()
+        self.test_change_udf_reverse()
         self.basic_udf_query()
         self.loop_kill_udfd()
         tdSql.execute(" drop function udf1 ")
diff --git a/tests/system-test/2-query/union.py b/tests/system-test/2-query/union.py
index d462873ab9..380b7879c4 100644
--- a/tests/system-test/2-query/union.py
+++ b/tests/system-test/2-query/union.py
@@ -406,6 +406,12 @@ class TDTestCase:
         tdSql.checkRows(6)
         ##tdSql.execute("drop database ep_iot")
 
+    def test_case_for_nodes_match_node(self):
+        sql = "create table db.nt (ts timestamp, c1 int primary key, c2 int)"
+        tdSql.execute(sql, queryTimes=1)
+        sql = 'select diff (ts) from (select * from db.tt union select * from db.tt order by c1, case when ts < now - 1h then ts + 1h else ts end) partition by c1, case when ts < now - 1h then ts + 1h else ts end'
+        tdSql.error(sql, -2147473917)
+
     def run(self):
         tdSql.prepare()
         self.test_TS_5630()
@@ -427,6 +433,7 @@ class TDTestCase:
         tdLog.printNoPrefix("==========step4:after wal, all check again ")
         self.all_test()
         self.test_TD_33137()
+        self.test_case_for_nodes_match_node()
     
     def test_TD_33137(self):
         sql = "select 'asd' union all select 'asdasd'"
diff --git a/tests/system-test/6-cluster/replica2.py b/tests/system-test/6-cluster/replica2.py
new file mode 100644
index 0000000000..1cda2bb4e8
--- /dev/null
+++ b/tests/system-test/6-cluster/replica2.py
@@ -0,0 +1,50 @@
+###################################################################
+ #		   Copyright (c) 2016 by TAOS Technologies, Inc.
+ #				     All rights reserved.
+ #
+ #  This file is proprietary and confidential to TAOS Technologies.
+ #  No part of this file may be reproduced, stored, transmitted, 
+ #  disclosed or used in any form or by any means other than as 
+ #  expressly provided by the written permission from Jianhui Tao
+ #
+###################################################################
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+from util.log import *
+
+class TDTestCase:
+    def init(self, conn, logSql, replicaVar=1):
+        tdLog.debug(f"start to init {__file__}")
+        self.replicaVar = int(replicaVar)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.execute('CREATE DATABASE db vgroups 1 replica 2;')
+
+        time.sleep(1)
+
+        tdSql.query("show db.vgroups;")
+
+        if(tdSql.queryResult[0][4] == "follower") and (tdSql.queryResult[0][6] == "leader"):
+            tdLog.info("stop dnode2")
+            sc.dnodeStop(2)
+
+        if(tdSql.queryResult[0][6] == "follower") and (tdSql.queryResult[0][4] == "leader"):
+            tdLog.info("stop dnode 3")
+            sc.dnodeStop(3)
+
+        tdLog.info("wait 10 seconds")
+        time.sleep(10)
+
+        tdSql.query("show db.vgroups;")
+
+        if(tdSql.queryResult[0][4] != "assigned") and (tdSql.queryResult[0][6] != "assigned"):
+            tdLog.exit("failed to set aasigned")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+	
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/system-test/7-tmq/tmqVnodeSplit-ntb-select.py b/tests/system-test/7-tmq/tmqVnodeSplit-ntb-select.py
new file mode 100644
index 0000000000..8f8eb7d4ea
--- /dev/null
+++ b/tests/system-test/7-tmq/tmqVnodeSplit-ntb-select.py
@@ -0,0 +1,192 @@
+
+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 util.cluster import *
+sys.path.append("./7-tmq")
+from tmqCommon import *
+
+from util.cluster import *
+sys.path.append("./6-cluster")
+from clusterCommonCreate import *
+from clusterCommonCheck import clusterComCheck
+
+
+
+class TDTestCase:
+    def __init__(self):
+        self.vgroups    = 1
+        self.ctbNum     = 10
+        self.rowsPerTbl = 1000
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), True)
+
+    def getDataPath(self):
+        selfPath = tdCom.getBuildPath()
+
+        return selfPath + '/../sim/dnode%d/data/vnode/vnode%d/wal/*';
+
+    def prepareTestEnv(self):
+        tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
+        paraDict = {'dbName':     'dbt',
+                    'dropFlag':   1,
+                    'event':      '',
+                    'vgroups':    1,
+                    'stbName':    'stb',
+                    'colPrefix':  'c',
+                    'tagPrefix':  't',
+                    'colSchema':   [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1},{'type': 'TIMESTAMP', 'count':1}],
+                    'tagSchema':   [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1}],
+                    'ctbPrefix':  'ctb',
+                    'ctbStartIdx': 0,
+                    'ctbNum':     10,
+                    'rowsPerTbl': 1000,
+                    'batchNum':   10,
+                    'startTs':    1640966400000,  # 2022-01-01 00:00:00.000
+                    'pollDelay':  120,
+                    'showMsg':    1,
+                    'showRow':    1,
+                    'snapshot':   0}
+
+        paraDict['vgroups'] = self.vgroups
+        paraDict['ctbNum'] = self.ctbNum
+        paraDict['rowsPerTbl'] = self.rowsPerTbl
+
+        tdCom.drop_all_db()
+        tmqCom.initConsumerTable()
+        tdCom.create_database(tdSql, paraDict["dbName"],paraDict["dropFlag"], wal_retention_period=36000,vgroups=paraDict["vgroups"],replica=self.replicaVar)
+        tdLog.info("create stb")
+        tdSql.query("create table dbt.t(ts timestamp, v int)")
+        tdSql.query("insert into dbt.t values('2022-01-01 00:00:00.000', 0)")
+        tdSql.query("insert into dbt.t values('2022-01-01 00:00:02.000', 0)")
+        tdSql.query("insert into dbt.t values('2022-01-01 00:00:03.000', 0)")
+        return
+
+    def restartAndRemoveWal(self, deleteWal):
+        tdDnodes = cluster.dnodes
+        tdSql.query("select * from information_schema.ins_vnodes")
+        for result in tdSql.queryResult:
+            if result[2] == 'dbt':
+                tdLog.debug("dnode is %d"%(result[0]))
+                dnodeId = result[0]
+                vnodeId = result[1]
+
+                tdDnodes[dnodeId - 1].stoptaosd()
+                time.sleep(1)
+                dataPath = self.getDataPath()
+                dataPath = dataPath%(dnodeId,vnodeId)
+                tdLog.debug("dataPath:%s"%dataPath)
+                if deleteWal:
+                    if os.system('rm -rf ' + dataPath) != 0:
+                        tdLog.exit("rm error")
+
+                tdDnodes[dnodeId - 1].starttaosd()
+                time.sleep(1)
+                break
+        tdLog.debug("restart dnode ok")
+
+    def splitVgroups(self):
+        tdSql.query("select * from information_schema.ins_vnodes")
+        vnodeId = 0
+        for result in tdSql.queryResult:
+            if result[2] == 'dbt':
+                vnodeId = result[1]
+                tdLog.debug("vnode is %d"%(vnodeId))
+                break
+        splitSql = "split vgroup %d" %(vnodeId)
+        tdLog.debug("splitSql:%s"%(splitSql))
+        tdSql.query(splitSql)
+        tdLog.debug("splitSql ok")
+
+    def tmqCase1(self, deleteWal=False):
+        tdLog.printNoPrefix("======== test case 1: ")
+        paraDict = {'dbName':     'dbt',
+                    'dropFlag':   1,
+                    'event':      '',
+                    'vgroups':    1,
+                    'stbName':    'stb',
+                    'colPrefix':  'c',
+                    'tagPrefix':  't',
+                    'colSchema':   [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1},{'type': 'TIMESTAMP', 'count':1}],
+                    'tagSchema':   [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1}],
+                    'ctbPrefix':  'ctb1',
+                    'ctbStartIdx': 0,
+                    'ctbNum':     10,
+                    'rowsPerTbl': 1000,
+                    'batchNum':   10,
+                    'startTs':    1640966400000,  # 2022-01-01 00:00:00.000
+                    'pollDelay':  2,
+                    'showMsg':    1,
+                    'showRow':    1,
+                    'snapshot':   0}
+
+        paraDict['vgroups'] = self.vgroups
+        paraDict['ctbNum'] = self.ctbNum
+        paraDict['rowsPerTbl'] = self.rowsPerTbl
+
+        topicNameList = ['topic1']
+        # expectRowsList = []
+        tmqCom.initConsumerTable()
+
+        tdLog.info("create topics from ntb with filter")
+        queryString = "select * from %s.t"%(paraDict['dbName'])
+        sqlString = "create topic %s as %s" %(topicNameList[0], queryString)
+        tdLog.info("create topic sql: %s"%sqlString)
+        tdSql.execute(sqlString)
+
+        # init consume info, and start tmq_sim, then check consume result
+        tdLog.info("insert consume info to consume processor")
+        consumerId   = 0
+        expectrowcnt = paraDict["rowsPerTbl"] * paraDict["ctbNum"] * 2
+        topicList    = topicNameList[0]
+        ifcheckdata  = 1
+        ifManualCommit = 1
+        keyList      = 'group.id:cgrp1, enable.auto.commit:true, auto.commit.interval.ms:200, auto.offset.reset:earliest'
+        tmqCom.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)
+
+        tdLog.info("start consume processor")
+        tmqCom.startTmqSimProcess(pollDelay=paraDict['pollDelay'],dbName=paraDict["dbName"],showMsg=paraDict['showMsg'], showRow=paraDict['showRow'],snapshot=paraDict['snapshot'])
+        tdLog.info("wait the consume result")
+
+
+        tmqCom.getStartConsumeNotifyFromTmqsim()
+        tmqCom.getStartCommitNotifyFromTmqsim()
+
+        #restart dnode & remove wal
+        self.restartAndRemoveWal(deleteWal)
+
+        # split vgroup
+        self.splitVgroups()
+
+        clusterComCheck.check_vgroups_status(vgroup_numbers=2,db_replica=self.replicaVar,db_name="dbt",count_number=240)
+
+        time.sleep(3)
+        for i in range(len(topicNameList)):
+            tdSql.query("drop topic %s"%topicNameList[i])
+        tdLog.printNoPrefix("======== test case 1 end ...... ")
+
+    def run(self):
+        self.prepareTestEnv()
+        self.tmqCase1(True)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+event = threading.Event()
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/utils/test/c/sml_test.c b/utils/test/c/sml_test.c
index d922a6454e..0907c2a641 100644
--- a/utils/test/c/sml_test.c
+++ b/utils/test/c/sml_test.c
@@ -1939,6 +1939,20 @@ int sml_td24559_Test() {
   }
   taos_free_result(pRes);
 
+  const char *sql2[] = {
+      "stb,t1=1 f1=283i32,f2=g\"Point(4.343 89.342)\" 1632299375000",
+  };
+
+  pRes = taos_query(taos, "use td24559");
+  taos_free_result(pRes);
+
+  pRes = taos_schemaless_insert(taos, (char **)sql2, sizeof(sql2) / sizeof(sql2[0]), TSDB_SML_LINE_PROTOCOL,
+                                TSDB_SML_TIMESTAMP_MILLI_SECONDS);
+
+  code = taos_errno(pRes);
+  printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
+  taos_free_result(pRes);
+
   pRes = taos_query(taos, "drop database if exists td24559");
   taos_free_result(pRes);
 
@@ -2325,6 +2339,17 @@ int sml_td17324_Test() {
   ASSERT(code == 0);
   taos_free_result(pRes);
 
+  const char *sql1[] = {
+      "st123456,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"pa3ssit\",c2=false,c4=4f64 1732700000394000000",
+  };
+
+  pRes = taos_schemaless_insert(taos, (char **)sql1, sizeof(sql1) / sizeof(sql1[0]), TSDB_SML_LINE_PROTOCOL,
+                                TSDB_SML_TIMESTAMP_NANO_SECONDS);
+  code = taos_errno(pRes);
+  printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
+  ASSERT(code == 0);
+  taos_free_result(pRes);
+
   taos_close(taos);
 
   return code;