Merge remote-tracking branch 'origin/3.0' into fix/tsim

76e66a58 · Shengliang Guan · 8e1700eb · 8ef588f2 · 76e66a58 · 76e66a58
13 changed file
--- a/docs/zh/05-get-started/03-package.md
+++ b/docs/zh/05-get-started/03-package.md
@@ -237,60 +237,4 @@ taosKeeper is removed successfully!

 然后再重新进行安装就可以了。

-:::
-
-## 安装目录说明
-
-TDengine 成功安装后，主安装目录是 /usr/local/taos，目录内容如下：
-
-```
-$ cd /usr/local/taos
-$ ll
-$ ll
-total 28
-drwxr-xr-x  7 root root 4096 Feb 22 09:34 ./
-drwxr-xr-x 12 root root 4096 Feb 22 09:34 ../
-drwxr-xr-x  2 root root 4096 Feb 22 09:34 bin/
-drwxr-xr-x  2 root root 4096 Feb 22 09:34 cfg/
-lrwxrwxrwx  1 root root   13 Feb 22 09:34 data -> /var/lib/taos/
-drwxr-xr-x  2 root root 4096 Feb 22 09:34 driver/
-drwxr-xr-x 10 root root 4096 Feb 22 09:34 examples/
-drwxr-xr-x  2 root root 4096 Feb 22 09:34 include/
-lrwxrwxrwx  1 root root   13 Feb 22 09:34 log -> /var/log/taos/
-```
-
- 自动生成配置文件目录、数据库目录、日志目录。
- 配置文件缺省目录：/etc/taos/taos.cfg， 软链接到 /usr/local/taos/cfg/taos.cfg；
- 数据库缺省目录：/var/lib/taos， 软链接到 /usr/local/taos/data；
- 日志缺省目录：/var/log/taos， 软链接到 /usr/local/taos/log；
- /usr/local/taos/bin 目录下的可执行文件，会软链接到 /usr/bin 目录下；
- /usr/local/taos/driver 目录下的动态库文件，会软链接到 /usr/lib 目录下；
- /usr/local/taos/include 目录下的头文件，会软链接到到 /usr/include 目录下；
-
-## 卸载和更新文件说明
-
-卸载安装包的时候，将保留配置文件、数据库文件和日志文件，即 /etc/taos/taos.cfg 、 /var/lib/taos 、 /var/log/taos 。如果用户确认后不需保留，可以手工删除，但一定要慎重，因为删除后，数据将永久丢失，不可以恢复！
-
-如果是更新安装，当缺省配置文件（ /etc/taos/taos.cfg ）存在时，仍然使用已有的配置文件，安装包中携带的配置文件修改为 taos.cfg.orig 保存在 /usr/local/taos/cfg/ 目录，可以作为设置配置参数的参考样例；如果不存在配置文件，就使用安装包中自带的配置文件。
-
-## 升级
-
-升级分为两个层面：升级安装包 和 升级运行中的实例。
-
-升级安装包请遵循前述安装和卸载的步骤先卸载旧版本再安装新版本。
-
-升级运行中的实例则要复杂得多，首先请注意版本号，TDengine 的版本号目前分为四段，如 2.4.0.14 和 2.4.0.16，只有前三段版本号一致（即只有第四段版本号不同）才能把一个运行中的实例进行升级。升级步骤如下：
-
- 停止数据写入
- 确保所有数据落盘，即写入时序数据库
- 停止 TDengine 集群
- 卸载旧版本并安装新版本
- 重新启动 TDengine 集群
- 进行简单的查询操作确认旧数据没有丢失
- 进行简单的写入操作确认 TDengine 集群可用
- 重新恢复业务数据的写入
-
-:::warning
-TDengine 不保证低版本能够兼容高版本的数据，所以任何时候都不推荐降级
-
-:::
+:::
\ No newline at end of file
--- a/docs/zh/05-get-started/index.md
+++ b/docs/zh/05-get-started/index.md
 ---
 title: 立即开始
-description: '从 Docker，安装包或使用 apt-get 快速安装 TDengine, 通过命令行程序TDengine CLI和工具 taosdemo 快速体验 TDengine 功能'
+description: '快速设置 TDengine 环境并体验其高效写入和查询'
 ---

-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-import PkgInstall from "./\_pkg_install.mdx";
-import AptGetInstall from "./\_apt_get_install.mdx";

-## 安装
+本章主要介绍如何利用 Docker 或者安装包快速设置 TDengine 环境并体验其高效写入和查询。

