other: merge 3.0

2022-08-15 16:25:39 +08:00 · 2022-08-15 16:25:39 +08:00 · 313a546b85
parent 34e14f770f e7051d7117
commit 313a546b85
113 changed files with 4943 additions and 5094 deletions
--- 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 53a0103
+        GIT_TAG d237772
        SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
        BINARY_DIR ""
        #BUILD_IN_SOURCE TRUE
--- a/docs/en/07-develop/_sub_java.mdx
+++ b/docs/en/07-develop/_sub_java.mdx
@ -1,7 +1,9 @@
 ```java
 {{#include docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java}}
 ```
-:::note
-For now Java connector doesn't provide asynchronous subscription, but `TimerTask` can be used to achieve similar purpose.
-
-:::
+```java
+{{#include docs/examples/java/src/main/java/com/taos/example/MetersDeserializer.java}}
+```
+```java
+{{#include docs/examples/java/src/main/java/com/taos/example/Meters.java}}
+```
--- a/docs/en/07-develop/_sub_rust.mdx
+++ b/docs/en/07-develop/_sub_rust.mdx
@ -1,3 +1,3 @@
-```rs
+```rust
 {{#include docs/examples/rust/nativeexample/examples/subscribe_demo.rs}}
-```
+```
--- a/docs/en/14-reference/03-connector/java.mdx
+++ b/docs/en/14-reference/03-connector/java.mdx
@ -41,19 +41,20 @@ Please refer to [Version Support List](/reference/connector#version-support).

 TDengine currently supports timestamp, number, character, Boolean type, and the corresponding type conversion with Java is as follows:

-| TDengine DataType | JDBCType (driver version < 2.0.24) | JDBCType (driver version > = 2.0.24) |
-| ----------------- | ---------------------------------- | ------------------------------------ |
-| TIMESTAMP         | java.lang.Long                     | java.sql.Timestamp                   |
-| INT               | java.lang.Integer                  | java.lang.Integer                    |
-| BIGINT            | java.lang.Long                     | java.lang.Long                       |
-| FLOAT             | java.lang.Float                    | java.lang.Float                      |
-| DOUBLE            | java.lang.Double                   | java.lang.Double                     |
-| SMALLINT          | java.lang.Short                    | java.lang.Short                      |
-| TINYINT           | java.lang.Byte                     | java.lang.Byte                       |
-| BOOL              | java.lang.Boolean                  | java.lang.Boolean                    |
-| BINARY            | java.lang.String                   | byte array                           |
-| NCHAR             | java.lang.String                   | java.lang.String                     |
-| JSON              | -                                  | java.lang.String                     |
+
+| TDengine DataType | JDBCType  |
+| ----------------- | ---------------------------------- |
+| TIMESTAMP         | java.sql.Timestamp                 |
+| INT               | java.lang.Integer                  |
+| BIGINT            | java.lang.Long                     |
+| FLOAT             | java.lang.Float                    |
+| DOUBLE            | java.lang.Double                   |
+| SMALLINT          | java.lang.Short                    |
+| TINYINT           | java.lang.Byte                     |
+| BOOL              | java.lang.Boolean                  |
+| BINARY            | byte array                         |
+| NCHAR             | java.lang.String                   |
+| JSON              | java.lang.String                   |

 **Note**: Only TAG supports JSON types

@ -81,7 +82,7 @@ Add following dependency in the `pom.xml` file of your Maven project:
 <dependency>
 <groupId>com.taosdata.jdbc</groupId>
 <artifactId>taos-jdbcdriver</artifactId>
- <version>2.0.**</version>
+ <version>3.0.0</version>
 </dependency>
 ```

@ -845,7 +846,13 @@ Please refer to: [JDBC example](https://github.com/taosdata/TDengine/tree/develo

   **Cause**: Currently, TDengine only supports 64-bit JDK.

-   **Solution**: Reinstall the 64-bit JDK. 4.
+   **Solution**: Reinstall the 64-bit JDK.
+
+4. java.lang.NoSuchMethodError: setByteArray
+
+  **Cause**: taos-jdbcdriver version 3.* only supports TDengine 3.0 or above.
+
+  **Solution**: connect TDengine 2.* using taos-jdbcdriver 2.* version.

 For other questions, please refer to [FAQ](/train-faq/faq)

--- a/docs/examples/java/pom.xml
+++ b/docs/examples/java/pom.xml
@ -21,7 +21,7 @@
    <dependency>
      <groupId>com.taosdata.jdbc</groupId>
      <artifactId>taos-jdbcdriver</artifactId>
-      <version>2.0.38</version>
+      <version>3.0.0</version>
    </dependency>
 <!--    ANCHOR_END: dep-->
    <dependency>
--- a/docs/examples/java/src/main/java/com/taos/example/Meters.java
+++ b/docs/examples/java/src/main/java/com/taos/example/Meters.java
@ -0,0 +1,62 @@
+package com.taos.example;
+
+import java.sql.Timestamp;
+
+public class Meters {
+    private Timestamp ts;
+    private float current;
+    private int voltage;
+    private int groupid;
+    private String location;
+
+    public Timestamp getTs() {
+        return ts;
+    }
+
+    public void setTs(Timestamp ts) {
+        this.ts = ts;
+    }
+
+    public float getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(float current) {
+        this.current = current;
+    }
+
+    public int getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(int voltage) {
+        this.voltage = voltage;
+    }
+
+    public int getGroupid() {
+        return groupid;
+    }
+
+    public void setGroupid(int groupid) {
+        this.groupid = groupid;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    @Override
+    public String toString() {
+        return "Meters{" +
+                "ts=" + ts +
+                ", current=" + current +
+                ", voltage=" + voltage +
+                ", groupid=" + groupid +
+                ", location='" + location + '\'' +
+                '}';
+    }
+}
--- a/docs/examples/java/src/main/java/com/taos/example/MetersDeserializer.java
+++ b/docs/examples/java/src/main/java/com/taos/example/MetersDeserializer.java
@ -0,0 +1,6 @@
+package com.taos.example;
+
+import com.taosdata.jdbc.tmq.ReferenceDeserializer;
+
+public class MetersDeserializer extends ReferenceDeserializer<Meters> {
+}
--- a/docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java
+++ b/docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java
@ -1,65 +1,77 @@
 package com.taos.example;

-import com.taosdata.jdbc.TSDBConnection;
-import com.taosdata.jdbc.TSDBDriver;
-import com.taosdata.jdbc.TSDBResultSet;
-import com.taosdata.jdbc.TSDBSubscribe;
+import com.taosdata.jdbc.tmq.ConsumerRecords;
+import com.taosdata.jdbc.tmq.TMQConstants;
+import com.taosdata.jdbc.tmq.TaosConsumer;

 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Statement;
+import java.time.Duration;
+import java.util.Collections;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicBoolean;

 public class SubscribeDemo {
-    private static final String topic = "topic-meter-current-bg-10";
-    private static final String sql = "select * from meters where current > 10";
+    private static final String TOPIC = "tmq_topic";
+    private static final String DB_NAME = "meters";
+    private static final AtomicBoolean shutdown = new AtomicBoolean(false);

    public static void main(String[] args) {
-        Connection connection = null;
-        TSDBSubscribe subscribe = null;
-
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            public void run() {
+                shutdown.set(true);
+            }
+        }, 3_000);
        try {
+            // prepare
            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/?user=root&password=taosdata";
+            Connection connection = DriverManager.getConnection(jdbcUrl);
+            try (Statement statement = connection.createStatement()) {
+                statement.executeUpdate("drop topic if exists " + TOPIC);
+                statement.executeUpdate("drop database if exists " + DB_NAME);
+                statement.executeUpdate("create database " + DB_NAME);
+                statement.executeUpdate("use " + DB_NAME);
+                statement.executeUpdate(
+                        "CREATE TABLE `meters` (`ts` TIMESTAMP, `current` FLOAT, `voltage` INT) TAGS (`groupid` INT, `location` BINARY(16))");
+                statement.executeUpdate("CREATE TABLE `d0` USING `meters` TAGS(0, 'Los Angles')");
+                statement.executeUpdate("INSERT INTO `d0` values(now - 10s, 0.32, 116)");
+                statement.executeUpdate("INSERT INTO `d0` values(now - 8s, NULL, NULL)");
+                statement.executeUpdate(
+                        "INSERT INTO `d1` USING `meters` TAGS(1, 'San Francisco') values(now - 9s, 10.1, 119)");
+                statement.executeUpdate(
+                        "INSERT INTO `d1` values (now-8s, 10, 120) (now - 6s, 10, 119) (now - 4s, 11.2, 118)");
+                // create topic
+                statement.executeUpdate("create topic " + TOPIC + " as select * from meters");
+            }
+
+            // create consumer
            Properties properties = new Properties();
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-            String jdbcUrl = "jdbc:TAOS://127.0.0.1:6030/power?user=root&password=taosdata";
-            connection = DriverManager.getConnection(jdbcUrl, properties);
-            // create subscribe
-            subscribe = ((TSDBConnection) connection).subscribe(topic, sql, true); 
-            int count = 0;
-            while (count < 10) {
-                // wait 1 second to avoid frequent calls to consume
-                TimeUnit.SECONDS.sleep(1); 
-                // consume
-                TSDBResultSet resultSet = subscribe.consume();
-                if (resultSet == null) {
-                    continue;
-                }
-                ResultSetMetaData metaData = resultSet.getMetaData();
-                while (resultSet.next()) {
-                    int columnCount = metaData.getColumnCount();
-                    for (int i = 1; i <= columnCount; i++) {
-                        System.out.print(metaData.getColumnLabel(i) + ": " + resultSet.getString(i) + "\t");
+            properties.setProperty(TMQConstants.BOOTSTRAP_SERVERS, "127.0.0.1:6030");
+            properties.setProperty(TMQConstants.MSG_WITH_TABLE_NAME, "true");
+            properties.setProperty(TMQConstants.ENABLE_AUTO_COMMIT, "true");
+            properties.setProperty(TMQConstants.GROUP_ID, "test");
+            properties.setProperty(TMQConstants.VALUE_DESERIALIZER,
+                    "com.taosdata.jdbc.MetersDeserializer");
+
+            // poll data
+            try (TaosConsumer<Meters> consumer = new TaosConsumer<>(properties)) {
+                consumer.subscribe(Collections.singletonList(TOPIC));
+                while (!shutdown.get()) {
+                    ConsumerRecords<Meters> meters = consumer.poll(Duration.ofMillis(100));
+                    for (Meters meter : meters) {
+                        System.out.println(meter);
                    }
-                    System.out.println();
-                    count++;
                }
            }
-        } catch (Exception e) {
+        } catch (ClassNotFoundException | SQLException e) {
            e.printStackTrace();
-        } finally {
-            try {
-                if (null != subscribe)
-                    // close subscribe
-                    subscribe.close(true);
-                if (connection != null)
-                    connection.close();
-            } catch (SQLException throwable) {
-                throwable.printStackTrace();
-            }
        }
+        timer.cancel();
    }
 }
--- a/docs/zh/01-index.md
+++ b/docs/zh/01-index.md
@ -4,7 +4,7 @@ sidebar_label: 文档首页
 slug: /
 ---

-TDengine是一款[开源](https://www.taosdata.com/tdengine/open_source_time-series_database)、[高性能](https://www.taosdata.com/fast)、[云原生](https://www.taosdata.com/tdengine/cloud_native_time-series_database)的时序数据库(Time-Series Database, TSDB), 它专为物联网、工业互联网、金融等场景优化设计。同时它还带有内建的缓存、流式计算、数据订阅等系统功能，能大幅减少系统设计的复杂度，降低研发和运营成本，是一极简的时序数据处理平台。本文档是 TDengine 用户手册，主要是介绍 TDengine 的基本概念、安装、使用、功能、开发接口、运营维护、TDengine 内核设计等等，它主要是面向架构师、开发者与系统管理员的。
+TDengine是一款[开源](https://www.taosdata.com/tdengine/open_source_time-series_database)、[高性能](https://www.taosdata.com/fast)、[云原生](https://www.taosdata.com/tdengine/cloud_native_time-series_database)的<a href="https://www.taosdata.com/" data-internallinksmanager029f6b8e52c="2" title="时序数据库" target="_blank" rel="noopener">时序数据库</a>（<a href="https://www.taosdata.com/time-series-database" data-internallinksmanager029f6b8e52c="9" title="Time Series DataBase" target="_blank" rel="noopener">Time Series Database</a>, <a href="https://www.taosdata.com/tsdb" data-internallinksmanager029f6b8e52c="8" title="TSDB" target="_blank" rel="noopener">TSDB</a>）, 它专为物联网、工业互联网、金融等场景优化设计。同时它还带有内建的缓存、流式计算、数据订阅等系统功能，能大幅减少系统设计的复杂度，降低研发和运营成本，是一极简的时序数据处理平台。本文档是 TDengine 用户手册，主要是介绍 TDengine 的基本概念、安装、使用、功能、开发接口、运营维护、TDengine 内核设计等等，它主要是面向架构师、开发者与系统管理员的。

 TDengine 充分利用了时序数据的特点，提出了“一个数据采集点一张表”与“超级表”的概念，设计了创新的存储引擎，让数据的写入、查询和存储效率都得到极大的提升。为正确理解并使用TDengine, 无论如何，请您仔细阅读[基本概念](./concept)一章。

--- a/docs/zh/02-intro.md
+++ b/docs/zh/02-intro.md
@ -3,7 +3,7 @@ title: 产品简介
 toc_max_heading_level: 2
 ---

-TDengine 是一款[开源](https://www.taosdata.com/tdengine/open_source_time-series_database)、[高性能](https://www.taosdata.com/tdengine/fast)、[云原生](https://www.taosdata.com/tdengine/cloud_native_time-series_database)的时序数据库 (Time-Series Database, TSDB)。TDengine 能被广泛运用于物联网、工业互联网、车联网、IT 运维、金融等领域。除核心的时序数据库功能外，TDengine 还提供[缓存](../develop/cache/)、[数据订阅](../develop/tmq)、[流式计算](../develop/stream)等功能，是一极简的时序数据处理平台，最大程度的减小系统设计的复杂度，降低研发和运营成本。
+TDengine 是一款[开源](https://www.taosdata.com/tdengine/open_source_time-series_database)、[高性能](https://www.taosdata.com/tdengine/fast)、[云原生](https://www.taosdata.com/tdengine/cloud_native_time-series_database)的<a href="https://www.taosdata.com/" data-internallinksmanager029f6b8e52c="2" title="时序数据库" target="_blank" rel="noopener">时序数据库</a>（<a href="https://www.taosdata.com/time-series-database" data-internallinksmanager029f6b8e52c="9" title="Time Series DataBase" target="_blank" rel="noopener">Time Series Database</a>, <a href="https://www.taosdata.com/tsdb" data-internallinksmanager029f6b8e52c="8" title="TSDB" target="_blank" rel="noopener">TSDB</a>）。TDengine 能被广泛运用于物联网、工业互联网、车联网、IT 运维、金融等领域。除核心的时序数据库功能外，TDengine 还提供[缓存](../develop/cache/)、[数据订阅](../develop/tmq)、[流式计算](../develop/stream)等功能，是一极简的时序数据处理平台，最大程度的减小系统设计的复杂度，降低研发和运营成本。

 本章节介绍TDengine的主要功能、竞争优势、适用场景、与其他数据库的对比测试等等，让大家对TDengine有个整体的了解。

--- a/docs/zh/05-get-started/01-docker.md
+++ b/docs/zh/05-get-started/01-docker.md
@ -13,7 +13,7 @@ title: 通过 Docker 快速体验 TDengine
 如果已经安装了 docker， 只需执行下面的命令。

 ```shell
-docker run -d -p 6030:6030 -p 6041/6041 -p 6043-6049/6043-6049 -p 6043-6049:6043-6049/udp tdengine/tdengine
+docker run -d -p 6030:6030 -p 6041:6041 -p 6043-6049:6043-6049 -p 6043-6049:6043-6049/udp tdengine/tdengine
 ```

 注意：TDengine 3.0 服务端仅使用 6030 TCP 端口。6041 为 taosAdapter 所使用提供 REST 服务端口。6043-6049 为 taosAdapter 提供第三方应用接入所使用端口，可根据需要选择是否打开。
--- a/docs/zh/05-get-started/03-package.md
+++ b/docs/zh/05-get-started/03-package.md
@ -29,6 +29,7 @@ echo "deb [arch=amd64] http://repos.taosdata.com/tdengine-stable stable main" |
 如果安装 Beta 版需要安装包仓库

 ```bash
+wget -qO - http://repos.taosdata.com/tdengine.key | sudo apt-key add -
 echo "deb [arch=amd64] http://repos.taosdata.com/tdengine-beta beta main" | sudo tee /etc/apt/sources.list.d/tdengine-beta.list
 ```

--- a/docs/zh/07-develop/06-stream.md
+++ b/docs/zh/07-develop/06-stream.md
@ -4,8 +4,16 @@ description: "TDengine 流式计算将数据的写入、预处理、复杂分析
 title: 流式计算
 ---

-在时序数据的处理中，经常要对原始数据进行清洗、预处理，再使用时序数据库进行长久的储存。用户通常需要在时序数据库之外再搭建 Kafka、Flink、Spark 等流计算处理引擎，增加了用户的开发成本和维护成本。
-使用 TDengine 3.0 的流式计算引擎能够最大限度的减少对这些额外中间件的依赖，真正将数据的写入、预处理、长期存储、复杂分析、实时计算、实时报警触发等功能融为一体，并且，所有这些任务只需要使用 SQL 完成，极大降低了用户的学习成本、使用成本。
+在时序数据的处理中，经常要对原始数据进行清洗、预处理，再使用时序数据库进行长久的储存。在传统的时序数据解决方案中，常常需要部署 Kafka、Flink 等流处理系统。而流处理系统的复杂性，带来了高昂的开发与运维成本。
+
+TDengine 3.0 的流式计算引擎提供了实时处理写入的数据流的能力，使用 SQL 定义实时流变换，当数据被写入流的源表后，数据会被以定义的方式自动处理，并根据定义的触发模式向目的表推送结果。它提供了替代复杂流处理系统的轻量级解决方案，并能够在高吞吐的数据写入的情况下，提供毫秒级的计算结果延迟。
+
+流式计算可以包含数据过滤，标量函数计算（含UDF），以及窗口聚合（支持滑动窗口、会话窗口与状态窗口），可以以超级表、子表、普通表为源表，写入到目的超级表。在创建流时，目的超级表将被自动创建，随后新插入的数据会被流定义的方式处理并写入其中，通过 partition by 子句，可以以表名或标签划分 partition，不同的 partition 将写入到目的超级表的不同子表。
+
+TDengine 的流式计算能够支持分布在多个 vnode 中的超级表聚合；还能够处理乱序数据的写入：它提供了 watermark 机制以度量容忍数据乱序的程度，并提供了 ignore expired 配置项以决定乱序数据的处理策略——丢弃或者重新计算。
+
+详见 [流式计算](../../taos-sql/stream)
+

 ## 流式计算的创建

@ -14,7 +22,7 @@ CREATE STREAM [IF NOT EXISTS] stream_name [stream_options] INTO stb_name AS subq
 stream_options: {
 TRIGGER    [AT_ONCE | WINDOW_CLOSE | MAX_DELAY time]
 WATERMARK   time
- IGNORE EXPIRED
+ IGNORE EXPIRED [0 | 1]
 }
 ```

@ -59,7 +67,7 @@ insert into d1004 values("2018-10-03 14:38:05.000", 10.80000, 223, 0.29000);
 insert into d1004 values("2018-10-03 14:38:06.500", 11.50000, 221, 0.35000);
 ```

-### 查询以观查结果
+### 查询以观察结果

 ```sql
 taos> select start, end, max_current from current_stream_output_stb;
@ -88,7 +96,7 @@ create stream power_stream into power_stream_output_stb as select ts, concat_ws(

 参考示例一 [写入数据](#写入数据)

-### 查询以观查结果
+### 查询以观察结果
 ```sql
 taos> select ts, meter_location, active_power, reactive_power from power_stream_output_stb;
           ts            |         meter_location         |       active_power        |      reactive_power       |
@ -102,4 +110,4 @@ taos> select ts, meter_location, active_power, reactive_power from power_stream_
 2018-10-03 14:38:16.800 | California.SanFrancisco.d1001  |            2588.728381186 |             829.240910475 |
 2018-10-03 14:38:16.650 | California.SanFrancisco.d1002  |            2175.595991997 |             555.520860397 |
 Query OK, 8 rows in database (0.014753s)
-```
+```
--- a/docs/zh/07-develop/_sub_java.mdx
+++ b/docs/zh/07-develop/_sub_java.mdx
@ -1,7 +1,9 @@
 ```java
 {{#include docs/examples/java/src/main/java/com/taos/example/SubscribeDemo.java}}
 ```
-:::note
-目前 Java 接口没有提供异步订阅模式，但用户程序可以通过创建 `TimerTask` 等方式达到同样的效果。
-
-:::
+```java
+{{#include docs/examples/java/src/main/java/com/taos/example/MetersDeserializer.java}}
+```
+```java
+{{#include docs/examples/java/src/main/java/com/taos/example/Meters.java}}
+```
--- a/docs/zh/07-develop/_sub_rust.mdx
+++ b/docs/zh/07-develop/_sub_rust.mdx
@ -1,3 +1,3 @@
-```rs
+```rust
 {{#include docs/examples/rust/nativeexample/examples/subscribe_demo.rs}}
-```
+```
--- a/docs/zh/12-taos-sql/01-data-type.md
+++ b/docs/zh/12-taos-sql/01-data-type.md
@ -34,7 +34,7 @@ CREATE DATABASE db_name PRECISION 'ns';
 | 7   |  DOUBLE   | 8         | 双精度浮点型，有效位数 15-16，范围 [-1.7E308, 1.7E308]      |
 | 8   |  BINARY   | 自定义    | 记录单字节字符串，建议只用于处理 ASCII 可见字符，中文等多字节字符需使用 nchar。 |
 | 9   | SMALLINT  | 2         | 短整型， 范围 [-32768, 32767]         |
-| 10 | SMALLINT UNSIGNED | 2| 无符号短整型，范围 [0, 655357] |
+| 10 | SMALLINT UNSIGNED | 2| 无符号短整型，范围 [0, 65535] |
 | 11   |  TINYINT  | 1         | 单字节整型，范围 [-128, 127]   |
 | 12 | TINYINT UNSIGNED | 1 | 无符号单字节整型，范围 [0, 255] |
 | 13   |   BOOL    | 1         | 布尔型，{true, false}     |
--- a/docs/zh/12-taos-sql/13-tmq.md
+++ b/docs/zh/12-taos-sql/13-tmq.md
@ -1,6 +1,6 @@
 ---
-sidebar_label: 消息队列
-title: 消息队列
+sidebar_label: 数据订阅
+title: 数据订阅
 ---

 TDengine 3.0.0.0 开始对消息队列做了大幅的优化和增强以简化用户的解决方案。
@ -8,24 +8,17 @@ TDengine 3.0.0.0 开始对消息队列做了大幅的优化和增强以简化用
 ## 创建订阅主题

 ```sql
-CREATE TOPIC [IF NOT EXISTS] topic_name AS {subquery | DATABASE db_name | STABLE stb_name };
+CREATE TOPIC [IF NOT EXISTS] topic_name AS subquery;
 ```

-订阅主题包括三种：列订阅、超级表订阅和数据库订阅。

-**列订阅是**用 subquery 描述，支持过滤和标量函数和 UDF 标量函数，不支持 JOIN、GROUP BY、窗口切分子句、聚合函数和 UDF 聚合函数。列订阅规则如下：
+TOPIC 支持过滤和标量函数和 UDF 标量函数，不支持 JOIN、GROUP BY、窗口切分子句、聚合函数和 UDF 聚合函数。列订阅规则如下：

 1. TOPIC 一旦创建则返回结果的字段确定
 2. 被订阅或用于计算的列不可被删除、修改
 3. 列可以新增，但新增的列不出现在订阅结果字段中
 4. 对于 select \*，则订阅展开为创建时所有的列（子表、普通表为数据列，超级表为数据列加标签列）

-**超级表订阅和数据库订阅**规则如下：
-
-1. 被订阅主体的 schema 变更不受限
-2. 返回消息中 schema 是块级别的，每块的 schema 可能不一样
-3. 列变更后写入的数据若未落盘，将以写入时的 schema 返回
-4. 列变更后写入的数据若未已落盘，将以落盘时的 schema 返回

 ## 删除订阅主题

--- a/docs/zh/14-reference/02-rest-api/02-rest-api.mdx
+++ b/docs/zh/14-reference/02-rest-api/02-rest-api.mdx
@ -2,7 +2,7 @@
 title: REST API
 ---

-为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 REST API。为最大程度降低学习成本，不同于其他数据库 REST API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。REST 连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
+为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 REST API。为最大程度降低学习成本，不同于其他数据库 REST API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。REST 连接器的使用参见 [视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。

 :::note
 与原生连接器的一个区别是，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，所有对表名、超级表名的引用都需要指定数据库名前缀。支持在 RESTful URL 中指定 db_name，这时如果 SQL 语句中没有指定数据库名前缀的话，会使用 URL 中指定的这个 db_name。
@ -20,8 +20,10 @@ RESTful 接口不依赖于任何 TDengine 的库，因此客户端不需要安

 下面示例是列出所有的数据库，请把 h1.taosdata.com 和 6041（缺省值）替换为实际运行的 TDengine 服务 FQDN 和端口号：

-```html
-curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases;" h1.taosdata.com:6041/rest/sql
+```bash
+curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" \
+  -d "select name, ntables, status from information_schema.ins_databases;" \
+  h1.taosdata.com:6041/rest/sql
 ```

 返回值结果如下表示验证通过：
@ -35,188 +37,27 @@ curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases;" h1.t
            "VARCHAR",
            64
        ],
-        [
-            "create_time",
-            "TIMESTAMP",
-            8
-        ],
-        [
-            "vgroups",
-            "SMALLINT",
-            2
-        ],
        [
            "ntables",
            "BIGINT",
            8
        ],
-        [
-            "replica",
-            "TINYINT",
-            1
-        ],
-        [
-            "strict",
-            "VARCHAR",
-            4
-        ],
-        [
-            "duration",
-            "VARCHAR",
-            10
-        ],
-        [
-            "keep",
-            "VARCHAR",
-            32
-        ],
-        [
-            "buffer",
-            "INT",
-            4
-        ],
-        [
-            "pagesize",
-            "INT",
-            4
-        ],
-        [
-            "pages",
-            "INT",
-            4
-        ],
-        [
-            "minrows",
-            "INT",
-            4
-        ],
-        [
-            "maxrows",
-            "INT",
-            4
-        ],
-        [
-            "comp",
-            "TINYINT",
-            1
-        ],
-        [
-            "precision",
-            "VARCHAR",
-            2
-        ],
        [
            "status",
            "VARCHAR",
            10
-        ],
-        [
-            "retention",
-            "VARCHAR",
-            60
-        ],
-        [
-            "single_stable",
-            "BOOL",
-            1
-        ],
-        [
-            "cachemodel",
-            "VARCHAR",
-            11
-        ],
-        [
-            "cachesize",
-            "INT",
-            4
-        ],
-        [
-            "wal_level",
-            "TINYINT",
-            1
-        ],
-        [
-            "wal_fsync_period",
-            "INT",
-            4
-        ],
-        [
-            "wal_retention_period",
-            "INT",
-            4
-        ],
-        [
-            "wal_retention_size",
-            "BIGINT",
-            8
-        ],
-        [
-            "wal_roll_period",
-            "INT",
-            4
-        ],
-        [
-            "wal_seg_size",
-            "BIGINT",
-            8
        ]
    ],
    "data": [
        [
            "information_schema",
-            null,
-            null,
-            14,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            "ready",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
+            16,
+            "ready"
        ],
        [
            "performance_schema",
-            null,
-            null,
-            3,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            "ready",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
+            9,
+            "ready"
        ]
    ],
    "rows": 2
@ -231,21 +72,21 @@ http://<fqdn>:<port>/rest/sql/[db_name]

 参数说明：

- fqnd: 集群中的任一台主机 FQDN 或 IP 地址
- port: 配置文件中 httpPort 配置项，缺省为 6041
+- fqnd: 集群中的任一台主机 FQDN 或 IP 地址。
+- port: 配置文件中 httpPort 配置项，缺省为 6041。
 - db_name: 可选参数，指定本次所执行的 SQL 语句的默认数据库库名。

 例如：`http://h1.taos.com:6041/rest/sql/test` 是指向地址为 `h1.taos.com:6041` 的 URL，并将默认使用的数据库库名设置为 `test`。

 HTTP 请求的 Header 里需带有身份认证信息，TDengine 支持 Basic 认证与自定义认证两种机制，后续版本将提供标准安全的数字签名机制来做身份验证。

- [自定义身份认证信息](#自定义授权码)如下所示
+- [自定义身份认证信息](#自定义授权码)如下所示：

  ```text
  Authorization: Taosd <TOKEN>
  ```

- Basic 身份认证信息如下所示
+- Basic 身份认证信息如下所示：

  ```text
  Authorization: Basic <TOKEN>
@ -259,13 +100,13 @@ HTTP 请求的 BODY 里就是一个完整的 SQL 语句，SQL 语句中的数据
 curl -L -H "Authorization: Basic <TOKEN>" -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 ```

-或者
+或者，

 ```bash
 curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 ```

-其中，`TOKEN` 为 `{username}:{password}` 经过 Base64 编码之后的字符串，例如 `root:taosdata` 编码后为 `cm9vdDp0YW9zZGF0YQ==`
+其中，`TOKEN` 为 `{username}:{password}` 经过 Base64 编码之后的字符串，例如 `root:taosdata` 编码后为 `cm9vdDp0YW9zZGF0YQ==`。

 ## HTTP 返回格式

@ -282,27 +123,9 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]

 ### HTTP body 结构

-<table>
-<tr>
-  <th>执行结果</th>
-  <th>说明</th>
-  <th>样例</th>
-</tr>
-<tr>
-  <td>正确执行</td>
-  <td>
-  code：（int）0 代表成功
-  <br/>
-  <br/>
-  column_meta：（[][3]any）列信息，每个列会用三个值来说明，分别为：列名(string)、列类型(string)、类型长度(int)
-  <br/>
-  <br/>
-  rows：（int）数据返回行数
-  <br/>
-  <br/>
-  data：（[][]any）具体数据内容
-  </td>
-  <td>
+#### 正确执行
+
+样例：

 ```json
 {
@ -313,23 +136,16 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 }
 ```

-  </td>
-</tr>
-<tr>
-    <td>正确查询</td>
-    <td>
-    code：（int）0 代表成功
-    <br/>
-    <br/>
-    column_meta：（[][3]any） 列信息，每个列会用三个值来说明，分别为：列名（string）、列类型（string）、类型长度（int）
-    <br/>
-    <br/>
-    rows：（int）数据返回行数
-    <br/>
-    <br/>
-    data：（[][]any）具体数据内容
-  </td>
-  <td>
+说明：
+
+- code：（`int`）0 代表成功。
+- column_meta：（`[1][3]any`）只返回 `[["affected_rows", "INT", 4]]`。
+- rows：（`int`）只返回 `1`。
+- data：（`[][]any`）返回受影响行数。
+
+#### 正确查询
+
+样例：

 ```json
 {
@ -385,17 +201,35 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 }
 ```

-  </td>
-</tr>
-<tr>
-  <td>错误</td>
-  <td>
-  code：（int）错误码
-  <br/>
-  <br/>
-  desc：（string）错误描述
-  </td>
-  <td>
+说明：
+
+- code：（`int`）0 代表成功。
+- column_meta：（`[][3]any`） 列信息，每个列会用三个值来说明，分别为：列名（string）、列类型（string）、类型长度（int）。
+- rows：（`int`）数据返回行数。
+- data：（`[][]any`）具体数据内容（时间格式仅支持 RFC3339，结果集为 0 时区）。
+
+列类型使用如下字符串：
+
+- "NULL"
+- "BOOL"
+- "TINYINT"
+- "SMALLINT"
+- "INT"
+- "BIGINT"
+- "FLOAT"
+- "DOUBLE"
+- "VARCHAR"
+- "TIMESTAMP"
+- "NCHAR"
+- "TINYINT UNSIGNED"
+- "SMALLINT UNSIGNED"
+- "INT UNSIGNED"
+- "BIGINT UNSIGNED"
+- "JSON"
+
+#### 错误
+
+样例：

 ```json
 {
@ -404,30 +238,10 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 }
 ```

-  </td>
-</tr>
-</table>
+说明：

-### 说明
-
- 时间格式仅支持 RFC3339，结果集为 0 时区
- 列类型使用如下字符串:
-    > "NULL"
-    > "BOOL"
-    > "TINYINT"
-    > "SMALLINT"
-    > "INT"
-    > "BIGINT"
-    > "FLOAT"
-    > "DOUBLE"
-    > "VARCHAR"
-    > "TIMESTAMP"
-    > "NCHAR"
-    > "TINYINT UNSIGNED"
-    > "SMALLINT UNSIGNED"
-    > "INT UNSIGNED"
-    > "BIGINT UNSIGNED"
-    > "JSON"
+- code：（`int`）错误码。
+- desc：（`string`）错误描述。

 ## 自定义授权码

@ -439,11 +253,9 @@ curl http://<fqnd>:<port>/rest/login/<username>/<password>

 其中，`fqdn` 是 TDengine 数据库的 FQDN 或 IP 地址，`port` 是 TDengine 服务的端口号，`username` 为数据库用户名，`password` 为数据库密码，返回值为 JSON 格式，各字段含义如下：

- status：请求结果的标志位
-
- code：返回值代码
-
- desc：授权码
+- status：请求结果的标志位。
+- code：返回值代码。
+- desc：授权码。

 获取授权码示例：

--- a/docs/zh/14-reference/03-connector/cpp.mdx
+++ b/docs/zh/14-reference/03-connector/cpp.mdx
@ -404,47 +404,3 @@ TDengine 的异步 API 均采用非阻塞调用模式。应用程序可以用多

  **支持版本**
  该功能接口从 2.3.0.0 版本开始支持。
-
-### 订阅和消费 API
-
-订阅 API 目前支持订阅一张或多张表，并通过定期轮询的方式不断获取写入表中的最新数据。
-
- `TAOS_SUB *taos_subscribe(TAOS* taos, int restart, const char* topic, const char *sql, TAOS_SUBSCRIBE_CALLBACK fp, void *param, int interval)`
-
-  该函数负责启动订阅服务，成功时返回订阅对象，失败时返回 `NULL`，其参数为：
-
-  - taos：已经建立好的数据库连接
-  - restart：如果订阅已经存在，是重新开始，还是继续之前的订阅
-  - topic：订阅的主题（即名称），此参数是订阅的唯一标识
-  - sql：订阅的查询语句，此语句只能是 `select` 语句，只应查询原始数据，只能按时间正序查询数据
-  - fp：收到查询结果时的回调函数（稍后介绍函数原型），只在异步调用时使用，同步调用时此参数应该传 `NULL`
-  - param：调用回调函数时的附加参数，系统 API 将其原样传递到回调函数，不进行任何处理
-  - interval：轮询周期，单位为毫秒。异步调用时，将根据此参数周期性的调用回调函数，为避免对系统性能造成影响，不建议将此参数设置的过小；同步调用时，如两次调用 `taos_consume()` 的间隔小于此周期，API 将会阻塞，直到时间间隔超过此周期。
-
- `typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB* tsub, TAOS_RES *res, void* param, int code)`
-
-  异步模式下，回调函数的原型，其参数为：
-
-  - tsub：订阅对象
-  - res：查询结果集，注意结果集中可能没有记录
-  - param：调用 `taos_subscribe()` 时客户程序提供的附加参数
-  - code：错误码
-
-  :::note
-  在这个回调函数里不可以做耗时过长的处理，尤其是对于返回的结果集中数据较多的情况，否则有可能导致客户端阻塞等异常状态。如果必须进行复杂计算，则建议在另外的线程中进行处理。
-
-  :::
-
- `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
-
-  同步模式下，该函数用来获取订阅的结果。 用户应用程序将其置于一个循环之中。 如两次调用 `taos_consume()` 的间隔小于订阅的轮询周期，API 将会阻塞，直到时间间隔超过此周期。如果数据库有新记录到达，该 API 将返回该最新的记录，否则返回一个没有记录的空结果集。 如果返回值为 `NULL`，说明系统出错。 异步模式下，用户程序不应调用此 API。
-
-  :::note
-  在调用 `taos_consume()` 之后，用户应用应确保尽快调用 `taos_fetch_row()` 或 `taos_fetch_block()` 来处理订阅结果，否则服务端会持续缓存查询结果数据等待客户端读取，极端情况下会导致服务端内存消耗殆尽，影响服务稳定性。
-
-  :::
-
- `void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress)`
-
-  取消订阅。 如参数 `keepProgress` 不为 0，API 会保留订阅的进度信息，后续调用 `taos_subscribe()` 时可以基于此进度继续；否则将删除进度信息，后续只能重新开始读取数据。
-
--- a/docs/zh/14-reference/03-connector/java.mdx
+++ b/docs/zh/14-reference/03-connector/java.mdx
@ -83,7 +83,7 @@ Maven 项目中，在 pom.xml 中添加以下依赖：
 <dependency>
 <groupId>com.taosdata.jdbc</groupId>
 <artifactId>taos-jdbcdriver</artifactId>
- <version>2.0.**</version>
+ <version>3.0.0</version>
 </dependency>
 ```

@ -712,7 +712,7 @@ while(true) {
 }
 ```

-`poll` 方法返回一个结果集，其中包含从上次 `poll` 到目前为止的所有新数据。请务必按需选择合理的调用 `poll` 的频率（如例子中的 `Duration.ofMillis(100)`），否则会给服务端造成不必要的压力。
+`poll` 每次调用获取一个消息。

 #### 关闭订阅

@ -900,7 +900,13 @@ public static void main(String[] args) throws Exception {

   **解决方法**：重新安装 64 位 JDK。

-4. 其它问题请参考 [FAQ](../../../train-faq/faq)
+4. java.lang.NoSuchMethodError: setByteArray
+
+  **原因**：taos-jdbcdriver 3.* 版本仅支持 TDengine 3.0 及以上版本。
+
+  **解决方法**： 使用 taos-jdbcdriver 2.* 版本连接 TDengine 2.* 版本。
+
+其它问题请参考 [FAQ](../../../train-faq/faq)

 ## API 参考

--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@ -275,12 +275,8 @@ typedef struct SStreamTask {
  int32_t nodeId;
  SEpSet  epSet;

-  // used for task source and sink,
-  // while task agg should have processedVer for each child
  int64_t recoverSnapVer;
  int64_t startVer;
-  int64_t checkpointVer;
-  int64_t processedVer;

  // children info
  SArray* childEpInfo;  // SArray<SStreamChildEpInfo*>
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@ -381,6 +381,9 @@ int32_t tmqCommitCb(void* param, SDataBuf* pBuf, int32_t code) {
  }
 #endif

+  taosMemoryFree(pParam->pOffset);
+  if (pBuf->pData) taosMemoryFree(pBuf->pData);
+
  /*tscDebug("receive offset commit cb of %s on vgId:%d, offset is %" PRId64, pParam->pOffset->subKey, pParam->->vgId,
   * pOffset->version);*/

@ -402,6 +405,8 @@ int32_t tmqCommitCb(void* param, SDataBuf* pBuf, int32_t code) {
      tsem_post(&pParamSet->rspSem);
    }

+    taosMemoryFree(pParamSet);
+
 #if 0
    taosArrayDestroyP(pParamSet->successfulOffsets, taosMemoryFree);
    taosArrayDestroyP(pParamSet->failedOffsets, taosMemoryFree);
@ -611,12 +616,12 @@ int32_t tmqCommitInner(tmq_t* tmq, const TAOS_RES* msg, int8_t automatic, int8_t
    }
  }

-#if 0
  if (!async) {
+#if 0
    taosArrayDestroyP(pParamSet->successfulOffsets, taosMemoryFree);
    taosArrayDestroyP(pParamSet->failedOffsets, taosMemoryFree);
-  }
 #endif
+  }

  return 0;
 }
@ -1216,6 +1221,7 @@ END:
  } else {
    taosMemoryFree(pParam);
  }
+  taosMemoryFree(pMsg->pData);
  return code;
 }

--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@ -129,19 +129,19 @@ typedef struct STsdbReader STsdbReader;
 #define LASTROW_RETRIEVE_TYPE_ALL    0x1
 #define LASTROW_RETRIEVE_TYPE_SINGLE 0x2

-int32_t tsdbSetTableId(STsdbReader *pReader, int64_t uid);
-int32_t tsdbReaderOpen(SVnode *pVnode, SQueryTableDataCond *pCond, SArray *pTableList, STsdbReader **ppReader,
-                       const char *idstr);
-void    tsdbReaderClose(STsdbReader *pReader);
-bool    tsdbNextDataBlock(STsdbReader *pReader);
-void    tsdbRetrieveDataBlockInfo(STsdbReader *pReader, SDataBlockInfo *pDataBlockInfo);
-int32_t tsdbRetrieveDatablockSMA(STsdbReader *pReader, SColumnDataAgg ***pBlockStatis, bool *allHave);
-SArray *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
-int32_t tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
-int32_t tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
-int64_t tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
-void   *tsdbGetIdx(SMeta *pMeta);
-void   *tsdbGetIvtIdx(SMeta *pMeta);
+int32_t  tsdbSetTableId(STsdbReader *pReader, int64_t uid);
+int32_t  tsdbReaderOpen(SVnode *pVnode, SQueryTableDataCond *pCond, SArray *pTableList, STsdbReader **ppReader,
+                        const char *idstr);
+void     tsdbReaderClose(STsdbReader *pReader);
+bool     tsdbNextDataBlock(STsdbReader *pReader);
+void     tsdbRetrieveDataBlockInfo(STsdbReader *pReader, SDataBlockInfo *pDataBlockInfo);
+int32_t  tsdbRetrieveDatablockSMA(STsdbReader *pReader, SColumnDataAgg ***pBlockStatis, bool *allHave);
+SArray  *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
+int32_t  tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
+int32_t  tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
+int64_t  tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
+void    *tsdbGetIdx(SMeta *pMeta);
+void    *tsdbGetIvtIdx(SMeta *pMeta);
 uint64_t getReaderMaxVersion(STsdbReader *pReader);

 int32_t tsdbLastRowReaderOpen(void *pVnode, int32_t type, SArray *pTableIdList, int32_t numOfCols, void **pReader);
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
@ -80,7 +80,7 @@ int32_t vnodeQueryOpen(SVnode* pVnode);
 void    vnodeQueryClose(SVnode* pVnode);
 int32_t vnodeGetTableMeta(SVnode* pVnode, SRpcMsg* pMsg, bool direct);
 int     vnodeGetTableCfg(SVnode* pVnode, SRpcMsg* pMsg, bool direct);
-int32_t vnodeGetBatchMeta(SVnode *pVnode, SRpcMsg *pMsg);
+int32_t vnodeGetBatchMeta(SVnode* pVnode, SRpcMsg* pMsg);

 // vnodeCommit.c
 int32_t vnodeBegin(SVnode* pVnode);
@ -98,6 +98,7 @@ void    vnodeSyncStart(SVnode* pVnode);
 void    vnodeSyncClose(SVnode* pVnode);
 void    vnodeRedirectRpcMsg(SVnode* pVnode, SRpcMsg* pMsg);
 bool    vnodeIsLeader(SVnode* pVnode);
+bool    vnodeIsRoleLeader(SVnode* pVnode);

 #ifdef __cplusplus
 }
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@ -144,6 +144,7 @@ int32_t     tsdbDeleteTableData(STsdb* pTsdb, int64_t version, tb_uid_t suid, tb
 STsdbReader tsdbQueryCacheLastT(STsdb* tsdb, SQueryTableDataCond* pCond, STableListInfo* tableList, uint64_t qId,
                                void* pMemRef);
 int32_t     tsdbSetKeepCfg(STsdb* pTsdb, STsdbCfg* pCfg);
+int32_t     tsdbGetStbIdList(SMeta* pMeta, int64_t suid, SArray* list);

 // tq
 int     tqInit();
@ -170,9 +171,8 @@ int32_t tqProcessTaskRecoverRsp(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRetrieveReq(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRetrieveRsp(STQ* pTq, SRpcMsg* pMsg);

-
-SSubmitReq* tdBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid,
-                            const char* stbFullName, int32_t vgId, SBatchDeleteReq* pDeleteReq);
+SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid,
+                            const char* stbFullName, SBatchDeleteReq* pDeleteReq);

 // sma
 int32_t smaInit();
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@ -298,14 +298,14 @@ int metaAlterSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
    tdbTbcClose(pUidIdxc);

    terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-    // ASSERT(0);
    return -1;
  }

  ret = tdbTbcGet(pUidIdxc, NULL, NULL, &pData, &nData);
  if (ret < 0) {
+    tdbTbcClose(pUidIdxc);
+
    terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
-    // ASSERT(0);
    return -1;
  }

--- a/source/dnode/vnode/src/sma/smaTimeRange.c
+++ b/source/dnode/vnode/src/sma/smaTimeRange.c
@ -201,9 +201,8 @@ int32_t tdProcessTSmaInsertImpl(SSma *pSma, int64_t indexUid, const char *msg) {
  }

  SBatchDeleteReq deleteReq;
-  SSubmitReq     *pSubmitReq =
-      tdBlockToSubmit(pSma->pVnode, (const SArray *)msg, pTsmaStat->pTSchema, true, pTsmaStat->pTSma->dstTbUid,
-                      pTsmaStat->pTSma->dstTbName, pTsmaStat->pTSma->dstVgId, &deleteReq);
+  SSubmitReq     *pSubmitReq = tqBlockToSubmit(pSma->pVnode, (const SArray *)msg, pTsmaStat->pTSchema, true,
+                                               pTsmaStat->pTSma->dstTbUid, pTsmaStat->pTSma->dstTbName, &deleteReq);

  if (!pSubmitReq) {
    smaError("vgId:%d, failed to gen submit blk while tsma insert for smaIndex %" PRIi64 " since %s", SMA_VID(pSma),
--- a/source/dnode/vnode/src/tq/tqPush.c
+++ b/source/dnode/vnode/src/tq/tqPush.c
@ -14,6 +14,7 @@
 */

 #include "tq.h"
+#include "vnd.h"

 #if 0
 void tqTmrRspFunc(void* param, void* tmrId) {
@ -212,9 +213,7 @@ int32_t tqPushMsgNew(STQ* pTq, void* msg, int32_t msgLen, tmsg_t msgType, int64_
 #endif

 int tqPushMsg(STQ* pTq, void* msg, int32_t msgLen, tmsg_t msgType, int64_t ver) {
-  walApplyVer(pTq->pVnode->pWal, ver);
-
-  if (msgType == TDMT_VND_SUBMIT) {
+  if (vnodeIsRoleLeader(pTq->pVnode) && msgType == TDMT_VND_SUBMIT) {
    if (taosHashGetSize(pTq->pStreamMeta->pTasks) == 0) return 0;

    void* data = taosMemoryMalloc(msgLen);
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@ -25,8 +25,7 @@ int32_t tdBuildDeleteReq(SVnode* pVnode, const char* stbFullName, const SSDataBl
  SColumnInfoData* pGidCol = taosArrayGet(pDataBlock->pDataBlock, GROUPID_COLUMN_INDEX);
  for (int32_t row = 0; row < totRow; row++) {
    int64_t ts = *(int64_t*)colDataGetData(pTsCol, row);
-    /*int64_t     groupId = *(int64_t*)colDataGetData(pGidCol, row);*/
-    int64_t groupId = 0;
+    int64_t groupId = *(int64_t*)colDataGetData(pGidCol, row);
    char*   name = buildCtbNameByGroupId(stbFullName, groupId);
    tqDebug("stream delete msg: groupId :%ld, name: %s", groupId, name);
    SMetaReader mr = {0};
@ -49,8 +48,8 @@ int32_t tdBuildDeleteReq(SVnode* pVnode, const char* stbFullName, const SSDataBl
  return 0;
 }

-SSubmitReq* tdBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pTSchema, bool createTb,
-                            int64_t suid, const char* stbFullName, int32_t vgId, SBatchDeleteReq* pDeleteReq) {
+SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pTSchema, bool createTb,
+                            int64_t suid, const char* stbFullName, SBatchDeleteReq* pDeleteReq) {
  SSubmitReq* ret = NULL;
  SArray*     schemaReqs = NULL;
  SArray*     schemaReqSz = NULL;
@ -153,7 +152,7 @@ SSubmitReq* tdBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchem
  // assign data
  // TODO
  ret = rpcMallocCont(cap);
-  ret->header.vgId = vgId;
+  ret->header.vgId = pVnode->config.vgId;
  ret->length = sizeof(SSubmitReq);
  ret->numOfBlocks = htonl(sz);

@ -234,8 +233,8 @@ void tqTableSink(SStreamTask* pTask, void* vnode, int64_t ver, void* data) {

  ASSERT(pTask->tbSink.pTSchema);
  deleteReq.deleteReqs = taosArrayInit(0, sizeof(SSingleDeleteReq));
-  SSubmitReq* pReq = tdBlockToSubmit(pVnode, pRes, pTask->tbSink.pTSchema, true, pTask->tbSink.stbUid,
-                                     pTask->tbSink.stbFullName, pVnode->config.vgId, &deleteReq);
+  SSubmitReq* pReq = tqBlockToSubmit(pVnode, pRes, pTask->tbSink.pTSchema, true, pTask->tbSink.stbUid,
+                                     pTask->tbSink.stbFullName, &deleteReq);

  tqDebug("vgId:%d, task %d convert blocks over, put into write-queue", TD_VID(pVnode), pTask->taskId);

--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@ -247,6 +247,8 @@ int32_t vnodeProcessWriteMsg(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRp

  vTrace("vgId:%d, process %s request success, index:%" PRId64, TD_VID(pVnode), TMSG_INFO(pMsg->msgType), version);

+  walApplyVer(pVnode->pWal, version);
+
  if (tqPushMsg(pVnode->pTq, pMsg->pCont, pMsg->contLen, pMsg->msgType, version) < 0) {
    vError("vgId:%d, failed to push msg to TQ since %s", TD_VID(pVnode), tstrerror(terrno));
    return -1;
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@ -764,6 +764,8 @@ void vnodeSyncStart(SVnode *pVnode) {

 void vnodeSyncClose(SVnode *pVnode) { syncStop(pVnode->sync); }

+bool vnodeIsRoleLeader(SVnode *pVnode) { return syncGetMyRole(pVnode->sync) == TAOS_SYNC_STATE_LEADER; }
+
 bool vnodeIsLeader(SVnode *pVnode) {
  if (!syncIsReady(pVnode->sync)) {
    vDebug("vgId:%d, vnode not ready, state:%s, restore:%d", pVnode->config.vgId, syncGetMyRoleStr(pVnode->sync),
--- a/source/libs/qworker/src/qworker.c
+++ b/source/libs/qworker/src/qworker.c
@ -1,3 +1,5 @@
+#include "qworker.h"
+
 #include "dataSinkMgt.h"
 #include "executor.h"
 #include "planner.h"
@ -7,7 +9,6 @@
 #include "tcommon.h"
 #include "tmsg.h"
 #include "tname.h"
-#include "qworker.h"

 SQWorkerMgmt gQwMgmt = {
    .lock = 0,
@ -15,7 +16,6 @@ SQWorkerMgmt gQwMgmt = {
    .qwNum = 0,
 };

-
 int32_t qwProcessHbLinkBroken(SQWorker *mgmt, SQWMsg *qwMsg, SSchedulerHbReq *req) {
  int32_t         code = 0;
  SSchedulerHbRsp rsp = {0};
@ -26,7 +26,7 @@ int32_t qwProcessHbLinkBroken(SQWorker *mgmt, SQWMsg *qwMsg, SSchedulerHbReq *re
  QW_LOCK(QW_WRITE, &sch->hbConnLock);

  sch->hbBrokenTs = taosGetTimestampMs();
-  
+
  if (qwMsg->connInfo.handle == sch->hbConnInfo.handle) {
    tmsgReleaseHandle(&sch->hbConnInfo, TAOS_CONN_SERVER);
    sch->hbConnInfo.handle = NULL;
@ -44,8 +44,8 @@ int32_t qwProcessHbLinkBroken(SQWorker *mgmt, SQWMsg *qwMsg, SSchedulerHbReq *re
  QW_RET(TSDB_CODE_SUCCESS);
 }

-static void freeItem(void* param) {
-  SExplainExecInfo* pInfo = param;
+static void freeItem(void *param) {
+  SExplainExecInfo *pInfo = param;
  taosMemoryFree(pInfo->verboseInfo);
 }

@ -54,7 +54,7 @@ int32_t qwHandleTaskComplete(QW_FPARAMS_DEF, SQWTaskCtx *ctx) {

  if (TASK_TYPE_TEMP == ctx->taskType && taskHandle) {
    if (ctx->explain) {
-      SArray* execInfoList = taosArrayInit(4, sizeof(SExplainExecInfo));
+      SArray *execInfoList = taosArrayInit(4, sizeof(SExplainExecInfo));
      QW_ERR_RET(qGetExplainExecInfo(taskHandle, execInfoList));

      SRpcHandleInfo connInfo = ctx->ctrlConnInfo;
@ -81,7 +81,7 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {
  qTaskInfo_t    taskHandle = ctx->taskHandle;
  DataSinkHandle sinkHandle = ctx->sinkHandle;

-  SArray* pResList = taosArrayInit(4, POINTER_BYTES);
+  SArray *pResList = taosArrayInit(4, POINTER_BYTES);
  while (true) {
    QW_TASK_DLOG("start to execTask, loopIdx:%d", i++);

@ -95,7 +95,7 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {
        } else {
          QW_TASK_DLOG("qExecTask failed, code:%x - %s", code, tstrerror(code));
        }
-        QW_ERR_RET(code);
+        QW_ERR_JRET(code);
      }
    }

@ -105,7 +105,7 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {
      QW_TASK_DLOG("qExecTask end with empty res, useconds:%" PRIu64, useconds);
      dsEndPut(sinkHandle, useconds);

-      QW_ERR_RET(qwHandleTaskComplete(QW_FPARAMS(), ctx));
+      QW_ERR_JRET(qwHandleTaskComplete(QW_FPARAMS(), ctx));

      if (queryStop) {
        *queryStop = true;
@ -114,7 +114,7 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {
      break;
    }

-    for(int32_t j = 0; j < taosArrayGetSize(pResList); ++j) {
+    for (int32_t j = 0; j < taosArrayGetSize(pResList); ++j) {
      SSDataBlock *pRes = taosArrayGetP(pResList, j);
      ASSERT(pRes->info.rows > 0);

@ -122,7 +122,7 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {
      code = dsPutDataBlock(sinkHandle, &inputData, &qcontinue);
      if (code) {
        QW_TASK_ELOG("dsPutDataBlock failed, code:%x - %s", code, tstrerror(code));
-        QW_ERR_RET(code);
+        QW_ERR_JRET(code);
      }

      QW_TASK_DLOG("data put into sink, rows:%d, continueExecTask:%d", pRes->info.rows, qcontinue);
@ -132,7 +132,7 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {
      if (queryStop) {
        *queryStop = true;
      }
-      
+
      break;
    }

@ -151,6 +151,11 @@ int32_t qwExecTask(QW_FPARAMS_DEF, SQWTaskCtx *ctx, bool *queryStop) {

  taosArrayDestroy(pResList);
  QW_RET(code);
+
+_return:
+  taosArrayDestroy(pResList);
+
+  return code;
 }

 int32_t qwGenerateSchHbRsp(SQWorker *mgmt, SQWSchStatus *sch, SQWHbInfo *hbInfo) {
@ -222,7 +227,8 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
          QW_ERR_RET(code);
        }

-        QW_TASK_DLOG("no more data in sink and query end, fetched blocks %d rows %d", pOutput->numOfBlocks, pOutput->numOfRows);
+        QW_TASK_DLOG("no more data in sink and query end, fetched blocks %d rows %d", pOutput->numOfBlocks,
+                     pOutput->numOfRows);

        qwUpdateTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_SUCC);
        if (NULL == rsp) {
@ -266,7 +272,8 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
    pOutput->numOfBlocks++;

    if (DS_BUF_EMPTY == pOutput->bufStatus && pOutput->queryEnd) {
-      QW_TASK_DLOG("task all data fetched and done, fetched blocks %d rows %d", pOutput->numOfBlocks, pOutput->numOfRows);
+      QW_TASK_DLOG("task all data fetched and done, fetched blocks %d rows %d", pOutput->numOfBlocks,
+                   pOutput->numOfRows);
      qwUpdateTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_SUCC);
      break;
    }
@ -288,10 +295,10 @@ int32_t qwGetQueryResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, int32_t *dataLen,
 }

 int32_t qwGetDeleteResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, SDeleteRes *pRes) {
-  int64_t            len = 0;
-  bool               queryEnd = false;
-  int32_t            code = 0;
-  SOutputData        output = {0};
+  int64_t     len = 0;
+  bool        queryEnd = false;
+  int32_t     code = 0;
+  SOutputData output = {0};

  dsGetDataLength(ctx->sinkHandle, &len, &queryEnd);

@ -304,7 +311,7 @@ int32_t qwGetDeleteResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, SDeleteRes *pRes
  if (NULL == output.pData) {
    QW_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
  }
-  
+
  code = dsGetDataBlock(ctx->sinkHandle, &output);
  if (code) {
    QW_TASK_ELOG("dsGetDataBlock failed, code:%x - %s", code, tstrerror(code));
@ -312,8 +319,8 @@ int32_t qwGetDeleteResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, SDeleteRes *pRes
    QW_ERR_RET(code);
  }

-  SDeleterRes* pDelRes = (SDeleterRes*)output.pData;
-  
+  SDeleterRes *pDelRes = (SDeleterRes *)output.pData;
+
  pRes->suid = pDelRes->suid;
  pRes->uidList = pDelRes->uidList;
  pRes->skey = pDelRes->skey;
@ -322,14 +329,13 @@ int32_t qwGetDeleteResFromSink(QW_FPARAMS_DEF, SQWTaskCtx *ctx, SDeleteRes *pRes
  strcpy(pRes->tableFName, pDelRes->tableName);
  strcpy(pRes->tsColName, pDelRes->tsColName);
  taosMemoryFree(output.pData);
-  
+
  return TSDB_CODE_SUCCESS;
 }

-
 int32_t qwHandlePrePhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *input, SQWPhaseOutput *output) {
-  int32_t         code = 0;
-  SQWTaskCtx     *ctx = NULL;
+  int32_t     code = 0;
+  SQWTaskCtx *ctx = NULL;

  QW_TASK_DLOG("start to handle event at phase %s", qwPhaseStr(phase));

@ -355,8 +361,8 @@ int32_t qwHandlePrePhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inpu
      if (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP)) {
        QW_ERR_JRET(qwDropTask(QW_FPARAMS()));

-        //qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code);
-        //QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));
+        // qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code);
+        // QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));

        QW_ERR_JRET(TSDB_CODE_QRY_TASK_DROPPED);
        break;
@ -391,8 +397,8 @@ int32_t qwHandlePrePhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inpu
      if (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP)) {
        QW_ERR_JRET(qwDropTask(QW_FPARAMS()));

-        //qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code);
-        //QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));
+        // qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code);
+        // QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));

        QW_ERR_JRET(TSDB_CODE_QRY_TASK_DROPPED);
      }
@ -428,9 +434,9 @@ _return:
 }

 int32_t qwHandlePostPhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *input, SQWPhaseOutput *output) {
-  int32_t         code = 0;
-  SQWTaskCtx     *ctx = NULL;
-  SRpcHandleInfo  connInfo = {0};
+  int32_t        code = 0;
+  SQWTaskCtx    *ctx = NULL;
+  SRpcHandleInfo connInfo = {0};

  QW_TASK_DLOG("start to handle event at phase %s", qwPhaseStr(phase));

@ -449,8 +455,8 @@ int32_t qwHandlePostPhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inp
      QW_ERR_JRET(TSDB_CODE_QRY_APP_ERROR);
    }

-    //qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code);
-    //QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));
+    // qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code);
+    // QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));

    QW_ERR_JRET(qwDropTask(QW_FPARAMS()));
    QW_ERR_JRET(TSDB_CODE_QRY_TASK_DROPPED);
@ -473,14 +479,14 @@ _return:
  if (QW_PHASE_POST_QUERY == phase && ctx) {
    ctx->queryRsped = true;

-    bool rsped = false;
+    bool   rsped = false;
    SQWMsg qwMsg = {.msgType = ctx->msgType, .connInfo = ctx->ctrlConnInfo};
    qwDbgSimulateRedirect(&qwMsg, ctx, &rsped);
    qwDbgSimulateDead(QW_FPARAMS(), ctx, &rsped);
    if (!rsped) {
      qwBuildAndSendQueryRsp(input->msgType + 1, &ctx->ctrlConnInfo, code, ctx);
      QW_TASK_DLOG("query msg rsped, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code));
-    }    
+    }
  }

  if (ctx) {
@ -507,7 +513,6 @@ int32_t qwAbortPrerocessQuery(QW_FPARAMS_DEF) {
  QW_RET(TSDB_CODE_SUCCESS);
 }

-
 int32_t qwPreprocessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) {
  int32_t        code = 0;
  bool           queryRsped = false;
@ -537,8 +542,7 @@ _return:
  QW_RET(TSDB_CODE_SUCCESS);
 }

-
-int32_t qwProcessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg, char* sql) {
+int32_t qwProcessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg, char *sql) {
  int32_t        code = 0;
  bool           queryRsped = false;
  SSubplan      *plan = NULL;
@ -556,7 +560,7 @@ int32_t qwProcessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg, char* sql) {
  ctx->needFetch = qwMsg->msgInfo.needFetch;
  ctx->msgType = qwMsg->msgType;

-  //QW_TASK_DLOGL("subplan json string, len:%d, %s", qwMsg->msgLen, qwMsg->msg);
+  // QW_TASK_DLOGL("subplan json string, len:%d, %s", qwMsg->msgLen, qwMsg->msg);

  code = qStringToSubplan(qwMsg->msg, &plan);
  if (TSDB_CODE_SUCCESS != code) {
@ -594,7 +598,7 @@ int32_t qwProcessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg, char* sql) {
 _return:

  taosMemoryFree(sql);
-  
+
  input.code = code;
  input.msgType = qwMsg->msgType;
  code = qwHandlePostPhaseEvents(QW_FPARAMS(), QW_PHASE_POST_QUERY, &input, NULL);
@ -648,7 +652,7 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) {

        qwBuildAndSendFetchRsp(ctx->fetchType, &qwMsg->connInfo, rsp, dataLen, code);
        rsp = NULL;
-        
+
        QW_TASK_DLOG("fetch rsp send, handle:%p, code:%x - %s, dataLen:%d", qwMsg->connInfo.handle, code,
                     tstrerror(code), dataLen);
      } else {
@ -754,13 +758,13 @@ _return:
  if (code || rsp) {
    bool rsped = false;
    if (ctx) {
-      qwDbgSimulateRedirect(qwMsg, ctx, &rsped);    
+      qwDbgSimulateRedirect(qwMsg, ctx, &rsped);
      qwDbgSimulateDead(QW_FPARAMS(), ctx, &rsped);
    }
    if (!rsped) {
      qwBuildAndSendFetchRsp(qwMsg->msgType + 1, &qwMsg->connInfo, rsp, dataLen, code);
-      QW_TASK_DLOG("%s send, handle:%p, code:%x - %s, dataLen:%d", TMSG_INFO(qwMsg->msgType + 1), qwMsg->connInfo.handle, code, tstrerror(code),
-                   dataLen);
+      QW_TASK_DLOG("%s send, handle:%p, code:%x - %s, dataLen:%d", TMSG_INFO(qwMsg->msgType + 1),
+                   qwMsg->connInfo.handle, code, tstrerror(code), dataLen);
    }
  }

@ -919,10 +923,11 @@ void qwProcessHbTimerEvent(void *param, void *tmrId) {
      uint64_t *sId = taosHashGetKey(pIter, NULL);
      QW_TLOG("cancel send hb to sch %" PRIx64 " cause of no connection handle", *sId);

-      if (sch->hbBrokenTs > 0 && ((currentMs - sch->hbBrokenTs) > QW_SCH_TIMEOUT_MSEC) && taosHashGetSize(sch->tasksHash) <= 0) {
+      if (sch->hbBrokenTs > 0 && ((currentMs - sch->hbBrokenTs) > QW_SCH_TIMEOUT_MSEC) &&
+          taosHashGetSize(sch->tasksHash) <= 0) {
        taosArrayPush(pExpiredSch, sId);
      }
-      
+
      pIter = taosHashIterate(mgmt->schHash, pIter);
      continue;
    }
@ -998,7 +1003,6 @@ _return:
  QW_RET(TSDB_CODE_SUCCESS);
 }

-
 int32_t qWorkerInit(int8_t nodeType, int32_t nodeId, SQWorkerCfg *cfg, void **qWorkerMgmt, const SMsgCb *pMsgCb) {
  if (NULL == qWorkerMgmt || pMsgCb->mgmt == NULL) {
    qError("invalid param to init qworker");
@ -1119,12 +1123,12 @@ int32_t qWorkerGetStat(SReadHandle *handle, void *qWorkerMgmt, SQWorkerStat *pSt
    QW_RET(TSDB_CODE_QRY_INVALID_INPUT);
  }

-  SQWorker *mgmt = (SQWorker *)qWorkerMgmt;
+  SQWorker     *mgmt = (SQWorker *)qWorkerMgmt;
  SDataSinkStat sinkStat = {0};
-  
+
  dsDataSinkGetCacheSize(&sinkStat);
  pStat->cacheDataSize = sinkStat.cachedSize;
-  
+
  pStat->queryProcessed = QW_STAT_GET(mgmt->stat.msgStat.queryProcessed);
  pStat->cqueryProcessed = QW_STAT_GET(mgmt->stat.msgStat.cqueryProcessed);
  pStat->fetchProcessed = QW_STAT_GET(mgmt->stat.msgStat.fetchProcessed);
@ -1139,6 +1143,3 @@ int32_t qWorkerGetStat(SReadHandle *handle, void *qWorkerMgmt, SQWorkerStat *pSt

  return TSDB_CODE_SUCCESS;
 }
-
-
-
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@ -642,7 +642,6 @@ static int32_t doTrimFunction(SScalarParam *pInput, int32_t inputNum, SScalarPar
    int32_t charLen = (type == TSDB_DATA_TYPE_VARCHAR) ? len : len / TSDB_NCHAR_SIZE;
    trimFn(input, output, type, charLen);

-    varDataSetLen(output, len);
    colDataAppend(pOutputData, i, output, false);
    output += varDataTLen(output);
  }
--- a/source/libs/transport/inc/transComm.h
+++ b/source/libs/transport/inc/transComm.h
@ -293,7 +293,7 @@ int transSendResponse(const STransMsg* msg);
 int transRegisterMsg(const STransMsg* msg);
 int transSetDefaultAddr(void* shandle, const char* ip, const char* fqdn);

-int transGetSockDebugInfo(struct sockaddr* sockname, char* dst);
+int transSockInfo2Str(struct sockaddr* sockname, char* dst);

 int64_t transAllocHandle();

--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@ -103,14 +103,6 @@ static SCliConn* getConnFromPool(void* pool, char* ip, uint32_t port);
 static void      addConnToPool(void* pool, SCliConn* conn);
 static void      doCloseIdleConn(void* param);

-static int sockDebugInfo(struct sockaddr* sockname, char* dst) {
-  struct sockaddr_in addr = *(struct sockaddr_in*)sockname;
-
-  char buf[16] = {0};
-  int  r = uv_ip4_name(&addr, (char*)buf, sizeof(buf));
-  sprintf(dst, "%s:%d", buf, ntohs(addr.sin_port));
-  return r;
-}
 // register timer for read
 static void cliReadTimeoutCb(uv_timer_t* handle);
 // register timer in each thread to clear expire conn
@ -121,12 +113,14 @@ static void cliAllocRecvBufferCb(uv_handle_t* handle, size_t suggested_size, uv_
 static void cliRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf);
 // callback after write data to socket
 static void cliSendCb(uv_write_t* req, int status);
-// callback after conn  to server
+// callback after conn to server
 static void cliConnCb(uv_connect_t* req, int status);
 static void cliAsyncCb(uv_async_t* handle);
 static void cliIdleCb(uv_idle_t* handle);
 static void cliPrepareCb(uv_prepare_t* handle);

+static bool cliRecvReleaseReq(SCliConn* conn, STransMsgHead* pHead);
+
 static int32_t allocConnRef(SCliConn* conn, bool update);

 static int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg);
@ -361,6 +355,9 @@ void cliHandleResp(SCliConn* conn) {

  SCliMsg*       pMsg = NULL;
  STransConnCtx* pCtx = NULL;
+  if (cliRecvReleaseReq(conn, pHead)) {
+    return;
+  }
  CONN_SHOULD_RELEASE(conn, pHead);

  if (CONN_NO_PERSIST_BY_APP(conn)) {
@ -383,7 +380,7 @@ void cliHandleResp(SCliConn* conn) {
               transMsg.info.ahandle);
      }
    } else {
-      pCtx = pMsg ? pMsg->ctx : NULL;
+      pCtx = pMsg->ctx;
      transMsg.info.ahandle = pCtx ? pCtx->ahandle : NULL;
      tDebug("%s conn %p get ahandle %p, persist: 1", CONN_GET_INST_LABEL(conn), conn, transMsg.info.ahandle);
    }
@ -395,7 +392,6 @@ void cliHandleResp(SCliConn* conn) {
  }

  STraceId* trace = &transMsg.info.traceId;
-
  tGDebug("%s conn %p %s received from %s, local info:%s, len:%d, code str:%s", CONN_GET_INST_LABEL(conn), conn,
          TMSG_INFO(pHead->msgType), conn->dst, conn->src, transMsg.contLen, tstrerror(transMsg.code));

@ -830,11 +826,11 @@ void cliConnCb(uv_connect_t* req, int status) {

  int addrlen = sizeof(peername);
  uv_tcp_getpeername((uv_tcp_t*)pConn->stream, &peername, &addrlen);
-  transGetSockDebugInfo(&peername, pConn->dst);
+  transSockInfo2Str(&peername, pConn->dst);

  addrlen = sizeof(sockname);
  uv_tcp_getsockname((uv_tcp_t*)pConn->stream, &sockname, &addrlen);
-  transGetSockDebugInfo(&sockname, pConn->src);
+  transSockInfo2Str(&sockname, pConn->src);

  tTrace("%s conn %p connect to server successfully", CONN_GET_INST_LABEL(pConn), pConn);
  assert(pConn->stream == req->handle);
@ -1053,6 +1049,30 @@ static void cliPrepareCb(uv_prepare_t* handle) {
  if (thrd->stopMsg != NULL) cliHandleQuit(thrd->stopMsg, thrd);
 }

+bool cliRecvReleaseReq(SCliConn* conn, STransMsgHead* pHead) {
+  if (pHead->release == 1 && (pHead->msgLen) == sizeof(*pHead)) {
+    uint64_t ahandle = pHead->ahandle;
+    SCliMsg* pMsg = NULL;
+    CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle);
+    transClearBuffer(&conn->readBuf);
+    transFreeMsg(transContFromHead((char*)pHead));
+    if (transQueueSize(&conn->cliMsgs) > 0 && ahandle == 0) {
+      SCliMsg* cliMsg = transQueueGet(&conn->cliMsgs, 0);
+      if (cliMsg->type == Release) return true;
+    }
+    tDebug("%s conn %p receive release request, refId:%" PRId64 "", CONN_GET_INST_LABEL(conn), conn, conn->refId);
+    if (T_REF_VAL_GET(conn) > 1) {
+      transUnrefCliHandle(conn);
+    }
+    destroyCmsg(pMsg);
+    cliReleaseUnfinishedMsg(conn);
+    transQueueClear(&conn->cliMsgs);
+    addConnToPool(((SCliThrd*)conn->hostThrd)->pool, conn);
+    return true;
+  }
+  return false;
+}
+
 static void* cliWorkThread(void* arg) {
  SCliThrd* pThrd = (SCliThrd*)arg;
  pThrd->pid = taosGetSelfPthreadId();
--- a/source/libs/transport/src/transComm.c
+++ b/source/libs/transport/src/transComm.c
@ -77,7 +77,7 @@ void transFreeMsg(void* msg) {
  }
  taosMemoryFree((char*)msg - sizeof(STransMsgHead));
 }
-int transGetSockDebugInfo(struct sockaddr* sockname, char* dst) {
+int transSockInfo2Str(struct sockaddr* sockname, char* dst) {
  struct sockaddr_in addr = *(struct sockaddr_in*)sockname;

  char buf[20] = {0};
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@ -114,6 +114,8 @@ static void uvAcceptAsyncCb(uv_async_t* handle);
 static void uvShutDownCb(uv_shutdown_t* req, int status);
 static void uvPrepareCb(uv_prepare_t* handle);

+static bool uvRecvReleaseReq(SSvrConn* conn, STransMsgHead* pHead);
+
 /*
 * time-consuming task throwed into BG work thread
 */
@ -123,7 +125,7 @@ static void uvWorkAfterTask(uv_work_t* req, int status);
 static void uvWalkCb(uv_handle_t* handle, void* arg);
 static void uvFreeCb(uv_handle_t* handle);

-static void uvStartSendRespInternal(SSvrMsg* smsg);
+static void uvStartSendRespImpl(SSvrMsg* smsg);
 static void uvPrepareSendData(SSvrMsg* msg, uv_buf_t* wb);
 static void uvStartSendResp(SSvrMsg* msg);

@ -154,37 +156,6 @@ static void* transAcceptThread(void* arg);
 static bool addHandleToWorkloop(SWorkThrd* pThrd, char* pipeName);
 static bool addHandleToAcceptloop(void* arg);

-#define CONN_SHOULD_RELEASE(conn, head)                                                                   \
-  do {                                                                                                    \
-    if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) {                                        \
-      reallocConnRef(conn);                                                                               \
-      tTrace("conn %p received release request", conn);                                                   \
-                                                                                                          \
-      STraceId traceId = head->traceId;                                                                   \
-      conn->status = ConnRelease;                                                                         \
-      transClearBuffer(&conn->readBuf);                                                                   \
-      transFreeMsg(transContFromHead((char*)head));                                                       \
-                                                                                                          \
-      STransMsg tmsg = {                                                                                  \
-          .code = 0, .info.handle = (void*)conn, .info.traceId = traceId, .info.ahandle = (void*)0x9527}; \
-      SSvrMsg* srvMsg = taosMemoryCalloc(1, sizeof(SSvrMsg));                                             \
-      srvMsg->msg = tmsg;                                                                                 \
-      srvMsg->type = Release;                                                                             \
-      srvMsg->pConn = conn;                                                                               \
-      if (!transQueuePush(&conn->srvMsgs, srvMsg)) {                                                      \
-        return;                                                                                           \
-      }                                                                                                   \
-      if (conn->regArg.init) {                                                                            \
-        tTrace("conn %p release, notify server app", conn);                                               \
-        STrans* pTransInst = conn->pTransInst;                                                            \
-        (*pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);                                \
-        memset(&conn->regArg, 0, sizeof(conn->regArg));                                                   \
-      }                                                                                                   \
-      uvStartSendRespInternal(srvMsg);                                                                    \
-      return;                                                                                             \
-    }                                                                                                     \
-  } while (0)
-
 #define SRV_RELEASE_UV(loop)       \
  do {                             \
    uv_walk(loop, uvWalkCb, NULL); \
@ -230,7 +201,9 @@ static void uvHandleReq(SSvrConn* pConn) {
  //  transRefSrvHandle(pConn);
  //  uv_queue_work(((SWorkThrd*)pConn->hostThrd)->loop, wreq, uvWorkDoTask, uvWorkAfterTask);

-  CONN_SHOULD_RELEASE(pConn, pHead);
+  if (uvRecvReleaseReq(pConn, pHead)) {
+    return;
+  }

  STransMsg transMsg;
  memset(&transMsg, 0, sizeof(transMsg));
@ -356,10 +329,10 @@ void uvOnSendCb(uv_write_t* req, int status) {

          msg = (SSvrMsg*)transQueueGet(&conn->srvMsgs, 0);
          if (msg != NULL) {
-            uvStartSendRespInternal(msg);
+            uvStartSendRespImpl(msg);
          }
        } else {
-          uvStartSendRespInternal(msg);
+          uvStartSendRespImpl(msg);
        }
      }
    }
@ -423,7 +396,7 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
  wb->len = len;
 }

-static void uvStartSendRespInternal(SSvrMsg* smsg) {
+static void uvStartSendRespImpl(SSvrMsg* smsg) {
  SSvrConn* pConn = smsg->pConn;
  if (pConn->broken) {
    return;
@ -453,7 +426,7 @@ static void uvStartSendResp(SSvrMsg* smsg) {
  if (!transQueuePush(&pConn->srvMsgs, smsg)) {
    return;
  }
-  uvStartSendRespInternal(smsg);
+  uvStartSendRespImpl(smsg);
  return;
 }

@ -544,6 +517,35 @@ static void uvShutDownCb(uv_shutdown_t* req, int status) {
  uv_close((uv_handle_t*)req->handle, uvDestroyConn);
  taosMemoryFree(req);
 }
+static bool uvRecvReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) {
+  if ((pHead)->release == 1 && (pHead->msgLen) == sizeof(*pHead)) {
+    reallocConnRef(pConn);
+    tTrace("conn %p received release request", pConn);
+
+    STraceId traceId = pHead->traceId;
+    pConn->status = ConnRelease;
+    transClearBuffer(&pConn->readBuf);
+    transFreeMsg(transContFromHead((char*)pHead));
+
+    STransMsg tmsg = {.code = 0, .info.handle = (void*)pConn, .info.traceId = traceId, .info.ahandle = (void*)0x9527};
+    SSvrMsg*  srvMsg = taosMemoryCalloc(1, sizeof(SSvrMsg));
+    srvMsg->msg = tmsg;
+    srvMsg->type = Release;
+    srvMsg->pConn = pConn;
+    if (!transQueuePush(&pConn->srvMsgs, srvMsg)) {
+      return true;
+    }
+    if (pConn->regArg.init) {
+      tTrace("conn %p release, notify server app", pConn);
+      STrans* pTransInst = pConn->pTransInst;
+      (*pTransInst->cfp)(pTransInst->parent, &(pConn->regArg.msg), NULL);
+      memset(&pConn->regArg, 0, sizeof(pConn->regArg));
+    }
+    uvStartSendRespImpl(srvMsg);
+    return true;
+  }
+  return false;
+}
 static void uvPrepareCb(uv_prepare_t* handle) {
  // prepare callback
  SWorkThrd*  pThrd = handle->data;
@ -696,7 +698,7 @@ void uvOnConnectionCb(uv_stream_t* q, ssize_t nread, const uv_buf_t* buf) {
      transUnrefSrvHandle(pConn);
      return;
    }
-    transGetSockDebugInfo(&peername, pConn->dst);
+    transSockInfo2Str(&peername, pConn->dst);

    addrlen = sizeof(sockname);
    if (0 != uv_tcp_getsockname(pConn->pTcp, (struct sockaddr*)&sockname, &addrlen)) {
@ -704,7 +706,7 @@ void uvOnConnectionCb(uv_stream_t* q, ssize_t nread, const uv_buf_t* buf) {
      transUnrefSrvHandle(pConn);
      return;
    }
-    transGetSockDebugInfo(&sockname, pConn->src);
+    transSockInfo2Str(&sockname, pConn->src);
    struct sockaddr_in addr = *(struct sockaddr_in*)&sockname;

    pConn->clientIp = addr.sin_addr.s_addr;
@ -992,7 +994,7 @@ void uvHandleRelease(SSvrMsg* msg, SWorkThrd* thrd) {
    if (!transQueuePush(&conn->srvMsgs, msg)) {
      return;
    }
-    uvStartSendRespInternal(msg);
+    uvStartSendRespImpl(msg);
    return;
  } else if (conn->status == ConnRelease || conn->status == ConnNormal) {
    tDebug("%s conn %p already released, ignore release-msg", transLabel(thrd->pTransInst), conn);
--- a/tests/pytest/util/taosadapter.py
+++ b/tests/pytest/util/taosadapter.py
@ -238,19 +238,23 @@ class TAdapter:

        if self.running != 0:
            psCmd = f"ps -ef|grep -w {toBeKilled}| grep -v grep | awk '{{print $2}}'"
+            # psCmd = f"pgrep {toBeKilled}"
            processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8")
+                psCmd, shell=True)

            while(processID):
-                killCmd = f"kill {signal} {processID} > /dev/null 2>&1"
+                killCmd = f"pkill {signal} {processID} > /dev/null 2>&1"
                os.system(killCmd)
                time.sleep(1)
                processID = subprocess.check_output(
                    psCmd, shell=True).decode("utf-8")
            if not platform.system().lower() == 'windows':
-                for port in range(6030, 6041):
-                    fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
-                    os.system(fuserCmd)
+                port = 6041
+                fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
+                os.system(fuserCmd)
+                # for port in range(6030, 6041):
+                    # fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
+                    # os.system(fuserCmd)

        self.running = 0
        tdLog.debug(f"taosadapter is stopped by kill {signal}")
--- a/tests/script/tsim/column/commit.sim
+++ b/tests/script/tsim/column/commit.sim
@ -10,12 +10,12 @@ sql create table d3.mt (ts timestamp, c000 int, c001 int, c002 int, c003 int, c0
 sql create table d3.t1 using d3.mt tags(1, 2, '3', 4, 5, 6)

 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -33,50 +33,50 @@ sql insert into d3.t1 values (now+1d,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,

 print =============== step3
 sql select * from d3.mt
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 sql select * from d3.mt where c001 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select * from d3.mt where c002 = 2 and c003 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
  return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
  return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
  return -1
 endi

@ -86,17 +86,17 @@ system sh/exec.sh -n dnode1 -s start

 print =============== step5
 sql select * from d3.mt
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 sql select * from d3.mt where c001 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select * from d3.mt where c002 = 2 and c003 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -107,35 +107,35 @@ endi

 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
  return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
  return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/column/metrics.sim
+++ b/tests/script/tsim/column/metrics.sim
@ -11,12 +11,12 @@ sql create table d2.t1 using d2.mt tags(1, 2, '3', 4, 5, 6)
 sql create table d2.t2 using d2.mt tags(6, 7, '8', 9, 10, 11)

 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -53,98 +53,98 @@ sql insert into d2.t2 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,

 print =============== step3
 sql select * from d2.mt
-if $rows != 20 then 
+if $rows != 20 then
  return -1
 endi

 sql select * from d2.mt where ts < now + 4m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 sql select * from d2.mt where c001 = 1
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

 sql select * from d2.mt where c002 = 2 and c003 = 2
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

 sql select * from d2.mt where c002 = 2 and c003 = 2 and ts < now + 4m
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

 sql select count(*) from d2.mt
-if $data00 != 20 then 
+if $data00 != 20 then
  return -1
 endi

 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 20 then 
+if $data00 != 20 then
  return -1
 endi
-if $data01 != 20 then 
+if $data01 != 20 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 90 then 
+if $data04 != 90 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
  return -1
 endi
-if $data08 != 20 then 
+if $data08 != 20 then
  return -1
 endi
-if $data09 != 20 then 
+if $data09 != 20 then
  return -1
 endi

 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c238), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt where a = 1
-print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09 
-if $data00 != 10 then 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
  return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
  return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
  return -1
 endi

@ -154,56 +154,56 @@ system sh/exec.sh -n dnode1 -s start

 print =============== step5
 sql select * from d2.mt
-if $rows != 20 then 
+if $rows != 20 then
  return -1
 endi

 sql select * from d2.mt where c001 = 1
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

 sql select * from d2.mt where c002 = 2 and c003 = 2
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

 sql select count(*) from d2.mt
-if $data00 != 20 then 
+if $data00 != 20 then
  return -1
 endi

 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d2.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 20 then 
+if $data00 != 20 then
  return -1
 endi
-if $data01 != 20 then 
+if $data01 != 20 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 90 then 
+if $data04 != 90 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
  return -1
 endi
-if $data08 != 20 then 
+if $data08 != 20 then
  return -1
 endi
-if $data09 != 20 then 
+if $data09 != 20 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/column/table.sim
+++ b/tests/script/tsim/column/table.sim
@ -9,7 +9,7 @@ sql use d1
 sql create table d1.t1 (ts timestamp, c000 int, c001 int, c002 int, c003 int, c004 int, c005 int, c006 int, c007 int, c008 int, c009 int, c010 int, c011 int, c012 int, c013 int, c014 int, c015 int, c016 int, c017 int, c018 int, c019 int, c020 int, c021 int, c022 int, c023 int, c024 int, c025 int, c026 int, c027 int, c028 int, c029 int, c030 int, c031 int, c032 int, c033 int, c034 int, c035 int, c036 int, c037 int, c038 int, c039 int, c040 int, c041 int, c042 int, c043 int, c044 int, c045 int, c046 int, c047 int, c048 int, c049 int, c050 int, c051 int, c052 int, c053 int, c054 int, c055 int, c056 int, c057 int, c058 int, c059 int, c060 int, c061 int, c062 int, c063 int, c064 int, c065 int, c066 int, c067 int, c068 int, c069 int, c070 int, c071 int, c072 int, c073 int, c074 int, c075 int, c076 int, c077 int, c078 int, c079 int, c080 int, c081 int, c082 int, c083 int, c084 int, c085 int, c086 int, c087 int, c088 int, c089 int, c090 int, c091 int, c092 int, c093 int, c094 int, c095 int, c096 int, c097 int, c098 int, c099 int, c100 int, c101 int, c102 int, c103 int, c104 int, c105 int, c106 int, c107 int, c108 int, c109 int, c110 int, c111 int, c112 int, c113 int, c114 int, c115 int, c116 int, c117 int, c118 int, c119 int, c120 int, c121 int, c122 int, c123 int, c124 int, c125 int, c126 int, c127 int, c128 int, c129 int, c130 int, c131 int, c132 int, c133 int, c134 int, c135 int, c136 int, c137 int, c138 int, c139 int, c140 int, c141 int, c142 int, c143 int, c144 int, c145 int, c146 int, c147 int, c148 int, c149 int, c150 int, c151 int, c152 int, c153 int, c154 int, c155 int, c156 int, c157 int, c158 int, c159 int, c160 int, c161 int, c162 int, c163 int, c164 int, c165 int, c166 int, c167 int, c168 int, c169 int, c170 int, c171 int, c172 int, c173 int, c174 int, c175 int, c176 int, c177 int, c178 int, c179 int, c180 int, c181 int, c182 int, c183 int, c184 int, c185 int, c186 int, c187 int, c188 int, c189 int, c190 int, c191 int, c192 int, c193 int, c194 int, c195 int, c196 int, c197 int, c198 int, c199 int, c200 int, c201 int, c202 int, c203 int, c204 int, c205 int, c206 int, c207 int, c208 int, c209 int, c210 int, c211 int, c212 int, c213 int, c214 int, c215 int, c216 int, c217 int, c218 int, c219 int, c220 int, c221 int, c222 int, c223 int, c224 int, c225 int, c226 int, c227 int, c228 int, c229 int, c230 int, c231 int, c232 int, c233 int, c234 int, c235 int, c236 int, c237 int, c238 int, c239 int, c240 int, c241 int, c242 int, c243 int, c244 int, c245 int, c246 int, c247 int, c248 int, c249 int, c250 int)

 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -32,91 +32,91 @@ sql insert into d1.t1 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,
 print ======= step3
 sql select * from d1.t1
 print select * from d1.t1 => rows $rows
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 sql select * from d1.t1 where ts < now + 4m
 print select * from d1.t1 where ts < now + 4m => rows $rows
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 sql select * from d1.t1 where c001 = 1
 print select * from d1.t1 where c001 = 1 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select * from d1.t1 where c002 = 2 and c003 = 2
 print select * from d1.t1 where c002 = 2 and c003 = 2 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select * from d1.t1 where c002 = 2 and c003 = 2 and ts < now + 4m
 print select * from d1.t1 where c002 = 2 and c003 = 2 and ts < now + 4m => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select count(*) from d1.t1
 print select count(*) from d1.t1 => $data00
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi

 sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250) from d1.t1
-print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07 
-if $data00 != 10 then 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
  return -1
 endi

-sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1 
+sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1

-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
  return -1
 endi

@ -128,79 +128,79 @@ print ==============  step5

 sql select * from d1.t1
 print select * from d1.t1 => rows $rows
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 sql select * from d1.t1 where c001 = 1
 print select * from d1.t1 where c001 = 1 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select * from d1.t1 where c002 = 2 and c003 = 2
 print select * from d1.t1 where c002 = 2 and c003 = 2 => rows $rows
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 sql select count(*) from d1.t1
 print select count(*) from d1.t1 => $data00
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi

 sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250) from d1.t1
-print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07 
-if $data00 != 10 then 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
  return -1
 endi

 sql select count(c001), count(c250), avg(c001), avg(c250), sum(c001), max(c001), min(c250), stddev(c250), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d1.t1
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
  return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
  return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
  return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
  return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
  return -1
 endi
-if $data07 != 2.872281323 then 
+if $data07 != 2.872281323 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/avg.sim
+++ b/tests/script/tsim/compute/avg.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select avg(tbcol) from $tb
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

@ -53,27 +53,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
  return -1
 endi

 print =============== step4
 sql select avg(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

 print =============== step5
 sql select avg(tbcol) as b from $tb interval(1m)
 print ===> $data01
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
  return -1
 endi

 sql select avg(tbcol) as b from $tb interval(1d)
 print ===> $data01
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

@ -82,17 +82,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data01
-if $data40 != 4.000000000 then 
+if $data40 != 4.000000000 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select avg(tbcol) from $mt
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

@ -101,13 +101,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
  return -1
 endi

 sql select avg(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

@ -115,31 +115,31 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
  return -1
 endi

 print =============== step9
 sql select avg(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
  return -1
 endi

 sql select avg(tbcol) as b from $mt interval(1d)
 print ===> $data01
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

 print =============== step10
 sql select avg(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -148,18 +148,18 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
  return -1
 endi
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/block_dist.sim
+++ b/tests/script/tsim/compute/block_dist.sim
@ -27,25 +27,25 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 sql create table $nt (ts timestamp, tbcol int)
 $x = 0
 while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc
-    sql insert into $nt values ($ms , $x ) 
-    $x = $x + 1  
+    sql insert into $nt values ($ms , $x )
+    $x = $x + 1
 endw

 sql flush database $db
@ -94,7 +94,7 @@ sql_error select _block_dist() from (select * from $mt)
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

--- a/tests/script/tsim/compute/bottom.sim
+++ b/tests/script/tsim/compute/bottom.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select bottom(tbcol, 1) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -53,24 +53,24 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 1) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5 then 
+if $data00 != 5 then
  return -1
 endi

 print =============== step4
 sql select bottom(tbcol, 1) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step5
-sql select bottom(tbcol, 2) as b from $tb 
+sql select bottom(tbcol, 2) as b from $tb
 print ===> $data00  $data10
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi
-if $data10 != 0 then 
+if $data10 != 0 then
  return -1
 endi

@ -79,10 +79,10 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 2) as b from $tb where ts > $ms
 print ===> $data00  $data10
-if $data00 != 6 then 
+if $data00 != 6 then
  return -1
 endi
-if $data10 != 5 then 
+if $data10 != 5 then
  return -1
 endi

@ -93,8 +93,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/count.sim
+++ b/tests/script/tsim/compute/count.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,19 +44,19 @@ $tb = $tbPrefix . $i

 sql select count(*) from $tb
 print ===> select count(*) from $tb => $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
  return -1
 endi

 sql select count(1) from $tb
 print ===> select count(1) from $tb => $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
  return -1
 endi

 sql select count(tbcol) from $tb
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
  return -1
 endi

@ -65,27 +65,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 5 then 
+if $data00 != 5 then
  return -1
 endi

 print =============== step4
 sql select count(tbcol) as b from $tb
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
  return -1
 endi

 print =============== step5
 sql select count(tbcol) as b from $tb interval(1m)
 print ===> $data00
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi

 sql select count(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
  return -1
 endi

@ -94,30 +94,30 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select count(*) from $mt
 print ===> $data00
-if $data00 != $totalNum then 
+if $data00 != $totalNum then
  return -1
 endi

 print =============== step8
 sql select count(1) from $mt
 print ===> $data00
-if $data00 != $totalNum then 
+if $data00 != $totalNum then
  return -1
 endi

 sql select count(tbcol) from $mt
 print ===> $data00
-if $data00 != $totalNum then 
+if $data00 != $totalNum then
  return -1
 endi

@ -126,13 +126,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 50 then 
+if $data00 != 50 then
  return -1
 endi

 sql select count(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 100 then 
+if $data00 != 100 then
  return -1
 endi

@ -140,34 +140,34 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 25 then 
+if $data00 != 25 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol) as b from $mt interval(1m)
 print ===> $data00
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data10 != 10 then 
+if $data10 != 10 then
  return -1
 endi

 sql select count(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 200 then 
+if $data00 != 200 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != $rowNum then 
+if $data00 != $rowNum then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -176,17 +176,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data01
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

--- a/tests/script/tsim/compute/diff.sim
+++ b/tests/script/tsim/compute/diff.sim
@ -25,17 +25,17 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -43,7 +43,7 @@ $tb = $tbPrefix . $i

 sql select diff(tbcol) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

@ -52,7 +52,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts > $ms
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

@ -60,14 +60,14 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts <= $ms
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 print =============== step4
 sql select diff(tbcol) as b from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

@ -86,8 +86,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/diff2.sim
+++ b/tests/script/tsim/compute/diff2.sim
@ -26,19 +26,19 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

    $tinyint = $x / 128
-    sql insert into $tb values ($ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x ) 
+    sql insert into $tb values ($ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -46,7 +46,7 @@ $tb = $tbPrefix . $i

 sql select diff(c1) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 sql select diff(c2) from $tb
@ -56,22 +56,22 @@ if $data10 != 1.000000000 then
 endi
 sql select diff(c3) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 sql select diff(c4) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 sql select diff(c5) from $tb
 print ===> $data10
-if $data10 != 0 then 
+if $data10 != 0 then
  return -1
 endi
 sql select diff(c6) from $tb
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
  return -1
 endi

@ -90,7 +90,7 @@ sql_error select diff(c1) from m_di_tb1 where c2 like '2%'
 print =============== step3
 sql select diff(c1) from $tb where c1 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 sql select diff(c2) from $tb where c2 > 5
@ -100,38 +100,38 @@ if $data10 != 1.000000000 then
 endi
 sql select diff(c3) from $tb where c3 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 sql select diff(c4) from $tb where c4 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 sql select diff(c5) from $tb where c5 > 5
 print ===> $data10
-if $data10 != 0 then 
+if $data10 != 0 then
  return -1
 endi
 sql select diff(c6) from $tb where c6 > 5
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
  return -1
 endi

 print =============== step4
 sql select diff(c1) from $tb where c1 > 5 and c2 < $rowNum
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select diff(c1) from $tb where c9 like '%9' and c1 <= 20
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 print ===> $data10
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi

@ -148,8 +148,8 @@ step6:
 print =============== clear
 #sql drop database $db
 #sql select * from information_schema.ins_databases
-#if $rows != 2 then 
+#if $rows != 2 then
 #  return -1
 #endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/first.sim
+++ b/tests/script/tsim/compute/first.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select first(tbcol) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -53,27 +53,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step4
 sql select first(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step5
 sql select first(tbcol) as b from $tb interval(1m)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 sql select first(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -82,17 +82,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data40 != 4 then 
+if $data40 != 4 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select first(tbcol) from $mt
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -101,13 +101,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 sql select first(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -115,7 +115,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -123,24 +123,24 @@ print =============== step9
 sql select first(tbcol) as b from $mt interval(1m)
 print select first(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select first(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step10
 sql select first(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -149,19 +149,19 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/interval.sim
+++ b/tests/script/tsim/compute/interval.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,13 +44,13 @@ $tb = $tbPrefix . $i

 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
 print ===> $rows
-if $rows < $rowNum then 
+if $rows < $rowNum then
  return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
  return -1
 endi

@ -59,16 +59,16 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms interval(1m)
 print ===> $rows
-if $rows > 10 then 
+if $rows > 10 then
  return -1
 endi
-if $rows < 3 then 
+if $rows < 3 then
  return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
  return -1
 endi

@ -81,16 +81,16 @@ $ms2 = 1601481600000 - $cc

 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
  return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
  return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
  return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
  return -1
 endi

@ -107,29 +107,29 @@ if $rows < 30 then
  print expect greater than 30, actual: $rows
  return -1
 endi
-if $rows > 50 then 
+if $rows > 50 then
  return -1
 endi
-if $data20 != 1 then 
+if $data20 != 1 then
  return -1
 endi
-if $data24 != 1 then 
+if $data24 != 1 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
  return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
  return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
  return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
  return -1
 endi

@ -138,16 +138,16 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms interval(1m)
 print ===> $rows
-if $rows < 3 then 
+if $rows < 3 then
  return -1
 endi
-if $rows > 7 then 
+if $rows > 7 then
  return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
  return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
  return -1
 endi

@ -160,16 +160,16 @@ $ms2 = 1601481600000 - $cc

 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
  return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
  return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
  return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
  return -1
 endi

@ -181,24 +181,24 @@ $cc = 1 * 60000
 $ms2 = 1601481600000 - $cc

 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
-if $rows < 30 then 
+if $rows < 30 then
  return -1
 endi
-if $rows > 50 then 
+if $rows > 50 then
  return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
  return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/last.sim
+++ b/tests/script/tsim/compute/last.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select last(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc

 sql select last(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step4
 sql select last(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

 print =============== step5
 sql select last(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select last(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc

 sql select last(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select last(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc

 sql select last(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 sql select last(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc

 sql select last(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step9
 sql select last(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select last(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

 print =============== step10
 sql select last(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc

 sql select last(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/last_row.sim
+++ b/tests/script/tsim/compute/last_row.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select last_row(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -54,21 +54,21 @@ $ms = 1601481600000 + $cc
 print select last_row(tbcol) from $tb where ts <= $ms
 sql select last_row(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step4
 sql select last_row(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

 print =============== step7
 sql select last_row(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -77,13 +77,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select last_row(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 sql select last_row(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -91,18 +91,18 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select last_row(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step10
 sql select last_row(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -110,28 +110,28 @@ print =============== step11

 $cc = 1 * 3600000
 $ms = 1601481600000 + $cc
-sql insert into $tb values( $ms , 10) 
+sql insert into $tb values( $ms , 10)

 $cc = 3 * 3600000
 $ms = 1601481600000 + $cc
-sql insert into $tb values( $ms , null) 
+sql insert into $tb values( $ms , null)

 $cc = 5 * 3600000
 $ms = 1601481600000 + $cc

-sql insert into $tb values( $ms , -1) 
+sql insert into $tb values( $ms , -1)

 $cc = 7 * 3600000
 $ms = 1601481600000 + $cc

-sql insert into $tb values( $ms , null) 
+sql insert into $tb values( $ms , null)

 ## for super table
 $cc = 6 * 3600000
 $ms = 1601481600000 + $cc

 sql select last_row(*) from $mt where ts < $ms
-if $data01 != -1 then 
+if $data01 != -1 then
  return -1
 endi

@ -139,12 +139,12 @@ $cc = 8 * 3600000
 $ms = 1601481600000 + $cc

 sql select last_row(*) from $mt where ts < $ms
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

 sql select last_row(*) from $mt
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

@ -152,7 +152,7 @@ $cc = 4 * 3600000
 $ms = 1601481600000 + $cc

 sql select last_row(*) from $mt where ts < $ms
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

@ -162,7 +162,7 @@ $cc = 4 * 3600000
 $ms2 = 1601481600000 + $cc

 sql select last_row(*) from $mt where ts > $ms1 and ts <= $ms2
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

@ -171,7 +171,7 @@ $cc = 6 * 3600000
 $ms = 1601481600000 + $cc

 sql select last_row(*) from $tb where ts <= $ms
-if $data01 != -1 then 
+if $data01 != -1 then
  return -1
 endi

@ -179,12 +179,12 @@ $cc = 8 * 3600000
 $ms = 1601481600000 + $cc

 sql select last_row(*) from $tb where ts <= $ms
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

 sql select last_row(*) from $tb
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

@ -192,7 +192,7 @@ $cc = 4 * 3600000
 $ms = 1601481600000 + $cc

 sql select last_row(*) from $tb where ts <= $ms
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

@ -202,14 +202,14 @@ $cc = 4 * 3600000
 $ms2 = 1601481600000 + $cc

 sql select last_row(*) from $tb where ts > $ms1 and ts <= $ms2
-if $data01 != NULL then 
+if $data01 != NULL then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

--- a/tests/script/tsim/compute/leastsquare.sim
+++ b/tests/script/tsim/compute/leastsquare.sim
@ -25,17 +25,17 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 2
  $ms = 1000
  while $x < $rowNum
    $ms = $ms + 1000
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -63,7 +63,7 @@ endi

 print =============== step5
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
-print ===> $data00 
+print ===> $data00
 if $data00 != @{slop:1.000000, intercept:1.000000}@ then
  return -1
 endi
@ -81,15 +81,15 @@ if $data00 != @{slop:1.000000, intercept:1.000000}@ then
  return -1
 endi
 print ===> $rows
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/max.sim
+++ b/tests/script/tsim/compute/max.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc
-    
-    sql insert into $tb values ($ms , $x ) 
+
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select max(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc

 sql select max(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step4
 sql select max(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

 print =============== step5
 sql select max(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select max(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc

 sql select max(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select max(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc

 sql select max(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 sql select max(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc

 sql select max(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step9
 sql select max(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select max(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

 print =============== step10
 sql select max(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc

 sql select max(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/min.sim
+++ b/tests/script/tsim/compute/min.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select min(tbcol) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc

 sql select min(tbcol) from $tb where ts < $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step4
 sql select min(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step5
 sql select min(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select min(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -85,17 +85,17 @@ $ms = 1601481600000 + $cc
 sql select min(tbcol) as b from $tb where ts <= $ms interval(1m)
 print select min(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select min(tbcol) from $mt
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -104,13 +104,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as c from $mt where ts < $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 sql select min(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

@ -118,31 +118,31 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step9
 sql select min(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select min(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

 print =============== step10
 sql select min(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -151,19 +151,19 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/null.sim
+++ b/tests/script/tsim/compute/null.sim
@ -25,24 +25,24 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc
-	
-    $v1 = $x 
+
+    $v1 = $x
    $v2 = $x
    if $x == 0 then
      $v1 = NULL
    endi
-    
-    sql insert into $tb values ($ms , $v1 , $v2 ) 
+
+    sql insert into $tb values ($ms , $v1 , $v2 )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -61,47 +61,47 @@ if $rows != 20 then
 endi

 print =============== step3
-sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $tb 
-print ===> $data00 $data01 $data02 $data03 $data04 $data05 
-if $data00 != 19 then 
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $tb
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+if $data00 != 19 then
  return -1
 endi
-if $data01 != 20 then 
+if $data01 != 20 then
  return -1
 endi
-if $data02 != 10.000000000 then 
+if $data02 != 10.000000000 then
  return -1
 endi
-if $data03 != 9.500000000 then 
+if $data03 != 9.500000000 then
  return -1
 endi
-if $data04 != 190 then 
+if $data04 != 190 then
  return -1
 endi
-if $data05 != 190 then 
+if $data05 != 190 then
  return -1
 endi

 print =============== step4
 sql select * from $tb  where tbcol2 = 19
 print ===> $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 19 then 
+if $data01 != 19 then
  return -1
 endi
-if $data02 != 19 then 
+if $data02 != 19 then
  return -1
 endi

-sql select * from $tb  where tbcol is NULL 
-if $rows != 1 then 
+sql select * from $tb  where tbcol is NULL
+if $rows != 1 then
  return -1
 endi

-sql select * from $tb  where tbcol = NULL 
-if $rows != 0 then 
+sql select * from $tb  where tbcol = NULL
+if $rows != 0 then
  return -1
 endi

@ -113,29 +113,29 @@ sql create table tt using $mt tags( NULL )
 #step52:

 sql select * from $mt  where tgcol is NULL
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 print =============== step6
-sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt 
-print ===> $data00 $data01 $data02 $data03 $data04 $data05 
-if $data00 != 190 then 
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+if $data00 != 190 then
  return -1
 endi
-if $data01 != 200 then 
+if $data01 != 200 then
  return -1
 endi
-if $data02 != 10.000000000 then 
+if $data02 != 10.000000000 then
  return -1
 endi
-if $data03 != 9.500000000 then 
+if $data03 != 9.500000000 then
  return -1
 endi
-if $data04 != 1900 then 
+if $data04 != 1900 then
  return -1
 endi
-if $data05 != 1900 then 
+if $data05 != 1900 then
  return -1
 endi

@ -158,15 +158,15 @@ sql insert into t7 values(now, NULL)
 #sql insert into t8 values(now, NULL)

 #sql select * from t1
-#if $rows != 1 then 
+#if $rows != 1 then
 #  return -1
 #endi
-#if $data01 != NULL then 
+#if $data01 != NULL then
 #  return -1
 #endi

 sql select * from t2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 if $data01 != NULL then
@ -174,7 +174,7 @@ if $data01 != NULL then
 endi

 sql select * from t3
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 if $data01 != NULL then
@ -182,7 +182,7 @@ if $data01 != NULL then
 endi

 sql select * from t4
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 if $data01 != NULL then
@ -190,7 +190,7 @@ if $data01 != NULL then
 endi

 sql select * from t5
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 if $data01 != NULL then
@ -198,7 +198,7 @@ if $data01 != NULL then
 endi

 sql select * from t6
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 if $data01 != NULL then
@ -206,7 +206,7 @@ if $data01 != NULL then
 endi

 sql select * from t7
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 if $data01 != NULL then
@ -214,7 +214,7 @@ if $data01 != NULL then
 endi

 #sql select * from t8
-#if $rows != 1 then 
+#if $rows != 1 then
 #  return -1
 #endi
 #if $data01 != NULL then
@ -224,8 +224,8 @@ endi
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/percentile.sim
+++ b/tests/script/tsim/compute/percentile.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,19 +44,19 @@ $tb = $tbPrefix . $i

 sql select percentile(tbcol, 10) from $tb
 print ===> $data00
-if $data00 != 1.900000000 then 
+if $data00 != 1.900000000 then
  return -1
 endi

 sql select percentile(tbcol, 20) from $tb
 print ===> $data00
-if $data00 != 3.800000000 then 
+if $data00 != 3.800000000 then
  return -1
 endi

 sql select percentile(tbcol, 100) from $tb
 print ===> $data00
-if $data00 != 19.000000000 then 
+if $data00 != 19.000000000 then
  return -1
 endi

@ -70,7 +70,7 @@ $ms = 1601481600000 + $cc

 sql select percentile(tbcol, 1) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.140000000 then 
+if $data00 != 5.140000000 then
  return -1
 endi

@ -79,7 +79,7 @@ $ms = 1601481600000 + $cc

 sql select percentile(tbcol, 5) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.700000000 then 
+if $data00 != 5.700000000 then
  return -1
 endi

@ -88,7 +88,7 @@ $ms = 1601481600000 + $cc

 sql select percentile(tbcol, 0) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.000000000 then 
+if $data00 != 5.000000000 then
  return -1
 endi

@ -98,7 +98,7 @@ $ms = 1601481600000 + $cc

 sql select percentile(tbcol, 1) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.140000000 then 
+if $data00 != 5.140000000 then
  return -1
 endi

@ -107,7 +107,7 @@ $ms = 1601481600000 + $cc

 sql select percentile(tbcol, 5) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.700000000 then 
+if $data00 != 5.700000000 then
  return -1
 endi

@ -116,15 +116,15 @@ $ms = 1601481600000 + $cc

 sql select percentile(tbcol, 0) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.000000000 then 
+if $data00 != 5.000000000 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/stddev.sim
+++ b/tests/script/tsim/compute/stddev.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select stddev(tbcol) from $tb
 print ===> $data00
-if $data00 != 5.766281297 then 
+if $data00 != 5.766281297 then
  return -1
 endi

@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc

 sql select stddev(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 1.414213562 then 
+if $data00 != 1.414213562 then
  return -1
 endi

 print =============== step4
 sql select stddev(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 5.766281297 then 
+if $data00 != 5.766281297 then
  return -1
 endi

 print =============== step5
 sql select stddev(tbcol) as b from $tb interval(1m)
-print ===> $data00 
-if $data00 != 0.000000000 then 
+print ===> $data00
+if $data00 != 0.000000000 then
  return -1
 endi

 sql select stddev(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 5.766281297 then 
+if $data00 != 5.766281297 then
  return -1
 endi

@ -84,18 +84,18 @@ $ms = 1601481600000 + $cc

 sql select stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data00 != 0.000000000 then 
+if $data00 != 0.000000000 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/sum.sim
+++ b/tests/script/tsim/compute/sum.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select sum(tbcol) from $tb
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
  return -1
 endi

@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc

 sql select sum(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi

 print =============== step4
 sql select sum(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
  return -1
 endi

 print =============== step5
 sql select sum(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi

 sql select sum(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
  return -1
 endi

@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc

 sql select sum(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
  return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select sum(tbcol) from $mt
 print ===> $data00
-if $data00 != 1900 then 
+if $data00 != 1900 then
  return -1
 endi

@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc

 sql select sum(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 100 then 
+if $data00 != 100 then
  return -1
 endi

 sql select sum(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 950 then 
+if $data00 != 950 then
  return -1
 endi

@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc

 sql select sum(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 50 then 
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select sum(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 < 5 then 
+if $data10 < 5 then
  return -1
 endi

 sql select sum(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 1900 then 
+if $data00 != 1900 then
  return -1
 endi

 print =============== step10
 sql select sum(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 190 then 
+if $data00 != 190 then
  return -1
 endi

-if $rows != $tbNum then 
+if $rows != $tbNum then
  return -1
 endi

@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc

 sql select sum(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1d)
 print select sum(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1d)
-print ===> $data00 $rows 
-if $data00 != 10 then 
+print ===> $data00 $rows
+if $data00 != 10 then
  return -1
 endi
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/compute/top.sim
+++ b/tests/script/tsim/compute/top.sim
@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
  $tb = $tbPrefix . $i
  sql create table $tb using $mt tags( $i )
-  
+
  $x = 0
  while $x < $rowNum
    $cc = $x * 60000
    $ms = 1601481600000 + $cc

-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
    $x = $x + 1
-  endw 
- 
+  endw
+
  $i = $i + 1
-endw 
+endw

 print =============== step2
 $i = 1
@ -44,7 +44,7 @@ $tb = $tbPrefix . $i

 sql select top(tbcol, 1) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

@ -54,24 +54,24 @@ $ms = 1601481600000 + $cc

 sql select top(tbcol, 1) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== step4
 sql select top(tbcol, 1) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
  return -1
 endi

 print =============== step5
-sql select top(tbcol, 2) as b from $tb 
+sql select top(tbcol, 2) as b from $tb
 print ===> $data00  $data10
-if $data00 != 18 then 
+if $data00 != 18 then
  return -1
 endi
-if $data10 != 19 then 
+if $data10 != 19 then
  return -1
 endi

@ -81,10 +81,10 @@ $ms = 1601481600000 + $cc

 sql select top(tbcol, 2) as b from $tb where ts <= $ms
 print ===> $data00  $data10
-if $data00 != 3 then 
+if $data00 != 3 then
  return -1
 endi
-if $data10 != 4 then 
+if $data10 != 4 then
  return -1
 endi

@ -95,8 +95,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/backquote.sim
+++ b/tests/script/tsim/insert/backquote.sim
@ -8,9 +8,9 @@ print =============== create database
 sql create database `database`
 sql create database `DataBase`
 sql select * from information_schema.ins_databases
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 if $rows != 4 then
  return -1
@ -27,12 +27,12 @@ endi

 $dbCnt = 0
 while $dbCnt < 2
-    if $dbCnt == 0 then 
+    if $dbCnt == 0 then
        sql use `database`
-    else 
+    else
        sql use `DataBase`
    endi
-    
+
    $dbCnt = $dbCnt + 1

    print =============== create super table, include all type
@ -41,13 +41,13 @@ while $dbCnt < 2
    sql create table `Stable` (`timestamp` timestamp, `int` int, `Binary` binary(32), `Nchar` nchar(32)) tags (`float` float, `binary` binary(16), `nchar` nchar(16))

    sql show stables
-    print rows: $rows 
+    print rows: $rows
    print $data00  $data01
    print $data10  $data11
-    if $rows != 2 then 
+    if $rows != 2 then
      return -1
    endi
-    if $data00 != Stable then 
+    if $data00 != Stable then
        if $data00 != stable then
          return -1
        endi
@ -57,24 +57,24 @@ while $dbCnt < 2
          return -1
        endi
    endi
-    
+
    print =============== create child table
    sql create table `table` using `stable` tags(100.0, 'stable+table', 'stable+table')
    sql create table `Table` using `stable` tags(100.1, 'stable+Table', 'stable+Table')
-    
+
    sql create table `TAble` using `Stable` tags(100.0, 'Stable+TAble', 'Stable+TAble')
-    sql create table `TABle` using `Stable` tags(100.1, 'Stable+TABle', 'Stable+TABle')    
-   
+    sql create table `TABle` using `Stable` tags(100.1, 'Stable+TABle', 'Stable+TABle')
+
    sql show tables
-    print rows: $rows 
+    print rows: $rows
    print $data00  $data01
    print $data10  $data11
    print $data20  $data21
    print $data30  $data31
-    if $rows != 4 then 
+    if $rows != 4 then
      return -1
    endi
-    
+
    print =============== insert data
    sql insert into `table` values(now+0s, 10, 'table', 'table')(now+1s, 11, 'table', 'table')
    sql insert into `Table` values(now+0s, 20, 'Table', 'Table')(now+1s, 21, 'Table', 'Table')
@ -86,15 +86,15 @@ while $dbCnt < 2
    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
      return -1
-    endi    
-    if $data01 != 10 then 
+    endi
+    if $data01 != 10 then
      return -1
-    endi    
-    if $data02 != table then 
+    endi
+    if $data02 != table then
      return -1
-    endi    
+    endi
    if $data03 != table then
      print expect table, actual $data03
      return -1
@ -103,57 +103,57 @@ while $dbCnt < 2

    print =================> 1
    sql select * from `Table`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
      return -1
-    endi    
-    if $data01 != 20 then 
+    endi
+    if $data01 != 20 then
      return -1
-    endi    
-    if $data02 != Table then 
+    endi
+    if $data02 != Table then
      return -1
-    endi    
-    if $data03 != Table then 
+    endi
+    if $data03 != Table then
      return -1
    endi

    print ================>2
    sql select * from `TAble`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
-      return -1
-    endi    
-    if $data01 != 30 then 
-      return -1
-    endi    
-    if $data02 != TAble then 
-      return -1
-    endi    
-    if $data03 != TAble then 
+    if $rows != 2 then
      return -1
    endi
-    
+    if $data01 != 30 then
+      return -1
+    endi
+    if $data02 != TAble then
+      return -1
+    endi
+    if $data03 != TAble then
+      return -1
+    endi
+
    sql select * from `TABle`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
-      return -1
-    endi    
-    if $data01 != 40 then 
-      return -1
-    endi    
-    if $data02 != TABle then 
-      return -1
-    endi    
-    if $data03 != TABle then 
+    if $rows != 2 then
      return -1
    endi
-    
+    if $data01 != 40 then
+      return -1
+    endi
+    if $data02 != TABle then
+      return -1
+    endi
+    if $data03 != TABle then
+      return -1
+    endi
+
    #print =============== query data from st, but not support select * from super table, waiting fix
    #sql select count(*) from `stable`
    #print rows: $rows
@ -174,7 +174,7 @@ while $dbCnt < 2
    #  return -1
    #endi
    #sql select * from `stable`
-    #if $rows != 4 then 
+    #if $rows != 4 then
    #  return -1
    #endi

@ -185,9 +185,9 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start

 sql select * from information_schema.ins_databases
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 if $rows != 4 then
  return -1
@ -204,22 +204,22 @@ endi

 $dbCnt = 0
 while $dbCnt < 2
-    if $dbCnt == 0 then 
+    if $dbCnt == 0 then
        sql use `database`
-    else 
+    else
        sql use `DataBase`
    endi
-    
+
    $dbCnt = $dbCnt + 1

    sql show stables
-    print rows: $rows 
+    print rows: $rows
    print $data00  $data01
    print $data10  $data11
-    if $rows != 2 then 
+    if $rows != 2 then
      return -1
    endi
-    if $data00 != Stable then 
+    if $data00 != Stable then
        if $data00 != stable then
          return -1
        endi
@ -229,86 +229,86 @@ while $dbCnt < 2
          return -1
        endi
    endi
-  
+
    sql show tables
-    print rows: $rows 
+    print rows: $rows
    print $data00  $data01
    print $data10  $data11
    print $data20  $data21
    print $data30  $data31
-    if $rows != 4 then 
+    if $rows != 4 then
      return -1
    endi
-    
+
    print =============== query data
    sql select * from `table`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
-      return -1
-    endi    
-    if $data01 != 10 then 
-      return -1
-    endi    
-    if $data02 != table then 
-      return -1
-    endi    
-    if $data03 != table then 
+    if $rows != 2 then
      return -1
    endi
-    
+    if $data01 != 10 then
+      return -1
+    endi
+    if $data02 != table then
+      return -1
+    endi
+    if $data03 != table then
+      return -1
+    endi
+
    sql select * from `Table`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
-      return -1
-    endi    
-    if $data01 != 20 then 
-      return -1
-    endi    
-    if $data02 != Table then 
-      return -1
-    endi    
-    if $data03 != Table then 
+    if $rows != 2 then
      return -1
    endi
-    
+    if $data01 != 20 then
+      return -1
+    endi
+    if $data02 != Table then
+      return -1
+    endi
+    if $data03 != Table then
+      return -1
+    endi
+
    sql select * from `TAble`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
-      return -1
-    endi    
-    if $data01 != 30 then 
-      return -1
-    endi    
-    if $data02 != TAble then 
-      return -1
-    endi    
-    if $data03 != TAble then 
+    if $rows != 2 then
      return -1
    endi
-    
+    if $data01 != 30 then
+      return -1
+    endi
+    if $data02 != TAble then
+      return -1
+    endi
+    if $data03 != TAble then
+      return -1
+    endi
+
    sql select * from `TABle`
-    print rows: $rows 
+    print rows: $rows
    print $data00 $data01 $data02 $data03
    print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
-      return -1
-    endi    
-    if $data01 != 40 then 
-      return -1
-    endi    
-    if $data02 != TABle then 
-      return -1
-    endi    
-    if $data03 != TABle then 
+    if $rows != 2 then
      return -1
    endi
-    
+    if $data01 != 40 then
+      return -1
+    endi
+    if $data02 != TABle then
+      return -1
+    endi
+    if $data03 != TABle then
+      return -1
+    endi
+
    #print =============== query data from st, but not support select * from super table, waiting fix
    #sql select count(*) from `stable`
    #print rows: $rows
@ -329,7 +329,7 @@ while $dbCnt < 2
    #  return -1
    #endi
    #sql select * from `stable`
-    #if $rows != 4 then 
+    #if $rows != 4 then
    #  return -1
    #endi

--- a/tests/script/tsim/insert/basic.sim
+++ b/tests/script/tsim/insert/basic.sim
@ -20,26 +20,26 @@ $x = 0
 while $x < 10
  $cc = $x * 60000
  $ms = 1601481600000 + $cc
-  
-  sql insert into $tb values ($ms , $x ) 
+
+  sql insert into $tb values ($ms , $x )
  $x = $x + 1
-endw 
+endw

 print =============== step 2
 $x = 0
 while $x < 5
  $cc = $x * 60000
  $ms = 1551481600000 + $cc
-  
-  sql insert into $tb values ($ms , $x ) 
+
+  sql insert into $tb values ($ms , $x )
  $x = $x + 1
-endw 
+endw

 sql select * from $tb

 print $rows points data are retrieved
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/basic0.sim
+++ b/tests/script/tsim/insert/basic0.sim
@ -18,7 +18,7 @@ print =============== create super table, include column type for count/sum/min/
 sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -28,7 +28,7 @@ sql create table ct2 using stb tags(2000)
 sql create table ct3 using stb tags(3000)

 sql show tables
-if $rows != 3 then 
+if $rows != 3 then
  return -1
 endi

@ -46,7 +46,7 @@ sql insert into ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
 #===================================================================
 print =============== query data from child table
 sql select * from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 print $data10  $data11 $data12 $data13
 print $data20  $data21 $data22 $data23
@ -58,111 +58,111 @@ if $data01 != 10 then
  print expect 10, actual: $data01
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi

 print =============== select count(*) from child table
 sql select count(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== select count(column) from child table
 sql select count(ts), count(c1), count(c2), count(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi
-if $data01 != 4 then 
+if $data01 != 4 then
  return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi

 #print =============== select first(*)/first(column) from child table
 sql select first(*) from ct1
 print ====> select first(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03

 sql select first(ts), first(c1), first(c2), first(c3) from ct1
 print ====> select first(ts), first(c1), first(c2), first(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi

 print =============== select min(column) from child table
 sql select min(c1), min(c2), min(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -13 then 
+if $data00 != -13 then
  return -1
 endi
 if $data01 != -2.30000 then
  print expect -2.30000, actual: $data01
  return -1
 endi
-if $data02 != -3.300000000 then 
+if $data02 != -3.300000000 then
  return -1
 endi

 print =============== select max(column) from child table
 sql select max(c1), max(c2), max(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 11 then 
+if $data00 != 11 then
  return -1
 endi
-if $data01 != 2.10000 then 
+if $data01 != 2.10000 then
  return -1
 endi
-if $data02 != 3.100000000 then 
+if $data02 != 3.100000000 then
  return -1
 endi

 print =============== select sum(column) from child table
 sql select sum(c1), sum(c2), sum(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -4 then 
+if $data00 != -4 then
  return -1
 endi
-if $data01 != -0.400000095 then 
+if $data01 != -0.400000095 then
  return -1
 endi
-if $data02 != -0.400000000 then 
+if $data02 != -0.400000000 then
  return -1
 endi

@ -173,34 +173,34 @@ print $data00 $data01 $data02
 print $data10 $data11 $data12
 print $data20 $data21 $data22
 print $data30 $data31 $data32
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
  return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
  return -1
 endi
-if $data10 != 11 then 
+if $data10 != 11 then
  return -1
 endi
-if $data11 != 2.10000 then 
+if $data11 != 2.10000 then
  return -1
 endi
-if $data12 != 3.100000000 then 
+if $data12 != 3.100000000 then
  return -1
 endi
-if $data30 != -13 then 
+if $data30 != -13 then
  return -1
 endi
-if $data31 != -2.30000 then 
+if $data31 != -2.30000 then
  return -1
 endi
-if $data32 != -3.300000000 then 
+if $data32 != -3.300000000 then
  return -1
 endi
 #===================================================================
@ -208,17 +208,17 @@ endi
 #print =============== query data from stb
 sql select * from stb
 print $rows
-if $rows != 9 then 
+if $rows != 9 then
  return -1
 endi

 #print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 9 then 
+if $data00 != 9 then
  return -1
 endi

@ -234,19 +234,19 @@ print $data50 $data51 $data52  $data53
 print $data60 $data61 $data62  $data63
 print $data70 $data71 $data72  $data73
 print $data80 $data81 $data82  $data83
-if $rows != 9 then 
+if $rows != 9 then
  return -1
 endi

-# The order of data from different sub tables in the super table is random, 
+# The order of data from different sub tables in the super table is random,
 # so this detection may fail randomly
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi

@ -254,16 +254,16 @@ endi
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print rows: $rows
 print $data00 $data01 $data02  $data03
-if $data00 != 9 then 
+if $data00 != 9 then
  return -1
 endi
-if $data01 != 9 then 
+if $data01 != 9 then
  return -1
 endi
-if $data02 != 9 then 
+if $data02 != 9 then
  return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
  return -1
 endi

@ -274,7 +274,7 @@ system sh/exec.sh -n dnode1 -s start

 print =============== query data from child table
 sql select * from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 print $data10  $data11 $data12 $data13
 print $data20  $data21 $data22 $data23
@ -282,113 +282,113 @@ print $data30  $data31 $data32 $data33
 if $rows != 4 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi

 print =============== select count(*) from child table
 sql select count(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi

 print =============== select count(column) from child table
 sql select count(ts), count(c1), count(c2), count(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $data00 != 4 then 
+if $data00 != 4 then
  return -1
 endi
-if $data01 != 4 then 
+if $data01 != 4 then
  return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi

 #print =============== select first(*)/first(column) from child table
 sql select first(*) from ct1
 print ====> select first(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03

 sql select first(ts), first(c1), first(c2), first(c3) from ct1
 print ====> select first(ts), first(c1), first(c2), first(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi

 print =============== select min(column) from child table
 sql select min(c1), min(c2), min(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -13 then 
+if $data00 != -13 then
  return -1
 endi
-if $data01 != -2.30000 then 
+if $data01 != -2.30000 then
  return -1
 endi
-if $data02 != -3.300000000 then 
+if $data02 != -3.300000000 then
  return -1
 endi

 print =============== select max(column) from child table
 sql select max(c1), max(c2), max(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 11 then 
+if $data00 != 11 then
  return -1
 endi
-if $data01 != 2.10000 then 
+if $data01 != 2.10000 then
  return -1
 endi
-if $data02 != 3.100000000 then 
+if $data02 != 3.100000000 then
  return -1
 endi

 print =============== select sum(column) from child table
 sql select sum(c1), sum(c2), sum(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -4 then 
+if $data00 != -4 then
  return -1
 endi
-if $data01 != -0.400000095 then 
+if $data01 != -0.400000095 then
  return -1
 endi
-if $data02 != -0.400000000 then 
+if $data02 != -0.400000000 then
  return -1
 endi

@ -399,51 +399,51 @@ print $data00 $data01 $data02
 print $data10 $data11 $data12
 print $data20 $data21 $data22
 print $data30 $data31 $data32
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
  return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
  return -1
 endi
-if $data10 != 11 then 
+if $data10 != 11 then
  return -1
 endi
-if $data11 != 2.10000 then 
+if $data11 != 2.10000 then
  return -1
 endi
-if $data12 != 3.100000000 then 
+if $data12 != 3.100000000 then
  return -1
 endi
-if $data30 != -13 then 
+if $data30 != -13 then
  return -1
 endi
-if $data31 != -2.30000 then 
+if $data31 != -2.30000 then
  return -1
 endi
-if $data32 != -3.300000000 then 
+if $data32 != -3.300000000 then
  return -1
 endi

 #===================================================================
 print =============== query data from stb
 sql select * from stb
-if $rows != 9 then 
+if $rows != 9 then
  return -1
-endi      
+endi

 print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 9 then 
+if $data00 != 9 then
  return -1
 endi

@ -459,35 +459,35 @@ print $data50 $data51 $data52  $data53
 print $data60 $data61 $data62  $data63
 print $data70 $data71 $data72  $data73
 print $data80 $data81 $data82  $data83
-if $rows != 9 then 
+if $rows != 9 then
  return -1
 endi
-# The order of data from different sub tables in the super table is random, 
+# The order of data from different sub tables in the super table is random,
 # so this detection may fail randomly
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi

 #print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 9 then 
+if $data00 != 9 then
  return -1
 endi
-if $data01 != 9 then 
+if $data01 != 9 then
  return -1
 endi
-if $data02 != 9 then 
+if $data02 != 9 then
  return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/basic1.sim
+++ b/tests/script/tsim/insert/basic1.sim
@ -21,7 +21,7 @@ sql create table stb_2 (ts timestamp, i int) tags (j int)
 sql create stable stb_3 (ts timestamp, i int) tags (j int)

 sql show stables
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi

@ -30,7 +30,7 @@ sql create table c1 using stb tags(true, -1, -2, -3, -4, -6.0, -7.0, 'child tbl
 sql create table c2 using stb tags(false, -1, -2, -3, -4, -6.0, -7.0, 'child tbl 2', 'child tbl 2', '2022-02-25 18:00:00.000', 10, 20, 30, 40)

 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

@ -39,12 +39,12 @@ sql insert into c1 values(now+0s, true, -1, -2, -3, -4, -6.0, -7.0, 'child tbl 1

 print =============== query data
 sql select * from c1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 print $data30  $data31
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi

@ -53,17 +53,17 @@ if $data01 != 1 then
  return -1
 endi

-if $data02 != -1 then 
+if $data02 != -1 then
  return -1
 endi

-if $data03 != -2 then 
+if $data03 != -2 then
  return -1
 endi

 print =============== query data from st, but not support select * from super table, waiting fix
 sql select * from stb
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi

@ -73,12 +73,12 @@ system sh/exec.sh -n dnode1 -s start

 print =============== query data
 sql select * from c1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 print $data30  $data31
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi

@ -86,17 +86,17 @@ if $data01 != 1 then
  return -1
 endi

-if $data02 != -1 then 
+if $data02 != -1 then
  return -1
 endi

-if $data03 != -2 then 
+if $data03 != -2 then
  return -1
 endi

 print =============== query data from st, but not support select * from super table, waiting fix
 sql select * from stb
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi

--- a/tests/script/tsim/insert/basic2.sim
+++ b/tests/script/tsim/insert/basic2.sim
@ -11,7 +11,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -20,7 +20,7 @@ sql create table ct1 using stb tags("BeiJing", "ChaoYang")
 sql create table ct2 using stb tags("BeiJing", "HaiDian")

 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

@ -47,7 +47,7 @@ print $data20 $data21 $data22  $data23  $data24  $data25
 print $data30 $data31 $data32  $data33  $data34  $data35
 print $data40 $data41 $data42  $data43  $data44  $data45

-if $rows != 5 then 
+if $rows != 5 then
  print rows $rows != 5
  return -1
 endi
@ -189,7 +189,7 @@ print $data20 $data21 $data22  $data23  $data24  $data25
 print $data30 $data31 $data32  $data33  $data34  $data35
 print $data40 $data41 $data42  $data43  $data44  $data45

-if $rows != 5 then 
+if $rows != 5 then
  print rows $rows != 5
  return -1
 endi
@ -319,4 +319,4 @@ if $data45 != 30.000000000 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/commit-merge0.sim
+++ b/tests/script/tsim/insert/commit-merge0.sim
@ -63,7 +63,7 @@ reboot_and_check:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start

-print =============== insert duplicated records to memory - loop $reboot_max - $reboot_cnt 
+print =============== insert duplicated records to memory - loop $reboot_max - $reboot_cnt
 sql use db
 sql insert into ct1 values ('2022-05-01 18:30:27.001', 0.0);
 sql insert into ct4 values ('2022-04-28 18:30:27.002', 0.0);
@ -91,7 +91,7 @@ sql insert into ct4 values ('2018-05-01 18:30:27.023', NULL) ;
 sql insert into ct4 values ('2021-03-01 18:30:27.024', NULL) ;
 sql insert into ct4 values ('2022-08-01 18:30:27.025', NULL) ;

-print =============== select * from ct1 - merge memory and file - loop $reboot_max - $reboot_cnt 
+print =============== select * from ct1 - merge memory and file - loop $reboot_max - $reboot_cnt
 sql select * from ct1;
 if $rows != 13 then
  print rows = $rows != 13
@ -163,8 +163,8 @@ if $data[12][1] != -99.990000000 then
    print $data[12][1] != -99.990000000
    return -1
 endi
- 
-print =============== select * from ct4 - merge memory and file - loop $reboot_max - $reboot_cnt 
+
+print =============== select * from ct4 - merge memory and file - loop $reboot_max - $reboot_cnt
 sql select * from ct4;
 if $rows != 12 then
  print rows = $rows != 12
--- a/tests/script/tsim/insert/insert_drop.sim
+++ b/tests/script/tsim/insert/insert_drop.sim
@ -25,16 +25,16 @@ $ts = $ts0
 while $i < 10
  $tb = tb . $i
  sql create table $tb using $stb tags( $i )
- 
+
  $x = 0
  while $x < $rowNum
    $xs = $x * $delta
    $ts = $ts0 + $xs
-    sql insert into $tb values ( $ts , $x ) 
+    sql insert into $tb values ( $ts , $x )
    $x = $x + 1
-  endw 
+  endw
  $i = $i + 1
-endw 
+endw
 print ====== tables created

 print ================== restart server to commit data into disk
@ -46,18 +46,18 @@ sql use $db
 sql drop table tb5
 $i = 0
 while $i < 4
-  
+
  $tb = tb . $i
  $x = 0
  while $x < $rowNum
    $xs = $x * $delta
    $ts = $ts0 + $xs
-    sql insert into $tb values ( $ts , $x ) 
+    sql insert into $tb values ( $ts , $x )
    $x = $x + 1
-  endw 
+  endw

  $i = $i + 1
-endw 
+endw

 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@ -73,4 +73,4 @@ if $rows != 0 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/insert_select.sim
+++ b/tests/script/tsim/insert/insert_select.sim
@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect

-print ======== step1 
+print ======== step1
 sql drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
--- a/tests/script/tsim/insert/null.sim
+++ b/tests/script/tsim/insert/null.sim
@ -18,7 +18,7 @@ print =============== create super table, include column type for count/sum/min/
 sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double, c4 bigint) tags (t1 int unsigned)

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -28,7 +28,7 @@ sql create table ct2 using stb tags(2000)
 sql create table ct3 using stb tags(3000)

 sql show tables
-if $rows != 3 then 
+if $rows != 3 then
  return -1
 endi

@ -55,22 +55,22 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 12 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi
-#if $data41 != -14 then 
+#if $data41 != -14 then
 #  return -1
 #endi
-#if $data42 != -2.40000 then 
+#if $data42 != -2.40000 then
 #  return -1
 #endi
-#if $data43 != -3.400000000 then 
+#if $data43 != -3.400000000 then
 #  return -1
 #endi

@ -79,10 +79,10 @@ sql select count(*) from ct1
 print ===> select count(*) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi

@ -91,16 +91,16 @@ sql select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
  return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
  return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
  return -1
 endi

@ -113,16 +113,16 @@ sql select min(c1), min(c2), min(c3) from ct1
 print ===> select min(c1), min(c2), min(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -2147483647 then 
+if $data00 != -2147483647 then
  return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
  return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
  return -1
 endi

@ -131,16 +131,16 @@ sql select max(c1), max(c2), max(c3) from ct1
 print ===> select max(c1), max(c2), max(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 16 then 
+if $data00 != 16 then
  return -1
 endi
-if $data01 != 2.70000 then 
+if $data01 != 2.70000 then
  return -1
 endi
-if $data02 != 3.700000000 then 
+if $data02 != 3.700000000 then
  return -1
 endi

@ -149,16 +149,16 @@ sql select sum(c1), sum(c2), sum(c3) from ct1
 print ===> select sum(c1), sum(c2), sum(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -2147483556  then 
+if $data00 != -2147483556  then
  return -1
 endi
-if $data01 != 18.799999952 then 
+if $data01 != 18.799999952 then
  return -1
 endi
-if $data02 != 26.800000000 then 
+if $data02 != 26.800000000 then
  return -1
 endi

@ -167,43 +167,43 @@ sql select c1, c2, c3 from ct1
 print ===> select c1, c2, c3 from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
  return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
  return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
  return -1
 endi
-if $data10 != NULL then 
+if $data10 != NULL then
  return -1
 endi
-if $data11 != NULL then 
+if $data11 != NULL then
  return -1
 endi
-if $data12 != NULL then 
+if $data12 != NULL then
  return -1
 endi
-if $data30 != 11 then 
+if $data30 != 11 then
  return -1
 endi
-if $data31 != NULL then 
+if $data31 != NULL then
  return -1
 endi
-if $data32 != 3.200000000 then 
+if $data32 != 3.200000000 then
  return -1
 endi
-if $data90 != 16 then 
+if $data90 != 16 then
  return -1
 endi
-if $data91 != 2.60000 then 
+if $data91 != 2.60000 then
  return -1
 endi
-if $data92 != 3.600000000 then 
+if $data92 != 3.600000000 then
  return -1
 endi
 #===================================================================
@ -211,36 +211,36 @@ endi

 #print =============== query data from stb
 sql select * from stb
-print ===> 
+print ===>
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
  return -1
 endi

 #print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi

 #print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
  return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
  return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
  return -1
 endi

@ -264,22 +264,22 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 12 then
  return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
  return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
  return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
  return -1
 endi
-if $data41 != 12 then 
+if $data41 != 12 then
  return -1
 endi
-if $data42 != 2.20000 then 
+if $data42 != 2.20000 then
  return -1
 endi
-if $data43 != NULL then 
+if $data43 != NULL then
  return -1
 endi

@ -288,10 +288,10 @@ sql select count(*) from ct1
 print ===> select count(*) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi

@ -300,16 +300,16 @@ sql select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
  return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
  return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
  return -1
 endi

@ -322,16 +322,16 @@ sql select min(c1), min(c2), min(c3) from ct1
 print ===> select min(c1), min(c2), min(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -2147483647 then 
+if $data00 != -2147483647 then
  return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
  return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
  return -1
 endi

@ -340,16 +340,16 @@ sql select max(c1), max(c2), max(c3) from ct1
 print ===> select max(c1), max(c2), max(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 16 then 
+if $data00 != 16 then
  return -1
 endi
-if $data01 != 2.70000 then 
+if $data01 != 2.70000 then
  return -1
 endi
-if $data02 != 3.700000000 then 
+if $data02 != 3.700000000 then
  return -1
 endi

@ -358,16 +358,16 @@ sql select sum(c1), sum(c2), sum(c3) from ct1
 print ===> select sum(c1), sum(c2), sum(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != -2147483556  then 
+if $data00 != -2147483556  then
  return -1
 endi
-if $data01 != 18.799999952 then 
+if $data01 != 18.799999952 then
  return -1
 endi
-if $data02 != 26.800000000 then 
+if $data02 != 26.800000000 then
  return -1
 endi

@ -376,78 +376,78 @@ sql select c1, c2, c3 from ct1
 print ===> select c1, c2, c3 from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
  return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
  return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
  return -1
 endi
-if $data10 != NULL then 
+if $data10 != NULL then
  return -1
 endi
-if $data11 != NULL then 
+if $data11 != NULL then
  return -1
 endi
-if $data12 != NULL then 
+if $data12 != NULL then
  return -1
 endi
-if $data30 != 11 then 
+if $data30 != 11 then
  return -1
 endi
-if $data31 != NULL then 
+if $data31 != NULL then
  return -1
 endi
-if $data32 != 3.200000000 then 
+if $data32 != 3.200000000 then
  return -1
 endi
-if $data90 != 16 then 
+if $data90 != 16 then
  return -1
 endi
-if $data91 != 2.60000 then 
+if $data91 != 2.60000 then
  return -1
 endi
-if $data92 != 3.600000000 then 
+if $data92 != 3.600000000 then
  return -1
 endi
 #===================================================================

 print =============== query data from stb
 sql select * from stb
-print ===> 
+print ===>
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
  return -1
 endi
 print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi

 print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 12 then 
+if $data00 != 12 then
  return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
  return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
  return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
  return -1
 endi

--- a/tests/script/tsim/insert/query_block1_file.sim
+++ b/tests/script/tsim/insert/query_block1_file.sim
@ -16,36 +16,36 @@ sql create database $db
 sql use $db
 sql create table $tb (ts timestamp, speed int)

-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows

-$N = 82 
+$N = 82

 print =============== step 1
 $x = $N
 $y = $N / 2
 while $x > $y
  $ms = $x . m
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , -$x ) 
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , -$x )
  $x = $x - 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $y then 
+print sql select * from $tb -> $rows points
+if $rows != $y then
  return -1
 endi

 $x = $N / 2
 $y = $N
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $N then 
+print sql select * from $tb -> $rows points
+if $rows != $N then
  return -1
 endi

@ -53,18 +53,18 @@ print =============== step 2

 $R = 4
 $x = $N * 2
-$y = $N * $R 
+$y = $N * $R
 $expect = $y + $N
 $y = $y + $x
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi

@ -100,7 +100,7 @@ endi

 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

@ -115,23 +115,23 @@ if $rows != 0 then
 endi

 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end3 
+sql select * from $tb where ts < $start3 and ts > $end3
 if $rows != 0 then
  return -1
 endi

-print ================= order by ts desc  
+print ================= order by ts desc

 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@ -148,9 +148,9 @@ if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

@ -164,15 +164,15 @@ if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
  return -1
 endi

@ -185,8 +185,8 @@ clear:

 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/query_block1_memory.sim
+++ b/tests/script/tsim/insert/query_block1_memory.sim
@ -17,9 +17,9 @@ sql use $db

 sql create table $tb (ts timestamp, speed int)

-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows

-$N = 82 
+$N = 82

 print =============== step 1
 $x = $N
@ -28,14 +28,14 @@ while $x > $y
  $z = $x * 60000
  $ms = 1601481600000 - $z

-  $xt = - . $x 
-  sql insert into $tb values ($ms , -$x ) 
+  $xt = - . $x
+  sql insert into $tb values ($ms , -$x )
  $x = $x - 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $y then 
+print sql select * from $tb -> $rows points
+if $rows != $y then
  return -1
 endi

@ -45,12 +45,12 @@ while $x < $y
  $z = $x * 60000
  $ms = 1601481600000 + $z

-  sql insert into $tb values ($ms , $x ) 
+  sql insert into $tb values ($ms , $x )
  $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $N then 
+print sql select * from $tb -> $rows points
+if $rows != $N then
  return -1
 endi

@ -69,100 +69,100 @@ $end2 = 1601481600000
 $end3 = 1601481600000 +  $step

 sql select * from $tb where ts < $start1 and ts > $end1
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

-print ================= order by ts desc  
+print ================= order by ts desc

 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -170,8 +170,8 @@ clear:

 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/query_block2_file.sim
+++ b/tests/script/tsim/insert/query_block2_file.sim
@ -16,23 +16,23 @@ sql create database $db
 sql use $db
 sql create table $tb (ts timestamp, speed int)

-#commit to file will trigger if insert 82 rows 
-$N = 82 
+#commit to file will trigger if insert 82 rows
+$N = 82

 print =============== step 1
 $x = $N * 2
 $y = $N
 $expect = $N
 while $x > $y
-  $ms = $x . m 
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , $xt ) 
+  $ms = $x . m
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , $xt )
  $x = $x - 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi

@ -40,20 +40,20 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi

 print =============== step 2

 $R = 4
-$y = $N * $R 
+$y = $N * $R

 $expect = $y + $N
 $expect = $expect + $N
@ -62,17 +62,17 @@ $x = $N * 3
 $y = $y + $x

 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi
- 
+

 print =============== step 2

@ -106,7 +106,7 @@ endi

 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

@ -121,14 +121,14 @@ if $rows != 0 then
 endi

 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
  return -1
 endi

@ -137,7 +137,7 @@ if $rows != 0 then
  return -1
 endi

-print ================= order by ts desc  
+print ================= order by ts desc

 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@ -154,9 +154,9 @@ if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

@ -170,15 +170,15 @@ if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
  return -1
 endi

@ -191,8 +191,8 @@ clear:

 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/query_block2_memory.sim
+++ b/tests/script/tsim/insert/query_block2_memory.sim
@ -14,22 +14,22 @@ sql drop database -x step1
 step1:
 sql create database $db
 sql use $db
-sql create table $tb (ts timestamp, speed int) 
+sql create table $tb (ts timestamp, speed int)

-$N = 82 
+$N = 82

 $x = $N * 2
 $y = $N
 while $x > $y
-  $ms = $x . m 
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , $xt ) 
+  $ms = $x . m
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , $xt )
  $x = $x - 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $y then 
+print sql select * from $tb -> $rows points
+if $rows != $y then
  return -1
 endi

@ -37,13 +37,13 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi

@ -63,107 +63,107 @@ $end2 = now
 $end3 = now+ . $step

 sql select * from $tb where ts < $start1 and ts > $end1
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end1
 print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
-if $rows != $result2 then 
+if $rows != $result2 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

-print ================= order by ts desc  
+print ================= order by ts desc

 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/query_file_memory.sim
+++ b/tests/script/tsim/insert/query_file_memory.sim
@ -17,23 +17,23 @@ sql use $db

 sql create table $tb (ts timestamp, speed int)

-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows

-$N = 82 
+$N = 82

 $x = $N * 2
 $y = $N
 $expect = $y
 while $x > $y
-  $ms = $x . m 
-  $xt = - . $x 
-  sql insert into $tb values (now - $ms , $xt ) 
+  $ms = $x . m
+  $xt = - . $x
+  sql insert into $tb values (now - $ms , $xt )
  $x = $x - 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi

@ -41,37 +41,37 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi

 $R = 4
 $R = $R - 1

-$y = $N * $R 
+$y = $N * $R
 $expect = $y + $N
 $expect = $expect + $N

 $x = $N * 3
 $y = $y + $x
 while $x < $y
-  $ms = $x . m 
-  sql insert into $tb values (now + $ms , $x ) 
+  $ms = $x . m
+  sql insert into $tb values (now + $ms , $x )
  $x = $x + 1
-endw 
+endw

 sql select * from $tb
-print sql select * from $tb -> $rows points 
-if $rows != $expect then 
+print sql select * from $tb -> $rows points
+if $rows != $expect then
  return -1
 endi
- 
+

 print =============== step 2

@ -105,7 +105,7 @@ endi

 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

@ -120,14 +120,14 @@ if $rows != 0 then
 endi

 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
-if $rows != $result2 then 
+print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
+if $rows != $result2 then
  return -1
 endi

 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
-if $rows != $result1 then 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
+if $rows != $result1 then
  return -1
 endi

@ -136,7 +136,7 @@ if $rows != 0 then
  return -1
 endi

-print ================= order by ts desc  
+print ================= order by ts desc

 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@ -153,9 +153,9 @@ if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
  return -1
 endi

@ -169,15 +169,15 @@ if $rows != 0 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points 
-if $rows != $result2 then 
+sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
+if $rows != $result2 then
  return -1
 endi

-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
-print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points 
-if $rows != $result1 then 
+sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
+if $rows != $result1 then
  return -1
 endi

@ -190,8 +190,8 @@ clear:

 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/query_multi_file.sim
+++ b/tests/script/tsim/insert/query_multi_file.sim
@ -15,18 +15,18 @@ step1:
 sql create database $db
 sql use $db

-sql create table $tb (ts timestamp, speed int) 
+sql create table $tb (ts timestamp, speed int)

 $N = 20000

 $x = 0

 while $x < $N
-  $ms = $x . s 
+  $ms = $x . s
  #print insert into $tb values (now + $ms , $x )
  sql insert into $tb values (now + $ms , $x ) -x error_insert
  $x = $x + 1
-endw 
+endw
 error_insert:

 sql select * from $tb
@ -37,8 +37,8 @@ endi

 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/tcp.sim
+++ b/tests/script/tsim/insert/tcp.sim
@ -21,8 +21,8 @@ while $x < 10000
  $ms = $x . s
  sql insert into tb values (now + $ms , '1' )
  $x = $x + 1
-endw 
+endw

 sql select * from tb

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/update0.sim
+++ b/tests/script/tsim/insert/update0.sim
@ -11,7 +11,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int) tags (city binary(20),district binary(20));

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -20,7 +20,7 @@ sql create table ct1 using stb tags("BeiJing", "ChaoYang")
 sql create table ct2 using stb tags("BeiJing", "HaiDian")

 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

@ -43,7 +43,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51

-if $rows != 6 then 
+if $rows != 6 then
  print rows $rows != 6
  return -1
 endi
@ -74,7 +74,7 @@ print $data00 $data01
 print $data10 $data11
 print $data20 $data21

-if $rows != 3 then 
+if $rows != 3 then
  print rows $rows != 3
  return -1
 endi
@ -107,7 +107,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51

-if $rows != 6 then 
+if $rows != 6 then
  print rows $rows != 6
  return -1
 endi
@ -133,7 +133,7 @@ print $data00 $data01
 print $data10 $data11
 print $data20 $data21

-if $rows != 3 then 
+if $rows != 3 then
  print rows $rows != 3
  return -1
 endi
@ -166,7 +166,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51

-if $rows != 6 then 
+if $rows != 6 then
  print rows $rows != 6
  return -1
 endi
@ -198,7 +198,7 @@ print $data20 $data21
 print $data30 $data31
 print $data40 $data41

-if $rows != 5 then 
+if $rows != 5 then
  print rows $rows != 5
  return -1
 endi
@ -228,4 +228,4 @@ if $data41 != NULL then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/insert/update1_sort_merge.sim
+++ b/tests/script/tsim/insert/update1_sort_merge.sim
@ -13,7 +13,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));

 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

@ -24,7 +24,7 @@ sql create table ct3 using stb tags("BeiJing", "PingGu")
 sql create table ct4 using stb tags("BeiJing", "YanQing")

 sql show tables
-if $rows != 4 then 
+if $rows != 4 then
  print rows $rows != 4
  return -1
 endi
@ -69,7 +69,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55

-if $rows != 6 then 
+if $rows != 6 then
  print rows $rows != 6
  return -1
 endi
@ -154,7 +154,7 @@ print =============== step 6 query records of ct2 from memory(taosc and taosd me
 sql select * from ct2;
 print $data00 $data01 $data02 $data03 $data04 $data05

-if $rows != 1 then 
+if $rows != 1 then
  print rows $rows != 1
  return -1
 endi
@ -196,12 +196,12 @@ print $data60 $data61 $data62 $data63 $data64 $data65
 print $data70 $data71 $data72 $data73 $data74 $data75
 print $data80 $data81 $data82 $data83 $data84 $data85
 print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
+print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5]
+print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5]
+print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5]
+print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5]

-if $rows != 14 then 
+if $rows != 14 then
  print rows $rows != 14
  return -1
 endi
@ -356,7 +356,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45


-if $rows != 5 then 
+if $rows != 5 then
  print rows $rows != 5
  return -1
 endi
@ -451,7 +451,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55

-if $rows != 6 then 
+if $rows != 6 then
  print rows $rows != 6
  return -1
 endi
@ -536,7 +536,7 @@ print =============== step 10 query records of ct2 from file
 sql select * from ct2;
 print $data00 $data01 $data02 $data03 $data04 $data05

-if $rows != 1 then 
+if $rows != 1 then
  print rows $rows != 1
  return -1
 endi
@ -578,12 +578,12 @@ print $data60 $data61 $data62 $data63 $data64 $data65
 print $data70 $data71 $data72 $data73 $data74 $data75
 print $data80 $data81 $data82 $data83 $data84 $data85
 print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
+print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5]
+print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5]
+print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5]
+print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5]

-if $rows != 14 then 
+if $rows != 14 then
  print rows $rows != 14
  return -1
 endi
@ -738,7 +738,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45


-if $rows != 5 then 
+if $rows != 5 then
  print rows $rows != 5
  return -1
 endi
@ -818,4 +818,4 @@ if $data44 != n8 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/scalar/in.sim
+++ b/tests/script/tsim/scalar/in.sim
@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect

-print ======== step1 
+print ======== step1
 sql drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
@ -11,24 +11,24 @@ sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint
 sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
- 
+
 sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
 sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
+sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
-sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); 
+sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');

 sql select * from tb1 where fts in ('2022-07-10 16:31:01', '2022-07-10 16:31:03', 1657441865000);
 if $rows != 3 then
--- a/tests/script/tsim/scalar/scalar.sim
+++ b/tests/script/tsim/scalar/scalar.sim
@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect

-print ======== step1 
+print ======== step1
 sql drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
@ -11,24 +11,24 @@ sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint
 sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
- 
+
 sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
 sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
+sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
-sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); 
+sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');

 sql select 1+1n;
 if $rows != 1 then
--- a/tests/script/tsim/tag/3.sim
+++ b/tests/script/tsim/tag/3.sim
@ -24,496 +24,496 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgc
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0, 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1, 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 = true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 = false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step15
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step16
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step17
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step18
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step19
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/4.sim
+++ b/tests/script/tsim/tag/4.sim
@ -24,686 +24,686 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigi
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step6
 sql select * from $mt where tgcol4 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol4 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol4 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol4 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step13
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step14
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step15
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step16
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step17
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step18
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step19
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step20
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step21
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step22
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step23
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step24
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d) 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 partition by tgcol4 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/5.sim
+++ b/tests/script/tsim/tag/5.sim
--- a/tests/script/tsim/tag/6.sim
+++ b/tests/script/tsim/tag/6.sim
--- a/tests/script/tsim/tag/add.sim
+++ b/tests/script/tsim/tag/add.sim
@ -25,39 +25,39 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 int
 sql reset query cache
-sql alter table $tb set tag tgcol4 =4 
+sql alter table $tb set tag tgcol4 =4
 sql reset query cache

 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi

@ -71,61 +71,61 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 tinyint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache

 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi

 sql select * from $mt where tgcol2 = 1 -x step3
  return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 2.00000 then
@ -134,34 +134,34 @@ endi

 sql describe $tb
 print sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
  return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
  return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
  return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 float
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache

 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 4.00000 then
@ -171,184 +171,184 @@ endi
 sql select * from $mt where tgcol2 = 1 -x step4
  return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 smallint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache

 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi

 sql select * from $mt where tgcol3 = '1' -x step5
  return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(10)
 sql alter table $mt add tag tgcol6 binary(10)

 sql reset query cache
-sql alter table $tb set tag tgcol4=false 
-sql alter table $tb set tag tgcol5='5' 
-sql alter table $tb set tag tgcol6='6' 
+sql alter table $tb set tag tgcol4=false
+sql alter table $tb set tag tgcol5='5'
+sql alter table $tb set tag tgcol6='6'
 sql reset query cache

 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 0 then
  return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
  return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
  return -1
 endi

 sql select * from $mt where tgcol6 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 0 then
  return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
  return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
  return -1
 endi

 sql select * from $mt where tgcol4 = 1
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where tgcol3 = 1 -x step52
  return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bigint
 sql alter table $mt add tag tgcol6 tinyint

 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
-sql alter table $tb set tag tgcol5=5 
-sql alter table $tb set tag tgcol6=6 
+sql alter table $tb set tag tgcol4=4
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
 sql reset query cache

 sql select * from $mt where tgcol6 = 6
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
  return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
  return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
  return -1
 endi

@ -358,55 +358,55 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
  return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 2.00000 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(17)
 sql alter table $mt add tag tgcol6 bool
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
-sql alter table $tb set tag tgcol5='5' 
+sql alter table $tb set tag tgcol4=4
+sql alter table $tb set tag tgcol5='5'
 sql alter table $tb set tag tgcol6='1'
 sql reset query cache

 sql select * from $mt where tgcol5 = '5'
 print select * from $mt where tgcol5 = 5
 print $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
  return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
  return -1
 endi
 if $data04 != 0 then
@ -426,45 +426,45 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bool
 sql alter table $mt add tag tgcol6 float

 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql alter table $tb set tag tgcol5=1
 sql alter table $tb set tag tgcol6=6
 sql reset query cache

 sql select * from $mt where tgcol5 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 4.000000000 then 
+if $data02 != 4.000000000 then
  return -1
 endi
 if $data03 != 1 then
@ -487,24 +487,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
  return -1
 endi

@ -512,7 +512,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step103
  return -1
 step103:

-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql reset query cache
@ -520,28 +520,28 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bool

 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=false
 sql reset query cache

 sql select * from $mt where tgcol4 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi
 if $data04 != 0 then
  return -1
 endi
-if $data05 != null then 
+if $data05 != null then
  return -1
 endi

@ -558,27 +558,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
 if $data05 != 4.00000 then
  return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
  return -1
 endi

@ -586,7 +586,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step114
  return -1
 step114:

-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@ -598,7 +598,7 @@ sql alter table $mt add tag tgcol7 bigint
 sql alter table $mt add tag tgcol8 smallint

 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=5
 sql alter table $tb set tag tgcol6='6'
 sql alter table $tb set tag tgcol7=7
@ -607,28 +607,28 @@ sql reset query cache

 sql select * from $mt where tgcol5 =5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
  return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
  return -1
 endi
-if $data05 != 6 then 
+if $data05 != 6 then
  return -1
 endi
-if $data06 != 7 then 
+if $data06 != 7 then
  return -1
 endi
-if $data07 != 8 then 
+if $data07 != 8 then
  return -1
 endi

@ -648,34 +648,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
 if $data04 != 3.00000 then
  return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
  return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
  return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
  return -1
 endi

-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@ -686,8 +686,8 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bigint

 sql reset query cache
-sql alter table $tb set tag tgcol1=false 
-sql alter table $tb set tag tgcol2='5' 
+sql alter table $tb set tag tgcol1=false
+sql alter table $tb set tag tgcol2='5'
 sql alter table $tb set tag tgcol3=4
 sql alter table $tb set tag tgcol4='3'
 sql alter table $tb set tag tgcol5=2
@ -696,28 +696,28 @@ sql reset query cache

 sql select * from $mt where tgcol4 = '3'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 0 then
  return -1
 endi
-if $data03 != 1 then 
+if $data03 != 1 then
  return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
  return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
  return -1
 endi
-if $data06 != 3 then 
+if $data06 != 3 then
  return -1
 endi
-if $data07 != 2 then 
+if $data07 != 2 then
  return -1
 endi

@ -747,34 +747,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
  return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
  return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
  return -1
 endi

-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol6
 sql reset query cache
@ -783,8 +783,8 @@ sql alter table $mt add tag tgcol4 int
 sql alter table $mt add tag tgcol6 bigint

 sql reset query cache
-sql alter table $tb set tag tgcol1='7' 
-sql alter table $tb set tag tgcol2='8' 
+sql alter table $tb set tag tgcol1='7'
+sql alter table $tb set tag tgcol2='8'
 sql alter table $tb set tag tgcol3=9
 sql alter table $tb set tag tgcol4=10
 sql alter table $tb set tag tgcol5=11
@ -793,28 +793,28 @@ sql reset query cache

 sql select * from $mt where tgcol2 = '8'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
  return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
  return -1
 endi
-if $data04 != 11.000000000 then 
+if $data04 != 11.000000000 then
  return -1
 endi
-if $data05 != 8 then 
+if $data05 != 8 then
  return -1
 endi
-if $data06 != 10 then 
+if $data06 != 10 then
  return -1
 endi
-if $data07 != 12 then 
+if $data07 != 12 then
  return -1
 endi

@ -824,7 +824,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)

 sql alter table $mt add tag tgcol3 binary(10)
 sql alter table $mt add tag tgcol4 int
@ -834,13 +834,13 @@ sql alter table $mt add tag tgcol6 bigint
 sql reset query cache
 sql alter table $mt drop tag tgcol6
 sql alter table $mt add tag tgcol7 bigint
-sql alter table $mt add tag tgcol8 bigint 
+sql alter table $mt add tag tgcol8 bigint

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/bigint.sim
+++ b/tests/script/tsim/tag/bigint.sim
@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
  return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@ -83,155 +83,155 @@ if $rows != 0 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/binary.sim
+++ b/tests/script/tsim/tag/binary.sim
@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0' )  
+  sql create table $tb using $mt tags( '0' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1' )  
+  sql create table $tb using $mt tags( '1' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
  return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@ -83,155 +83,155 @@ if $rows != 0 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/binary_binary.sim
+++ b/tests/script/tsim/tag/binary_binary.sim
@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 bina
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0', '0' )  
+  sql create table $tb using $mt tags( '0', '0' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1', '1' )  
+  sql create table $tb using $mt tags( '1', '1' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step3
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi


 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/bool.sim
+++ b/tests/script/tsim/tag/bool.sim
@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
  return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@ -79,40 +79,40 @@ if $rows != 0 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
@ -121,115 +121,115 @@ if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
 print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/bool_binary.sim
+++ b/tests/script/tsim/tag/bool_binary.sim
@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, '0' )  
+  sql create table $tb using $mt tags( 0, '0' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, '1' )  
+  sql create table $tb using $mt tags( 1, '1' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi


 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/bool_int.sim
+++ b/tests/script/tsim/tag/bool_int.sim
@ -24,299 +24,299 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> true
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> false
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi


 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/change.sim
+++ b/tests/script/tsim/tag/change.sim
@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

@ -62,18 +62,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

@ -86,15 +86,15 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 2.00000 then
@ -103,61 +103,61 @@ endi

 sql alter table $mt rename tag tgcol1 tgcol3
 sql alter table $mt rename tag tgcol2 tgcol4
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql alter table $mt rename tag tgcol1 tgcol3
 sql alter table $mt rename tag tgcol2 tgcol4
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
  return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
  return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
  return -1
 endi

@ -187,31 +187,31 @@ step25:

 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

@ -229,34 +229,34 @@ step32:

 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@ -271,13 +271,13 @@ step42:

 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 2.00000 then
@ -298,7 +298,7 @@ endi
 if $data03 != 2.00000 then
  return -1
 endi
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@ -313,34 +313,34 @@ step52:

 sql select * from $mt where tgcol3 < 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql select * from $mt where tgcol4 = '2'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@ -367,144 +367,144 @@ step66:

 sql select * from $mt where tgcol7 = '1'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
  return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
  return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

 sql select * from $mt where tgcol8 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
  return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
  return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

 sql select * from $mt where tgcol9 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
  return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
  return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

 sql select * from $mt where tgcol10 = 5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
  return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
  return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

 sql select * from $mt where tgcol11 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
  return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
  return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/column.sim
+++ b/tests/script/tsim/tag/column.sim
@ -31,7 +31,7 @@ sql create table $tb using $mt tags(  0,  '0' )

 $i = 1
 $tb = $tbPrefix . $i
-sql create table $tb using $mt tags(  1,   '1'  )  
+sql create table $tb using $mt tags(  1,   '1'  )

 $i = 2
 $tb = $tbPrefix . $i
@ -66,26 +66,26 @@ sql insert into $tb values(now, '3',  '3')

 print =============== step4
 sql select * from $mt where tgcol2 = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step5
 sql select * from $mt
-if $rows != 4 then 
+if $rows != 4 then
  return -1
 endi

 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/commit.sim
+++ b/tests/script/tsim/tag/commit.sim
--- a/tests/script/tsim/tag/create.sim
+++ b/tests/script/tsim/tag/create.sim
@ -25,107 +25,107 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step3
 $i = 3
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
@ -133,62 +133,62 @@ if $rows != 0 then
  print expect 0, actual: $rows
  return -1
 endi
-  
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step9
 $i = 9
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 sql create table $tb using $mt tags( '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
-  
+
 print =============== step10
 $i = 10
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 1
 if $rows != 1 then
  print expect 1, actual: $rows
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -198,16 +198,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -217,16 +217,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -236,16 +236,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -255,17 +255,17 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi

 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 print =============== step15
@ -274,16 +274,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -293,16 +293,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -312,16 +312,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = true
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -331,16 +331,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -350,16 +350,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -369,16 +369,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -388,16 +388,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -407,16 +407,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -426,16 +426,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -445,51 +445,51 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol3 = 3
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol4 = 4
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol5 = 5
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol6 = '6'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol6 = '0'
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -499,16 +499,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol6 = '6'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol6 = '0'
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -518,16 +518,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4', '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 sql select * from $mt where tgcol3 = '0'
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi

@ -545,12 +545,12 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))
 sql create table $tb using $mt tags('1', '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi

@ -560,12 +560,12 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))
 sql create table $tb using $mt tags('1', '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi

@ -575,7 +575,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
 #  return -1
-step30: 
+step30:

 print =============== step31
 $i = 31
@ -584,16 +584,16 @@ $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5))
 sql_error create table $tb using $mt tags('1234567')
 sql create table $tb using $mt tags('12345')
-sql insert into $tb values(now, 1) 
-sql select * from $mt 
+sql insert into $tb values(now, 1)
+sql select * from $mt
 print sql select * from $mt
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print $data00 $data01 $data02
-if $data02 != 12345 then 
+if $data02 != 12345 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/delete.sim
+++ b/tests/script/tsim/tag/delete.sim
@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

@ -48,38 +48,38 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 < 3
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 2.00000 then
@ -87,13 +87,13 @@ if $data03 != 2.00000 then
 endi

 sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
  return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
  return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
  return -1
 endi

@ -101,25 +101,25 @@ sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol1 -x step40
  return -1
 step40:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi

@ -127,111 +127,111 @@ sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol1 -x step50
  return -1
 step50:
- 
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

 sql describe $tb
-if $data21 != SMALLINT then 
+if $data21 != SMALLINT then
  return -1
 endi
-if $data31 != TINYINT then 
+if $data31 != TINYINT then
  return -1
 endi
-if $data41 != VARCHAR then 
+if $data41 != VARCHAR then
  return -1
 endi
-if $data22 != 2 then 
+if $data22 != 2 then
  return -1
 endi
-if $data32 != 1 then 
+if $data32 != 1 then
  return -1
 endi
-if $data42 != 10 then 
+if $data42 != 10 then
  return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
  return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
  return -1
 endi
-if $data43 != TAG then 
+if $data43 != TAG then
  return -1
 endi

 sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
 if $data03 != 2.00000 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

@ -244,21 +244,21 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi

@ -271,24 +271,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
  return -1
 endi

@ -302,27 +302,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
 if $data05 != 4.00000 then
  return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
  return -1
 endi

@ -336,30 +336,30 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
 if $data04 != 3.00000 then
  return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
  return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
  return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
  return -1
 endi

@ -374,30 +374,30 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
  return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
  return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
  return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
  return -1
 endi

@ -412,16 +412,16 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi

@ -436,23 +436,23 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi

 sql select * from $mt where tgcol2 = 1 -x step3
  return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@ -460,23 +460,23 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi

 sql select * from $mt where tgcol2 = 1 -x step4
  return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@ -484,23 +484,23 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi

 sql select * from $mt where tgcol2 = '1' -x step5
  return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@ -508,19 +508,19 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi

@ -530,7 +530,7 @@ step51:
 sql select * from $mt where tgcol3 = 1 -x step52
  return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
@ -538,19 +538,19 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi

@ -560,7 +560,7 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
  return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
@ -568,19 +568,19 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi

@ -598,19 +598,19 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi

@ -628,22 +628,22 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol1 = '1'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != null then 
+if $data03 != null then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi
-if $data05 != null then 
+if $data05 != null then
  return -1
 endi

@ -664,10 +664,10 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol4=4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
@ -676,13 +676,13 @@ endi
 if $data03 != 4.00000 then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi
-if $data05 != null then 
+if $data05 != null then
  return -1
 endi
-if $data06 != null then 
+if $data06 != null then
  return -1
 endi

@ -703,28 +703,28 @@ $tb = $tbPrefix . $i

 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
 if $data02 != 1 then
  return -1
 endi
-if $data03 != 4.000000000 then 
+if $data03 != 4.000000000 then
  return -1
 endi
-if $data04 != null then 
+if $data04 != null then
  return -1
 endi
-if $data05 != null then 
+if $data05 != null then
  return -1
 endi
-if $data06 != null then 
+if $data06 != null then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

@ -749,28 +749,28 @@ $tb = $tbPrefix . $i
 sql reset query cache
 sql select * from $mt where tgcol2 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
  return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
  return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
  return -1
 endi
-if $data04 != 5.000000000 then 
+if $data04 != 5.000000000 then
  return -1
 endi
-if $data05 != null then 
+if $data05 != null then
  return -1
 endi
-if $data06 != null then 
+if $data06 != null then
  return -1
 endi
-if $data07 != null then 
+if $data07 != null then
  return -1
 endi

@ -790,7 +790,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)

 sql alter table xxmt drop tag tag1 -x step141
  return -1
@ -814,8 +814,8 @@ step145:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/double.sim
+++ b/tests/script/tsim/tag/double.sim
@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
  return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@ -83,156 +83,156 @@ if $rows != 0 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi


 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/filter.sim
+++ b/tests/script/tsim/tag/filter.sim
@ -24,31 +24,31 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0' )  
+  sql create table $tb using $mt tags( '0' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1' )  
+  sql create table $tb using $mt tags( '1' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

@ -62,18 +62,18 @@ sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(t
 step3:

 print =============== step4
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'  
-if $rows != 1 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+if $rows != 1 then
  return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
  return -1
 endi

 print =============== step5
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

@ -96,9 +96,9 @@ sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(t
 step9:

 print =============== step10
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol 
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

@ -112,14 +112,14 @@ step12:

 print =============== step13
 sql select count(tbcol) as c from $mt group by tgcol
-print $data00 
-if $data00 != 100 then 
+print $data00
+if $data00 != 100 then
  return -1
 endi

 print =============== step14
 sql select count(tbcol) as c from $mt where ts > 1000 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
 if $data00 != 100 then
  print expect 100, actual $data00
  return -1
@ -132,16 +132,16 @@ step15:

 print =============== step16
 sql select count(tbcol) as c from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/float.sim
+++ b/tests/script/tsim/tag/float.sim
@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
  return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@ -83,156 +83,156 @@ if $rows != 0 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi


 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/int.sim
+++ b/tests/script/tsim/tag/int.sim
@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
  return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@ -78,160 +78,160 @@ sql select * from $tb where ts > 100000 and ts < 100000
 if $rows != 0 then
  return -1
 endi
-sql select * from $tb where ts > now + 4m and ts < now + 3m 
+sql select * from $tb where ts > now + 4m and ts < now + 3m
 if $rows != 0 then
  return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi

 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/tests/script/tsim/tag/int_binary.sim
+++ b/tests/script/tsim/tag/int_binary.sim
@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))
 $i = 0
 while $i < 5
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, '0' )  
+  sql create table $tb using $mt tags( 0, '0' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw
 while $i < 10
  $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, '1' )  
+  sql create table $tb using $mt tags( 1, '1' )
  $x = 0
  while $x < $rowNum
-    $ms = $x . m 
-    sql insert into $tb values (now + $ms , $x ) 
+    $ms = $x . m
+    sql insert into $tb values (now + $ms , $x )
    $x = $x + 1
-  endw  
+  endw
  $i = $i + 1
-endw 
+endw

 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
  return -1
 endi

 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
  return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
  return -1
 endi

 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
  return -1
 endi

 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
  return -1
 endi

 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 200 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 200 then
  return -1
 endi

 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 50 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 50 then
  return -1
 endi

 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi


 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 25 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 25 then
  return -1
 endi

 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
+if $data00 != 100 then
  return -1
 endi

 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
--- a/Show More
+++ b/Show More