Merge branch '3.0' of github.com:taosdata/TDengine into szhou/fixbugs

690f0224 · slzhou · e61156d3 · 13979382 · 690f0224 · 690f0224
82 changed file
--- 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/12-taos-sql/13-tmq.md
+++ b/docs/zh/12-taos-sql/13-tmq.md
 ---
-sidebar_label: 消息队列
+sidebar_label: 数据订阅
-title: 消息队列
+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
@@ -20,8 +20,10 @@ RESTful 接口不依赖于任何 TDengine 的库，因此客户端不需要安
 下面示例是列出所有的数据库，请把 h1.taosdata.com 和 6041（缺省值）替换为实际运行的 TDengine 服务 FQDN 和端口号：
-```html
+```bash
-curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases;" h1.taosdata.com:6041/rest/sql
+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,
+            16,
-            null,
+            "ready"
-            14,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            "ready",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
        ],
        [
            "performance_schema",
-            null,
+            9,
-            null,
+            "ready"
-            3,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            "ready",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
        ]
    ],
    "rows": 2
@@ -231,21 +72,21 @@ http://<fqdn>:<port>/rest/sql/[db_name]
 参数说明：
- fqnd: 集群中的任一台主机 FQDN 或 IP 地址
+- fqnd: 集群中的任一台主机 FQDN 或 IP 地址。
- port: 配置文件中 httpPort 配置项，缺省为 6041
+- 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>
+- code：（`int`）0 代表成功。
-    <td>正确查询</td>
+- column_meta：（`[1][3]any`）只返回 `[["affected_rows", "INT", 4]]`。
-    <td>
+- rows：（`int`）只返回 `1`。
-    code：（int）0 代表成功
+- data：（`[][]any`）返回受影响行数。
-    <br/>
-    <br/>
+#### 正确查询
-    column_meta：（[][3]any） 列信息，每个列会用三个值来说明，分别为：列名（string）、列类型（string）、类型长度（int）
-    <br/>
+样例：
-    <br/>
-    rows：（int）数据返回行数
-    <br/>
-    <br/>
-    data：（[][]any）具体数据内容
-  </td>
-  <td>
 ```json
 {
@@ -385,17 +201,35 @@ curl -L -u username:password -d "<SQL>" <ip>:<PORT>/rest/sql/[db_name]
 }
 ```
-  </td>
+说明：
-</tr>
-<tr>
+- code：（`int`）0 代表成功。
-  <td>错误</td>
+- column_meta：（`[][3]any`） 列信息，每个列会用三个值来说明，分别为：列名（string）、列类型（string）、类型长度（int）。
-  <td>
+- rows：（`int`）数据返回行数。
-  code：（int）错误码
+- data：（`[][]any`）具体数据内容（时间格式仅支持 RFC3339，结果集为 0 时区）。
-  <br/>
-  <br/>
+列类型使用如下字符串:
-  desc：（string）错误描述
-  </td>
+- "NULL"
-  <td>
+- "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>
+- code：（`int`）错误码。
+- desc：（`string`）错误描述。
-### 说明
- 时间格式仅支持 RFC3339，结果集为 0 时区
- 列类型使用如下字符串:
-    > "NULL"
-    > "BOOL"
-    > "TINYINT"
-    > "SMALLINT"
-    > "INT"
-    > "BIGINT"
-    > "FLOAT"
-    > "DOUBLE"
-    > "VARCHAR"
-    > "TIMESTAMP"
-    > "NCHAR"
-    > "TINYINT UNSIGNED"
-    > "SMALLINT UNSIGNED"
-    > "INT UNSIGNED"
-    > "BIGINT UNSIGNED"
-    > "JSON"
 ## 自定义授权码
@@ -439,11 +253,9 @@ curl http://<fqnd>:<port>/rest/login/<username>/<password>
 其中，`fqdn` 是 TDengine 数据库的 FQDN 或 IP 地址，`port` 是 TDengine 服务的端口号，`username` 为数据库用户名，`password` 为数据库密码，返回值为 JSON 格式，各字段含义如下：