-TDengine 完整的软件包包括服务端（taosd）、用于与第三方系统对接并提供 RESTful 接口的 taosAdapter、应用驱动（taosc）、命令行程序 (CLI，taos) 和一些工具软件，目前 2.X 版服务端 taosd 和 taosAdapter 仅在 Linux 系统上安装和运行，后续将支持 Windows、macOS 等系统。应用驱动 taosc 与 TDengine CLI 可以在 Windows 或 Linux 上安装和运行。TDengine 除了提供多种语言的连接器之外，还通过 [taosAdapter](/reference/taosadapter) 提供 [RESTful 接口](/reference/rest-api)。但在 2.4 之前的版本中没有 taosAdapter，RESTful 接口是由 taosd 内置的 HTTP 服务提供的。
+```mdx-code-block
+import DocCardList from '@theme/DocCardList';
+import {useCurrentSidebarCategory} from '@docusaurus/theme-common';

-TDengine 支持 X64/ARM64/MIPS64/Alpha64 硬件平台，后续将支持 ARM32、RISC-V 等 CPU 架构。
-
-<Tabs defaultValue="apt-get">
-<TabItem value="docker" label="Docker">
-如果已经安装了 docker， 只需执行下面的命令。
-
-```shell
-docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp tdengine/tdengine
-```
-
-确定该容器已经启动并且在正常运行
-
-```shell
-docker ps
-```
-
-进入该容器并执行 bash
-
-```shell
-docker exec -it <container name> bash
-```
-
-然后就可以执行相关的 Linux 命令操作和访问 TDengine
-
-详细操作方法请参照 [通过 Docker 快速体验 TDengine](/train-faq/docker)。
-
-:::info
-从 2.4.0.10 开始，除 taosd 以外，Docker 镜像还包含：taos、taosAdapter、taosdump、taosBenchmark、TDinsight 安装脚本和示例代码。启动 Docker 容器时，将同时启动 taosAdapter 和 taosd，实现对 RESTful 的支持。
-
-:::
-
-</TabItem>
-<TabItem value="apt-get" label="apt-get">
-<AptGetInstall />
-</TabItem>
-<TabItem value="pkg" label="安装包">
-<PkgInstall />
-</TabItem>
-<TabItem value="src" label="源码">
-
-如果您希望对 TDengine 贡献代码或对内部实现感兴趣，请参考我们的 [TDengine GitHub 主页](https://github.com/taosdata/TDengine) 下载源码构建和安装.
-
-下载其他组件、最新 Beta 版及之前版本的安装包，请点击[这里](https://www.taosdata.com/cn/all-downloads/)。
-
-</TabItem>
-</Tabs>
-
-## 启动
-
-安装后，请使用 `systemctl` 命令来启动 TDengine 的服务进程。
-
-```bash
-systemctl start taosd
-```
-
-检查服务是否正常工作：
-
-```bash
-systemctl status taosd
-```
-
-如果 TDengine 服务正常工作，那么您可以通过 TDengine 的命令行程序 `taos` 来访问并体验 TDengine。
-
-:::info
-
- systemctl 命令需要 _root_ 权限来运行，如果您非 _root_ 用户，请在命令前添加 sudo 。
- 为更好的获得产品反馈，改善产品，TDengine 会采集基本的使用信息，但您可以修改系统配置文件 taos.cfg 里的配置参数 telemetryReporting，将其设为 0，就可将其关闭。
- TDengine 采用 FQDN（一般就是 hostname）作为节点的 ID，为保证正常运行，需要给运行 taosd 的服务器配置好 FQDN，在 TDengine CLI 或应用运行的机器配置好 DNS 服务或 hosts 文件，保证 FQDN 能够解析。
- `systemctl stop taosd` 指令在执行后并不会马上停止 TDengine 服务，而是会等待系统中必要的落盘工作正常完成。在数据量很大的情况下，这可能会消耗较长时间。
-
-TDengine 支持在使用 [`systemd`](https://en.wikipedia.org/wiki/Systemd) 做进程服务管理的 Linux 系统上安装，用 `which systemctl` 命令来检测系统中是否存在 `systemd` 包:
-
-```bash
-which systemctl
-```
-
-如果系统中不支持 `systemd`，也可以用手动运行 `/usr/local/taos/bin/taosd` 方式启动 TDengine 服务。
-
-:::note
-
-## TDengine 命令行 (CLI)
-
-为便于检查 TDengine 的状态，执行数据库 (Database) 的各种即席(Ad Hoc)查询，TDengine 提供一命令行应用程序(以下简称为 TDengine CLI) taos。要进入 TDengine 命令行，您只要在安装有 TDengine 的 Linux 终端执行 `taos` 即可。
-
-```bash
-taos
-```
-
-如果连接服务成功，将会打印出欢迎消息和版本信息。如果失败，则会打印错误消息出来（请参考 [FAQ](/train-faq/faq) 来解决终端连接服务端失败的问题）。 TDengine CLI 的提示符号如下：
-
-```cmd
-taos>
-```
-
-在 TDengine CLI 中，用户可以通过 SQL 命令来创建/删除数据库、表等，并进行数据库(database)插入查询操作。在终端中运行的 SQL 语句需要以分号结束来运行。示例：
-
-```sql
-create database demo;
-use demo;
-create table t (ts timestamp, speed int);
-insert into t values ('2019-07-15 00:00:00', 10);
-insert into t values ('2019-07-15 01:00:00', 20);
-select * from t;
-           ts            |    speed    |
-========================================
- 2019-07-15 00:00:00.000 |          10 |
- 2019-07-15 01:00:00.000 |          20 |
-Query OK, 2 row(s) in set (0.003128s)
-```
-
-除执行 SQL 语句外，系统管理员还可以从 TDengine CLI 进行检查系统运行状态、添加删除用户账号等操作。TDengine CLI 连同应用驱动也可以独立安装在 Linux 或 Windows 机器上运行，更多细节请参考 [这里](../reference/taos-shell/)
-
-## 使用 taosBenchmark 体验写入速度
-
-启动 TDengine 的服务，在 Linux 终端执行 `taosBenchmark` （曾命名为 `taosdemo`）：
-
-```bash
-taosBenchmark
-```
-
-该命令将在数据库 test 下面自动创建一张超级表 meters，该超级表下有 1 万张表，表名为 "d0" 到 "d9999"，每张表有 1 万条记录，每条记录有 (ts, current, voltage, phase) 四个字段，时间戳从 "2017-07-14 10:40:00 000" 到 "2017-07-14 10:40:09 999"，每张表带有标签 location 和 groupId，groupId 被设置为 1 到 10， location 被设置为 "California.SanFrancisco" 或者 "California.LosAngeles"。
-
-这条命令很快完成 1 亿条记录的插入。具体时间取决于硬件性能，即使在一台普通的 PC 服务器往往也仅需十几秒。
-
-taosBenchmark 命令本身带有很多选项，配置表的数目、记录条数等等，您可以设置不同参数进行体验，请执行 `taosBenchmark --help` 详细列出。taosBenchmark 详细使用方法请参照 [如何使用 taosBenchmark 对 TDengine 进行性能测试](https://www.taosdata.com/2021/10/09/3111.html)。
-
-## 使用 TDengine CLI 体验查询速度
-
-使用上述 taosBenchmark 插入数据后，可以在 TDengine CLI 输入查询命令，体验查询速度。
-
-查询超级表下记录总条数：
-
-```sql
-taos> select count(*) from test.meters;
-```
-
-查询 1 亿条记录的平均值、最大值、最小值等：
-
-```sql
-taos> select avg(current), max(voltage), min(phase) from test.meters;
-```
-
-查询 location="California.SanFrancisco" 的记录总条数：
-
-```sql
-taos> select count(*) from test.meters where location="California.SanFrancisco";
-```
-
-查询 groupId=10 的所有记录的平均值、最大值、最小值等：
-
-```sql
-taos> select avg(current), max(voltage), min(phase) from test.meters where groupId=10;
-```
-
-对表 d10 按 10s 进行平均值、最大值和最小值聚合统计：
-
-```sql
-taos> select avg(current), max(voltage), min(phase) from test.d10 interval(10s);
-```
+<DocCardList items={useCurrentSidebarCategory().items}/>
+```
\ No newline at end of file
--- a/docs/zh/13-operation/01-pkg-install.md
+++ b/docs/zh/13-operation/01-pkg-install.md
@@ -6,199 +6,11 @@ description: 安装、卸载、启动、停止和升级
 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";

