Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/tsdb_last

docs/zh/05-get-started/01-docker.md

@@ -13,7 +13,7 @@ title: 通过 Docker 快速体验 TDengine
 如果已经安装了 docker， 只需执行下面的命令。
 
 ```shell
-docker run -d -p 6030:6030 -p 6041/6041 -p 6043-6049/6043-6049 -p 6043-6049:6043-6049/udp tdengine/tdengine
+docker run -d -p 6030:6030 -p 6041:6041 -p 6043-6049:6043-6049 -p 6043-6049:6043-6049/udp tdengine/tdengine
 ```
 
 注意：TDengine 3.0 服务端仅使用 6030 TCP 端口。6041 为 taosAdapter 所使用提供 REST 服务端口。6043-6049 为 taosAdapter 提供第三方应用接入所使用端口，可根据需要选择是否打开。

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
 ```
 

docs/zh/12-taos-sql/13-tmq.md

@@ -1,6 +1,6 @@
 ---
-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 返回
 
 ## 删除订阅主题
 

docs/zh/14-reference/02-rest-api/02-rest-api.mdx

@@ -2,7 +2,7 @@
 title: REST API
 ---
 
-为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 REST API。为最大程度降低学习成本，不同于其他数据库 REST API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。REST 连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
+为支持各种不同类型平台的开发，TDengine 提供符合 REST 设计标准的 API，即 REST API。为最大程度降低学习成本，不同于其他数据库 REST API 的设计方法，TDengine 直接通过 HTTP POST 请求 BODY 中包含的 SQL 语句来操作数据库，仅需要一个 URL。REST 连接器的使用参见 [视频教程](https://www.taosdata.com/blog/2020/11/11/1965.html)。
 
 :::note
 与原生连接器的一个区别是，RESTful 接口是无状态的，因此 `USE db_name` 指令没有效果，所有对表名、超级表名的引用都需要指定数据库名前缀。支持在 RESTful URL 中指定 db_name，这时如果 SQL 语句中没有指定数据库名前缀的话，会使用 URL 中指定的这个 db_name。
@@ -20,8 +20,10 @@ RESTful 接口不依赖于任何 TDengine 的库，因此客户端不需要安
 
 下面示例是列出所有的数据库，请把 h1.taosdata.com 和 6041（缺省值）替换为实际运行的 TDengine 服务 FQDN 和端口号：
 
-```html
+```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：授权码
 
 获取授权码示例：
 

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()` 时可以基于此进度继续；否则将删除进度信息，后续只能重新开始读取数据。
-

docs/zh/14-reference/03-connector/java.mdx