- status：请求结果的标志位
+- status：请求结果的标志位。
+- code：返回值代码。
- code：返回值代码
+- desc：授权码。
- 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
@@ -712,7 +712,7 @@ while(true) {
 }
 ```
-`poll` 每次调用获取一个消息。请按需选择合理的调用 `poll` 的频率（如例子中的 `Duration.ofMillis(100)`），否则会给服务端造成不必要的压力。
+`poll` 每次调用获取一个消息。
 #### 关闭订阅

--- 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
@@ -128,19 +128,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  tsdbSetTableId(STsdbReader *pReader, int64_t uid);
-int32_t tsdbReaderOpen(SVnode *pVnode, SQueryTableDataCond *pCond, SArray *pTableList, STsdbReader **ppReader,
+int32_t  tsdbReaderOpen(SVnode *pVnode, SQueryTableDataCond *pCond, SArray *pTableList, STsdbReader **ppReader,
-                       const char *idstr);
+                        const char *idstr);
-void    tsdbReaderClose(STsdbReader *pReader);
+void     tsdbReaderClose(STsdbReader *pReader);
-bool    tsdbNextDataBlock(STsdbReader *pReader);
+bool     tsdbNextDataBlock(STsdbReader *pReader);
-void    tsdbRetrieveDataBlockInfo(STsdbReader *pReader, SDataBlockInfo *pDataBlockInfo);
+void     tsdbRetrieveDataBlockInfo(STsdbReader *pReader, SDataBlockInfo *pDataBlockInfo);
-int32_t tsdbRetrieveDatablockSMA(STsdbReader *pReader, SColumnDataAgg ***pBlockStatis, bool *allHave);
+int32_t  tsdbRetrieveDatablockSMA(STsdbReader *pReader, SColumnDataAgg ***pBlockStatis, bool *allHave);
-SArray *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
+SArray  *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdList);
-int32_t tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
+int32_t  tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
-int32_t tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
+int32_t  tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
-int64_t tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
+int64_t  tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
-void   *tsdbGetIdx(SMeta *pMeta);
+void    *tsdbGetIdx(SMeta *pMeta);
-void   *tsdbGetIvtIdx(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();
@@ -169,10 +170,9 @@ int32_t tqProcessTaskDispatchRsp(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRecoverRsp(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRetrieveReq(STQ* pTq, SRpcMsg* pMsg);
 int32_t tqProcessTaskRetrieveRsp(STQ* pTq, SRpcMsg* pMsg);
-int32_t tsdbGetStbIdList(SMeta* pMeta, int64_t suid, SArray* list);
-SSubmitReq* tdBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid,
+SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pSchema, bool createTb, int64_t suid,
-                            const char* stbFullName, int32_t vgId, SBatchDeleteReq* pDeleteReq);
+                            const char* stbFullName, SBatchDeleteReq* pDeleteReq);
 // sma
 int32_t smaInit();

--- 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 =
+  SSubmitReq     *pSubmitReq = tqBlockToSubmit(pSma->pVnode, (const SArray *)msg, pTsmaStat->pTSchema, true,
-      tdBlockToSubmit(pSma->pVnode, (const SArray *)msg, pTsmaStat->pTSchema, true, pTsmaStat->pTSma->dstTbUid,
+                                               pTsmaStat->pTSma->dstTbUid, pTsmaStat->pTSma->dstTbName, &deleteReq);
-                      pTsmaStat->pTSma->dstTbName, pTsmaStat->pTSma->dstVgId, &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 (vnodeIsRoleLeader(pTq->pVnode) && msgType == TDMT_VND_SUBMIT) {
-  if (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 = *(int64_t*)colDataGetData(pGidCol, row);
-    int64_t groupId = 0;
    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,
+SSubmitReq* tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* pTSchema, bool createTb,
-                            int64_t suid, const char* stbFullName, int32_t vgId, SBatchDeleteReq* pDeleteReq) {
+                            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,
+  SSubmitReq* pReq = tqBlockToSubmit(pVnode, pRes, pTask->tbSink.pTSchema, true, pTask->tbSink.stbUid,
-                                     pTask->tbSink.stbFullName, pVnode->config.vgId, &deleteReq);
+                                     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/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/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
\ No newline at end of file
--- 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 
+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
@@ -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
\ No newline at end of file
--- 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 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07
-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
-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 
+print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07
-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
 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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 ) 
+    sql insert into $nt values ($ms , $x )
-    $x = $x + 1  
+    $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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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 
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $tb
-print ===> $data00 $data01 $data02 $data03 $data04 $data05 
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 19 then 
+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 
+sql select * from $tb  where tbcol is NULL
-if $rows != 1 then 
+if $rows != 1 then
  return -1
 endi
-sql select * from $tb  where tbcol = NULL 
+sql select * from $tb  where tbcol = NULL
-if $rows != 0 then 
+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 
+sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt
-print ===> $data00 $data01 $data02 $data03 $data04 $data05 
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 190 then 
+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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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 
+print ===> $data00
-if $data00 != 0.000000000 then 
+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
\ No newline at end of file
--- 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 
+print ===> $data00 $rows
-if $data00 != 10 then 
+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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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    
+    endi
-    if $data01 != 10 then 
+    if $data01 != 10 then
      return -1
-    endi    
+    endi
-    if $data02 != table then 
+    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    
+    endi
-    if $data01 != 20 then 
+    if $data01 != 20 then
      return -1
-    endi    
+    endi
-    if $data02 != Table then 
+    if $data02 != Table then
      return -1
-    endi    
+    endi
-    if $data03 != Table then 
+    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 
+    if $rows != 2 then
      return -1
-    endi    
+    endi
-    if $data01 != 30 then 
+    if $data01 != 30 then
      return -1
-    endi    
+    endi
-    if $data02 != TAble then 
+    if $data02 != TAble then
      return -1
-    endi    
+    endi
-    if $data03 != TAble then 
+    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 
+    if $rows != 2 then
      return -1
-    endi    
+    endi
-    if $data01 != 40 then 
+    if $data01 != 40 then
      return -1
-    endi    
+    endi
-    if $data02 != TABle then 
+    if $data02 != TABle then
      return -1
-    endi    
+    endi
-    if $data03 != TABle then 
+    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 
+    if $rows != 2 then
      return -1
-    endi    
+    endi
-    if $data01 != 10 then 
+    if $data01 != 10 then
      return -1
-    endi    
+    endi
-    if $data02 != table then 
+    if $data02 != table then
      return -1
-    endi    
+    endi
-    if $data03 != table then 
+    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 
+    if $rows != 2 then
      return -1
-    endi    
+    endi
-    if $data01 != 20 then 
+    if $data01 != 20 then
      return -1
-    endi    
+    endi
-    if $data02 != Table then 
+    if $data02 != Table then
      return -1
-    endi    
+    endi
-    if $data03 != Table then 
+    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 
+    if $rows != 2 then
      return -1
-    endi    
+    endi
-    if $data01 != 30 then 
+    if $data01 != 30 then
      return -1
-    endi    
+    endi
-    if $data02 != TAble then 
+    if $data02 != TAble then
      return -1
-    endi    
+    endi
-    if $data03 != TAble then 
+    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 
+    if $rows != 2 then
      return -1
-    endi    
+    endi
-    if $data01 != 40 then 
+    if $data01 != 40 then
      return -1
-    endi    
+    endi
-    if $data02 != TABle then 
+    if $data02 != TABle then
      return -1
-    endi    
+    endi
-    if $data03 != TABle then 
+    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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- 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
--- 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 
+  $xt = - . $x
-  sql insert into $tb values (now - $ms , -$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 
+print sql select * from $tb -> $rows points
-if $rows != $y then 
+if $rows != $y then
  return -1
 endi
 $x = $N / 2
 $y = $N
 while $x < $y
-  $ms = $x . m 
+  $ms = $x . m
-  sql insert into $tb values (now + $ms , $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 
+print sql select * from $tb -> $rows points
-if $rows != $N then 
+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 
+  $ms = $x . m
-  sql insert into $tb values (now + $ms , $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 
+print sql select * from $tb -> $rows points
-if $rows != $expect then 
+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 
+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 
+print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points
-if $rows != $result1 then 
+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  
+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 
+print sql select * from $tb where ts < $start3 and ts > $end1  order by ts desc  -> $rows points
-if $rows != $result2 then 
+if $rows != $result2 then
  return -1
 endi
-sql select * from $tb where ts < $start3 and ts > $end2 order by ts desc  
+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 
+print sql select * from $tb where ts < $start3 and ts > $end2  order by ts desc  -> $rows points
-if $rows != $result1 then 
+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
\ No newline at end of file
--- a/tests/script/tsim/insert/query_block1_memory.sim
+++ b/tests/script/tsim/insert/query_block1_memory.sim
--- a/tests/script/tsim/insert/query_block2_file.sim
+++ b/tests/script/tsim/insert/query_block2_file.sim
--- a/tests/script/tsim/insert/query_block2_memory.sim
+++ b/tests/script/tsim/insert/query_block2_memory.sim
--- a/tests/script/tsim/insert/query_file_memory.sim
+++ b/tests/script/tsim/insert/query_file_memory.sim
--- 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
\ No newline at end of file
--- 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
\ No newline at end of file
--- a/tests/script/tsim/insert/update0.sim
+++ b/tests/script/tsim/insert/update0.sim
--- a/tests/script/tsim/insert/update1_sort_merge.sim
+++ b/tests/script/tsim/insert/update1_sort_merge.sim
--- a/tests/script/tsim/scalar/in.sim
+++ b/tests/script/tsim/scalar/in.sim
--- a/tests/script/tsim/scalar/scalar.sim
+++ b/tests/script/tsim/scalar/scalar.sim
--- a/tests/script/tsim/tag/3.sim
+++ b/tests/script/tsim/tag/3.sim
--- a/tests/script/tsim/tag/4.sim
+++ b/tests/script/tsim/tag/4.sim
--- 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
--- a/tests/script/tsim/tag/bigint.sim
+++ b/tests/script/tsim/tag/bigint.sim
--- a/tests/script/tsim/tag/binary.sim
+++ b/tests/script/tsim/tag/binary.sim
--- a/tests/script/tsim/tag/binary_binary.sim
+++ b/tests/script/tsim/tag/binary_binary.sim
--- a/tests/script/tsim/tag/bool.sim
+++ b/tests/script/tsim/tag/bool.sim
--- a/tests/script/tsim/tag/bool_binary.sim
+++ b/tests/script/tsim/tag/bool_binary.sim
--- a/tests/script/tsim/tag/bool_int.sim
+++ b/tests/script/tsim/tag/bool_int.sim
--- a/tests/script/tsim/tag/change.sim
+++ b/tests/script/tsim/tag/change.sim
--- a/tests/script/tsim/tag/column.sim
+++ b/tests/script/tsim/tag/column.sim
--- 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
--- a/tests/script/tsim/tag/delete.sim
+++ b/tests/script/tsim/tag/delete.sim
--- a/tests/script/tsim/tag/double.sim
+++ b/tests/script/tsim/tag/double.sim
--- a/tests/script/tsim/tag/filter.sim
+++ b/tests/script/tsim/tag/filter.sim
--- a/tests/script/tsim/tag/float.sim
+++ b/tests/script/tsim/tag/float.sim
--- a/tests/script/tsim/tag/int.sim
+++ b/tests/script/tsim/tag/int.sim
--- a/tests/script/tsim/tag/int_binary.sim
+++ b/tests/script/tsim/tag/int_binary.sim
--- a/tests/script/tsim/tag/int_float.sim
+++ b/tests/script/tsim/tag/int_float.sim
--- a/tests/script/tsim/tag/set.sim
+++ b/tests/script/tsim/tag/set.sim
--- a/tests/script/tsim/tag/smallint.sim
+++ b/tests/script/tsim/tag/smallint.sim
--- a/tests/script/tsim/tag/tinyint.sim
+++ b/tests/script/tsim/tag/tinyint.sim