-TDengine 开源版本提供 deb 和 rpm 格式安装包，用户可以根据自己的运行环境选择合适的安装包。其中 deb 支持 Debian/Ubuntu 及衍生系统，rpm 支持 CentOS/RHEL/SUSE 及衍生系统。同时我们也为企业用户提供 tar.gz 格式安装包。
+本节将介绍一些关于安装和卸载更深层次的内容，以及升级的注意事项。

-## 安装
+## 安装和卸载

-<Tabs>
-<TabItem label="Deb 安装" value="debinst">
-
-1、从官网下载获得 deb 安装包，例如 TDengine-server-2.4.0.7-Linux-x64.deb；
-2、进入到 TDengine-server-2.4.0.7-Linux-x64.deb 安装包所在目录，执行如下的安装命令：
-
-```
-$ sudo dpkg -i TDengine-server-2.4.0.7-Linux-x64.deb
-(Reading database ... 137504 files and directories currently installed.)
-Preparing to unpack TDengine-server-2.4.0.7-Linux-x64.deb ...
-TDengine is removed successfully!
-Unpacking tdengine (2.4.0.7) over (2.4.0.7) ...
-Setting up tdengine (2.4.0.7) ...
-Start to install TDengine...
-
-System hostname is: ubuntu-1804
-
-Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join
-OR leave it blank to build one:
-
-Enter your email address for priority support or enter empty to skip:
-Created symlink /etc/systemd/system/multi-user.target.wants/taosd.service → /etc/systemd/system/taosd.service.
-
-To configure TDengine : edit /etc/taos/taos.cfg
-To start TDengine     : sudo systemctl start taosd
-To access TDengine    : taos -h ubuntu-1804 to login into TDengine server
-
-
-TDengine is installed successfully!
-```
-
-</TabItem>
-
-<TabItem label="RPM 安装" value="rpminst">
-
-1、从官网下载获得 rpm 安装包，例如 TDengine-server-2.4.0.7-Linux-x64.rpm；
-2、进入到 TDengine-server-2.4.0.7-Linux-x64.rpm 安装包所在目录，执行如下的安装命令：
-
-```
-$ sudo rpm -ivh TDengine-server-2.4.0.7-Linux-x64.rpm
-Preparing...                          ################################# [100%]
-Updating / installing...
-   1:tdengine-2.4.0.7-3               ################################# [100%]
-Start to install TDengine...
-
-System hostname is: centos7
-
-Enter FQDN:port (like h1.taosdata.com:6030) of an existing TDengine cluster node to join
-OR leave it blank to build one:
-
-Enter your email address for priority support or enter empty to skip:
-
-Created symlink from /etc/systemd/system/multi-user.target.wants/taosd.service to /etc/systemd/system/taosd.service.
-
-To configure TDengine : edit /etc/taos/taos.cfg
-To start TDengine     : sudo systemctl start taosd
-To access TDengine    : taos -h centos7 to login into TDengine server
-
-
-TDengine is installed successfully!
-```
-
-</TabItem>
-
-<TabItem label="tar.gz 安装" value="tarinst">
-
-1、从官网下载获得 tar.gz 安装包，例如 TDengine-server-2.4.0.7-Linux-x64.tar.gz；
-2、进入到 TDengine-server-2.4.0.7-Linux-x64.tar.gz 安装包所在目录，先解压文件后，进入子目录，执行其中的 install.sh 安装脚本：
-
-```
-$ tar xvzf TDengine-enterprise-server-2.4.0.7-Linux-x64.tar.gz
-TDengine-enterprise-server-2.4.0.7/
-TDengine-enterprise-server-2.4.0.7/driver/
-TDengine-enterprise-server-2.4.0.7/driver/vercomp.txt
-TDengine-enterprise-server-2.4.0.7/driver/libtaos.so.2.4.0.7
-TDengine-enterprise-server-2.4.0.7/install.sh
-TDengine-enterprise-server-2.4.0.7/examples/
-...
-
-$ ll
-total 43816
-drwxrwxr-x  3 ubuntu ubuntu     4096 Feb 22 09:31 ./
-drwxr-xr-x 20 ubuntu ubuntu     4096 Feb 22 09:30 ../
-drwxrwxr-x  4 ubuntu ubuntu     4096 Feb 22 09:30 TDengine-enterprise-server-2.4.0.7/
-rw-rw-r--  1 ubuntu ubuntu 44852544 Feb 22 09:31 TDengine-enterprise-server-2.4.0.7-Linux-x64.tar.gz
-
-$ cd TDengine-enterprise-server-2.4.0.7/
-
- $ ll
-total 40784
-drwxrwxr-x  4 ubuntu ubuntu     4096 Feb 22 09:30 ./
-drwxrwxr-x  3 ubuntu ubuntu     4096 Feb 22 09:31 ../
-drwxrwxr-x  2 ubuntu ubuntu     4096 Feb 22 09:30 driver/
-drwxrwxr-x 10 ubuntu ubuntu     4096 Feb 22 09:30 examples/
-rwxrwxr-x  1 ubuntu ubuntu    33294 Feb 22 09:30 install.sh*
-rw-rw-r--  1 ubuntu ubuntu 41704288 Feb 22 09:30 taos.tar.gz
-
-$ sudo ./install.sh
-
-Start to update TDengine...
-Created symlink /etc/systemd/system/multi-user.target.wants/taosd.service → /etc/systemd/system/taosd.service.
-Nginx for TDengine is updated successfully!
-
-To configure TDengine : edit /etc/taos/taos.cfg
-To configure Taos Adapter (if has) : edit /etc/taos/taosadapter.toml
-To start TDengine     : sudo systemctl start taosd
-To access TDengine    : use taos -h ubuntu-1804 in shell OR from http://127.0.0.1:6060
-
-TDengine is updated successfully!
-Install taoskeeper as a standalone service
-taoskeeper is installed, enable it by `systemctl enable taoskeeper`
-```
-
-:::info
-install.sh 安装脚本在执行过程中，会通过命令行交互界面询问一些配置信息。如果希望采取无交互安装方式，那么可以用 -e no 参数来执行 install.sh 脚本。运行 `./install.sh -h` 指令可以查看所有参数的详细说明信息。
-
-:::
-
-</TabItem>
-</Tabs>
-
-:::note
-当安装第一个节点时，出现 Enter FQDN：提示的时候，不需要输入任何内容。只有当安装第二个或以后更多的节点时，才需要输入已有集群中任何一个可用节点的 FQDN，支持该新节点加入集群。当然也可以不输入，而是在新节点启动前，配置到新节点的配置文件中。
-
-:::
-
-## 卸载
-
-<Tabs>
-<TabItem label="Deb 卸载" value="debuninst">
-
-卸载命令如下:
-
-```
-$ sudo dpkg -r tdengine
-(Reading database ... 137504 files and directories currently installed.)
-Removing tdengine (2.4.0.7) ...
-TDengine is removed successfully!
-
-```
-
-</TabItem>
-
-<TabItem label="RPM 卸载" value="rpmuninst">
-
-卸载命令如下:
-
-```
-$ sudo rpm -e tdengine
-TDengine is removed successfully!
-```
-
-</TabItem>
-
-<TabItem label="tar.gz 卸载" value="taruninst">
-
-卸载命令如下:
-
-```
-$ rmtaos
-Nginx for TDengine is running, stopping it...
-TDengine is removed successfully!
-
-taosKeeper is removed successfully!
-```
-
-</TabItem>
-</Tabs>
-
-:::info
- TDengine 提供了多种安装包，但最好不要在一个系统上同时使用 tar.gz 安装包和 deb 或 rpm 安装包。否则会相互影响，导致在使用时出现问题。
-
- 对于 deb 包安装后，如果安装目录被手工误删了部分，出现卸载、或重新安装不能成功。此时，需要清除 TDengine 包的安装信息，执行如下命令：
-
-   ```
-   $ sudo rm -f /var/lib/dpkg/info/tdengine*
-   ```
-
-然后再重新进行安装就可以了。
-
- 对于 rpm 包安装后，如果安装目录被手工误删了部分，出现卸载、或重新安装不能成功。此时，需要清除 TDengine 包的安装信息，执行如下命令：
-
-   ```
-   $ sudo rpm -e --noscripts tdengine
-   ```
-
-然后再重新进行安装就可以了。
-
-:::
+关于安装和卸载，请参考 [安装和卸载](../get-started/package)

 ## 安装目录说明