@@ -712,7 +712,7 @@ while(true) {
 }
 ```
 
-`poll` 每次调用获取一个消息。请按需选择合理的调用 `poll` 的频率（如例子中的 `Duration.ofMillis(100)`），否则会给服务端造成不必要的压力。
+`poll` 每次调用获取一个消息。
 
 #### 关闭订阅
 

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*>

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;
 }
 

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);

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
 }

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();

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),

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);

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);
 

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;

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),

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);
   }

tests/pytest/util/taosadapter.py

@@ -238,19 +238,23 @@ class TAdapter:
 
         if self.running != 0:
             psCmd = f"ps -ef|grep -w {toBeKilled}| grep -v grep | awk '{{print $2}}'"
+            # psCmd = f"pgrep {toBeKilled}"
             processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8")
+                psCmd, shell=True)
 
             while(processID):
-                killCmd = f"kill {signal} {processID} > /dev/null 2>&1"
+                killCmd = f"pkill {signal} {processID} > /dev/null 2>&1"
                 os.system(killCmd)
                 time.sleep(1)
                 processID = subprocess.check_output(
                     psCmd, shell=True).decode("utf-8")
             if not platform.system().lower() == 'windows':
-                for port in range(6030, 6041):
+                port = 6041
-                    fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
+                fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
-                    os.system(fuserCmd)
+                os.system(fuserCmd)
+                # for port in range(6030, 6041):
+                    # fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
+                    # os.system(fuserCmd)
 
         self.running = 0
         tdLog.debug(f"taosadapter is stopped by kill {signal}")

tests/script/tsim/column/commit.sim

@@ -10,12 +10,12 @@ sql create table d3.mt (ts timestamp, c000 int, c001 int, c002 int, c003 int, c0
 sql create table d3.t1 using d3.mt tags(1, 2, '3', 4, 5, 6)
 
 sql show tables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -33,50 +33,50 @@ sql insert into d3.t1 values (now+1d,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 ,
 
 print =============== step3
 sql select * from d3.mt
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d3.mt where c001 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d3.mt where c002 = 2 and c003 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c235), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
   return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
   return -1
 endi
 
@@ -86,17 +86,17 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== step5
 sql select * from d3.mt
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 sql select * from d3.mt where c001 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 sql select * from d3.mt where c002 = 2 and c003 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -107,35 +107,35 @@ endi
 
 sql select count(c001), count(c248), avg(c001), avg(c248), sum(c001), max(c001), min(c248), avg(c128), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*), count(*) from d3.mt
 print $data00  $data01  $data02  $data03  $data04  $data05  $data06  $data07  $data08 $data09
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 4.500000000 then 
+if $data02 != 4.500000000 then
   return -1
 endi
-if $data03 != 4.500000000 then 
+if $data03 != 4.500000000 then
   return -1
 endi
-if $data04 != 45 then 
+if $data04 != 45 then
   return -1
 endi
-if $data05 != 9 then 
+if $data05 != 9 then
   return -1
 endi
-if $data06 != 0 then 
+if $data06 != 0 then
   return -1
 endi
-if $data07 != 4.500000000 then 
+if $data07 != 4.500000000 then
   return -1
 endi
-if $data08 != 10 then 
+if $data08 != 10 then
   return -1
 endi
-if $data09 != 10 then 
+if $data09 != 10 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/avg.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select avg(tbcol) from $tb
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -53,27 +53,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
   return -1
 endi
 
 print =============== step4
 sql select avg(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
 print =============== step5
 sql select avg(tbcol) as b from $tb interval(1m)
 print ===> $data01
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
 sql select avg(tbcol) as b from $tb interval(1d)
 print ===> $data01
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -82,17 +82,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data01
-if $data40 != 4.000000000 then 
+if $data40 != 4.000000000 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select avg(tbcol) from $mt
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -101,13 +101,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
   return -1
 endi
 
 sql select avg(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
@@ -115,31 +115,31 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 2.000000000 then 
+if $data00 != 2.000000000 then
   return -1
 endi
 
 print =============== step9
 sql select avg(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
 sql select avg(tbcol) as b from $mt interval(1d)
 print ===> $data01
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
 print =============== step10
 sql select avg(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 9.500000000 then 
+if $data00 != 9.500000000 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -148,18 +148,18 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select avg(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
 

tests/script/tsim/compute/bottom.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select bottom(tbcol, 1) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -53,24 +53,24 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 1) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5 then 
+if $data00 != 5 then
   return -1
 endi
 
 print =============== step4
 sql select bottom(tbcol, 1) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step5
-sql select bottom(tbcol, 2) as b from $tb 
+sql select bottom(tbcol, 2) as b from $tb
 print ===> $data00  $data10
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data10 != 0 then 
+if $data10 != 0 then
   return -1
 endi
 
@@ -79,10 +79,10 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select bottom(tbcol, 2) as b from $tb where ts > $ms
 print ===> $data00  $data10
-if $data00 != 6 then 
+if $data00 != 6 then
   return -1
 endi
-if $data10 != 5 then 
+if $data10 != 5 then
   return -1
 endi
 
@@ -93,8 +93,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
 

tests/script/tsim/compute/diff.sim

@@ -25,17 +25,17 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -43,7 +43,7 @@ $tb = $tbPrefix . $i
 
 sql select diff(tbcol) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
@@ -52,7 +52,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts > $ms
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
@@ -60,14 +60,14 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select diff(tbcol) from $tb where ts <= $ms
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 print =============== step4
 sql select diff(tbcol) as b from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
@@ -86,8 +86,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/diff2.sim

@@ -26,19 +26,19 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
     $tinyint = $x / 128
-    sql insert into $tb values ($ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x ) 
+    sql insert into $tb values ($ms , $x , $x , $x , $x , $tinyint , $x , $x , $x , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -46,7 +46,7 @@ $tb = $tbPrefix . $i
 
 sql select diff(c1) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c2) from $tb
@@ -56,22 +56,22 @@ if $data10 != 1.000000000 then
 endi
 sql select diff(c3) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c4) from $tb
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c5) from $tb
 print ===> $data10
-if $data10 != 0 then 
+if $data10 != 0 then
   return -1
 endi
 sql select diff(c6) from $tb
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
@@ -90,7 +90,7 @@ sql_error select diff(c1) from m_di_tb1 where c2 like '2%'
 print =============== step3
 sql select diff(c1) from $tb where c1 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c2) from $tb where c2 > 5
@@ -100,38 +100,38 @@ if $data10 != 1.000000000 then
 endi
 sql select diff(c3) from $tb where c3 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c4) from $tb where c4 > 5
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 sql select diff(c5) from $tb where c5 > 5
 print ===> $data10
-if $data10 != 0 then 
+if $data10 != 0 then
   return -1
 endi
 sql select diff(c6) from $tb where c6 > 5
 print ===> $data10
-if $data10 != 1.000000000 then 
+if $data10 != 1.000000000 then
   return -1
 endi
 
 print =============== step4
 sql select diff(c1) from $tb where c1 > 5 and c2 < $rowNum
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select diff(c1) from $tb where c9 like '%9' and c1 <= 20
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 print ===> $data10
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
@@ -148,8 +148,8 @@ step6:
 print =============== clear
 #sql drop database $db
 #sql select * from information_schema.ins_databases
-#if $rows != 2 then 
+#if $rows != 2 then
 #  return -1
 #endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/first.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select first(tbcol) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -53,27 +53,27 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step4
 sql select first(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step5
 sql select first(tbcol) as b from $tb interval(1m)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 sql select first(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -82,17 +82,17 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data00
-if $data40 != 4 then 
+if $data40 != 4 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select first(tbcol) from $mt
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -101,13 +101,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 sql select first(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -115,7 +115,7 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -123,24 +123,24 @@ print =============== step9
 sql select first(tbcol) as b from $mt interval(1m)
 print select first(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select first(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step10
 sql select first(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -149,19 +149,19 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select first(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/interval.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,13 +44,13 @@ $tb = $tbPrefix . $i
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb interval(1m)
 print ===> $rows
-if $rows < $rowNum then 
+if $rows < $rowNum then
   return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -59,16 +59,16 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms interval(1m)
 print ===> $rows
-if $rows > 10 then 
+if $rows > 10 then
   return -1
 endi
-if $rows < 3 then 
+if $rows < 3 then
   return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -81,16 +81,16 @@ $ms2 = 1601481600000 - $cc
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $tb  where ts <= $ms and ts > $ms2 interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
   return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
   return -1
 endi
-if $data00 != 1 then 
+if $data00 != 1 then
   return -1
 endi
-if $data04 != 1 then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -107,29 +107,29 @@ if $rows < 30 then
   print expect greater than 30, actual: $rows
   return -1
 endi
-if $rows > 50 then 
+if $rows > 50 then
   return -1
 endi
-if $data20 != 1 then 
+if $data20 != 1 then
   return -1
 endi
-if $data24 != 1 then 
+if $data24 != 1 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
   return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
@@ -138,16 +138,16 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms interval(1m)
 print ===> $rows
-if $rows < 3 then 
+if $rows < 3 then
   return -1
 endi
-if $rows > 7 then 
+if $rows > 7 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
@@ -160,16 +160,16 @@ $ms2 = 1601481600000 - $cc
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m)
 print ===> $rows
-if $rows < 18 then 
+if $rows < 18 then
   return -1
 endi
-if $rows > 22 then 
+if $rows > 22 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
@@ -181,24 +181,24 @@ $cc = 1 * 60000
 $ms2 = 1601481600000 - $cc
 
 sql select count(tbcol), avg(tbcol), max(tbcol), min(tbcol), count(tbcol) from $mt  where ts <= $ms1 and ts > $ms2 interval(1m) fill(value, 0)
-if $rows < 30 then 
+if $rows < 30 then
   return -1
 endi
-if $rows > 50 then 
+if $rows > 50 then
   return -1
 endi
-if $data10 > 15 then 
+if $data10 > 15 then
   return -1
 endi
-if $data10 < 5 then 
+if $data10 < 5 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/last.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select last(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select last(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step5
 sql select last(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select last(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select last(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 sql select last(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step9
 sql select last(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select last(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step10
 sql select last(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc
 
 sql select last(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
 

tests/script/tsim/compute/leastsquare.sim

@@ -25,17 +25,17 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 2
   $ms = 1000
   while $x < $rowNum
     $ms = $ms + 1000
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -63,7 +63,7 @@ endi
 
 print =============== step5
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
-print ===> $data00 
+print ===> $data00
 if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
@@ -81,15 +81,15 @@ if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 print ===> $rows
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/max.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
-    
+
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select max(tbcol) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select max(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step5
 sql select max(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select max(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -84,17 +84,17 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select max(tbcol) from $mt
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as c from $mt where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 sql select max(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -119,31 +119,31 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step9
 sql select max(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select max(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step10
 sql select max(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -153,19 +153,19 @@ $ms = 1601481600000 + $cc
 
 sql select max(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/min.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select min(tbcol) from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -54,27 +54,27 @@ $ms = 1601481600000 + $cc
 
 sql select min(tbcol) from $tb where ts < $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step4
 sql select min(tbcol) as b from $tb
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step5
 sql select min(tbcol) as b from $tb interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select min(tbcol) as b from $tb interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -85,17 +85,17 @@ $ms = 1601481600000 + $cc
 sql select min(tbcol) as b from $tb where ts <= $ms interval(1m)
 print select min(tbcol) as b from $tb where ts <= $ms interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select min(tbcol) from $mt
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -104,13 +104,13 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as c from $mt where ts < $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 sql select min(tbcol) as c from $mt where tgcol < 5
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
@@ -118,31 +118,31 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as c from $mt where tgcol < 5 and ts <= $ms
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step9
 sql select min(tbcol) as b from $mt interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 
 sql select min(tbcol) as b from $mt interval(1d)
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
 print =============== step10
 sql select min(tbcol) as b from $mt group by tgcol
 print ===> $data00
-if $data00 != 0 then 
+if $data00 != 0 then
   return -1
 endi
 
-if $rows != $tbNum then 
+if $rows != $tbNum then
   return -1
 endi
 
@@ -151,19 +151,19 @@ $cc = 4 * 60000
 $ms = 1601481600000 + $cc
 sql select min(tbcol) as b from $mt  where ts <= $ms partition by tgcol interval(1m)
 print ===> $data10
-if $data10 != 1 then 
+if $data10 != 1 then
   return -1
 endi
 print ===> $rows
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/percentile.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,19 +44,19 @@ $tb = $tbPrefix . $i
 
 sql select percentile(tbcol, 10) from $tb
 print ===> $data00
-if $data00 != 1.900000000 then 
+if $data00 != 1.900000000 then
   return -1
 endi
 
 sql select percentile(tbcol, 20) from $tb
 print ===> $data00
-if $data00 != 3.800000000 then 
+if $data00 != 3.800000000 then
   return -1
 endi
 
 sql select percentile(tbcol, 100) from $tb
 print ===> $data00
-if $data00 != 19.000000000 then 
+if $data00 != 19.000000000 then
   return -1
 endi
 
@@ -70,7 +70,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 1) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.140000000 then 
+if $data00 != 5.140000000 then
   return -1
 endi
 
@@ -79,7 +79,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 5) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.700000000 then 
+if $data00 != 5.700000000 then
   return -1
 endi
 
@@ -88,7 +88,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 0) from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.000000000 then 
+if $data00 != 5.000000000 then
   return -1
 endi
 
@@ -98,7 +98,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 1) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.140000000 then 
+if $data00 != 5.140000000 then
   return -1
 endi
 
@@ -107,7 +107,7 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 5) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.700000000 then 
+if $data00 != 5.700000000 then
   return -1
 endi
 
@@ -116,15 +116,15 @@ $ms = 1601481600000 + $cc
 
 sql select percentile(tbcol, 0) as c from $tb where ts > $ms
 print ===> $data00
-if $data00 != 5.000000000 then 
+if $data00 != 5.000000000 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/compute/top.sim

@@ -25,18 +25,18 @@ $i = 0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $mt tags( $i )
-  
+
   $x = 0
   while $x < $rowNum
     $cc = $x * 60000
     $ms = 1601481600000 + $cc
 
-    sql insert into $tb values ($ms , $x ) 
+    sql insert into $tb values ($ms , $x )
     $x = $x + 1
-  endw 
+  endw
- 
+
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 $i = 1
@@ -44,7 +44,7 @@ $tb = $tbPrefix . $i
 
 sql select top(tbcol, 1) from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
@@ -54,24 +54,24 @@ $ms = 1601481600000 + $cc
 
 sql select top(tbcol, 1) from $tb where ts <= $ms
 print ===> $data00
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== step4
 sql select top(tbcol, 1) as b from $tb
 print ===> $data00
-if $data00 != 19 then 
+if $data00 != 19 then
   return -1
 endi
 
 print =============== step5
-sql select top(tbcol, 2) as b from $tb 
+sql select top(tbcol, 2) as b from $tb
 print ===> $data00  $data10
-if $data00 != 18 then 
+if $data00 != 18 then
   return -1
 endi
-if $data10 != 19 then 
+if $data10 != 19 then
   return -1
 endi
 
@@ -81,10 +81,10 @@ $ms = 1601481600000 + $cc
 
 sql select top(tbcol, 2) as b from $tb where ts <= $ms
 print ===> $data00  $data10
-if $data00 != 3 then 
+if $data00 != 3 then
   return -1
 endi
-if $data10 != 4 then 
+if $data10 != 4 then
   return -1
 endi
 
@@ -95,8 +95,8 @@ step6:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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    
-    if $data01 != 30 then 
-      return -1
-    endi    
-    if $data02 != TAble then 
-      return -1
-    endi    
-    if $data03 != TAble then 
       return -1
     endi
-    
+    if $data01 != 30 then
+      return -1
+    endi
+    if $data02 != TAble then
+      return -1
+    endi
+    if $data03 != TAble then
+      return -1
+    endi
+
     sql select * from `TABle`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
-      return -1
-    endi    
-    if $data01 != 40 then 
-      return -1
-    endi    
-    if $data02 != TABle then 
-      return -1
-    endi    
-    if $data03 != TABle then 
       return -1
     endi
-    
+    if $data01 != 40 then
+      return -1
+    endi
+    if $data02 != TABle then
+      return -1
+    endi
+    if $data03 != TABle then
+      return -1
+    endi
+
     #print =============== query data from st, but not support select * from super table, waiting fix
     #sql select count(*) from `stable`
     #print rows: $rows
@@ -174,7 +174,7 @@ while $dbCnt < 2
     #  return -1
     #endi
     #sql select * from `stable`
-    #if $rows != 4 then 
+    #if $rows != 4 then
     #  return -1
     #endi
 
@@ -185,9 +185,9 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 
 sql select * from information_schema.ins_databases
-print rows: $rows 
+print rows: $rows
 print $data00  $data01
-print $data10  $data11 
+print $data10  $data11
 print $data20  $data21
 if $rows != 4 then
   return -1
@@ -204,22 +204,22 @@ endi
 
 $dbCnt = 0
 while $dbCnt < 2
-    if $dbCnt == 0 then 
+    if $dbCnt == 0 then
         sql use `database`
-    else 
+    else
         sql use `DataBase`
     endi
-    
+
     $dbCnt = $dbCnt + 1
 
     sql show stables
-    print rows: $rows 
+    print rows: $rows
     print $data00  $data01
     print $data10  $data11
-    if $rows != 2 then 
+    if $rows != 2 then
       return -1
     endi
-    if $data00 != Stable then 
+    if $data00 != Stable then
         if $data00 != stable then
           return -1
         endi
@@ -229,86 +229,86 @@ while $dbCnt < 2
           return -1
         endi
     endi
-  
+
     sql show tables
-    print rows: $rows 
+    print rows: $rows
     print $data00  $data01
     print $data10  $data11
     print $data20  $data21
     print $data30  $data31
-    if $rows != 4 then 
+    if $rows != 4 then
       return -1
     endi
-    
+
     print =============== query data
     sql select * from `table`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
-      return -1
-    endi    
-    if $data01 != 10 then 
-      return -1
-    endi    
-    if $data02 != table then 
-      return -1
-    endi    
-    if $data03 != table then 
       return -1
     endi
-    
+    if $data01 != 10 then
+      return -1
+    endi
+    if $data02 != table then
+      return -1
+    endi
+    if $data03 != table then
+      return -1
+    endi
+
     sql select * from `Table`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
-      return -1
-    endi    
-    if $data01 != 20 then 
-      return -1
-    endi    
-    if $data02 != Table then 
-      return -1
-    endi    
-    if $data03 != Table then 
       return -1
     endi
-    
+    if $data01 != 20 then
+      return -1
+    endi
+    if $data02 != Table then
+      return -1
+    endi
+    if $data03 != Table then
+      return -1
+    endi
+
     sql select * from `TAble`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
-      return -1
-    endi    
-    if $data01 != 30 then 
-      return -1
-    endi    
-    if $data02 != TAble then 
-      return -1
-    endi    
-    if $data03 != TAble then 
       return -1
     endi
-    
+    if $data01 != 30 then
+      return -1
+    endi
+    if $data02 != TAble then
+      return -1
+    endi
+    if $data03 != TAble then
+      return -1
+    endi
+
     sql select * from `TABle`
-    print rows: $rows 
+    print rows: $rows
     print $data00 $data01 $data02 $data03
     print $data10 $data11 $data12 $data13
-    if $rows != 2 then 
+    if $rows != 2 then
-      return -1
-    endi    
-    if $data01 != 40 then 
-      return -1
-    endi    
-    if $data02 != TABle then 
-      return -1
-    endi    
-    if $data03 != TABle then 
       return -1
     endi
-    
+    if $data01 != 40 then
+      return -1
+    endi
+    if $data02 != TABle then
+      return -1
+    endi
+    if $data03 != TABle then
+      return -1
+    endi
+
     #print =============== query data from st, but not support select * from super table, waiting fix
     #sql select count(*) from `stable`
     #print rows: $rows
@@ -329,7 +329,7 @@ while $dbCnt < 2
     #  return -1
     #endi
     #sql select * from `stable`
-    #if $rows != 4 then 
+    #if $rows != 4 then
     #  return -1
     #endi
 

tests/script/tsim/insert/basic.sim

@@ -20,26 +20,26 @@ $x = 0
 while $x < 10
   $cc = $x * 60000
   $ms = 1601481600000 + $cc
-  
+
-  sql insert into $tb values ($ms , $x ) 
+  sql insert into $tb values ($ms , $x )
   $x = $x + 1
-endw 
+endw
 
 print =============== step 2
 $x = 0
 while $x < 5
   $cc = $x * 60000
   $ms = 1551481600000 + $cc
-  
+
-  sql insert into $tb values ($ms , $x ) 
+  sql insert into $tb values ($ms , $x )
   $x = $x + 1
-endw 
+endw
 
 sql select * from $tb
 
 print $rows points data are retrieved
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/basic0.sim

@@ -18,7 +18,7 @@ print =============== create super table, include column type for count/sum/min/
 sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -28,7 +28,7 @@ sql create table ct2 using stb tags(2000)
 sql create table ct3 using stb tags(3000)
 
 sql show tables
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
@@ -46,7 +46,7 @@ sql insert into ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
 #===================================================================
 print =============== query data from child table
 sql select * from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 print $data10  $data11 $data12 $data13
 print $data20  $data21 $data22 $data23
@@ -58,111 +58,111 @@ if $data01 != 10 then
   print expect 10, actual: $data01
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select count(*) from child table
 sql select count(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== select count(column) from child table
 sql select count(ts), count(c1), count(c2), count(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
-if $data01 != 4 then 
+if $data01 != 4 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 #print =============== select first(*)/first(column) from child table
 sql select first(*) from ct1
 print ====> select first(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 
 sql select first(ts), first(c1), first(c2), first(c3) from ct1
 print ====> select first(ts), first(c1), first(c2), first(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select min(column) from child table
 sql select min(c1), min(c2), min(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -13 then 
+if $data00 != -13 then
   return -1
 endi
 if $data01 != -2.30000 then
   print expect -2.30000, actual: $data01
   return -1
 endi
-if $data02 != -3.300000000 then 
+if $data02 != -3.300000000 then
   return -1
 endi
 
 print =============== select max(column) from child table
 sql select max(c1), max(c2), max(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 11 then 
+if $data00 != 11 then
   return -1
 endi
-if $data01 != 2.10000 then 
+if $data01 != 2.10000 then
   return -1
 endi
-if $data02 != 3.100000000 then 
+if $data02 != 3.100000000 then
   return -1
 endi
 
 print =============== select sum(column) from child table
 sql select sum(c1), sum(c2), sum(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -4 then 
+if $data00 != -4 then
   return -1
 endi
-if $data01 != -0.400000095 then 
+if $data01 != -0.400000095 then
   return -1
 endi
-if $data02 != -0.400000000 then 
+if $data02 != -0.400000000 then
   return -1
 endi
 
@@ -173,34 +173,34 @@ print $data00 $data01 $data02
 print $data10 $data11 $data12
 print $data20 $data21 $data22
 print $data30 $data31 $data32
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != 11 then 
+if $data10 != 11 then
   return -1
 endi
-if $data11 != 2.10000 then 
+if $data11 != 2.10000 then
   return -1
 endi
-if $data12 != 3.100000000 then 
+if $data12 != 3.100000000 then
   return -1
 endi
-if $data30 != -13 then 
+if $data30 != -13 then
   return -1
 endi
-if $data31 != -2.30000 then 
+if $data31 != -2.30000 then
   return -1
 endi
-if $data32 != -3.300000000 then 
+if $data32 != -3.300000000 then
   return -1
 endi
 #===================================================================
@@ -208,17 +208,17 @@ endi
 #print =============== query data from stb
 sql select * from stb
 print $rows
-if $rows != 9 then 
+if $rows != 9 then
   return -1
 endi
 
 #print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
 
@@ -234,19 +234,19 @@ print $data50 $data51 $data52  $data53
 print $data60 $data61 $data62  $data63
 print $data70 $data71 $data72  $data73
 print $data80 $data81 $data82  $data83
-if $rows != 9 then 
+if $rows != 9 then
   return -1
 endi
 
-# The order of data from different sub tables in the super table is random, 
+# The order of data from different sub tables in the super table is random,
 # so this detection may fail randomly
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
@@ -254,16 +254,16 @@ endi
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print rows: $rows
 print $data00 $data01 $data02  $data03
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
-if $data01 != 9 then 
+if $data01 != 9 then
   return -1
 endi
-if $data02 != 9 then 
+if $data02 != 9 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
 
@@ -274,7 +274,7 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== query data from child table
 sql select * from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 print $data10  $data11 $data12 $data13
 print $data20  $data21 $data22 $data23
@@ -282,113 +282,113 @@ print $data30  $data31 $data32 $data33
 if $rows != 4 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select count(*) from child table
 sql select count(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
 
 print =============== select count(column) from child table
 sql select count(ts), count(c1), count(c2), count(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $data00 != 4 then 
+if $data00 != 4 then
   return -1
 endi
-if $data01 != 4 then 
+if $data01 != 4 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 #print =============== select first(*)/first(column) from child table
 sql select first(*) from ct1
 print ====> select first(*) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
 
 sql select first(ts), first(c1), first(c2), first(c3) from ct1
 print ====> select first(ts), first(c1), first(c2), first(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 print =============== select min(column) from child table
 sql select min(c1), min(c2), min(c3) from ct1
-print rows: $rows 
+print rows: $rows
 print $data00  $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -13 then 
+if $data00 != -13 then
   return -1
 endi
-if $data01 != -2.30000 then 
+if $data01 != -2.30000 then
   return -1
 endi
-if $data02 != -3.300000000 then 
+if $data02 != -3.300000000 then
   return -1
 endi
 
 print =============== select max(column) from child table
 sql select max(c1), max(c2), max(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 11 then 
+if $data00 != 11 then
   return -1
 endi
-if $data01 != 2.10000 then 
+if $data01 != 2.10000 then
   return -1
 endi
-if $data02 != 3.100000000 then 
+if $data02 != 3.100000000 then
   return -1
 endi
 
 print =============== select sum(column) from child table
 sql select sum(c1), sum(c2), sum(c3) from ct1
 print $data00 $data01 $data02  $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -4 then 
+if $data00 != -4 then
   return -1
 endi
-if $data01 != -0.400000095 then 
+if $data01 != -0.400000095 then
   return -1
 endi
-if $data02 != -0.400000000 then 
+if $data02 != -0.400000000 then
   return -1
 endi
 
@@ -399,51 +399,51 @@ print $data00 $data01 $data02
 print $data10 $data11 $data12
 print $data20 $data21 $data22
 print $data30 $data31 $data32
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != 11 then 
+if $data10 != 11 then
   return -1
 endi
-if $data11 != 2.10000 then 
+if $data11 != 2.10000 then
   return -1
 endi
-if $data12 != 3.100000000 then 
+if $data12 != 3.100000000 then
   return -1
 endi
-if $data30 != -13 then 
+if $data30 != -13 then
   return -1
 endi
-if $data31 != -2.30000 then 
+if $data31 != -2.30000 then
   return -1
 endi
-if $data32 != -3.300000000 then 
+if $data32 != -3.300000000 then
   return -1
 endi
 
 #===================================================================
 print =============== query data from stb
 sql select * from stb
-if $rows != 9 then 
+if $rows != 9 then
   return -1
-endi      
+endi
 
 print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
 
@@ -459,35 +459,35 @@ print $data50 $data51 $data52  $data53
 print $data60 $data61 $data62  $data63
 print $data70 $data71 $data72  $data73
 print $data80 $data81 $data82  $data83
-if $rows != 9 then 
+if $rows != 9 then
   return -1
 endi
-# The order of data from different sub tables in the super table is random, 
+# The order of data from different sub tables in the super table is random,
 # so this detection may fail randomly
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
 
 #print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 9 then 
+if $data00 != 9 then
   return -1
 endi
-if $data01 != 9 then 
+if $data01 != 9 then
   return -1
 endi
-if $data02 != 9 then 
+if $data02 != 9 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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
 

tests/script/tsim/insert/basic2.sim

@@ -11,7 +11,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -20,7 +20,7 @@ sql create table ct1 using stb tags("BeiJing", "ChaoYang")
 sql create table ct2 using stb tags("BeiJing", "HaiDian")
 
 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -47,7 +47,7 @@ print $data20 $data21 $data22  $data23  $data24  $data25
 print $data30 $data31 $data32  $data33  $data34  $data35
 print $data40 $data41 $data42  $data43  $data44  $data45
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -189,7 +189,7 @@ print $data20 $data21 $data22  $data23  $data24  $data25
 print $data30 $data31 $data32  $data33  $data34  $data35
 print $data40 $data41 $data42  $data43  $data44  $data45
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -319,4 +319,4 @@ if $data45 != 30.000000000 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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

tests/script/tsim/insert/insert_drop.sim

@@ -25,16 +25,16 @@ $ts = $ts0
 while $i < 10
   $tb = tb . $i
   sql create table $tb using $stb tags( $i )
- 
+
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta
     $ts = $ts0 + $xs
-    sql insert into $tb values ( $ts , $x ) 
+    sql insert into $tb values ( $ts , $x )
     $x = $x + 1
-  endw 
+  endw
   $i = $i + 1
-endw 
+endw
 print ====== tables created
 
 print ================== restart server to commit data into disk
@@ -46,18 +46,18 @@ sql use $db
 sql drop table tb5
 $i = 0
 while $i < 4
-  
+
   $tb = tb . $i
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta
     $ts = $ts0 + $xs
-    sql insert into $tb values ( $ts , $x ) 
+    sql insert into $tb values ( $ts , $x )
     $x = $x + 1
-  endw 
+  endw
 
   $i = $i + 1
-endw 
+endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ if $rows != 0 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

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;

tests/script/tsim/insert/null.sim

@@ -18,7 +18,7 @@ print =============== create super table, include column type for count/sum/min/
 sql create table if not exists stb (ts timestamp, c1 int, c2 float, c3 double, c4 bigint) tags (t1 int unsigned)
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -28,7 +28,7 @@ sql create table ct2 using stb tags(2000)
 sql create table ct3 using stb tags(3000)
 
 sql show tables
-if $rows != 3 then 
+if $rows != 3 then
   return -1
 endi
 
@@ -55,22 +55,22 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 12 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
-#if $data41 != -14 then 
+#if $data41 != -14 then
 #  return -1
 #endi
-#if $data42 != -2.40000 then 
+#if $data42 != -2.40000 then
 #  return -1
 #endi
-#if $data43 != -3.400000000 then 
+#if $data43 != -3.400000000 then
 #  return -1
 #endi
 
@@ -79,10 +79,10 @@ sql select count(*) from ct1
 print ===> select count(*) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
@@ -91,16 +91,16 @@ sql select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
@@ -113,16 +113,16 @@ sql select min(c1), min(c2), min(c3) from ct1
 print ===> select min(c1), min(c2), min(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483647 then 
+if $data00 != -2147483647 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
 
@@ -131,16 +131,16 @@ sql select max(c1), max(c2), max(c3) from ct1
 print ===> select max(c1), max(c2), max(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 16 then 
+if $data00 != 16 then
   return -1
 endi
-if $data01 != 2.70000 then 
+if $data01 != 2.70000 then
   return -1
 endi
-if $data02 != 3.700000000 then 
+if $data02 != 3.700000000 then
   return -1
 endi
 
@@ -149,16 +149,16 @@ sql select sum(c1), sum(c2), sum(c3) from ct1
 print ===> select sum(c1), sum(c2), sum(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483556  then 
+if $data00 != -2147483556  then
   return -1
 endi
-if $data01 != 18.799999952 then 
+if $data01 != 18.799999952 then
   return -1
 endi
-if $data02 != 26.800000000 then 
+if $data02 != 26.800000000 then
   return -1
 endi
 
@@ -167,43 +167,43 @@ sql select c1, c2, c3 from ct1
 print ===> select c1, c2, c3 from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != NULL then 
+if $data10 != NULL then
   return -1
 endi
-if $data11 != NULL then 
+if $data11 != NULL then
   return -1
 endi
-if $data12 != NULL then 
+if $data12 != NULL then
   return -1
 endi
-if $data30 != 11 then 
+if $data30 != 11 then
   return -1
 endi
-if $data31 != NULL then 
+if $data31 != NULL then
   return -1
 endi
-if $data32 != 3.200000000 then 
+if $data32 != 3.200000000 then
   return -1
 endi
-if $data90 != 16 then 
+if $data90 != 16 then
   return -1
 endi
-if $data91 != 2.60000 then 
+if $data91 != 2.60000 then
   return -1
 endi
-if $data92 != 3.600000000 then 
+if $data92 != 3.600000000 then
   return -1
 endi
 #===================================================================
@@ -211,36 +211,36 @@ endi
 
 #print =============== query data from stb
 sql select * from stb
-print ===> 
+print ===>
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
 
 #print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
 #print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
@@ -264,22 +264,22 @@ print ===> rows4: $data40 $data41 $data42 $data43 $data44
 if $rows != 12 then
   return -1
 endi
-if $data01 != 10 then 
+if $data01 != 10 then
   return -1
 endi
-if $data02 != 2.00000 then 
+if $data02 != 2.00000 then
   return -1
 endi
-if $data03 != 3.000000000 then 
+if $data03 != 3.000000000 then
   return -1
 endi
-if $data41 != 12 then 
+if $data41 != 12 then
   return -1
 endi
-if $data42 != 2.20000 then 
+if $data42 != 2.20000 then
   return -1
 endi
-if $data43 != NULL then 
+if $data43 != NULL then
   return -1
 endi
 
@@ -288,10 +288,10 @@ sql select count(*) from ct1
 print ===> select count(*) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
@@ -300,16 +300,16 @@ sql select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> select count(ts), count(c1), count(c2), count(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 
@@ -322,16 +322,16 @@ sql select min(c1), min(c2), min(c3) from ct1
 print ===> select min(c1), min(c2), min(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483647 then 
+if $data00 != -2147483647 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
 
@@ -340,16 +340,16 @@ sql select max(c1), max(c2), max(c3) from ct1
 print ===> select max(c1), max(c2), max(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 16 then 
+if $data00 != 16 then
   return -1
 endi
-if $data01 != 2.70000 then 
+if $data01 != 2.70000 then
   return -1
 endi
-if $data02 != 3.700000000 then 
+if $data02 != 3.700000000 then
   return -1
 endi
 
@@ -358,16 +358,16 @@ sql select sum(c1), sum(c2), sum(c3) from ct1
 print ===> select sum(c1), sum(c2), sum(c3) from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != -2147483556  then 
+if $data00 != -2147483556  then
   return -1
 endi
-if $data01 != 18.799999952 then 
+if $data01 != 18.799999952 then
   return -1
 endi
-if $data02 != 26.800000000 then 
+if $data02 != 26.800000000 then
   return -1
 endi
 
@@ -376,78 +376,78 @@ sql select c1, c2, c3 from ct1
 print ===> select c1, c2, c3 from ct1
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
-if $data01 != 2.00000 then 
+if $data01 != 2.00000 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data10 != NULL then 
+if $data10 != NULL then
   return -1
 endi
-if $data11 != NULL then 
+if $data11 != NULL then
   return -1
 endi
-if $data12 != NULL then 
+if $data12 != NULL then
   return -1
 endi
-if $data30 != 11 then 
+if $data30 != 11 then
   return -1
 endi
-if $data31 != NULL then 
+if $data31 != NULL then
   return -1
 endi
-if $data32 != 3.200000000 then 
+if $data32 != 3.200000000 then
   return -1
 endi
-if $data90 != 16 then 
+if $data90 != 16 then
   return -1
 endi
-if $data91 != 2.60000 then 
+if $data91 != 2.60000 then
   return -1
 endi
-if $data92 != 3.600000000 then 
+if $data92 != 3.600000000 then
   return -1
 endi
 #===================================================================
 
 print =============== query data from stb
 sql select * from stb
-print ===> 
+print ===>
 print ===> rows: $rows
 print ===> rows0: $data00 $data01 $data02 $data03 $data04
-if $rows != 12 then 
+if $rows != 12 then
   return -1
 endi
 print =============== select count(*) from supter table
 sql select count(*) from stb
 print $data00 $data01 $data02
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
 
 print =============== select count(column) from supter table
 sql select count(ts), count(c1), count(c2), count(c3) from stb
 print $data00 $data01 $data02  $data03
-if $data00 != 12 then 
+if $data00 != 12 then
   return -1
 endi
-if $data01 != 8 then 
+if $data01 != 8 then
   return -1
 endi
-if $data02 != 8 then 
+if $data02 != 8 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
 

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
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/query_block1_memory.sim

@@ -17,9 +17,9 @@ sql use $db
 
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows
 
-$N = 82 
+$N = 82
 
 print =============== step 1
 $x = $N
@@ -28,14 +28,14 @@ while $x > $y
   $z = $x * 60000
   $ms = 1601481600000 - $z
 
-  $xt = - . $x 
+  $xt = - . $x
-  sql insert into $tb values ($ms , -$x ) 
+  sql insert into $tb values ($ms , -$x )
   $x = $x - 1
-endw 
+endw
 
 sql select * from $tb
-print sql select * from $tb -> $rows points 
+print sql select * from $tb -> $rows points
-if $rows != $y then 
+if $rows != $y then
   return -1
 endi
 
@@ -45,12 +45,12 @@ while $x < $y
   $z = $x * 60000
   $ms = 1601481600000 + $z
 
-  sql insert into $tb values ($ms , $x ) 
+  sql insert into $tb values ($ms , $x )
   $x = $x + 1
-endw 
+endw
 sql select * from $tb
-print sql select * from $tb -> $rows points 
+print sql select * from $tb -> $rows points
-if $rows != $N then 
+if $rows != $N then
   return -1
 endi
 
@@ -69,100 +69,100 @@ $end2 = 1601481600000
 $end3 = 1601481600000 +  $step
 
 sql select * from $tb where ts < $start1 and ts > $end1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+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
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+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
 
 sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -170,8 +170,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/query_block2_file.sim

@@ -16,23 +16,23 @@ sql create database $db
 sql use $db
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows
-$N = 82 
+$N = 82
 
 print =============== step 1
 $x = $N * 2
 $y = $N
 $expect = $N
 while $x > $y
-  $ms = $x . m 
+  $ms = $x . m
-  $xt = - . $x 
+  $xt = - . $x
-  sql insert into $tb values (now - $ms , $xt ) 
+  sql insert into $tb values (now - $ms , $xt )
   $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
 
@@ -40,20 +40,20 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 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
 
 print =============== step 2
 
 $R = 4
-$y = $N * $R 
+$y = $N * $R
 
 $expect = $y + $N
 $expect = $expect + $N
@@ -62,17 +62,17 @@ $x = $N * 3
 $y = $y + $x
 
 while $x < $y
-  $ms = $x . m 
+  $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
- 
+
 
 print =============== step 2
 
@@ -106,7 +106,7 @@ endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -121,14 +121,14 @@ if $rows != 0 then
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+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
 
@@ -137,7 +137,7 @@ if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@@ -154,9 +154,9 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -170,15 +170,15 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+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
 
@@ -191,8 +191,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/query_block2_memory.sim

@@ -14,22 +14,22 @@ sql drop database -x step1
 step1:
 sql create database $db
 sql use $db
-sql create table $tb (ts timestamp, speed int) 
+sql create table $tb (ts timestamp, speed int)
 
-$N = 82 
+$N = 82
 
 $x = $N * 2
 $y = $N
 while $x > $y
-  $ms = $x . m 
+  $ms = $x . m
-  $xt = - . $x 
+  $xt = - . $x
-  sql insert into $tb values (now - $ms , $xt ) 
+  sql insert into $tb values (now - $ms , $xt )
   $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
 
@@ -37,13 +37,13 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 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
 
@@ -63,107 +63,107 @@ $end2 = now
 $end3 = now+ . $step
 
 sql select * from $tb where ts < $start1 and ts > $end1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
 print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points
-if $rows != $result2 then 
+if $rows != $result2 then
   return -1
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end2
-print sql select * from $tb where ts < $start3 and ts > $end2 -> $rows points 
+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
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end2 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start1 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end2  order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql select * from $tb where ts < $start2 and ts > $end3 order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+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
 
 sql select * from $tb where ts < $start3 and ts > $end3   order by ts desc
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/query_file_memory.sim

@@ -17,23 +17,23 @@ sql use $db
 
 sql create table $tb (ts timestamp, speed int)
 
-#commit to file will trigger if insert 82 rows 
+#commit to file will trigger if insert 82 rows
 
-$N = 82 
+$N = 82
 
 $x = $N * 2
 $y = $N
 $expect = $y
 while $x > $y
-  $ms = $x . m 
+  $ms = $x . m
-  $xt = - . $x 
+  $xt = - . $x
-  sql insert into $tb values (now - $ms , $xt ) 
+  sql insert into $tb values (now - $ms , $xt )
   $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
 
@@ -41,37 +41,37 @@ $x = $N
 $y = $N * 2
 $expect = $N * 2
 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
 
 $R = 4
 $R = $R - 1
 
-$y = $N * $R 
+$y = $N * $R
 $expect = $y + $N
 $expect = $expect + $N
 
 $x = $N * 3
 $y = $y + $x
 while $x < $y
-  $ms = $x . m 
+  $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
- 
+
 
 print =============== step 2
 
@@ -105,7 +105,7 @@ endi
 
 sql select * from $tb where ts < $start2 and ts > $end1
 print select * from $tb where ts < $start2 and ts > $end1 ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -120,14 +120,14 @@ if $rows != 0 then
 endi
 
 sql select * from $tb where ts < $start3 and ts > $end1
-print sql select * from $tb where ts < $start3 and ts > $end1 -> $rows points 
+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
 
@@ -136,7 +136,7 @@ if $rows != 0 then
   return -1
 endi
 
-print ================= order by ts desc  
+print ================= order by ts desc
 
 sql select * from $tb where ts < $start1 and ts > $end1 order by ts desc
 if $rows != 0 then
@@ -153,9 +153,9 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc  
+sql select * from $tb where ts < $start2 and ts > $end1 order by ts desc
 print select * from $tb where ts < $start2 and ts > $end1  order by ts desc  ->  $rows points
-if $rows != $result1 then 
+if $rows != $result1 then
   return -1
 endi
 
@@ -169,15 +169,15 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from $tb where ts < $start3 and ts > $end1 order by ts desc  
+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
 
@@ -190,8 +190,8 @@ clear:
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/query_multi_file.sim

@@ -15,18 +15,18 @@ step1:
 sql create database $db
 sql use $db
 
-sql create table $tb (ts timestamp, speed int) 
+sql create table $tb (ts timestamp, speed int)
 
 $N = 20000
 
 $x = 0
 
 while $x < $N
-  $ms = $x . s 
+  $ms = $x . s
   #print insert into $tb values (now + $ms , $x )
   sql insert into $tb values (now + $ms , $x ) -x error_insert
   $x = $x + 1
-endw 
+endw
 error_insert:
 
 sql select * from $tb
@@ -37,8 +37,8 @@ endi
 
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/tcp.sim

@@ -21,8 +21,8 @@ while $x < 10000
   $ms = $x . s
   sql insert into tb values (now + $ms , '1' )
   $x = $x + 1
-endw 
+endw
 
 sql select * from tb
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/update0.sim

@@ -11,7 +11,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int) tags (city binary(20),district binary(20));
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -20,7 +20,7 @@ sql create table ct1 using stb tags("BeiJing", "ChaoYang")
 sql create table ct2 using stb tags("BeiJing", "HaiDian")
 
 sql show tables
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
@@ -43,7 +43,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -74,7 +74,7 @@ print $data00 $data01
 print $data10 $data11
 print $data20 $data21
 
-if $rows != 3 then 
+if $rows != 3 then
   print rows $rows != 3
   return -1
 endi
@@ -107,7 +107,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -133,7 +133,7 @@ print $data00 $data01
 print $data10 $data11
 print $data20 $data21
 
-if $rows != 3 then 
+if $rows != 3 then
   print rows $rows != 3
   return -1
 endi
@@ -166,7 +166,7 @@ print $data30 $data31
 print $data40 $data41
 print $data50 $data51
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -198,7 +198,7 @@ print $data20 $data21
 print $data30 $data31
 print $data40 $data41
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -228,4 +228,4 @@ if $data41 != NULL then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/insert/update1_sort_merge.sim

@@ -13,7 +13,7 @@ print =============== create super table
 sql create table if not exists stb (ts timestamp, c1 int unsigned, c2 double, c3 binary(10), c4 nchar(10), c5 double) tags (city binary(20),district binary(20));
 
 sql show stables
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
@@ -24,7 +24,7 @@ sql create table ct3 using stb tags("BeiJing", "PingGu")
 sql create table ct4 using stb tags("BeiJing", "YanQing")
 
 sql show tables
-if $rows != 4 then 
+if $rows != 4 then
   print rows $rows != 4
   return -1
 endi
@@ -69,7 +69,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -154,7 +154,7 @@ print =============== step 6 query records of ct2 from memory(taosc and taosd me
 sql select * from ct2;
 print $data00 $data01 $data02 $data03 $data04 $data05
 
-if $rows != 1 then 
+if $rows != 1 then
   print rows $rows != 1
   return -1
 endi
@@ -196,12 +196,12 @@ print $data60 $data61 $data62 $data63 $data64 $data65
 print $data70 $data71 $data72 $data73 $data74 $data75
 print $data80 $data81 $data82 $data83 $data84 $data85
 print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
+print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5]
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
+print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5]
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
+print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5]
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
+print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5]
 
-if $rows != 14 then 
+if $rows != 14 then
   print rows $rows != 14
   return -1
 endi
@@ -356,7 +356,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -451,7 +451,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55
 
-if $rows != 6 then 
+if $rows != 6 then
   print rows $rows != 6
   return -1
 endi
@@ -536,7 +536,7 @@ print =============== step 10 query records of ct2 from file
 sql select * from ct2;
 print $data00 $data01 $data02 $data03 $data04 $data05
 
-if $rows != 1 then 
+if $rows != 1 then
   print rows $rows != 1
   return -1
 endi
@@ -578,12 +578,12 @@ print $data60 $data61 $data62 $data63 $data64 $data65
 print $data70 $data71 $data72 $data73 $data74 $data75
 print $data80 $data81 $data82 $data83 $data84 $data85
 print $data90 $data91 $data92 $data93 $data94 $data95
-print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5] 
+print $data[10][0] $data[10][1] $data[10][2] $data[10][3] $data[10][4] $data[10][5]
-print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5] 
+print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11][5]
-print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
+print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5]
-print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
+print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5]
 
-if $rows != 14 then 
+if $rows != 14 then
   print rows $rows != 14
   return -1
 endi
@@ -738,7 +738,7 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 
 
-if $rows != 5 then 
+if $rows != 5 then
   print rows $rows != 5
   return -1
 endi
@@ -818,4 +818,4 @@ if $data44 != n8 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/scalar/in.sim

@@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-print ======== step1 
+print ======== step1
 sql drop database if exists db1;
 sql create database db1 vgroups 3;
 sql use db1;
@@ -11,24 +11,24 @@ sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint
 sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
- 
+
 sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
 sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
 sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
+sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
 sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
- 
+
 sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
-sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b'); 
+sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
 sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
-sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd'); 
+sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
-sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e'); 
+sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
 
 sql select * from tb1 where fts in ('2022-07-10 16:31:01', '2022-07-10 16:31:03', 1657441865000);
 if $rows != 3 then

tests/script/tsim/scalar/scalar.sim

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

tests/script/tsim/tag/3.sim

@@ -24,496 +24,496 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgc
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step15
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step16
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step17
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step18
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step19
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = true and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/4.sim

@@ -24,686 +24,686 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 bigi
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0, 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0, 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1, 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1, 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol1 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where tgcol3 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol3 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where tgcol4 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol4 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step9
 sql select * from $mt where ts > now + 4m and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step10
 sql select * from $mt where ts > now + 4m and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step11
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step12
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step13
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step14
 sql select * from $mt where ts > now + 4m and tgcol3 = 1 and tgcol4 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 1 and tgcol4 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 = 0 and tgcol4 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol3 <> 0 and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol3 <> 0 and ts < now + 5m and ts < now + 5m and tgcol4 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step15
 sql select * from $mt where ts > now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol1 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol1 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol1 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step16
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step17
 sql select * from $mt where ts > now + 4m and tgcol4 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol1 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 1 and tgcol2 <> 1  and tgcol3 <> 1 and tgcol1 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 = 0 and tgcol2 = 0 and tgcol3 = 0 and tgcol1 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol4 <> 0 and tgcol2 <> 0 and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol4 <> 0 and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol4 <> 0 and ts < now + 5m and ts < now + 5m and tgcol2 <> 0  and tgcol3 <> 0 and tgcol1 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step18
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step19
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1  and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step20
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step21
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol3
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol4
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step22
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1  group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step23
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1  group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 group by tgcol2
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step24
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol1 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d) 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol2 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 partition by tgcol3 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol1 = 1 and tgcol2 = 1 and tgcol3 = 1 and tgcol4 = 1 partition by tgcol4 interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/add.sim

@@ -25,39 +25,39 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 int
 sql reset query cache
-sql alter table $tb set tag tgcol4 =4 
+sql alter table $tb set tag tgcol4 =4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
@@ -71,61 +71,61 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 tinyint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step3
   return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -134,34 +134,34 @@ endi
 
 sql describe $tb
 print sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
   return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 float
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4.00000 then
@@ -171,184 +171,184 @@ endi
 sql select * from $mt where tgcol2 = 1 -x step4
   return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 smallint
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol3 = '1' -x step5
   return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(10)
 sql alter table $mt add tag tgcol6 binary(10)
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=false 
+sql alter table $tb set tag tgcol4=false
-sql alter table $tb set tag tgcol5='5' 
+sql alter table $tb set tag tgcol5='5'
-sql alter table $tb set tag tgcol6='6' 
+sql alter table $tb set tag tgcol6='6'
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol6 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 1
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 1 -x step52
   return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bigint
 sql alter table $mt add tag tgcol6 tinyint
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
-sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol5=5
-sql alter table $tb set tag tgcol6=6 
+sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
 sql select * from $mt where tgcol6 = 6
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
-if $data04 != 6 then 
+if $data04 != 6 then
   return -1
 endi
 
@@ -358,55 +358,55 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
   return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(17)
 sql alter table $mt add tag tgcol6 bool
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
-sql alter table $tb set tag tgcol5='5' 
+sql alter table $tb set tag tgcol5='5'
 sql alter table $tb set tag tgcol6='1'
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
 print select * from $mt where tgcol5 = 5
 print $data01 $data02 $data03 $data04
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4 then 
+if $data02 != 4 then
   return -1
 endi
-if $data03 != 5 then 
+if $data03 != 5 then
   return -1
 endi
 if $data04 != 0 then
@@ -426,45 +426,45 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol4
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 bool
 sql alter table $mt add tag tgcol6 float
 
 sql reset query cache
-sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol4=4
 sql alter table $tb set tag tgcol5=1
 sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
 sql select * from $mt where tgcol5 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 4.000000000 then 
+if $data02 != 4.000000000 then
   return -1
 endi
 if $data03 != 1 then
@@ -487,24 +487,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
 
@@ -512,7 +512,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step103
   return -1
 step103:
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql reset query cache
@@ -520,28 +520,28 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bool
 
 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=false
 sql reset query cache
 
 sql select * from $mt where tgcol4 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 if $data04 != 0 then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
 
@@ -558,27 +558,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 if $data05 != 4.00000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
 
@@ -586,7 +586,7 @@ sql alter table $mt rename tag tgcol1 tgcol4 -x step114
   return -1
 step114:
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@@ -598,7 +598,7 @@ sql alter table $mt add tag tgcol7 bigint
 sql alter table $mt add tag tgcol8 smallint
 
 sql reset query cache
-sql alter table $tb set tag tgcol4='4' 
+sql alter table $tb set tag tgcol4='4'
 sql alter table $tb set tag tgcol5=5
 sql alter table $tb set tag tgcol6='6'
 sql alter table $tb set tag tgcol7=7
@@ -607,28 +607,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol5 =5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 6 then 
+if $data05 != 6 then
   return -1
 endi
-if $data06 != 7 then 
+if $data06 != 7 then
   return -1
 endi
-if $data07 != 8 then 
+if $data07 != 8 then
   return -1
 endi
 
@@ -648,34 +648,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 if $data04 != 3.00000 then
   return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol5
@@ -686,8 +686,8 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bigint
 
 sql reset query cache
-sql alter table $tb set tag tgcol1=false 
+sql alter table $tb set tag tgcol1=false
-sql alter table $tb set tag tgcol2='5' 
+sql alter table $tb set tag tgcol2='5'
 sql alter table $tb set tag tgcol3=4
 sql alter table $tb set tag tgcol4='3'
 sql alter table $tb set tag tgcol5=2
@@ -696,28 +696,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol4 = '3'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 1 then 
+if $data03 != 1 then
   return -1
 endi
-if $data04 != 5 then 
+if $data04 != 5 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 3 then 
+if $data06 != 3 then
   return -1
 endi
-if $data07 != 2 then 
+if $data07 != 2 then
   return -1
 endi
 
@@ -747,34 +747,34 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
-sql alter table $mt drop tag tgcol2 
+sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol4
 sql alter table $mt drop tag tgcol6
 sql reset query cache
@@ -783,8 +783,8 @@ sql alter table $mt add tag tgcol4 int
 sql alter table $mt add tag tgcol6 bigint
 
 sql reset query cache
-sql alter table $tb set tag tgcol1='7' 
+sql alter table $tb set tag tgcol1='7'
-sql alter table $tb set tag tgcol2='8' 
+sql alter table $tb set tag tgcol2='8'
 sql alter table $tb set tag tgcol3=9
 sql alter table $tb set tag tgcol4=10
 sql alter table $tb set tag tgcol5=11
@@ -793,28 +793,28 @@ sql reset query cache
 
 sql select * from $mt where tgcol2 = '8'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 9 then 
+if $data03 != 9 then
   return -1
 endi
-if $data04 != 11.000000000 then 
+if $data04 != 11.000000000 then
   return -1
 endi
-if $data05 != 8 then 
+if $data05 != 8 then
   return -1
 endi
-if $data06 != 10 then 
+if $data06 != 10 then
   return -1
 endi
-if $data07 != 12 then 
+if $data07 != 12 then
   return -1
 endi
 
@@ -824,7 +824,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 
 sql alter table $mt add tag tgcol3 binary(10)
 sql alter table $mt add tag tgcol4 int
@@ -834,13 +834,13 @@ sql alter table $mt add tag tgcol6 bigint
  sql reset query cache
 sql alter table $mt drop tag tgcol6
 sql alter table $mt add tag tgcol7 bigint
-sql alter table $mt add tag tgcol8 bigint 
+sql alter table $mt add tag tgcol8 bigint
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/bigint.sim

@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,155 +83,155 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/binary.sim

@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0' )  
+  sql create table $tb using $mt tags( '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1' )  
+  sql create table $tb using $mt tags( '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,155 +83,155 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/binary_binary.sim

@@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5), tgcol2 bina
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0', '0' )  
+  sql create table $tb using $mt tags( '0', '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1', '1' )  
+  sql create table $tb using $mt tags( '1', '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/bool.sim

@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -79,40 +79,40 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
@@ -121,115 +121,115 @@ if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
 print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/bool_binary.sim

@@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(5)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, '0' )  
+  sql create table $tb using $mt tags( 0, '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, '1' )  
+  sql create table $tb using $mt tags( 1, '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/bool_int.sim

@@ -24,299 +24,299 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> true
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> false
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> false and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> true
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> false
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> false
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = true and tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/change.sim

@@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -62,18 +62,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -86,15 +86,15 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -103,61 +103,61 @@ endi
 
 sql alter table $mt rename tag tgcol1 tgcol3
 sql alter table $mt rename tag tgcol2 tgcol4
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt rename tag tgcol1 tgcol3
 sql alter table $mt rename tag tgcol2 tgcol4
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -187,31 +187,31 @@ step25:
 
 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -229,34 +229,34 @@ step32:
 
 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@@ -271,13 +271,13 @@ step42:
 
 sql select * from $mt where tgcol3 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -298,7 +298,7 @@ endi
 if $data03 != 2.00000 then
   return -1
 endi
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@@ -313,34 +313,34 @@ step52:
 
 sql select * from $mt where tgcol3 < 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = '2'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@@ -367,144 +367,144 @@ step66:
 
 sql select * from $mt where tgcol7 = '1'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol8 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol9 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol10 = 5
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol11 = '6'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 4 then 
+if $data04 != 4 then
   return -1
 endi
-if $data05 != 5.000000000 then 
+if $data05 != 5.000000000 then
   return -1
 endi
-if $data06 != 6 then 
+if $data06 != 6 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/column.sim

@@ -31,7 +31,7 @@ sql create table $tb using $mt tags(  0,  '0' )
 
 $i = 1
 $tb = $tbPrefix . $i
-sql create table $tb using $mt tags(  1,   '1'  )  
+sql create table $tb using $mt tags(  1,   '1'  )
 
 $i = 2
 $tb = $tbPrefix . $i
@@ -66,26 +66,26 @@ sql insert into $tb values(now, '3',  '3')
 
 print =============== step4
 sql select * from $mt where tgcol2 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt
-if $rows != 4 then 
+if $rows != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/create.sim

@@ -25,107 +25,107 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step3
 $i = 3
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
@@ -133,62 +133,62 @@ if $rows != 0 then
   print expect 0, actual: $rows
   return -1
 endi
-  
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
 sql create table $tb using $mt tags( 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step9
 $i = 9
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 sql create table $tb using $mt tags( '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
 print =============== step10
 $i = 10
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 1
 if $rows != 1 then
   print expect 1, actual: $rows
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -198,16 +198,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 smallint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -217,16 +217,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -236,16 +236,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -255,17 +255,17 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 print =============== step15
@@ -274,16 +274,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -293,16 +293,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 double)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -312,16 +312,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = true
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -331,16 +331,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -350,16 +350,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -369,16 +369,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -388,16 +388,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -407,16 +407,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float, tgcol2 double)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -426,16 +426,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -445,51 +445,51 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bool, tgcol3 int, tgcol4 float, tgcol5 double, tgcol6 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol3 = 3
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol4 = 4
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol5 = 5
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol6 = '6'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol6 = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -499,16 +499,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 int, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol6 = '6'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol6 = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -518,16 +518,16 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10), tgcol5 binary(10), tgcol6 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4', '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol3 = '0'
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 
@@ -545,12 +545,12 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250))
 sql create table $tb using $mt tags('1', '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -560,12 +560,12 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(25), tgcol2 binary(250))
 sql create table $tb using $mt tags('1', '1')
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -575,7 +575,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
 #  return -1
-step30: 
+step30:
 
 print =============== step31
 $i = 31
@@ -584,16 +584,16 @@ $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5))
 sql_error create table $tb using $mt tags('1234567')
 sql create table $tb using $mt tags('12345')
-sql insert into $tb values(now, 1) 
+sql insert into $tb values(now, 1)
-sql select * from $mt 
+sql select * from $mt
 print sql select * from $mt
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print $data00 $data01 $data02
-if $data02 != 12345 then 
+if $data02 != 12345 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/delete.sim

@@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -48,38 +48,38 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 < 3
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
@@ -87,13 +87,13 @@ if $data03 != 2.00000 then
 endi
 
 sql describe $tb
-if $data21 != BIGINT then 
+if $data21 != BIGINT then
   return -1
 endi
-if $data31 != FLOAT then 
+if $data31 != FLOAT then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
 
@@ -101,25 +101,25 @@ sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol1 -x step40
   return -1
 step40:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -127,111 +127,111 @@ sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol1 -x step50
   return -1
 step50:
- 
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 tinyint)
 sql create table $tb using $mt tags( 1, 2, 3 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
 sql describe $tb
-if $data21 != SMALLINT then 
+if $data21 != SMALLINT then
   return -1
 endi
-if $data31 != TINYINT then 
+if $data31 != TINYINT then
   return -1
 endi
-if $data41 != VARCHAR then 
+if $data41 != VARCHAR then
   return -1
 endi
-if $data22 != 2 then 
+if $data22 != 2 then
   return -1
 endi
-if $data32 != 1 then 
+if $data32 != 1 then
   return -1
 endi
-if $data42 != 10 then 
+if $data42 != 10 then
   return -1
 endi
-if $data23 != TAG then 
+if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
-if $data43 != TAG then 
+if $data43 != TAG then
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt drop tag tgcol3
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float, tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, 2, '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol3 = '3'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2.00000 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
@@ -244,21 +244,21 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10), tgcol3 binary(10))
 sql create table $tb using $mt tags( 1, '2', '3' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 
@@ -271,24 +271,24 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 binary(10), tgcol3 binary(10), tgcol4 binary(10))
 sql create table $tb using $mt tags( '1', '2', '3', '4' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol4 = '4'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
 
@@ -302,27 +302,27 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int, tgcol3 smallint, tgcol4 float, tgcol5 binary(10))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
 if $data05 != 4.00000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
 
@@ -336,30 +336,30 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 smallint, tgcol3 float, tgcol4 double, tgcol5 binary(10), tgcol6 binary(20))
 sql create table $tb using $mt tags( 1, 2, 3, 4, '5', '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 if $data04 != 3.00000 then
   return -1
 endi
-if $data05 != 4.000000000 then 
+if $data05 != 4.000000000 then
   return -1
 endi
-if $data06 != 5 then 
+if $data06 != 5 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -374,30 +374,30 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -412,16 +412,16 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
@@ -436,23 +436,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step3
   return -1
 step3:
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
@@ -460,23 +460,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 1 -x step4
   return -1
 step4:
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
@@ -484,23 +484,23 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = '1' -x step5
   return -1
 step5:
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
@@ -508,19 +508,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -530,7 +530,7 @@ step51:
 sql select * from $mt where tgcol3 = 1 -x step52
   return -1
 step52:
-  
+
 print =============== step7
 $i = 7
 $mt = $mtPrefix . $i
@@ -538,19 +538,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -560,7 +560,7 @@ step71:
 sql select * from $mt where tgcol3 = 1 -x step72
   return -1
 step72:
-    
+
 print =============== step8
 $i = 8
 $mt = $mtPrefix . $i
@@ -568,19 +568,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -598,19 +598,19 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = 1
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
 
@@ -628,22 +628,22 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol1 = '1'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != null then 
+if $data03 != null then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
 
@@ -664,10 +664,10 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4=4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
@@ -676,13 +676,13 @@ endi
 if $data03 != 4.00000 then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
-if $data06 != null then 
+if $data06 != null then
   return -1
 endi
 
@@ -703,28 +703,28 @@ $tb = $tbPrefix . $i
 
 sql select * from $mt where tgcol4 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 4.000000000 then 
+if $data03 != 4.000000000 then
   return -1
 endi
-if $data04 != null then 
+if $data04 != null then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
-if $data06 != null then 
+if $data06 != null then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
@@ -749,28 +749,28 @@ $tb = $tbPrefix . $i
 sql reset query cache
 sql select * from $mt where tgcol2 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 5.000000000 then 
+if $data04 != 5.000000000 then
   return -1
 endi
-if $data05 != null then 
+if $data05 != null then
   return -1
 endi
-if $data06 != null then 
+if $data06 != null then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
@@ -790,7 +790,7 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 bigint)
 sql create table $tb using $mt tags( 1, 1 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 
 sql alter table xxmt drop tag tag1 -x step141
   return -1
@@ -814,8 +814,8 @@ step145:
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/double.sim

@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol double)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,156 +83,156 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/filter.sim

@@ -24,31 +24,31 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(10))
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '0' )  
+  sql create table $tb using $mt tags( '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( '1' )  
+  sql create table $tb using $mt tags( '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1' 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
@@ -62,18 +62,18 @@ sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(t
 step3:
 
 print =============== step4
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'  
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data00 != 10 then 
+if $data00 != 10 then
   return -1
 endi
 
 print =============== step5
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
@@ -96,9 +96,9 @@ sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(t
 step9:
 
 print =============== step10
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol 
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
@@ -112,14 +112,14 @@ step12:
 
 print =============== step13
 sql select count(tbcol) as c from $mt group by tgcol
-print $data00 
+print $data00
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol) as c from $mt where ts > 1000 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
 if $data00 != 100 then
   print expect 100, actual $data00
   return -1
@@ -132,16 +132,16 @@ step15:
 
 print =============== step16
 sql select count(tbcol) as c from $mt where tgcol = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/float.sim

@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol float)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -83,156 +83,156 @@ if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/int.sim

@@ -24,50 +24,50 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
@@ -78,160 +78,160 @@ sql select * from $tb where ts > 100000 and ts < 100000
 if $rows != 0 then
   return -1
 endi
-sql select * from $tb where ts > now + 4m and ts < now + 3m 
+sql select * from $tb where ts > now + 4m and ts < now + 3m
 if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/int_binary.sim

@@ -24,283 +24,283 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 binary(5))
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, '0' )  
+  sql create table $tb using $mt tags( 0, '0' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, '1' )  
+  sql create table $tb using $mt tags( 1, '1' )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 = '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '0'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> '1'
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1'
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0'
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0'
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = '1' and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '1' and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = '0' and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = '0' and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> '0' and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> '0' and ts < now + 5m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1'
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = '1' group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/int_float.sim

@@ -24,299 +24,299 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int, tgcol2 float)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0, 0 )  
+  sql create table $tb using $mt tags( 0, 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1, 1 )  
+  sql create table $tb using $mt tags( 1, 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol2 > 0.5
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 < 0.5
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 > 0.5 and tgcol2 < 1.5
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol2 <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select * from $mt where ts > now + 4m and tgcol2 = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step7
 sql select * from $mt where ts > now + 4m and tgcol2 = 1 and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 1 and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 = 0 and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol2 <> 0 and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 = 0 and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol2 <> 0 and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol2 <> 0 and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol2 <> 0 and ts < now + 5m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 and tgcol2 = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 
 print =============== step13
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step14
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/set.sim

@@ -25,18 +25,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bool, tgcol2 int)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -50,46 +50,46 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = false
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
 if $data02 != 0 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql describe $tb
 print $data21 $data23 $data32 $data33
-if $data21 != BOOL then 
+if $data21 != BOOL then
   return -1
 endi
-if $data31 != INT then 
+if $data31 != INT then
   return -1
 endi
 if $data23 != TAG then
   return -1
 endi
-if $data33 != TAG then 
+if $data33 != TAG then
   return -1
 endi
 
@@ -99,18 +99,18 @@ $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 smallint, tgcol2 tinyint)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -121,58 +121,58 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = 3
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 2
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
-  
+
-  
+
 print =============== step4
 $i = 4
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 bigint, tgcol2 float)
 sql create table $tb using $mt tags( 1, 2 )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = 1
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2.00000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 
@@ -183,53 +183,53 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = 3
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4.00000 then 
+if $data03 != 4.00000 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 4
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3 then 
+if $data02 != 3 then
   return -1
 endi
-if $data03 != 4.00000 then 
+if $data03 != 4.00000 then
   return -1
 endi
-  
+
-  
+
 print =============== step5
 $i = 5
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 double, tgcol2 binary(10))
 sql create table $tb using $mt tags( 1, '2' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol2 = '2'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1.000000000 then 
+if $data02 != 1.000000000 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
 
@@ -240,64 +240,64 @@ sql reset query cache
 
 sql select * from $mt where tgcol1 = 3
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = '4'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 3.000000000 then 
+if $data02 != 3.000000000 then
   return -1
 endi
-if $data03 != 4 then 
+if $data03 != 4 then
   return -1
 endi
-  
+
 print =============== step6
 $i = 6
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol1 binary(10), tgcol2 int, tgcol3 smallint, tgcol4 binary(11), tgcol5 double, tgcol6 binary(20))
 sql create table $tb using $mt tags( '1', 2, 3, '4', 5, '6' )
-sql insert into $tb values(now, 1)  
+sql insert into $tb values(now, 1)
 sql select * from $mt where tgcol1 = '1'
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2 then 
+if $data03 != 2 then
   return -1
 endi
-if $data04 != 3 then 
+if $data04 != 3 then
   return -1
 endi
-if $data05 != 4 then 
+if $data05 != 4 then
   return -1
 endi
-if $data06 != 5.000000000 then 
+if $data06 != 5.000000000 then
   return -1
 endi
-if $data07 != 6 then 
+if $data07 != 6 then
   return -1
 endi
 
@@ -309,146 +309,146 @@ sql alter table $tb set tag tgcol5=10
 sql alter table $tb set tag tgcol6='11'
 
 sql reset query cache
-  
+
 sql select * from $mt where tgcol1 = '7'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol2 = 8
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = '9'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol5 = 10
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 sql select * from $mt where tgcol6 = '11'
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 7 then 
+if $data02 != 7 then
   return -1
 endi
-if $data03 != 8 then 
+if $data03 != 8 then
   return -1
 endi
-if $data04 != 9 then 
+if $data04 != 9 then
   return -1
 endi
-if $data05 != 10.000000000 then 
+if $data05 != 10.000000000 then
   return -1
 endi
-if $data06 != 11 then 
+if $data06 != 11 then
   return -1
 endi
-if $data07 != null then 
+if $data07 != null then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 

tests/script/tsim/tag/smallint.sim

@@ -24,214 +24,214 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol smallint)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > 100000 and ts < 100000
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 3m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/tag/tinyint.sim

@@ -24,214 +24,214 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol tinyint)
 $i = 0
 while $i < 5
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 0 )  
+  sql create table $tb using $mt tags( 0 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 while $i < 10
   $tb = $tbPrefix . $i
-  sql create table $tb using $mt tags( 1 )  
+  sql create table $tb using $mt tags( 1 )
   $x = 0
   while $x < $rowNum
-    $ms = $x . m 
+    $ms = $x . m
-    sql insert into $tb values (now + $ms , $x ) 
+    sql insert into $tb values (now + $ms , $x )
     $x = $x + 1
-  endw  
+  endw
   $i = $i + 1
-endw 
+endw
 
 print =============== step2
 sql select * from $tb
-if $rows != $rowNum then 
+if $rows != $rowNum then
   return -1
 endi
 sql select * from $tb where ts < now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts <= now + 4m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts >= now + 4m
-if $rows != 15 then 
+if $rows != 15 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts < now + 5m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 sql select * from $tb where ts < now + 4m and ts > now + 5m
 if $rows != 0 then
   return -1
 endi
-sql select * from $tb where ts > 100000 and ts < 100000 
+sql select * from $tb where ts > 100000 and ts < 100000
 if $rows != 0 then
   return -1
 endi
-sql select * from $tb where ts > now + 4m and ts < now + 3m 
+sql select * from $tb where ts > now + 4m and ts < now + 3m
 if $rows != 0 then
   return -1
 endi
 sql select * from $tb where ts > now + 4m and ts > now + 5m and ts < now + 6m
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
 
 print =============== step3
 sql select * from $mt
-if $rows != $totalNum then 
+if $rows != $totalNum then
   return -1
 endi
 
 sql select * from $mt where ts < now + 4m
-if $rows != 50 then 
+if $rows != 50 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m
-if $rows != 150 then 
+if $rows != 150 then
   return -1
 endi
 sql select * from $mt where ts = now + 4m
-if $rows != 0 then 
+if $rows != 0 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m
-if $rows != 10 then 
+if $rows != 10 then
   return -1
 endi
 
 print =============== step4
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 1
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 sql select * from $mt where tgcol <> 0
-if $rows != 100 then 
+if $rows != 100 then
   return -1
 endi
 
 print =============== step5
 sql select * from $mt where ts > now + 4m and tgcol = 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 1
-if $rows != 75 then 
+if $rows != 75 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts < now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol = 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts <= now + 4m and tgcol <> 0
-if $rows != 25 then 
+if $rows != 25 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and ts < now + 5m and tgcol <> 0
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 sql select * from $mt where ts > now + 4m and tgcol <> 0 and ts < now + 5m
-if $rows != 5 then 
+if $rows != 5 then
   return -1
 endi
 
 print =============== step6
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 200 then 
+if $data00 != 200 then
   return -1
 endi
 
 print =============== step7
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step8
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 50 then 
+if $data00 != 50 then
   return -1
 endi
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step10
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tgcol = 1 group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== step11
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m group by tgcol
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 25 then 
+if $data00 != 25 then
   return -1
 endi
 
 print =============== step12
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt partition by tgcol interval(1d)
-print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
+print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data00 != 100 then 
+if $data00 != 100 then
   return -1
 endi
 
 print =============== clear
 sql drop database $db
 sql select * from information_schema.ins_databases
-if $rows != 2 then 
+if $rows != 2 then
   return -1
 endi
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/system-test/2-query/json_tag.py

@@ -1,25 +1,8 @@
-###################################################################
-#           Copyright (c) 2016 by TAOS Technologies, Inc.
-#                     All rights reserved.
-#
-#  This file is proprietary and confidential to TAOS Technologies.
-#  No part of this file may be reproduced, db_test.stored, transmitted,
-#  disclosed or used in any form or by any means other than as
-#  expressly provided by the written permission from Jianhui Tao
-#
-###################################################################
-
 # -*- coding: utf-8 -*-
 
-import imp
-import sys
-import taos
 from util.log import tdLog
 from util.cases import tdCases
 from util.sql import tdSql
-import json
-import os
-
 
 class TDTestCase:
     def caseDescription(self):
@@ -31,35 +14,33 @@ class TDTestCase:
         return
 
     def init(self, conn, logSql):
-        self.testcasePath = os.path.split(__file__)[0]
-        self.testcaseFilename = os.path.split(__file__)[-1]
-        # os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
         tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), True)
+        tdSql.init(conn.cursor(), False)
 
     def run(self):
         # tdSql.prepare()
-        tdSql.execute('drop database if exists db')
+        dbname = "db"
-        tdSql.execute('create database db vgroups 1')
+        tdSql.execute(f'drop database if exists {dbname}')
-        tdSql.execute('use db')
+        tdSql.execute(f'create database {dbname} vgroups 1')
+        tdSql.execute(f'use {dbname}')
         print("============== STEP 1 ===== prepare data & validate json string")
-        tdSql.error("create table if not exists jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json, tagint int)")
+        tdSql.error(f"create table if not exists {dbname}.jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json, tagint int)")
-        tdSql.error("create table if not exists jsons1(ts timestamp, data json) tags(tagint int)")
+        tdSql.error(f"create table if not exists {dbname}.jsons1(ts timestamp, data json) tags(tagint int)")
-        tdSql.execute("create table if not exists jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
+        tdSql.execute(f"create table if not exists {dbname}.jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
-        tdSql.execute("insert into jsons1_1 using jsons1 tags('{\"tag1\":\"fff\",\"tag2\":5, \"tag3\":true}') values(1591060618000, 1, false, 'json1', '你是') (1591060608000, 23, true, '等等', 'json')")
+        tdSql.execute(f"insert into {dbname}.jsons1_1 using {dbname}.jsons1 tags('{{\"tag1\":\"fff\",\"tag2\":5, \"tag3\":true}}') values(1591060618000, 1, false, 'json1', '你是') (1591060608000, 23, true, '等等', 'json')")
-        tdSql.execute("insert into jsons1_2 using jsons1 tags('{\"tag1\":5,\"tag2\":\"beijing\"}') values (1591060628000, 2, true, 'json2', 'sss')")
+        tdSql.execute(f"insert into {dbname}.jsons1_2 using {dbname}.jsons1 tags('{{\"tag1\":5,\"tag2\":\"beijing\"}}') values (1591060628000, 2, true, 'json2', 'sss')")
-        tdSql.execute("insert into jsons1_3 using jsons1 tags('{\"tag1\":false,\"tag2\":\"beijing\"}') values (1591060668000, 3, false, 'json3', 'efwe')")
+        tdSql.execute(f"insert into {dbname}.jsons1_3 using {dbname}.jsons1 tags('{{\"tag1\":false,\"tag2\":\"beijing\"}}') values (1591060668000, 3, false, 'json3', 'efwe')")
-        tdSql.execute("insert into jsons1_4 using jsons1 tags('{\"tag1\":null,\"tag2\":\"shanghai\",\"tag3\":\"hello\"}') values (1591060728000, 4, true, 'json4', '323sd')")
+        tdSql.execute(f"insert into {dbname}.jsons1_4 using {dbname}.jsons1 tags('{{\"tag1\":null,\"tag2\":\"shanghai\",\"tag3\":\"hello\"}}') values (1591060728000, 4, true, 'json4', '323sd')")
-        tdSql.execute("insert into jsons1_5 using jsons1 tags('{\"tag1\":1.232, \"tag2\":null}') values(1591060928000, 1, false, '你就会', 'ewe')")
+        tdSql.execute(f"insert into {dbname}.jsons1_5 using {dbname}.jsons1 tags('{{\"tag1\":1.232, \"tag2\":null}}') values(1591060928000, 1, false, '你就会', 'ewe')")
-        tdSql.execute("insert into jsons1_6 using jsons1 tags('{\"tag1\":11,\"tag2\":\"\",\"tag2\":null}') values(1591061628000, 11, false, '你就会','')")
+        tdSql.execute(f"insert into {dbname}.jsons1_6 using {dbname}.jsons1 tags('{{\"tag1\":11,\"tag2\":\"\",\"tag2\":null}}') values(1591061628000, 11, false, '你就会','')")
-        tdSql.execute("insert into jsons1_7 using jsons1 tags('{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":null}') values(1591062628000, 2, NULL, '你就会', 'dws')")
+        tdSql.execute(f"insert into {dbname}.jsons1_7 using {dbname}.jsons1 tags('{{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":null}}') values(1591062628000, 2, NULL, '你就会', 'dws')")
 
         # test duplicate key using the first one. elimate empty key
-        tdSql.execute("CREATE TABLE if not exists jsons1_8 using jsons1 tags('{\"tag1\":null, \"tag1\":true, \"tag1\":45, \"1tag$\":2, \" \":90, \"\":32}')")
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_8 using {dbname}.jsons1 tags('{{\"tag1\":null, \"tag1\":true, \"tag1\":45, \"1tag$\":2, \" \":90, \"\":32}}')")
-        tdSql.query("select jtag from jsons1_8")
+        tdSql.query(f"select jtag from {dbname}.jsons1_8")
-        tdSql.checkRows(0);
+        tdSql.checkRows(0)
 
-        tdSql.query("select ts,jtag from jsons1 order by ts limit 2,3")
+        tdSql.query(f"select ts,jtag from {dbname}.jsons1 order by ts limit 2,3")
         tdSql.checkData(0, 0, '2020-06-02 09:17:08.000')
         tdSql.checkData(0, 1, '{"tag1":5,"tag2":"beijing"}')
         tdSql.checkData(1, 0, '2020-06-02 09:17:48.000')
@@ -67,7 +48,7 @@ class TDTestCase:
         tdSql.checkData(2, 0, '2020-06-02 09:18:48.000')
         tdSql.checkData(2, 1, '{"tag1":null,"tag2":"shanghai","tag3":"hello"}')
 
-        tdSql.query("select ts,jtag->'tag1' from jsons1 order by ts limit 2,3")
+        tdSql.query(f"select ts,jtag->'tag1' from {dbname}.jsons1 order by ts limit 2,3")
         tdSql.checkData(0, 0, '2020-06-02 09:17:08.000')
         tdSql.checkData(0, 1, '5.000000000')
         tdSql.checkData(1, 0, '2020-06-02 09:17:48.000')
@@ -76,163 +57,163 @@ class TDTestCase:
         tdSql.checkData(2, 1, 'null')
 
         # test empty json string, save as jtag is NULL
-        tdSql.execute("insert into jsons1_9  using jsons1 tags('\t') values (1591062328000, 24, NULL, '你就会', '2sdw')")
+        tdSql.execute(f"insert into {dbname}.jsons1_9  using {dbname}.jsons1 tags('\t') values (1591062328000, 24, NULL, '你就会', '2sdw')")
-        tdSql.execute("CREATE TABLE if not exists jsons1_10 using jsons1 tags('')")
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_10 using {dbname}.jsons1 tags('')")
-        tdSql.execute("CREATE TABLE if not exists jsons1_11 using jsons1 tags(' ')")
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_11 using {dbname}.jsons1 tags(' ')")
-        tdSql.execute("CREATE TABLE if not exists jsons1_12 using jsons1 tags('{}')")
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_12 using {dbname}.jsons1 tags('{{}}')")
-        tdSql.execute("CREATE TABLE if not exists jsons1_13 using jsons1 tags('null')")
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_13 using {dbname}.jsons1 tags('null')")
 
         # test invalidate json
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('\"efwewf\"')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('\"efwewf\"')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('3333')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('3333')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags(76)")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags(76)")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags(hell)")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags(hell)")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('33.33')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('33.33')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('false')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('false')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('[1,true]')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('[1,true]')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{222}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{222}}')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"fe\"}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"fe\"}}')")
 
         # test invalidate json key, key must can be printed assic char
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"tag1\":[1,true]}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"tag1\":[1,true]}}')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"tag1\":{}}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"tag1\":{{}}}}')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"。loc\":\"fff\"}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"。loc\":\"fff\"}}')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"\t\":\"fff\"}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"\t\":\"fff\"}}')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"试试\":\"fff\"}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"试试\":\"fff\"}}')")
 
         # test invalidate json value, value number can not be inf,nan TD-12166
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"k\":1.8e308}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"k\":1.8e308}}')")
-        tdSql.error("CREATE TABLE if not exists jsons1_14 using jsons1 tags('{\"k\":-1.8e308}')")
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"k\":-1.8e308}}')")
 
         #test length limit
         char1= ''.join(['abcd']*64)
         char3= ''.join(['abcd']*1021)
         print(len(char3))   # 4084
-        tdSql.error("CREATE TABLE if not exists  jsons1_15 using  jsons1 tags('{\"%s1\":5}')" % char1)   # len(key)=257
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_15 using {dbname}.jsons1 tags('{{\"%s1\":5}}')" % char1)   # len(key)=257
-        tdSql.execute("CREATE TABLE if not exists  jsons1_15 using  jsons1 tags('{\"%s\":5}')" % char1)  # len(key)=256
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_15 using {dbname}.jsons1 tags('{{\"%s\":5}}')" % char1)  # len(key)=256
-        tdSql.error("CREATE TABLE if not exists  jsons1_16 using  jsons1 tags('{\"TSSSS\":\"%s\"}')" % char3)   # len(object)=4096
+        tdSql.error(f"create TABLE if not exists {dbname}.jsons1_16 using {dbname}.jsons1 tags('{{\"TSSSS\":\"%s\"}}')" % char3)   # len(object)=4096
-        tdSql.execute("CREATE TABLE if not exists  jsons1_16 using  jsons1 tags('{\"TSSS\":\"%s\"}')" % char3)  # len(object)=4095
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_16 using {dbname}.jsons1 tags('{{\"TSSS\":\"%s\"}}')" % char3)  # len(object)=4095
-        tdSql.execute("drop table if exists jsons1_15")
+        tdSql.execute(f"drop table if exists {dbname}.jsons1_15")
-        tdSql.execute("drop table if exists jsons1_16")
+        tdSql.execute(f"drop table if exists {dbname}.jsons1_16")
 
         print("============== STEP 2 ===== alter table json tag")
-        tdSql.error("ALTER STABLE jsons1 add tag tag2 nchar(20)")
+        tdSql.error(f"ALTER stable {dbname}.jsons1 add tag tag2 nchar(20)")
-        tdSql.error("ALTER STABLE jsons1 drop tag jtag")
+        tdSql.error(f"ALTER stable {dbname}.jsons1 drop tag jtag")
-        tdSql.error("ALTER TABLE jsons1 MODIFY TAG jtag nchar(128)")
+        tdSql.error(f"ALTER table {dbname}.jsons1 MODIFY TAG jtag nchar(128)")
 
-        tdSql.execute("ALTER TABLE jsons1_1 SET TAG jtag='{\"tag1\":\"femail\",\"tag2\":35,\"tag3\":true}'")
+        tdSql.execute(f"ALTER table {dbname}.jsons1_1 SET TAG jtag='{{\"tag1\":\"femail\",\"tag2\":35,\"tag3\":true}}'")
-        tdSql.query("select jtag from jsons1_1")
+        tdSql.query(f"select jtag from {dbname}.jsons1_1")
         tdSql.checkData(0, 0, '{"tag1":"femail","tag2":35,"tag3":true}')
-        tdSql.execute("ALTER TABLE jsons1 rename TAG jtag jtag_new")
+        tdSql.execute(f"ALTER table {dbname}.jsons1 rename TAG jtag jtag_new")
-        tdSql.execute("ALTER TABLE jsons1 rename TAG jtag_new jtag")
+        tdSql.execute(f"ALTER table {dbname}.jsons1 rename TAG jtag_new jtag")
 
-        tdSql.execute("create table st(ts timestamp, i int) tags(t int)")
+        tdSql.execute(f"create table {dbname}.st(ts timestamp, i int) tags(t int)")
-        tdSql.error("ALTER STABLE st add tag jtag json")
+        tdSql.error(f"ALTER stable {dbname}.st add tag jtag json")
-        tdSql.error("ALTER STABLE st add column jtag json")
+        tdSql.error(f"ALTER stable {dbname}.st add column jtag json")
 
         print("============== STEP 3 ===== query table")
         # test error syntax
-        tdSql.error("select * from jsons1 where jtag->tag1='beijing'")
+        tdSql.error(f"select * from {dbname}.jsons1 where jtag->tag1='beijing'")
-        tdSql.error("select -> from jsons1")
+        tdSql.error(f"select -> from {dbname}.jsons1")
-        tdSql.error("select * from jsons1 where contains")
+        tdSql.error(f"select * from {dbname}.jsons1 where contains")
-        tdSql.error("select * from jsons1 where jtag->")
+        tdSql.error(f"select * from {dbname}.jsons1 where jtag->")
-        tdSql.error("select jtag->location from jsons1")
+        tdSql.error(f"select jtag->location from {dbname}.jsons1")
-        tdSql.error("select jtag contains location from jsons1")
+        tdSql.error(f"select jtag contains location from {dbname}.jsons1")
-        tdSql.error("select * from jsons1 where jtag contains location")
+        tdSql.error(f"select * from {dbname}.jsons1 where jtag contains location")
-        tdSql.query("select * from jsons1 where jtag contains''")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag contains''")
-        tdSql.error("select * from jsons1 where jtag contains 'location'='beijing'")
+        tdSql.error(f"select * from {dbname}.jsons1 where jtag contains 'location'='beijing'")
 
         # test function error
-        tdSql.error("select avg(jtag->'tag1') from jsons1")
+        tdSql.error(f"select avg(jtag->'tag1') from {dbname}.jsons1")
-        tdSql.error("select avg(jtag) from jsons1")
+        tdSql.error(f"select avg(jtag) from {dbname}.jsons1")
-        tdSql.error("select min(jtag->'tag1') from jsons1")
+        tdSql.error(f"select min(jtag->'tag1') from {dbname}.jsons1")
-        tdSql.error("select min(jtag) from jsons1")
+        tdSql.error(f"select min(jtag) from {dbname}.jsons1")
-        tdSql.error("select ceil(jtag->'tag1') from jsons1")
+        tdSql.error(f"select ceil(jtag->'tag1') from {dbname}.jsons1")
-        tdSql.error("select ceil(jtag) from jsons1")
+        tdSql.error(f"select ceil(jtag) from {dbname}.jsons1")
 
 
         #test scalar operation
-        tdSql.query("select jtag contains 'tag1',jtag->'tag1' from jsons1 order by jtag->'tag1'")
+        tdSql.query(f"select jtag contains 'tag1',jtag->'tag1' from {dbname}.jsons1 order by jtag->'tag1'")
         tdSql.checkRows(9)
-        tdSql.query("select jtag->'tag1' like 'fe%',jtag->'tag1' from jsons1 order by jtag->'tag1'")
+        tdSql.query(f"select jtag->'tag1' like 'fe%',jtag->'tag1' from {dbname}.jsons1 order by jtag->'tag1'")
         tdSql.checkRows(9)
-        tdSql.query("select jtag->'tag1' not like 'fe%',jtag->'tag1' from jsons1 order by jtag->'tag1'")
+        tdSql.query(f"select jtag->'tag1' not like 'fe%',jtag->'tag1' from {dbname}.jsons1 order by jtag->'tag1'")
         tdSql.checkRows(9)
-        tdSql.query("select jtag->'tag1' match 'fe',jtag->'tag1' from jsons1 order by jtag->'tag1'")
+        tdSql.query(f"select jtag->'tag1' match 'fe',jtag->'tag1' from {dbname}.jsons1 order by jtag->'tag1'")
         tdSql.checkRows(9)
-        tdSql.query("select jtag->'tag1' nmatch 'fe',jtag->'tag1' from jsons1 order by jtag->'tag1'")
+        tdSql.query(f"select jtag->'tag1' nmatch 'fe',jtag->'tag1' from {dbname}.jsons1 order by jtag->'tag1'")
         tdSql.checkRows(9)
-        tdSql.query("select jtag->'tag1',jtag->'tag1'>='a' from jsons1 order by jtag->'tag1'")
+        tdSql.query(f"select jtag->'tag1',jtag->'tag1'>='a' from {dbname}.jsons1 order by jtag->'tag1'")
         tdSql.checkRows(9)
 
         # test select normal column
-        tdSql.query("select dataint from jsons1 order by dataint")
+        tdSql.query(f"select dataint from {dbname}.jsons1 order by dataint")
         tdSql.checkRows(9)
         tdSql.checkData(1, 0, 1)
 
         # test select json tag
-        tdSql.query("select * from jsons1")
+        tdSql.query(f"select * from {dbname}.jsons1")
         tdSql.checkRows(9)
-        tdSql.query("select jtag from jsons1")
+        tdSql.query(f"select jtag from {dbname}.jsons1")
         tdSql.checkRows(9)
-        tdSql.query("select * from jsons1 where jtag is null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag is null")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag is not null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag is not null")
         tdSql.checkRows(8)
 
         # test jtag is NULL
-        tdSql.query("select jtag from jsons1_9")
+        tdSql.query(f"select jtag from {dbname}.jsons1_9")
         tdSql.checkData(0, 0, None)
 
         # test select json tag->'key', value is string
-        tdSql.query("select jtag->'tag1' from jsons1_1")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1_1")
         tdSql.checkData(0, 0, '"femail"')
-        tdSql.query("select jtag->'tag2' from jsons1_6")
+        tdSql.query(f"select jtag->'tag2' from {dbname}.jsons1_6")
         tdSql.checkData(0, 0, '""')
         # test select json tag->'key', value is int
-        tdSql.query("select jtag->'tag2' from jsons1_1")
+        tdSql.query(f"select jtag->'tag2' from {dbname}.jsons1_1")
         tdSql.checkData(0, 0, "35.000000000")
         # test select json tag->'key', value is bool
-        tdSql.query("select jtag->'tag3' from jsons1_1")
+        tdSql.query(f"select jtag->'tag3' from {dbname}.jsons1_1")
         tdSql.checkData(0, 0, "true")
         # test select json tag->'key', value is null
-        tdSql.query("select jtag->'tag1' from jsons1_4")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1_4")
         tdSql.checkData(0, 0, "null")
         # test select json tag->'key', value is double
-        tdSql.query("select jtag->'tag1' from jsons1_5")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1_5")
         tdSql.checkData(0, 0, "1.232000000")
         # test select json tag->'key', key is not exist
-        tdSql.query("select jtag->'tag10' from jsons1_4")
+        tdSql.query(f"select jtag->'tag10' from {dbname}.jsons1_4")
         tdSql.checkData(0, 0, None)
 
-        tdSql.query("select jtag->'tag1' from jsons1")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1")
         tdSql.checkRows(9)
         # test header name
-        res = tdSql.getColNameList("select jtag->'tag1' from jsons1")
+        res = tdSql.getColNameList(f"select jtag->'tag1' from {dbname}.jsons1")
         cname_list = []
         cname_list.append("jtag->'tag1'")
         tdSql.checkColNameList(res, cname_list)
 
 
         # test where with json tag
-        tdSql.query("select * from jsons1_1 where jtag is not null")
+        tdSql.query(f"select * from {dbname}.jsons1_1 where jtag is not null")
-        tdSql.query("select * from jsons1 where jtag='{\"tag1\":11,\"tag2\":\"\"}'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag='{{\"tag1\":11,\"tag2\":\"\"}}'")
-        tdSql.error("select * from jsons1 where jtag->'tag1'={}")
+        tdSql.error(f"select * from {dbname}.jsons1 where jtag->'tag1'={{}}")
 
         # test json error
-        tdSql.error("select jtag + 1 from jsons1")
+        tdSql.error(f"select jtag + 1 from {dbname}.jsons1")
-        tdSql.error("select jtag > 1 from jsons1")
+        tdSql.error(f"select jtag > 1 from {dbname}.jsons1")
-        tdSql.error("select jtag like \"1\" from jsons1")
+        tdSql.error(f"select jtag like \"1\" from {dbname}.jsons1")
-        tdSql.error("select jtag in  (\"1\") from jsons1")
+        tdSql.error(f"select jtag in  (\"1\") from {dbname}.jsons1")
-        #tdSql.error("select jtag from jsons1 where jtag > 1")
+        #tdSql.error(f"select jtag from {dbname}.jsons1 where jtag > 1")
-        #tdSql.error("select jtag from jsons1 where jtag like 'fsss'")
+        #tdSql.error(f"select jtag from {dbname}.jsons1 where jtag like 'fsss'")
-        #tdSql.error("select jtag from jsons1 where jtag in (1)")
+        #tdSql.error(f"select jtag from {dbname}.jsons1 where jtag in (1)")
 
 
         # where json value is string
-        tdSql.query("select * from jsons1 where jtag->'tag2'='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'='beijing'")
         tdSql.checkRows(2)
-        tdSql.query("select dataint,tbname,jtag->'tag1',jtag from jsons1 where jtag->'tag2'='beijing' order by dataint")
+        tdSql.query(f"select dataint,tbname,jtag->'tag1',jtag from {dbname}.jsons1 where jtag->'tag2'='beijing' order by dataint")
         tdSql.checkRows(2)
         tdSql.checkData(0, 0, 2)
         tdSql.checkData(0, 1, 'jsons1_2')
@@ -243,180 +224,180 @@ class TDTestCase:
         tdSql.checkData(1, 2, 'false')
 
 
-        tdSql.query("select * from jsons1 where jtag->'tag1'='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'='beijing'")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'='收到货'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'='收到货'")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag2'>'beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'>'beijing'")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag2'>='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'>='beijing'")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag2'<'beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'<'beijing'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag2'<='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'<='beijing'")
         tdSql.checkRows(4)
-        tdSql.query("select * from jsons1 where jtag->'tag2'!='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'!='beijing'")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag2'=''")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2'=''")
         tdSql.checkRows(2)
 
         # where json value is int
-        tdSql.query("select * from jsons1 where jtag->'tag1'=5")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=5")
         tdSql.checkRows(1)
         tdSql.checkData(0, 1, 2)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=10")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=10")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'<54")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'<54")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1'<=11")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'<=11")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1'>4")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'>4")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1'>=5")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'>=5")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1'!=5")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'!=5")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1'!=55")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'!=55")
         tdSql.checkRows(3)
 
         # where json value is double
-        tdSql.query("select * from jsons1 where jtag->'tag1'=1.232")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=1.232")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag1'<1.232")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'<1.232")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'<=1.232")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'<=1.232")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag1'>1.23")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'>1.23")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1'>=1.232")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'>=1.232")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1'!=1.232")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'!=1.232")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1'!=3.232")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'!=3.232")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1'/0=3")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'/0=3")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'/5=1")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'/5=1")
         tdSql.checkRows(1)
 
         # where json value is bool
-        tdSql.query("select * from jsons1 where jtag->'tag1'=true")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=true")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=false")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=false")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag1'!=false")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'!=false")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'>false")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'>false")
         tdSql.checkRows(0)
 
         # where json value is null
-        tdSql.query("select * from jsons1 where jtag->'tag1'=null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=null")
         tdSql.checkRows(0)
 
         # where json key is null
-        tdSql.query("select * from jsons1 where jtag->'tag_no_exist'=3")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag_no_exist'=3")
         tdSql.checkRows(0)
 
         # where json value is not exist
-        tdSql.query("select * from jsons1 where jtag->'tag1' is null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' is null")
         tdSql.checkData(0, 0, 'jsons1_9')
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag4' is null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag4' is null")
         tdSql.checkRows(9)
-        tdSql.query("select * from jsons1 where jtag->'tag3' is not null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag3' is not null")
         tdSql.checkRows(3)
 
         # test contains
-        tdSql.query("select * from jsons1 where jtag contains 'tag1'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag contains 'tag1'")
         tdSql.checkRows(8)
-        tdSql.query("select * from jsons1 where jtag contains 'tag3'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag contains 'tag3'")
         tdSql.checkRows(4)
-        tdSql.query("select * from jsons1 where jtag contains 'tag_no_exist'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag contains 'tag_no_exist'")
         tdSql.checkRows(0)
 
         # test json tag in where condition with and/or
-        tdSql.query("select * from jsons1 where jtag->'tag1'=false and jtag->'tag2'='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=false and jtag->'tag2'='beijing'")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=false or jtag->'tag2'='beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=false or jtag->'tag2'='beijing'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=false and jtag->'tag2'='shanghai'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=false and jtag->'tag2'='shanghai'")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=false and jtag->'tag2'='shanghai'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=false and jtag->'tag2'='shanghai'")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=13 or jtag->'tag2'>35")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=13 or jtag->'tag2'>35")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1'=13 or jtag->'tag2'>35")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'=13 or jtag->'tag2'>35")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag1' is not null and jtag contains 'tag3'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' is not null and jtag contains 'tag3'")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1'='femail' and jtag contains 'tag3'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1'='femail' and jtag contains 'tag3'")
         tdSql.checkRows(2)
 
 
         # test with between and
-        tdSql.query("select * from jsons1 where jtag->'tag1' between 1 and 30")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' between 1 and 30")
         tdSql.checkRows(3)
-        tdSql.query("select * from jsons1 where jtag->'tag1' between 'femail' and 'beijing'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' between 'femail' and 'beijing'")
         tdSql.checkRows(2)
 
         # test with tbname/normal column
-        tdSql.query("select * from jsons1 where tbname = 'jsons1_1'")
+        tdSql.query(f"select * from {dbname}.jsons1 where tbname = 'jsons1_1'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where tbname = 'jsons1_1' and jtag contains 'tag3'")
+        tdSql.query(f"select * from {dbname}.jsons1 where tbname = 'jsons1_1' and jtag contains 'tag3'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where tbname = 'jsons1_1' and jtag contains 'tag3' and dataint=3")
+        tdSql.query(f"select * from {dbname}.jsons1 where tbname = 'jsons1_1' and jtag contains 'tag3' and dataint=3")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where tbname = 'jsons1_1' and jtag contains 'tag3' and dataint=23")
+        tdSql.query(f"select * from {dbname}.jsons1 where tbname = 'jsons1_1' and jtag contains 'tag3' and dataint=23")
         tdSql.checkRows(1)
 
 
         # test where condition like
-        tdSql.query("select * from jsons1 where jtag->'tag2' like 'bei%'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2' like 'bei%'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1' like 'fe%' and jtag->'tag2' is not null")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' like 'fe%' and jtag->'tag2' is not null")
         tdSql.checkRows(2)
 
         # test where condition in  no support in
-        tdSql.error("select * from jsons1 where jtag->'tag1' in ('beijing')")
+        tdSql.error(f"select * from {dbname}.jsons1 where jtag->'tag1' in ('beijing')")
 
         # test where condition match/nmath
-        tdSql.query("select * from jsons1 where jtag->'tag1' match 'ma'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' match 'ma'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1' match 'ma$'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' match 'ma$'")
         tdSql.checkRows(0)
-        tdSql.query("select * from jsons1 where jtag->'tag2' match 'jing$'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag2' match 'jing$'")
         tdSql.checkRows(2)
-        tdSql.query("select * from jsons1 where jtag->'tag1' match '收到'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' match '收到'")
         tdSql.checkRows(1)
-        tdSql.query("select * from jsons1 where jtag->'tag1' nmatch 'ma'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'tag1' nmatch 'ma'")
         tdSql.checkRows(1)
 
         # test distinct
-        tdSql.execute("insert into jsons1_14 using jsons1 tags('{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":null}') values(1591062628000, 2, NULL, '你就会', 'dws')")
+        tdSql.execute(f"insert into {dbname}.jsons1_14 using {dbname}.jsons1 tags('{{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":null}}') values(1591062628000, 2, NULL, '你就会', 'dws')")
-        tdSql.query("select distinct jtag->'tag1' from jsons1")
+        tdSql.query(f"select distinct jtag->'tag1' from {dbname}.jsons1")
         tdSql.checkRows(8)
-        tdSql.error("select distinct jtag from jsons1")
+        tdSql.error(f"select distinct jtag from {dbname}.jsons1")
 
         #test dumplicate key with normal colomn
-        tdSql.execute("INSERT INTO jsons1_15 using jsons1 tags('{\"tbname\":\"tt\",\"databool\":true,\"datastr\":\"是是是\"}') values(1591060828000, 4, false, 'jjsf', \"你就会\")")
+        tdSql.execute(f"insert into {dbname}.jsons1_15 using {dbname}.jsons1 tags('{{\"tbname\":\"tt\",\"databool\":true,\"datastr\":\"是是是\"}}') values(1591060828000, 4, false, 'jjsf', \"你就会\")")
-        tdSql.query("select * from jsons1 where jtag->'datastr' match '是' and datastr match 'js'")
+        tdSql.query(f"select * from {dbname}.jsons1 where jtag->'datastr' match '是' and datastr match 'js'")
         tdSql.checkRows(1)
-        tdSql.query("select tbname,jtag->'tbname' from jsons1 where jtag->'tbname'='tt' and tbname='jsons1_15'")
+        tdSql.query(f"select tbname,jtag->'tbname' from {dbname}.jsons1 where jtag->'tbname'='tt' and tbname='jsons1_15'")
         tdSql.checkRows(1)
 
         # test join
-        tdSql.execute("create table if not exists jsons2(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
+        tdSql.execute(f"create table if not exists {dbname}.jsons2(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
-        tdSql.execute("insert into jsons2_1 using jsons2 tags('{\"tag1\":\"fff\",\"tag2\":5, \"tag3\":true}') values(1591060618000, 2, false, 'json2', '你是2')")
+        tdSql.execute(f"insert into {dbname}.jsons2_1 using {dbname}.jsons2 tags('{{\"tag1\":\"fff\",\"tag2\":5, \"tag3\":true}}') values(1591060618000, 2, false, 'json2', '你是2')")
-        tdSql.execute("insert into jsons2_2 using jsons2 tags('{\"tag1\":5,\"tag2\":null}') values (1591060628000, 2, true, 'json2', 'sss')")
+        tdSql.execute(f"insert into {dbname}.jsons2_2 using {dbname}.jsons2 tags('{{\"tag1\":5,\"tag2\":null}}') values (1591060628000, 2, true, 'json2', 'sss')")
 
-        tdSql.execute("create table if not exists jsons3(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
+        tdSql.execute(f"create table if not exists {dbname}.jsons3(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
-        tdSql.execute("insert into jsons3_1 using jsons3 tags('{\"tag1\":\"fff\",\"tag2\":5, \"tag3\":true}') values(1591060618000, 3, false, 'json3', '你是3')")
+        tdSql.execute(f"insert into {dbname}.jsons3_1 using {dbname}.jsons3 tags('{{\"tag1\":\"fff\",\"tag2\":5, \"tag3\":true}}') values(1591060618000, 3, false, 'json3', '你是3')")
-        tdSql.execute("insert into jsons3_2 using jsons3 tags('{\"tag1\":5,\"tag2\":\"beijing\"}') values (1591060638000, 2, true, 'json3', 'sss')")
+        tdSql.execute(f"insert into {dbname}.jsons3_2 using {dbname}.jsons3 tags('{{\"tag1\":5,\"tag2\":\"beijing\"}}') values (1591060638000, 2, true, 'json3', 'sss')")
-        tdSql.query("select 'sss',33,a.jtag->'tag3' from jsons2 a,jsons3 b where a.ts=b.ts and a.jtag->'tag1'=b.jtag->'tag1'")
+        tdSql.query(f"select 'sss',33,a.jtag->'tag3' from {dbname}.jsons2 a,jsons3 b where a.ts=b.ts and a.jtag->'tag1'=b.jtag->'tag1'")
         tdSql.checkData(0, 0, "sss")
         tdSql.checkData(0, 2, "true")
 
-        res = tdSql.getColNameList("select 'sss',33,a.jtag->'tag3' from jsons2 a,jsons3 b where a.ts=b.ts and a.jtag->'tag1'=b.jtag->'tag1'")
+        res = tdSql.getColNameList(f"select 'sss',33,a.jtag->'tag3' from {dbname}.jsons2 a,jsons3 b where a.ts=b.ts and a.jtag->'tag1'=b.jtag->'tag1'")
         cname_list = []
         cname_list.append("'sss'")
         cname_list.append("33")
@@ -424,19 +405,19 @@ class TDTestCase:
         tdSql.checkColNameList(res, cname_list)
         #
         # test group by & order by  json tag
-        tdSql.query("select ts,jtag->'tag1' from jsons1 partition by jtag->'tag1' order by jtag->'tag1' desc")
+        tdSql.query(f"select ts,jtag->'tag1' from {dbname}.jsons1 partition by jtag->'tag1' order by jtag->'tag1' desc")
         tdSql.checkRows(11)
         tdSql.checkData(0, 1, '"femail"')
         tdSql.checkData(2, 1, '"收到货"')
         tdSql.checkData(7, 1, "false")
 
 
-        tdSql.error("select count(*) from jsons1 group by jtag")
+        tdSql.error(f"select count(*) from {dbname}.jsons1 group by jtag")
-        tdSql.error("select count(*) from jsons1 partition by jtag")
+        tdSql.error(f"select count(*) from {dbname}.jsons1 partition by jtag")
-        tdSql.error("select count(*) from jsons1 group by jtag order by jtag")
+        tdSql.error(f"select count(*) from {dbname}.jsons1 group by jtag order by jtag")
-        tdSql.error("select count(*) from jsons1 group by jtag->'tag1' order by jtag->'tag2'")
+        tdSql.error(f"select count(*) from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag2'")
-        tdSql.error("select count(*) from jsons1 group by jtag->'tag1' order by jtag")
+        tdSql.error(f"select count(*) from {dbname}.jsons1 group by jtag->'tag1' order by jtag")
-        tdSql.query("select count(*),jtag->'tag1' from jsons1 group by jtag->'tag1' order by jtag->'tag1' desc")
+        tdSql.query(f"select count(*),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1' desc")
         tdSql.checkRows(8)
         tdSql.checkData(0, 0, 2)
         tdSql.checkData(0, 1, '"femail"')
@@ -447,7 +428,7 @@ class TDTestCase:
         tdSql.checkData(5, 0, 1)
         tdSql.checkData(5, 1, "false")
 
-        tdSql.query("select count(*),jtag->'tag1' from jsons1 group by jtag->'tag1' order by jtag->'tag1' asc")
+        tdSql.query(f"select count(*),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1' asc")
         tdSql.checkRows(8)
         tdSql.checkData(0, 1, None)
         tdSql.checkData(2, 0, 1)
@@ -458,7 +439,7 @@ class TDTestCase:
         tdSql.checkData(7, 1, '"femail"')
 
         # test stddev with group by json tag
-        tdSql.query("select stddev(dataint),jtag->'tag1' from jsons1 group by jtag->'tag1' order by jtag->'tag1'")
+        tdSql.query(f"select stddev(dataint),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1'")
         tdSql.checkRows(8)
         tdSql.checkData(0, 1, None)
         tdSql.checkData(4, 0, 0)
@@ -466,222 +447,222 @@ class TDTestCase:
         tdSql.checkData(7, 0, 11)
         tdSql.checkData(7, 1, '"femail"')
 
-        res = tdSql.getColNameList("select stddev(dataint),jsons1.jtag->'tag1' from jsons1 group by jsons1.jtag->'tag1' order by jtag->'tag1'")
+        res = tdSql.getColNameList(f"select stddev(dataint),jsons1.jtag->'tag1' from {dbname}.jsons1 group by jsons1.jtag->'tag1' order by jtag->'tag1'")
         cname_list = []
         cname_list.append("stddev(dataint)")
         cname_list.append("jsons1.jtag->'tag1'")
         tdSql.checkColNameList(res, cname_list)
 
         # test top/bottom with group by json tag
-        tdSql.query("select top(dataint,2),jtag->'tag1' from jsons1 group by jtag->'tag1' order by jtag->'tag1'")
+        tdSql.query(f"select top(dataint,2),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' order by jtag->'tag1'")
         tdSql.checkRows(11)
         tdSql.checkData(0, 1, None)
 
         # test having
-        tdSql.query("select count(*),jtag->'tag1' from jsons1 group by jtag->'tag1' having count(*) > 1")
+        tdSql.query(f"select count(*),jtag->'tag1' from {dbname}.jsons1 group by jtag->'tag1' having count(*) > 1")
         tdSql.checkRows(3)
 
         # subquery with json tag
-        tdSql.query("select * from (select jtag, dataint from jsons1) order by dataint")
+        tdSql.query(f"select * from (select jtag, dataint from {dbname}.jsons1) order by dataint")
         tdSql.checkRows(11)
         tdSql.checkData(1, 1, 1)
         tdSql.checkData(5, 0, '{"tag1":false,"tag2":"beijing"}')
 
-        tdSql.error("select jtag->'tag1' from (select jtag->'tag1', dataint from jsons1)")
+        tdSql.error(f"select jtag->'tag1' from (select jtag->'tag1', dataint from {dbname}.jsons1)")
-        tdSql.error("select t->'tag1' from (select jtag->'tag1' as t, dataint from jsons1)")
+        tdSql.error(f"select t->'tag1' from (select jtag->'tag1' as t, dataint from {dbname}.jsons1)")
-        tdSql.error("select ts,jtag->'tag1' from (select jtag->'tag1',tbname,ts from jsons1 order by ts)")
+        tdSql.error(f"select ts,jtag->'tag1' from (select jtag->'tag1',tbname,ts from {dbname}.jsons1 order by ts)")
 
         # union all
-        tdSql.query("select jtag->'tag1' from jsons1 union all select jtag->'tag2' from jsons2")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1 union all select jtag->'tag2' from {dbname}.jsons2")
         tdSql.checkRows(13)
-        tdSql.query("select jtag->'tag1' from jsons1_1 union all select jtag->'tag2' from jsons2_1")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1_1 union all select jtag->'tag2' from {dbname}.jsons2_1")
         tdSql.checkRows(3)
 
-        tdSql.query("select jtag->'tag1' from jsons1_1 union all select jtag->'tag1' from jsons2_1")
+        tdSql.query(f"select jtag->'tag1' from {dbname}.jsons1_1 union all select jtag->'tag1' from {dbname}.jsons2_1")
         tdSql.checkRows(3)
-        tdSql.query("select dataint,jtag->'tag1',tbname from jsons1 union all select dataint,jtag->'tag1',tbname from jsons2")
+        tdSql.query(f"select dataint,jtag->'tag1',tbname from {dbname}.jsons1 union all select dataint,jtag->'tag1',tbname from {dbname}.jsons2")
         tdSql.checkRows(13)
-        tdSql.query("select dataint,jtag,tbname from jsons1 union all select dataint,jtag,tbname from jsons2")
+        tdSql.query(f"select dataint,jtag,tbname from {dbname}.jsons1 union all select dataint,jtag,tbname from {dbname}.jsons2")
         tdSql.checkRows(13)
 
         #show create table
-        tdSql.query("show create table jsons1")
+        tdSql.query(f"show create table {dbname}.jsons1")
         tdSql.checkData(0, 1, 'CREATE STABLE `jsons1` (`ts` TIMESTAMP, `dataint` INT, `databool` BOOL, `datastr` NCHAR(50), `datastrbin` VARCHAR(150)) TAGS (`jtag` JSON)')
 
         #test aggregate function:count/avg/twa/irate/sum/stddev/leastsquares
-        tdSql.query("select count(*) from jsons1 where jtag is not null")
+        tdSql.query(f"select count(*) from {dbname}.jsons1 where jtag is not null")
         tdSql.checkData(0, 0, 10)
-        tdSql.query("select avg(dataint) from jsons1 where jtag is not null")
+        tdSql.query(f"select avg(dataint) from {dbname}.jsons1 where jtag is not null")
         tdSql.checkData(0, 0, 5.3)
-        # tdSql.query("select twa(dataint) from jsons1 where jtag is not null")
+        # tdSql.query(f"select twa(dataint) from {dbname}.jsons1 where jtag is not null")
         # tdSql.checkData(0, 0, 28.386363636363637)
-        # tdSql.query("select irate(dataint) from jsons1 where jtag is not null")
+        # tdSql.query(f"select irate(dataint) from {dbname}.jsons1 where jtag is not null")
 
-        tdSql.query("select sum(dataint) from jsons1 where jtag->'tag1' is not null")
+        tdSql.query(f"select sum(dataint) from {dbname}.jsons1 where jtag->'tag1' is not null")
         tdSql.checkData(0, 0, 45)
-        tdSql.query("select stddev(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select stddev(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 4.496912521)
-        tdSql.query("SELECT LEASTSQUARES(dataint, 1, 1) from jsons1 where jtag is not null")
+        tdSql.query(f"select LEASTSQUARES(dataint, 1, 1) from {dbname}.jsons1 where jtag is not null")
 
         #test selection function:min/max/first/last/top/bottom/percentile/apercentile/last_row/interp
-        tdSql.query("select min(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select min(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 1)
-        tdSql.query("select max(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select max(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 11)
-        tdSql.query("select first(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select first(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 2)
-        tdSql.query("select last(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select last(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 11)
-        tdSql.query("select top(dataint,100) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select top(dataint,100) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkRows(3)
-        tdSql.query("select bottom(dataint,100) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select bottom(dataint,100) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkRows(3)
-        #tdSql.query("select percentile(dataint,20) from jsons1 where jtag->'tag1'>1")
+        #tdSql.query(f"select percentile(dataint,20) from {dbname}.jsons1 where jtag->'tag1'>1")
-        tdSql.query("select apercentile(dataint, 50) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select apercentile(dataint, 50) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 1.5)
-        # tdSql.query("select last_row(dataint) from jsons1 where jtag->'tag1'>1")
+        # tdSql.query(f"select last_row(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
-        # tdSql.query("select interp(dataint) from jsons1 where ts = '2020-06-02 09:17:08.000' and jtag->'tag1'>1")
+        # tdSql.query(f"select interp(dataint) from {dbname}.jsons1 where ts = '2020-06-02 09:17:08.000' and jtag->'tag1'>1")
 
         #test calculation function:diff/derivative/spread/ceil/floor/round/
-        tdSql.query("select diff(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select diff(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkRows(2)
         # tdSql.checkData(0, 0, -1)
         # tdSql.checkData(1, 0, 10)
-        tdSql.query("select derivative(dataint, 10m, 0) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select derivative(dataint, 10m, 0) from {dbname}.jsons1 where jtag->'tag1'>1")
         # tdSql.checkData(0, 0, -2)
-        tdSql.query("select spread(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select spread(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkData(0, 0, 10)
-        tdSql.query("select ceil(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select ceil(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkRows(3)
-        tdSql.query("select floor(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select floor(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkRows(3)
-        tdSql.query("select round(dataint) from jsons1 where jtag->'tag1'>1")
+        tdSql.query(f"select round(dataint) from {dbname}.jsons1 where jtag->'tag1'>1")
         tdSql.checkRows(3)
 
         #math function
-        tdSql.query("select sin(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select sin(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select cos(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select cos(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select tan(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select tan(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select asin(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select asin(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select acos(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select acos(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select atan(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select atan(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select ceil(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select ceil(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select floor(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select floor(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select round(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select round(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select abs(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select abs(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select pow(dataint,5) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select pow(dataint,5) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select log(dataint,10) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select log(dataint,10) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select sqrt(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select sqrt(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select HISTOGRAM(dataint,'user_input','[1, 33, 555, 7777]',1)  from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select HISTOGRAM(dataint,'user_input','[1, 33, 555, 7777]',1)  from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select csum(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select csum(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select mavg(dataint,1) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select mavg(dataint,1) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select statecount(dataint,'GE',10) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select statecount(dataint,'GE',10) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select stateduration(dataint,'GE',0) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select stateduration(dataint,'GE',0) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select sample(dataint,3) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select sample(dataint,3) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select HYPERLOGLOG(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select HYPERLOGLOG(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(1)
-        tdSql.query("select twa(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select twa(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(1)
 
         # function not ready
-        tdSql.query("select tail(dataint,1) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select tail(dataint,1) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(1)
-        tdSql.query("select unique(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select unique(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select mode(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select mode(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(1)
-        tdSql.query("select irate(dataint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select irate(dataint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(1)
 
         #str function
-        tdSql.query("select upper(dataStr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select upper(dataStr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select ltrim(dataStr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select ltrim(dataStr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select lower(dataStr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select lower(dataStr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select rtrim(dataStr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select rtrim(dataStr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select LENGTH(dataStr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select LENGTH(dataStr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select CHAR_LENGTH(dataStr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select CHAR_LENGTH(dataStr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select SUBSTR(dataStr,5) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select SUBSTR(dataStr,5) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select CONCAT(dataStr,dataStrBin) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select CONCAT(dataStr,dataStrBin) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select CONCAT_ws('adad!@!@%$^$%$^$%^a',dataStr,dataStrBin) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select CONCAT_ws('adad!@!@%$^$%$^$%^a',dataStr,dataStrBin) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select CAST(dataStr as bigint) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select CAST(dataStr as bigint) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
 
         #time function
-        tdSql.query("select now() from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select now() from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select today() from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select today() from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select TIMEZONE() from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select TIMEZONE() from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select TO_ISO8601(ts) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select TO_ISO8601(ts) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select TO_UNIXTIMESTAMP(datastr) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select TO_UNIXTIMESTAMP(datastr) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select TIMETRUNCATE(ts,1s) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select TIMETRUNCATE(ts,1s) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select TIMEDIFF(ts,_c0) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select TIMEDIFF(ts,_c0) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select TIMEDIFF(ts,1u) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select TIMEDIFF(ts,1u) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(3)
-        tdSql.query("select ELAPSED(ts,1h) from jsons1 where jtag->'tag1'>1;")
+        tdSql.query(f"select ELAPSED(ts,1h) from {dbname}.jsons1 where jtag->'tag1'>1;")
         tdSql.checkRows(1)
 
         # to_json()
-        tdSql.query("select to_json('{\"abc\":123}') from jsons1_1")
+        tdSql.query(f"select to_json('{{\"abc\":123}}') from {dbname}.jsons1_1")
         tdSql.checkRows(2)
         tdSql.checkData(0, 0, '{"abc":123}')
         tdSql.checkData(1, 0, '{"abc":123}')
-        tdSql.query("select to_json('null') from jsons1_1")
+        tdSql.query(f"select to_json('null') from {dbname}.jsons1_1")
         tdSql.checkRows(2)
         tdSql.checkData(0, 0, 'null')
         tdSql.checkData(1, 0, 'null')
-        tdSql.query("select to_json('{\"key\"}') from jsons1_1")
+        tdSql.query(f"select to_json('{{\"key\"}}') from {dbname}.jsons1_1")
         tdSql.checkRows(2)
         tdSql.checkData(0, 0, 'null')
         tdSql.checkData(1, 0, 'null')
 
         #test TD-12077
-        tdSql.execute("insert into jsons1_16 using jsons1 tags('{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":-2.111}') values(1591062628000, 2, NULL, '你就会', 'dws')")
+        tdSql.execute(f"insert into {dbname}.jsons1_16 using {dbname}.jsons1 tags('{{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":-2.111}}') values(1591062628000, 2, NULL, '你就会', 'dws')")
-        tdSql.query("select jtag->'tag3' from jsons1_16")
+        tdSql.query(f"select jtag->'tag3' from {dbname}.jsons1_16")
         tdSql.checkData(0, 0, '-2.111000000')
 
         # test TD-12452
-        tdSql.execute("ALTER TABLE jsons1_1 SET TAG jtag=NULL")
+        tdSql.execute(f"ALTER table {dbname}.jsons1_1 SET TAG jtag=NULL")
-        tdSql.query("select jtag from jsons1_1")
+        tdSql.query(f"select jtag from {dbname}.jsons1_1")
         tdSql.checkData(0, 0, None)
-        tdSql.execute("CREATE TABLE if not exists jsons1_20 using jsons1 tags(NULL)")
+        tdSql.execute(f"create TABLE if not exists {dbname}.jsons1_20 using {dbname}.jsons1 tags(NULL)")
-        tdSql.query("select jtag from jsons1_20")
+        tdSql.query(f"select jtag from {dbname}.jsons1_20")
         tdSql.checkRows(0)
-        tdSql.execute("insert into jsons1_21 using jsons1 tags(NULL) values(1591061628000, 11, false, '你就会','')")
+        tdSql.execute(f"insert into {dbname}.jsons1_21 using {dbname}.jsons1 tags(NULL) values(1591061628000, 11, false, '你就会','')")
-        tdSql.query("select jtag from jsons1_21")
+        tdSql.query(f"select jtag from {dbname}.jsons1_21")
         tdSql.checkData(0, 0, None)
         #
         # #test TD-12389
@@ -691,23 +672,23 @@ class TDTestCase:
         tdSql.checkData(5, 2, 4095)
         #
         # #test TD-13918
-        tdSql.execute("drop table  if exists jsons_13918_1")
+        tdSql.execute(f"drop table  if exists {dbname}.jsons_13918_1")
-        tdSql.execute("drop table  if exists jsons_13918_2")
+        tdSql.execute(f"drop table  if exists {dbname}.jsons_13918_2")
-        tdSql.execute("drop table  if exists jsons_13918_3")
+        tdSql.execute(f"drop table  if exists {dbname}.jsons_13918_3")
-        tdSql.execute("drop table  if exists jsons_13918_4")
+        tdSql.execute(f"drop table  if exists {dbname}.jsons_13918_4")
-        tdSql.execute("drop table  if exists jsons_stb")
+        tdSql.execute(f"drop table  if exists {dbname}.jsons_stb")
-        tdSql.execute("create table jsons_stb (ts timestamp, dataInt int) tags (jtag json)")
+        tdSql.execute(f"create table {dbname}.jsons_stb (ts timestamp, dataInt int) tags (jtag json)")
-        tdSql.error("create table jsons_13918_1 using jsons_stb tags ('nullx')")
+        tdSql.error(f"create table {dbname}.jsons_13918_1 using {dbname}.jsons_stb tags ('nullx')")
-        tdSql.error("create table jsons_13918_2 using jsons_stb tags (nullx)")
+        tdSql.error(f"create table {dbname}.jsons_13918_2 using {dbname}.jsons_stb tags (nullx)")
-        tdSql.error("insert into jsons_13918_3 using jsons_stb tags('NULLx') values(1591061628001, 11)")
+        tdSql.error(f"insert into {dbname}.jsons_13918_3 using {dbname}.jsons_stb tags('NULLx') values(1591061628001, 11)")
-        tdSql.error("insert into jsons_13918_4 using jsons_stb tags(NULLx) values(1591061628002, 11)")
+        tdSql.error(f"insert into {dbname}.jsons_13918_4 using {dbname}.jsons_stb tags(NULLx) values(1591061628002, 11)")
-        tdSql.execute("create table jsons_13918_1 using jsons_stb tags ('null')")
+        tdSql.execute(f"create table {dbname}.jsons_13918_1 using {dbname}.jsons_stb tags ('null')")
-        tdSql.execute("create table jsons_13918_2 using jsons_stb tags (null)")
+        tdSql.execute(f"create table {dbname}.jsons_13918_2 using {dbname}.jsons_stb tags (null)")
-        tdSql.execute("insert into jsons_13918_1 values(1591061628003, 11)")
+        tdSql.execute(f"insert into {dbname}.jsons_13918_1 values(1591061628003, 11)")
-        tdSql.execute("insert into jsons_13918_2 values(1591061628004, 11)")
+        tdSql.execute(f"insert into {dbname}.jsons_13918_2 values(1591061628004, 11)")
-        tdSql.execute("insert into jsons_13918_3 using jsons_stb tags('NULL') values(1591061628005, 11)")
+        tdSql.execute(f"insert into {dbname}.jsons_13918_3 using {dbname}.jsons_stb tags('NULL') values(1591061628005, 11)")
-        tdSql.execute("insert into jsons_13918_4 using jsons_stb tags(\"NULL\") values(1591061628006, 11)")
+        tdSql.execute(f"insert into {dbname}.jsons_13918_4 using {dbname}.jsons_stb tags(\"NULL\") values(1591061628006, 11)")
-        tdSql.query("select * from jsons_stb")
+        tdSql.query(f"select * from {dbname}.jsons_stb")
         tdSql.checkRows(4)
 
     def stop(self):
@@ -717,4 +698,3 @@ class TDTestCase:
 
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())
-

tests/system-test/2-query/json_tag_large_tables.py

@@ -35,7 +35,7 @@ class TDTestCase:
         self.testcaseFilename = os.path.split(__file__)[-1]
         # os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
         tdLog.debug("start to execute %s" % __file__)
-        tdSql.init(conn.cursor(), True)
+        tdSql.init(conn.cursor(), False)
 
     def run(self):
         # tdSql.prepare()
@@ -47,24 +47,24 @@ class TDTestCase:
         i = 0
         # add 100000 table
         tdSql.execute("create table if not exists jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
-        while i <= 10 0000:
+        while i <= 100000:
             sql = """insert into jsons1_{%d} using jsons1 tags('{"tag1":{%d}}') values(1591060618000, 1, false, 'json1', '你是') (1591060608000, 23, true, '等等', 'json')"""%(i, i)
             tdSql.execute(sql)
             i = i + 1
 
-        // do query
+        # do query
-        i = 0        
+        i = 0
-        while i <= 10 0000:
+        while i <= 100000:
             sql = """select count(*) from jsons1 where jtag->'tag1' = %d"""%(i)
             tdSql.query(sql)
             if 1 != tdSql.getRows():
                 print("err: %s"%(sql))
-        
+
-        while i <= 10000000
+        while i <= 10000000:
             sql = """insert into jsons1_{%d} using jsons1 tags('{"tag1":{%d}}') values(1591060618000, 1, false, 'json1', '你是') (1591060608000, 23, true, '等等', 'json')"""%(i, i)
             tdSql.execute(sql)
             i = i + 1
-        
+
         i = 0
         # drop super table
         tdSql.execute("create table if not exists jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
@@ -76,7 +76,7 @@ class TDTestCase:
         tdSql.execute('drop stable jsons1')
 
 
-        # drop database 
+        # drop database
         i = 0
         tdSql.execute("create table if not exists jsons1(ts timestamp, dataInt int, dataBool bool, dataStr nchar(50), dataStrBin binary(150)) tags(jtag json)")
         while i <= 100000:
@@ -84,10 +84,10 @@ class TDTestCase:
             tdSql.execute(sql)
             i = i + 1
         tdSql.execute('drop database db')
-        
+
 
         # test duplicate key using the first one. elimate empty key
-        #tdSql.execute("CREATE TABLE if not exists jsons1_8 using jsons1 tags('{\"tag1\":null, \"tag1\":true, \"tag1\":45, \"1tag$\":2, \" \":90, \"\":32}')") tdSql.query("select jtag from jsons1_8") tdSql.checkRows(0); 
+        #tdSql.execute("CREATE TABLE if not exists jsons1_8 using jsons1 tags('{\"tag1\":null, \"tag1\":true, \"tag1\":45, \"1tag$\":2, \" \":90, \"\":32}')") tdSql.query("select jtag from jsons1_8") tdSql.checkRows(0);
         #tdSql.query("select ts,jtag from jsons1 order by ts limit 2,3")
         #tdSql.checkData(0, 0, '2020-06-02 09:17:08.000')
         #tdSql.checkData(0, 1, '{"tag1":5,"tag2":"beijing"}')
@@ -704,4 +704,3 @@ class TDTestCase:
 
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())
-

tests/system-test/2-query/leastsquares.py

@@ -26,6 +26,7 @@ TS_TYPE_COL = [ TS_COL, ]
 
 ALL_COL = [ INT_COL, BINT_COL, SINT_COL, TINT_COL, FLOAT_COL, DOUBLE_COL, BOOL_COL, BINARY_COL, NCHAR_COL, TS_COL ]
 
+DBNAME = "db"
 class TDTestCase:
 
     def init(self, conn, logSql):
@@ -133,13 +134,13 @@ class TDTestCase:
         return f"select leastsquares({select_clause}, {start_val}, {step_val}) from {from_clause} {where_condition} {group_condition}"
 
     @property
-    def __tb_list(self):
+    def __tb_list(self, dbname=DBNAME):
         return [
-            "ct1",
+            f"{dbname}.ct1",
-            "ct4",
+            f"{dbname}.ct4",
-            "t1",
+            f"{dbname}.nt1",
-            "ct2",
+            f"{dbname}.ct2",
-            "stb1",
+            f"{dbname}.stb1",
         ]
 
     @property
@@ -161,36 +162,37 @@ class TDTestCase:
         err_sqls = []
         __no_join_tblist = self.__tb_list
         for tb in __no_join_tblist:
-                select_claus_list = self.__query_condition(tb)
+            tbname = tb.split(".")[-1]
-                for select_claus in select_claus_list:
+            select_claus_list = self.__query_condition(tbname)
-                    group_claus = self.__group_condition(col=select_claus)
+            for select_claus in select_claus_list:
-                    where_claus = self.__where_condition(query_conditon=select_claus)
+                group_claus = self.__group_condition(col=select_claus)
-                    having_claus = self.__group_condition(col=select_claus, having=f"{select_claus} is not null")
+                where_claus = self.__where_condition(query_conditon=select_claus)
-                    for arg in self.start_step_val:
+                having_claus = self.__group_condition(col=select_claus, having=f"{select_claus} is not null")
-                        if not  isinstance(arg,int) or isinstance(arg, bool) :
+                for arg in self.start_step_val:
-                            err_sqls.extend(
+                    if not  isinstance(arg,int) or isinstance(arg, bool) :
-                                (
+                        err_sqls.extend(
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg),
+                            (
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, step_val=arg, group_condition=group_claus),
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg),
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, where_condition=where_claus, group_condition=having_claus),
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, step_val=arg, group_condition=group_claus),
-                                )
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, where_condition=where_claus, group_condition=having_claus),
                             )
-                        elif isinstance(select_claus, str) and any([BOOL_COL in select_claus, BINARY_COL in select_claus, NCHAR_COL in select_claus, TS_COL in select_claus]):
+                        )
-                            err_sqls.extend(
+                    elif isinstance(select_claus, str) and any([BOOL_COL in select_claus, BINARY_COL in select_claus, NCHAR_COL in select_claus, TS_COL in select_claus]):
-                                (
+                        err_sqls.extend(
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg),
+                            (
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, step_val=arg, group_condition=group_claus),
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg),
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, where_condition=where_claus, group_condition=having_claus),
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, step_val=arg, group_condition=group_claus),
-                                )
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, where_condition=where_claus, group_condition=having_claus),
                             )
-                        else:
+                        )
-                            current_sqls.extend(
+                    else:
-                                (
+                        current_sqls.extend(
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, step_val=0),
+                            (
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=0, step_val=arg, group_condition=group_claus),
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, step_val=0),
-                                    self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, step_val=arg, where_condition=where_claus, group_condition=having_claus),
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=0, step_val=arg, group_condition=group_claus),
-                                )
+                                self.__single_sql(select_clause=select_claus, from_clause=tb, start_val=arg, step_val=arg, where_condition=where_claus, group_condition=having_claus),
                             )
+                        )
 
         # return filter(None, sqls)
         return list(filter(None, current_sqls)), list(filter(None, err_sqls))
@@ -207,25 +209,25 @@ class TDTestCase:
 
 
     def __test_current(self):
-        # tdSql.query("explain select c1 from ct1")
+        # tdSql.query("explain select c1 from {dbname}.ct1")
-        # tdSql.query("explain select 1 from ct2")
+        # tdSql.query("explain select 1 from {dbname}.ct2")
-        # tdSql.query("explain select cast(ceil(c6) as bigint) from ct4 group by c6")
+        # tdSql.query("explain select cast(ceil(c6) as bigint) from {dbname}.ct4 group by c6")
-        # tdSql.query("explain select count(c3) from ct4 group by c7 having count(c3) > 0")
+        # tdSql.query("explain select count(c3) from {dbname}.ct4 group by c7 having count(c3) > 0")
-        # tdSql.query("explain select ct2.c3 from ct4 join ct2 on ct4.ts=ct2.ts")
+        # tdSql.query("explain select ct2.c3 from {dbname}.ct4 join ct2 on ct4.ts=ct2.ts")
         # tdSql.query("explain select c1 from stb1 where c1 is not null and c1 in (0, 1, 2) or c1 between 2 and 100 ")
 
         self.leastsquares_check()
 
-    def __test_error(self):
+    def __test_error(self, dbname=DBNAME):
 
         tdLog.printNoPrefix("===step 0: err case, must return err")
-        tdSql.error( "select leastsquares(c1) from ct8" )
+        tdSql.error( f"select leastsquares(c1) from {dbname}.ct8" )
-        tdSql.error( "select leastsquares(c1, 1) from  ct1 " )
+        tdSql.error( f"select leastsquares(c1, 1) from {dbname}.ct1 " )
-        tdSql.error( "select leastsquares(c1, null, 1) from  ct1 " )
+        tdSql.error( f"select leastsquares(c1, null, 1) from {dbname}.ct1 " )
-        tdSql.error( "select leastsquares(c1, 1, null) from  ct1 " )
+        tdSql.error( f"select leastsquares(c1, 1, null) from {dbname}.ct1 " )
-        tdSql.error( "select leastsquares(null, 1, 1) from  ct1 " )
+        tdSql.error( f"select leastsquares(null, 1, 1) from {dbname}.ct1 " )
-        tdSql.error( '''select leastsquares(['c1 + c1', 'c1 + c2', 'c1 + c3', 'c1 + c4', 'c1 + c5', 'c1 + c6', 'c1 + c7', 'c1 + c8', 'c1 + c9', 'c1 + c10'])
+        tdSql.error( f'''select leastsquares(['c1 + c1', 'c1 + c2', 'c1 + c3', 'c1 + c4', 'c1 + c5', 'c1 + c6', 'c1 + c7', 'c1 + c8', 'c1 + c9', 'c1 + c10'])
-                    from ct1
+                    from {dbname}.ct1
                     where ['c1 + c1', 'c1 + c2', 'c1 + c3', 'c1 + c4', 'c1 + c5', 'c1 + c6', 'c1 + c7', 'c1 + c8', 'c1 + c9', 'c1 + c10'] is not null
                     group by ['c1 + c1', 'c1 + c2', 'c1 + c3', 'c1 + c4', 'c1 + c5', 'c1 + c6', 'c1 + c7', 'c1 + c8', 'c1 + c9', 'c1 + c10']
                     having ['c1 + c1', 'c1 + c2', 'c1 + c3', 'c1 + c4', 'c1 + c5', 'c1 + c6', 'c1 + c7', 'c1 + c8', 'c1 + c9', 'c1 + c10'] is not null ''' )
@@ -234,16 +236,16 @@ class TDTestCase:
         self.__test_error()
         self.__test_current()
 
-    def __create_tb(self):
+    def __create_tb(self, dbname=DBNAME):
 
         tdLog.printNoPrefix("==========step1:create table")
-        create_stb_sql  =  f'''create table stb1(
+        create_stb_sql  =  f'''create table {dbname}.stb1(
                 ts timestamp, {INT_COL} int, {BINT_COL} bigint, {SINT_COL} smallint, {TINT_COL} tinyint,
                  {FLOAT_COL} float, {DOUBLE_COL} double, {BOOL_COL} bool,
                  {BINARY_COL} binary(16), {NCHAR_COL} nchar(32), {TS_COL} timestamp
             ) tags (t1 int)
             '''
-        create_ntb_sql = f'''create table t1(
+        create_ntb_sql = f'''create table {dbname}.nt1(
                 ts timestamp, {INT_COL} int, {BINT_COL} bigint, {SINT_COL} smallint, {TINT_COL} tinyint,
                  {FLOAT_COL} float, {DOUBLE_COL} double, {BOOL_COL} bool,
                  {BINARY_COL} binary(16), {NCHAR_COL} nchar(32), {TS_COL} timestamp
@@ -253,30 +255,29 @@ class TDTestCase:
         tdSql.execute(create_ntb_sql)
 
         for i in range(4):
-            tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
+            tdSql.execute(f'create table {dbname}.ct{i+1} using {dbname}.stb1 tags ( {i+1} )')
-            { i % 32767 }, { i % 127}, { i * 1.11111 }, { i * 1000.1111 }, { i % 2}
 
-    def __insert_data(self, rows):
+    def __insert_data(self, rows, dbname=DBNAME):
         now_time = int(datetime.datetime.timestamp(datetime.datetime.now()) * 1000)
         for i in range(rows):
             tdSql.execute(
-                f"insert into ct1 values ( { now_time - i * 1000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar_测试_{i}', { now_time + 1 * i } )"
+                f"insert into {dbname}.ct1 values ( { now_time - i * 1000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar_测试_{i}', { now_time + 1 * i } )"
             )
             tdSql.execute(
-                f"insert into ct4 values ( { now_time - i * 7776000000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar_测试_{i}', { now_time + 1 * i } )"
+                f"insert into {dbname}.ct4 values ( { now_time - i * 7776000000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar_测试_{i}', { now_time + 1 * i } )"
             )
             tdSql.execute(
-                f"insert into ct2 values ( { now_time - i * 7776000000 }, {-i},  {-11111 * i}, {-111 * i % 32767 }, {-11 * i % 127}, {-1.11*i}, {-1100.0011*i}, {i%2}, 'binary{i}', 'nchar_测试_{i}', { now_time + 1 * i } )"
+                f"insert into {dbname}.ct2 values ( { now_time - i * 7776000000 }, {-i},  {-11111 * i}, {-111 * i % 32767 }, {-11 * i % 127}, {-1.11*i}, {-1100.0011*i}, {i%2}, 'binary{i}', 'nchar_测试_{i}', { now_time + 1 * i } )"
             )
         tdSql.execute(
-            f'''insert into ct1 values
+            f'''insert into {dbname}.ct1 values
             ( { now_time - rows * 5 }, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar_测试_0', { now_time + 8 } )
             ( { now_time + 10000 }, { rows }, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar_测试_9', { now_time + 9 } )
             '''
         )
 
         tdSql.execute(
-            f'''insert into ct4 values
+            f'''insert into {dbname}.ct4 values
             ( { now_time - rows * 7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - rows * 3888000000 + 10800000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time +  7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
@@ -292,7 +293,7 @@ class TDTestCase:
         )
 
         tdSql.execute(
-            f'''insert into ct2 values
+            f'''insert into {dbname}.ct2 values
             ( { now_time - rows * 7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - rows * 3888000000 + 10800000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time + 7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
@@ -308,13 +309,13 @@ class TDTestCase:
         )
 
         for i in range(rows):
-            insert_data = f'''insert into t1 values
+            insert_data = f'''insert into {dbname}.nt1 values
                 ( { now_time - i * 3600000 }, {i}, {i * 11111}, { i % 32767 }, { i % 127}, { i * 1.11111 }, { i * 1000.1111 }, { i % 2},
                 "binary_{i}", "nchar_测试_{i}", { now_time - 1000 * i } )
                 '''
             tdSql.execute(insert_data)
         tdSql.execute(
-            f'''insert into t1 values
+            f'''insert into {dbname}.nt1 values
             ( { now_time + 10800000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - (( rows // 2 ) * 60 + 30) * 60000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - rows * 3600000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
@@ -332,7 +333,7 @@ class TDTestCase:
 
 
     def run(self):
-        tdSql.prepare()
+        tdSql.prepare(DBNAME)
 
         tdLog.printNoPrefix("==========step1:create table")
         self.__create_tb()
@@ -344,10 +345,9 @@ class TDTestCase:
         tdLog.printNoPrefix("==========step3:all check")
         self.all_test()
 
-        tdDnodes.stop(1)
+        tdSql.execute(f"flush database {DBNAME}")
-        tdDnodes.start(1)
 
-        tdSql.execute("use db")
+        tdSql.execute(f"use {DBNAME}")
 
         tdLog.printNoPrefix("==========step4:after wal, all check again ")
         self.all_test()

tests/system-test/2-query/length.py

@@ -19,6 +19,7 @@ TS_COL      = "c10"
 UN_CHAR_COL = [INT_COL, BINT_COL, SINT_COL, TINT_COL, FLOAT_COL, DOUBLE_COL, BOOL_COL, ]
 CHAR_COL    = [ BINARY_COL, NCHAR_COL, ]
 TS_TYPE_COL = [TS_COL]
+DBNAME = "db"
 
 class TDTestCase:
 
@@ -102,16 +103,16 @@ class TDTestCase:
 
         return sqls
 
-    def __test_current(self):
+    def __test_current(self, dbname=DBNAME):
         tdLog.printNoPrefix("==========current sql condition check , must return query ok==========")
-        tbname = ["ct1", "ct2", "ct4", "t1", "stb1"]
+        tbname = [f"{dbname}.ct1", f"{dbname}.ct2", f"{dbname}.ct4", f"{dbname}.nt1", f"{dbname}.stb1"]
         for tb in tbname:
             self.__length_current_check(tb)
             tdLog.printNoPrefix(f"==========current sql condition check in {tb} over==========")
 
-    def __test_error(self):
+    def __test_error(self, dbname=DBNAME):
         tdLog.printNoPrefix("==========err sql condition check , must return error==========")
-        tbname = ["ct1", "ct2", "ct4", "t1", "stb1"]
+        tbname = [f"{dbname}.ct1", f"{dbname}.ct2", f"{dbname}.ct4", f"{dbname}.nt1", f"{dbname}.stb1"]
 
         for tb in tbname:
             for errsql in self.__length_err_check(tb):
@@ -124,17 +125,16 @@ class TDTestCase:
         self.__test_error()
 
 
-    def __create_tb(self):
+    def __create_tb(self, dbname=DBNAME):
-        tdSql.prepare()
 
         tdLog.printNoPrefix("==========step1:create table")
-        create_stb_sql  =  f'''create table stb1(
+        create_stb_sql  =  f'''create table {dbname}.stb1(
                 ts timestamp, {INT_COL} int, {BINT_COL} bigint, {SINT_COL} smallint, {TINT_COL} tinyint,
                  {FLOAT_COL} float, {DOUBLE_COL} double, {BOOL_COL} bool,
                  {BINARY_COL} binary(16), {NCHAR_COL} nchar(32), {TS_COL} timestamp
             ) tags (t1 int)
             '''
-        create_ntb_sql = f'''create table t1(
+        create_ntb_sql = f'''create table {dbname}.nt1(
                 ts timestamp, {INT_COL} int, {BINT_COL} bigint, {SINT_COL} smallint, {TINT_COL} tinyint,
                  {FLOAT_COL} float, {DOUBLE_COL} double, {BOOL_COL} bool,
                  {BINARY_COL} binary(16), {NCHAR_COL} nchar(32), {TS_COL} timestamp
@@ -144,29 +144,29 @@ class TDTestCase:
         tdSql.execute(create_ntb_sql)
 
         for i in range(4):
-            tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
+            tdSql.execute(f'create table {dbname}.ct{i+1} using {dbname}.stb1 tags ( {i+1} )')
 
-    def __insert_data(self, rows):
+    def __insert_data(self, rows, dbname=DBNAME):
         now_time = int(datetime.datetime.timestamp(datetime.datetime.now()) * 1000)
         for i in range(rows):
             tdSql.execute(
-                f"insert into ct1 values ( { now_time - i * 1000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar{i}', { now_time + 1 * i } )"
+                f"insert into {dbname}.ct1 values ( { now_time - i * 1000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar{i}', { now_time + 1 * i } )"
             )
             tdSql.execute(
-                f"insert into ct4 values ( { now_time - i * 7776000000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar{i}', { now_time + 1 * i } )"
+                f"insert into {dbname}.ct4 values ( { now_time - i * 7776000000 }, {i}, {11111 * i}, {111 * i % 32767 }, {11 * i % 127}, {1.11*i}, {1100.0011*i}, {i%2}, 'binary{i}', 'nchar{i}', { now_time + 1 * i } )"
             )
             tdSql.execute(
-                f"insert into ct2 values ( { now_time - i * 7776000000 }, {-i},  {-11111 * i}, {-111 * i % 32767 }, {-11 * i % 127}, {-1.11*i}, {-1100.0011*i}, {i%2}, 'binary{i}', 'nchar{i}', { now_time + 1 * i } )"
+                f"insert into {dbname}.ct2 values ( { now_time - i * 7776000000 }, {-i},  {-11111 * i}, {-111 * i % 32767 }, {-11 * i % 127}, {-1.11*i}, {-1100.0011*i}, {i%2}, 'binary{i}', 'nchar{i}', { now_time + 1 * i } )"
             )
         tdSql.execute(
-            f'''insert into ct1 values
+            f'''insert into {dbname}.ct1 values
             ( { now_time - rows * 5 }, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar0', { now_time + 8 } )
             ( { now_time + 10000 }, { rows }, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar9', { now_time + 9 } )
             '''
         )
 
         tdSql.execute(
-            f'''insert into ct4 values
+            f'''insert into {dbname}.ct4 values
             ( { now_time - rows * 7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - rows * 3888000000+ 10800000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time +  7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
@@ -182,7 +182,7 @@ class TDTestCase:
         )
 
         tdSql.execute(
-            f'''insert into ct2 values
+            f'''insert into {dbname}.ct2 values
             ( { now_time - rows * 7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - rows * 3888000000+ 10800000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time + 7776000000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
@@ -198,13 +198,13 @@ class TDTestCase:
         )
 
         for i in range(rows):
-            insert_data = f'''insert into t1 values
+            insert_data = f'''insert into {dbname}.nt1 values
                 ( { now_time - i * 3600000 }, {i}, {i * 11111}, { i % 32767 }, { i % 127}, { i * 1.11111 }, { i * 1000.1111 }, { i % 2},
                 "binary_{i}", "nchar_{i}", { now_time - 1000 * i } )
                 '''
             tdSql.execute(insert_data)
         tdSql.execute(
-            f'''insert into t1 values
+            f'''insert into {dbname}.nt1 values
             ( { now_time + 10800000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - (( rows // 2 ) * 60 + 30) * 60000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( { now_time - rows * 3600000 }, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
@@ -233,8 +233,7 @@ class TDTestCase:
         tdLog.printNoPrefix("==========step3:all check")
         self.all_test()
 
-        tdDnodes.stop(1)
+        tdSql.execute("flush database db")
-        tdDnodes.start(1)
 
         tdSql.execute("use db")
 

tests/system-test/2-query/log.py

@@ -10,48 +10,46 @@ from util.cases import *
 
 
 class TDTestCase:
-    updatecfgDict = {'debugFlag': 143 ,"cDebugFlag":143,"uDebugFlag":143 ,"rpcDebugFlag":143 , "tmrDebugFlag":143 ,
+
-    "jniDebugFlag":143 ,"simDebugFlag":143,"dDebugFlag":143, "dDebugFlag":143,"vDebugFlag":143,"mDebugFlag":143,"qDebugFlag":143,
-    "wDebugFlag":143,"sDebugFlag":143,"tsdbDebugFlag":143,"tqDebugFlag":143 ,"fsDebugFlag":143 ,"udfDebugFlag":143}
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
 
-    def prepare_datas(self):
+    def prepare_datas(self, dbname="db"):
         tdSql.execute(
-            '''create table stb1
+            f'''create table {dbname}.stb1
             (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
             tags (t1 int)
             '''
         )
 
         tdSql.execute(
-            '''
+            f'''
-            create table t1
+            create table {dbname}.t1
             (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
             '''
         )
         for i in range(4):
-            tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
+            tdSql.execute(f'create table {dbname}.ct{i+1} using {dbname}.stb1 tags ( {i+1} )')
 
         for i in range(9):
             tdSql.execute(
-                f"insert into ct1 values ( now()-{i*10}s, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+                f"insert into {dbname}.ct1 values ( now()-{i*10}s, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
             )
             tdSql.execute(
-                f"insert into ct4 values ( now()-{i*90}d, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
+                f"insert into {dbname}.ct4 values ( now()-{i*90}d, {1*i}, {11111*i}, {111*i}, {11*i}, {1.11*i}, {11.11*i}, {i%2}, 'binary{i}', 'nchar{i}', now()+{1*i}a )"
             )
-        tdSql.execute("insert into ct1 values (now()-45s, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar0', now()+8a )")
+        tdSql.execute(f"insert into {dbname}.ct1 values (now()-45s, 0, 0, 0, 0, 0, 0, 0, 'binary0', 'nchar0', now()+8a )")
-        tdSql.execute("insert into ct1 values (now()+10s, 9, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute(f"insert into {dbname}.ct1 values (now()+10s, 9, -99999, -999, -99, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
-        tdSql.execute("insert into ct1 values (now()+15s, 9, -99999, -999, -99, -9.99, NULL, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute(f"insert into {dbname}.ct1 values (now()+15s, 9, -99999, -999, -99, -9.99, NULL, 1, 'binary9', 'nchar9', now()+9a )")
-        tdSql.execute("insert into ct1 values (now()+20s, 9, -99999, -999, NULL, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
+        tdSql.execute(f"insert into {dbname}.ct1 values (now()+20s, 9, -99999, -999, NULL, -9.99, -99.99, 1, 'binary9', 'nchar9', now()+9a )")
 
-        tdSql.execute("insert into ct4 values (now()-810d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute(f"insert into {dbname}.ct4 values (now()-810d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
-        tdSql.execute("insert into ct4 values (now()-400d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
+        tdSql.execute(f"insert into {dbname}.ct4 values (now()-400d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ) ")
-        tdSql.execute("insert into ct4 values (now()+90d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL  ) ")
+        tdSql.execute(f"insert into {dbname}.ct4 values (now()+90d, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL  ) ")
 
         tdSql.execute(
-            f'''insert into t1 values
+            f'''insert into {dbname}.t1 values
             ( '2020-04-21 01:01:01.000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL )
             ( '2020-10-21 01:01:01.000', 1, 11111, 111, 11, 1.11, 11.11, 1, "binary1", "nchar1", now()+1a )
             ( '2020-12-31 01:01:01.000', 2, 22222, 222, 22, 2.22, 22.22, 0, "binary2", "nchar2", now()+2a )
@@ -185,68 +183,68 @@ class TDTestCase:
         else:
             tdLog.info("log value check pass , it work as expected ,sql is \"%s\"   "%log_query )
 
-    def test_errors(self):
+    def test_errors(self, dbname="db"):
         error_sql_lists = [
-            "select log from t1",
+            f"select log from {dbname}.t1",
-            # "select log(-+--+c1 ,2) from t1",
+            # f"select log(-+--+c1 ,2) from {dbname}.t1",
-            # "select +-log(c1,2) from t1",
+            # f"select +-log(c1,2) from {dbname}.t1",
-            # "select ++-log(c1,2) from t1",
+            # f"select ++-log(c1,2) from {dbname}.t1",
-            # "select ++--log(c1,2) from t1",
+            # f"select ++--log(c1,2) from {dbname}.t1",
-            # "select - -log(c1,2)*0 from t1",
+            # f"select - -log(c1,2)*0 from {dbname}.t1",
-            # "select log(tbname+1,2) from t1 ",
+            # f"select log(tbname+1,2) from {dbname}.t1 ",
-            "select log(123--123,2)==1 from t1",
+            f"select log(123--123,2)==1 from {dbname}.t1",
-            "select log(c1,2) as 'd1' from t1",
+            f"select log(c1,2) as 'd1' from {dbname}.t1",
-            "select log(c1 ,c2 ,2) from t1",
+            f"select log(c1 ,c2 ,2) from {dbname}.t1",
-            "select log(c1 ,NULL ,2) from t1",
+            f"select log(c1 ,NULL ,2) from {dbname}.t1",
-            "select log(, 2) from t1;",
+            f"select log(, 2) from {dbname}.t1;",
-            "select log(log(c1, 2) ab from t1)",
+            f"select log(log(c1, 2) ab from {dbname}.t1)",
-            "select log(c1 ,2 ) as int from t1",
+            f"select log(c1 ,2 ) as int from {dbname}.t1",
-            "select log from stb1",
+            f"select log from {dbname}.stb1",
-            # "select log(-+--+c1) from stb1",
+            # f"select log(-+--+c1) from {dbname}.stb1",
-            # "select +-log(c1) from stb1",
+            # f"select +-log(c1) from {dbname}.stb1",
-            # "select ++-log(c1) from stb1",
+            # f"select ++-log(c1) from {dbname}.stb1",
-            # "select ++--log(c1) from stb1",
+            # f"select ++--log(c1) from {dbname}.stb1",
-            # "select - -log(c1)*0 from stb1",
+            # f"select - -log(c1)*0 from {dbname}.stb1",
-            # "select log(tbname+1) from stb1 ",
+            # f"select log(tbname+1) from {dbname}.stb1 ",
-            "select log(123--123 ,2)==1 from stb1",
+            f"select log(123--123 ,2)==1 from {dbname}.stb1",
-            "select log(c1 ,2) as 'd1' from stb1",
+            f"select log(c1 ,2) as 'd1' from {dbname}.stb1",
-            "select log(c1 ,c2 ,2 ) from stb1",
+            f"select log(c1 ,c2 ,2 ) from {dbname}.stb1",
-            "select log(c1 ,NULL,2) from stb1",
+            f"select log(c1 ,NULL,2) from {dbname}.stb1",
-            "select log(,) from stb1;",
+            f"select log(,) from {dbname}.stb1;",
-            "select log(log(c1 , 2) ab from stb1)",
+            f"select log(log(c1 , 2) ab from {dbname}.stb1)",
-            "select log(c1 , 2) as int from stb1"
+            f"select log(c1 , 2) as int from {dbname}.stb1"
         ]
         for error_sql in error_sql_lists:
             tdSql.error(error_sql)
 
-    def support_types(self):
+    def support_types(self, dbname="db"):
         type_error_sql_lists = [
-            "select log(ts ,2 ) from t1" ,
+            f"select log(ts ,2 ) from {dbname}.t1" ,
-            "select log(c7,c2 ) from t1",
+            f"select log(c7,c2 ) from {dbname}.t1",
-            "select log(c8,c1 ) from t1",
+            f"select log(c8,c1 ) from {dbname}.t1",
-            "select log(c9,c2 ) from t1",
+            f"select log(c9,c2 ) from {dbname}.t1",
-            "select log(ts,c7 ) from ct1" ,
+            f"select log(ts,c7 ) from {dbname}.ct1" ,
-            "select log(c7,c9 ) from ct1",
+            f"select log(c7,c9 ) from {dbname}.ct1",
-            "select log(c8,c2 ) from ct1",
+            f"select log(c8,c2 ) from {dbname}.ct1",
-            "select log(c9,c1 ) from ct1",
+            f"select log(c9,c1 ) from {dbname}.ct1",
-            "select log(ts,2 ) from ct3" ,
+            f"select log(ts,2 ) from {dbname}.ct3" ,
-            "select log(c7,2 ) from ct3",
+            f"select log(c7,2 ) from {dbname}.ct3",
-            "select log(c8,2 ) from ct3",
+            f"select log(c8,2 ) from {dbname}.ct3",
-            "select log(c9,2 ) from ct3",
+            f"select log(c9,2 ) from {dbname}.ct3",
-            "select log(ts,2 ) from ct4" ,
+            f"select log(ts,2 ) from {dbname}.ct4" ,
-            "select log(c7,2 ) from ct4",
+            f"select log(c7,2 ) from {dbname}.ct4",
-            "select log(c8,2 ) from ct4",
+            f"select log(c8,2 ) from {dbname}.ct4",
-            "select log(c9,2 ) from ct4",
+            f"select log(c9,2 ) from {dbname}.ct4",
-            "select log(ts,2 ) from stb1" ,
+            f"select log(ts,2 ) from {dbname}.stb1" ,
-            "select log(c7,2 ) from stb1",
+            f"select log(c7,2 ) from {dbname}.stb1",
-            "select log(c8,2 ) from stb1",
+            f"select log(c8,2 ) from {dbname}.stb1",
-            "select log(c9,2 ) from stb1" ,
+            f"select log(c9,2 ) from {dbname}.stb1" ,
 
-            "select log(ts,2 ) from stbbb1" ,
+            f"select log(ts,2 ) from {dbname}.stbbb1" ,
-            "select log(c7,2 ) from stbbb1",
+            f"select log(c7,2 ) from {dbname}.stbbb1",
 
-            "select log(ts,2 ) from tbname",
+            f"select log(ts,2 ) from {dbname}.tbname",
-            "select log(c9,2 ) from tbname"
+            f"select log(c9,2 ) from {dbname}.tbname"
 
         ]
 
@@ -255,98 +253,88 @@ class TDTestCase:
 
 
         type_sql_lists = [
-            "select log(c1,2 ) from t1",
+            f"select log(c1,2 ) from {dbname}.t1",
-            "select log(c2,2 ) from t1",
+            f"select log(c2,2 ) from {dbname}.t1",
-            "select log(c3,2 ) from t1",
+            f"select log(c3,2 ) from {dbname}.t1",
-            "select log(c4,2 ) from t1",
+            f"select log(c4,2 ) from {dbname}.t1",
-            "select log(c5,2 ) from t1",
+            f"select log(c5,2 ) from {dbname}.t1",
-            "select log(c6,2 ) from t1",
+            f"select log(c6,2 ) from {dbname}.t1",
 
-            "select log(c1,2 ) from ct1",
+            f"select log(c1,2 ) from {dbname}.ct1",
-            "select log(c2,2 ) from ct1",
+            f"select log(c2,2 ) from {dbname}.ct1",
-            "select log(c3,2 ) from ct1",
+            f"select log(c3,2 ) from {dbname}.ct1",
-            "select log(c4,2 ) from ct1",
+            f"select log(c4,2 ) from {dbname}.ct1",
-            "select log(c5,2 ) from ct1",
+            f"select log(c5,2 ) from {dbname}.ct1",
-            "select log(c6,2 ) from ct1",
+            f"select log(c6,2 ) from {dbname}.ct1",
 
-            "select log(c1,2 ) from ct3",
+            f"select log(c1,2 ) from {dbname}.ct3",
-            "select log(c2,2 ) from ct3",
+            f"select log(c2,2 ) from {dbname}.ct3",
-            "select log(c3,2 ) from ct3",
+            f"select log(c3,2 ) from {dbname}.ct3",
-            "select log(c4,2 ) from ct3",
+            f"select log(c4,2 ) from {dbname}.ct3",
-            "select log(c5,2 ) from ct3",
+            f"select log(c5,2 ) from {dbname}.ct3",
-            "select log(c6,2 ) from ct3",
+            f"select log(c6,2 ) from {dbname}.ct3",
 
-            "select log(c1,2 ) from stb1",
+            f"select log(c1,2 ) from {dbname}.stb1",
-            "select log(c2,2 ) from stb1",
+            f"select log(c2,2 ) from {dbname}.stb1",
-            "select log(c3,2 ) from stb1",
+            f"select log(c3,2 ) from {dbname}.stb1",
-            "select log(c4,2 ) from stb1",
+            f"select log(c4,2 ) from {dbname}.stb1",
-            "select log(c5,2 ) from stb1",
+            f"select log(c5,2 ) from {dbname}.stb1",
-            "select log(c6,2 ) from stb1",
+            f"select log(c6,2 ) from {dbname}.stb1",
 
-            "select log(c6,2) as alisb from stb1",
+            f"select log(c6,2) as alisb from {dbname}.stb1",
-            "select log(c6,2) alisb from stb1",
+            f"select log(c6,2) alisb from {dbname}.stb1",
         ]
 
         for type_sql in type_sql_lists:
             tdSql.query(type_sql)
 
-    def basic_log_function(self):
+    def basic_log_function(self, dbname="db"):
 
         # basic query
-        tdSql.query("select c1 from ct3")
+        tdSql.query(f"select c1 from {dbname}.ct3")
         tdSql.checkRows(0)
-        tdSql.query("select c1 from t1")
+        tdSql.query(f"select c1 from {dbname}.t1")
         tdSql.checkRows(12)
-        tdSql.query("select c1 from stb1")
+        tdSql.query(f"select c1 from {dbname}.stb1")
         tdSql.checkRows(25)
 
         # used for empty table  , ct3 is empty
 
-        tdSql.query("select log(c1 ,2) from ct3")
+        tdSql.query(f"select log(c1 ,2) from {dbname}.ct3")
         tdSql.checkRows(0)
-        tdSql.query("select log(c2 ,2) from ct3")
+        tdSql.query(f"select log(c2 ,2) from {dbname}.ct3")
         tdSql.checkRows(0)
-        tdSql.query("select log(c3 ,2) from ct3")
+        tdSql.query(f"select log(c3 ,2) from {dbname}.ct3")
         tdSql.checkRows(0)
-        tdSql.query("select log(c4 ,2) from ct3")
+        tdSql.query(f"select log(c4 ,2) from {dbname}.ct3")
         tdSql.checkRows(0)
-        tdSql.query("select log(c5 ,2) from ct3")
+        tdSql.query(f"select log(c5 ,2) from {dbname}.ct3")
         tdSql.checkRows(0)
-        tdSql.query("select log(c6 ,2) from ct3")
+        tdSql.query(f"select log(c6 ,2) from {dbname}.ct3")
         tdSql.checkRows(0)
 
 
         # # used for regular table
-        tdSql.query("select log(c1 ,2) from t1")
+        tdSql.query(f"select log(c1 ,2) from {dbname}.t1")
         tdSql.checkData(0, 0, None)
         tdSql.checkData(1 , 0, 0.000000000)
         tdSql.checkData(3 , 0, 1.584962501)
         tdSql.checkData(5 , 0, None)
 
-        tdSql.query("select log(c1) from t1")
+        tdSql.query(f"select log(c1) from {dbname}.t1")
         tdSql.checkData(0, 0, None)
         tdSql.checkData(1 , 0, 0.000000000)
         tdSql.checkData(2 , 0, 0.693147181)
         tdSql.checkData(3 , 0, 1.098612289)
         tdSql.checkData(4 , 0, 1.386294361)
 
-        tdSql.query("select c1, c2, c3 , c4, c5 from t1")
+        self.check_result_auto_log( f"select c1, c2, c3 , c4, c5 from {dbname}.t1", f"select log(c1), log(c2) ,log(c3), log(c4), log(c5) from {dbname}.t1")
-        tdSql.checkData(1, 4, 1.11000)
+        self.check_result_auto_log2( f"select c1, c2, c3 , c4, c5 from {dbname}.t1", f"select log(c1 ,2), log(c2 ,2) ,log(c3, 2), log(c4 ,2), log(c5 ,2) from {dbname}.t1")
-        tdSql.checkData(3, 3, 33)
+        self.check_result_auto_log__10( f"select c1, c2, c3 , c4, c5 from {dbname}.t1", f"select log(c1 ,1), log(c2 ,1) ,log(c3, 1), log(c4 ,1), log(c5 ,1) from {dbname}.t1")
-        tdSql.checkData(5, 4, None)
+        self.check_result_auto_log__10( f"select c1, c2, c3 , c4, c5 from {dbname}.t1", f"select log(c1 ,-10), log(c2 ,-10) ,log(c3, -10), log(c4 ,-10), log(c5 ,-10) from {dbname}.t1")
-
-        tdSql.query("select ts,c1, c2, c3 , c4, c5 from t1")
-        tdSql.checkData(1, 5, 1.11000)
-        tdSql.checkData(3, 4, 33)
-        tdSql.checkData(5, 5, None)
-
-        self.check_result_auto_log( "select c1, c2, c3 , c4, c5 from t1", "select log(c1), log(c2) ,log(c3), log(c4), log(c5) from t1")
-        self.check_result_auto_log2( "select c1, c2, c3 , c4, c5 from t1", "select log(c1 ,2), log(c2 ,2) ,log(c3, 2), log(c4 ,2), log(c5 ,2) from t1")
-        self.check_result_auto_log1( "select c1, c2, c3 , c4, c5 from t1", "select log(c1 ,1), log(c2 ,1) ,log(c3, 1), log(c4 ,1), log(c5 ,1) from t1")
-        self.check_result_auto_log__10( "select c1, c2, c3 , c4, c5 from t1", "select log(c1 ,-10), log(c2 ,-10) ,log(c3, -10), log(c4 ,-10), log(c5 ,-10) from t1")
 
         # used for sub table
-        tdSql.query("select c1 ,log(c1 ,3) from ct1")
+        tdSql.query(f"select c1 ,log(c1 ,3) from {dbname}.ct1")
         tdSql.checkData(0, 1, 1.892789261)
         tdSql.checkData(1 , 1, 1.771243749)
         tdSql.checkData(3 , 1, 1.464973521)
@@ -354,19 +342,19 @@ class TDTestCase:
 
         # test bug fix for log(c1,c2)
 
-        tdSql.query("select c1, c2 ,log(c1,c2) from ct1")
+        tdSql.query(f"select c1, c2 ,log(c1,c2) from {dbname}.ct1")
         tdSql.checkData(0 , 2, 0.182485070)
         tdSql.checkData(1 , 2, 0.172791608)
         tdSql.checkData(2 , 2, 0.161311499)
         tdSql.checkData(3 , 2, 0.147315235)
         tdSql.checkData(4 , 2, None)
 
-        self.check_result_auto_log( "select c1, c2, c3 , c4, c5 from ct1", "select log(c1), log(c2) ,log(c3), log(c4), log(c5) from ct1")
+        self.check_result_auto_log( f"select c1, c2, c3 , c4, c5 from {dbname}.ct1", f"select log(c1), log(c2) ,log(c3), log(c4), log(c5) from {dbname}.ct1")
-        self.check_result_auto_log2( "select c1, c2, c3 , c4, c5 from ct1", "select log(c1,2), log(c2,2) ,log(c3,2), log(c4,2), log(c5,2) from ct1")
+        self.check_result_auto_log2( f"select c1, c2, c3 , c4, c5 from {dbname}.ct1", f"select log(c1,2), log(c2,2) ,log(c3,2), log(c4,2), log(c5,2) from {dbname}.ct1")
-        self.check_result_auto_log__10( "select c1, c2, c3 , c4, c5 from ct1", "select log(c1,-10), log(c2,-10) ,log(c3,-10), log(c4,-10), log(c5,-10) from ct1")
+        self.check_result_auto_log__10( f"select c1, c2, c3 , c4, c5 from {dbname}.ct1", f"select log(c1,-10), log(c2,-10) ,log(c3,-10), log(c4,-10), log(c5,-10) from {dbname}.ct1")
 
         # nest query for log functions
-        tdSql.query("select c1  , log(c1,3) ,log(log(c1,3),3) , log(log(log(c1,3),3),3) from ct1;")
+        tdSql.query(f"select c1  , log(c1,3) ,log(log(c1,3),3) , log(log(log(c1,3),3),3) from {dbname}.ct1;")
         tdSql.checkData(0 , 0 , 8)
         tdSql.checkData(0 , 1 , 1.892789261)
         tdSql.checkData(0 , 2 , 0.580779541)
@@ -384,36 +372,36 @@ class TDTestCase:
 
         # # used for stable table
 
-        tdSql.query("select log(c1, 2) from stb1")
+        tdSql.query(f"select log(c1, 2) from {dbname}.stb1")
         tdSql.checkRows(25)
 
 
         # used for not exists table
-        tdSql.error("select log(c1, 2) from stbbb1")
+        tdSql.error(f"select log(c1, 2) from {dbname}.stbbb1")
-        tdSql.error("select log(c1, 2) from tbname")
+        tdSql.error(f"select log(c1, 2) from {dbname}tbname")
-        tdSql.error("select log(c1, 2) from ct5")
+        tdSql.error(f"select log(c1, 2) from {dbname}.ct5")
 
         # mix with common col
-        tdSql.query("select c1, log(c1 ,2) from ct1")
+        tdSql.query(f"select c1, log(c1 ,2) from {dbname}.ct1")
         tdSql.checkData(0 , 0 ,8)
         tdSql.checkData(0 , 1 ,3.000000000)
         tdSql.checkData(4 , 0 ,0)
         tdSql.checkData(4 , 1 ,None)
-        tdSql.query("select c1, log(c1,2) from ct4")
+        tdSql.query(f"select c1, log(c1,2) from {dbname}.ct4")
         tdSql.checkData(0 , 0 , None)
         tdSql.checkData(0 , 1 ,None)
         tdSql.checkData(4 , 0 ,5)
         tdSql.checkData(4 , 1 ,2.321928095)
         tdSql.checkData(5 , 0 ,None)
         tdSql.checkData(5 , 1 ,None)
-        tdSql.query("select c1, log(c1 ,2 ) from ct4 ")
+        tdSql.query(f"select c1, log(c1 ,2 ) from {dbname}.ct4 ")
         tdSql.checkData(0 , 0 ,None)
         tdSql.checkData(0 , 1 ,None)
         tdSql.checkData(4 , 0 ,5)
         tdSql.checkData(4 , 1 ,2.321928095)
 
         # mix with common functions
-        tdSql.query("select c1, log(c1 ,2),c5, log(c5 ,2) from ct4 ")
+        tdSql.query(f"select c1, log(c1 ,2),c5, log(c5 ,2) from {dbname}.ct4 ")
         tdSql.checkData(0 , 0 ,None)
         tdSql.checkData(0 , 1 ,None)
         tdSql.checkData(0 , 2 ,None)
@@ -424,34 +412,34 @@ class TDTestCase:
         tdSql.checkData(3 , 2 ,6.66000)
         tdSql.checkData(3 , 3 ,2.735522144)
 
-        tdSql.query("select c1, log(c1,1),c5, floor(c5 ) from stb1 ")
+        tdSql.query(f"select c1, log(c1,1),c5, floor(c5 ) from {dbname}.stb1 ")
 
         # # mix with agg functions , not support
-        tdSql.error("select c1, log(c1 ,2),c5, count(c5) from stb1 ")
+        tdSql.error(f"select c1, log(c1 ,2),c5, count(c5) from {dbname}.stb1 ")
-        tdSql.error("select c1, log(c1 ,2),c5, count(c5) from ct1 ")
+        tdSql.error(f"select c1, log(c1 ,2),c5, count(c5) from {dbname}.ct1 ")
-        tdSql.error("select log(c1 ,2), count(c5) from stb1 ")
+        tdSql.error(f"select log(c1 ,2), count(c5) from {dbname}.stb1 ")
-        tdSql.error("select log(c1 ,2), count(c5) from ct1 ")
+        tdSql.error(f"select log(c1 ,2), count(c5) from {dbname}.ct1 ")
-        tdSql.error("select c1, count(c5) from ct1 ")
+        tdSql.error(f"select c1, count(c5) from {dbname}.ct1 ")
-        tdSql.error("select c1, count(c5) from stb1 ")
+        tdSql.error(f"select c1, count(c5) from {dbname}.stb1 ")
 
         # agg functions mix with agg functions
 
-        tdSql.query("select max(c5), count(c5) from stb1")
+        tdSql.query(f"select max(c5), count(c5) from {dbname}.stb1")
-        tdSql.query("select max(c5), count(c5) from ct1")
+        tdSql.query(f"select max(c5), count(c5) from {dbname}.ct1")
 
 
         # bug fix for count
-        tdSql.query("select count(c1) from ct4 ")
+        tdSql.query(f"select count(c1) from {dbname}.ct4 ")
         tdSql.checkData(0,0,9)
-        tdSql.query("select count(*) from ct4 ")
+        tdSql.query(f"select count(*) from {dbname}.ct4 ")
         tdSql.checkData(0,0,12)
-        tdSql.query("select count(c1) from stb1 ")
+        tdSql.query(f"select count(c1) from {dbname}.stb1 ")
         tdSql.checkData(0,0,22)
-        tdSql.query("select count(*) from stb1 ")
+        tdSql.query(f"select count(*) from {dbname}.stb1 ")
         tdSql.checkData(0,0,25)
 
         # # bug fix for compute
-        tdSql.query("select c1, log(c1 ,2) -0 ,log(c1-4 ,2)-0 from ct4 ")
+        tdSql.query(f"select c1, log(c1 ,2) -0 ,log(c1-4 ,2)-0 from {dbname}.ct4 ")
         tdSql.checkData(0, 0, None)
         tdSql.checkData(0, 1, None)
         tdSql.checkData(0, 2, None)
@@ -459,7 +447,7 @@ class TDTestCase:
         tdSql.checkData(1, 1, 3.000000000)
         tdSql.checkData(1, 2, 2.000000000)
 
-        tdSql.query(" select c1, log(c1 ,2) -0 ,log(c1-0.1 ,2)-0.1 from ct4")
+        tdSql.query(f"select c1, log(c1 ,2) -0 ,log(c1-0.1 ,2)-0.1 from {dbname}.ct4")
         tdSql.checkData(0, 0, None)
         tdSql.checkData(0, 1, None)
         tdSql.checkData(0, 2, None)
@@ -467,88 +455,87 @@ class TDTestCase:
         tdSql.checkData(1, 1, 3.000000000)
         tdSql.checkData(1, 2, 2.881852653)
 
-        tdSql.query("select c1, log(c1, -10), c2, log(c2, -10), c3, log(c3, -10) from ct1")
+        tdSql.query(f"select c1, log(c1, -10), c2, log(c2, -10), c3, log(c3, -10) from {dbname}.ct1")
 
-    def test_big_number(self):
+    def test_big_number(self, dbname="db"):
 
-        tdSql.query("select c1, log(c1, 100000000) from ct1")  # bigint to double data overflow
+        tdSql.query(f"select c1, log(c1, 100000000) from {dbname}.ct1")  # bigint to double data overflow
         tdSql.checkData(0, 1, 0.112886248)
         tdSql.checkData(1, 1, 0.105637255)
         tdSql.checkData(4, 1, None)
 
 
-        tdSql.query("select c1, log(c1, 10000000000000) from ct1")  # bigint to double data overflow
+        tdSql.query(f"select c1, log(c1, 10000000000000) from {dbname}.ct1")  # bigint to double data overflow
         tdSql.checkData(0, 1, 0.069468461)
         tdSql.checkData(1, 1, 0.065007542)
         tdSql.checkData(4, 1, None)
 
-        tdSql.query("select c1, log(c1, 10000000000000000000000000) from ct1")  # bigint to double data overflow
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000) from {dbname}.ct1")  # bigint to double data overflow
-        tdSql.query("select c1, log(c1, 10000000000000000000000000.0) from ct1") # 10000000000000000000000000.0 is a double value
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000.0) from {dbname}.ct1") # 10000000000000000000000000.0 is a double value
         tdSql.checkData(0, 1, 0.036123599)
         tdSql.checkData(1, 1, 0.033803922)
         tdSql.checkData(4, 1, None)
 
-        tdSql.query("select c1, log(c1, 10000000000000000000000000000000000) from ct1")  # bigint to double data overflow
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000000000000) from {dbname}.ct1")  # bigint to double data overflow
-        tdSql.query("select c1, log(c1, 10000000000000000000000000000000000.0) from ct1") # 10000000000000000000000000.0 is a double value
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000000000000.0) from {dbname}.ct1") # 10000000000000000000000000.0 is a double value
         tdSql.checkData(0, 1, 0.026561470)
         tdSql.checkData(1, 1, 0.024855825)
         tdSql.checkData(4, 1, None)
 
-        tdSql.query("select c1, log(c1, 10000000000000000000000000000000000000000) from ct1")  # bigint to double data overflow
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000000000000000000) from {dbname}.ct1")  # bigint to double data overflow
-        tdSql.query("select c1, log(c1, 10000000000000000000000000000000000000000.0) from ct1") # 10000000000000000000000000.0 is a double value
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000000000000000000.0) from {dbname}.ct1") # 10000000000000000000000000.0 is a double value
         tdSql.checkData(0, 1, 0.022577250)
         tdSql.checkData(1, 1, 0.021127451)
         tdSql.checkData(4, 1, None)
 
-        tdSql.query("select c1, log(c1, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000) from ct1")  # bigint to double data overflow
+        tdSql.query(f"select c1, log(c1, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000) from {dbname}.ct1")  # bigint to double data overflow
 
-    def log_base_test(self):
+    def log_base_test(self, dbname="db"):
 
         # base is an regular number ,int or double
-        tdSql.query("select c1, log(c1, 2) from ct1")
+        tdSql.query(f"select c1, log(c1, 2) from {dbname}.ct1")
         tdSql.checkData(0, 1,3.000000000)
-        tdSql.query("select c1, log(c1, 2.0) from ct1")
+        tdSql.query(f"select c1, log(c1, 2.0) from {dbname}.ct1")
         tdSql.checkData(0, 1, 3.000000000)
 
-        tdSql.query("select c1, log(1, 2.0) from ct1")
+        tdSql.query(f"select c1, log(1, 2.0) from {dbname}.ct1")
         tdSql.checkData(0, 1, 0.000000000)
         tdSql.checkRows(13)
 
 
         # # bug for compute in functions
-        # tdSql.query("select c1, abs(1/0) from ct1")
+        # tdSql.query(f"select c1, abs(1/0) from {dbname}.ct1")
         # tdSql.checkData(0, 0, 8)
         # tdSql.checkData(0, 1, 1)
 
-        tdSql.query("select c1, log(1, 2.0) from ct1")
+        tdSql.query(f"select c1, log(1, 2.0) from {dbname}.ct1")
         tdSql.checkData(0, 1, 0.000000000)
         tdSql.checkRows(13)
 
         # two cols start log(x,y)
-        tdSql.query("select c1,c2, log(c1,c2) from ct1")
+        tdSql.query(f"select c1,c2, log(c1,c2) from {dbname}.ct1")
         tdSql.checkData(0, 2, 0.182485070)
         tdSql.checkData(1, 2, 0.172791608)
         tdSql.checkData(4, 2, None)
 
-        tdSql.query("select c1,c2, log(c2,c1) from ct1")
+        tdSql.query(f"select c1,c2, log(c2,c1) from {dbname}.ct1")
         tdSql.checkData(0, 2, 5.479900349)
         tdSql.checkData(1, 2, 5.787318105)
         tdSql.checkData(4, 2, None)
 
-        tdSql.query("select c1, log(2.0 , c1) from ct1")
+        tdSql.query(f"select c1, log(2.0 , c1) from {dbname}.ct1")
         tdSql.checkData(0, 1, 0.333333333)
         tdSql.checkData(1, 1, 0.356207187)
         tdSql.checkData(4, 1, None)
 
-        tdSql.query("select c1, log(2.0 , ceil(abs(c1))) from ct1")
+        tdSql.query(f"select c1, log(2.0 , ceil(abs(c1))) from {dbname}.ct1")
         tdSql.checkData(0, 1, 0.333333333)
         tdSql.checkData(1, 1, 0.356207187)
         tdSql.checkData(4, 1, None)
 
 
-    def abs_func_filter(self):
+    def abs_func_filter(self, dbname="db"):
-        tdSql.execute("use db")
+        tdSql.query(f"select c1, abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from {dbname}.ct4 where c1>5 ")
-        tdSql.query("select c1, abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from ct4 where c1>5 ")
         tdSql.checkRows(3)
         tdSql.checkData(0,0,8)
         tdSql.checkData(0,1,8.000000000)
@@ -556,7 +543,7 @@ class TDTestCase:
         tdSql.checkData(0,3,7.900000000)
         tdSql.checkData(0,4,3.000000000)
 
-        tdSql.query("select c1, abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from ct4 where c1=5 ")
+        tdSql.query(f"select c1, abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from {dbname}.ct4 where c1=5 ")
         tdSql.checkRows(1)
         tdSql.checkData(0,0,5)
         tdSql.checkData(0,1,5.000000000)
@@ -564,15 +551,7 @@ class TDTestCase:
         tdSql.checkData(0,3,4.900000000)
         tdSql.checkData(0,4,2.000000000)
 
-        tdSql.query("select c1, abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from ct4 where c1=5 ")
+        tdSql.query(f"select c1,c2 , abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from {dbname}.ct4 where c1>log(c1,2) limit 1 ")
-        tdSql.checkRows(1)
-        tdSql.checkData(0,0,5)
-        tdSql.checkData(0,1,5.000000000)
-        tdSql.checkData(0,2,5.000000000)
-        tdSql.checkData(0,3,4.900000000)
-        tdSql.checkData(0,4,2.000000000)
-
-        tdSql.query("select c1,c2 , abs(c1) -0 ,ceil(c1-0.1)-0 ,floor(c1+0.1)-0.1 ,ceil(log(c1,2)-0.5) from ct4 where c1>log(c1,2) limit 1 ")
         tdSql.checkRows(1)
         tdSql.checkData(0,0,8)
         tdSql.checkData(0,1,88888)
@@ -581,46 +560,43 @@ class TDTestCase:
         tdSql.checkData(0,4,7.900000000)
         tdSql.checkData(0,5,3.000000000)
 
-    def log_Arithmetic(self):
-        pass
 
-    def check_boundary_values(self):
+    def check_boundary_values(self, dbname="bound_test"):
 
-        tdSql.execute("drop database if exists bound_test")
+        tdSql.execute(f"drop database if exists {dbname}")
-        tdSql.execute("create database if not exists bound_test")
+        tdSql.execute(f"create database if not exists {dbname}")
         time.sleep(3)
-        tdSql.execute("use bound_test")
         tdSql.execute(
-            "create table stb_bound (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(32),c9 nchar(32), c10 timestamp) tags (t1 int);"
+            f"create table {dbname}.stb_bound (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(32),c9 nchar(32), c10 timestamp) tags (t1 int);"
         )
-        tdSql.execute(f'create table sub1_bound using stb_bound tags ( 1 )')
+        tdSql.execute(f'create table {dbname}.sub1_bound using {dbname}.stb_bound tags ( 1 )')
         tdSql.execute(
-                f"insert into sub1_bound values ( now()-1s, 2147483647, 9223372036854775807, 32767, 127, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
+                f"insert into {dbname}.sub1_bound values ( now()-1s, 2147483647, 9223372036854775807, 32767, 127, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
             )
         tdSql.execute(
-                f"insert into sub1_bound values ( now()-1s, -2147483647, -9223372036854775807, -32767, -127, -3.40E+38, -1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
+                f"insert into {dbname}.sub1_bound values ( now()-1s, -2147483647, -9223372036854775807, -32767, -127, -3.40E+38, -1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
             )
         tdSql.execute(
-                f"insert into sub1_bound values ( now(), 2147483646, 9223372036854775806, 32766, 126, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
+                f"insert into {dbname}.sub1_bound values ( now(), 2147483646, 9223372036854775806, 32766, 126, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
             )
         tdSql.execute(
-                f"insert into sub1_bound values ( now(), -2147483646, -9223372036854775806, -32766, -126, -3.40E+38, -1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
+                f"insert into {dbname}.sub1_bound values ( now(), -2147483646, -9223372036854775806, -32766, -126, -3.40E+38, -1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
             )
         tdSql.error(
-                f"insert into sub1_bound values ( now()+1s, 2147483648, 9223372036854775808, 32768, 128, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
+                f"insert into {dbname}.sub1_bound values ( now()+1s, 2147483648, 9223372036854775808, 32768, 128, 3.40E+38, 1.7e+308, True, 'binary_tb1', 'nchar_tb1', now() )"
             )
-        self.check_result_auto_log( "select c1, c2, c3 , c4, c5 ,c6 from sub1_bound ", "select log(c1), log(c2) ,log(c3), log(c4), log(c5) ,log(c6) from sub1_bound")
+        self.check_result_auto_log( f"select c1, c2, c3 , c4, c5 ,c6 from {dbname}.sub1_bound ", f"select log(c1), log(c2) ,log(c3), log(c4), log(c5) ,log(c6) from {dbname}.sub1_bound")
-        self.check_result_auto_log2( "select c1, c2, c3 , c4, c5 ,c6 from sub1_bound ", "select log(c1,2), log(c2,2) ,log(c3,2), log(c4,2), log(c5,2) ,log(c6,2) from sub1_bound")
+        self.check_result_auto_log2( f"select c1, c2, c3 , c4, c5 ,c6 from {dbname}.sub1_bound ", f"select log(c1,2), log(c2,2) ,log(c3,2), log(c4,2), log(c5,2) ,log(c6,2) from {dbname}.sub1_bound")
-        self.check_result_auto_log__10( "select c1, c2, c3 , c4, c5 ,c6 from sub1_bound ", "select log(c1,-10), log(c2,-10) ,log(c3,-10), log(c4,-10), log(c5,-10) ,log(c6,-10) from sub1_bound")
+        self.check_result_auto_log__10( f"select c1, c2, c3 , c4, c5 ,c6 from {dbname}.sub1_bound ", f"select log(c1,-10), log(c2,-10) ,log(c3,-10), log(c4,-10), log(c5,-10) ,log(c6,-10) from {dbname}.sub1_bound")
 
-        self.check_result_auto_log2( "select c1, c2, c3 , c3, c2 ,c1 from sub1_bound ", "select log(c1,2), log(c2,2) ,log(c3,2), log(c3,2), log(c2,2) ,log(c1,2) from sub1_bound")
+        self.check_result_auto_log2( f"select c1, c2, c3 , c3, c2 ,c1 from {dbname}.sub1_bound ", f"select log(c1,2), log(c2,2) ,log(c3,2), log(c3,2), log(c2,2) ,log(c1,2) from {dbname}.sub1_bound")
-        self.check_result_auto_log( "select c1, c2, c3 , c3, c2 ,c1 from sub1_bound ", "select log(c1), log(c2) ,log(c3), log(c3), log(c2) ,log(c1) from sub1_bound")
+        self.check_result_auto_log( f"select c1, c2, c3 , c3, c2 ,c1 from {dbname}.sub1_bound ", f"select log(c1), log(c2) ,log(c3), log(c3), log(c2) ,log(c1) from {dbname}.sub1_bound")
 
 
-        self.check_result_auto_log2("select abs(abs(abs(abs(abs(abs(abs(abs(abs(c1)))))))))  nest_col_func from sub1_bound" , "select log(abs(c1) ,2) from sub1_bound" )
+        self.check_result_auto_log2(f"select abs(abs(abs(abs(abs(abs(abs(abs(abs(c1)))))))))  nest_col_func from {dbname}.sub1_bound" , f"select log(abs(c1) ,2) from {dbname}.sub1_bound" )
 
         # check basic elem for table per row
-        tdSql.query("select log(abs(c1),2) ,log(abs(c2),2) , log(abs(c3),2) , log(abs(c4),2), log(abs(c5),2), log(abs(c6),2) from sub1_bound ")
+        tdSql.query(f"select log(abs(c1),2) ,log(abs(c2),2) , log(abs(c3),2) , log(abs(c4),2), log(abs(c5),2), log(abs(c6),2) from {dbname}.sub1_bound ")
         tdSql.checkData(0,0,math.log(2147483647,2))
         tdSql.checkData(0,1,math.log(9223372036854775807 ,2))
         tdSql.checkData(0,2,math.log(32767,2))
@@ -641,7 +617,7 @@ class TDTestCase:
         tdSql.checkData(3,5,math.log(169999999999999993883079578865998174333346074304075874502773119193537729178160565864330091787584707988572262467983188919169916105593357174268369962062473635296474636515660464935663040684957844303524367815028553272712298986386310828644513212353921123253311675499856875650512437415429217994623324794855339589632.000000000,2))
 
         # check basic elem for table per row
-        tdSql.query("select log(abs(c1)) ,log(abs(c2)) , log(abs(c3)) , log(abs(c4)), log(abs(c5)), log(abs(c6)) from sub1_bound ")
+        tdSql.query(f"select log(abs(c1)) ,log(abs(c2)) , log(abs(c3)) , log(abs(c4)), log(abs(c5)), log(abs(c6)) from {dbname}.sub1_bound ")
         tdSql.checkData(0,0,math.log(2147483647))
         tdSql.checkData(0,1,math.log(9223372036854775807))
         tdSql.checkData(0,2,math.log(32767))
@@ -661,28 +637,25 @@ class TDTestCase:
         tdSql.checkData(3,4,math.log(339999995214436424907732413799364296704.00000))
         tdSql.checkData(3,5,math.log(169999999999999993883079578865998174333346074304075874502773119193537729178160565864330091787584707988572262467983188919169916105593357174268369962062473635296474636515660464935663040684957844303524367815028553272712298986386310828644513212353921123253311675499856875650512437415429217994623324794855339589632.000000000))
 
-
-
         # check  + - * / in functions
-        tdSql.query("select log(abs(c1+1) ,2) ,log(abs(c2),2) , log(abs(c3*1),2) , log(abs(c4/2),2), log(abs(c5) ,2)/2, log(abs(c6) ,2) from sub1_bound ")
+        tdSql.query(f"select log(abs(c1+1) ,2) ,log(abs(c2),2) , log(abs(c3*1),2) , log(abs(c4/2),2), log(abs(c5) ,2)/2, log(abs(c6) ,2) from {dbname}.sub1_bound ")
         tdSql.checkData(0,0,math.log(2147483648.000000000,2))
         tdSql.checkData(0,1,math.log(9223372036854775807,2))
         tdSql.checkData(0,2,math.log(32767.000000000,2))
         tdSql.checkData(0,3,math.log(63.500000000,2))
         tdSql.checkData(0,4,63.999401166)
 
-    def support_super_table_test(self):
+    def support_super_table_test(self, dbname="db"):
-        tdSql.execute(" use db ")
-        self.check_result_auto_log2( " select c5 from stb1 order by ts " , "select log(c5,2) from stb1 order by ts" )
-        self.check_result_auto_log2( " select c5 from stb1 order by tbname " , "select log(c5,2) from stb1 order by tbname" )
-        self.check_result_auto_log2( " select c5 from stb1 where c1 > 0 order by tbname  " , "select log(c5,2) from stb1 where c1 > 0 order by tbname" )
-        self.check_result_auto_log2( " select c5 from stb1 where c1 > 0 order by tbname  " , "select log(c5,2) from stb1 where c1 > 0 order by tbname" )
 
-        self.check_result_auto_log2( " select t1,c5 from stb1 order by ts " , "select log(t1,2), log(c5,2) from stb1 order by ts" )
+        self.check_result_auto_log2( f"select c5 from {dbname}.stb1 order by ts " , f"select log(c5,2) from {dbname}.stb1 order by ts" )
-        self.check_result_auto_log2( " select t1,c5 from stb1 order by tbname " , "select log(t1,2) ,log(c5,2) from stb1 order by tbname" )
+        self.check_result_auto_log2( f"select c5 from {dbname}.stb1 order by tbname " , f"select log(c5,2) from {dbname}.stb1 order by tbname" )
-        self.check_result_auto_log2( " select t1,c5 from stb1 where c1 > 0 order by tbname  " , "select log(t1,2) ,log(c5,2) from stb1 where c1 > 0 order by tbname" )
+        self.check_result_auto_log2( f"select c5 from {dbname}.stb1 where c1 > 0 order by tbname  " , f"select log(c5,2) from {dbname}.stb1 where c1 > 0 order by tbname" )
-        self.check_result_auto_log2( " select t1,c5 from stb1 where c1 > 0 order by tbname  " , "select log(t1,2) , log(c5,2) from stb1 where c1 > 0 order by tbname" )
+        self.check_result_auto_log2( f"select c5 from {dbname}.stb1 where c1 > 0 order by tbname  " , f"select log(c5,2) from {dbname}.stb1 where c1 > 0 order by tbname" )
-        pass
+
+        self.check_result_auto_log2( f"select t1,c5 from {dbname}.stb1 order by ts " , f"select log(t1,2), log(c5,2) from {dbname}.stb1 order by ts" )
+        self.check_result_auto_log2( f"select t1,c5 from {dbname}.stb1 order by tbname " , f"select log(t1,2) ,log(c5,2) from {dbname}.stb1 order by tbname" )
+        self.check_result_auto_log2( f"select t1,c5 from {dbname}.stb1 where c1 > 0 order by tbname  " , f"select log(t1,2) ,log(c5,2) from {dbname}.stb1 where c1 > 0 order by tbname" )
+        self.check_result_auto_log2( f"select t1,c5 from {dbname}.stb1 where c1 > 0 order by tbname  " , f"select log(t1,2) , log(c5,2) from {dbname}.stb1 where c1 > 0 order by tbname" )
 
     def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
         tdSql.prepare()

tests/system-test/fulltest.sh

@@ -110,15 +110,20 @@ python3 ./test.py -f 2-query/histogram.py
 python3 ./test.py -f 2-query/histogram.py -R
 python3 ./test.py -f 2-query/hyperloglog.py
 python3 ./test.py -f 2-query/hyperloglog.py -R
+python3 ./test.py -f 2-query/interp.py
+python3 ./test.py -f 2-query/interp.py -R
 python3 ./test.py -f 2-query/irate.py
 # python3 ./test.py -f 2-query/irate.py -R
 python3 ./test.py -f 2-query/join.py
 python3 ./test.py -f 2-query/join.py -R
-
+python3 ./test.py -f 2-query/last_row.py
-python3 ./test.py -f 2-query/interp.py
+python3 ./test.py -f 2-query/last_row.py -R
-python3 ./test.py -f 2-query/interp.py -R
+python3 ./test.py -f 2-query/last.py
-
+python3 ./test.py -f 2-query/last.py -R
-
+python3 ./test.py -f 2-query/leastsquares.py
+python3 ./test.py -f 2-query/leastsquares.py -R
+python3 ./test.py -f 2-query/length.py
+python3 ./test.py -f 2-query/length.py -R
 
 python3 ./test.py -f 1-insert/update_data.py
 
@@ -127,7 +132,6 @@ python3 ./test.py -f 1-insert/delete_data.py
 python3 ./test.py -f 2-query/varchar.py
 python3 ./test.py -f 2-query/ltrim.py
 python3 ./test.py -f 2-query/rtrim.py
-python3 ./test.py -f 2-query/length.py
 python3 ./test.py -f 2-query/upper.py
 python3 ./test.py -f 2-query/lower.py
 python3 ./test.py -f 2-query/join2.py
@@ -136,7 +140,6 @@ python3 ./test.py -f 2-query/union.py
 python3 ./test.py -f 2-query/union1.py
 python3 ./test.py -f 2-query/concat2.py
 python3 ./test.py -f 2-query/spread.py
-python3 ./test.py -f 2-query/leastsquares.py
 
 
 python3 ./test.py -f 2-query/timezone.py
@@ -144,7 +147,6 @@ python3 ./test.py -f 2-query/Now.py
 python3 ./test.py -f 2-query/Today.py
 python3 ./test.py -f 2-query/max.py
 python3 ./test.py -f 2-query/min.py
-python3 ./test.py -f 2-query/last.py
 python3 ./test.py -f 2-query/To_iso8601.py
 python3 ./test.py -f 2-query/To_unixtimestamp.py
 python3 ./test.py -f 2-query/timetruncate.py
@@ -178,7 +180,6 @@ python3 ./test.py -f 2-query/ttl_comment.py
 python3 ./test.py -f 2-query/twa.py
 python3 ./test.py -f 2-query/queryQnode.py
 python3 ./test.py -f 2-query/max_partition.py
-python3 ./test.py -f 2-query/last_row.py
 python3 ./test.py -f 2-query/tsbsQuery.py
 
 python3 ./test.py -f 6-cluster/5dnode1mnode.py

tests/system-test/test.py

@@ -194,7 +194,7 @@ if __name__ == "__main__":
             processID = subprocess.check_output(psCmd, shell=True)
 
         for port in range(6030, 6041):
-            usePortPID = "lsof -i tcp:%d | grep LISTEn | awk '{print $2}'" % port
+            usePortPID = "lsof -i tcp:%d | grep LISTEN | awk '{print $2}'" % port
             processID = subprocess.check_output(usePortPID, shell=True)
 
             if processID:
@@ -206,11 +206,13 @@ if __name__ == "__main__":
             time.sleep(2)
 
         if restful:
-            toBeKilled = "taosadapter"
+            toBeKilled = "taosadapt"
 
-            killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -TERM > /dev/null 2>&1" % toBeKilled
+            # killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -TERM > /dev/null 2>&1" % toBeKilled
+            killCmd = f"pkill {toBeKilled}"
 
             psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
+            # psCmd = f"pgrep {toBeKilled}"
             processID = subprocess.check_output(psCmd, shell=True)
 
             while(processID):
@@ -218,15 +220,15 @@ if __name__ == "__main__":
                 time.sleep(1)
                 processID = subprocess.check_output(psCmd, shell=True)
 
-            for port in range(6030, 6041):
+            port = 6041
-                usePortPID = "lsof -i tcp:%d | grep LISTEn | awk '{print $2}'" % port
+            usePortPID = f"lsof -i tcp:{port} | grep LISTEN | awk '{{print $2}}'"
-                processID = subprocess.check_output(usePortPID, shell=True)
+            processID = subprocess.check_output(usePortPID, shell=True)
 
-                if processID:
+            if processID:
-                    killCmd = "kill -TERM %s" % processID
+                killCmd = f"kill -TERM {processID}"
-                    os.system(killCmd)
+                os.system(killCmd)
-                fuserCmd = "fuser -k -n tcp %d" % port
+            fuserCmd = f"fuser -k -n tcp {port}"
-                os.system(fuserCmd)
+            os.system(fuserCmd)
 
             tdLog.info('stop taosadapter')