@@ -234,34 +46,6 @@ lrwxrwxrwx  1 root root   13 Feb 22 09:34 log -> /var/log/taos/

 如果是更新安装，当缺省配置文件（ /etc/taos/taos.cfg ）存在时，仍然使用已有的配置文件，安装包中携带的配置文件修改为 taos.cfg.orig 保存在 /usr/local/taos/cfg/ 目录，可以作为设置配置参数的参考样例；如果不存在配置文件，就使用安装包中自带的配置文件。

-## 启动和停止
-
-TDengine 使用 Linux 系统的 systemd/systemctl/service 来管理系统的启动和、停止、重启操作。TDengine 的服务进程是 taosd，默认情况下 TDengine 在系统启动后将自动启动。DBA 可以通过 systemd/systemctl/service 手动操作停止、启动、重新启动服务。
-
-以 systemctl 为例，命令如下：
-
- 启动服务进程：`systemctl start taosd`
-
- 停止服务进程：`systemctl stop taosd`
-
- 重启服务进程：`systemctl restart taosd`
-
- 查看服务状态：`systemctl status taosd`
-
-注意：TDengine 在 2.4 版本之后包含一个独立组件 taosAdapter 需要使用 systemctl 命令管理 taosAdapter 服务的启动和停止。
-
-如果服务进程处于活动状态，则 status 指令会显示如下的相关信息：
-
-   ```
-   Active: active (running)
-   ```
-
-如果后台服务进程处于停止状态，则 status 指令会显示如下的相关信息：
-
-   ```
-   Active: inactive (dead)
-   ```
-
 ## 升级
 升级分为两个层面：升级安装包 和 升级运行中的实例。


--- a/source/libs/command/src/explain.c
+++ b/source/libs/command/src/explain.c
@@ -401,8 +401,6 @@ int32_t qExplainResNodeToRowsImpl(SExplainResNode *pResNode, SExplainCtx *ctx, i
        QRY_ERR_RET(qExplainBufAppendExecInfo(pResNode->pExecInfo, tbuf, &tlen));
        EXPLAIN_ROW_APPEND(EXPLAIN_BLANK_FORMAT);
      }
-      EXPLAIN_ROW_APPEND(EXPLAIN_COLUMNS_FORMAT, pTagScanNode->pScanCols->length);
-      EXPLAIN_ROW_APPEND(EXPLAIN_BLANK_FORMAT);
      if (pTagScanNode->pScanPseudoCols) {
        EXPLAIN_ROW_APPEND(EXPLAIN_PSEUDO_COLUMNS_FORMAT, pTagScanNode->pScanPseudoCols->length);
        EXPLAIN_ROW_APPEND(EXPLAIN_BLANK_FORMAT);

--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3963,6 +3963,8 @@ static SSDataBlock* doApplyIndefinitFunction(SOperatorInfo* pOperator) {
    size_t rows = pInfo->pRes->info.rows;
    if (rows > 0 || pOperator->status == OP_EXEC_DONE) {
      break;
+    } else {
+      blockDataCleanup(pInfo->pRes);
    }
  }


--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
@@ -1018,7 +1018,7 @@ static int32_t parseTagsClause(SInsertParseContext* pCxt, SSchema* pSchema, uint
 end:
  for (int i = 0; i < taosArrayGetSize(pTagVals); ++i) {
    STagVal* p = (STagVal*)taosArrayGet(pTagVals, i);
-    if (IS_VAR_DATA_TYPE(p->type)) {
+    if (p->type == TSDB_DATA_TYPE_NCHAR) {
      taosMemoryFree(p->pData);
    }
  }

--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -1588,7 +1588,7 @@ static int32_t eliminateProjOptimizeImpl(SOptimizeContext* pCxt, SLogicSubplan*
  FOREACH(pProjection, pProjectNode->pProjections) {
    SNode* pChildTarget = NULL;
    FOREACH(pChildTarget, pChild->pTargets) {
-      if (strcmp(((SColumnNode*)pProjection)->colName, ((SColumnNode*)pChildTarget)->colName) == 0) {
+      if (0 == strcmp(((SColumnNode*)pProjection)->colName, ((SColumnNode*)pChildTarget)->colName)) {
        nodesListAppend(pNewChildTargets, nodesCloneNode(pChildTarget));
        break;
      }
@@ -2167,10 +2167,26 @@ static int32_t tagScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSubp
        break;
      }
  }
-  
  NODES_DESTORY_LIST(pScanNode->pScanCols);

  SLogicNode* pAgg = pScanNode->node.pParent;
+  if (NULL == pAgg->pParent) {
+    SNodeList* pScanTargets = nodesMakeList();
+
+    SNode* pAggTarget = NULL;
+    FOREACH(pAggTarget, pAgg->pTargets) {
+      SNode* pScanTarget = NULL;
+        FOREACH(pScanTarget, pScanNode->node.pTargets) {
+        if (0 == strcmp( ((SColumnNode*)pAggTarget)->colName, ((SColumnNode*)pAggTarget)->colName )) {
+          nodesListAppend(pScanTargets, nodesCloneNode(pScanTarget));
+          break;
+        }
+      }
+    }
+    nodesDestroyList(pScanNode->node.pTargets);
+    pScanNode->node.pTargets = pScanTargets;
+  }
+
  int32_t code = replaceLogicNode(pLogicSubplan, pAgg, (SLogicNode*)pScanNode);
  if (TSDB_CODE_SUCCESS == code) {
    NODES_CLEAR_LIST(pAgg->pChildren);

--- a/source/libs/sync/test/sh/a.sh
+++ b/source/libs/sync/test/sh/a.sh
@@ -22,14 +22,14 @@ done

 echo ""
 echo "generate vgId ..."
-cat ${logpath}/log.dnode* | grep "vgId:" | grep -v ERROR | awk '{print $5}' | sort | uniq > ${logpath}/log.vgIds.tmp
+cat ${logpath}/log.dnode* | grep "vgId:" | grep -v ERROR | awk '{print $5}' | awk -F, '{print $1}' | sort | uniq > ${logpath}/log.vgIds.tmp
 echo "all vgIds:" > ${logpath}/log.vgIds
-cat ${logpath}/log.dnode* | grep "vgId:" | grep -v ERROR | awk '{print $5}' | sort | uniq >> ${logpath}/log.vgIds
+cat ${logpath}/log.dnode* | grep "vgId:" | grep -v ERROR | awk '{print $5}' | awk -F, '{print $1}' | sort | uniq >> ${logpath}/log.vgIds
 for dnode in `ls ${logpath} | grep dnode | grep -v log`;do
 	echo "" >> ${logpath}/log.vgIds
 	echo "" >> ${logpath}/log.vgIds
 	echo "${dnode}:" >> ${logpath}/log.vgIds
-	cat ${logpath}/${dnode}/log/taosdlog.* | grep SYN | grep "vgId:" | grep -v ERROR | awk '{print $5}' | sort | uniq >> ${logpath}/log.vgIds 
+	cat ${logpath}/${dnode}/log/taosdlog.* | grep SYN | grep "vgId:" | grep -v ERROR | awk '{print $5}' | awk -F, '{print $1}' | sort | uniq >> ${logpath}/log.vgIds 
 done

 echo ""
@@ -52,7 +52,33 @@ for file in `ls ${logpath}/log.dnode* | grep -v vgId`;do
 	cat ${file} | awk '{ if(index($0, "sync open") > 0 || index($0, "sync close") > 0 || index($0, "become leader") > 0) {print $0} }' > ${file}.main
 done

+echo ""
+echo "generate log.leader.term ..."
+cat ${logpath}/*.main | grep "become leader" | grep -v "config change" | awk '{print $5,$0}' | awk -F, '{print $4"_"$0}' | sort -k1 > ${logpath}/log.leader.term
+
+echo ""
+echo "generate log.index, log.snapshot, log.records, log.actions ..."
+for file in `ls ${logpath}/log.dnode*vgId*`;do
+	destfile1=${file}.index
+	echo "generate ${destfile1}"
+	cat ${file} | awk '{ if(index($0, "write index:") > 0 || index($0, "wal truncate, from-index") > 0) {print $0} }' > ${destfile1}
+
+	destfile2=${file}.snapshot
+	echo "generate ${destfile2}"
+	cat ${file} | awk '{ if(index($0, "snapshot sender") > 0 || index($0, "snapshot receiver") > 0) {print $0} }' | grep -v "save old" | grep -v "create new" | grep -v "udpate replicaIndex" | grep -v "delete old" | grep -v "reset for" > ${destfile2}

+	destfile3=${file}.records
+	echo "generate ${destfile3}"
+	cat ${file} | awk '{ if(index($0, "write index:") > 0 || index($0, "wal truncate, from-index") > 0 || index($0, "snapshot sender") > 0 || index($0, "snapshot receiver") > 0) {print $0} }' | grep -v "save old" | grep -v "create new" | grep -v "udpate replicaIndex" | grep -v "delete old" | grep -v "reset for" > ${destfile3}

+	destfile4=${file}.commit
+	echo "generate ${destfile4}"
+	cat ${file} | awk '{ if(index($0, "commit by") > 0) {print $0} }' > ${destfile4}
+
+	destfile5=${file}.actions
+	echo "generate ${destfile5}"
+	cat ${file} | awk '{ if(index($0, "commit by") > 0 || index($0, "sync open") > 0 || index($0, "sync close") > 0 || index($0, "become leader") > 0 || index($0, "write index:") > 0 || index($0, "wal truncate, from-index") > 0 || index($0, "snapshot sender") > 0 || index($0, "snapshot receiver") > 0) {print $0} }' | grep -v "save old" | grep -v "create new" | grep -v "udpate replicaIndex" | grep -v "delete old" | grep -v "reset for" > ${destfile5}
+
+done

 exit 0
--- a/tests/script/tsim/parser/udf.sim
+++ b/tests/script/tsim/parser/udf.sim
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/exec.sh -n dnode1 -s start
-system sh/prepare_udf.sh
-
-sleep 100
-sql connect
-print ======================== dnode1 start
-
-sql create function n01 as '/tmp/normal' outputtype int;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n01 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != INT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n01;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n02 as '/tmp/normal' outputtype bool;
-sql show functions;
-if $rows != 1 then
-  print expect 1, actual $rows
-  return -1
-endi
-
-
-if $data00 != n02 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BOOL then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n02;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-sql create function n03 as '/tmp/normal' outputtype TINYINT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n03 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != TINYINT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n03;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-sql create function n04 as '/tmp/normal' outputtype SMALLINT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n04 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != SMALLINT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n04;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-sql create function n05 as '/tmp/normal' outputtype INT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n05 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != INT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n05;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-
-
-
-sql create function n06 as '/tmp/normal' outputtype BIGINT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n06 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BIGINT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n06;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-
-sql create function n07 as '/tmp/normal' outputtype FLOAT;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n07 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != FLOAT then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n07;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-sql create function n08 as '/tmp/normal' outputtype DOUBLE;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n08 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != DOUBLE then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n08;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-
-
-
-sql create function n09 as '/tmp/normal' outputtype BINARY;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n09 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BINARY(0) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n09;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n10 as '/tmp/normal' outputtype BINARY(10);
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n10 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != BINARY(10) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n10;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n11 as '/tmp/normal' outputtype TIMESTAMP;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n11 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != TIMESTAMP then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n11;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n12 as '/tmp/normal' outputtype NCHAR;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n12 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != NCHAR(0) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n12;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n13 as '/tmp/normal' outputtype NCHAR(10);
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n13 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != NCHAR(10) then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n13;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-
-sql create function n14 as '/tmp/normal' outputtype TINYINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n14 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n14;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-sql create function n15 as '/tmp/normal' outputtype SMALLINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n15 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n15;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function n16 as '/tmp/normal' outputtype INT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n16 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n16;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-
-sql create function n17 as '/tmp/normal' outputtype BIGINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n17 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n17;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-sql create aggregate function n18 as '/tmp/normal' outputtype BIGINT UNSIGNED;
-sql show functions;
-if $rows != 1 then
-  return -1
-endi
-
-
-if $data00 != n18 then 
-  return -1
-endi
-if $data01 != /tmp/normal then 
-  return -1
-endi
-if $data02 != 1 then 
-  return -1
-endi
-if $data05 != 5 then 
-  return -1
-endi
-
-sql drop function n18;
-
-sql show functions;
-if $rows != 0 then
-  return -1
-endi
-
-
-
-sql create function t01 as '/tmp/normal' outputtype INT;
-sql_error create function t01 as '/tmp/normal' outputtype SMALLINT;
-sql drop function t01;
-sql create function t01 as '/tmp/normal' outputtype INT;
-sql create function t02 as '/tmp/normal' outputtype SMALLINT;
-sql show functions;
-if $rows != 2 then
-  return -1
-endi
-
-
-
-
-
-
-sql_error create function e1 as '/tmp/normal';
-sql_error create function e2 as '/tmp/normal' outputtype;
-sql_error create function e3 as '/tmp/normal' a;
-sql_error create function e4 as '/tmp/normal' outputtype a;
-sql_error create function e5 as '/tmp/normal' outputtype bool int;
-sql_error create function as '/tmp/normal' outputtype;
-sql_error create function e6 as '/tmp/empty' outputtype int;
-sql_error create function e7 as '/tmp/big' outputtype int;
-sql_error create function e8 as '/tmp/noexistfile' outputtype int;
-sql_error create function e0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456 as '/tmp/normal' outputtype int;
-sql_error create function e9 as outputtype int;
-
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/parser/udf_dll.sim
+++ b/tests/script/tsim/parser/udf_dll.sim
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
-system sh/exec.sh -n dnode1 -s start
-system sh/prepare_udf.sh
-
-sleep 100
-sql connect
-print ======================== dnode1 start
-
-sql create function add_one as '/tmp/add_one.so' outputtype int;
-sql create aggregate function sum_double as '/tmp/sum_double.so' outputtype int;
-sql show functions;
-if $rows != 2 then
-  return -1
-endi
-
-sql create database db;
-sql use db;
-sql create table tb1 (ts timestamp, f1 int, f2 bool, f3 binary(10));
-sql insert into tb1 values ('2021-03-23 17:17:19.660', 1, true, 'tb1-1');
-sql insert into tb1 values ('2021-03-23 19:23:28.595', 2, false, 'tb1-2');
-sql insert into tb1 values ('2021-03-23 19:33:39.070', 3, true, 'tb1-3');
-sql insert into tb1 values ('2021-03-23 19:34:37.670', 4, false, 'tb1-4');
-sql insert into tb1 values ('2021-03-24 19:08:06.609', 5, true, 'tb1-5');
-sql insert into tb1 values ('2021-03-24 19:26:38.231', 6, false, 'tb1-6');
-sql insert into tb1 values ('2021-03-25 10:03:17.688', 7, true, 'tb1-7');
-
-sql select add_one(f1) from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data10 != 3 then 
-   return -1
-endi
-if $data20 != 4 then 
-   return -1
-endi
-if $data30 != 5 then 
-   return -1
-endi
-if $data40 != 6 then 
-   return -1
-endi
-if $data50 != 7 then 
-   return -1
-endi
-if $data60 != 8 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1;
-if $rows != 1 then
-  return -1
-endi
-
-if $data00 != 56 then 
-   return -1
-endi
-
-
-sql select ts,add_one(f1),f1 from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:17:19.660@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data02 != 1 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:23:28.595@ then 
-   return -1
-endi
-if $data11 != 3 then 
-   return -1
-endi
-if $data12 != 2 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:33:39.070@ then 
-   return -1
-endi
-if $data21 != 4 then 
-   return -1
-endi
-if $data22 != 3 then 
-   return -1
-endi
-if $data30 != @21-03-23 19:34:37.670@ then 
-   return -1
-endi
-if $data31 != 5 then 
-   return -1
-endi
-if $data32 != 4 then 
-   return -1
-endi
-if $data40 != @21-03-24 19:08:06.609@ then 
-   return -1
-endi
-if $data41 != 6 then 
-   return -1
-endi
-if $data42 != 5 then 
-   return -1
-endi
-if $data50 != @21-03-24 19:26:38.231@ then 
-   return -1
-endi
-if $data51 != 7 then 
-   return -1
-endi
-if $data52 != 6 then 
-   return -1
-endi
-if $data60 != @21-03-25 10:03:17.688@ then 
-   return -1
-endi
-if $data61 != 8 then 
-   return -1
-endi
-if $data62 != 7 then 
-   return -1
-endi
-
-
-
-
-sql select add_one(f1),add_one(f1) from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != 3 then 
-   return -1
-endi
-if $data11 != 3 then 
-   return -1
-endi
-if $data20 != 4 then 
-   return -1
-endi
-if $data21 != 4 then 
-   return -1
-endi
-if $data30 != 5 then 
-   return -1
-endi
-if $data31 != 5 then 
-   return -1
-endi
-if $data40 != 6 then 
-   return -1
-endi
-if $data41 != 6 then 
-   return -1
-endi
-if $data50 != 7 then 
-   return -1
-endi
-if $data51 != 7 then 
-   return -1
-endi
-if $data60 != 8 then 
-   return -1
-endi
-if $data61 != 8 then 
-   return -1
-endi
-
-
-sql select add_one(f1)+1 from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 3.000000000 then 
-   return -1
-endi
-if $data10 != 4.000000000 then 
-   return -1
-endi
-if $data20 != 5.000000000 then 
-   return -1
-endi
-if $data30 != 6.000000000 then 
-   return -1
-endi
-if $data40 != 7.000000000 then 
-   return -1
-endi
-if $data50 != 8.000000000 then 
-   return -1
-endi
-if $data60 != 9.000000000 then 
-   return -1
-endi
-
-
-sql select sum_double(f1)+1 from tb1;
-if $rows != 1 then
-  return -1
-endi
-
-if $data00 != 57.000000000 then 
-   return -1
-endi
-
-
-sql select add_one(f1)+1,f1 from tb1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 3.000000000 then 
-   return -1
-endi
-if $data01 != 1 then 
-   return -1
-endi
-if $data10 != 4.000000000 then 
-   return -1
-endi
-if $data11 != 2 then 
-   return -1
-endi
-if $data20 != 5.000000000 then 
-   return -1
-endi
-if $data21 != 3 then 
-   return -1
-endi
-if $data30 != 6.000000000 then 
-   return -1
-endi
-if $data31 != 4 then 
-   return -1
-endi
-if $data40 != 7.000000000 then 
-   return -1
-endi
-if $data41 != 5 then 
-   return -1
-endi
-if $data50 != 8.000000000 then 
-   return -1
-endi
-if $data51 != 6 then 
-   return -1
-endi
-if $data60 != 9.000000000 then 
-   return -1
-endi
-if $data61 != 7 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1 interval (10a);
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:17:19.660@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:23:28.590@ then 
-   return -1
-endi
-if $data11 != 4 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:33:39.070@ then 
-   return -1
-endi
-if $data21 != 6 then 
-   return -1
-endi
-if $data30 != @21-03-23 19:34:37.670@ then 
-   return -1
-endi
-if $data31 != 8 then 
-   return -1
-endi
-if $data40 != @21-03-24 19:08:06.600@ then 
-   return -1
-endi
-if $data41 != 10 then 
-   return -1
-endi
-if $data50 != @21-03-24 19:26:38.230@ then 
-   return -1
-endi
-if $data51 != 12 then 
-   return -1
-endi
-if $data60 != @21-03-25 10:03:17.680@ then 
-   return -1
-endi
-if $data61 != 14 then 
-   return -1
-endi
-
-sql select ts,add_one(f1) from tb1 where ts>="2021-03-23 17:00:00.000" and ts<="2021-03-24 20:00:00.000";
-if $rows != 6 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:17:19.660@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:23:28.595@ then 
-   return -1
-endi
-if $data11 != 3 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:33:39.070@ then 
-   return -1
-endi
-if $data21 != 4 then 
-   return -1
-endi
-if $data30 != @21-03-23 19:34:37.670@ then 
-   return -1
-endi
-if $data31 != 5 then 
-   return -1
-endi
-if $data40 != @21-03-24 19:08:06.609@ then 
-   return -1
-endi
-if $data41 != 6 then 
-   return -1
-endi
-if $data50 != @21-03-24 19:26:38.231@ then 
-   return -1
-endi
-if $data51 != 7 then 
-   return -1
-endi
-
-sql select sum_double(f1) from tb1 where ts>="2021-03-23 17:00:00.000" and ts<="2021-03-24 20:00:00.000" interval (1h);
-if $rows != 3 then
-  return -1
-endi
-
-if $data00 != @21-03-23 17:00:00.000@ then 
-   return -1
-endi
-if $data01 != 2 then 
-   return -1
-endi
-if $data10 != @21-03-23 19:00:00.000@ then 
-   return -1
-endi
-if $data11 != 18 then 
-   return -1
-endi
-if $data20 != @21-03-24 19:00:00.000@ then 
-   return -1
-endi
-if $data21 != 22 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1 where ts>="2021-03-23 17:00:00.000" and ts<="2021-03-24 20:00:00.000" interval (1h) fill(value,999);
-if $rows != 28 then
-  return -1
-endi
-
-sql_error select add_one(f1) from tb1 group by f1;
-
-sql select sum_double(f1) from tb1 group by f1;
-if $rows != 7 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data10 != 4 then 
-   return -1
-endi
-if $data20 != 6 then 
-   return -1
-endi
-if $data30 != 8 then 
-   return -1
-endi
-if $data40 != 10 then 
-   return -1
-endi
-if $data50 != 12 then 
-   return -1
-endi
-if $data60 != 14 then 
-   return -1
-endi
-
-sql select sum_double(f1) from tb1 interval (1h) order by ts desc;
-if $rows != 4 then
-  return -1
-endi
-
-if $data00 != @21-03-25 10:00:00.000@ then 
-   return -1
-endi
-if $data01 != 14 then 
-   return -1
-endi
-if $data10 != @21-03-24 19:00:00.000@ then 
-   return -1
-endi
-if $data11 != 22 then 
-   return -1
-endi
-if $data20 != @21-03-23 19:00:00.000@ then 
-   return -1
-endi
-if $data21 != 18 then 
-   return -1
-endi
-if $data30 != @21-03-23 17:00:00.000@ then 
-   return -1
-endi
-if $data31 != 2 then 
-   return -1
-endi
-
-
-sql select add_one(f1) from tb1 limit 2;
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != 2 then 
-   return -1
-endi
-if $data10 != 3 then 
-   return -1
-endi
-
-
-sql select sum_double(f1) from tb1 interval (1d) limit 2;
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != @21-03-23 00:00:00.000@ then 
-   return -1
-endi
-if $data01 != 20 then 
-   return -1
-endi
-if $data10 != @21-03-24 00:00:00.000@ then 
-   return -1
-endi
-if $data11 != 22 then 
-   return -1
-endi
-
-
-sql_error select ts,sum_double(f1),f1 from tb1;
-sql_error select add_one(f1),count(f1) from tb1;
-sql_error select sum_double(f1),count(f1) from tb1;
-sql_error select add_one(f1),top(f1,3) from tb1;
-sql_error select add_one(f1) from tb1 interval(10a);
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/parser/udf_dll_stable.sim
+++ b/tests/script/tsim/parser/udf_dll_stable.sim
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -59,7 +59,7 @@ python3 ./test.py -f 2-query/char_length.py -R
 python3 ./test.py -f 2-query/check_tsdb.py
 python3 ./test.py -f 2-query/check_tsdb.py -R

-python3 ./test.py -f 1-insert/update_data.py
+# jira python3 ./test.py -f 1-insert/update_data.py
 python3 ./test.py -f 1-insert/delete_data.py
 python3 ./test.py -f 2-query/db.py

@@ -148,7 +148,7 @@ python3 ./test.py -f 2-query/max_partition.py
 python3 ./test.py -f 2-query/last_row.py

 python3 ./test.py -f 6-cluster/5dnode1mnode.py
-python3 ./test.py -f 6-cluster/5dnode2mnode.py  -N 5 -M 3
+#python3 ./test.py -f 6-cluster/5dnode2mnode.py  -N 5 -M 3
 #python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py -N 5 -M 3
 python3 ./test.py -f 6-cluster/5dnode3mnodeStopLoop.py -N 5 -M 3
 # BUG python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py -N 5 -M 3
@@ -212,8 +212,8 @@ python3 ./test.py -f 7-tmq/tmqUdf.py
 # python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot0.py
 # python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot1.py
 python3 ./test.py -f 7-tmq/stbTagFilter-1ctb.py
-# python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py

+# python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py

 #------------querPolicy  2-----------


--- a/taos-tools @ 69b558cc
+++ b/taos-tools @ 69b558cc
-Subproject commit f84cb6e51556d8030585128c2b252aa2a6453328
+Subproject commit 69b558ccbfe54a4407fe23eeae2e67c540f59e55